wifi: rtw89: phy: move bb_gain_info used by WiFi 6 chips to union

WiFi 7 chips use different bb_gain_info struct, so move existing struct to
a union in advance. This doesn't change logic at all.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20240105064228.36580-2-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index ea6df85..8c5b831 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -4824,7 +4824,9 @@ struct rtw89_dev {
        struct rtw89_env_monitor_info env_monitor;
        struct rtw89_dig_info dig;
        struct rtw89_phy_ch_info ch_info;
-       struct rtw89_phy_bb_gain_info bb_gain;
+       union {
+               struct rtw89_phy_bb_gain_info ax;
+       } bb_gain;
        struct rtw89_phy_efuse_gain efuse_gain;
        struct rtw89_phy_ul_tb_info ul_tb_info;
        struct rtw89_antdiv_info antdiv;

diff --git a/drivers/net/wireless/realtek/rtw89/phy.c b/drivers/net/wireless/realtek/rtw89/phy.c
index bafc7b1..b2729c2 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/phy.c
+++ b/drivers/net/wireless/realtek/rtw89/phy.c
@@ -929,7 +929,7 @@ static void
 rtw89_phy_cfg_bb_gain_error(struct rtw89_dev *rtwdev,
                            union rtw89_phy_bb_gain_arg arg, u32 data)
 {
-       struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain;
+       struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain.ax;
        u8 type = arg.type;
        u8 path = arg.path;
        u8 gband = arg.gain_band;
@@ -968,7 +968,7 @@ static void
 rtw89_phy_cfg_bb_rpl_ofst(struct rtw89_dev *rtwdev,
                          union rtw89_phy_bb_gain_arg arg, u32 data)
 {
-       struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain;
+       struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain.ax;
        u8 rxsc_start = arg.rxsc_start;
        u8 bw = arg.bw;
        u8 path = arg.path;
@@ -1050,7 +1050,7 @@ static void
 rtw89_phy_cfg_bb_gain_bypass(struct rtw89_dev *rtwdev,
                             union rtw89_phy_bb_gain_arg arg, u32 data)
 {
-       struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain;
+       struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain.ax;
        u8 type = arg.type;
        u8 path = arg.path;
        u8 gband = arg.gain_band;
@@ -1077,7 +1077,7 @@ static void
 rtw89_phy_cfg_bb_gain_op1db(struct rtw89_dev *rtwdev,
                            union rtw89_phy_bb_gain_arg arg, u32 data)
 {
-       struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain;
+       struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain.ax;
        u8 type = arg.type;
        u8 path = arg.path;
        u8 gband = arg.gain_band;

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8851b.c b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
index 5c167a9..b5cf093 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8851b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
@@ -901,7 +901,7 @@ static void rtw8851b_set_gain_error(struct rtw89_dev *rtwdev,
                                    enum rtw89_subband subband,
                                    enum rtw89_rf_path path)
 {
-       const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain;
+       const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain.ax;
        u8 gain_band = rtw89_subband_to_bb_gain_band(subband);
        s32 val;
        u32 reg;
@@ -987,7 +987,7 @@ next:
 static
 void rtw8851b_set_rxsc_rpl_comp(struct rtw89_dev *rtwdev, enum rtw89_subband subband)
 {
-       const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain;
+       const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain.ax;
        u8 band = rtw89_subband_to_bb_gain_band(subband);
        u32 val;
 

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b.c b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
index de887a3..ab60cc1 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
@@ -988,7 +988,7 @@ static void rtw8852b_set_gain_error(struct rtw89_dev *rtwdev,
                                    enum rtw89_subband subband,
                                    enum rtw89_rf_path path)
 {
-       const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain;
+       const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain.ax;
        u8 gain_band = rtw89_subband_to_bb_gain_band(subband);
        s32 val;
        u32 reg;
@@ -1086,7 +1086,7 @@ next:
 static
 void rtw8852b_set_rxsc_rpl_comp(struct rtw89_dev *rtwdev, enum rtw89_subband subband)
 {
-       const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain;
+       const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain.ax;
        u8 band = rtw89_subband_to_bb_gain_band(subband);
        u32 val;
 

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c.c b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
index 8618d02..9a9b710 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
@@ -842,7 +842,7 @@ static void rtw8852c_set_gain_error(struct rtw89_dev *rtwdev,
                                    enum rtw89_subband subband,
                                    enum rtw89_rf_path path)
 {
-       const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain;
+       const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain.ax;
        u8 gain_band = rtw89_subband_to_bb_gain_band(subband);
        s32 val;
        u32 reg;