wifi: rtw89: parse and apply ACPI DSM functions
Ping-Ke Shih
maintainercover wifi: rtw89: parse and apply ACPI DSM functions
The ACPI DSM functions define some regulations used by Realtek Windows WiFi driver. Since rtw89 is also working on PC platforms, follow these settings to have the same behavior.
Zong-Zhe Yang (4):
wifi: rtw89: regd/acpi: support country CA by BIT(1) in 6 GHz SP conf
wifi: rtw89: regd/acpi: update field definition to specific country in
UNII-4 conf
wifi: rtw89: regd/acpi: support regulatory rules via ACPI DSM and
parse rule of regd_UK
wifi: rtw89: regd/acpi: support 6 GHz VLP policy via ACPI DSM
drivers/net/wireless/realtek/rtw89/acpi.c | 95 ++++++++++++++ drivers/net/wireless/realtek/rtw89/acpi.h | 33 ++++- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/regd.c | 149 +++++++++++++++++----- 4 files changed, 242 insertions(+), 36 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/4 wifi: rtw89: regd/acpi: support country CA by BIT(1) in 6 GHz SP conf
From: Zong-Zhe Yang <[email protected]>
ACPI DSM function 7 is used to decide whether 6 GHz Standard Power (SP) is allowed on given countries. Now, add BIT(1) for country CA. Besides, for searching country index, replace for-loop with index getter function.
--- drivers/net/wireless/realtek/rtw89/acpi.h | 1 + drivers/net/wireless/realtek/rtw89/regd.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-)
drivers/net/wireless/realtek/rtw89/acpi.h +1 -0
@@ -56,6 +56,7 @@ struct rtw89_acpi_policy_6ghz {enum rtw89_acpi_conf_6ghz_sp {RTW89_ACPI_CONF_6GHZ_SP_US =BIT (0 ), +RTW89_ACPI_CONF_6GHZ_SP_CA =BIT (1 ), };struct rtw89_acpi_policy_6ghz_sp {
drivers/net/wireless/realtek/rtw89/regd.c +10 -10
@@ -490,12 +490,11 @@ static void rtw89_regd_setup_policy_6ghz(struct rtw89_dev *rtwdev)static void rtw89_regd_setup_policy_6ghz_sp (struct rtw89_dev *rtwdev) {struct rtw89_regulatory_info *regulatory = &rtwdev->regulatory; -const struct rtw89_regd_ctrl *regd_ctrl = ®ulatory->ctrl;const struct rtw89_acpi_policy_6ghz_sp *ptr;struct rtw89_acpi_dsm_result res = {}; -bool enable_by_us; +bool enable; +u8 index;int ret; -int i; ret =rtw89_acpi_evaluate_dsm (rtwdev,RTW89_ACPI_DSM_FUNC_6GHZ_SP_SUP , &res);if (ret) {
@@ -520,14 +519,15 @@ static void rtw89_regd_setup_policy_6ghz_sp(struct rtw89_dev *rtwdev)bitmap_fill (regulatory->block_6ghz_sp,RTW89_REGD_MAX_COUNTRY_NUM ); - enable_by_us =u8_get_bits (ptr->conf,RTW89_ACPI_CONF_6GHZ_SP_US ); + index =rtw89_regd_get_index_by_name (rtwdev,"US" ); + enable =u8_get_bits (ptr->conf,RTW89_ACPI_CONF_6GHZ_SP_US ); +if (enable && index !=RTW89_REGD_MAX_COUNTRY_NUM ) +clear_bit (index, regulatory->block_6ghz_sp); -for (i =0 ; i < regd_ctrl->nr; i++) { -const struct rtw89_regd *tmp = ®d_ctrl->map[i]; - -if (enable_by_us &&memcmp (tmp->alpha2,"US" ,2 ) ==0 ) -clear_bit (i, regulatory->block_6ghz_sp); - } + index =rtw89_regd_get_index_by_name (rtwdev,"CA" ); + enable =u8_get_bits (ptr->conf,RTW89_ACPI_CONF_6GHZ_SP_CA ); +if (enable && index !=RTW89_REGD_MAX_COUNTRY_NUM ) +clear_bit (index, regulatory->block_6ghz_sp); out:kfree (ptr);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next 1/4] wifi: rtw89: regd/acpi: support country CA by BIT(1) in 6 GHz SP conf
Quoted 9 lines · Ping-Ke Shih
From: Zong-Zhe Yang <[email protected]>
ACPI DSM function 7 is used to decide whether 6 GHz Standard Power (SP) is allowed on given countries. Now, add BIT(1) for country CA. Besides, for searching country index, replace for-loop with index getter function.
Signed-off-by Zong-Zhe Yang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
4 patch(es) applied to rtw-next branch of rtw.git, thanks.
75bb7774a16b wifi: rtw89: regd/acpi: support country CA by BIT(1) in 6 GHz SP conf 01186c303ba3 wifi: rtw89: regd/acpi: update field definition to specific country in UNII-4 conf 08fbc2b6881b wifi: rtw89: regd/acpi: support regulatory rules via ACPI DSM and parse rule of regd_UK b99d7cd36da8 wifi: rtw89: regd/acpi: support 6 GHz VLP policy via ACPI DSM
Ping-Ke Shih
maintainerPATCH 2/4 wifi: rtw89: regd/acpi: update field definition to specific country in UNII-4 conf
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
Originally, fields of ACPI DSM function 6 were handled for countries following specific regulatory.
BIT(0) for countries following FCC regulatory BIT(1) for countries following IC regulatory
Now, update to the following (one field for one specific country).
BIT(0) for country US
BIT(1) for country CA
--- drivers/net/wireless/realtek/rtw89/acpi.h | 4 +-- drivers/net/wireless/realtek/rtw89/regd.c | 34 ++++++++--------------- 2 files changed, 13 insertions(+), 25 deletions(-)
drivers/net/wireless/realtek/rtw89/acpi.h +2 -2
@@ -22,8 +22,8 @@ enum rtw89_acpi_dsm_func { };enum rtw89_acpi_conf_unii4 { -RTW89_ACPI_CONF_UNII4_FCC =BIT (0 ), -RTW89_ACPI_CONF_UNII4_IC =BIT (1 ), +RTW89_ACPI_CONF_UNII4_US =BIT (0 ), +RTW89_ACPI_CONF_UNII4_CA =BIT (1 ), };enum rtw89_acpi_policy_mode {
drivers/net/wireless/realtek/rtw89/regd.c +11 -23
@@ -360,15 +360,13 @@ static void rtw89_regd_setup_unii4(struct rtw89_dev *rtwdev, struct wiphy *wiphy) {struct rtw89_regulatory_info *regulatory = &rtwdev->regulatory; -const struct rtw89_regd_ctrl *regd_ctrl = ®ulatory->ctrl;const struct rtw89_chip_info *chip = rtwdev->chip;struct ieee80211_supported_band *sband;struct rtw89_acpi_dsm_result res = {}; -bool enable_by_fcc; -bool enable_by_ic; +bool enable; +u8 index;int ret;u8 val; -int i; sband = wiphy->bands[NL80211_BAND_5GHZ ];if (!sband)
@@ -385,35 +383,25 @@ static void rtw89_regd_setup_unii4(struct rtw89_dev *rtwdev,if (ret) {rtw89_debug (rtwdev,RTW89_DBG_REGD ,"acpi: cannot eval unii 4: %d\n" , ret); - enable_by_fcc = true; - enable_by_ic = false; + val =u8_encode_bits (1 ,RTW89_ACPI_CONF_UNII4_US ); goto bottom; } val = res.u.value; - enable_by_fcc =u8_get_bits (val,RTW89_ACPI_CONF_UNII4_FCC ); - enable_by_ic =u8_get_bits (val,RTW89_ACPI_CONF_UNII4_IC );rtw89_debug (rtwdev,RTW89_DBG_REGD ,"acpi: eval if allow unii-4: 0x%x\n" , val); bottom: -for (i =0 ; i < regd_ctrl->nr; i++) { -const struct rtw89_regd *regd = ®d_ctrl->map[i]; + index =rtw89_regd_get_index_by_name (rtwdev,"US" ); + enable =u8_get_bits (val,RTW89_ACPI_CONF_UNII4_US ); +if (enable && index !=RTW89_REGD_MAX_COUNTRY_NUM ) +clear_bit (index, regulatory->block_unii4); -switch (regd->txpwr_regd[RTW89_BAND_5G ]) { -case RTW89_FCC : -if (enable_by_fcc) -clear_bit (i, regulatory->block_unii4); -break ; -case RTW89_IC : -if (enable_by_ic) -clear_bit (i, regulatory->block_unii4); -break ; -default : -break ; - } - } + index =rtw89_regd_get_index_by_name (rtwdev,"CA" ); + enable =u8_get_bits (val,RTW89_ACPI_CONF_UNII4_CA ); +if (enable && index !=RTW89_REGD_MAX_COUNTRY_NUM ) +clear_bit (index, regulatory->block_unii4); } static void __rtw89_regd_setup_policy_6ghz(struct rtw89_dev *rtwdev, bool block,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/4 wifi: rtw89: regd/acpi: support regulatory rules via ACPI DSM and parse rule of regd_UK
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
ACPI DSM function 10 is defined for the enablement for Realtek regulatory rules. The first rule is whether to allow regd_UK regulatory settings or not. If not, the strict one, i.e. regd_ETSI, regulatory settings will be used on country GB.
--- drivers/net/wireless/realtek/rtw89/acpi.c | 48 +++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/acpi.h | 13 ++++++ drivers/net/wireless/realtek/rtw89/regd.c | 27 ++++++++++++- 3 files changed, 87 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/acpi.c +48 -0
@@ -279,6 +279,51 @@ static int rtw89_acpi_dsm_get_policy_tas(struct rtw89_dev *rtwdev,return 0 ; } +static +bool chk_acpi_policy_reg_rules_sig (const struct rtw89_acpi_policy_reg_rules *p) +{ +return p->signature[0 ] ==0x52 && + p->signature[1 ] ==0x54 && + p->signature[2 ] ==0x4B && + p->signature[3 ] ==0x0A ; +} + +static +int rtw89_acpi_dsm_get_policy_reg_rules (struct rtw89_dev *rtwdev, +union acpi_object *obj, +struct rtw89_acpi_policy_reg_rules **policy) +{ +const struct rtw89_acpi_policy_reg_rules *ptr; +u32 buf_len; + +if (obj->type !=ACPI_TYPE_BUFFER ) { +rtw89_debug (rtwdev,RTW89_DBG_ACPI , +"acpi: expect buffer but type: %d\n" , obj->type); +return -EINVAL ; + } + + buf_len = obj->buffer.length; +if (buf_len <sizeof (*ptr)) { +rtw89_debug (rtwdev,RTW89_DBG_ACPI ,"%s: invalid buffer length: %u\n" , + __func__, buf_len); +return -EINVAL ; + } + + ptr = (typeof (ptr ))obj->buffer.pointer; +if (!chk_acpi_policy_reg_rules_sig (ptr)) { +rtw89_debug (rtwdev,RTW89_DBG_ACPI ,"%s: bad signature\n" , __func__); +return -EINVAL ; + } + + *policy =kmemdup (ptr,sizeof (*ptr),GFP_KERNEL ); +if (!*policy) +return -ENOMEM ; + +rtw89_hex_dump (rtwdev,RTW89_DBG_ACPI ,"policy_reg_rules: " , *policy, +sizeof (*ptr)); +return 0 ; +} +int rtw89_acpi_evaluate_dsm (struct rtw89_dev *rtwdev,enum rtw89_acpi_dsm_func func,struct rtw89_acpi_dsm_result *res)
@@ -302,6 +347,9 @@ int rtw89_acpi_evaluate_dsm(struct rtw89_dev *rtwdev, &res->u.policy_6ghz_sp); else if (func == RTW89_ACPI_DSM_FUNC_TAS_EN) ret =rtw89_acpi_dsm_get_policy_tas (rtwdev, obj, &res->u.policy_tas); + else if (func == RTW89_ACPI_DSM_FUNC_REG_RULES_EN) + ret =rtw89_acpi_dsm_get_policy_reg_rules (rtwdev, obj, + &res->u.policy_reg_rules); else ret =rtw89_acpi_dsm_get_value (rtwdev, obj, &res->u.value);
drivers/net/wireless/realtek/rtw89/acpi.h +13 -0
@@ -19,6 +19,7 @@ enum rtw89_acpi_dsm_func {RTW89_ACPI_DSM_FUNC_TAS_EN =5 ,RTW89_ACPI_DSM_FUNC_UNII4_SUP =6 ,RTW89_ACPI_DSM_FUNC_6GHZ_SP_SUP =7 , + RTW89_ACPI_DSM_FUNC_REG_RULES_EN = 10, }; enum rtw89_acpi_conf_unii4 {
@@ -75,6 +76,17 @@ struct rtw89_acpi_policy_tas {u8 rsvd[3 ]; } __packed; +enum rtw89_acpi_conf_reg_rules { +RTW89_ACPI_CONF_REG_RULE_REGD_UK =BIT (0 ), +}; + +struct rtw89_acpi_policy_reg_rules { +u8 signature[4 ]; +u8 revision; +u8 conf; +u8 rsvd[3 ]; +} __packed; + struct rtw89_acpi_dsm_result { union { u8 value;
@@ -82,6 +94,7 @@ struct rtw89_acpi_dsm_result {struct rtw89_acpi_policy_6ghz *policy_6ghz;struct rtw89_acpi_policy_6ghz_sp *policy_6ghz_sp;struct rtw89_acpi_policy_tas *policy_tas; +struct rtw89_acpi_policy_reg_rules *policy_reg_rules; } u; };
drivers/net/wireless/realtek/rtw89/regd.c +26 -1
@@ -608,6 +608,30 @@ const char *rtw89_regd_get_string(enum rtw89_regulation_type regd)return rtw89_regd_string[regd]; } +static void rtw89_regd_setup_reg_rules (struct rtw89_dev *rtwdev) +{ +struct rtw89_regulatory_info *regulatory = &rtwdev->regulatory; +const struct rtw89_acpi_policy_reg_rules *ptr; +struct rtw89_acpi_dsm_result res = {}; +int ret; + + regulatory->txpwr_uk_follow_etsi = true; + + ret =rtw89_acpi_evaluate_dsm (rtwdev,RTW89_ACPI_DSM_FUNC_REG_RULES_EN , &res); +if (ret) { +rtw89_debug (rtwdev,RTW89_DBG_REGD , +"acpi: cannot eval policy reg-rules: %d\n" , ret); +return ; + } + + ptr = res.u.policy_reg_rules; + + regulatory->txpwr_uk_follow_etsi = + !u8_get_bits (ptr->conf,RTW89_ACPI_CONF_REG_RULE_REGD_UK ); + +kfree (ptr); +} +int rtw89_regd_setup (struct rtw89_dev *rtwdev) {struct rtw89_regulatory_info *regulatory = &rtwdev->regulatory;
@@ -624,7 +648,8 @@ int rtw89_regd_setup(struct rtw89_dev *rtwdev) } regulatory->reg_6ghz_power =RTW89_REG_6GHZ_POWER_DFLT ; - regulatory->txpwr_uk_follow_etsi = true; + +rtw89_regd_setup_reg_rules (rtwdev);if (!wiphy)return -EINVAL ;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/4 wifi: rtw89: regd/acpi: support 6 GHz VLP policy via ACPI DSM
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
Process ACPI DSM function 11 to get 6 GHz VLP support by country. If not allowed, return error to block the connection. By default, i.e. ACPI DSM function is not configured, disallow 6 GHz VLP on country US and country CA, because some platform-level certifications are needed in FCC regulation before operating on 6 GHz VLP connection.
--- drivers/net/wireless/realtek/rtw89/acpi.c | 47 ++++++++++++++++ drivers/net/wireless/realtek/rtw89/acpi.h | 15 +++++ drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/regd.c | 68 +++++++++++++++++++++++ 4 files changed, 131 insertions(+)
drivers/net/wireless/realtek/rtw89/acpi.c +47 -0
@@ -236,6 +236,50 @@ int rtw89_acpi_dsm_get_policy_6ghz_sp(struct rtw89_dev *rtwdev,return 0 ; } +static bool chk_acpi_policy_6ghz_vlp_sig (const struct rtw89_acpi_policy_6ghz_vlp *p) +{ +return p->signature[0 ] ==0x52 && + p->signature[1 ] ==0x54 && + p->signature[2 ] ==0x4B && + p->signature[3 ] ==0x0B ; +} + +static +int rtw89_acpi_dsm_get_policy_6ghz_vlp (struct rtw89_dev *rtwdev, +union acpi_object *obj, +struct rtw89_acpi_policy_6ghz_vlp **policy) +{ +const struct rtw89_acpi_policy_6ghz_vlp *ptr; +u32 buf_len; + +if (obj->type !=ACPI_TYPE_BUFFER ) { +rtw89_debug (rtwdev,RTW89_DBG_ACPI , +"acpi: expect buffer but type: %d\n" , obj->type); +return -EINVAL ; + } + + buf_len = obj->buffer.length; +if (buf_len <sizeof (*ptr)) { +rtw89_debug (rtwdev,RTW89_DBG_ACPI ,"%s: invalid buffer length: %u\n" , + __func__, buf_len); +return -EINVAL ; + } + + ptr = (typeof (ptr ))obj->buffer.pointer; +if (!chk_acpi_policy_6ghz_vlp_sig (ptr)) { +rtw89_debug (rtwdev,RTW89_DBG_ACPI ,"%s: bad signature\n" , __func__); +return -EINVAL ; + } + + *policy =kmemdup (ptr,sizeof (*ptr),GFP_KERNEL ); +if (!*policy) +return -ENOMEM ; + +rtw89_hex_dump (rtwdev,RTW89_DBG_ACPI ,"policy_6ghz_vlp: " , *policy, +sizeof (*ptr)); +return 0 ; +} +static bool chk_acpi_policy_tas_sig (const struct rtw89_acpi_policy_tas *p) { return p->signature[0] == 0x52 &&
@@ -345,6 +389,9 @@ int rtw89_acpi_evaluate_dsm(struct rtw89_dev *rtwdev,else if (func ==RTW89_ACPI_DSM_FUNC_6GHZ_SP_SUP ) ret =rtw89_acpi_dsm_get_policy_6ghz_sp (rtwdev, obj, &res->u.policy_6ghz_sp); +else if (func ==RTW89_ACPI_DSM_FUNC_6GHZ_VLP_SUP ) + ret =rtw89_acpi_dsm_get_policy_6ghz_vlp (rtwdev, obj, + &res->u.policy_6ghz_vlp);else if (func ==RTW89_ACPI_DSM_FUNC_TAS_EN ) ret =rtw89_acpi_dsm_get_policy_tas (rtwdev, obj, &res->u.policy_tas);else if (func ==RTW89_ACPI_DSM_FUNC_REG_RULES_EN )
drivers/net/wireless/realtek/rtw89/acpi.h +15 -0
@@ -20,6 +20,7 @@ enum rtw89_acpi_dsm_func {RTW89_ACPI_DSM_FUNC_UNII4_SUP =6 ,RTW89_ACPI_DSM_FUNC_6GHZ_SP_SUP =7 ,RTW89_ACPI_DSM_FUNC_REG_RULES_EN =10 , + RTW89_ACPI_DSM_FUNC_6GHZ_VLP_SUP = 11, }; enum rtw89_acpi_conf_unii4 {
@@ -68,6 +69,19 @@ struct rtw89_acpi_policy_6ghz_sp {u8 rsvd; } __packed; +enum rtw89_acpi_conf_6ghz_vlp { +RTW89_ACPI_CONF_6GHZ_VLP_US =BIT (0 ), +RTW89_ACPI_CONF_6GHZ_VLP_CA =BIT (1 ), +}; + +struct rtw89_acpi_policy_6ghz_vlp { +u8 signature[4 ]; +u8 revision; +u8 override; +u8 conf; +u8 rsvd; +} __packed; +struct rtw89_acpi_policy_tas {u8 signature[4 ];u8 revision;
@@ -93,6 +107,7 @@ struct rtw89_acpi_dsm_result {/* caller needs to free it after using */ struct rtw89_acpi_policy_6ghz *policy_6ghz;struct rtw89_acpi_policy_6ghz_sp *policy_6ghz_sp; +struct rtw89_acpi_policy_6ghz_vlp *policy_6ghz_vlp;struct rtw89_acpi_policy_tas *policy_tas;struct rtw89_acpi_policy_reg_rules *policy_reg_rules; } u;
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -5386,6 +5386,7 @@ struct rtw89_regulatory_info {DECLARE_BITMAP (block_unii4,RTW89_REGD_MAX_COUNTRY_NUM );DECLARE_BITMAP (block_6ghz,RTW89_REGD_MAX_COUNTRY_NUM );DECLARE_BITMAP (block_6ghz_sp,RTW89_REGD_MAX_COUNTRY_NUM ); +DECLARE_BITMAP (block_6ghz_vlp,RTW89_REGD_MAX_COUNTRY_NUM ); };enum rtw89_ifs_clm_application {
drivers/net/wireless/realtek/rtw89/regd.c +68 -0
99 lines not on this page · raw message
Signature · 1 line
2.25.1