diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2021-01-17 20:35:04 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2021-01-17 20:35:04 +0200 |
commit | 2d8b1f5f252f232399cbd5288f95c03c24fd9b1d (patch) | |
tree | e4f91c24e00d05cc159625821ea3d7fd76c4d100 | |
parent | 24fb81762ed1aeee57064deaeedee03f5d57da06 (diff) | |
download | enea-kernel-cache-2d8b1f5f252f232399cbd5288f95c03c24fd9b1d.tar.gz |
Revert "patches: drivers: net: ath EEPROM reg domain"
The backported patch:
- does not actually resolve the initial issue (testing was false-positive);
- is not actually needed as the firmware image we carry in NFVA already contains the fix;
- might cause issues with other chipsets;
This reverts commit 24fb81762ed1aeee57064deaeedee03f5d57da06.
Change-Id: I9c438d871d2aaa8c109aebe310b109eb95224baa
-rw-r--r-- | patches/drivers/net/0001-ath-add-support-for-special-0x0-regulatory-domain.patch | 52 | ||||
-rw-r--r-- | patches/drivers/net/ath-eeprom-regulatory-domain.scc | 2 |
2 files changed, 0 insertions, 54 deletions
diff --git a/patches/drivers/net/0001-ath-add-support-for-special-0x0-regulatory-domain.patch b/patches/drivers/net/0001-ath-add-support-for-special-0x0-regulatory-domain.patch deleted file mode 100644 index edd2e43..0000000 --- a/patches/drivers/net/0001-ath-add-support-for-special-0x0-regulatory-domain.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | From 2dc016599cfa9672a147528ca26d70c3654a5423 Mon Sep 17 00:00:00 2001 | ||
2 | From: Wen Gong <wgong@codeaurora.org> | ||
3 | Date: Fri, 29 Nov 2019 07:34:09 +0000 | ||
4 | Subject: [PATCH] ath: add support for special 0x0 regulatory domain | ||
5 | |||
6 | Some sdio chips of rome QCA6174's regulatory domain code of EEPROM is | ||
7 | empty, then ath_is_world_regd will return false for this case, and | ||
8 | it will lead function __ath_reg_dyn_country not work, thus the regdomain | ||
9 | will not update for NL80211_REGDOM_SET_BY_COUNTRY_IE type, it result | ||
10 | ath10k set the same regdomain/reg_5ghz_ctl/reg_2ghz_ctl to firmware, | ||
11 | then the tx power will not changed with different regdomain's AP. The | ||
12 | regulatory domain code of EEPROM of some QCA6174 PCIE chip is 0x6c, it | ||
13 | means world wide regdomain, for this chip, it does not have the issue. | ||
14 | |||
15 | For empty reulatory domain code chip, set it to world regulatory domain | ||
16 | in functio ath_regd_sanitize, then it will fix the issue. | ||
17 | |||
18 | Tested with QCA6174 SDIO with firmware | ||
19 | WLAN.RMH.4.4.1-00029. | ||
20 | |||
21 | Upstream-Status: Backport [2dc016599cfa9672a147528ca26d70c3654a5423] | ||
22 | |||
23 | Signed-off-by: Wen Gong <wgong@codeaurora.org> | ||
24 | Signed-off-by: Kalle Valo <kvalo@codeaurora.org> | ||
25 | --- | ||
26 | drivers/net/wireless/ath/regd.c | 10 +++++----- | ||
27 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
28 | |||
29 | diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c | ||
30 | index 20f4f8ea9f894..bee9110b91f38 100644 | ||
31 | --- a/drivers/net/wireless/ath/regd.c | ||
32 | +++ b/drivers/net/wireless/ath/regd.c | ||
33 | @@ -666,14 +666,14 @@ ath_regd_init_wiphy(struct ath_regulatory *reg, | ||
34 | |||
35 | /* | ||
36 | * Some users have reported their EEPROM programmed with | ||
37 | - * 0x8000 set, this is not a supported regulatory domain | ||
38 | - * but since we have more than one user with it we need | ||
39 | - * a solution for them. We default to 0x64, which is the | ||
40 | - * default Atheros world regulatory domain. | ||
41 | + * 0x8000 or 0x0 set, this is not a supported regulatory | ||
42 | + * domain but since we have more than one user with it we | ||
43 | + * need a solution for them. We default to 0x64, which is | ||
44 | + * the default Atheros world regulatory domain. | ||
45 | */ | ||
46 | static void ath_regd_sanitize(struct ath_regulatory *reg) | ||
47 | { | ||
48 | - if (reg->current_rd != COUNTRY_ERD_FLAG) | ||
49 | + if (reg->current_rd != COUNTRY_ERD_FLAG && reg->current_rd != 0) | ||
50 | return; | ||
51 | printk(KERN_DEBUG "ath: EEPROM regdomain sanitized\n"); | ||
52 | reg->current_rd = 0x64; | ||
diff --git a/patches/drivers/net/ath-eeprom-regulatory-domain.scc b/patches/drivers/net/ath-eeprom-regulatory-domain.scc deleted file mode 100644 index 6b02932..0000000 --- a/patches/drivers/net/ath-eeprom-regulatory-domain.scc +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | # Upstream in kernel v5.6-rc1 and newer | ||
2 | patch 0001-ath-add-support-for-special-0x0-regulatory-domain.patch | ||