wifi: rtw89: sar: add supported UNII-4 frequency range along with UNII-3 of SAR subband

The UNII-4 uses the same SAR value of UNII-3, so add UNII-4 frequency
range and change the enum name to represent UNII-3 and UNII-4.

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

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index 38df161bfd351253b27da3617b41b4736424a778..171711d6eac9371776239c1b976af813c29c918b 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -4562,7 +4562,7 @@ enum rtw89_sar_subband {
        RTW89_SAR_2GHZ_SUBBAND,
        RTW89_SAR_5GHZ_SUBBAND_1_2, /* U-NII-1 and U-NII-2 */
        RTW89_SAR_5GHZ_SUBBAND_2_E, /* U-NII-2-Extended */
-       RTW89_SAR_5GHZ_SUBBAND_3,   /* U-NII-3 */
+       RTW89_SAR_5GHZ_SUBBAND_3_4, /* U-NII-3 and U-NII-4 */
        RTW89_SAR_6GHZ_SUBBAND_5_L, /* U-NII-5 lower part */
        RTW89_SAR_6GHZ_SUBBAND_5_H, /* U-NII-5 higher part */
        RTW89_SAR_6GHZ_SUBBAND_6,   /* U-NII-6 */

diff --git a/drivers/net/wireless/realtek/rtw89/sar.c b/drivers/net/wireless/realtek/rtw89/sar.c
index 27826d909785c8fb9c82e8d2ec262f0f6bb62bb0..bcc287771b2a35c84bb62b7a41f8ef52aeeca471 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/sar.c
+++ b/drivers/net/wireless/realtek/rtw89/sar.c
@@ -27,8 +27,8 @@ static enum rtw89_sar_subband rtw89_sar_get_subband(struct rtw89_dev *rtwdev,
                return RTW89_SAR_5GHZ_SUBBAND_1_2;
        case 5500 ... 5720:
                return RTW89_SAR_5GHZ_SUBBAND_2_E;
-       case 5745 ... 5825:
-               return RTW89_SAR_5GHZ_SUBBAND_3;
+       case 5745 ... 5885:
+               return RTW89_SAR_5GHZ_SUBBAND_3_4;
        case 5955 ... 6155:
                return RTW89_SAR_6GHZ_SUBBAND_5_L;
        case 6175 ... 6415:
@@ -295,7 +295,7 @@ static const struct cfg80211_sar_freq_ranges rtw89_common_sar_freq_ranges[] = {
        { .start_freq = 2412, .end_freq = 2484, },
        { .start_freq = 5180, .end_freq = 5320, },
        { .start_freq = 5500, .end_freq = 5720, },
-       { .start_freq = 5745, .end_freq = 5825, },
+       { .start_freq = 5745, .end_freq = 5885, },
        { .start_freq = 5955, .end_freq = 6155, },
        { .start_freq = 6175, .end_freq = 6415, },
        { .start_freq = 6435, .end_freq = 6515, },