From: Emil Renner Berthing <esmil@mailme.dk>
To: linux-spi@vger.kernel.org
Cc: Emil Renner Berthing <kernel@esmil.dk>,
Addy Ke <addy.ke@rock-chips.com>, Mark Brown <broonie@kernel.org>,
Heiko Stuebner <heiko@sntech.de>,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH v1 04/14] spi: rockchip: use atomic_t state
Date: Wed, 31 Oct 2018 11:57:01 +0100 [thread overview]
Message-ID: <20181031105711.19575-5-esmil@mailme.dk> (raw)
In-Reply-To: <20181031105711.19575-1-esmil@mailme.dk>
From: Emil Renner Berthing <kernel@esmil.dk>
The state field is currently only used to make sure
only the last of the tx and rx dma callbacks issue
an spi_finalize_current_transfer.
Rather than using a spinlock we can get away
with just turning the state field into an atomic_t.
Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
---
drivers/spi/spi-rockchip.c | 75 +++++++++++++-------------------------
1 file changed, 25 insertions(+), 50 deletions(-)
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index 7fac4253075e..1c813797f963 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -142,8 +142,9 @@
#define RF_DMA_EN (1 << 0)
#define TF_DMA_EN (1 << 1)
-#define RXBUSY (1 << 0)
-#define TXBUSY (1 << 1)
+/* Driver state flags */
+#define RXDMA (1 << 0)
+#define TXDMA (1 << 1)
/* sclk_out: spi master internal logic in rk3x can support 50Mhz */
#define MAX_SCLK_OUT 50000000
@@ -169,6 +170,9 @@ struct rockchip_spi {
struct clk *apb_pclk;
void __iomem *regs;
+
+ atomic_t state;
+
/*depth of the FIFO buffer */
u32 fifo_len;
/* max bus freq supported */
@@ -187,10 +191,6 @@ struct rockchip_spi {
void *rx;
void *rx_end;
- u32 state;
- /* protect state */
- spinlock_t lock;
-
bool cs_asserted[ROCKCHIP_SPI_MAX_CS_NUM];
bool use_dma;
@@ -302,28 +302,21 @@ static int rockchip_spi_prepare_message(struct spi_master *master,
static void rockchip_spi_handle_err(struct spi_master *master,
struct spi_message *msg)
{
- unsigned long flags;
struct rockchip_spi *rs = spi_master_get_devdata(master);
- spin_lock_irqsave(&rs->lock, flags);
-
/*
* For DMA mode, we need terminate DMA channel and flush
* fifo for the next transfer if DMA thansfer timeout.
* handle_err() was called by core if transfer failed.
* Maybe it is reasonable for error handling here.
*/
- if (rs->use_dma) {
- if (rs->state & RXBUSY) {
- dmaengine_terminate_async(rs->dma_rx.ch);
- flush_fifo(rs);
- }
+ if (atomic_read(&rs->state) & TXDMA)
+ dmaengine_terminate_async(rs->dma_tx.ch);
- if (rs->state & TXBUSY)
- dmaengine_terminate_async(rs->dma_tx.ch);
+ if (atomic_read(&rs->state) & RXDMA) {
+ dmaengine_terminate_async(rs->dma_rx.ch);
+ flush_fifo(rs);
}
-
- spin_unlock_irqrestore(&rs->lock, flags);
}
static int rockchip_spi_unprepare_message(struct spi_master *master,
@@ -398,48 +391,36 @@ static int rockchip_spi_pio_transfer(struct rockchip_spi *rs)
static void rockchip_spi_dma_rxcb(void *data)
{
- unsigned long flags;
struct rockchip_spi *rs = data;
+ int state = atomic_fetch_andnot(RXDMA, &rs->state);
- spin_lock_irqsave(&rs->lock, flags);
-
- rs->state &= ~RXBUSY;
- if (!(rs->state & TXBUSY)) {
- spi_enable_chip(rs, false);
- spi_finalize_current_transfer(rs->master);
- }
+ if (state & TXDMA)
+ return;
- spin_unlock_irqrestore(&rs->lock, flags);
+ spi_enable_chip(rs, false);
+ spi_finalize_current_transfer(rs->master);
}
static void rockchip_spi_dma_txcb(void *data)
{
- unsigned long flags;
struct rockchip_spi *rs = data;
+ int state = atomic_fetch_andnot(TXDMA, &rs->state);
+
+ if (state & RXDMA)
+ return;
/* Wait until the FIFO data completely. */
wait_for_idle(rs);
- spin_lock_irqsave(&rs->lock, flags);
-
- rs->state &= ~TXBUSY;
- if (!(rs->state & RXBUSY)) {
- spi_enable_chip(rs, false);
- spi_finalize_current_transfer(rs->master);
- }
-
- spin_unlock_irqrestore(&rs->lock, flags);
+ spi_enable_chip(rs, false);
+ spi_finalize_current_transfer(rs->master);
}
static int rockchip_spi_prepare_dma(struct rockchip_spi *rs)
{
- unsigned long flags;
struct dma_async_tx_descriptor *rxdesc, *txdesc;
- spin_lock_irqsave(&rs->lock, flags);
- rs->state &= ~RXBUSY;
- rs->state &= ~TXBUSY;
- spin_unlock_irqrestore(&rs->lock, flags);
+ atomic_set(&rs->state, 0);
rxdesc = NULL;
if (rs->rx) {
@@ -490,9 +471,7 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs)
/* rx must be started before tx due to spi instinct */
if (rxdesc) {
- spin_lock_irqsave(&rs->lock, flags);
- rs->state |= RXBUSY;
- spin_unlock_irqrestore(&rs->lock, flags);
+ atomic_or(RXDMA, &rs->state);
dmaengine_submit(rxdesc);
dma_async_issue_pending(rs->dma_rx.ch);
}
@@ -500,9 +479,7 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs)
spi_enable_chip(rs, true);
if (txdesc) {
- spin_lock_irqsave(&rs->lock, flags);
- rs->state |= TXBUSY;
- spin_unlock_irqrestore(&rs->lock, flags);
+ atomic_or(TXDMA, &rs->state);
dmaengine_submit(txdesc);
dma_async_issue_pending(rs->dma_tx.ch);
}
@@ -716,8 +693,6 @@ static int rockchip_spi_probe(struct platform_device *pdev)
goto err_disable_spiclk;
}
- spin_lock_init(&rs->lock);
-
pm_runtime_set_active(&pdev->dev);
pm_runtime_enable(&pdev->dev);
--
2.19.1
next prev parent reply other threads:[~2018-10-31 10:58 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-31 10:56 [PATCH v1 00/14] Rockchip SPI cleanup and use interrupts Emil Renner Berthing
2018-10-31 10:56 ` [PATCH v1 01/14] spi: rockchip: make spi_enable_chip take bool Emil Renner Berthing
2018-11-05 12:06 ` Applied "spi: rockchip: make spi_enable_chip take bool" to the spi tree Mark Brown
2018-10-31 10:56 ` [PATCH v1 02/14] spi: rockchip: use designated init for dma config Emil Renner Berthing
2018-11-05 12:06 ` Applied "spi: rockchip: use designated init for dma config" to the spi tree Mark Brown
2018-10-31 10:57 ` [PATCH v1 03/14] spi: rockchip: always use SPI mode Emil Renner Berthing
2018-11-05 12:06 ` Applied "spi: rockchip: always use SPI mode" to the spi tree Mark Brown
2018-10-31 10:57 ` Emil Renner Berthing [this message]
2018-11-05 12:06 ` Applied "spi: rockchip: use atomic_t state" " Mark Brown
2018-10-31 10:57 ` [PATCH v1 05/14] spi: rockchip: disable spi on error Emil Renner Berthing
2018-11-05 12:06 ` Applied "spi: rockchip: disable spi on error" to the spi tree Mark Brown
2018-10-31 10:57 ` [PATCH v1 06/14] spi: rockchip: read transfer info directly Emil Renner Berthing
2018-11-05 12:06 ` Applied "spi: rockchip: read transfer info directly" to the spi tree Mark Brown
2018-10-31 10:57 ` [PATCH v1 07/14] spi: rockchip: don't store dma channels twice Emil Renner Berthing
2018-11-05 12:06 ` Applied "spi: rockchip: don't store dma channels twice" to the spi tree Mark Brown
2018-10-31 10:57 ` [PATCH v1 08/14] spi: rockchip: remove master pointer from dev data Emil Renner Berthing
2018-11-05 12:06 ` Applied "spi: rockchip: remove master pointer from dev data" to the spi tree Mark Brown
2018-10-31 10:57 ` [PATCH v1 09/14] spi: rockchip: simplify use_dma logic Emil Renner Berthing
2018-11-05 12:06 ` Applied "spi: rockchip: simplify use_dma logic" to the spi tree Mark Brown
2018-10-31 10:57 ` [PATCH v1 10/14] spi: rockchip: set min/max speed Emil Renner Berthing
2018-11-05 12:06 ` Applied "spi: rockchip: set min/max speed" to the spi tree Mark Brown
2018-10-31 10:57 ` [PATCH v1 11/14] spi: rockchip: precompute rx sample delay Emil Renner Berthing
2018-11-05 12:06 ` Applied "spi: rockchip: precompute rx sample delay" to the spi tree Mark Brown
2018-10-31 10:57 ` [PATCH v1 12/14] spi: rockchip: use irq rather than polling Emil Renner Berthing
2018-11-05 12:06 ` Applied "spi: rockchip: use irq rather than polling" to the spi tree Mark Brown
2018-10-31 10:57 ` [PATCH v1 13/14] spi: rockchip: support 4bit words Emil Renner Berthing
2018-11-05 12:06 ` Applied "spi: rockchip: support 4bit words" to the spi tree Mark Brown
2018-10-31 10:57 ` [PATCH v1 14/14] spi: rockchip: support lsb-first mode Emil Renner Berthing
2018-11-05 12:06 ` Applied "spi: rockchip: support lsb-first mode" to the spi tree Mark Brown
2018-10-31 11:20 ` [PATCH v1 00/14] Rockchip SPI cleanup and use interrupts Heiko Stübner
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=20181031105711.19575-5-esmil@mailme.dk \
--to=esmil@mailme.dk \
--cc=addy.ke@rock-chips.com \
--cc=broonie@kernel.org \
--cc=heiko@sntech.de \
--cc=kernel@esmil.dk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-spi@vger.kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).