wifi: mt76: mt7996: introduce mt7996_band_valid()

Replace dbdc_support and tbtc_support with mt7996_band_valid() to
support mt7996 variants with band0/band2 dual-band support.
This changes reduces ambiguity when checking supported bands on different
variants or new chipsets, as well as during the init configurations on
DMA TX/RX queues or irq masks.

Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/dma.c b/drivers/net/wireless/mediatek/mt76/mt7996/dma.c
index 7ec6c64b3fd1ce766323e9f7f395ecbc247979e2..7c5801e1ebdb1084a30da4aab641f082768381a5 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/dma.c
@@ -233,13 +233,13 @@ void mt7996_dma_start(struct mt7996_dev *dev, bool reset, bool wed_reset)
        /* enable interrupts for TX/RX rings */
        irq_mask = MT_INT_MCU_CMD | MT_INT_RX_DONE_MCU | MT_INT_TX_DONE_MCU;
 
-       if (!dev->mphy.band_idx)
+       if (mt7996_band_valid(dev, MT_BAND0))
                irq_mask |= MT_INT_BAND0_RX_DONE;
 
-       if (dev->dbdc_support)
+       if (mt7996_band_valid(dev, MT_BAND1))
                irq_mask |= MT_INT_BAND1_RX_DONE;
 
