Commit ef208162 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-fix-v4.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fixes from Mark Brown:
 "A number of driver specific fixes (including several missing
  dependencies for randconfig type cases) plus two core fixes.

  One makes the setup_transfer() callback optional which unbreaks some
  drivers which had been merged with it omitted due to local versions of
  this patch and another ensures that we don't corrupt data by leaking
  internal dummy buffers to callers, causing the callers to think they
  allocated those buffers"

* tag 'spi-fix-v4.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: fsl-espi: fix behaviour for full-duplex xfers
  spi: fsl-spi: fix devm_ioremap_resource() error case
  spi: Kconfig: Add SOC_LS1021A to SPI_FSL_DSPI dependence
  spi/omap2-mcpsi: Always call spi_finalize_current_message()
  spi: fsl-spi: use devm_ioremap_resource() to map parameter ram on CPM1
  spi: bitbang: Make setup_transfer() callback optional
  spi: check tx_buf and rx_buf in spi_unmap_msg
  spi: bcm2835: change timeout of polling driver to 1s
  spi: bcm2835: Add GPIOLIB dependency
parents a156e068 c8b35042

drivers/spi/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ config SPI_ATMEL 
config SPI_BCM2835

	tristate "BCM2835 SPI controller"

	depends on ARCH_BCM2835 || COMPILE_TEST

	depends on GPIOLIB

	help

	  This selects a driver for the Broadcom BCM2835 SPI master.
@@ -302,7 +303,7 @@ config SPI_FSL_SPI 
config SPI_FSL_DSPI

	tristate "Freescale DSPI controller"

	select REGMAP_MMIO

	depends on SOC_VF610 || COMPILE_TEST

	depends on SOC_VF610 || SOC_LS1021A || COMPILE_TEST

	help

	  This enables support for the Freescale DSPI controller in master

	  mode. VF610 platform uses the controller.

drivers/spi/spi-bcm2835.c

+2 −3
Original line number Diff line number Diff line
@@ -164,13 +164,12 @@ static int bcm2835_spi_transfer_one_poll(struct spi_master *master, 
					 unsigned long xfer_time_us)

