mt76: fix crash on tearing down ext phy
Subsystems (2)
Felix Fietkau
maintainerPATCH 1/3 mt76: fix crash on tearing down ext phy
Only clear dev->phy2 after the phy is gone, the driver may still need to access it until shutdown is complete
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +1 -1
@@ -387,9 +387,9 @@ void mt76_unregister_phy(struct mt76_phy *phy) {struct mt76_dev *dev = phy->dev; - dev->phy2 =NULL ;mt76_tx_status_check (dev,NULL , true);ieee80211_unregister_hw (phy->hw); + dev->phy2 =NULL ; }EXPORT_SYMBOL_GPL (mt76_unregister_phy);
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 2/3 mt76: mt7915: fix vif sta index for DBDC
Since vif indexes are per-phy, we need to factor in the phy index to avoid collisions on the WTBL index
--- drivers/net/wireless/mediatek/mt76/mt7915/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/main.c +2 -1
@@ -189,7 +189,8 @@ static int mt7915_add_interface(struct ieee80211_hw *hw, phy->mt76->vif_mask |=BIT (mvif->idx); phy->omac_mask |=BIT_ULL (mvif->omac_idx); - idx =MT7915_WTBL_RESERVED - mvif->idx; + idx =MT7915_WTBL_RESERVED - mvif->idx - + ext_phy *MT7915_MAX_INTERFACES /2 ;INIT_LIST_HEAD (&mvif->sta.rc_list);INIT_LIST_HEAD (&mvif->sta.stats_list);
Signature · 1 line
2.28.0
Felix Fietkau
maintainerRe: [PATCH 2/3] mt76: mt7915: fix vif sta index for DBDC
Quoted 4 lines · Felix Fietkau
Since vif indexes are per-phy, we need to factor in the phy index to avoid collisions on the WTBL index
Signed-off-by Felix Fietkau <[email protected]>
This one is superseded by
"mt76: mt7915: make vif index per adapter instead of per band"
- Felix
Felix Fietkau
maintainerPATCH 3/3 mt76: mt7915: add support for using a secondary PCIe link for gen1
In reply to Felix FietkauFor performance reasons, mt7915 supports using 2 PCIE gen1 links on platforms that don't support gen2.
Add support for using this to move traffic for a second DBDC band onto a dedicated link
--- .../net/wireless/mediatek/mt76/mt7915/dma.c | 96 ++++++---- .../net/wireless/mediatek/mt76/mt7915/mac.c | 17 ++ .../wireless/mediatek/mt76/mt7915/mt7915.h | 25 ++- .../net/wireless/mediatek/mt76/mt7915/pci.c | 167 +++++++++++++++++- .../net/wireless/mediatek/mt76/mt7915/regs.h | 18 ++ 5 files changed, 284 insertions(+), 39 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/dma.c +66 -30
@@ -73,34 +73,41 @@ static int mt7915_poll_tx(struct napi_struct *napi, int budget)return 0 ; } -void mt7915_dma_prefetch (struct mt7915_dev *dev) +static void __mt7915_dma_prefetch (struct mt7915_dev *dev,u32 ofs) {#define PREFETCH (base, depth) ((base) << 16 | (depth)) -mt76_wr (dev,MT_WFDMA0_RX_RING0_EXT_CTRL ,PREFETCH (0x0 ,0x4 )); -mt76_wr (dev,MT_WFDMA0_RX_RING1_EXT_CTRL ,PREFETCH (0x40 ,0x4 )); -mt76_wr (dev,MT_WFDMA0_RX_RING2_EXT_CTRL ,PREFETCH (0x80 ,0x0 )); - -mt76_wr (dev,MT_WFDMA1_TX_RING0_EXT_CTRL ,PREFETCH (0x80 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING1_EXT_CTRL ,PREFETCH (0xc0 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING2_EXT_CTRL ,PREFETCH (0x100 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING3_EXT_CTRL ,PREFETCH (0x140 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING4_EXT_CTRL ,PREFETCH (0x180 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING5_EXT_CTRL ,PREFETCH (0x1c0 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING6_EXT_CTRL ,PREFETCH (0x200 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING7_EXT_CTRL ,PREFETCH (0x240 ,0x4 )); - -mt76_wr (dev,MT_WFDMA1_TX_RING16_EXT_CTRL ,PREFETCH (0x280 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING17_EXT_CTRL ,PREFETCH (0x2c0 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING18_EXT_CTRL ,PREFETCH (0x300 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING19_EXT_CTRL ,PREFETCH (0x340 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING20_EXT_CTRL ,PREFETCH (0x380 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING21_EXT_CTRL ,PREFETCH (0x3c0 ,0x0 )); - -mt76_wr (dev,MT_WFDMA1_RX_RING0_EXT_CTRL ,PREFETCH (0x3c0 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_RX_RING1_EXT_CTRL ,PREFETCH (0x400 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_RX_RING2_EXT_CTRL ,PREFETCH (0x440 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_RX_RING3_EXT_CTRL ,PREFETCH (0x480 ,0x0 )); +mt76_wr (dev,MT_WFDMA0_RX_RING0_EXT_CTRL + ofs,PREFETCH (0x0 ,0x4 )); +mt76_wr (dev,MT_WFDMA0_RX_RING1_EXT_CTRL + ofs,PREFETCH (0x40 ,0x4 )); +mt76_wr (dev,MT_WFDMA0_RX_RING2_EXT_CTRL + ofs,PREFETCH (0x80 ,0x0 )); + +mt76_wr (dev,MT_WFDMA1_TX_RING0_EXT_CTRL + ofs,PREFETCH (0x80 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING1_EXT_CTRL + ofs,PREFETCH (0xc0 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING2_EXT_CTRL + ofs,PREFETCH (0x100 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING3_EXT_CTRL + ofs,PREFETCH (0x140 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING4_EXT_CTRL + ofs,PREFETCH (0x180 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING5_EXT_CTRL + ofs,PREFETCH (0x1c0 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING6_EXT_CTRL + ofs,PREFETCH (0x200 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING7_EXT_CTRL + ofs,PREFETCH (0x240 ,0x4 )); + +mt76_wr (dev,MT_WFDMA1_TX_RING16_EXT_CTRL + ofs,PREFETCH (0x280 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING17_EXT_CTRL + ofs,PREFETCH (0x2c0 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING18_EXT_CTRL + ofs,PREFETCH (0x300 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING19_EXT_CTRL + ofs,PREFETCH (0x340 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING20_EXT_CTRL + ofs,PREFETCH (0x380 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING21_EXT_CTRL + ofs,PREFETCH (0x3c0 ,0x0 )); + +mt76_wr (dev,MT_WFDMA1_RX_RING0_EXT_CTRL + ofs,PREFETCH (0x3c0 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_RX_RING1_EXT_CTRL + ofs,PREFETCH (0x400 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_RX_RING2_EXT_CTRL + ofs,PREFETCH (0x440 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_RX_RING3_EXT_CTRL + ofs,PREFETCH (0x480 ,0x0 )); +} + +void mt7915_dma_prefetch (struct mt7915_dev *dev) +{ +__mt7915_dma_prefetch (dev,0 ); +if (dev->hif2) +__mt7915_dma_prefetch (dev,MT_WFDMA1_PCIE1_BASE -MT_WFDMA1_BASE ); }static u32 __mt7915_reg_addr (struct mt7915_dev *dev,u32 addr)
@@ -204,6 +211,7 @@ int mt7915_dma_init(struct mt7915_dev *dev)/* Increase buffer size to receive large VHT/HE MPDUs */ struct mt76_bus_ops *bus_ops;int rx_buf_size =MT_RX_BUF_SIZE *2 ; +u32 hif1_ofs =0 ;int ret; dev->bus_ops = dev->mt76.bus;
@@ -219,14 +227,14 @@ int mt7915_dma_init(struct mt7915_dev *dev)mt76_dma_attach (&dev->mt76); +if (dev->hif2) + hif1_ofs =MT_WFDMA1_PCIE1_BASE -MT_WFDMA1_BASE ; +/* configure global setting */ mt76_set (dev,MT_WFDMA1_GLO_CFG ,MT_WFDMA1_GLO_CFG_OMIT_TX_INFO |MT_WFDMA1_GLO_CFG_OMIT_RX_INFO ); -/* configure perfetch settings */ -mt7915_dma_prefetch (dev); -/* reset dma idx */ mt76_wr (dev,MT_WFDMA0_RST_DTX_PTR , ~0 );mt76_wr (dev,MT_WFDMA1_RST_DTX_PTR , ~0 );
@@ -235,6 +243,21 @@ int mt7915_dma_init(struct mt7915_dev *dev)mt76_wr (dev,MT_WFDMA0_PRI_DLY_INT_CFG0 ,0 );mt76_wr (dev,MT_WFDMA1_PRI_DLY_INT_CFG0 ,0 ); +if (dev->hif2) { +mt76_set (dev,MT_WFDMA1_GLO_CFG + hif1_ofs, +MT_WFDMA1_GLO_CFG_OMIT_TX_INFO | +MT_WFDMA1_GLO_CFG_OMIT_RX_INFO ); + +mt76_wr (dev,MT_WFDMA0_RST_DTX_PTR + hif1_ofs, ~0 ); +mt76_wr (dev,MT_WFDMA1_RST_DTX_PTR + hif1_ofs, ~0 ); + +mt76_wr (dev,MT_WFDMA0_PRI_DLY_INT_CFG0 + hif1_ofs,0 ); +mt76_wr (dev,MT_WFDMA1_PRI_DLY_INT_CFG0 + hif1_ofs,0 ); + } + +/* configure perfetch settings */ +mt7915_dma_prefetch (dev); +/* init tx queue */ ret =mt7915_init_tx_queues (&dev->phy,MT7915_TXQ_BAND0 ,MT7915_TX_RING_SIZE );
@@ -283,7 +306,8 @@ int mt7915_dma_init(struct mt7915_dev *dev)if (dev->dbdc_support) { ret =mt76_queue_alloc (dev, &dev->mt76.q_rx[MT_RXQ_EXT ],MT7915_RXQ_BAND1 ,MT7915_RX_RING_SIZE , - rx_buf_size,MT_RX_DATA_RING_BASE ); + rx_buf_size, +MT_RX_DATA_RING_BASE + hif1_ofs);if (ret)return ret;
@@ -291,7 +315,8 @@ int mt7915_dma_init(struct mt7915_dev *dev) ret =mt76_queue_alloc (dev, &dev->mt76.q_rx[MT_RXQ_EXT_WA ],MT7915_RXQ_MCU_WA_EXT ,MT7915_RX_MCU_RING_SIZE , - rx_buf_size,MT_RX_EVENT_RING_BASE ); + rx_buf_size, +MT_RX_EVENT_RING_BASE + hif1_ofs);if (ret)return ret; }
@@ -334,6 +359,17 @@ int mt7915_dma_init(struct mt7915_dev *dev)mt76_set (dev,MT_WFDMA1_GLO_CFG ,MT_WFDMA1_GLO_CFG_TX_DMA_EN |MT_WFDMA1_GLO_CFG_RX_DMA_EN ); +if (dev->hif2) { +mt76_set (dev,MT_WFDMA0_GLO_CFG + hif1_ofs, + (MT_WFDMA0_GLO_CFG_TX_DMA_EN | +MT_WFDMA0_GLO_CFG_RX_DMA_EN )); +mt76_set (dev,MT_WFDMA1_GLO_CFG + hif1_ofs, + (MT_WFDMA1_GLO_CFG_TX_DMA_EN | +MT_WFDMA1_GLO_CFG_RX_DMA_EN )); +mt76_set (dev,MT_WFDMA_HOST_CONFIG , +MT_WFDMA_HOST_CONFIG_PDMA_BAND ); + } +/* enable interrupts for TX/RX rings */ mt7915_irq_enable (dev,MT_INT_RX_DONE_ALL |MT_INT_TX_DONE_MCU |MT_INT_MCU_CMD );
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +17 -0
@@ -1474,12 +1474,21 @@ mt7915_dma_reset(struct mt7915_phy *phy) {struct mt7915_dev *dev = phy->dev;struct mt76_phy *mphy_ext = dev->mt76.phy2; +u32 hif1_ofs =MT_WFDMA1_PCIE1_BASE -MT_WFDMA1_BASE ;int i;mt76_clear (dev,MT_WFDMA0_GLO_CFG ,MT_WFDMA0_GLO_CFG_TX_DMA_EN |MT_WFDMA0_GLO_CFG_RX_DMA_EN );mt76_clear (dev,MT_WFDMA1_GLO_CFG ,MT_WFDMA1_GLO_CFG_TX_DMA_EN |MT_WFDMA1_GLO_CFG_RX_DMA_EN ); +if (dev->hif2) { +mt76_clear (dev,MT_WFDMA0_GLO_CFG + hif1_ofs, + (MT_WFDMA0_GLO_CFG_TX_DMA_EN | +MT_WFDMA0_GLO_CFG_RX_DMA_EN )); +mt76_clear (dev,MT_WFDMA1_GLO_CFG + hif1_ofs, + (MT_WFDMA1_GLO_CFG_TX_DMA_EN | +MT_WFDMA1_GLO_CFG_RX_DMA_EN )); + }usleep_range (1000 ,2000 );mt76_queue_tx_cleanup (dev, dev->mt76.q_mcu[MT_MCUQ_WA ], true);
@@ -1500,6 +1509,14 @@ mt7915_dma_reset(struct mt7915_phy *phy) MT_WFDMA0_GLO_CFG_TX_DMA_EN | MT_WFDMA0_GLO_CFG_RX_DMA_EN);mt76_set (dev,MT_WFDMA1_GLO_CFG ,MT_WFDMA1_GLO_CFG_TX_DMA_EN |MT_WFDMA1_GLO_CFG_RX_DMA_EN ); +if (dev->hif2) { +mt76_set (dev,MT_WFDMA0_GLO_CFG + hif1_ofs, + (MT_WFDMA0_GLO_CFG_TX_DMA_EN | +MT_WFDMA0_GLO_CFG_RX_DMA_EN )); +mt76_set (dev,MT_WFDMA1_GLO_CFG + hif1_ofs, + (MT_WFDMA1_GLO_CFG_TX_DMA_EN | +MT_WFDMA1_GLO_CFG_RX_DMA_EN )); + } }void mt7915_tx_token_put (struct mt7915_dev *dev)
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +22 -3
@@ -115,6 +115,14 @@ struct mib_stats {u16 ba_miss_cnt; }; +struct mt7915_hif { +struct list_head list; + +struct device *dev; +void __iomem *regs; +int irq; +}; +struct mt7915_phy {struct mt76_phy *mt76;struct mt7915_dev *dev;
@@ -163,10 +171,13 @@ struct mt7915_dev {struct mt76_phy mphy; }; +struct mt7915_hif *hif2; +const struct mt76_bus_ops *bus_ops;struct mt7915_phy phy;u16 chainmask; +u32 hif_idx;struct work_struct init_work;struct work_struct rc_work;
@@ -278,7 +289,6 @@ static inline u8 mt7915_lmac_mapping(struct mt7915_dev *dev, u8 ac) }extern const struct ieee80211_ops mt7915_ops; -extern struct pci_driver mt7915_pci_driver;extern const struct mt76_testmode_ops mt7915_testmode_ops;u32 mt7915_reg_map (struct mt7915_dev *dev,u32 addr);
@@ -365,14 +375,23 @@ static inline bool is_mt7915(struct mt76_dev *dev)return mt76_chip (dev) ==0x7915 ; } +void mt7915_dual_hif_set_irq_mask (struct mt7915_dev *dev,bool write_reg, +u32 clear,u32 set); +static inline void mt7915_irq_enable (struct mt7915_dev *dev,u32 mask) { -mt76_set_irq_mask (&dev->mt76,MT_INT_MASK_CSR ,0 , mask); +if (dev->hif2) +mt7915_dual_hif_set_irq_mask (dev, true,0 , mask); +else +mt76_set_irq_mask (&dev->mt76,MT_INT_MASK_CSR ,0 , mask); }static inline void mt7915_irq_disable (struct mt7915_dev *dev,u32 mask) { -mt76_set_irq_mask (&dev->mt76,MT_INT_MASK_CSR , mask,0 ); +if (dev->hif2) +mt7915_dual_hif_set_irq_mask (dev, true, mask,0 ); +else +mt76_set_irq_mask (&dev->mt76,MT_INT_MASK_CSR , mask,0 ); } static inline u32
drivers/net/wireless/mediatek/mt76/mt7915/pci.c +161 -6
232 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7915/regs.h +18 -0
@@ -355,15 +355,29 @@#define MT_INT_TX_DONE_MCU_WM BIT(27)#define MT_INT_TX_DONE_BAND0 BIT(30)#define MT_INT_TX_DONE_BAND1 BIT(31) + +#define MT_INT_BAND1_MASK (MT_INT_RX_DONE_WA_EXT | \ + MT_INT_TX_DONE_BAND1) +#define MT_INT_MCU_CMD BIT(29)#define MT_INT_TX_DONE_MCU (MT_INT_TX_DONE_MCU_WA | \ MT_INT_TX_DONE_MCU_WM | \ MT_INT_TX_DONE_FWDL) +#define MT_WFDMA_HOST_CONFIG MT_WFDMA_EXT_CSR(0x30) +#define MT_WFDMA_HOST_CONFIG_PDMA_BAND BIT(0) +#define MT_WFDMA_EXT_CSR_HIF_MISC MT_WFDMA_EXT_CSR(0x44)#define MT_WFDMA_EXT_CSR_HIF_MISC_BUSY BIT(0) +#define MT_INT1_SOURCE_CSR MT_WFDMA_EXT_CSR(0x88) +#define MT_INT1_MASK_CSR MT_WFDMA_EXT_CSR(0x8c) + +#define MT_PCIE_RECOG_ID MT_WFDMA_EXT_CSR(0x90) +#define MT_PCIE_RECOG_ID_MASK GENMASK(30, 0) +#define MT_PCIE_RECOG_ID_SEM BIT(31) +/* WFDMA0 PCIE1 */ #define MT_WFDMA0_PCIE1_BASE 0xd8000#define MT_WFDMA0_PCIE1 (ofs) (MT_WFDMA0_PCIE1_BASE + (ofs))
@@ -418,6 +432,10 @@#define MT_HW_CHIPID 0x70010200#define MT_HW_REV 0x70010204 +#define MT_PCIE1_MAC_BASE 0x74020000 +#define MT_PCIE1_MAC (ofs) (MT_PCIE1_MAC_BASE + (ofs)) +#define MT_PCIE1_MAC_INT_ENABLE MT_PCIE1_MAC(0x188) +#define MT_PCIE_MAC_BASE 0x74030000#define MT_PCIE_MAC (ofs) (MT_PCIE_MAC_BASE + (ofs))#define MT_PCIE_MAC_INT_ENABLE MT_PCIE_MAC(0x188)
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH v2 3/3 mt76: mt7915: add support for using a secondary PCIe link for gen1
For performance reasons, mt7915 supports using 2 PCIE gen1 links on platforms that don't support gen2.
Add support for using this to move traffic for a second DBDC band onto a dedicated link
---
v2: prevent writes to irq mask and recognition id register when gen1 is not in use
.../net/wireless/mediatek/mt76/mt7915/dma.c | 96 +++++++--- .../net/wireless/mediatek/mt76/mt7915/mac.c | 17 ++ .../wireless/mediatek/mt76/mt7915/mt7915.h | 25 ++- .../net/wireless/mediatek/mt76/mt7915/pci.c | 173 +++++++++++++++++- .../net/wireless/mediatek/mt76/mt7915/regs.h | 18 ++ 5 files changed, 290 insertions(+), 39 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/dma.c +66 -30
@@ -73,34 +73,41 @@ static int mt7915_poll_tx(struct napi_struct *napi, int budget)return 0 ; } -void mt7915_dma_prefetch (struct mt7915_dev *dev) +static void __mt7915_dma_prefetch (struct mt7915_dev *dev,u32 ofs) {#define PREFETCH (base, depth) ((base) << 16 | (depth)) -mt76_wr (dev,MT_WFDMA0_RX_RING0_EXT_CTRL ,PREFETCH (0x0 ,0x4 )); -mt76_wr (dev,MT_WFDMA0_RX_RING1_EXT_CTRL ,PREFETCH (0x40 ,0x4 )); -mt76_wr (dev,MT_WFDMA0_RX_RING2_EXT_CTRL ,PREFETCH (0x80 ,0x0 )); - -mt76_wr (dev,MT_WFDMA1_TX_RING0_EXT_CTRL ,PREFETCH (0x80 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING1_EXT_CTRL ,PREFETCH (0xc0 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING2_EXT_CTRL ,PREFETCH (0x100 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING3_EXT_CTRL ,PREFETCH (0x140 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING4_EXT_CTRL ,PREFETCH (0x180 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING5_EXT_CTRL ,PREFETCH (0x1c0 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING6_EXT_CTRL ,PREFETCH (0x200 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING7_EXT_CTRL ,PREFETCH (0x240 ,0x4 )); - -mt76_wr (dev,MT_WFDMA1_TX_RING16_EXT_CTRL ,PREFETCH (0x280 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING17_EXT_CTRL ,PREFETCH (0x2c0 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING18_EXT_CTRL ,PREFETCH (0x300 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING19_EXT_CTRL ,PREFETCH (0x340 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING20_EXT_CTRL ,PREFETCH (0x380 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_TX_RING21_EXT_CTRL ,PREFETCH (0x3c0 ,0x0 )); - -mt76_wr (dev,MT_WFDMA1_RX_RING0_EXT_CTRL ,PREFETCH (0x3c0 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_RX_RING1_EXT_CTRL ,PREFETCH (0x400 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_RX_RING2_EXT_CTRL ,PREFETCH (0x440 ,0x4 )); -mt76_wr (dev,MT_WFDMA1_RX_RING3_EXT_CTRL ,PREFETCH (0x480 ,0x0 )); +mt76_wr (dev,MT_WFDMA0_RX_RING0_EXT_CTRL + ofs,PREFETCH (0x0 ,0x4 )); +mt76_wr (dev,MT_WFDMA0_RX_RING1_EXT_CTRL + ofs,PREFETCH (0x40 ,0x4 )); +mt76_wr (dev,MT_WFDMA0_RX_RING2_EXT_CTRL + ofs,PREFETCH (0x80 ,0x0 )); + +mt76_wr (dev,MT_WFDMA1_TX_RING0_EXT_CTRL + ofs,PREFETCH (0x80 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING1_EXT_CTRL + ofs,PREFETCH (0xc0 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING2_EXT_CTRL + ofs,PREFETCH (0x100 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING3_EXT_CTRL + ofs,PREFETCH (0x140 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING4_EXT_CTRL + ofs,PREFETCH (0x180 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING5_EXT_CTRL + ofs,PREFETCH (0x1c0 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING6_EXT_CTRL + ofs,PREFETCH (0x200 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING7_EXT_CTRL + ofs,PREFETCH (0x240 ,0x4 )); + +mt76_wr (dev,MT_WFDMA1_TX_RING16_EXT_CTRL + ofs,PREFETCH (0x280 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING17_EXT_CTRL + ofs,PREFETCH (0x2c0 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING18_EXT_CTRL + ofs,PREFETCH (0x300 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING19_EXT_CTRL + ofs,PREFETCH (0x340 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING20_EXT_CTRL + ofs,PREFETCH (0x380 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_TX_RING21_EXT_CTRL + ofs,PREFETCH (0x3c0 ,0x0 )); + +mt76_wr (dev,MT_WFDMA1_RX_RING0_EXT_CTRL + ofs,PREFETCH (0x3c0 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_RX_RING1_EXT_CTRL + ofs,PREFETCH (0x400 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_RX_RING2_EXT_CTRL + ofs,PREFETCH (0x440 ,0x4 )); +mt76_wr (dev,MT_WFDMA1_RX_RING3_EXT_CTRL + ofs,PREFETCH (0x480 ,0x0 )); +} + +void mt7915_dma_prefetch (struct mt7915_dev *dev) +{ +__mt7915_dma_prefetch (dev,0 ); +if (dev->hif2) +__mt7915_dma_prefetch (dev,MT_WFDMA1_PCIE1_BASE -MT_WFDMA1_BASE ); }static u32 __mt7915_reg_addr (struct mt7915_dev *dev,u32 addr)
@@ -204,6 +211,7 @@ int mt7915_dma_init(struct mt7915_dev *dev)/* Increase buffer size to receive large VHT/HE MPDUs */ struct mt76_bus_ops *bus_ops;int rx_buf_size =MT_RX_BUF_SIZE *2 ; +u32 hif1_ofs =0 ;int ret; dev->bus_ops = dev->mt76.bus;
@@ -219,14 +227,14 @@ int mt7915_dma_init(struct mt7915_dev *dev)mt76_dma_attach (&dev->mt76); +if (dev->hif2) + hif1_ofs =MT_WFDMA1_PCIE1_BASE -MT_WFDMA1_BASE ; +/* configure global setting */ mt76_set (dev,MT_WFDMA1_GLO_CFG ,MT_WFDMA1_GLO_CFG_OMIT_TX_INFO |MT_WFDMA1_GLO_CFG_OMIT_RX_INFO ); -/* configure perfetch settings */ -mt7915_dma_prefetch (dev); -/* reset dma idx */ mt76_wr (dev,MT_WFDMA0_RST_DTX_PTR , ~0 );mt76_wr (dev,MT_WFDMA1_RST_DTX_PTR , ~0 );
@@ -235,6 +243,21 @@ int mt7915_dma_init(struct mt7915_dev *dev)mt76_wr (dev,MT_WFDMA0_PRI_DLY_INT_CFG0 ,0 );mt76_wr (dev,MT_WFDMA1_PRI_DLY_INT_CFG0 ,0 ); +if (dev->hif2) { +mt76_set (dev,MT_WFDMA1_GLO_CFG + hif1_ofs, +MT_WFDMA1_GLO_CFG_OMIT_TX_INFO | +MT_WFDMA1_GLO_CFG_OMIT_RX_INFO ); + +mt76_wr (dev,MT_WFDMA0_RST_DTX_PTR + hif1_ofs, ~0 ); +mt76_wr (dev,MT_WFDMA1_RST_DTX_PTR + hif1_ofs, ~0 ); + +mt76_wr (dev,MT_WFDMA0_PRI_DLY_INT_CFG0 + hif1_ofs,0 ); +mt76_wr (dev,MT_WFDMA1_PRI_DLY_INT_CFG0 + hif1_ofs,0 ); + } + +/* configure perfetch settings */ +mt7915_dma_prefetch (dev); +/* init tx queue */ ret =mt7915_init_tx_queues (&dev->phy,MT7915_TXQ_BAND0 ,MT7915_TX_RING_SIZE );
@@ -283,7 +306,8 @@ int mt7915_dma_init(struct mt7915_dev *dev)if (dev->dbdc_support) { ret =mt76_queue_alloc (dev, &dev->mt76.q_rx[MT_RXQ_EXT ],MT7915_RXQ_BAND1 ,MT7915_RX_RING_SIZE , - rx_buf_size,MT_RX_DATA_RING_BASE ); + rx_buf_size, +MT_RX_DATA_RING_BASE + hif1_ofs);if (ret)return ret;
@@ -291,7 +315,8 @@ int mt7915_dma_init(struct mt7915_dev *dev) ret =mt76_queue_alloc (dev, &dev->mt76.q_rx[MT_RXQ_EXT_WA ],MT7915_RXQ_MCU_WA_EXT ,MT7915_RX_MCU_RING_SIZE , - rx_buf_size,MT_RX_EVENT_RING_BASE ); + rx_buf_size, +MT_RX_EVENT_RING_BASE + hif1_ofs);if (ret)return ret; }
@@ -334,6 +359,17 @@ int mt7915_dma_init(struct mt7915_dev *dev)mt76_set (dev,MT_WFDMA1_GLO_CFG ,MT_WFDMA1_GLO_CFG_TX_DMA_EN |MT_WFDMA1_GLO_CFG_RX_DMA_EN ); +if (dev->hif2) { +mt76_set (dev,MT_WFDMA0_GLO_CFG + hif1_ofs, + (MT_WFDMA0_GLO_CFG_TX_DMA_EN | +MT_WFDMA0_GLO_CFG_RX_DMA_EN )); +mt76_set (dev,MT_WFDMA1_GLO_CFG + hif1_ofs, + (MT_WFDMA1_GLO_CFG_TX_DMA_EN | +MT_WFDMA1_GLO_CFG_RX_DMA_EN )); +mt76_set (dev,MT_WFDMA_HOST_CONFIG , +MT_WFDMA_HOST_CONFIG_PDMA_BAND ); + } +/* enable interrupts for TX/RX rings */ mt7915_irq_enable (dev,MT_INT_RX_DONE_ALL |MT_INT_TX_DONE_MCU |MT_INT_MCU_CMD );
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +17 -0
@@ -1474,12 +1474,21 @@ mt7915_dma_reset(struct mt7915_phy *phy) {struct mt7915_dev *dev = phy->dev;struct mt76_phy *mphy_ext = dev->mt76.phy2; +u32 hif1_ofs =MT_WFDMA1_PCIE1_BASE -MT_WFDMA1_BASE ;int i;mt76_clear (dev,MT_WFDMA0_GLO_CFG ,MT_WFDMA0_GLO_CFG_TX_DMA_EN |MT_WFDMA0_GLO_CFG_RX_DMA_EN );mt76_clear (dev,MT_WFDMA1_GLO_CFG ,MT_WFDMA1_GLO_CFG_TX_DMA_EN |MT_WFDMA1_GLO_CFG_RX_DMA_EN ); +if (dev->hif2) { +mt76_clear (dev,MT_WFDMA0_GLO_CFG + hif1_ofs, + (MT_WFDMA0_GLO_CFG_TX_DMA_EN | +MT_WFDMA0_GLO_CFG_RX_DMA_EN )); +mt76_clear (dev,MT_WFDMA1_GLO_CFG + hif1_ofs, + (MT_WFDMA1_GLO_CFG_TX_DMA_EN | +MT_WFDMA1_GLO_CFG_RX_DMA_EN )); + }usleep_range (1000 ,2000 );mt76_queue_tx_cleanup (dev, dev->mt76.q_mcu[MT_MCUQ_WA ], true);
@@ -1500,6 +1509,14 @@ mt7915_dma_reset(struct mt7915_phy *phy) MT_WFDMA0_GLO_CFG_TX_DMA_EN | MT_WFDMA0_GLO_CFG_RX_DMA_EN);mt76_set (dev,MT_WFDMA1_GLO_CFG ,MT_WFDMA1_GLO_CFG_TX_DMA_EN |MT_WFDMA1_GLO_CFG_RX_DMA_EN ); +if (dev->hif2) { +mt76_set (dev,MT_WFDMA0_GLO_CFG + hif1_ofs, + (MT_WFDMA0_GLO_CFG_TX_DMA_EN | +MT_WFDMA0_GLO_CFG_RX_DMA_EN )); +mt76_set (dev,MT_WFDMA1_GLO_CFG + hif1_ofs, + (MT_WFDMA1_GLO_CFG_TX_DMA_EN | +MT_WFDMA1_GLO_CFG_RX_DMA_EN )); + } }void mt7915_tx_token_put (struct mt7915_dev *dev)
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +22 -3
@@ -115,6 +115,14 @@ struct mib_stats {u16 ba_miss_cnt; }; +struct mt7915_hif { +struct list_head list; + +struct device *dev; +void __iomem *regs; +int irq; +}; +struct mt7915_phy {struct mt76_phy *mt76;struct mt7915_dev *dev;
@@ -163,10 +171,13 @@ struct mt7915_dev {struct mt76_phy mphy; }; +struct mt7915_hif *hif2; +const struct mt76_bus_ops *bus_ops;struct mt7915_phy phy;u16 chainmask; +u32 hif_idx;struct work_struct init_work;struct work_struct rc_work;
@@ -278,7 +289,6 @@ static inline u8 mt7915_lmac_mapping(struct mt7915_dev *dev, u8 ac) }extern const struct ieee80211_ops mt7915_ops; -extern struct pci_driver mt7915_pci_driver;extern const struct mt76_testmode_ops mt7915_testmode_ops;u32 mt7915_reg_map (struct mt7915_dev *dev,u32 addr);
@@ -365,14 +375,23 @@ static inline bool is_mt7915(struct mt76_dev *dev)return mt76_chip (dev) ==0x7915 ; } +void mt7915_dual_hif_set_irq_mask (struct mt7915_dev *dev,bool write_reg, +u32 clear,u32 set); +static inline void mt7915_irq_enable (struct mt7915_dev *dev,u32 mask) { -mt76_set_irq_mask (&dev->mt76,MT_INT_MASK_CSR ,0 , mask); +if (dev->hif2) +mt7915_dual_hif_set_irq_mask (dev, true,0 , mask); +else +mt76_set_irq_mask (&dev->mt76,MT_INT_MASK_CSR ,0 , mask); }static inline void mt7915_irq_disable (struct mt7915_dev *dev,u32 mask) { -mt76_set_irq_mask (&dev->mt76,MT_INT_MASK_CSR , mask,0 ); +if (dev->hif2) +mt7915_dual_hif_set_irq_mask (dev, true, mask,0 ); +else +mt76_set_irq_mask (&dev->mt76,MT_INT_MASK_CSR , mask,0 ); } static inline u32
drivers/net/wireless/mediatek/mt76/mt7915/pci.c +167 -6
232 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7915/regs.h +18 -0
@@ -355,15 +355,29 @@#define MT_INT_TX_DONE_MCU_WM BIT(27)#define MT_INT_TX_DONE_BAND0 BIT(30)#define MT_INT_TX_DONE_BAND1 BIT(31) + +#define MT_INT_BAND1_MASK (MT_INT_RX_DONE_WA_EXT | \ + MT_INT_TX_DONE_BAND1) +#define MT_INT_MCU_CMD BIT(29)#define MT_INT_TX_DONE_MCU (MT_INT_TX_DONE_MCU_WA | \ MT_INT_TX_DONE_MCU_WM | \ MT_INT_TX_DONE_FWDL) +#define MT_WFDMA_HOST_CONFIG MT_WFDMA_EXT_CSR(0x30) +#define MT_WFDMA_HOST_CONFIG_PDMA_BAND BIT(0) +#define MT_WFDMA_EXT_CSR_HIF_MISC MT_WFDMA_EXT_CSR(0x44)#define MT_WFDMA_EXT_CSR_HIF_MISC_BUSY BIT(0) +#define MT_INT1_SOURCE_CSR MT_WFDMA_EXT_CSR(0x88) +#define MT_INT1_MASK_CSR MT_WFDMA_EXT_CSR(0x8c) + +#define MT_PCIE_RECOG_ID MT_WFDMA_EXT_CSR(0x90) +#define MT_PCIE_RECOG_ID_MASK GENMASK(30, 0) +#define MT_PCIE_RECOG_ID_SEM BIT(31) +/* WFDMA0 PCIE1 */ #define MT_WFDMA0_PCIE1_BASE 0xd8000#define MT_WFDMA0_PCIE1 (ofs) (MT_WFDMA0_PCIE1_BASE + (ofs))
@@ -418,6 +432,10 @@#define MT_HW_CHIPID 0x70010200#define MT_HW_REV 0x70010204 +#define MT_PCIE1_MAC_BASE 0x74020000 +#define MT_PCIE1_MAC (ofs) (MT_PCIE1_MAC_BASE + (ofs)) +#define MT_PCIE1_MAC_INT_ENABLE MT_PCIE1_MAC(0x188) +#define MT_PCIE_MAC_BASE 0x74030000#define MT_PCIE_MAC (ofs) (MT_PCIE_MAC_BASE + (ofs))#define MT_PCIE_MAC_INT_ENABLE MT_PCIE_MAC(0x188)
Signature · 1 line
2.28.0