From: Sylwester Nawrocki <s.nawrocki@samsung.com> To: broonie@kernel.org Cc: linux-samsung-soc@vger.kernel.org, Sylwester Nawrocki <s.nawrocki@samsung.com>, b.zolnierkie@samsung.com, krzk@kernel.org, linux-spi@vger.kernel.org, kgene@kernel.org, andi@etezian.org, linux-arm-kernel@lists.infradead.org, m.szyprowski@samsung.com Subject: [PATCH 6/6] spi: spi-s3c64xx: Allow higher transfer lengths in polling IO mode Date: Mon, 16 Apr 2018 17:40:21 +0200 [thread overview] Message-ID: <20180416154021.25626-6-s.nawrocki@samsung.com> (raw) In-Reply-To: <20180416154021.25626-1-s.nawrocki@samsung.com> Some variants of the SPI controller have no DMA support, in such case SPI transfers longer than the FIFO length are not currently properly handled by the driver. Fix it by doing multiple transfers in the s3c64xx_spi_transfer_one() function if the SPI transfer length exceeds the FIFO size. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> --- drivers/spi/spi-s3c64xx.c | 108 ++++++++++++++++++++++++++++++---------------- 1 file changed, 71 insertions(+), 37 deletions(-) diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 2723fa6bed8b..b2e8ed354dac 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -349,7 +349,7 @@ static bool s3c64xx_spi_can_dma(struct spi_master *master, } static void s3c64xx_enable_datapath(struct s3c64xx_spi_driver_data *sdd, - struct spi_transfer *xfer, int dma_mode) + struct spi_transfer *xfer, bool dma_mode) { void __iomem *regs = sdd->regs; u32 modecfg, chcfg; @@ -634,11 +634,15 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master, struct spi_transfer *xfer) { struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); + const unsigned int fifo_len = (FIFO_LVL_MASK(sdd) >> 1) + 1; + const void *tx_buf = NULL; + void *rx_buf = NULL; + int target_len = 0, origin_len = 0; + bool use_dma = false; int status; u32 speed; u8 bpw; unsigned long flags; - int use_dma; reinit_completion(&sdd->xfer_completion); @@ -653,48 +657,78 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master, s3c64xx_spi_config(sdd); } - /* Polling method for xfers not bigger than FIFO capacity */ - use_dma = 0; - if (!is_polling(sdd) && - (sdd->rx_dma.ch && sdd->tx_dma.ch && - (xfer->len > ((FIFO_LVL_MASK(sdd) >> 1) + 1)))) - use_dma = 1; + if (!is_polling(sdd) && (xfer->len > fifo_len) && + sdd->rx_dma.ch && sdd->tx_dma.ch) { + use_dma = true; - spin_lock_irqsave(&sdd->lock, flags); + } else if (is_polling(sdd) && xfer->len > fifo_len) { + tx_buf = xfer->tx_buf; + rx_buf = xfer->rx_buf; + origin_len = xfer->len; - /* Pending only which is to be done */ - sdd->state &= ~RXBUSY; - sdd->state &= ~TXBUSY; + target_len = xfer->len; + if (xfer->len > fifo_len) + xfer->len = fifo_len; + } + + do { + spin_lock_irqsave(&sdd->lock, flags); - s3c64xx_enable_datapath(sdd, xfer, use_dma); + /* Pending only which is to be done */ + sdd->state &= ~RXBUSY; + sdd->state &= ~TXBUSY; - /* Start the signals */ - s3c64xx_spi_set_cs(spi, true); + s3c64xx_enable_datapath(sdd, xfer, use_dma); - spin_unlock_irqrestore(&sdd->lock, flags); + /* Start the signals */ + s3c64xx_spi_set_cs(spi, true); - if (use_dma) - status = wait_for_dma(sdd, xfer); - else - status = wait_for_pio(sdd, xfer); - - if (status) { - dev_err(&spi->dev, "I/O Error: rx-%d tx-%d res:rx-%c tx-%c len-%d\n", - xfer->rx_buf ? 1 : 0, xfer->tx_buf ? 1 : 0, - (sdd->state & RXBUSY) ? 'f' : 'p', - (sdd->state & TXBUSY) ? 'f' : 'p', - xfer->len); - - if (use_dma) { - if (xfer->tx_buf != NULL - && (sdd->state & TXBUSY)) - dmaengine_terminate_all(sdd->tx_dma.ch); - if (xfer->rx_buf != NULL - && (sdd->state & RXBUSY)) - dmaengine_terminate_all(sdd->rx_dma.ch); + spin_unlock_irqrestore(&sdd->lock, flags); + + if (use_dma) + status = wait_for_dma(sdd, xfer); + else + status = wait_for_pio(sdd, xfer); + + if (status) { + dev_err(&spi->dev, + "I/O Error: rx-%d tx-%d res:rx-%c tx-%c len-%d\n", + xfer->rx_buf ? 1 : 0, xfer->tx_buf ? 1 : 0, + (sdd->state & RXBUSY) ? 'f' : 'p', + (sdd->state & TXBUSY) ? 'f' : 'p', + xfer->len); + + if (use_dma) { + if (xfer->tx_buf && (sdd->state & TXBUSY)) + dmaengine_terminate_all(sdd->tx_dma.ch); + if (xfer->rx_buf && (sdd->state & RXBUSY)) + dmaengine_terminate_all(sdd->rx_dma.ch); + } + } else { + flush_fifo(sdd); } - } else { - flush_fifo(sdd); + + if (target_len > 0) { + target_len -= xfer->len; + + if (xfer->tx_buf) + xfer->tx_buf += xfer->len; + + if (xfer->rx_buf) + xfer->rx_buf += xfer->len; + + if (target_len > fifo_len) + xfer->len = fifo_len; + else + xfer->len = target_len; + } + } while (target_len > 0); + + if (origin_len) { + /* Restore original xfer buffers and length */ + xfer->tx_buf = tx_buf; + xfer->rx_buf = rx_buf; + xfer->len = origin_len; } return status; -- 2.14.2
WARNING: multiple messages have this Message-ID (diff)
From: s.nawrocki@samsung.com (Sylwester Nawrocki) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/6] spi: spi-s3c64xx: Allow higher transfer lengths in polling IO mode Date: Mon, 16 Apr 2018 17:40:21 +0200 [thread overview] Message-ID: <20180416154021.25626-6-s.nawrocki@samsung.com> (raw) In-Reply-To: <20180416154021.25626-1-s.nawrocki@samsung.com> Some variants of the SPI controller have no DMA support, in such case SPI transfers longer than the FIFO length are not currently properly handled by the driver. Fix it by doing multiple transfers in the s3c64xx_spi_transfer_one() function if the SPI transfer length exceeds the FIFO size. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> --- drivers/spi/spi-s3c64xx.c | 108 ++++++++++++++++++++++++++++++---------------- 1 file changed, 71 insertions(+), 37 deletions(-) diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 2723fa6bed8b..b2e8ed354dac 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -349,7 +349,7 @@ static bool s3c64xx_spi_can_dma(struct spi_master *master, } static void s3c64xx_enable_datapath(struct s3c64xx_spi_driver_data *sdd, - struct spi_transfer *xfer, int dma_mode) + struct spi_transfer *xfer, bool dma_mode) { void __iomem *regs = sdd->regs; u32 modecfg, chcfg; @@ -634,11 +634,15 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master, struct spi_transfer *xfer) { struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); + const unsigned int fifo_len = (FIFO_LVL_MASK(sdd) >> 1) + 1; + const void *tx_buf = NULL; + void *rx_buf = NULL; + int target_len = 0, origin_len = 0; + bool use_dma = false; int status; u32 speed; u8 bpw; unsigned long flags; - int use_dma; reinit_completion(&sdd->xfer_completion); @@ -653,48 +657,78 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master, s3c64xx_spi_config(sdd); } - /* Polling method for xfers not bigger than FIFO capacity */ - use_dma = 0; - if (!is_polling(sdd) && - (sdd->rx_dma.ch && sdd->tx_dma.ch && - (xfer->len > ((FIFO_LVL_MASK(sdd) >> 1) + 1)))) - use_dma = 1; + if (!is_polling(sdd) && (xfer->len > fifo_len) && + sdd->rx_dma.ch && sdd->tx_dma.ch) { + use_dma = true; - spin_lock_irqsave(&sdd->lock, flags); + } else if (is_polling(sdd) && xfer->len > fifo_len) { + tx_buf = xfer->tx_buf; + rx_buf = xfer->rx_buf; + origin_len = xfer->len; - /* Pending only which is to be done */ - sdd->state &= ~RXBUSY; - sdd->state &= ~TXBUSY; + target_len = xfer->len; + if (xfer->len > fifo_len) + xfer->len = fifo_len; + } + + do { + spin_lock_irqsave(&sdd->lock, flags); - s3c64xx_enable_datapath(sdd, xfer, use_dma); + /* Pending only which is to be done */ + sdd->state &= ~RXBUSY; + sdd->state &= ~TXBUSY; - /* Start the signals */ - s3c64xx_spi_set_cs(spi, true); + s3c64xx_enable_datapath(sdd, xfer, use_dma); - spin_unlock_irqrestore(&sdd->lock, flags); + /* Start the signals */ + s3c64xx_spi_set_cs(spi, true); - if (use_dma) - status = wait_for_dma(sdd, xfer); - else - status = wait_for_pio(sdd, xfer); - - if (status) { - dev_err(&spi->dev, "I/O Error: rx-%d tx-%d res:rx-%c tx-%c len-%d\n", - xfer->rx_buf ? 1 : 0, xfer->tx_buf ? 1 : 0, - (sdd->state & RXBUSY) ? 'f' : 'p', - (sdd->state & TXBUSY) ? 'f' : 'p', - xfer->len); - - if (use_dma) { - if (xfer->tx_buf != NULL - && (sdd->state & TXBUSY)) - dmaengine_terminate_all(sdd->tx_dma.ch); - if (xfer->rx_buf != NULL - && (sdd->state & RXBUSY)) - dmaengine_terminate_all(sdd->rx_dma.ch); + spin_unlock_irqrestore(&sdd->lock, flags); + + if (use_dma) + status = wait_for_dma(sdd, xfer); + else + status = wait_for_pio(sdd, xfer); + + if (status) { + dev_err(&spi->dev, + "I/O Error: rx-%d tx-%d res:rx-%c tx-%c len-%d\n", + xfer->rx_buf ? 1 : 0, xfer->tx_buf ? 1 : 0, + (sdd->state & RXBUSY) ? 'f' : 'p', + (sdd->state & TXBUSY) ? 'f' : 'p', + xfer->len); + + if (use_dma) { + if (xfer->tx_buf && (sdd->state & TXBUSY)) + dmaengine_terminate_all(sdd->tx_dma.ch); + if (xfer->rx_buf && (sdd->state & RXBUSY)) + dmaengine_terminate_all(sdd->rx_dma.ch); + } + } else { + flush_fifo(sdd); } - } else { - flush_fifo(sdd); + + if (target_len > 0) { + target_len -= xfer->len; + + if (xfer->tx_buf) + xfer->tx_buf += xfer->len; + + if (xfer->rx_buf) + xfer->rx_buf += xfer->len; + + if (target_len > fifo_len) + xfer->len = fifo_len; + else + xfer->len = target_len; + } + } while (target_len > 0); + + if (origin_len) { + /* Restore original xfer buffers and length */ + xfer->tx_buf = tx_buf; + xfer->rx_buf = rx_buf; + xfer->len = origin_len; } return status; -- 2.14.2
next prev parent reply other threads:[~2018-04-16 15:40 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <CGME20180416154055epcas2p4c08bb2254e79368a29eb481cddc59855@epcas2p4.samsung.com> 2018-04-16 15:40 ` [PATCH 1/6] spi: spi-s3c64xx: Remove unused driver data structure tgl_spi field Sylwester Nawrocki 2018-04-16 15:40 ` Sylwester Nawrocki [not found] ` <CGME20180416154109epcas2p1696b9cdc72403fe5abdd0a2117067c8d@epcas2p1.samsung.com> 2018-04-16 15:40 ` [PATCH 2/6] spi: spi-s3c64xx: Remove unused s3c64xx_spi_hwinit() function argument Sylwester Nawrocki 2018-04-16 15:40 ` Sylwester Nawrocki 2018-04-16 19:06 ` andi 2018-04-16 19:06 ` andi at etezian.org 2018-04-17 6:28 ` Krzysztof Kozlowski 2018-04-17 6:28 ` Krzysztof Kozlowski [not found] ` <CGME20180416154122epcas1p1ae714af12f8da08783c47fcd820c40e7@epcas1p1.samsung.com> 2018-04-16 15:40 ` [PATCH 3/6] spi: spi-s3c64xx: Drop unused enable_datapath() " Sylwester Nawrocki 2018-04-16 15:40 ` Sylwester Nawrocki 2018-04-16 19:09 ` andi 2018-04-16 19:09 ` andi at etezian.org 2018-04-17 10:02 ` Sylwester Nawrocki 2018-04-17 10:02 ` Sylwester Nawrocki 2018-04-17 10:51 ` Krzysztof Kozlowski 2018-04-17 10:51 ` Krzysztof Kozlowski 2018-04-17 6:28 ` Krzysztof Kozlowski 2018-04-17 6:28 ` Krzysztof Kozlowski [not found] ` <CGME20180416154130epcas1p492c86e911db645acf32d960281e8b297@epcas1p4.samsung.com> 2018-04-16 15:40 ` [PATCH 4/6] spi: spi-s3c64xx: Do not ignore timeout errors in polling I/O mode Sylwester Nawrocki 2018-04-16 15:40 ` Sylwester Nawrocki 2018-04-16 19:12 ` andi 2018-04-16 19:12 ` andi at etezian.org 2018-04-17 6:30 ` Krzysztof Kozlowski 2018-04-17 6:30 ` Krzysztof Kozlowski 2018-04-17 10:02 ` Mark Brown 2018-04-17 10:02 ` Mark Brown [not found] ` <CGME20180416154158epcas2p3120ff2617db98504c4e48d5cc4c42036@epcas2p3.samsung.com> 2018-04-16 15:40 ` [PATCH 5/6] spi: spi-s3c64xx: Fix indentation in the register offset definitions Sylwester Nawrocki 2018-04-16 15:40 ` Sylwester Nawrocki 2018-04-16 19:14 ` andi 2018-04-16 19:14 ` andi at etezian.org 2018-04-17 6:30 ` Krzysztof Kozlowski 2018-04-17 6:30 ` Krzysztof Kozlowski [not found] ` <CGME20180416154208epcas1p1774dd679e3564be916901a180315943b@epcas1p1.samsung.com> 2018-04-16 15:40 ` Sylwester Nawrocki [this message] 2018-04-16 15:40 ` [PATCH 6/6] spi: spi-s3c64xx: Allow higher transfer lengths in polling IO mode Sylwester Nawrocki 2018-04-16 19:19 ` andi 2018-04-16 19:19 ` andi at etezian.org 2018-04-17 9:07 ` Sylwester Nawrocki 2018-04-17 9:07 ` Sylwester Nawrocki 2018-04-16 19:04 ` [PATCH 1/6] spi: spi-s3c64xx: Remove unused driver data structure tgl_spi field andi 2018-04-16 19:04 ` andi at etezian.org 2018-04-17 6:27 ` Krzysztof Kozlowski 2018-04-17 6:27 ` Krzysztof Kozlowski
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=20180416154021.25626-6-s.nawrocki@samsung.com \ --to=s.nawrocki@samsung.com \ --cc=andi@etezian.org \ --cc=b.zolnierkie@samsung.com \ --cc=broonie@kernel.org \ --cc=kgene@kernel.org \ --cc=krzk@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=linux-spi@vger.kernel.org \ --cc=m.szyprowski@samsung.com \ /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.