| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20230512141445.2026660-7-joychakr@google.com>
Date: Fri, 12 May 2023 14:14:45 +0000
From: Joy Chakraborty <joychakr@...gle.com>
To: Vinod Koul <vkoul@...nel.org>
Cc: dmaengine@...r.kernel.org, linux-kernel@...r.kernel.org,
devicetree@...r.kernel.org, manugautam@...gle.com,
danielmentz@...gle.com, sjadavani@...gle.com,
Joy Chakraborty <joychakr@...gle.com>
Subject: [PATCH v2 6/6] dmaengine: pl330: Use dma singles for peripheral _dregs
Use DMA singles in a loop to load/store data to the peripheral for
the remaining bytes left after chucks of bursts are done, which is
handled by the _dregs() function.
If the transfer length is not a multiple of (AxLen*AxSize) then the
_dregs function takes care of setting up CCR with residual burst
required to complete the transaction. It does so by changing the
AxLen in CCR and 1 burst of Load and Store.
But some peripherals might not set the burst request signal to the DMA
controller since the number of bytes to transfer is less then the
initial size of burst requested i.e. AxLen*AxSize leading to a forever
wait.
Example of such a case :
Considering a peripheral having an RX FIFO of n bytes and a sw
configurable threshold level logic which drives the RX burst req
signal to PL330 i.e. when data in the RX fifo crosses the threshold
value the peripheral asserts the RX burst request to PL330 to copy
data from the fifo in bursts.
Taking an example say the Rx Fifo is 256 bytes in depth, the max
AxLen is 16, max AxSize is 4bytes and 304 bytes had to copied from
peripheral to memory.
In this case the peripheral SW driver would configure the threshold
to the maximum possible burst size (AxLen*AxSize) i.e. 64 bytes and
pass the same to pl330 driver using src/dst_maxburst variable.
PL330 would copy the first 256 bytes with 4 burst transactions and
the 48 remaining bytes would be handled by _dregs().
Currently _dregs() would setup a burst for AxLen=3 and AxSize=16 to
copy the 48bytes but since 48bytes is below the threshold configured
at the peripheral the Rx burst request signal would not get set
leading to a forever wait and timeout.
This logic will copy the remaining 48bytes using single transactions
of 4bytes each which would not depend on the burst req signal from
the peripheral.
Instructions generated for above example with logic change:
DMAMOV CCR 0xbd0239
DMAMOV SAR 0xffffe000
DMAMOV DAR 0xffffc860
DMALP_1 3
DMAFLUSHP 0
DMAWFPB 0
DMALDB
DMASTPB 0
DMALPENDA_1 bjmpto_7
DMAMOV CCR 0xad0229
DMALDA
DMALP_0 11
DMAFLUSHP 0
DMAWFPS 0
DMASTPS 0
DMALPENDA_0 bjmpto_6
DMASEV 3
DMAEND
Signed-off-by: Joy Chakraborty <joychakr@...gle.com>
---
drivers/dma/pl330.c | 65 +++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 63 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 46e254fd4007..2145f601939e 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -1208,6 +1208,67 @@ static inline int _ldst_peripheral(struct pl330_dmac *pl330,
return off;
}
+/*
+ * Sets up transfers to peripheral using DMA Singles instead of Bursts.
+ * Data is moved between fifo and memory in bursts following which it is
+ * loaded/stored to peripheral using Loops of DMA singles based on
+ * transfer direction.
+ */
+static inline int _ldst_periph_single_dregs(struct pl330_dmac *pl330,
+ unsigned int dry_run, u8 buf[],
+ const struct _xfer_spec *pxs,
+ int src_length, int dst_length)
+{
+ int off = 0;
+ unsigned int ljmp, lpcnt;
+ struct _arg_LPEND lpend;
+ enum dma_transfer_direction direction = pxs->desc->rqtype;
+
+ if (direction == DMA_MEM_TO_DEV) {
+ off += _emit_load(dry_run, &buf[off], ALWAYS, direction,
+ pxs->desc->peri);
+ lpcnt = dst_length;
+ } else {
+ lpcnt = src_length;
+ }
+
+ /*
+ * Use Loop Cnt 0 to load/store from/to peripheral in single transactions
+ * since Burst Req might not be set as pending transfer length maybe less
+ * size of bytes to burst (AxSize * AxLen).
+ */
+ off += _emit_LP(dry_run, &buf[off], 0, lpcnt);
+ ljmp = off;
+
+ /*
+ * do FLUSHP at beginning to clear any stale dma requests before the
+ * first WFP.
+ */
+ if (!(pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP))
+ off += _emit_FLUSHP(dry_run, &buf[off], pxs->desc->peri);
+
+ off += _emit_WFP(dry_run, &buf[off], SINGLE, pxs->desc->peri);
+
+ if (direction == DMA_MEM_TO_DEV)
+ off += _emit_store(dry_run, &buf[off], SINGLE, direction,
+ pxs->desc->peri);
+ else
+ off += _emit_load(dry_run, &buf[off], SINGLE, direction,
+ pxs->desc->peri);
+
+ lpend.cond = ALWAYS;
+ lpend.forever = false;
+ lpend.loop = 0;
+ lpend.bjump = off - ljmp;
+ off += _emit_LPEND(dry_run, &buf[off], &lpend);
+
+ if (direction == DMA_DEV_TO_MEM)
+ off += _emit_store(dry_run, &buf[off], ALWAYS, direction,
+ pxs->desc->peri);
+
+ return off;
+}
+
static int _bursts(struct pl330_dmac *pl330, unsigned dry_run, u8 buf[],
const struct _xfer_spec *pxs, int cyc)
{
@@ -1273,8 +1334,8 @@ static int _dregs(struct pl330_dmac *pl330, unsigned int dry_run, u8 buf[],
case DMA_MEM_TO_DEV:
case DMA_DEV_TO_MEM:
off += _emit_MOV(dry_run, &buf[off], CCR, dregs_ccr);
- off += _ldst_peripheral(pl330, dry_run, &buf[off], pxs, 1,
- BURST);
+ off += _ldst_periph_single_dregs(pl330, dry_run, &buf[off],
+ pxs, src_length, dst_length);
break;
case DMA_MEM_TO_MEM:
--
2.40.1.606.ga4b1b128d6-goog
Powered by blists - more mailing lists