{

	struct bcm2835_spi *bs = spi_master_get_devdata(master);

	unsigned long timeout = jiffies +

		max(4 * xfer_time_us * HZ / 1000000, 2uL);

	/* set timeout to 1 second of maximum polling */

	unsigned long timeout = jiffies + HZ;



	/* enable HW block without interrupts */

	bcm2835_wr(bs, BCM2835_SPI_CS, cs | BCM2835_SPI_CS_TA);



	/* set timeout to 4x the expected time, or 2 jiffies */

	/* loop until finished the transfer */

	while (bs->rx_len) {

		/* read from fifo as much as possible */

drivers/spi/spi-bitbang.c

+10 −7
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ int spi_bitbang_setup(struct spi_device *spi) 
{

	struct spi_bitbang_cs	*cs = spi->controller_state;

	struct spi_bitbang	*bitbang;

	int			retval;

	unsigned long		flags;



	bitbang = spi_master_get_devdata(spi->master);
@@ -197,9 +196,11 @@ int spi_bitbang_setup(struct spi_device *spi) 
	if (!cs->txrx_word)

		return -EINVAL;



	retval = bitbang->setup_transfer(spi, NULL);

	if (bitbang->setup_transfer) {

		int retval = bitbang->setup_transfer(spi, NULL);

		if (retval < 0)

			return retval;

	}



	dev_dbg(&spi->dev, "%s, %u nsec/bit\n", __func__, 2 * cs->nsecs);
@@ -295,9 +296,11 @@ static int spi_bitbang_transfer_one(struct spi_master *master, 


		/* init (-1) or override (1) transfer params */

		if (do_setup != 0) {

			if (bitbang->setup_transfer) {

				status = bitbang->setup_transfer(spi, t);

				if (status < 0)

					break;

			}

			if (do_setup == -1)

				do_setup = 0;

		}

drivers/spi/spi-fsl-cpm.c

+23 −17
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/of_address.h>

#include <linux/spi/spi.h>

#include <linux/types.h>

#include <linux/platform_device.h>



#include "spi-fsl-cpm.h"

#include "spi-fsl-lib.h"
@@ -269,17 +270,6 @@ static unsigned long fsl_spi_cpm_get_pram(struct mpc8xxx_spi *mspi) 
	if (mspi->flags & SPI_CPM2) {

		pram_ofs = cpm_muram_alloc(SPI_PRAM_SIZE, 64);

		out_be16(spi_base, pram_ofs);

	} else {

		struct spi_pram __iomem *pram = spi_base;

		u16 rpbase = in_be16(&pram->rpbase);



		/* Microcode relocation patch applied? */

		if (rpbase) {

			pram_ofs = rpbase;

		} else {

			pram_ofs = cpm_muram_alloc(SPI_PRAM_SIZE, 64);

			out_be16(spi_base, pram_ofs);

		}

	}



	iounmap(spi_base);
@@ -292,7 +282,6 @@ int fsl_spi_cpm_init(struct mpc8xxx_spi *mspi) 
	struct device_node *np = dev->of_node;

	const u32 *iprop;

	int size;

	unsigned long pram_ofs;

	unsigned long bds_ofs;



	if (!(mspi->flags & SPI_CPM_MODE))
@@ -319,8 +308,26 @@ int fsl_spi_cpm_init(struct mpc8xxx_spi *mspi) 
		}

	}



	pram_ofs = fsl_spi_cpm_get_pram(mspi);

	if (IS_ERR_VALUE(pram_ofs)) {

	if (mspi->flags & SPI_CPM1) {

		struct resource *res;

		void *pram;



		res = platform_get_resource(to_platform_device(dev),

					    IORESOURCE_MEM, 1);

		pram = devm_ioremap_resource(dev, res);

		if (IS_ERR(pram))

			mspi->pram = NULL;

		else

			mspi->pram = pram;

	} else {

		unsigned long pram_ofs = fsl_spi_cpm_get_pram(mspi);



		if (IS_ERR_VALUE(pram_ofs))

			mspi->pram = NULL;

		else

			mspi->pram = cpm_muram_addr(pram_ofs);

	}

	if (mspi->pram == NULL) {

		dev_err(dev, "can't allocate spi parameter ram\n");

		goto err_pram;

	}
@@ -346,8 +353,6 @@ int fsl_spi_cpm_init(struct mpc8xxx_spi *mspi) 
		goto err_dummy_rx;

	}



	mspi->pram = cpm_muram_addr(pram_ofs);



	mspi->tx_bd = cpm_muram_addr(bds_ofs);

	mspi->rx_bd = cpm_muram_addr(bds_ofs + sizeof(*mspi->tx_bd));
@@ -375,7 +380,8 @@ err_dummy_rx: 
err_dummy_tx:

	cpm_muram_free(bds_ofs);

err_bds:

	cpm_muram_free(pram_ofs);

	if (!(mspi->flags & SPI_CPM1))

		cpm_muram_free(cpm_muram_offset(mspi->pram));

err_pram:

	fsl_spi_free_dummy_rx();

	return -ENOMEM;

drivers/spi/spi-fsl-espi.c

+31 −14
Original line number Diff line number Diff line
@@ -359,14 +359,16 @@ static void fsl_espi_rw_trans(struct spi_message *m, 
				struct fsl_espi_transfer *trans, u8 *rx_buff)

{

	struct fsl_espi_transfer *espi_trans = trans;

	unsigned int n_tx = espi_trans->n_tx;

	unsigned int n_rx = espi_trans->n_rx;

	unsigned int total_len = espi_trans->len;

	struct spi_transfer *t;

	u8 *local_buf;

	u8 *rx_buf = rx_buff;

	unsigned int trans_len;

	unsigned int addr;

	int i, pos, loop;

	unsigned int tx_only;

	unsigned int rx_pos = 0;

	unsigned int pos;

	int i, loop;



	local_buf = kzalloc(SPCOM_TRANLEN_MAX, GFP_KERNEL);

	if (!local_buf) {
@@ -374,36 +376,48 @@ static void fsl_espi_rw_trans(struct spi_message *m, 
		return;

	}



	for (pos = 0, loop = 0; pos < n_rx; pos += trans_len, loop++) {

		trans_len = n_rx - pos;

		if (trans_len > SPCOM_TRANLEN_MAX - n_tx)

			trans_len = SPCOM_TRANLEN_MAX - n_tx;

	for (pos = 0, loop = 0; pos < total_len; pos += trans_len, loop++) {

		trans_len = total_len - pos;



		i = 0;

		tx_only = 0;

		list_for_each_entry(t, &m->transfers, transfer_list) {

			if (t->tx_buf) {

				memcpy(local_buf + i, t->tx_buf, t->len);

				i += t->len;

				if (!t->rx_buf)

					tx_only += t->len;

			}

		}



		/* Add additional TX bytes to compensate SPCOM_TRANLEN_MAX */

		if (loop > 0)

			trans_len += tx_only;



		if (trans_len > SPCOM_TRANLEN_MAX)

			trans_len = SPCOM_TRANLEN_MAX;



		/* Update device offset */

		if (pos > 0) {

			addr = fsl_espi_cmd2addr(local_buf);

			addr += pos;

			addr += rx_pos;

			fsl_espi_addr2cmd(addr, local_buf);

		}



		espi_trans->n_tx = n_tx;

		espi_trans->n_rx = trans_len;

		espi_trans->len = trans_len + n_tx;

		espi_trans->len = trans_len;

		espi_trans->tx_buf = local_buf;

		espi_trans->rx_buf = local_buf;

		fsl_espi_do_trans(m, espi_trans);



		memcpy(rx_buf + pos, espi_trans->rx_buf + n_tx, trans_len);

		/* If there is at least one RX byte then copy it to rx_buf */

		if (tx_only < SPCOM_TRANLEN_MAX)

			memcpy(rx_buf + rx_pos, espi_trans->rx_buf + tx_only,

					trans_len - tx_only);



		rx_pos += trans_len - tx_only;



		if (loop > 0)

			espi_trans->actual_length += espi_trans->len - n_tx;

			espi_trans->actual_length += espi_trans->len - tx_only;

		else

			espi_trans->actual_length += espi_trans->len;

	}
@@ -418,6 +432,7 @@ static int fsl_espi_do_one_msg(struct spi_master *master, 
	u8 *rx_buf = NULL;

	unsigned int n_tx = 0;

	unsigned int n_rx = 0;

	unsigned int xfer_len = 0;

	struct fsl_espi_transfer espi_trans;



	list_for_each_entry(t, &m->transfers, transfer_list) {
@@ -427,11 +442,13 @@ static int fsl_espi_do_one_msg(struct spi_master *master, 
			n_rx += t->len;

			rx_buf = t->rx_buf;

		}

		if ((t->tx_buf) || (t->rx_buf))

			xfer_len += t->len;

	}



	espi_trans.n_tx = n_tx;

	espi_trans.n_rx = n_rx;

	espi_trans.len = n_tx + n_rx;

	espi_trans.len = xfer_len;

	espi_trans.actual_length = 0;

	espi_trans.status = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE