* [PATCH 1/5] rtlwifi: Update regulatory database [not found] <1431725583-7324-1-git-send-email-Larry.Finger@lwfinger.net> @ 2015-05-15 21:32 ` Larry Finger 2015-05-26 10:57 ` [1/5] " Kalle Valo 2015-05-15 21:33 ` [PATCH 2/5] rtlwifi: rtl8188ee: Apply the new regulatory information Larry Finger [not found] ` <1431725583-7324-1-git-send-email-Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org> 2 siblings, 1 reply; 6+ messages in thread From: Larry Finger @ 2015-05-15 21:32 UTC (permalink / raw) To: kvalo; +Cc: linux-wireless, Shao Fu, netdev, Larry Finger From: Shao Fu <shaofu@realtek.com> Driver rtlwifi maintains its own regulatory information, The Chrome Autotest (https://www.chromium.org/chromium-os/testing/autotest-user-doc) showed some errors. This patch adds the necessary information for rtlwifi. Signed-off-by: Shao Fu <shaofu@realtek.com> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> --- drivers/net/wireless/rtlwifi/regd.c | 42 +++++++++++++++++++++++++++++++++---- drivers/net/wireless/rtlwifi/regd.h | 1 + 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/rtlwifi/regd.c b/drivers/net/wireless/rtlwifi/regd.c index 1893d01..a62bf0a 100644 --- a/drivers/net/wireless/rtlwifi/regd.c +++ b/drivers/net/wireless/rtlwifi/regd.c @@ -40,6 +40,7 @@ static struct country_code_to_enum_rd allCountries[] = { {COUNTRY_CODE_GLOBAL_DOMAIN, "JP"}, {COUNTRY_CODE_WORLD_WIDE_13, "EC"}, {COUNTRY_CODE_TELEC_NETGEAR, "EC"}, + {COUNTRY_CODE_WORLD_WIDE_13_5G_ALL, "US"}, }; /* @@ -124,6 +125,17 @@ static const struct ieee80211_regdomain rtl_regdom_14_60_64 = { } }; +static const struct ieee80211_regdomain rtl_regdom_12_13_5g_all = { + .n_reg_rules = 4, + .alpha2 = "99", + .reg_rules = { + RTL819x_2GHZ_CH01_11, + RTL819x_2GHZ_CH12_13, + RTL819x_5GHZ_5150_5350, + RTL819x_5GHZ_5470_5850, + } +}; + static const struct ieee80211_regdomain rtl_regdom_14 = { .n_reg_rules = 3, .alpha2 = "99", @@ -348,6 +360,8 @@ static const struct ieee80211_regdomain *_rtl_regdomain_select( return &rtl_regdom_14_60_64; case COUNTRY_CODE_GLOBAL_DOMAIN: return &rtl_regdom_14; + case COUNTRY_CODE_WORLD_WIDE_13_5G_ALL: + return &rtl_regdom_12_13_5g_all; default: return &rtl_regdom_no_midband; } @@ -384,6 +398,25 @@ static struct country_code_to_enum_rd *_rtl_regd_find_country(u16 countrycode) return NULL; } +static u8 channel_plan_to_country_code(u8 channelplan) +{ + switch (channelplan) { + case 0x20: + case 0x21: + return COUNTRY_CODE_WORLD_WIDE_13; + case 0x22: + return COUNTRY_CODE_IC; + case 0x32: + return COUNTRY_CODE_TELEC_NETGEAR; + case 0x41: + return COUNTRY_CODE_GLOBAL_DOMAIN; + case 0x7f: + return COUNTRY_CODE_WORLD_WIDE_13_5G_ALL; + default: + return COUNTRY_CODE_MAX; /*Error*/ + } +} + int rtl_regd_init(struct ieee80211_hw *hw, void (*reg_notifier)(struct wiphy *wiphy, struct regulatory_request *request)) @@ -396,11 +429,12 @@ int rtl_regd_init(struct ieee80211_hw *hw, return -EINVAL; /* init country_code from efuse channel plan */ - rtlpriv->regd.country_code = rtlpriv->efuse.channel_plan; + rtlpriv->regd.country_code = + channel_plan_to_country_code(rtlpriv->efuse.channel_plan); - RT_TRACE(rtlpriv, COMP_REGD, DBG_TRACE, - "rtl: EEPROM regdomain: 0x%0x\n", - rtlpriv->regd.country_code); + RT_TRACE(rtlpriv, COMP_REGD, DBG_DMESG, + "rtl: EEPROM regdomain: 0x%0x conuntry code: %d\n", + rtlpriv->efuse.channel_plan, rtlpriv->regd.country_code); if (rtlpriv->regd.country_code >= COUNTRY_CODE_MAX) { RT_TRACE(rtlpriv, COMP_REGD, DBG_DMESG, diff --git a/drivers/net/wireless/rtlwifi/regd.h b/drivers/net/wireless/rtlwifi/regd.h index 3bbbaaa..f7f15bc 100644 --- a/drivers/net/wireless/rtlwifi/regd.h +++ b/drivers/net/wireless/rtlwifi/regd.h @@ -49,6 +49,7 @@ enum country_code_type_t { COUNTRY_CODE_GLOBAL_DOMAIN = 10, COUNTRY_CODE_WORLD_WIDE_13 = 11, COUNTRY_CODE_TELEC_NETGEAR = 12, + COUNTRY_CODE_WORLD_WIDE_13_5G_ALL = 13, /*add new channel plan above this line */ COUNTRY_CODE_MAX -- 2.1.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [1/5] rtlwifi: Update regulatory database 2015-05-15 21:32 ` [PATCH 1/5] rtlwifi: Update regulatory database Larry Finger @ 2015-05-26 10:57 ` Kalle Valo 0 siblings, 0 replies; 6+ messages in thread From: Kalle Valo @ 2015-05-26 10:57 UTC (permalink / raw) To: Larry Finger; +Cc: linux-wireless, Shao Fu, netdev, Larry Finger > From: Shao Fu <shaofu@realtek.com> > > Driver rtlwifi maintains its own regulatory information, The Chrome Autotest > (https://www.chromium.org/chromium-os/testing/autotest-user-doc) > showed some errors. This patch adds the necessary information for rtlwifi. > > Signed-off-by: Shao Fu <shaofu@realtek.com> > Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Thanks, 5 patches applied to wireless-drivers-next.git: 02b5fffbe9e0 rtlwifi: Update regulatory database 852ce7805638 rtlwifi: rtl8188ee: Apply the new regulatory information 5620302484d4 rtlwifi: rtl8192ee: Apply the regulatory changes to driver b23cd22d3923 rtlwifi: rtl8723be: Update driver for regulatory changes d10101a60372 rtlwifi: rtl8821ae: Fix problem with regulatory information Kalle Valo ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/5] rtlwifi: rtl8188ee: Apply the new regulatory information [not found] <1431725583-7324-1-git-send-email-Larry.Finger@lwfinger.net> 2015-05-15 21:32 ` [PATCH 1/5] rtlwifi: Update regulatory database Larry Finger @ 2015-05-15 21:33 ` Larry Finger [not found] ` <1431725583-7324-1-git-send-email-Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org> 2 siblings, 0 replies; 6+ messages in thread From: Larry Finger @ 2015-05-15 21:33 UTC (permalink / raw) To: kvalo; +Cc: linux-wireless, Shao Fu, netdev, Larry Finger From: Shao Fu <shaofu@realtek.com> The driver was setting a channel plan for the world. Now it reads it from EEPROM. Signed-off-by: Shao Fu <shaofu@realtek.com> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> --- drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c index 86ce5b1..40c65b7 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c @@ -1919,8 +1919,8 @@ static void _rtl88ee_read_adapter_info(struct ieee80211_hw *hw) "dev_addr: %pM\n", rtlefuse->dev_addr); /*channel plan */ rtlefuse->eeprom_channelplan = hwinfo[EEPROM_CHANNELPLAN]; - /* set channel paln to world wide 13 */ - rtlefuse->channel_plan = COUNTRY_CODE_WORLD_WIDE_13; + /* set channel plan from efuse */ + rtlefuse->channel_plan = rtlefuse->eeprom_channelplan; /*tx power*/ _rtl88ee_read_txpower_info_from_hwpg(hw, rtlefuse->autoload_failflag, -- 2.1.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
[parent not found: <1431725583-7324-1-git-send-email-Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org>]
* [PATCH 3/5] rtlwifi: rtl8192ee: Apply the regulatory changes to driver [not found] ` <1431725583-7324-1-git-send-email-Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org> @ 2015-05-15 21:33 ` Larry Finger 2015-05-15 21:33 ` [PATCH 4/5] rtlwifi: rtl8723be: Update driver for regulatory changes Larry Finger 2015-05-15 21:33 ` [PATCH 5/5] rtlwifi: rtl8821ae: Fix problem with regulatory information Larry Finger 2 siblings, 0 replies; 6+ messages in thread From: Larry Finger @ 2015-05-15 21:33 UTC (permalink / raw) To: kvalo-sgV2jX0FEOL9JmXXK+q4OQ Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA, Shao Fu, netdev-u79uwXL29TY76Z2rM5mHXA, Larry Finger From: Shao Fu <shaofu-Rasf1IRRPZFBDgjK7y7TUQ@public.gmane.org> The driver was setting a channel plan for the world. Now it reads it fromi EEPROM. In addition, a typo was fixed. Signed-off-by: Shao Fu <shaofu-Rasf1IRRPZFBDgjK7y7TUQ@public.gmane.org> Signed-off-by: Larry Finger <Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org> --- drivers/net/wireless/rtlwifi/rtl8192ee/hw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c index da0a612..0705e7e 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c @@ -2194,8 +2194,8 @@ static void _rtl92ee_read_adapter_info(struct ieee80211_hw *hw) "dev_addr: %pM\n", rtlefuse->dev_addr); /*channel plan */ rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN]; - /* set channel paln to world wide 13 */ - rtlefuse->channel_plan = COUNTRY_CODE_WORLD_WIDE_13; + /* set channel plan from efuse */ + rtlefuse->channel_plan = rtlefuse->eeprom_channelplan; /*tx power*/ _rtl92ee_read_txpower_info_from_hwpg(hw, rtlefuse->autoload_failflag, hwinfo); -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/5] rtlwifi: rtl8723be: Update driver for regulatory changes [not found] ` <1431725583-7324-1-git-send-email-Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org> 2015-05-15 21:33 ` [PATCH 3/5] rtlwifi: rtl8192ee: Apply the regulatory changes to driver Larry Finger @ 2015-05-15 21:33 ` Larry Finger 2015-05-15 21:33 ` [PATCH 5/5] rtlwifi: rtl8821ae: Fix problem with regulatory information Larry Finger 2 siblings, 0 replies; 6+ messages in thread From: Larry Finger @ 2015-05-15 21:33 UTC (permalink / raw) To: kvalo-sgV2jX0FEOL9JmXXK+q4OQ Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA, Shao Fu, netdev-u79uwXL29TY76Z2rM5mHXA, Larry Finger From: Shao Fu <shaofu-Rasf1IRRPZFBDgjK7y7TUQ@public.gmane.org> The driver is converted to use the channel plan in the EEPROM. Signed-off-by: Shao Fu <shaofu-Rasf1IRRPZFBDgjK7y7TUQ@public.gmane.org> Signed-off-by: Larry Finger <Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org> --- drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c index b681af3..e0f679b 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c @@ -2139,8 +2139,8 @@ static void _rtl8723be_read_adapter_info(struct ieee80211_hw *hw, RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid); - /* set channel plan to world wide 13 */ - rtlefuse->channel_plan = COUNTRY_CODE_WORLD_WIDE_13; + /* set channel plan from efuse */ + rtlefuse->channel_plan = rtlefuse->eeprom_channelplan; if (rtlhal->oem_id == RT_CID_DEFAULT) { /* Does this one have a Toshiba SMID from group 1? */ -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 5/5] rtlwifi: rtl8821ae: Fix problem with regulatory information [not found] ` <1431725583-7324-1-git-send-email-Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org> 2015-05-15 21:33 ` [PATCH 3/5] rtlwifi: rtl8192ee: Apply the regulatory changes to driver Larry Finger 2015-05-15 21:33 ` [PATCH 4/5] rtlwifi: rtl8723be: Update driver for regulatory changes Larry Finger @ 2015-05-15 21:33 ` Larry Finger 2 siblings, 0 replies; 6+ messages in thread From: Larry Finger @ 2015-05-15 21:33 UTC (permalink / raw) To: kvalo-sgV2jX0FEOL9JmXXK+q4OQ Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA, Shao Fu, netdev-u79uwXL29TY76Z2rM5mHXA, Larry Finger From: Shao Fu <shaofu-Rasf1IRRPZFBDgjK7y7TUQ@public.gmane.org> The driver was not setting a channel plan. Now it gets it from EEPROM. Signed-off-by: Shao Fu <shaofu-Rasf1IRRPZFBDgjK7y7TUQ@public.gmane.org> Signed-off-by: Larry Finger <Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org> --- drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c index 8704eee..450bd4d 100644 --- a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c @@ -3232,8 +3232,8 @@ static void _rtl8821ae_read_adapter_info(struct ieee80211_hw *hw, bool b_pseudo_ if (rtlefuse->eeprom_channelplan == 0xff) rtlefuse->eeprom_channelplan = 0x7F; - /* set channel paln to world wide 13 */ - /* rtlefuse->channel_plan = (u8)rtlefuse->eeprom_channelplan; */ + /* set channel plan from efuse */ + rtlefuse->channel_plan = rtlefuse->eeprom_channelplan; /*parse xtal*/ rtlefuse->crystalcap = hwinfo[EEPROM_XTAL_8821AE]; -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-05-26 14:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1431725583-7324-1-git-send-email-Larry.Finger@lwfinger.net>
2015-05-15 21:32 ` [PATCH 1/5] rtlwifi: Update regulatory database Larry Finger
2015-05-26 10:57 ` [1/5] " Kalle Valo
2015-05-15 21:33 ` [PATCH 2/5] rtlwifi: rtl8188ee: Apply the new regulatory information Larry Finger
[not found] ` <1431725583-7324-1-git-send-email-Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org>
2015-05-15 21:33 ` [PATCH 3/5] rtlwifi: rtl8192ee: Apply the regulatory changes to driver Larry Finger
2015-05-15 21:33 ` [PATCH 4/5] rtlwifi: rtl8723be: Update driver for regulatory changes Larry Finger
2015-05-15 21:33 ` [PATCH 5/5] rtlwifi: rtl8821ae: Fix problem with regulatory information Larry Finger
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).