Unverified Commit 9b163e0d authored by David Lechner's avatar David Lechner Committed by Mark Brown
Browse files

spi: remove struct spi_message::is_dma_mapped 



There are no more users of the deprecated is_dma_mapped in struct
spi_message so it can be removed.

References in documentation and comments are also removed.

A few similar checks if xfer->tx_dma or xfer->rx_dma are not NULL are
also removed since these are now guaranteed to be NULL because they
were previously set only if is_dma_mapped was true.

Signed-off-by: default avatarDavid Lechner <dlechner@baylibre.com>
Link: https://msgid.link/r/20240325-spi-remove-is_dma_mapped-v2-1-d08d62b61f1c@baylibre.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6defadbe

Documentation/spi/pxa2xx.rst

+0 −3
Original line number Diff line number Diff line
@@ -194,9 +194,6 @@ The following logic is used to determine the type of I/O to be used on 
a per "spi_transfer" basis::



  if spi_message.len > 65536 then

	if spi_message.is_dma_mapped or rx_dma_buf != 0 or tx_dma_buf != 0 then

		reject premapped transfers



	print "rate limited" warning

	use PIO transfers

Documentation/spi/spi-summary.rst

+0 −4
Original line number Diff line number Diff line
@@ -419,10 +419,6 @@ any more such messages. 
    to make extra copies unless the hardware requires it (e.g. working

    around hardware errata that force the use of bounce buffering).



    If standard dma_map_single() handling of these buffers is inappropriate,

    you can use spi_message.is_dma_mapped to tell the controller driver

    that you've already provided the relevant DMA addresses.



  - The basic I/O primitive is spi_async().  Async requests may be

    issued in any context (irq handler, task, etc) and completion

    is reported using a callback provided with the message.

drivers/spi/spi-atmel.c

+2 −6
Original line number Diff line number Diff line
@@ -987,8 +987,6 @@ static void atmel_spi_pdc_next_xfer(struct spi_controller *host, 
 * For DMA, tx_buf/tx_dma have the same relationship as rx_buf/rx_dma:

 *  - The buffer is either valid for CPU access, else NULL

 *  - If the buffer is valid, so is its DMA address

 *

 * This driver manages the dma address unless message->is_dma_mapped.

 */

static int

atmel_spi_dma_map_xfer(struct atmel_spi *as, struct spi_transfer *xfer)
@@ -1374,8 +1372,7 @@ static int atmel_spi_one_transfer(struct spi_controller *host, 
	 * DMA map early, for performance (empties dcache ASAP) and

	 * better fault reporting.

	 */

	if ((!host->cur_msg->is_dma_mapped)

		&& as->use_pdc) {

	if (as->use_pdc) {

		if (atmel_spi_dma_map_xfer(as, xfer) < 0)

			return -ENOMEM;

	}
@@ -1454,8 +1451,7 @@ static int atmel_spi_one_transfer(struct spi_controller *host, 
		}

	}



	if (!host->cur_msg->is_dma_mapped

		&& as->use_pdc)

	if (as->use_pdc)

		atmel_spi_dma_unmap_xfer(host, xfer);



	if (as->use_pdc)

drivers/spi/spi-pxa2xx.c

+0 −11
Original line number Diff line number Diff line
@@ -944,7 +944,6 @@ static int pxa2xx_spi_transfer_one(struct spi_controller *controller, 
				   struct spi_transfer *transfer)

{

	struct driver_data *drv_data = spi_controller_get_devdata(controller);

	struct spi_message *message = controller->cur_msg;

	struct chip_data *chip = spi_get_ctldata(spi);

	u32 dma_thresh = chip->dma_threshold;

	u32 dma_burst = chip->dma_burst_size;
@@ -959,16 +958,6 @@ static int pxa2xx_spi_transfer_one(struct spi_controller *controller, 


	/* Check if we can DMA this transfer */

	if (transfer->len > MAX_DMA_LEN && chip->enable_dma) {



		/* Reject already-mapped transfers; PIO won't always work */

		if (message->is_dma_mapped

				|| transfer->rx_dma || transfer->tx_dma) {

			dev_err(&spi->dev,

				"Mapped transfer length of %u is greater than %d\n",

				transfer->len, MAX_DMA_LEN);

			return -EINVAL;

		}



		/* Warn ... we force this to PIO mode */

		dev_warn_ratelimited(&spi->dev,

				     "DMA disabled for transfer length %u greater than %d\n",

drivers/spi/spi.c

+0 −7
Original line number Diff line number Diff line
@@ -3709,9 +3709,6 @@ static int __spi_split_transfer_maxsize(struct spi_controller *ctlr, 
	 * to the same values as *xferp, so tx_buf, rx_buf and len

	 * are all identical (as well as most others)

	 * so we just have to fix up len and the pointers.

	 *

	 * This also includes support for the depreciated

	 * spi_message.is_dma_mapped interface.

	 */



	/*
@@ -3725,12 +3722,8 @@ static int __spi_split_transfer_maxsize(struct spi_controller *ctlr, 
		/* Update rx_buf, tx_buf and DMA */

		if (xfers[i].rx_buf)

			xfers[i].rx_buf += offset;

		if (xfers[i].rx_dma)

			xfers[i].rx_dma += offset;

		if (xfers[i].tx_buf)

			xfers[i].tx_buf += offset;

		if (xfers[i].tx_dma)

			xfers[i].tx_dma += offset;



		/* Update length */

		xfers[i].len = min(maxsize, xfers[i].len - offset);