From: Emil Renner Berthing <kernel@esmil.dk> To: linux-rockchip@lists.infradead.org Cc: Emil Renner Berthing <kernel@esmil.dk>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Heiko Stuebner <heiko@sntech.de>, Mark Brown <broonie@kernel.org>, Enric Balletbo i Serra <enric.balletbo@collabora.com>, Brian Norris <briannorris@chromium.org>, Douglas Anderson <dianders@chromium.org>, Shunqian Zheng <zhengsq@rock-chips.com>, Nickey Yang <nickey.yang@rock-chips.com>, Klaus Goger <klaus.goger@theobroma-systems.com>, Randy Li <ayaka@soulik.info>, Chris Zhong <zyw@rock-chips.com>, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org Subject: [PATCH 7/7] spi: rockchip: simplify spi enable logic Date: Wed, 10 Oct 2018 11:00:38 +0200 [thread overview] Message-ID: <20181010090038.20834-8-kernel@esmil.dk> (raw) In-Reply-To: <20181010090038.20834-1-kernel@esmil.dk> Let the dma/non-dma code paths handle the spi enable flag themselves. This removes some logic to determine if the flag should be turned on before or after dma and also don't leave the spi enabled if the dma path fails. Signed-off-by: Emil Renner Berthing <kernel@esmil.dk> --- drivers/spi/spi-rockchip.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 1044849a352d..51ef632bca52 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -379,6 +379,8 @@ static int rockchip_spi_pio_transfer(struct rockchip_spi *rs) { int remain = 0; + spi_enable_chip(rs, 1); + do { if (rs->tx) { remain = rs->tx_end - rs->tx; @@ -501,6 +503,8 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs) dma_async_issue_pending(rs->dma_rx.ch); } + spi_enable_chip(rs, 1); + if (txdesc) { spin_lock_irqsave(&rs->lock, flags); rs->state |= TXBUSY; @@ -509,7 +513,8 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs) dma_async_issue_pending(rs->dma_tx.ch); } - return 0; + /* 1 means the transfer is in progress */ + return 1; } static void rockchip_spi_config(struct rockchip_spi *rs) @@ -592,7 +597,6 @@ static int rockchip_spi_transfer_one( struct spi_device *spi, struct spi_transfer *xfer) { - int ret = 0; struct rockchip_spi *rs = spi_master_get_devdata(master); WARN_ON(readl_relaxed(rs->regs + ROCKCHIP_SPI_SSIENR) && @@ -636,24 +640,10 @@ static int rockchip_spi_transfer_one( rockchip_spi_config(rs); - if (rs->use_dma) { - if (rs->tmode == CR0_XFM_RO) { - /* rx: dma must be prepared first */ - ret = rockchip_spi_prepare_dma(rs); - spi_enable_chip(rs, 1); - } else { - /* tx or tr: spi must be enabled first */ - spi_enable_chip(rs, 1); - ret = rockchip_spi_prepare_dma(rs); - } - /* successful DMA prepare means the transfer is in progress */ - ret = ret ? ret : 1; - } else { - spi_enable_chip(rs, 1); - ret = rockchip_spi_pio_transfer(rs); - } + if (rs->use_dma) + return rockchip_spi_prepare_dma(rs); - return ret; + return rockchip_spi_pio_transfer(rs); } static bool rockchip_spi_can_dma(struct spi_master *master, -- 2.19.1
WARNING: multiple messages have this Message-ID (diff)
From: kernel@esmil.dk (Emil Renner Berthing) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 7/7] spi: rockchip: simplify spi enable logic Date: Wed, 10 Oct 2018 11:00:38 +0200 [thread overview] Message-ID: <20181010090038.20834-8-kernel@esmil.dk> (raw) In-Reply-To: <20181010090038.20834-1-kernel@esmil.dk> Let the dma/non-dma code paths handle the spi enable flag themselves. This removes some logic to determine if the flag should be turned on before or after dma and also don't leave the spi enabled if the dma path fails. Signed-off-by: Emil Renner Berthing <kernel@esmil.dk> --- drivers/spi/spi-rockchip.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 1044849a352d..51ef632bca52 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -379,6 +379,8 @@ static int rockchip_spi_pio_transfer(struct rockchip_spi *rs) { int remain = 0; + spi_enable_chip(rs, 1); + do { if (rs->tx) { remain = rs->tx_end - rs->tx; @@ -501,6 +503,8 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs) dma_async_issue_pending(rs->dma_rx.ch); } + spi_enable_chip(rs, 1); + if (txdesc) { spin_lock_irqsave(&rs->lock, flags); rs->state |= TXBUSY; @@ -509,7 +513,8 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs) dma_async_issue_pending(rs->dma_tx.ch); } - return 0; + /* 1 means the transfer is in progress */ + return 1; } static void rockchip_spi_config(struct rockchip_spi *rs) @@ -592,7 +597,6 @@ static int rockchip_spi_transfer_one( struct spi_device *spi, struct spi_transfer *xfer) { - int ret = 0; struct rockchip_spi *rs = spi_master_get_devdata(master); WARN_ON(readl_relaxed(rs->regs + ROCKCHIP_SPI_SSIENR) && @@ -636,24 +640,10 @@ static int rockchip_spi_transfer_one( rockchip_spi_config(rs); - if (rs->use_dma) { - if (rs->tmode == CR0_XFM_RO) { - /* rx: dma must be prepared first */ - ret = rockchip_spi_prepare_dma(rs); - spi_enable_chip(rs, 1); - } else { - /* tx or tr: spi must be enabled first */ - spi_enable_chip(rs, 1); - ret = rockchip_spi_prepare_dma(rs); - } - /* successful DMA prepare means the transfer is in progress */ - ret = ret ? ret : 1; - } else { - spi_enable_chip(rs, 1); - ret = rockchip_spi_pio_transfer(rs); - } + if (rs->use_dma) + return rockchip_spi_prepare_dma(rs); - return ret; + return rockchip_spi_pio_transfer(rs); } static bool rockchip_spi_can_dma(struct spi_master *master, -- 2.19.1
next prev parent reply other threads:[~2018-10-10 9:02 UTC|newest] Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-10 9:00 [PATCH 0/7] Enable spi dma on Rockchip RK3399 Emil Renner Berthing 2018-10-10 9:00 ` Emil Renner Berthing 2018-10-10 9:00 ` [PATCH 1/7] spi: rockchip: initialize dma_slave_config properly Emil Renner Berthing 2018-10-10 9:00 ` Emil Renner Berthing 2018-10-11 14:56 ` Applied "spi: rockchip: initialize dma_slave_config properly" to the spi tree Mark Brown 2018-10-11 14:56 ` Mark Brown 2018-10-11 14:56 ` Mark Brown 2018-10-11 14:56 ` Mark Brown 2018-10-11 14:56 ` Mark Brown 2018-10-10 9:00 ` [PATCH 2/7] spi: rockchip: adjust dma watermark and burstlen Emil Renner Berthing 2018-10-10 9:00 ` Emil Renner Berthing 2018-10-11 14:56 ` Applied "spi: rockchip: adjust dma watermark and burstlen" to the spi tree Mark Brown 2018-10-11 14:56 ` Mark Brown 2018-10-11 14:56 ` Mark Brown 2018-10-11 14:56 ` Mark Brown 2018-10-11 14:56 ` Mark Brown 2018-10-10 9:00 ` [PATCH 3/7] arm64: dts: rockchip: add rk3399 SPI DMAs Emil Renner Berthing 2018-10-10 9:00 ` Emil Renner Berthing 2018-10-12 9:16 ` Enric Balletbo Serra 2018-10-16 12:32 ` Heiko Stuebner 2018-10-16 12:32 ` Heiko Stuebner 2018-10-10 9:00 ` [PATCH 4/7] spi: rockchip: remove unneeded dma_caps Emil Renner Berthing 2018-10-10 9:00 ` Emil Renner Berthing 2018-10-11 14:56 ` Applied "spi: rockchip: remove unneeded dma_caps" to the spi tree Mark Brown 2018-10-11 14:56 ` Mark Brown 2018-10-11 14:56 ` Mark Brown 2018-10-11 14:56 ` Mark Brown 2018-10-11 14:56 ` Mark Brown 2018-10-10 9:00 ` [PATCH 5/7] spi: rockchip: mark use_dma as bool Emil Renner Berthing 2018-10-10 9:00 ` Emil Renner Berthing 2018-10-11 14:56 ` Applied "spi: rockchip: mark use_dma as bool" to the spi tree Mark Brown 2018-10-11 14:56 ` Mark Brown 2018-10-11 14:56 ` Mark Brown 2018-10-11 14:56 ` Mark Brown 2018-10-11 14:56 ` Mark Brown 2018-10-10 9:00 ` [PATCH 6/7] spi: rockchip: directly use direction constants Emil Renner Berthing 2018-10-10 9:00 ` Emil Renner Berthing 2018-10-11 14:55 ` Applied "spi: rockchip: directly use direction constants" to the spi tree Mark Brown 2018-10-11 14:55 ` Mark Brown 2018-10-11 14:55 ` Mark Brown 2018-10-11 14:55 ` Mark Brown 2018-10-11 14:55 ` Mark Brown 2018-10-10 9:00 ` Emil Renner Berthing [this message] 2018-10-10 9:00 ` [PATCH 7/7] spi: rockchip: simplify spi enable logic Emil Renner Berthing 2018-10-11 14:55 ` Applied "spi: rockchip: simplify spi enable logic" to the spi tree Mark Brown 2018-10-11 14:55 ` Mark Brown 2018-10-11 14:55 ` Mark Brown 2018-10-11 14:55 ` Mark Brown 2018-10-11 14:55 ` Mark Brown
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=20181010090038.20834-8-kernel@esmil.dk \ --to=kernel@esmil.dk \ --cc=ayaka@soulik.info \ --cc=briannorris@chromium.org \ --cc=broonie@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=dianders@chromium.org \ --cc=enric.balletbo@collabora.com \ --cc=heiko@sntech.de \ --cc=klaus.goger@theobroma-systems.com \ --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 \ --cc=mark.rutland@arm.com \ --cc=nickey.yang@rock-chips.com \ --cc=robh+dt@kernel.org \ --cc=zhengsq@rock-chips.com \ --cc=zyw@rock-chips.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.