fixup-731-v6.18-net-mediatek-wed-Introduce-MT7992-WED-support-to-MT7.patch (2578B)
1 diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c 2 index 4a82f8e4c118..36488aa6cc20 100644 3 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c 4 +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c 5 @@ -664,8 +664,8 @@ int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr, 6 MT_RXQ_WED_RING_BASE; 7 wed->wlan.wpdma_rx_glo = pci_resource_start(pci_dev, 0) + 8 MT_WPDMA_GLO_CFG; 9 - wed->wlan.wpdma_rx = pci_resource_start(pci_dev, 0) + 10 - MT_RXQ_WED_DATA_RING_BASE; 11 + wed->wlan.wpdma_rx[0] = pci_resource_start(pci_dev, 0) + 12 + MT_RXQ_WED_DATA_RING_BASE; 13 } else { 14 struct platform_device *plat_dev = pdev_ptr; 15 struct resource *res; 16 @@ -687,7 +687,7 @@ int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr, 17 wed->wlan.wpdma_tx = res->start + MT_TXQ_WED_RING_BASE; 18 wed->wlan.wpdma_txfree = res->start + MT_RXQ_WED_RING_BASE; 19 wed->wlan.wpdma_rx_glo = res->start + MT_WPDMA_GLO_CFG; 20 - wed->wlan.wpdma_rx = res->start + MT_RXQ_WED_DATA_RING_BASE; 21 + wed->wlan.wpdma_rx[0] = res->start + MT_RXQ_WED_DATA_RING_BASE; 22 } 23 wed->wlan.nbuf = MT7915_HW_TOKEN_SIZE; 24 wed->wlan.tx_tbit[0] = is_mt7915(&dev->mt76) ? 4 : 30; 25 diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c 26 index 30b40f4a91be..fb2428a9b877 100644 27 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c 28 +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c 29 @@ -503,9 +503,9 @@ int mt7996_mmio_wed_init(struct mt7996_dev *dev, void *pdev_ptr, 30 } 31 32 wed->wlan.wpdma_rx_glo = wed->wlan.phy_base + hif1_ofs + MT_WFDMA0_GLO_CFG; 33 - wed->wlan.wpdma_rx = wed->wlan.phy_base + hif1_ofs + 34 - MT_RXQ_RING_BASE(MT7996_RXQ_BAND0) + 35 - MT7996_RXQ_BAND0 * MT_RING_SIZE; 36 + wed->wlan.wpdma_rx[0] = wed->wlan.phy_base + hif1_ofs + 37 + MT_RXQ_RING_BASE(MT7996_RXQ_BAND0) + 38 + MT7996_RXQ_BAND0 * MT_RING_SIZE; 39 40 wed->wlan.id = MT7996_DEVICE_ID_2; 41 wed->wlan.tx_tbit[0] = ffs(MT_INT_TX_DONE_BAND2) - 1; 42 @@ -518,9 +518,9 @@ int mt7996_mmio_wed_init(struct mt7996_dev *dev, void *pdev_ptr, 43 44 wed->wlan.wpdma_rx_glo = wed->wlan.phy_base + MT_WFDMA0_GLO_CFG; 45 46 - wed->wlan.wpdma_rx = wed->wlan.phy_base + 47 - MT_RXQ_RING_BASE(MT7996_RXQ_BAND0) + 48 - MT7996_RXQ_BAND0 * MT_RING_SIZE; 49 + wed->wlan.wpdma_rx[0] = wed->wlan.phy_base + 50 + MT_RXQ_RING_BASE(MT7996_RXQ_BAND0) + 51 + MT7996_RXQ_BAND0 * MT_RING_SIZE; 52 53 wed->wlan.wpdma_rx_rro[0] = wed->wlan.phy_base + 54 MT_RXQ_RING_BASE(MT7996_RXQ_RRO_BAND0) +