Unverified Commit c314360c authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "Some small spi geni cleanups" from Stephen Boyd <swboyd@chromium.org>: 

To follow onto Doug's latest spi geni series[1] this simplifies and
reduces the code a little more.

[1] https://lore.kernel.org/r/20200618150626.237027-1-dianders@chromium.org

Stephen Boyd (2):
  spi: spi-geni-qcom: Simplify setup_fifo_xfer()
  spi: spi-geni-qcom: Don't set {tx,rx}_rem_bytes unnecessarily

 drivers/spi/spi-geni-qcom.c | 55 +++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 30 deletions(-)

base-commit: 7ba9bdcb
--
Sent by a computer, using git, on the internet
parents 0d574c6b 59ab0fa0

drivers/spi/spi-geni-qcom.c

+21 −21
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ static void handle_fifo_timeout(struct spi_master *spi, 
	reinit_completion(&mas->cancel_done);

	writel(0, se->base + SE_GENI_TX_WATERMARK_REG);

	mas->cur_xfer = NULL;

	mas->tx_rem_bytes = mas->rx_rem_bytes = 0;

	geni_se_cancel_m_cmd(se);

	spin_unlock_irq(&mas->lock);
@@ -513,19 +512,17 @@ static irqreturn_t geni_spi_isr(int irq, void *data) 
		if (mas->cur_xfer) {

			spi_finalize_current_transfer(spi);

			mas->cur_xfer = NULL;

		} else {

			complete(&mas->cs_done);

		}



			/*

		 * If this happens, then a CMD_DONE came before all the Tx

		 * buffer bytes were sent out. This is unusual, log this

		 * condition and disable the WM interrupt to prevent the

		 * system from stalling due an interrupt storm.

		 * If this happens when all Rx bytes haven't been received, log

		 * the condition.

		 * The only known time this can happen is if bits_per_word != 8

		 * and some registers that expect xfer lengths in num spi_words

			 * If this happens, then a CMD_DONE came before all the

			 * Tx buffer bytes were sent out. This is unusual, log

			 * this condition and disable the WM interrupt to

			 * prevent the system from stalling due an interrupt

			 * storm.

			 *

			 * If this happens when all Rx bytes haven't been

			 * received, log the condition. The only known time

			 * this can happen is if bits_per_word != 8 and some

			 * registers that expect xfer lengths in num spi_words

			 * weren't written correctly.

			 */

			if (mas->tx_rem_bytes) {
@@ -536,6 +533,9 @@ static irqreturn_t geni_spi_isr(int irq, void *data) 
			if (mas->rx_rem_bytes)

				dev_err(mas->dev, "Premature done. rx_rem = %d bpw%d\n",

					mas->rx_rem_bytes, mas->cur_bits_per_word);

		} else {

			complete(&mas->cs_done);

		}

	}



	if (m_irq & M_CMD_CANCEL_EN)

CRA Git | Maintained and supported by SUSTech CRA and CCSE