-       if (dev->tbtc_support)
+       if (mt7996_band_valid(dev, MT_BAND2))
                irq_mask |= MT_INT_BAND2_RX_DONE;
 
        if (mtk_wed_device_active(wed) && wed_reset) {
@@ -382,7 +382,7 @@ int mt7996_dma_rro_init(struct mt7996_dev *dev)
        if (ret)
                return ret;
 
-       if (dev->dbdc_support) {
+       if (mt7996_band_valid(dev, MT_BAND1)) {
                /* rx msdu page queue for band1 */
                mdev->q_rx[MT_RXQ_MSDU_PAGE_BAND1].flags =
                        MT_WED_RRO_Q_MSDU_PG(1) | MT_QFLAG_WED_RRO_EN;
@@ -396,7 +396,7 @@ int mt7996_dma_rro_init(struct mt7996_dev *dev)
                        return ret;
        }
 
-       if (dev->tbtc_support) {
+       if (mt7996_band_valid(dev, MT_BAND2)) {
                /* rx msdu page queue for band2 */
                mdev->q_rx[MT_RXQ_MSDU_PAGE_BAND2].flags =
                        MT_WED_RRO_Q_MSDU_PG(2) | MT_QFLAG_WED_RRO_EN;
@@ -516,7 +516,7 @@ int mt7996_dma_init(struct mt7996_dev *dev)
        if (ret)
                return ret;
 
-       if (dev->tbtc_support || dev->mphy.band_idx == MT_BAND2) {
+       if (mt7996_band_valid(dev, MT_BAND2)) {
                /* rx data queue for band2 */
                rx_base = MT_RXQ_RING_BASE(MT_RXQ_BAND2) + hif1_ofs;
                ret = mt76_queue_alloc(dev, &dev->mt76.q_rx[MT_RXQ_BAND2],
@@ -570,7 +570,7 @@ int mt7996_dma_init(struct mt7996_dev *dev)
                if (ret)
                        return ret;
 
-               if (dev->tbtc_support || dev->mphy.band_idx == MT_BAND2) {
+               if (mt7996_band_valid(dev, MT_BAND2)) {
                        /* rx rro data queue for band2 */
                        dev->mt76.q_rx[MT_RXQ_RRO_BAND2].flags =
                                MT_WED_RRO_Q_DATA(1) | MT_QFLAG_WED_RRO_EN;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/init.c b/drivers/net/wireless/mediatek/mt76/mt7996/init.c
index 1896571ad140713c3b6a0a7dbd3bcbdd9576562b..64fa2f28c8c24d4118f54779c366aca98cdfc159 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/init.c
@@ -540,7 +540,8 @@ int mt7996_txbf_init(struct mt7996_dev *dev)
 {
        int ret;
 
-       if (dev->dbdc_support) {
+       if (mt7996_band_valid(dev, MT_BAND1) ||
+           mt7996_band_valid(dev, MT_BAND2)) {
                ret = mt7996_mcu_set_txbf(dev, BF_MOD_EN_CTRL);
                if (ret)
                        return ret;
@@ -563,11 +564,7 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
        int ret;
        struct mtk_wed_device *wed = &dev->mt76.mmio.wed;
 
-       if (band != MT_BAND1 && band != MT_BAND2)
-               return 0;
-
-       if ((band == MT_BAND1 && !dev->dbdc_support) ||
-           (band == MT_BAND2 && !dev->tbtc_support))
+       if (!mt7996_band_valid(dev, band) || band == MT_BAND0)
                return 0;
 
        if (phy)
@@ -897,9 +894,6 @@ static int mt7996_init_hardware(struct mt7996_dev *dev)
        INIT_LIST_HEAD(&dev->wed_rro.poll_list);
        spin_lock_init(&dev->wed_rro.lock);
 
-       dev->dbdc_support = true;
-       dev->tbtc_support = true;
-
        ret = mt7996_dma_init(dev);
        if (ret)
                return ret;
@@ -1331,8 +1325,6 @@ int mt7996_register_device(struct mt7996_dev *dev)
        if (ret)
                return ret;
 
-       ieee80211_queue_work(mt76_hw(dev), &dev->init_work);
-
        ret = mt7996_register_phy(dev, mt7996_phy2(dev), MT_BAND1);
        if (ret)
                return ret;
@@ -1341,13 +1333,24 @@ int mt7996_register_device(struct mt7996_dev *dev)
        if (ret)
                return ret;
 
+       ieee80211_queue_work(mt76_hw(dev), &dev->init_work);
+
        dev->recovery.hw_init_done = true;
 
        ret = mt7996_init_debugfs(&dev->phy);
        if (ret)
-               return ret;
+               goto error;
 
-       return mt7996_coredump_register(dev);
+       ret = mt7996_coredump_register(dev);
+       if (ret)
+               goto error;
+
+       return 0;
+
+error:
+       cancel_work_sync(&dev->init_work);
+
+       return ret;
 }
 
 void mt7996_unregister_device(struct mt7996_dev *dev)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
index b5e27c29b1c4448b68a9507a255f12969f670cba..be4beeb47a19d357bc7be013ad11b9409861eb08 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
@@ -2964,9 +2964,10 @@ mt7996_mcu_init_rx_airtime(struct mt7996_dev *dev)
 {
        struct uni_header hdr = {};
        struct sk_buff *skb;
-       int len, num;
+       int len, num, i;
 
-       num = 2 + 2 * (dev->dbdc_support + dev->tbtc_support);
+       num = 2 + 2 * (mt7996_band_valid(dev, MT_BAND1) +
+                      mt7996_band_valid(dev, MT_BAND2));
        len = sizeof(hdr) + num * sizeof(struct vow_rx_airtime);
        skb = mt76_mcu_msg_alloc(&dev->mt76, NULL, len);
        if (!skb)
@@ -2974,13 +2975,10 @@ mt7996_mcu_init_rx_airtime(struct mt7996_dev *dev)
 
        skb_put_data(skb, &hdr, sizeof(hdr));
 
-       mt7996_add_rx_airtime_tlv(skb, dev->mt76.phy.band_idx);
-
-       if (dev->dbdc_support)
-               mt7996_add_rx_airtime_tlv(skb, MT_BAND1);
-
-       if (dev->tbtc_support)
-               mt7996_add_rx_airtime_tlv(skb, MT_BAND2);
+       for (i = 0; i < __MT_MAX_BAND; i++) {
+               if (mt7996_band_valid(dev, i))
+                       mt7996_add_rx_airtime_tlv(skb, i);
+       }
 
        return mt76_mcu_skb_send_msg(&dev->mt76, skb,
                                     MCU_WM_UNI_CMD(VOW), true);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
index 0ba00e4166d938db75c1d767b70f0d24b01d432e..aefd09c7d6e65947884f62112a840860586905ca 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
@@ -280,8 +280,6 @@ struct mt7996_dev {
 
        u32 hw_pattern;
 
-       bool dbdc_support:1;
-       bool tbtc_support:1;
        bool flash_mode:1;
        bool has_eht:1;
        bool has_rro:1;
@@ -393,6 +391,17 @@ mt7996_phy3(struct mt7996_dev *dev)
        return __mt7996_phy(dev, MT_BAND2);
 }
 
+static inline bool
+mt7996_band_valid(struct mt7996_dev *dev, u8 band)
+{
+       /* tri-band support */
+       if (band <= MT_BAND2 &&
+           mt76_get_field(dev, MT_PAD_GPIO, MT_PAD_GPIO_ADIE_COMB) <= 1)
+               return true;
+
+       return band == MT_BAND0 || band == MT_BAND2;
+}
+
 extern const struct ieee80211_ops mt7996_ops;
 extern struct pci_driver mt7996_pci_driver;
 extern struct pci_driver mt7996_hif_driver;
@@ -494,7 +503,8 @@ int mt7996_mcu_wed_rro_reset_sessions(struct mt7996_dev *dev, u16 id);
 
 static inline u8 mt7996_max_interface_num(struct mt7996_dev *dev)
 {
-       return MT7996_MAX_INTERFACES * (1 + dev->dbdc_support + dev->tbtc_support);
+       return MT7996_MAX_INTERFACES * (1 + mt7996_band_valid(dev, MT_BAND1) +
+                                       mt7996_band_valid(dev, MT_BAND2));
 }
 
 static inline u16 mt7996_wtbl_size(struct mt7996_dev *dev)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/regs.h b/drivers/net/wireless/mediatek/mt76/mt7996/regs.h
index 6102df912741f955ed7ed06f60bfa2515bf1cffe..d8904cbc2856d33c4a8ddf06c69ef15a25ac64db 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/regs.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/regs.h
@@ -629,6 +629,9 @@ enum base_rev {
 #define MT_TOP_MISC                            MT_TOP(0xf0)
 #define MT_TOP_MISC_FW_STATE                   GENMASK(2, 0)
 
+#define MT_PAD_GPIO                            0x700056f0
+#define MT_PAD_GPIO_ADIE_COMB                  GENMASK(16, 15)
+
 #define MT_HW_REV                              0x70010204
 #define MT_HW_REV1                             0x8a00