* [PATCH] mxs: spi: clear XFER_LEN in CTRL0 register during DMA
@ 2012-12-26 5:01 Juha Lumme
[not found] ` <1356498088-31176-1-git-send-email-juha.lumme-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
0 siblings, 1 reply; 2+ messages in thread
From: Juha Lumme @ 2012-12-26 5:01 UTC (permalink / raw)
To: spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
Cc: Marek Vasut, Fabio Estevam, Juha Lumme,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
On MX23 the XFER_LEN part in CTRL0 register was improperly OR'd, and because
of that too many characters were being expected from SPI.
This caused a timeout (SSP_TIMEOUT) to happen in the last package in the DMA
chain, and resulted into a corrupted read.
This is a workaround for the problem, by clearing the XFER_LEN bytes always
before reading the new size for XFER_LEN.
Cc: Marek Vasut <marex-ynQEQJNshbs@public.gmane.org>
Cc: Fabio Estevam <fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
Cc: Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org
Signed-off-by: Juha Lumme <juha.lumme-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
drivers/spi/spi-mxs.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index 86dd04d..265c33f 100644
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -241,6 +241,7 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi, int cs,
INIT_COMPLETION(spi->c);
ctrl0 = readl(ssp->base + HW_SSP_CTRL0);
+ ctrl0 &= ~BM_SSP_CTRL0_XFER_COUNT;
ctrl0 |= BM_SSP_CTRL0_DATA_XFER | mxs_spi_cs_to_reg(cs);
if (*first)
@@ -256,8 +257,10 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi, int cs,
if ((sg_count + 1 == sgs) && *last)
ctrl0 |= BM_SSP_CTRL0_IGNORE_CRC;
- if (ssp->devid == IMX23_SSP)
+ if (ssp->devid == IMX23_SSP) {
+ ctrl0 &= ~BM_SSP_CTRL0_XFER_COUNT;
ctrl0 |= min;
+ }
dma_xfer[sg_count].pio[0] = ctrl0;
dma_xfer[sg_count].pio[3] = min;
--
1.7.10.4
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mxs: spi: clear XFER_LEN in CTRL0 register during DMA
[not found] ` <1356498088-31176-1-git-send-email-juha.lumme-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2012-12-26 5:06 ` Marek Vasut
0 siblings, 0 replies; 2+ messages in thread
From: Marek Vasut @ 2012-12-26 5:06 UTC (permalink / raw)
To: Juha Lumme
Cc: Fabio Estevam,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
Dear Juha Lumme,
> On MX23 the XFER_LEN
XFER_COUNT ;-)
> part in CTRL0 register was improperly OR'd
... during construction of DMA descriptor chain. Instead of being freshly set.
> , and
> because of that too many characters
Bytes
> were being expected from SPI.
expected from SPI during the last DMA cycle.
> This caused a timeout (SSP_TIMEOUT) to happen in the last package
... during the processing of the last DMA descriptor ...
> in the
> DMA chain, and resulted into a corrupted read.
Write too, really ;-)
> This is a workaround for the problem
This is actually a correct fix for the issue.
> , by clearing the XFER_LEN bytes always
> before reading the new size for XFER_LEN.
before setting new XFER_COUNT into the ctrl0 field of DMA control transfer.
> Cc: Marek Vasut <marex-ynQEQJNshbs@public.gmane.org>
> Cc: Fabio Estevam <fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
> Cc: Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org
> Signed-off-by: Juha Lumme <juha.lumme-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
All but the commit message,
Acked-by: Marek Vasut <marex-ynQEQJNshbs@public.gmane.org>
> ---
> drivers/spi/spi-mxs.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
> index 86dd04d..265c33f 100644
> --- a/drivers/spi/spi-mxs.c
> +++ b/drivers/spi/spi-mxs.c
> @@ -241,6 +241,7 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi, int
> cs, INIT_COMPLETION(spi->c);
>
> ctrl0 = readl(ssp->base + HW_SSP_CTRL0);
> + ctrl0 &= ~BM_SSP_CTRL0_XFER_COUNT;
> ctrl0 |= BM_SSP_CTRL0_DATA_XFER | mxs_spi_cs_to_reg(cs);
>
> if (*first)
> @@ -256,8 +257,10 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi, int
> cs, if ((sg_count + 1 == sgs) && *last)
> ctrl0 |= BM_SSP_CTRL0_IGNORE_CRC;
>
> - if (ssp->devid == IMX23_SSP)
> + if (ssp->devid == IMX23_SSP) {
> + ctrl0 &= ~BM_SSP_CTRL0_XFER_COUNT;
> ctrl0 |= min;
> + }
>
> dma_xfer[sg_count].pio[0] = ctrl0;
> dma_xfer[sg_count].pio[3] = min;
Best regards,
Marek Vasut
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-12-26 5:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-12-26 5:01 [PATCH] mxs: spi: clear XFER_LEN in CTRL0 register during DMA Juha Lumme
[not found] ` <1356498088-31176-1-git-send-email-juha.lumme-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-12-26 5:06 ` Marek Vasut
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).