wifi: rtw89: efuse: read hardware version from efuse for WiFi 7 chips

Hardware version from efuse prioritizes to the version from register.
For WiFi 7 chips, this becomes required, so implement this in common flow.

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

diff --git a/drivers/net/wireless/realtek/rtw89/efuse.c b/drivers/net/wireless/realtek/rtw89/efuse.c
index 6c6c763510af6b78c9ebe9462470ec717cc36f6e..a2757a88d55da575026678523f0b9e3477931c30 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/efuse.c
+++ b/drivers/net/wireless/realtek/rtw89/efuse.c
@@ -7,10 +7,6 @@
 #include "mac.h"
 #include "reg.h"
 
-#define EF_FV_OFSET 0x5ea
-#define EF_CV_MASK GENMASK(7, 4)
-#define EF_CV_INV 15
-
 #define EFUSE_B1_MSSDEVTYPE_MASK GENMASK(3, 0)
 #define EFUSE_B1_MSSCUSTIDX0_MASK GENMASK(7, 4)
 #define EFUSE_B2_MSSKEYNUM_MASK GENMASK(3, 0)

diff --git a/drivers/net/wireless/realtek/rtw89/efuse.h b/drivers/net/wireless/realtek/rtw89/efuse.h
index a96fc104479104db84eab44e51867e8f04405a35..a14a9dfed8e8f23f8b408f807f759741c7aa7a56 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/efuse.h
+++ b/drivers/net/wireless/realtek/rtw89/efuse.h
@@ -11,6 +11,11 @@
 #define RTW89_EFUSE_BLOCK_SIZE_MASK GENMASK(15, 0)
 #define RTW89_EFUSE_MAX_BLOCK_SIZE 0x10000
 
+#define EF_FV_OFSET 0x5EA
+#define EF_FV_OFSET_BE_V1 0x17CA
+#define EF_CV_MASK GENMASK(7, 4)
+#define EF_CV_INV 15
+
 struct rtw89_efuse_block_cfg {
        u32 offset;
        u32 size;
@@ -26,5 +31,6 @@ int rtw89_read_efuse_ver(struct rtw89_dev *rtwdev, u8 *efv);
 int rtw89_efuse_recognize_mss_info_v1(struct rtw89_dev *rtwdev, u8 b1, u8 b2);
 int rtw89_efuse_read_fw_secure_ax(struct rtw89_dev *rtwdev);
 int rtw89_efuse_read_fw_secure_be(struct rtw89_dev *rtwdev);
+int rtw89_efuse_read_ecv_be(struct rtw89_dev *rtwdev);
 
 #endif

diff --git a/drivers/net/wireless/realtek/rtw89/efuse_be.c b/drivers/net/wireless/realtek/rtw89/efuse_be.c
index 64768923b0f0a8a42536bf524a9075639182e17a..70c1b8be662e14e9a7c42ffcd58b22ac85e5fa54 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/efuse_be.c
+++ b/drivers/net/wireless/realtek/rtw89/efuse_be.c
@@ -512,3 +512,29 @@ out:
 
        return 0;
 }
+
+int rtw89_efuse_read_ecv_be(struct rtw89_dev *rtwdev)
+{
+       u32 dump_addr;
+       u8 buff[4]; /* efuse access must 4 bytes align */
+       int ret;
+       u8 ecv;
+       u8 val;
+
+       dump_addr = ALIGN_DOWN(EF_FV_OFSET_BE_V1, 4);
+
+       ret = rtw89_dump_physical_efuse_map_be(rtwdev, buff, dump_addr, 4, false);
+       if (ret)
+               return ret;
+
+       val = buff[EF_FV_OFSET_BE_V1 & 0x3];
+
+       ecv = u8_get_bits(val, EF_CV_MASK);
+       if (ecv == EF_CV_INV)
+               return -ENOENT;
+
+       rtwdev->hal.cv = ecv;
+
+       return 0;
+}
+EXPORT_SYMBOL(rtw89_efuse_read_ecv_be);

diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c
index fae0527e50e8ee76987a5fcfa188492b7ebee2b9..91854ae9a310b018c8608251039e9627c0fbbb3d 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac.c
+++ b/drivers/net/wireless/realtek/rtw89/mac.c
@@ -1529,8 +1529,10 @@ static int rtw89_mac_power_switch(struct rtw89_dev *rtwdev, bool on)
                return ret;
 
        if (on) {
-               if (!test_bit(RTW89_FLAG_PROBE_DONE, rtwdev->flags))
+               if (!test_bit(RTW89_FLAG_PROBE_DONE, rtwdev->flags)) {
+                       rtw89_mac_efuse_read_ecv(rtwdev);
                        mac->efuse_read_fw_secure(rtwdev);
+               }
 
                set_bit(RTW89_FLAG_POWERON, rtwdev->flags);
                set_bit(RTW89_FLAG_DMAC_FUNC, rtwdev->flags);
@@ -7281,6 +7283,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_ax = {
        .parse_phycap_map = rtw89_parse_phycap_map_ax,
        .cnv_efuse_state = rtw89_cnv_efuse_state_ax,
        .efuse_read_fw_secure = rtw89_efuse_read_fw_secure_ax,
+       .efuse_read_ecv = NULL,
 
        .cfg_plt = rtw89_mac_cfg_plt_ax,
        .get_plt_cnt = rtw89_mac_get_plt_cnt_ax,

diff --git a/drivers/net/wireless/realtek/rtw89/mac.h b/drivers/net/wireless/realtek/rtw89/mac.h
index 9d0c491f053fd5fb59fb5a516c9a51a7c38fcb80..2f3138b155f9eef001329bb987746a6491eeed2c 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac.h
+++ b/drivers/net/wireless/realtek/rtw89/mac.h
@@ -1067,6 +1067,7 @@ struct rtw89_mac_gen_def {
        int (*parse_phycap_map)(struct rtw89_dev *rtwdev);
        int (*cnv_efuse_state)(struct rtw89_dev *rtwdev, bool idle);
        int (*efuse_read_fw_secure)(struct rtw89_dev *rtwdev);
+       int (*efuse_read_ecv)(struct rtw89_dev *rtwdev);
 
        int (*cfg_plt)(struct rtw89_dev *rtwdev, struct rtw89_mac_ax_plt *plt);
        u16 (*get_plt_cnt)(struct rtw89_dev *rtwdev, u8 band);
@@ -1602,6 +1603,16 @@ int rtw89_mac_get_dle_rsvd_qt_cfg(struct rtw89_dev *rtwdev,
                                  struct rtw89_mac_dle_rsvd_qt_cfg *cfg);
 int rtw89_mac_cpu_io_rx(struct rtw89_dev *rtwdev, bool wow_enable);
 
+static inline int rtw89_mac_efuse_read_ecv(struct rtw89_dev *rtwdev)
+{
+       const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;
+
+       if (!mac->efuse_read_ecv)
+               return -ENOENT;
+
+       return mac->efuse_read_ecv(rtwdev);
+}
+
 static inline
 void rtw89_fwdl_secure_idmem_share_mode(struct rtw89_dev *rtwdev, u8 mode)
 {

diff --git a/drivers/net/wireless/realtek/rtw89/mac_be.c b/drivers/net/wireless/realtek/rtw89/mac_be.c
index c0204e68c17232dd200fbe54ba20dc0b005e59fe..0b29f43b38bd9751051caf9db5ccee2b39aea8b1 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac_be.c
+++ b/drivers/net/wireless/realtek/rtw89/mac_be.c
@@ -2774,6 +2774,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_be = {
        .parse_phycap_map = rtw89_parse_phycap_map_be,
        .cnv_efuse_state = rtw89_cnv_efuse_state_be,
        .efuse_read_fw_secure = rtw89_efuse_read_fw_secure_be,
+       .efuse_read_ecv = rtw89_efuse_read_ecv_be,
 
        .cfg_plt = rtw89_mac_cfg_plt_be,
        .get_plt_cnt = rtw89_mac_get_plt_cnt_be,