Unverified Commit 828b4809 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "spi: spi-zynqmp-gpspi: fix some issues" from quanyang.wang@windriver.com 

Quanyang Wang <quanyang.wang@windriver.com>:

From: Quanyang Wang <quanyang.wang@windriver.com>

Hello,

This series fix some issues that occurs when the gqspi driver switches to spi-mem framework.

Hi Amit,
I rewrite the "Subject" and "commit message" of these patches, so they
look different from the ones which you reviewed before. I still keep
your "Reviewed-by" and hope you will not mind.

Regards,
Quanyang Wang

Quanyang Wang (4):
  spi: spi-zynqmp-gqspi: use wait_for_completion_timeout to make
    zynqmp_qspi_exec_op not interruptible
  spi: spi-zynqmp-gqspi: add mutex locking for exec_op
  spi: spi-zynqmp-gqspi: transmit dummy circles by using the
    controller's internal functionality
  spi: spi-zynqmp-gqspi: fix incorrect operating mode in
    zynqmp_qspi_read_op

 drivers/spi/spi-zynqmp-gqspi.c | 53 +++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 26 deletions(-)

--
2.25.1

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
parents 30700a05 41d31093

drivers/spi/spi-zynqmp-gqspi.c

+27 −26
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ struct zynqmp_qspi { 
	u32 genfifoentry;

	enum mode_type mode;

	struct completion data_completion;

	struct mutex op_lock;

};



/**
@@ -520,7 +521,7 @@ static void zynqmp_qspi_filltxfifo(struct zynqmp_qspi *xqspi, int size) 
{

	u32 count = 0, intermediate;



	while ((xqspi->bytes_to_transfer > 0) && (count < size)) {

	while ((xqspi->bytes_to_transfer > 0) && (count < size) && (xqspi->txbuf)) {

		memcpy(&intermediate, xqspi->txbuf, 4);

		zynqmp_gqspi_write(xqspi, GQSPI_TXD_OFST, intermediate);
@@ -579,7 +580,7 @@ static void zynqmp_qspi_fillgenfifo(struct zynqmp_qspi *xqspi, u8 nbits, 
		genfifoentry |= GQSPI_GENFIFO_DATA_XFER;

		genfifoentry |= GQSPI_GENFIFO_TX;

		transfer_len = xqspi->bytes_to_transfer;

	} else {

	} else if (xqspi->rxbuf) {

		genfifoentry &= ~GQSPI_GENFIFO_TX;

		genfifoentry |= GQSPI_GENFIFO_DATA_XFER;

		genfifoentry |= GQSPI_GENFIFO_RX;
@@ -587,6 +588,11 @@ static void zynqmp_qspi_fillgenfifo(struct zynqmp_qspi *xqspi, u8 nbits, 
			transfer_len = xqspi->dma_rx_bytes;

		else

			transfer_len = xqspi->bytes_to_receive;

	} else {

		/* Sending dummy circles here */

		genfifoentry &= ~(GQSPI_GENFIFO_TX | GQSPI_GENFIFO_RX);

		genfifoentry |= GQSPI_GENFIFO_DATA_XFER;

		transfer_len = xqspi->bytes_to_transfer;

	}

	genfifoentry |= zynqmp_qspi_selectspimode(xqspi, nbits);

	xqspi->genfifoentry = genfifoentry;
