From 5e764ec9bece7847f6051ac2dd5d14210fc76164 Mon Sep 17 00:00:00 2001 From: Lorenzo Bianconi Date: Sun, 4 Apr 2021 13:36:57 +0200 Subject: [PATCH] mt76: mt7921: introduce MT_WFDMA_DUMMY_CR definition Introduce MT_WFDMA_DUMMY_CR definition and remove magic numbers Signed-off-by: Lorenzo Bianconi Signed-off-by: Felix Fietkau --- mt7921/dma.c | 2 +- mt7921/mac.c | 2 +- mt7921/regs.h | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mt7921/dma.c b/mt7921/dma.c index 60de29a92..992faf82a 100644 --- a/mt7921/dma.c +++ b/mt7921/dma.c @@ -323,7 +323,7 @@ int mt7921_dma_init(struct mt7921_dev *dev) mt76_set(dev, MT_WFDMA0_GLO_CFG, MT_WFDMA0_GLO_CFG_TX_DMA_EN | MT_WFDMA0_GLO_CFG_RX_DMA_EN); - mt76_set(dev, 0x54000120, BIT(1)); + mt76_set(dev, MT_WFDMA_DUMMY_CR, MT_WFDMA_NEED_REINIT); /* enable interrupts for TX/RX rings */ mt7921_irq_enable(dev, MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_ALL | diff --git a/mt7921/mac.c b/mt7921/mac.c index a61b37d0a..19dbb8c36 100644 --- a/mt7921/mac.c +++ b/mt7921/mac.c @@ -1272,7 +1272,7 @@ mt7921_dma_reset(struct mt7921_dev *dev) mt76_set(dev, MT_WFDMA0_GLO_CFG, MT_WFDMA0_GLO_CFG_TX_DMA_EN | MT_WFDMA0_GLO_CFG_RX_DMA_EN); - mt76_set(dev, 0x54000120, BIT(1)); + mt76_set(dev, MT_WFDMA_DUMMY_CR, MT_WFDMA_NEED_REINIT); /* enable interrupts for TX/RX rings */ mt7921_irq_enable(dev, diff --git a/mt7921/regs.h b/mt7921/regs.h index 50249e957..76ecfea21 100644 --- a/mt7921/regs.h +++ b/mt7921/regs.h @@ -385,6 +385,12 @@ #define MT_TOP_MISC MT_TOP(0xf0) #define MT_TOP_MISC_FW_STATE GENMASK(2, 0) +#define MT_MCU_WPDMA0_BASE 0x54000000 +#define MT_MCU_WPDMA0(ofs) (MT_MCU_WPDMA0_BASE + (ofs)) + +#define MT_WFDMA_DUMMY_CR MT_MCU_WPDMA0(0x120) +#define MT_WFDMA_NEED_REINIT BIT(1) + #define MT_HW_BOUND 0x70010020 #define MT_HW_CHIPID 0x70010200 #define MT_HW_REV 0x70010204