mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +00:00
793f8ab62c
Add kernel patches for version 6.1. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
97 lines
3.9 KiB
Diff
97 lines
3.9 KiB
Diff
From 8c5a3ead40c1778595be768db284c66c03546e2d Mon Sep 17 00:00:00 2001
|
|
From: Dom Cobley <popcornmix@gmail.com>
|
|
Date: Fri, 21 Apr 2023 20:24:54 +0100
|
|
Subject: [PATCH] bcm2835-dma: Support dma flags for multi-beat burst
|
|
|
|
Add a control bit to enable a multi-beat burst on a DMA.
|
|
This improves DMA performance and is required for HDMI audio.
|
|
|
|
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
|
|
---
|
|
drivers/dma/bcm2835-dma.c | 28 ++++++++++++++++++++--------
|
|
1 file changed, 20 insertions(+), 8 deletions(-)
|
|
|
|
--- a/drivers/dma/bcm2835-dma.c
|
|
+++ b/drivers/dma/bcm2835-dma.c
|
|
@@ -158,7 +158,8 @@ struct bcm2835_desc {
|
|
#define BCM2835_DMA_S_WIDTH BIT(9) /* 128bit writes if set */
|
|
#define BCM2835_DMA_S_DREQ BIT(10) /* enable SREQ for source */
|
|
#define BCM2835_DMA_S_IGNORE BIT(11) /* ignore source reads - read 0 */
|
|
-#define BCM2835_DMA_BURST_LENGTH(x) ((x & 15) << 12)
|
|
+#define BCM2835_DMA_BURST_LENGTH(x) (((x) & 15) << 12)
|
|
+#define BCM2835_DMA_GET_BURST_LENGTH(x) (((x) >> 12) & 15)
|
|
#define BCM2835_DMA_CS_FLAGS(x) (x & (BCM2835_DMA_PRIORITY(15) | \
|
|
BCM2835_DMA_PANIC_PRIORITY(15) | \
|
|
BCM2835_DMA_WAIT_FOR_WRITES | \
|
|
@@ -182,6 +183,11 @@ struct bcm2835_desc {
|
|
#define WIDE_DEST(x) ((x & BCM2835_DMA_WIDE_DEST) ? \
|
|
BCM2835_DMA_D_WIDTH : 0)
|
|
|
|
+/* A fake bit to request that the driver requires multi-beat burst */
|
|
+#define BCM2835_DMA_BURST BIT(30)
|
|
+#define BURST_LENGTH(x) ((x & BCM2835_DMA_BURST) ? \
|
|
+ BCM2835_DMA_BURST_LENGTH(3) : 0)
|
|
+
|
|
|
|
/* debug register bits */
|
|
#define BCM2835_DMA_DEBUG_LAST_NOT_SET_ERR BIT(0)
|
|
@@ -285,7 +291,7 @@ struct bcm2835_desc {
|
|
/* the max dma length for different channels */
|
|
#define MAX_DMA40_LEN SZ_1G
|
|
|
|
-#define BCM2711_DMA40_BURST_LEN(x) ((min(x,16) - 1) << 8)
|
|
+#define BCM2711_DMA40_BURST_LEN(x) (((x) & 15) << 8)
|
|
#define BCM2711_DMA40_INC BIT(12)
|
|
#define BCM2711_DMA40_SIZE_32 (0 << 13)
|
|
#define BCM2711_DMA40_SIZE_64 (1 << 13)
|
|
@@ -362,12 +368,16 @@ static inline uint32_t to_bcm2711_ti(uin
|
|
|
|
static inline uint32_t to_bcm2711_srci(uint32_t info)
|
|
{
|
|
- return ((info & BCM2835_DMA_S_INC) ? BCM2711_DMA40_INC : 0);
|
|
+ return ((info & BCM2835_DMA_S_INC) ? BCM2711_DMA40_INC : 0) |
|
|
+ ((info & BCM2835_DMA_S_WIDTH) ? BCM2711_DMA40_SIZE_128 : 0) |
|
|
+ BCM2711_DMA40_BURST_LEN(BCM2835_DMA_GET_BURST_LENGTH(info));
|
|
}
|
|
|
|
static inline uint32_t to_bcm2711_dsti(uint32_t info)
|
|
{
|
|
- return ((info & BCM2835_DMA_D_INC) ? BCM2711_DMA40_INC : 0);
|
|
+ return ((info & BCM2835_DMA_D_INC) ? BCM2711_DMA40_INC : 0) |
|
|
+ ((info & BCM2835_DMA_D_WIDTH) ? BCM2711_DMA40_SIZE_128 : 0) |
|
|
+ BCM2711_DMA40_BURST_LEN(BCM2835_DMA_GET_BURST_LENGTH(info));
|
|
}
|
|
|
|
static inline uint32_t to_bcm2711_cbaddr(dma_addr_t addr)
|
|
@@ -936,7 +946,8 @@ static struct dma_async_tx_descriptor *b
|
|
struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
|
|
struct bcm2835_desc *d;
|
|
u32 info = BCM2835_DMA_D_INC | BCM2835_DMA_S_INC |
|
|
- WAIT_RESP(c->dreq) | WIDE_SOURCE(c->dreq) | WIDE_DEST(c->dreq);
|
|
+ WAIT_RESP(c->dreq) | WIDE_SOURCE(c->dreq) |
|
|
+ WIDE_DEST(c->dreq) | BURST_LENGTH(c->dreq);
|
|
u32 extra = BCM2835_DMA_INT_EN;
|
|
size_t max_len = bcm2835_dma_max_frame_length(c);
|
|
size_t frames;
|
|
@@ -967,8 +978,8 @@ static struct dma_async_tx_descriptor *b
|
|
struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
|
|
struct bcm2835_desc *d;
|
|
dma_addr_t src = 0, dst = 0;
|
|
- u32 info = WAIT_RESP(c->dreq) |
|
|
- WIDE_SOURCE(c->dreq) | WIDE_DEST(c->dreq);
|
|
+ u32 info = WAIT_RESP(c->dreq) | WIDE_SOURCE(c->dreq) |
|
|
+ WIDE_DEST(c->dreq) | BURST_LENGTH(c->dreq);
|
|
u32 extra = BCM2835_DMA_INT_EN;
|
|
size_t frames;
|
|
|
|
@@ -1020,7 +1031,8 @@ static struct dma_async_tx_descriptor *b
|
|
struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
|
|
struct bcm2835_desc *d;
|
|
dma_addr_t src, dst;
|
|
- u32 info = WAIT_RESP(c->dreq) | WIDE_SOURCE(c->dreq) | WIDE_DEST(c->dreq);
|
|
+ u32 info = WAIT_RESP(c->dreq) | WIDE_SOURCE(c->dreq) |
|
|
+ WIDE_DEST(c->dreq) | BURST_LENGTH(c->dreq);
|
|
u32 extra = 0;
|
|
size_t max_len = bcm2835_dma_max_frame_length(c);
|
|
size_t frames;
|