@@ -821,8 +827,8 @@ static void zynqmp_qspi_write_op(struct zynqmp_qspi *xqspi, u8 tx_nbits, 
static void zynqmp_qspi_read_op(struct zynqmp_qspi *xqspi, u8 rx_nbits,

				u32 genfifoentry)

{

	zynqmp_qspi_fillgenfifo(xqspi, rx_nbits, genfifoentry);

	zynqmp_qspi_setuprxdma(xqspi);

	zynqmp_qspi_fillgenfifo(xqspi, rx_nbits, genfifoentry);

}



/**
@@ -951,6 +957,7 @@ static int zynqmp_qspi_exec_op(struct spi_mem *mem, 
		op->cmd.opcode, op->cmd.buswidth, op->addr.buswidth,

		op->dummy.buswidth, op->data.buswidth);



	mutex_lock(&xqspi->op_lock);

	zynqmp_qspi_config_op(xqspi, mem->spi);

	zynqmp_qspi_chipselect(mem->spi, false);

	genfifoentry |= xqspi->genfifocs;
@@ -973,7 +980,7 @@ static int zynqmp_qspi_exec_op(struct spi_mem *mem, 
		zynqmp_gqspi_write(xqspi, GQSPI_IER_OFST,

				   GQSPI_IER_GENFIFOEMPTY_MASK |

				   GQSPI_IER_TXNOT_FULL_MASK);

		if (!wait_for_completion_interruptible_timeout

		if (!wait_for_completion_timeout

		    (&xqspi->data_completion, msecs_to_jiffies(1000))) {

			err = -ETIMEDOUT;

			kfree(tmpbuf);
@@ -1001,7 +1008,7 @@ static int zynqmp_qspi_exec_op(struct spi_mem *mem, 
				   GQSPI_IER_TXEMPTY_MASK |

				   GQSPI_IER_GENFIFOEMPTY_MASK |

				   GQSPI_IER_TXNOT_FULL_MASK);

		if (!wait_for_completion_interruptible_timeout

		if (!wait_for_completion_timeout

		    (&xqspi->data_completion, msecs_to_jiffies(1000))) {

			err = -ETIMEDOUT;

			goto return_err;
@@ -1009,32 +1016,23 @@ static int zynqmp_qspi_exec_op(struct spi_mem *mem, 
	}



	if (op->dummy.nbytes) {

		tmpbuf = kzalloc(op->dummy.nbytes, GFP_KERNEL | GFP_DMA);

		if (!tmpbuf)

			return -ENOMEM;

		memset(tmpbuf, 0xff, op->dummy.nbytes);

		reinit_completion(&xqspi->data_completion);

		xqspi->txbuf = tmpbuf;

		xqspi->txbuf = NULL;

		xqspi->rxbuf = NULL;

		xqspi->bytes_to_transfer = op->dummy.nbytes;

		/*

		 * xqspi->bytes_to_transfer here represents the dummy circles

		 * which need to be sent.

		 */

		xqspi->bytes_to_transfer = op->dummy.nbytes * 8 / op->dummy.buswidth;

		xqspi->bytes_to_receive = 0;

		zynqmp_qspi_write_op(xqspi, op->dummy.buswidth,

		/*

		 * Using op->data.buswidth instead of op->dummy.buswidth here because

		 * we need to use it to configure the correct SPI mode.

		 */

		zynqmp_qspi_write_op(xqspi, op->data.buswidth,

				     genfifoentry);

		zynqmp_gqspi_write(xqspi, GQSPI_CONFIG_OFST,

				   zynqmp_gqspi_read(xqspi, GQSPI_CONFIG_OFST) |

				   GQSPI_CFG_START_GEN_FIFO_MASK);

		zynqmp_gqspi_write(xqspi, GQSPI_IER_OFST,

				   GQSPI_IER_TXEMPTY_MASK |

				   GQSPI_IER_GENFIFOEMPTY_MASK |

				   GQSPI_IER_TXNOT_FULL_MASK);

		if (!wait_for_completion_interruptible_timeout

		    (&xqspi->data_completion, msecs_to_jiffies(1000))) {

			err = -ETIMEDOUT;

			kfree(tmpbuf);

			goto return_err;

		}



		kfree(tmpbuf);

	}



	if (op->data.nbytes) {
@@ -1076,7 +1074,7 @@ static int zynqmp_qspi_exec_op(struct spi_mem *mem, 
						   GQSPI_IER_RXEMPTY_MASK);

			}

		}

		if (!wait_for_completion_interruptible_timeout

		if (!wait_for_completion_timeout

		    (&xqspi->data_completion, msecs_to_jiffies(1000)))

			err = -ETIMEDOUT;

	}
@@ -1084,6 +1082,7 @@ static int zynqmp_qspi_exec_op(struct spi_mem *mem, 
return_err:



	zynqmp_qspi_chipselect(mem->spi, true);

	mutex_unlock(&xqspi->op_lock);



	return err;

}
@@ -1156,6 +1155,8 @@ static int zynqmp_qspi_probe(struct platform_device *pdev) 
		goto clk_dis_pclk;

	}



	mutex_init(&xqspi->op_lock);



	pm_runtime_use_autosuspend(&pdev->dev);

	pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT);

	pm_runtime_set_active(&pdev->dev);