mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 21:58:04 +00:00
793f8ab62c
Add kernel patches for version 6.1. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
65 lines
2.3 KiB
Diff
65 lines
2.3 KiB
Diff
From 153c92ec4e0364c12f99e39106dc79e5b7167cac Mon Sep 17 00:00:00 2001
|
|
From: Dom Cobley <popcornmix@gmail.com>
|
|
Date: Wed, 30 Dec 2020 14:51:29 +0000
|
|
Subject: [PATCH] bcm2835-dma: Add bcm2835-dma: Add DMA_WIDE_SOURCE and
|
|
DMA_WIDE_DEST flags
|
|
|
|
Use (reserved) bits 24 and 25 of the dreq value
|
|
(the second cell of the DT DMA descriptor) to request
|
|
that wide source reads or wide dest writes are required
|
|
|
|
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
|
|
---
|
|
drivers/dma/bcm2835-dma.c | 19 ++++++++++++++++---
|
|
1 file changed, 16 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/dma/bcm2835-dma.c
|
|
+++ b/drivers/dma/bcm2835-dma.c
|
|
@@ -171,6 +171,17 @@ struct bcm2835_desc {
|
|
#define WAIT_RESP(x) ((x & BCM2835_DMA_NO_WAIT_RESP) ? \
|
|
0 : BCM2835_DMA_WAIT_RESP)
|
|
|
|
+/* A fake bit to request that the driver requires wide reads */
|
|
+#define BCM2835_DMA_WIDE_SOURCE BIT(24)
|
|
+#define WIDE_SOURCE(x) ((x & BCM2835_DMA_WIDE_SOURCE) ? \
|
|
+ BCM2835_DMA_S_WIDTH : 0)
|
|
+
|
|
+/* A fake bit to request that the driver requires wide writes */
|
|
+#define BCM2835_DMA_WIDE_DEST BIT(25)
|
|
+#define WIDE_DEST(x) ((x & BCM2835_DMA_WIDE_DEST) ? \
|
|
+ BCM2835_DMA_D_WIDTH : 0)
|
|
+
|
|
+
|
|
/* debug register bits */
|
|
#define BCM2835_DMA_DEBUG_LAST_NOT_SET_ERR BIT(0)
|
|
#define BCM2835_DMA_DEBUG_FIFO_ERR BIT(1)
|
|
@@ -850,7 +861,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;
|
|
+ u32 info = BCM2835_DMA_D_INC | BCM2835_DMA_S_INC |
|
|
+ WIDE_SOURCE(c->dreq) | WIDE_DEST(c->dreq);
|
|
u32 extra = BCM2835_DMA_INT_EN | WAIT_RESP(c->dreq);
|
|
size_t max_len = bcm2835_dma_max_frame_length(c);
|
|
size_t frames;
|
|
@@ -881,7 +893,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);
|
|
+ u32 info = WAIT_RESP(c->dreq) |
|
|
+ WIDE_SOURCE(c->dreq) | WIDE_DEST(c->dreq);
|
|
u32 extra = BCM2835_DMA_INT_EN;
|
|
size_t frames;
|
|
|
|
@@ -943,7 +956,7 @@ 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);
|
|
+ u32 info = WAIT_RESP(c->dreq) | WIDE_SOURCE(c->dreq) | WIDE_DEST(c->dreq);
|
|
u32 extra = 0;
|
|
size_t max_len = bcm2835_dma_max_frame_length(c);
|
|
size_t frames;
|