| Message ID | 1400016884-9568-3-git-send-email-agross@codeaurora.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8f391222c06c27e072e306e7eefd41d39b68ec46 |
| Headers | show |
On Tue, May 13, 2014 at 04:34:42PM -0500, Andy Gross wrote: > This patch fixes the calculation for determining whether to use FIFO or BLOCK > mode. Applied, thanks.
On Tue, 2014-05-13 at 16:34 -0500, Andy Gross wrote: > This patch fixes the calculation for determining whether to use FIFO or BLOCK > mode. <snip> > @@ -368,7 +368,7 @@ static int spi_qup_io_config(struct spi_device *spi, struct spi_transfer *xfer) > n_words = xfer->len / w_size; > controller->w_size = w_size; > > - if (n_words <= controller->in_fifo_sz) { > + if (n_words <= (controller->in_fifo_sz / sizeof(u32))) { Wouldn't be better to divide by w_size? Probably will not make too much difference, but.. > mode = QUP_IO_M_MODE_FIFO; Regards, Ivan -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index ea7017b..57b65e9 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -289,7 +289,7 @@ static irqreturn_t spi_qup_qup_irq(int irq, void *dev_id) writel_relaxed(opflags, controller->base + QUP_OPERATIONAL); if (!xfer) { - dev_err_ratelimited(controller->dev, "unexpected irq %x08 %x08 %x08\n", + dev_err_ratelimited(controller->dev, "unexpected irq %08x %08x %08x\n", qup_err, spi_err, opflags); return IRQ_HANDLED; } @@ -368,7 +368,7 @@ static int spi_qup_io_config(struct spi_device *spi, struct spi_transfer *xfer) n_words = xfer->len / w_size; controller->w_size = w_size; - if (n_words <= controller->in_fifo_sz) { + if (n_words <= (controller->in_fifo_sz / sizeof(u32))) { mode = QUP_IO_M_MODE_FIFO; writel_relaxed(n_words, controller->base + QUP_MX_READ_CNT); writel_relaxed(n_words, controller->base + QUP_MX_WRITE_CNT);
This patch fixes the calculation for determining whether to use FIFO or BLOCK mode. Signed-off-by: Andy Gross <agross@codeaurora.org> --- drivers/spi/spi-qup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)