wifi: rtw89: add addr cam H2C command v1

The coming RTL8922D uses different format of address CAM command, so add
the new format accordingly.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20251114060128.35363-13-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/cam.c b/drivers/net/wireless/realtek/rtw89/cam.c
index 8233d91024e8e3ad59542683033b6b814fba81e5..5f282a02a3564ca7fd149076c9c6f5ea07750205 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/cam.c
+++ b/drivers/net/wireless/realtek/rtw89/cam.c
@@ -819,12 +819,15 @@ void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev,
        struct rtw89_addr_cam_entry *addr_cam =
                rtw89_get_addr_cam_of(rtwvif_link, rtwsta_link);
        struct ieee80211_sta *sta = rtwsta_link_to_sta_safe(rtwsta_link);
+       const struct rtw89_chip_info *chip = rtwdev->chip;
        struct ieee80211_link_sta *link_sta;
        const u8 *sma = scan_mac_addr ? scan_mac_addr : rtwvif_link->mac_addr;
        u8 sma_hash, tma_hash, addr_msk_start;
+       u8 ver = chip->addrcam_ver;
        u8 sma_start = 0;
        u8 tma_start = 0;
        const u8 *tma;
+       u8 mac_id;
 
        rcu_read_lock();
 
@@ -845,9 +848,17 @@ void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev,
        sma_hash = rtw89_cam_addr_hash(sma_start, sma);
        tma_hash = rtw89_cam_addr_hash(tma_start, tma);
 
-       h2c->w1 = le32_encode_bits(addr_cam->addr_cam_idx, ADDR_CAM_W1_IDX) |
-                 le32_encode_bits(addr_cam->offset, ADDR_CAM_W1_OFFSET) |
-                 le32_encode_bits(addr_cam->len, ADDR_CAM_W1_LEN);
+       mac_id = rtwsta_link ? rtwsta_link->mac_id : rtwvif_link->mac_id;
+
+       if (ver == 0)
+               h2c->w1 = le32_encode_bits(addr_cam->addr_cam_idx, ADDR_CAM_W1_IDX) |
+                         le32_encode_bits(addr_cam->offset, ADDR_CAM_W1_OFFSET) |
+                         le32_encode_bits(addr_cam->len, ADDR_CAM_W1_LEN);
+       else
+               h2c->w1 = le32_encode_bits(addr_cam->addr_cam_idx, ADDR_CAM_W1_V1_IDX) |
+                         le32_encode_bits(addr_cam->offset, ADDR_CAM_W1_V1_OFFSET) |
+                         le32_encode_bits(addr_cam->len, ADDR_CAM_W1_V1_LEN);
+
        h2c->w2 = le32_encode_bits(addr_cam->valid, ADDR_CAM_W2_VALID) |
                  le32_encode_bits(rtwvif_link->net_type, ADDR_CAM_W2_NET_TYPE) |
                  le32_encode_bits(rtwvif_link->bcn_hit_cond, ADDR_CAM_W2_BCN_HIT_COND) |
@@ -870,14 +881,20 @@ void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev,
                  le32_encode_bits(tma[3], ADDR_CAM_W6_TMA3) |
                  le32_encode_bits(tma[4], ADDR_CAM_W6_TMA4) |
                  le32_encode_bits(tma[5], ADDR_CAM_W6_TMA5);
