From: Miquel Raynal <miquel.raynal@bootlin.com> To: Richard Weinberger <richard@nod.at>, Vignesh Raghavendra <vigneshr@ti.com>, Tudor Ambarus <Tudor.Ambarus@microchip.com>, Pratyush Yadav <p.yadav@ti.com>, Michael Walle <michael@walle.cc>, <linux-mtd@lists.infradead.org>, Mark Brown <broonie@kernel.org>, <linux-spi@vger.kernel.org> Cc: Julien Su <juliensu@mxic.com.tw>, Jaime Liao <jaimeliao@mxic.com.tw>, Thomas Petazzoni <thomas.petazzoni@bootlin.com>, Boris Brezillon <boris.brezillon@collabora.com>, Xiangsheng Hou <xiangsheng.hou@mediatek.com>, Miquel Raynal <miquel.raynal@bootlin.com>, stable@vger.kernel.org, Mason Yang <masonccyang@mxic.com.tw>, Zhengxun Li <zhengxunli@mxic.com.tw> Subject: [PATCH v9 09/13] spi: mxic: Fix the transmit path Date: Tue, 4 Jan 2022 09:36:27 +0100 [thread overview] Message-ID: <20220104083631.40776-10-miquel.raynal@bootlin.com> (raw) In-Reply-To: <20220104083631.40776-1-miquel.raynal@bootlin.com> By working with external hardware ECC engines, we figured out that Under certain circumstances, it is needed for the SPI controller to check INT_TX_EMPTY and INT_RX_NOT_EMPTY in both receive and transmit path (not only in the receive path). The delay penalty being negligible, move this code in the common path. Fixes: b942d80b0a39 ("spi: Add MXIC controller driver") Cc: stable@vger.kernel.org Suggested-by: Mason Yang <masonccyang@mxic.com.tw> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Reviewed-by: Zhengxun Li <zhengxunli@mxic.com.tw> Reviewed-by: Mark Brown <broonie@kernel.org> --- drivers/spi/spi-mxic.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/drivers/spi/spi-mxic.c b/drivers/spi/spi-mxic.c index 6bec0a7c77d3..22a82f5f74b5 100644 --- a/drivers/spi/spi-mxic.c +++ b/drivers/spi/spi-mxic.c @@ -304,25 +304,21 @@ static int mxic_spi_data_xfer(struct mxic_spi *mxic, const void *txbuf, writel(data, mxic->regs + TXD(nbytes % 4)); + ret = readl_poll_timeout(mxic->regs + INT_STS, sts, + sts & INT_TX_EMPTY, 0, USEC_PER_SEC); + if (ret) + return ret; + + ret = readl_poll_timeout(mxic->regs + INT_STS, sts, + sts & INT_RX_NOT_EMPTY, 0, + USEC_PER_SEC); + if (ret) + return ret; + + data = readl(mxic->regs + RXD); if (rxbuf) { - ret = readl_poll_timeout(mxic->regs + INT_STS, sts, - sts & INT_TX_EMPTY, 0, - USEC_PER_SEC); - if (ret) - return ret; - - ret = readl_poll_timeout(mxic->regs + INT_STS, sts, - sts & INT_RX_NOT_EMPTY, 0, - USEC_PER_SEC); - if (ret) - return ret; - - data = readl(mxic->regs + RXD); data >>= (8 * (4 - nbytes)); memcpy(rxbuf + pos, &data, nbytes); - WARN_ON(readl(mxic->regs + INT_STS) & INT_RX_NOT_EMPTY); - } else { - readl(mxic->regs + RXD); } WARN_ON(readl(mxic->regs + INT_STS) & INT_RX_NOT_EMPTY); -- 2.27.0
WARNING: multiple messages have this Message-ID (diff)
From: Miquel Raynal <miquel.raynal@bootlin.com> To: Richard Weinberger <richard@nod.at>, Vignesh Raghavendra <vigneshr@ti.com>, Tudor Ambarus <Tudor.Ambarus@microchip.com>, Pratyush Yadav <p.yadav@ti.com>, Michael Walle <michael@walle.cc>, <linux-mtd@lists.infradead.org>, Mark Brown <broonie@kernel.org>, <linux-spi@vger.kernel.org> Cc: Julien Su <juliensu@mxic.com.tw>, Jaime Liao <jaimeliao@mxic.com.tw>, Thomas Petazzoni <thomas.petazzoni@bootlin.com>, Boris Brezillon <boris.brezillon@collabora.com>, Xiangsheng Hou <xiangsheng.hou@mediatek.com>, Miquel Raynal <miquel.raynal@bootlin.com>, stable@vger.kernel.org, Mason Yang <masonccyang@mxic.com.tw>, Zhengxun Li <zhengxunli@mxic.com.tw> Subject: [PATCH v9 09/13] spi: mxic: Fix the transmit path Date: Tue, 4 Jan 2022 09:36:27 +0100 [thread overview] Message-ID: <20220104083631.40776-10-miquel.raynal@bootlin.com> (raw) In-Reply-To: <20220104083631.40776-1-miquel.raynal@bootlin.com> By working with external hardware ECC engines, we figured out that Under certain circumstances, it is needed for the SPI controller to check INT_TX_EMPTY and INT_RX_NOT_EMPTY in both receive and transmit path (not only in the receive path). The delay penalty being negligible, move this code in the common path. Fixes: b942d80b0a39 ("spi: Add MXIC controller driver") Cc: stable@vger.kernel.org Suggested-by: Mason Yang <masonccyang@mxic.com.tw> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Reviewed-by: Zhengxun Li <zhengxunli@mxic.com.tw> Reviewed-by: Mark Brown <broonie@kernel.org> --- drivers/spi/spi-mxic.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/drivers/spi/spi-mxic.c b/drivers/spi/spi-mxic.c index 6bec0a7c77d3..22a82f5f74b5 100644 --- a/drivers/spi/spi-mxic.c +++ b/drivers/spi/spi-mxic.c @@ -304,25 +304,21 @@ static int mxic_spi_data_xfer(struct mxic_spi *mxic, const void *txbuf, writel(data, mxic->regs + TXD(nbytes % 4)); + ret = readl_poll_timeout(mxic->regs + INT_STS, sts, + sts & INT_TX_EMPTY, 0, USEC_PER_SEC); + if (ret) + return ret; + + ret = readl_poll_timeout(mxic->regs + INT_STS, sts, + sts & INT_RX_NOT_EMPTY, 0, + USEC_PER_SEC); + if (ret) + return ret; + + data = readl(mxic->regs + RXD); if (rxbuf) { - ret = readl_poll_timeout(mxic->regs + INT_STS, sts, - sts & INT_TX_EMPTY, 0, - USEC_PER_SEC); - if (ret) - return ret; - - ret = readl_poll_timeout(mxic->regs + INT_STS, sts, - sts & INT_RX_NOT_EMPTY, 0, - USEC_PER_SEC); - if (ret) - return ret; - - data = readl(mxic->regs + RXD); data >>= (8 * (4 - nbytes)); memcpy(rxbuf + pos, &data, nbytes); - WARN_ON(readl(mxic->regs + INT_STS) & INT_RX_NOT_EMPTY); - } else { - readl(mxic->regs + RXD); } WARN_ON(readl(mxic->regs + INT_STS) & INT_RX_NOT_EMPTY); -- 2.27.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2022-01-04 8:36 UTC|newest] Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-04 8:36 [PATCH v9 00/13] External ECC engines & Macronix support Miquel Raynal 2022-01-04 8:36 ` Miquel Raynal 2022-01-04 8:36 ` [PATCH v9 01/13] spi: spi-mem: Introduce a capability structure Miquel Raynal 2022-01-04 8:36 ` Miquel Raynal 2022-01-05 5:52 ` Pratyush Yadav 2022-01-05 5:52 ` Pratyush Yadav 2022-01-26 10:53 ` Miquel Raynal 2022-01-26 10:53 ` Miquel Raynal 2022-01-26 16:35 ` Mark Brown 2022-01-26 16:35 ` Mark Brown 2022-01-26 17:36 ` Miquel Raynal 2022-01-26 17:36 ` Miquel Raynal 2022-01-26 17:41 ` Mark Brown 2022-01-26 17:41 ` Mark Brown 2022-01-27 9:20 ` Miquel Raynal 2022-01-27 9:20 ` Miquel Raynal 2022-01-27 9:37 ` Miquel Raynal 2022-01-27 9:37 ` Miquel Raynal 2022-01-04 8:36 ` [PATCH v9 02/13] spi: spi-mem: Check the controller extra capabilities Miquel Raynal 2022-01-04 8:36 ` Miquel Raynal 2022-01-05 5:53 ` Pratyush Yadav 2022-01-05 5:53 ` Pratyush Yadav 2022-01-26 10:53 ` Miquel Raynal 2022-01-26 10:53 ` Miquel Raynal 2022-01-04 8:36 ` [PATCH v9 03/13] spi: cadence-quadspi: Provide a capability structure Miquel Raynal 2022-01-04 8:36 ` Miquel Raynal 2022-01-26 10:53 ` Miquel Raynal 2022-01-26 10:53 ` Miquel Raynal 2022-01-04 8:36 ` [PATCH v9 04/13] spi: mxic: " Miquel Raynal 2022-01-04 8:36 ` Miquel Raynal 2022-01-26 10:53 ` Miquel Raynal 2022-01-26 10:53 ` Miquel Raynal 2022-01-04 8:36 ` [PATCH v9 05/13] spi: spi-mem: Kill the spi_mem_dtr_supports_op() helper Miquel Raynal 2022-01-04 8:36 ` Miquel Raynal 2022-01-26 10:53 ` Miquel Raynal 2022-01-26 10:53 ` Miquel Raynal 2022-01-04 8:36 ` [PATCH v9 06/13] spi: spi-mem: Add an ecc parameter to the spi_mem_op structure Miquel Raynal 2022-01-04 8:36 ` Miquel Raynal 2022-01-04 9:02 ` Boris Brezillon 2022-01-04 9:02 ` Boris Brezillon 2022-01-04 9:24 ` Miquel Raynal 2022-01-04 9:24 ` Miquel Raynal 2022-01-26 10:53 ` Miquel Raynal 2022-01-26 10:53 ` Miquel Raynal 2022-01-04 8:36 ` [PATCH v9 07/13] mtd: spinand: Delay a little bit the dirmap creation Miquel Raynal 2022-01-04 8:36 ` Miquel Raynal 2022-01-26 10:53 ` Miquel Raynal 2022-01-26 10:53 ` Miquel Raynal 2022-01-04 8:36 ` [PATCH v9 08/13] mtd: spinand: Create direct mapping descriptors for ECC operations Miquel Raynal 2022-01-04 8:36 ` Miquel Raynal 2022-01-26 10:52 ` Miquel Raynal 2022-01-26 10:52 ` Miquel Raynal 2022-01-04 8:36 ` Miquel Raynal [this message] 2022-01-04 8:36 ` [PATCH v9 09/13] spi: mxic: Fix the transmit path Miquel Raynal 2022-01-26 10:52 ` Miquel Raynal 2022-01-26 10:52 ` Miquel Raynal 2022-01-04 8:36 ` [PATCH v9 10/13] spi: mxic: Create a helper to configure the controller before an operation Miquel Raynal 2022-01-04 8:36 ` Miquel Raynal 2022-01-26 10:52 ` Miquel Raynal 2022-01-26 10:52 ` Miquel Raynal 2022-01-04 8:36 ` [PATCH v9 11/13] spi: mxic: Create a helper to ease the start of " Miquel Raynal 2022-01-04 8:36 ` Miquel Raynal 2022-01-26 10:52 ` Miquel Raynal 2022-01-26 10:52 ` Miquel Raynal 2022-01-04 8:36 ` [PATCH v9 12/13] spi: mxic: Add support for direct mapping Miquel Raynal 2022-01-04 8:36 ` Miquel Raynal 2022-01-26 10:52 ` Miquel Raynal 2022-01-26 10:52 ` Miquel Raynal 2022-01-04 8:36 ` [PATCH v9 13/13] spi: mxic: Add support for pipelined ECC operations Miquel Raynal 2022-01-04 8:36 ` Miquel Raynal 2022-01-26 10:52 ` Miquel Raynal 2022-01-26 10:52 ` Miquel Raynal 2022-01-04 9:04 ` [PATCH v9 00/13] External ECC engines & Macronix support Boris Brezillon 2022-01-04 9:04 ` Boris Brezillon 2022-01-23 16:01 ` Miquel Raynal 2022-01-23 16:01 ` Miquel Raynal
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220104083631.40776-10-miquel.raynal@bootlin.com \ --to=miquel.raynal@bootlin.com \ --cc=Tudor.Ambarus@microchip.com \ --cc=boris.brezillon@collabora.com \ --cc=broonie@kernel.org \ --cc=jaimeliao@mxic.com.tw \ --cc=juliensu@mxic.com.tw \ --cc=linux-mtd@lists.infradead.org \ --cc=linux-spi@vger.kernel.org \ --cc=masonccyang@mxic.com.tw \ --cc=michael@walle.cc \ --cc=p.yadav@ti.com \ --cc=richard@nod.at \ --cc=stable@vger.kernel.org \ --cc=thomas.petazzoni@bootlin.com \ --cc=vigneshr@ti.com \ --cc=xiangsheng.hou@mediatek.com \ --cc=zhengxunli@mxic.com.tw \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.