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, Huibin Hong <huibin.hong@rock-chips.com> Subject: [PATCH 2/7] spi: rockchip: adjust dma watermark and burstlen Date: Wed, 10 Oct 2018 11:00:33 +0200 [thread overview] Message-ID: <20181010090038.20834-3-kernel@esmil.dk> (raw) In-Reply-To: <20181010090038.20834-1-kernel@esmil.dk> From: Huibin Hong <huibin.hong@rock-chips.com> Signal tx dma when spi fifo is less than half full, and limit tx bursts to half the fifo length. Clamp rx burst length to 1 to avoid alignment issues. Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com> Signed-off-by: Emil Renner Berthing <kernel@esmil.dk> --- drivers/spi/spi-rockchip.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 185bbdce62b1..ede3002215cd 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -458,10 +458,7 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs) rxconf.direction = rs->dma_rx.direction; rxconf.src_addr = rs->dma_rx.addr; rxconf.src_addr_width = rs->n_bytes; - if (rs->dma_caps.max_burst > 4) - rxconf.src_maxburst = 4; - else - rxconf.src_maxburst = 1; + rxconf.src_maxburst = 1; dmaengine_slave_config(rs->dma_rx.ch, &rxconf); rxdesc = dmaengine_prep_slave_sg( @@ -480,10 +477,7 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs) txconf.direction = rs->dma_tx.direction; txconf.dst_addr = rs->dma_tx.addr; txconf.dst_addr_width = rs->n_bytes; - if (rs->dma_caps.max_burst > 4) - txconf.dst_maxburst = 4; - else - txconf.dst_maxburst = 1; + txconf.dst_maxburst = rs->fifo_len / 2; dmaengine_slave_config(rs->dma_tx.ch, &txconf); txdesc = dmaengine_prep_slave_sg( @@ -581,7 +575,7 @@ static void rockchip_spi_config(struct rockchip_spi *rs) writel_relaxed(rs->fifo_len / 2 - 1, rs->regs + ROCKCHIP_SPI_TXFTLR); writel_relaxed(rs->fifo_len / 2 - 1, rs->regs + ROCKCHIP_SPI_RXFTLR); - writel_relaxed(0, rs->regs + ROCKCHIP_SPI_DMATDLR); + writel_relaxed(rs->fifo_len / 2 - 1, rs->regs + ROCKCHIP_SPI_DMATDLR); writel_relaxed(0, rs->regs + ROCKCHIP_SPI_DMARDLR); writel_relaxed(dmacr, rs->regs + ROCKCHIP_SPI_DMACR); -- 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 2/7] spi: rockchip: adjust dma watermark and burstlen Date: Wed, 10 Oct 2018 11:00:33 +0200 [thread overview] Message-ID: <20181010090038.20834-3-kernel@esmil.dk> (raw) In-Reply-To: <20181010090038.20834-1-kernel@esmil.dk> From: Huibin Hong <huibin.hong@rock-chips.com> Signal tx dma when spi fifo is less than half full, and limit tx bursts to half the fifo length. Clamp rx burst length to 1 to avoid alignment issues. Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com> Signed-off-by: Emil Renner Berthing <kernel@esmil.dk> --- drivers/spi/spi-rockchip.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 185bbdce62b1..ede3002215cd 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -458,10 +458,7 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs) rxconf.direction = rs->dma_rx.direction; rxconf.src_addr = rs->dma_rx.addr; rxconf.src_addr_width = rs->n_bytes; - if (rs->dma_caps.max_burst > 4) - rxconf.src_maxburst = 4; - else - rxconf.src_maxburst = 1; + rxconf.src_maxburst = 1; dmaengine_slave_config(rs->dma_rx.ch, &rxconf); rxdesc = dmaengine_prep_slave_sg( @@ -480,10 +477,7 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs) txconf.direction = rs->dma_tx.direction; txconf.dst_addr = rs->dma_tx.addr; txconf.dst_addr_width = rs->n_bytes; - if (rs->dma_caps.max_burst > 4) - txconf.dst_maxburst = 4; - else - txconf.dst_maxburst = 1; + txconf.dst_maxburst = rs->fifo_len / 2; dmaengine_slave_config(rs->dma_tx.ch, &txconf); txdesc = dmaengine_prep_slave_sg( @@ -581,7 +575,7 @@ static void rockchip_spi_config(struct rockchip_spi *rs) writel_relaxed(rs->fifo_len / 2 - 1, rs->regs + ROCKCHIP_SPI_TXFTLR); writel_relaxed(rs->fifo_len / 2 - 1, rs->regs + ROCKCHIP_SPI_RXFTLR); - writel_relaxed(0, rs->regs + ROCKCHIP_SPI_DMATDLR); + writel_relaxed(rs->fifo_len / 2 - 1, rs->regs + ROCKCHIP_SPI_DMATDLR); writel_relaxed(0, rs->regs + ROCKCHIP_SPI_DMARDLR); writel_relaxed(dmacr, rs->regs + ROCKCHIP_SPI_DMACR); -- 2.19.1
next prev parent reply other threads:[~2018-10-10 9:01 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 ` Emil Renner Berthing [this message] 2018-10-10 9:00 ` [PATCH 2/7] spi: rockchip: adjust dma watermark and burstlen 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 ` [PATCH 7/7] spi: rockchip: simplify spi enable logic Emil Renner Berthing 2018-10-10 9:00 ` 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-3-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=huibin.hong@rock-chips.com \ --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.