-       h2c->w8 = le32_encode_bits(rtwvif_link->port, ADDR_CAM_W8_PORT_INT) |
-                 le32_encode_bits(rtwvif_link->port, ADDR_CAM_W8_TSF_SYNC) |
-                 le32_encode_bits(rtwvif_link->trigger, ADDR_CAM_W8_TF_TRS) |
-                 le32_encode_bits(rtwvif_link->lsig_txop, ADDR_CAM_W8_LSIG_TXOP) |
-                 le32_encode_bits(rtwvif_link->tgt_ind, ADDR_CAM_W8_TGT_IND) |
-                 le32_encode_bits(rtwvif_link->frm_tgt_ind, ADDR_CAM_W8_FRM_TGT_IND) |
-                 le32_encode_bits(rtwsta_link ? rtwsta_link->mac_id :
-                                                rtwvif_link->mac_id, ADDR_CAM_W8_MACID);
+       if (ver == 0)
+               h2c->w8 = le32_encode_bits(rtwvif_link->port, ADDR_CAM_W8_PORT_INT) |
+                         le32_encode_bits(rtwvif_link->port, ADDR_CAM_W8_TSF_SYNC) |
+                         le32_encode_bits(rtwvif_link->trigger, ADDR_CAM_W8_TF_TRS) |
+                         le32_encode_bits(rtwvif_link->lsig_txop, ADDR_CAM_W8_LSIG_TXOP) |
+                         le32_encode_bits(rtwvif_link->tgt_ind, ADDR_CAM_W8_TGT_IND) |
+                         le32_encode_bits(rtwvif_link->frm_tgt_ind, ADDR_CAM_W8_FRM_TGT_IND) |
+                         le32_encode_bits(mac_id, ADDR_CAM_W8_MACID);
+       else
+               h2c->w8 = le32_encode_bits(rtwvif_link->port, ADDR_CAM_W8_V1_PORT_INT) |
+                         le32_encode_bits(rtwvif_link->port, ADDR_CAM_W8_V1_TSF_SYNC) |
+                         le32_encode_bits(rtwvif_link->trigger, ADDR_CAM_W8_V1_TF_TRS) |
+                         le32_encode_bits(rtwvif_link->lsig_txop, ADDR_CAM_W8_V1_LSIG_TXOP) |
+                         le32_encode_bits(mac_id, ADDR_CAM_W8_V1_MACID);
 
        if (rtwvif_link->net_type == RTW89_NET_TYPE_INFRA)
                h2c->w9 = le32_encode_bits(vif->cfg.aid & 0xfff, ADDR_CAM_W9_AID12);

