wifi: mt76: connac: replace is_mt7925() with is_connac3()

Use is_connac3() instead of is_mt7925() to avoid confusion
when more chips join.

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Link: https://patch.msgid.link/20260425195011.790265-11-sean.wang@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
index 45479cc29134052f2859365324baad51a80a9040..1994863dc59d11ae08bf235e1f974deff0c7c92a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
@@ -172,11 +172,16 @@ struct mt76_connac_tx_free {
 
 extern const struct wiphy_wowlan_support mt76_connac_wowlan_support;
 
-static inline bool is_mt7925(struct mt76_dev *dev)
+static inline bool is_connac3(struct mt76_dev *dev)
 {
        return mt76_chip(dev) == 0x7925 || mt76_chip(dev) == 0x7927;
 }
 
+static inline bool is_mt7925(struct mt76_dev *dev)
+{
+       return mt76_chip(dev) == 0x7925;
+}
+
 static inline bool is_mt7927(struct mt76_dev *dev)
 {
        return mt76_chip(dev) == 0x7927;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
index 0339e2e7ab601a027df3933a1b45d594f9a7e187..c341595e91383574bec6221be887758fd742ce99 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
@@ -173,7 +173,7 @@ void mt76_connac_write_hw_txp(struct mt76_dev *dev,
 
        txp->msdu_id[0] = cpu_to_le16(id | MT_MSDU_ID_VALID);
 
-       if (is_mt7663(dev) || is_connac2(dev) || is_mt7925(dev))
+       if (is_mt7663(dev) || is_connac2(dev) || is_connac3(dev))
                last_mask = MT_TXD_LEN_LAST;
        else
                last_mask = MT_TXD_LEN_AMSDU_LAST |
@@ -217,7 +217,7 @@ mt76_connac_txp_skb_unmap_hw(struct mt76_dev *dev,
        u32 last_mask;
        int i;
 
-       if (is_mt7663(dev) || is_connac2(dev) || is_mt7925(dev))
+       if (is_mt7663(dev) || is_connac2(dev) || is_connac3(dev))
                last_mask = MT_TXD_LEN_LAST;
        else
                last_mask = MT_TXD_LEN_MSDU_LAST;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index f61d0625ef51424bfb4d248db6d8102904684d8a..ff884697d62f5b00de5bc061faffb0abe73fae84 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -67,7 +67,7 @@ int mt76_connac_mcu_init_download(struct mt76_dev *dev, u32 addr, u32 len,
 
        if ((!is_connac_v1(dev) && addr == MCU_PATCH_ADDRESS) ||
            (is_connac2(dev) && addr == 0x900000) ||
-           (is_mt7925(dev) && (addr == 0x900000 || addr == 0xe0002800)) ||
+           (is_connac3(dev) && (addr == 0x900000 || addr == 0xe0002800)) ||
            (is_mt799x(dev) && addr == 0x900000))
                cmd = MCU_CMD(PATCH_START_REQ);
        else
@@ -3089,7 +3089,7 @@ static u32 mt76_connac2_get_data_mode(struct mt76_dev *dev, u32 info)
 {
        u32 mode = DL_MODE_NEED_RSP;
 
-       if ((!is_connac2(dev) && !is_mt7925(dev)) || info == PATCH_SEC_NOT_SUPPORT)
+       if ((!is_connac2(dev) && !is_connac3(dev)) || info == PATCH_SEC_NOT_SUPPORT)
                return mode;
 
        switch (FIELD_GET(PATCH_SEC_ENC_TYPE_MASK, info)) {

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index ac5126ab68ff83ccc1fffc6da04d6fb7b264f60d..552cb94edaa01bb76b235064dd320f9a042d5408 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -1878,7 +1878,7 @@ mt76_connac_mcu_gen_dl_mode(struct mt76_dev *dev, u8 feature_set, bool is_wa)
 
        ret |= feature_set & FW_FEATURE_SET_ENCRYPT ?
               DL_MODE_ENCRYPT | DL_MODE_RESET_SEC_IV : 0;
-       if (is_connac2(dev) || is_mt7925(dev))
+       if (is_connac2(dev) || is_connac3(dev))
                ret |= feature_set & FW_FEATURE_ENCRY_MODE ?
                       DL_CONFIG_ENCRY_MODE_SEL : 0;
        ret |= FIELD_PREP(DL_MODE_KEY_IDX,

diff --git a/drivers/net/wireless/mediatek/mt76/mt792x_usb.c b/drivers/net/wireless/mediatek/mt76/mt792x_usb.c
index 0d9dbd0aaf9e493083ba7657a03e64dae4926c5e..be043e964c3cc9b9592fa7709ebb81c939c2ff4a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt792x_usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt792x_usb.c
@@ -263,7 +263,7 @@ EXPORT_SYMBOL_GPL(mt792xu_dma_init);
 
 int mt792xu_wfsys_reset(struct mt792x_dev *dev)
 {
-       const struct mt792xu_wfsys_desc *desc = is_mt7925(&dev->mt76) ?
+       const struct mt792xu_wfsys_desc *desc = is_connac3(&dev->mt76) ?
                                                &mt7925_wfsys_desc :
                                                &mt7921_wfsys_desc;
        u32 val;