Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dccd573b authored by David Brownell's avatar David Brownell Committed by Linus Torvalds
Browse files

SPI controller drivers: check for unsupported modes 



Minor SPI controller driver updates: make the setup() methods reject
spi->mode bits they don't support, by masking aginst the inverse of bits
they *do* support.  This insures against misbehavior later when new mode
bits get added.

Most controllers can't support SPI_LSB_FIRST; more handle SPI_CS_HIGH.
Support for all four SPI clock/transfer modes is routine.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ff294cba

drivers/spi/atmel_spi.c

+1 −0
Original line number Diff line number Diff line
@@ -350,6 +350,7 @@ atmel_spi_interrupt(int irq, void *dev_id) 
	return ret;

}



/* the spi->mode bits understood by this driver: */

#define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH)



static int atmel_spi_setup(struct spi_device *spi)

drivers/spi/au1550_spi.c

+9 −0
Original line number Diff line number Diff line
@@ -280,6 +280,9 @@ static int au1550_spi_setupxfer(struct spi_device *spi, struct spi_transfer *t) 
	return 0;

}



/* the spi->mode bits understood by this driver: */

#define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST)



static int au1550_spi_setup(struct spi_device *spi)

{

	struct au1550_spi *hw = spi_master_get_devdata(spi->master);
@@ -292,6 +295,12 @@ static int au1550_spi_setup(struct spi_device *spi) 
		return -EINVAL;

	}



	if (spi->mode & ~MODEBITS) {

		dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n",

			spi->mode & ~MODEBITS);

		return -EINVAL;

	}



	if (spi->max_speed_hz == 0)

		spi->max_speed_hz = hw->freq_max;

	if (spi->max_speed_hz > hw->freq_max

drivers/spi/mpc52xx_psc_spi.c

+9 −0
Original line number Diff line number Diff line
@@ -270,6 +270,9 @@ static void mpc52xx_psc_spi_work(struct work_struct *work) 
	spin_unlock_irq(&mps->lock);

}



/* the spi->mode bits understood by this driver: */

#define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST)



static int mpc52xx_psc_spi_setup(struct spi_device *spi)

{

	struct mpc52xx_psc_spi *mps = spi_master_get_devdata(spi->master);
@@ -279,6 +282,12 @@ static int mpc52xx_psc_spi_setup(struct spi_device *spi) 
	if (spi->bits_per_word%8)

		return -EINVAL;



	if (spi->mode & ~MODEBITS) {

		dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n",

			spi->mode & ~MODEBITS);

		return -EINVAL;

	}



	if (!cs) {

		cs = kzalloc(sizeof *cs, GFP_KERNEL);

		if (!cs)

drivers/spi/omap_uwire.c

+9 −0
Original line number Diff line number Diff line
@@ -445,10 +445,19 @@ static int uwire_setup_transfer(struct spi_device *spi, struct spi_transfer *t) 
	return status;

}



/* the spi->mode bits understood by this driver: */

#define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH)



static int uwire_setup(struct spi_device *spi)

{

	struct uwire_state *ust = spi->controller_state;



	if (spi->mode & ~MODEBITS) {

		dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n",

			spi->mode & ~MODEBITS);

		return -EINVAL;

	}



	if (ust == NULL) {

		ust = kzalloc(sizeof(*ust), GFP_KERNEL);

		if (ust == NULL)

drivers/spi/pxa2xx_spi.c

+9 −0
Original line number Diff line number Diff line
@@ -1067,6 +1067,9 @@ static int transfer(struct spi_device *spi, struct spi_message *msg) 
	return 0;

}



/* the spi->mode bits understood by this driver: */

#define MODEBITS (SPI_CPOL | SPI_CPHA)



static int setup(struct spi_device *spi)

{

	struct pxa2xx_spi_chip *chip_info = NULL;
@@ -1093,6 +1096,12 @@ static int setup(struct spi_device *spi) 
		return -EINVAL;

	}



	if (spi->mode & ~MODEBITS) {

		dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n",

			spi->mode & ~MODEBITS);

		return -EINVAL;

	}



	/* Only alloc on first setup */

	chip = spi_get_ctldata(spi);

	if (!chip) {