diff --git a/drivers/net/wireless/realtek/rtw89/cam.h b/drivers/net/wireless/realtek/rtw89/cam.h
index 2bc8fbf79c0b8f7d835d9608e025d8354f7578e2..833a956f0176ca8553ea5be968575460b47496ee 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/cam.h
+++ b/drivers/net/wireless/realtek/rtw89/cam.h
@@ -33,6 +33,9 @@ struct rtw89_h2c_addr_cam {
 #define ADDR_CAM_W1_IDX GENMASK(7, 0)
 #define ADDR_CAM_W1_OFFSET GENMASK(15, 8)
 #define ADDR_CAM_W1_LEN GENMASK(23, 16)
+#define ADDR_CAM_W1_V1_IDX GENMASK(9, 0)
+#define ADDR_CAM_W1_V1_OFFSET GENMASK(23, 16)
+#define ADDR_CAM_W1_V1_LEN GENMASK(31, 24)
 #define ADDR_CAM_W2_VALID BIT(0)
 #define ADDR_CAM_W2_NET_TYPE GENMASK(2, 1)
 #define ADDR_CAM_W2_BCN_HIT_COND GENMASK(4, 3)
@@ -62,6 +65,14 @@ struct rtw89_h2c_addr_cam {
 #define ADDR_CAM_W8_LSIG_TXOP BIT(15)
 #define ADDR_CAM_W8_TGT_IND GENMASK(26, 24)
 #define ADDR_CAM_W8_FRM_TGT_IND GENMASK(29, 27)
+#define ADDR_CAM_W8_V1_MACID GENMASK(9, 0)
+#define ADDR_CAM_W8_V1_PORT_INT GENMASK(18, 16)
+#define ADDR_CAM_W8_V1_TSF_SYNC GENMASK(21, 19)
+#define ADDR_CAM_W8_V1_TF_TRS BIT(22)
+#define ADDR_CAM_W8_V1_LSIG_TXOP BIT(23)
+#define ADDR_CAM_W8_V1_TB_RANGING BIT(24)
+#define ADDR_CAM_W8_V1_TB_SENSING BIT(25)
+#define ADDR_CAM_W8_V1_SENS_EN BIT(26)
 #define ADDR_CAM_W9_AID12 GENMASK(11, 0)
 #define ADDR_CAM_W9_AID12_0 GENMASK(7, 0)
 #define ADDR_CAM_W9_AID12_1 GENMASK(11, 8)

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index 1f99d5f264d2eae58e0f9807b2ad51bb76243012..c33ff7c0090fe32b9012e2fa7df918895fc4bb3f 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -4458,6 +4458,7 @@ struct rtw89_chip_info {
        u8 bacam_num;
        u8 bacam_dynamic_num;
        enum rtw89_bacam_ver bacam_ver;
+       u8 addrcam_ver;
        u8 ppdu_max_usr;
 
        u8 sec_ctrl_efuse_size;

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8851b.c b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
index 2019f6022cbb4d3e76f5785f976acee4d3b3befc..84b628d23882db27c188d9583b0a799e9b2c0af3 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8851b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
@@ -2648,6 +2648,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = {
        .bacam_num              = 2,
        .bacam_dynamic_num      = 4,
        .bacam_ver              = RTW89_BACAM_V0,
+       .addrcam_ver            = 0,
        .ppdu_max_usr           = 4,
        .sec_ctrl_efuse_size    = 4,
        .physical_efuse_size    = 1216,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a.c b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
index 48205aa4a9804f52defd3678149d6524c43235a5..8677723e3561c1b961ec5f9546a0b3603a8adbd3 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
@@ -2334,6 +2334,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = {
        .bacam_num              = 2,
        .bacam_dynamic_num      = 4,
        .bacam_ver              = RTW89_BACAM_V0,
+       .addrcam_ver            = 0,
        .ppdu_max_usr           = 4,
        .sec_ctrl_efuse_size    = 4,
        .physical_efuse_size    = 1216,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b.c b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
index 38cd151f8c3f22fa94d67b735563983953befd1b..70fb05bc5e980de8fee9fe9d3acbe33169db2ed5 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
@@ -959,6 +959,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = {
        .bacam_num              = 2,
        .bacam_dynamic_num      = 4,
        .bacam_ver              = RTW89_BACAM_V0,
+       .addrcam_ver            = 0,
        .ppdu_max_usr           = 4,
        .sec_ctrl_efuse_size    = 4,
        .physical_efuse_size    = 1216,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852bt.c b/drivers/net/wireless/realtek/rtw89/rtw8852bt.c
index 15ba780492d617235932892ed99184722467617c..f956474c3b722a451a443982b04b888ac6681d17 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852bt.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852bt.c
@@ -818,6 +818,7 @@ const struct rtw89_chip_info rtw8852bt_chip_info = {
        .bacam_num              = 2,
        .bacam_dynamic_num      = 4,
        .bacam_ver              = RTW89_BACAM_V0,
+       .addrcam_ver            = 0,
        .ppdu_max_usr           = 4,
        .sec_ctrl_efuse_size    = 4,
        .physical_efuse_size    = 1216,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c.c b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
index ee81a6792eee1efb0e5896e0a1eda5fe48436f1b..db99450e91589e260babbd8c00db26f7a4b97d17 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
@@ -3178,6 +3178,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = {
        .bacam_num              = 8,
        .bacam_dynamic_num      = 8,
        .bacam_ver              = RTW89_BACAM_V0_EXT,
+       .addrcam_ver            = 0,
        .ppdu_max_usr           = 8,
        .sec_ctrl_efuse_size    = 4,
        .physical_efuse_size    = 1216,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8922a.c b/drivers/net/wireless/realtek/rtw89/rtw8922a.c
index 11e8b50a329199c0f225c6ba13e18dbb15c2baa2..4437279c554b096167072b33eb343b78e8f14004 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8922a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8922a.c
@@ -2931,6 +2931,7 @@ const struct rtw89_chip_info rtw8922a_chip_info = {
        .bacam_num              = 24,
        .bacam_dynamic_num      = 8,
        .bacam_ver              = RTW89_BACAM_V1,
+       .addrcam_ver            = 0,
        .ppdu_max_usr           = 16,
        .sec_ctrl_efuse_size    = 4,
        .physical_efuse_size    = 0x1300,