mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
32 lines
1.3 KiB
Diff
32 lines
1.3 KiB
Diff
From 396d1f8952dabc5fb9fec6931606023ca3a00732 Mon Sep 17 00:00:00 2001
|
|
From: Dom Cobley <popcornmix@gmail.com>
|
|
Date: Tue, 30 May 2023 15:51:48 +0100
|
|
Subject: [PATCH] bcm2835-dma: Move definition of PROT bits to expected place
|
|
|
|
Fixes: 654368fe848c ("bcm2835-dma: Need to keep PROT bits set in CS on 40bit controller")
|
|
|
|
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
|
|
---
|
|
drivers/dma/bcm2835-dma.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/dma/bcm2835-dma.c
|
|
+++ b/drivers/dma/bcm2835-dma.c
|
|
@@ -242,6 +242,8 @@ struct bcm2835_desc {
|
|
#define BCM2711_DMA40_WR_PAUSED BIT(5) /* Writing is paused */
|
|
#define BCM2711_DMA40_DREQ_PAUSED BIT(6) /* Is paused by DREQ flow control */
|
|
#define BCM2711_DMA40_WAITING_FOR_WRITES BIT(7) /* Waiting for last write */
|
|
+// we always want to run in supervisor mode
|
|
+#define BCM2711_DMA40_PROT (BIT(8)|BIT(9))
|
|
#define BCM2711_DMA40_ERR BIT(10)
|
|
#define BCM2711_DMA40_QOS(x) (((x) & 0x1f) << 16)
|
|
#define BCM2711_DMA40_PANIC_QOS(x) (((x) & 0x1f) << 20)
|
|
@@ -250,8 +252,6 @@ struct bcm2835_desc {
|
|
#define BCM2711_DMA40_DISDEBUG BIT(29)
|
|
#define BCM2711_DMA40_ABORT BIT(30)
|
|
#define BCM2711_DMA40_HALT BIT(31)
|
|
-// we always want to run in supervisor mode
|
|
-#define BCM2711_DMA40_PROT (BIT(8)|BIT(9))
|
|
|
|
#define BCM2711_DMA40_CS_FLAGS(x) (x & (BCM2711_DMA40_QOS(15) | \
|
|
BCM2711_DMA40_PANIC_QOS(15) | \
|