wifi: mt76: connac: introduce helper for mt7925 chipset

Introduce is_mt7925() helper for new chipset. mt7925 runs the same
firmware download and mmio map flow as mt7921.

This is a preliminary patch to support mt7925 driver.

Co-developed-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
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 22878f088804bf75508f169125b955c1080fd0f2..1f29d8cd900cba621162a01a2a10f5b6d6fc839b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
@@ -172,6 +172,11 @@ struct mt76_connac_tx_free {
 
 extern const struct wiphy_wowlan_support mt76_connac_wowlan_support;
 
+static inline bool is_mt7925(struct mt76_dev *dev)
+{
+       return mt76_chip(dev) == 0x7925;
+}
+
 static inline bool is_mt7922(struct mt76_dev *dev)
 {
        return mt76_chip(dev) == 0x7922;
@@ -245,6 +250,7 @@ static inline bool is_mt76_fw_txp(struct mt76_dev *dev)
        switch (mt76_chip(dev)) {
        case 0x7961:
        case 0x7922:
+       case 0x7925:
        case 0x7663:
        case 0x7622:
                return false;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
index 73db9e14db06ce3d14a9bbd4431f3f9710c96bc8..3b63c64e7d54a1e690f7152c9f1b0880ec653532 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
@@ -170,7 +170,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_mt7921(dev))
+       if (is_mt7663(dev) || is_mt7921(dev) || is_mt7925(dev))
                last_mask = MT_TXD_LEN_LAST;
        else
                last_mask = MT_TXD_LEN_AMSDU_LAST |
@@ -214,7 +214,7 @@ mt76_connac_txp_skb_unmap_hw(struct mt76_dev *dev,
        u32 last_mask;
        int i;
 
-       if (is_mt7663(dev) || is_mt7921(dev))
+       if (is_mt7663(dev) || is_mt7921(dev) || is_mt7925(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 0f0a519f956f81165e613aaa0537b7151bfd2027..21456692e790b64439183c868ba124b6cb673b03 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -66,6 +66,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_mt7921(dev) && addr == 0x900000) ||
+           (is_mt7925(dev) && addr == 0x900000) ||
            (is_mt7996(dev) && addr == 0x900000))
                cmd = MCU_CMD(PATCH_START_REQ);
        else
@@ -3064,7 +3065,7 @@ static u32 mt76_connac2_get_data_mode(struct mt76_dev *dev, u32 info)
 {
        u32 mode = DL_MODE_NEED_RSP;
 
-       if (!is_mt7921(dev) || info == PATCH_SEC_NOT_SUPPORT)
+       if ((!is_mt7921(dev) && !is_mt7925(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 4543e5bf0482d23f45237ae453c65bba2de8186f..19be8556cd3c2781fbc37f6cc8cba1115c4c4221 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -1739,7 +1739,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_mt7921(dev))
+       if (is_mt7921(dev) || is_mt7925(dev))
                ret |= feature_set & FW_FEATURE_ENCRY_MODE ?
                       DL_CONFIG_ENCRY_MODE_SEL : 0;
        ret |= FIELD_PREP(DL_MODE_KEY_IDX,