wifi: rtw89: fw: add fw_def struct to put firmware name and format version

The RTL8922DE has a RTL8922DE-VS variant which uses different firmware
name and format version, and the rule to select firmware type will be
needed to extend. Prepare for coming patches.

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

diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index 36e988277b2bd6d36c2e73a8889d2e0e8b28c8f7..9d9b915709893a139d3682e972ff18a84eecab73 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -6753,7 +6753,8 @@ struct rtw89_dev *rtw89_alloc_ieee80211_hw(struct device *device,
        bool support_mlo;
        bool no_chanctx;
 
-       firmware = rtw89_early_fw_feature_recognize(device, chip, &early_fw, &fw_format);
+       firmware = rtw89_early_fw_feature_recognize(device, chip, variant,
+                                                   &early_fw, &fw_format);
 
        ops = kmemdup(&rtw89_ops, sizeof(rtw89_ops), GFP_KERNEL);
        if (!ops)

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index 4778957d6b2dd926625522ef08dca1eb4c3bd1c2..5cb8aacf7644e183842c60777ed82f8a42003506 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -4152,6 +4152,11 @@ struct rtw89_reg_imr {
        u32 set;
 };
 
+struct rtw89_fw_def {
+       const char *fw_basename;
+       u8 fw_format_max;
+};
+
 struct rtw89_phy_table {
        const struct rtw89_reg2_def *regs;
        u32 n_regs;
@@ -4494,8 +4499,7 @@ struct rtw89_chip_info {
        const struct rtw89_chip_ops *ops;
        const struct rtw89_mac_gen_def *mac_def;
        const struct rtw89_phy_gen_def *phy_def;
-       const char *fw_basename;
-       u8 fw_format_max;
+       struct rtw89_fw_def fw_def;
        bool try_ce_fw;
        u8 bbmcu_nr;
        u32 needed_fw_elms;
@@ -4633,6 +4637,7 @@ struct rtw89_chip_info {
 struct rtw89_chip_variant {
        bool no_mcs_12_13: 1;
        u32 fw_min_ver_code;
+       const struct rtw89_fw_def *fw_def_override;
 };
 
 union rtw89_bus_info {
@@ -7379,6 +7384,22 @@ void rtw89_chip_calc_rx_gain_normal(struct rtw89_dev *rtwdev,
                chip->ops->calc_rx_gain_normal(rtwdev, chan, path, phy_idx, calc);
 }
 
+static inline const struct rtw89_fw_def *
+__rtw89_chip_get_fw_def(const struct rtw89_chip_info *chip,
+                       const struct rtw89_chip_variant *variant)
+{
+       if (variant && variant->fw_def_override)
+               return variant->fw_def_override;
+
+       return &chip->fw_def;
+}
+
+static inline
+const struct rtw89_fw_def *rtw89_chip_get_fw_def(struct rtw89_dev *rtwdev)
+{
+       return __rtw89_chip_get_fw_def(rtwdev->chip, rtwdev->variant);
+}
+
 static inline void rtw89_load_txpwr_table(struct rtw89_dev *rtwdev,
                                          const struct rtw89_txpwr_table *tbl)
 {

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index c52f9e11a8b26569759f5d9b319c1be9244fa65e..aa42e5c60eb714f5ed57f9ce626feb2980ad0554 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -965,18 +965,20 @@ static void rtw89_fw_recognize_features(struct rtw89_dev *rtwdev)
 const struct firmware *
 rtw89_early_fw_feature_recognize(struct device *device,
                                 const struct rtw89_chip_info *chip,
+                                const struct rtw89_chip_variant *variant,
                                 struct rtw89_fw_info *early_fw,
                                 int *used_fw_format)
 {
+       const struct rtw89_fw_def *fw_def = __rtw89_chip_get_fw_def(chip, variant);
        const struct firmware *firmware;
        char fw_name[64];
        int fw_format;
        u32 ver_code;
        int ret;
 
-       for (fw_format = chip->fw_format_max; fw_format >= 0; fw_format--) {
+       for (fw_format = fw_def->fw_format_max; fw_format >= 0; fw_format--) {
                rtw89_fw_get_filename(fw_name, sizeof(fw_name),
-                                     chip->fw_basename, fw_format);
+                                     fw_def->fw_basename, fw_format);
 
                ret = request_firmware(&firmware, fw_name, device);
                if (!ret) {
@@ -2024,11 +2026,11 @@ void rtw89_load_firmware_work(struct work_struct *work)
 {
        struct rtw89_dev *rtwdev =
                container_of(work, struct rtw89_dev, load_firmware_work);
-       const struct rtw89_chip_info *chip = rtwdev->chip;
+       const struct rtw89_fw_def *fw_def = rtw89_chip_get_fw_def(rtwdev);
        char fw_name[64];
 
        rtw89_fw_get_filename(fw_name, sizeof(fw_name),
-                             chip->fw_basename, rtwdev->fw.fw_format);
+                             fw_def->fw_basename, rtwdev->fw.fw_format);
 
        rtw89_load_firmware_req(rtwdev, &rtwdev->fw.req, fw_name, false);
 }

diff --git a/drivers/net/wireless/realtek/rtw89/fw.h b/drivers/net/wireless/realtek/rtw89/fw.h
index d45b6ea6ea1bcf13f57bea8babb287edcd941d8a..c60d419616d63da0df0825640002fc7cb7325c4d 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.h
+++ b/drivers/net/wireless/realtek/rtw89/fw.h
@@ -5171,6 +5171,7 @@ int rtw89_fw_recognize_elements(struct rtw89_dev *rtwdev);
 const struct firmware *
 rtw89_early_fw_feature_recognize(struct device *device,
                                 const struct rtw89_chip_info *chip,
+                                const struct rtw89_chip_variant *variant,
                                 struct rtw89_fw_info *early_fw,
                                 int *used_fw_format);
 int rtw89_fw_download(struct rtw89_dev *rtwdev, enum rtw89_fw_type type,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8851b.c b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
index b63c0e7852097a7df172f1366eb3fecdc7f80c3f..fdb053fabae6b5cc63c41ec6e3851c5565798813 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8851b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
@@ -2580,8 +2580,10 @@ const struct rtw89_chip_info rtw8851b_chip_info = {
        .ops                    = &rtw8851b_chip_ops,
        .mac_def                = &rtw89_mac_gen_ax,
        .phy_def                = &rtw89_phy_gen_ax,
-       .fw_basename            = RTW8851B_FW_BASENAME,
-       .fw_format_max          = RTW8851B_FW_FORMAT_MAX,
+       .fw_def                 = {
+               .fw_basename    = RTW8851B_FW_BASENAME,
+               .fw_format_max  = RTW8851B_FW_FORMAT_MAX,
+       },
        .try_ce_fw              = true,
        .bbmcu_nr               = 0,
        .needed_fw_elms         = 0,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a.c b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
index 5ea7a36ab5abc48519c5a0115c366a1329988c5d..36d66f4e2dd0d0b847f153b31f7b8ea5acfa8830 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
@@ -2265,8 +2265,10 @@ const struct rtw89_chip_info rtw8852a_chip_info = {
        .ops                    = &rtw8852a_chip_ops,
        .mac_def                = &rtw89_mac_gen_ax,
        .phy_def                = &rtw89_phy_gen_ax,
-       .fw_basename            = RTW8852A_FW_BASENAME,
-       .fw_format_max          = RTW8852A_FW_FORMAT_MAX,
+       .fw_def                 = {
+               .fw_basename    = RTW8852A_FW_BASENAME,
+               .fw_format_max  = RTW8852A_FW_FORMAT_MAX,
+       },
        .try_ce_fw              = false,
        .bbmcu_nr               = 0,
        .needed_fw_elms         = 0,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b.c b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
index 393986b297eaebfc0db8a78dbea13d5a3268a704..5a41ff1f18f47659411eecd682bb05f22c9dcab4 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
@@ -911,8 +911,10 @@ const struct rtw89_chip_info rtw8852b_chip_info = {
        .ops                    = &rtw8852b_chip_ops,
        .mac_def                = &rtw89_mac_gen_ax,
        .phy_def                = &rtw89_phy_gen_ax,
-       .fw_basename            = RTW8852B_FW_BASENAME,
-       .fw_format_max          = RTW8852B_FW_FORMAT_MAX,
+       .fw_def                 = {
+               .fw_basename    = RTW8852B_FW_BASENAME,
+               .fw_format_max  = RTW8852B_FW_FORMAT_MAX,
+       },
        .try_ce_fw              = true,
        .bbmcu_nr               = 0,
        .needed_fw_elms         = 0,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852bt.c b/drivers/net/wireless/realtek/rtw89/rtw8852bt.c
index 92bbd6e5d6993b552f4017cfc0608be0097e040e..514861e48c253e27aa319df51580545e90b02f62 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852bt.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852bt.c
@@ -757,8 +757,10 @@ const struct rtw89_chip_info rtw8852bt_chip_info = {
        .ops                    = &rtw8852bt_chip_ops,
        .mac_def                = &rtw89_mac_gen_ax,
        .phy_def                = &rtw89_phy_gen_ax,
-       .fw_basename            = RTW8852BT_FW_BASENAME,
-       .fw_format_max          = RTW8852BT_FW_FORMAT_MAX,
+       .fw_def                 = {
+               .fw_basename    = RTW8852BT_FW_BASENAME,
+               .fw_format_max  = RTW8852BT_FW_FORMAT_MAX,
+       },
        .try_ce_fw              = true,
        .bbmcu_nr               = 0,
        .needed_fw_elms         = RTW89_AX_GEN_DEF_NEEDED_FW_ELEMENTS_NO_6GHZ,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c.c b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
index de5d343f80a57933c841f2be98469eb78aaad852..70ca8c3950d91be31a39e76e60b264e6e7f2bb2a 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
@@ -3106,8 +3106,10 @@ const struct rtw89_chip_info rtw8852c_chip_info = {
        .ops                    = &rtw8852c_chip_ops,
        .mac_def                = &rtw89_mac_gen_ax,
        .phy_def                = &rtw89_phy_gen_ax,
-       .fw_basename            = RTW8852C_FW_BASENAME,
-       .fw_format_max          = RTW8852C_FW_FORMAT_MAX,
+       .fw_def                 = {
+               .fw_basename    = RTW8852C_FW_BASENAME,
+               .fw_format_max  = RTW8852C_FW_FORMAT_MAX,
+       },
        .try_ce_fw              = false,
        .bbmcu_nr               = 0,
        .needed_fw_elms         = 0,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8922a.c b/drivers/net/wireless/realtek/rtw89/rtw8922a.c
index f41b66b362c4e61ac5cf1a3b1e95eaf3ae8ca0bb..fd1b171b106cad3fd98682132420870e0b8a0268 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8922a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8922a.c
@@ -2916,8 +2916,10 @@ const struct rtw89_chip_info rtw8922a_chip_info = {
        .ops                    = &rtw8922a_chip_ops,
        .mac_def                = &rtw89_mac_gen_be,
        .phy_def                = &rtw89_phy_gen_be,
-       .fw_basename            = RTW8922A_FW_BASENAME,
-       .fw_format_max          = RTW8922A_FW_FORMAT_MAX,
+       .fw_def                 = {
+               .fw_basename    = RTW8922A_FW_BASENAME,
+               .fw_format_max  = RTW8922A_FW_FORMAT_MAX,
+       },
        .try_ce_fw              = false,
        .bbmcu_nr               = 1,
        .needed_fw_elms         = RTW89_BE_GEN_DEF_NEEDED_FW_ELEMENTS,
@@ -3057,6 +3059,7 @@ EXPORT_SYMBOL(rtw8922a_chip_info);
 const struct rtw89_chip_variant rtw8922ae_vs_variant = {
        .no_mcs_12_13 = true,
        .fw_min_ver_code = RTW89_FW_VER_CODE(0, 35, 54, 0),
+       .fw_def_override = NULL,
 };
 EXPORT_SYMBOL(rtw8922ae_vs_variant);