* [PATCH v3 0/2] rtw88: update regulatory settings @ 2019-10-22 10:12 yhchuang 2019-10-22 10:12 ` [PATCH v3 1/2] rtw88: add regulatory process strategy for different chipset yhchuang 2019-10-22 10:12 ` [PATCH v3 2/2] rtw88: support dynamic user regulatory setting yhchuang 0 siblings, 2 replies; 7+ messages in thread From: yhchuang @ 2019-10-22 10:12 UTC (permalink / raw) To: kvalo; +Cc: linux-wireless, briannorris From: Yan-Hsuan Chuang <yhchuang@realtek.com> Set regulatory according to hints from kernel, and allows to report WW country code, by wiphy_apply_custom_regulatory(). Also add a Kconfig to let user to config if NL80211_REGDOM_SET_BY_USER is allowed. Refer to the commit log for more details v2 -> v3 * split patch set for further discussion Tzu-En Huang (2): rtw88: add regulatory process strategy for different chipset rtw88: support dynamic user regulatory setting drivers/net/wireless/realtek/rtw88/Kconfig | 10 ++++ drivers/net/wireless/realtek/rtw88/main.c | 6 ++- drivers/net/wireless/realtek/rtw88/main.h | 1 + drivers/net/wireless/realtek/rtw88/regd.c | 61 ++++++++++++++++++---- 4 files changed, 65 insertions(+), 13 deletions(-) -- 2.17.1 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 1/2] rtw88: add regulatory process strategy for different chipset 2019-10-22 10:12 [PATCH v3 0/2] rtw88: update regulatory settings yhchuang @ 2019-10-22 10:12 ` yhchuang 2019-10-25 3:54 ` Chris Chiu 2019-10-22 10:12 ` [PATCH v3 2/2] rtw88: support dynamic user regulatory setting yhchuang 1 sibling, 1 reply; 7+ messages in thread From: yhchuang @ 2019-10-22 10:12 UTC (permalink / raw) To: kvalo; +Cc: linux-wireless, briannorris From: Tzu-En Huang <tehuang@realtek.com> There are two kinds of country/regulatory efuse settings for Realtek's chipset, one is worldwide and the other is a specific country. For both settings, REGULATORY_STRICT_REG will be set, telling stack that devices original regulatory is the superset of any further settings. For the chipset with the country setting being a specific country, Realtek does not apply any new regulatory setting notifiers to the card. For the chipset with a worldwide regulatory setting, Realtek's custom worldwide regulatory setting will be provided via wiphy_apply_custom_regulatory(). And if a new regulatory notification is set by NL80211_REGDOM_SET_BY_COUNTRY_IE, the new setting will be applied to the card. Signed-off-by: Tzu-En Huang <tehuang@realtek.com> Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com> --- drivers/net/wireless/realtek/rtw88/main.c | 6 ++- drivers/net/wireless/realtek/rtw88/main.h | 1 + drivers/net/wireless/realtek/rtw88/regd.c | 58 +++++++++++++++++++---- 3 files changed, 53 insertions(+), 12 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c index 5343d860189b..25d450aada8a 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -1337,8 +1337,10 @@ int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw) return ret; } - if (regulatory_hint(hw->wiphy, rtwdev->regd.alpha2)) - rtw_err(rtwdev, "regulatory_hint fail\n"); + if (!rtwdev->efuse.country_worldwide) { + if (regulatory_hint(hw->wiphy, rtwdev->efuse.country_code)) + rtw_err(rtwdev, "regulatory_hint fail\n"); + } rtw_debugfs_init(rtwdev); diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h index 4759d6a0ca6e..88ad03472063 100644 --- a/drivers/net/wireless/realtek/rtw88/main.h +++ b/drivers/net/wireless/realtek/rtw88/main.h @@ -1205,6 +1205,7 @@ struct rtw_efuse { u8 addr[ETH_ALEN]; u8 channel_plan; u8 country_code[2]; + bool country_worldwide; u8 rf_board_option; u8 rfe_option; u8 thermal_meter; diff --git a/drivers/net/wireless/realtek/rtw88/regd.c b/drivers/net/wireless/realtek/rtw88/regd.c index 69744dd65968..718a147697cc 100644 --- a/drivers/net/wireless/realtek/rtw88/regd.c +++ b/drivers/net/wireless/realtek/rtw88/regd.c @@ -7,6 +7,18 @@ #include "debug.h" #include "phy.h" +static const struct ieee80211_regdomain rtw88_world_regdom = { + .n_reg_rules = 5, + .alpha2 = "99", + .reg_rules = { + REG_RULE(2412 - 10, 2462 + 10, 40, 0, 20, 0), + REG_RULE(2467 - 10, 2484 + 10, 40, 0, 20, NL80211_RRF_NO_IR), + REG_RULE(5180 - 10, 5240 + 10, 80, 0, 20, NL80211_RRF_NO_IR), + REG_RULE(5260 - 10, 5700 + 10, 80, 0, 20, + NL80211_RRF_NO_IR | NL80211_RRF_DFS), + REG_RULE(5745 - 10, 5825 + 10, 80, 0, 20, NL80211_RRF_NO_IR), + } +}; #define COUNTRY_CHPLAN_ENT(_alpha2, _chplan, _txpwr_regd) \ {.alpha2 = (_alpha2), \ .chplan = (_chplan), \ @@ -339,12 +351,30 @@ static struct rtw_regulatory rtw_regd_find_reg_by_name(char *alpha2) return rtw_defined_chplan; } +static bool rtw_regd_is_ww(struct rtw_regulatory *reg) +{ + if (reg->txpwr_regd == RTW_REGD_WW) + return true; + return false; +} + static int rtw_regd_notifier_apply(struct rtw_dev *rtwdev, struct wiphy *wiphy, struct regulatory_request *request) { + if (request->initiator == NL80211_REGDOM_SET_BY_DRIVER) + return -EINVAL; if (request->initiator == NL80211_REGDOM_SET_BY_USER) + return -EINVAL; + if (request->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE && + !rtw_regd_is_ww(&rtwdev->regd)) + return -EINVAL; + if (request->initiator == NL80211_REGDOM_SET_BY_CORE && + !rtwdev->efuse.country_worldwide) { + rtwdev->regd = + rtw_regd_find_reg_by_name(rtwdev->efuse.country_code); return 0; + } rtwdev->regd = rtw_regd_find_reg_by_name(request->alpha2); rtw_regd_apply_world_flags(wiphy, request->initiator); @@ -352,15 +382,22 @@ static int rtw_regd_notifier_apply(struct rtw_dev *rtwdev, } static int -rtw_regd_init_wiphy(struct rtw_regulatory *reg, struct wiphy *wiphy, +rtw_regd_init_wiphy(struct rtw_dev *rtwdev, struct wiphy *wiphy, void (*reg_notifier)(struct wiphy *wiphy, struct regulatory_request *request)) { + struct rtw_regulatory *reg = &rtwdev->regd; + wiphy->reg_notifier = reg_notifier; - wiphy->regulatory_flags &= ~REGULATORY_CUSTOM_REG; - wiphy->regulatory_flags &= ~REGULATORY_STRICT_REG; - wiphy->regulatory_flags &= ~REGULATORY_DISABLE_BEACON_HINTS; + if (rtw_regd_is_ww(reg)) { + rtwdev->efuse.country_worldwide = true; + wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG; + wiphy_apply_custom_regulatory(wiphy, &rtw88_world_regdom); + } else { + rtwdev->efuse.country_worldwide = false; + } + wiphy->regulatory_flags |= REGULATORY_STRICT_REG; rtw_regd_apply_hw_cap_flags(wiphy); @@ -377,7 +414,7 @@ int rtw_regd_init(struct rtw_dev *rtwdev, return -EINVAL; rtwdev->regd = rtw_regd_find_reg_by_name(rtwdev->efuse.country_code); - rtw_regd_init_wiphy(&rtwdev->regd, wiphy, reg_notifier); + rtw_regd_init_wiphy(rtwdev, wiphy, reg_notifier); return 0; } @@ -388,11 +425,12 @@ void rtw_regd_notifier(struct wiphy *wiphy, struct regulatory_request *request) struct rtw_dev *rtwdev = hw->priv; struct rtw_hal *hal = &rtwdev->hal; - rtw_regd_notifier_apply(rtwdev, wiphy, request); - rtw_dbg(rtwdev, RTW_DBG_REGD, - "get alpha2 %c%c from initiator %d, mapping to chplan 0x%x, txregd %d\n", - request->alpha2[0], request->alpha2[1], request->initiator, - rtwdev->regd.chplan, rtwdev->regd.txpwr_regd); + if (!rtw_regd_notifier_apply(rtwdev, wiphy, request)) + rtw_dbg(rtwdev, RTW_DBG_REGD, + "get alpha2 %c%c from initiator %d, mapping to chplan 0x%x, txregd %d\n", + request->alpha2[0], request->alpha2[1], + request->initiator, rtwdev->regd.chplan, + rtwdev->regd.txpwr_regd); rtw_phy_set_tx_power_level(rtwdev, hal->current_channel); } -- 2.17.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] rtw88: add regulatory process strategy for different chipset 2019-10-22 10:12 ` [PATCH v3 1/2] rtw88: add regulatory process strategy for different chipset yhchuang @ 2019-10-25 3:54 ` Chris Chiu 2019-11-29 2:29 ` Tony Chuang 0 siblings, 1 reply; 7+ messages in thread From: Chris Chiu @ 2019-10-25 3:54 UTC (permalink / raw) To: Tony Chuang; +Cc: Kalle Valo, linux-wireless, Brian Norris On Tue, Oct 22, 2019 at 6:12 PM <yhchuang@realtek.com> wrote: > > From: Tzu-En Huang <tehuang@realtek.com> > > There are two kinds of country/regulatory efuse settings > for Realtek's chipset, one is worldwide and the other is > a specific country. For both settings, REGULATORY_STRICT_REG > will be set, telling stack that devices original regulatory is > the superset of any further settings. > > For the chipset with the country setting being a specific > country, Realtek does not apply any new regulatory setting > notifiers to the card. > > For the chipset with a worldwide regulatory setting, > Realtek's custom worldwide regulatory setting will be > provided via wiphy_apply_custom_regulatory(). > And if a new regulatory notification is set by > NL80211_REGDOM_SET_BY_COUNTRY_IE, the new setting will be > applied to the card. > > Signed-off-by: Tzu-En Huang <tehuang@realtek.com> > Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com> Reviewed-by: Chris Chiu <chiu@endlessm.com> Looks good to me. Chris > --- > drivers/net/wireless/realtek/rtw88/main.c | 6 ++- > drivers/net/wireless/realtek/rtw88/main.h | 1 + > drivers/net/wireless/realtek/rtw88/regd.c | 58 +++++++++++++++++++---- > 3 files changed, 53 insertions(+), 12 deletions(-) > > > -- > 2.17.1 > ^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCH v3 1/2] rtw88: add regulatory process strategy for different chipset 2019-10-25 3:54 ` Chris Chiu @ 2019-11-29 2:29 ` Tony Chuang 2019-11-29 5:23 ` Kalle Valo 0 siblings, 1 reply; 7+ messages in thread From: Tony Chuang @ 2019-11-29 2:29 UTC (permalink / raw) To: Chris Chiu; +Cc: Kalle Valo, linux-wireless, Brian Norris > -----Original Message----- > From: Chris Chiu [mailto:chiu@endlessm.com] > Sent: Friday, October 25, 2019 11:54 AM > To: Tony Chuang > Cc: Kalle Valo; linux-wireless; Brian Norris > Subject: Re: [PATCH v3 1/2] rtw88: add regulatory process strategy for > different chipset > > On Tue, Oct 22, 2019 at 6:12 PM <yhchuang@realtek.com> wrote: > > > > From: Tzu-En Huang <tehuang@realtek.com> > > > > There are two kinds of country/regulatory efuse settings > > for Realtek's chipset, one is worldwide and the other is > > a specific country. For both settings, REGULATORY_STRICT_REG > > will be set, telling stack that devices original regulatory is > > the superset of any further settings. > > > > For the chipset with the country setting being a specific > > country, Realtek does not apply any new regulatory setting > > notifiers to the card. > > > > For the chipset with a worldwide regulatory setting, > > Realtek's custom worldwide regulatory setting will be > > provided via wiphy_apply_custom_regulatory(). > > And if a new regulatory notification is set by > > NL80211_REGDOM_SET_BY_COUNTRY_IE, the new setting will be > > applied to the card. > > > > Signed-off-by: Tzu-En Huang <tehuang@realtek.com> > > Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com> > Reviewed-by: Chris Chiu <chiu@endlessm.com> > > Looks good to me. > > Chris Gentle ping of this patch set :) Yan-Hsuan ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] rtw88: add regulatory process strategy for different chipset 2019-11-29 2:29 ` Tony Chuang @ 2019-11-29 5:23 ` Kalle Valo 2020-02-12 8:47 ` Tony Chuang 0 siblings, 1 reply; 7+ messages in thread From: Kalle Valo @ 2019-11-29 5:23 UTC (permalink / raw) To: Tony Chuang; +Cc: Chris Chiu, linux-wireless, Brian Norris Tony Chuang <yhchuang@realtek.com> writes: >> -----Original Message----- >> From: Chris Chiu [mailto:chiu@endlessm.com] >> Sent: Friday, October 25, 2019 11:54 AM >> To: Tony Chuang >> Cc: Kalle Valo; linux-wireless; Brian Norris >> Subject: Re: [PATCH v3 1/2] rtw88: add regulatory process strategy for >> different chipset >> >> On Tue, Oct 22, 2019 at 6:12 PM <yhchuang@realtek.com> wrote: >> > >> > From: Tzu-En Huang <tehuang@realtek.com> >> > >> > There are two kinds of country/regulatory efuse settings >> > for Realtek's chipset, one is worldwide and the other is >> > a specific country. For both settings, REGULATORY_STRICT_REG >> > will be set, telling stack that devices original regulatory is >> > the superset of any further settings. >> > >> > For the chipset with the country setting being a specific >> > country, Realtek does not apply any new regulatory setting >> > notifiers to the card. >> > >> > For the chipset with a worldwide regulatory setting, >> > Realtek's custom worldwide regulatory setting will be >> > provided via wiphy_apply_custom_regulatory(). >> > And if a new regulatory notification is set by >> > NL80211_REGDOM_SET_BY_COUNTRY_IE, the new setting will be >> > applied to the card. >> > >> > Signed-off-by: Tzu-En Huang <tehuang@realtek.com> >> > Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com> >> Reviewed-by: Chris Chiu <chiu@endlessm.com> >> >> Looks good to me. >> >> Chris > > Gentle ping of this patch set :) This is on my queue. I just want to investigate this in detail and haven't found enough free time to do that. -- https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches ^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCH v3 1/2] rtw88: add regulatory process strategy for different chipset 2019-11-29 5:23 ` Kalle Valo @ 2020-02-12 8:47 ` Tony Chuang 0 siblings, 0 replies; 7+ messages in thread From: Tony Chuang @ 2020-02-12 8:47 UTC (permalink / raw) To: Kalle Valo; +Cc: Chris Chiu, linux-wireless, Brian Norris, Andy Huang > Tony Chuang <yhchuang@realtek.com> writes: > > >> -----Original Message----- > >> From: Chris Chiu [mailto:chiu@endlessm.com] > >> Sent: Friday, October 25, 2019 11:54 AM > >> To: Tony Chuang > >> Cc: Kalle Valo; linux-wireless; Brian Norris > >> Subject: Re: [PATCH v3 1/2] rtw88: add regulatory process strategy for > >> different chipset > >> > >> On Tue, Oct 22, 2019 at 6:12 PM <yhchuang@realtek.com> wrote: > >> > > >> > From: Tzu-En Huang <tehuang@realtek.com> > >> > > >> > There are two kinds of country/regulatory efuse settings > >> > for Realtek's chipset, one is worldwide and the other is > >> > a specific country. For both settings, REGULATORY_STRICT_REG > >> > will be set, telling stack that devices original regulatory is > >> > the superset of any further settings. > >> > > >> > For the chipset with the country setting being a specific > >> > country, Realtek does not apply any new regulatory setting > >> > notifiers to the card. > >> > > >> > For the chipset with a worldwide regulatory setting, > >> > Realtek's custom worldwide regulatory setting will be > >> > provided via wiphy_apply_custom_regulatory(). > >> > And if a new regulatory notification is set by > >> > NL80211_REGDOM_SET_BY_COUNTRY_IE, the new setting will be > >> > applied to the card. > >> > > >> > Signed-off-by: Tzu-En Huang <tehuang@realtek.com> > >> > Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com> > >> Reviewed-by: Chris Chiu <chiu@endlessm.com> > >> > >> Looks good to me. > >> > >> Chris > > > > Gentle ping of this patch set :) > > This is on my queue. I just want to investigate this in detail and > haven't found enough free time to do that. > Is there anyone else wants to comment on it? Appreciate if there's any suggestions. Thanks! Yan-Hsuan ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 2/2] rtw88: support dynamic user regulatory setting 2019-10-22 10:12 [PATCH v3 0/2] rtw88: update regulatory settings yhchuang 2019-10-22 10:12 ` [PATCH v3 1/2] rtw88: add regulatory process strategy for different chipset yhchuang @ 2019-10-22 10:12 ` yhchuang 1 sibling, 0 replies; 7+ messages in thread From: yhchuang @ 2019-10-22 10:12 UTC (permalink / raw) To: kvalo; +Cc: linux-wireless, briannorris From: Tzu-En Huang <tehuang@realtek.com> Add support for regulatory set by NL80211_REGDOM_SET_BY_USER. This should only be enabled for distributions that need set Realtek's card regulatory from userspace. Signed-off-by: Tzu-En Huang <tehuang@realtek.com> Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com> --- drivers/net/wireless/realtek/rtw88/Kconfig | 10 ++++++++++ drivers/net/wireless/realtek/rtw88/regd.c | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtw88/Kconfig b/drivers/net/wireless/realtek/rtw88/Kconfig index 33bd7ed797ff..04b84ec1dfc1 100644 --- a/drivers/net/wireless/realtek/rtw88/Kconfig +++ b/drivers/net/wireless/realtek/rtw88/Kconfig @@ -52,4 +52,14 @@ config RTW88_DEBUGFS If unsure, say Y to simplify debug problems +config RTW88_REGD_USER_REG_HINTS + bool "Realtek rtw88 user regulatory hints" + depends on RTW88_CORE + default n + help + Enable regulatoy user hints + + If unsure, say N. This should only be allowed on distributions + that need this to correct the regulatory. + endif diff --git a/drivers/net/wireless/realtek/rtw88/regd.c b/drivers/net/wireless/realtek/rtw88/regd.c index 718a147697cc..500a02b97a9c 100644 --- a/drivers/net/wireless/realtek/rtw88/regd.c +++ b/drivers/net/wireless/realtek/rtw88/regd.c @@ -364,7 +364,8 @@ static int rtw_regd_notifier_apply(struct rtw_dev *rtwdev, { if (request->initiator == NL80211_REGDOM_SET_BY_DRIVER) return -EINVAL; - if (request->initiator == NL80211_REGDOM_SET_BY_USER) + if (request->initiator == NL80211_REGDOM_SET_BY_USER && + !IS_ENABLED(CONFIG_RTW88_REGD_USER_REG_HINTS)) return -EINVAL; if (request->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE && !rtw_regd_is_ww(&rtwdev->regd)) -- 2.17.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-02-12 8:48 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-10-22 10:12 [PATCH v3 0/2] rtw88: update regulatory settings yhchuang 2019-10-22 10:12 ` [PATCH v3 1/2] rtw88: add regulatory process strategy for different chipset yhchuang 2019-10-25 3:54 ` Chris Chiu 2019-11-29 2:29 ` Tony Chuang 2019-11-29 5:23 ` Kalle Valo 2020-02-12 8:47 ` Tony Chuang 2019-10-22 10:12 ` [PATCH v3 2/2] rtw88: support dynamic user regulatory setting yhchuang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).