Skip to content

Commit cb467c4

Browse files
ADESTMvinodkoul
authored andcommitted
dmaengine: stm32-dma3: refactor HW linked-list to optimize memory accesses
Current behavior splits the buffer/sg in n * STM32_DMA3_MAX_BLOCK_SIZE + 1 for the remainder without optimization. New behavior splits the buffer/sg in n * STM32_DMA3_MAX_BLOCK_SIZE + 1 for (x * chan->max_burst) + 1 for the remainder. Depending on channel FIFO size, optimal double-word (word if only 8-byte FIFO size) bursts can be programmed before managing the very last remainder with lower data width. In case of _prep_slave_sg, and depending on the channel Transfer Complete event configuration, the user is warned about the refactored linked-list, not having the same items count than the initial sg_list. This warning is shown only if the configuration is successful. Signed-off-by: Amelie Delaunay <amelie.delaunay@foss.st.com> Link: https://lore.kernel.org/r/20241016-dma3-mp25-updates-v3-3-8311fe6f228d@foss.st.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent 12eb621 commit cb467c4

File tree

1 file changed

+33
-7
lines changed

1 file changed

+33
-7
lines changed

drivers/dma/stm32/stm32-dma3.c

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,6 +1126,25 @@ static void stm32_dma3_free_chan_resources(struct dma_chan *c)
11261126
chan->config_set = 0;
11271127
}
11281128

1129+
static u32 stm32_dma3_get_ll_count(struct stm32_dma3_chan *chan, size_t len)
1130+
{
1131+
u32 count;
1132+
1133+
count = len / STM32_DMA3_MAX_BLOCK_SIZE;
1134+
len -= (len / STM32_DMA3_MAX_BLOCK_SIZE) * STM32_DMA3_MAX_BLOCK_SIZE;
1135+
1136+
if (len >= chan->max_burst) {
1137+
count += 1; /* len < STM32_DMA3_MAX_BLOCK_SIZE here, so it fits in one item */
1138+
len -= (len / chan->max_burst) * chan->max_burst;
1139+
}
1140+
1141+
/* Unaligned remainder fits in one extra item */
1142+
if (len > 0)
1143+
count += 1;
1144+
1145+
return count;
1146+
}
1147+
11291148
static void stm32_dma3_init_chan_config_for_memcpy(struct stm32_dma3_chan *chan,
11301149
dma_addr_t dst, dma_addr_t src)
11311150
{
@@ -1161,7 +1180,7 @@ static struct dma_async_tx_descriptor *stm32_dma3_prep_dma_memcpy(struct dma_cha
11611180
size_t next_size, offset;
11621181
u32 count, i, ctr1, ctr2;
11631182

1164-
count = DIV_ROUND_UP(len, STM32_DMA3_MAX_BLOCK_SIZE);
1183+
count = stm32_dma3_get_ll_count(chan, len);
11651184

11661185
swdesc = stm32_dma3_chan_desc_alloc(chan, count);
11671186
if (!swdesc)
@@ -1177,6 +1196,9 @@ static struct dma_async_tx_descriptor *stm32_dma3_prep_dma_memcpy(struct dma_cha
11771196
remaining = len - offset;
11781197
next_size = min_t(size_t, remaining, STM32_DMA3_MAX_BLOCK_SIZE);
11791198

1199+
if (next_size < STM32_DMA3_MAX_BLOCK_SIZE && next_size >= chan->max_burst)
1200+
next_size = chan->max_burst * (remaining / chan->max_burst);
1201+
11801202
ret = stm32_dma3_chan_prep_hw(chan, DMA_MEM_TO_MEM, &swdesc->ccr, &ctr1, &ctr2,
11811203
src + offset, dst + offset, next_size);
11821204
if (ret)
@@ -1215,12 +1237,9 @@ static struct dma_async_tx_descriptor *stm32_dma3_prep_slave_sg(struct dma_chan
12151237
u32 i, j, count, ctr1, ctr2;
12161238
int ret;
12171239

1218-
count = sg_len;
1219-
for_each_sg(sgl, sg, sg_len, i) {
1220-
len = sg_dma_len(sg);
1221-
if (len > STM32_DMA3_MAX_BLOCK_SIZE)
1222-
count += DIV_ROUND_UP(len, STM32_DMA3_MAX_BLOCK_SIZE) - 1;
1223-
}
1240+
count = 0;
1241+
for_each_sg(sgl, sg, sg_len, i)
1242+
count += stm32_dma3_get_ll_count(chan, sg_dma_len(sg));
12241243

12251244
swdesc = stm32_dma3_chan_desc_alloc(chan, count);
12261245
if (!swdesc)
@@ -1237,6 +1256,9 @@ static struct dma_async_tx_descriptor *stm32_dma3_prep_slave_sg(struct dma_chan
12371256
do {
12381257
size_t chunk = min_t(size_t, len, STM32_DMA3_MAX_BLOCK_SIZE);
12391258

1259+
if (chunk < STM32_DMA3_MAX_BLOCK_SIZE && chunk >= chan->max_burst)
1260+
chunk = chan->max_burst * (len / chan->max_burst);
1261+
12401262
if (dir == DMA_MEM_TO_DEV) {
12411263
src = sg_addr;
12421264
dst = dev_addr;
@@ -1269,6 +1291,10 @@ static struct dma_async_tx_descriptor *stm32_dma3_prep_slave_sg(struct dma_chan
12691291
} while (len);
12701292
}
12711293

1294+
if (count != sg_len && chan->tcem != CTR2_TCEM_CHANNEL)
1295+
dev_warn(chan2dev(chan), "Linked-list refactored, %d items instead of %d\n",
1296+
count, sg_len);
1297+
12721298
/* Enable Error interrupts */
12731299
swdesc->ccr |= CCR_USEIE | CCR_ULEIE | CCR_DTEIE;
12741300
/* Enable Transfer state interrupts */

0 commit comments

Comments
 (0)