Skip to content

Commit 17847ea

Browse files
kuba-mookuba-moo
committed
Merge tag 'wireless-2025-02-07' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless
Kalle Valo says: ==================== wireless fixes for v6.14-rc3 We have only one fix for ath12k and one fix for brcmfmac. Also this will be my last pull request as I'm stepping down as wireless driver maintainer. * tag 'wireless-2025-02-07' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless: MAINTAINERS: wifi: remove Kalle MAINTAINERS: wifi: ath: remove Kalle wifi: brcmfmac: use random seed flag for BCM4355 and BCM4364 firmware wifi: ath12k: fix handling of 6 GHz rules ==================== Link: https://patch.msgid.link/20250207182957.23315C4CED1@smtp.kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 parents 9dfedb8 + b76adb9 commit 17847ea

File tree

10 files changed

+49
-29
lines changed

10 files changed

+49
-29
lines changed

‎.mailmap‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@ Juha Yrjola <juha.yrjola@solidboot.com>
376376
Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
377377
Iskren Chernev <me@iskren.info> <iskren.chernev@gmail.com>
378378
Kalle Valo <kvalo@kernel.org> <kvalo@codeaurora.org>
379+
Kalle Valo <kvalo@kernel.org> <quic_kvalo@quicinc.com>
379380
Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>
380381
Karthikeyan Periyasamy <quic_periyasa@quicinc.com> <periyasa@codeaurora.org>
381382
Kathiravan T <quic_kathirav@quicinc.com> <kathirav@codeaurora.org>

‎Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Technologies ath10k wireless devices
88

99
maintainers:
10-
- Kalle Valo <kvalo@kernel.org>
1110
- Jeff Johnson <jjohnson@kernel.org>
1211

1312
description:

‎Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
88
title: Qualcomm Technologies ath11k wireless devices (PCIe)
99

1010
maintainers:
11-
- Kalle Valo <kvalo@kernel.org>
1211
- Jeff Johnson <jjohnson@kernel.org>
1312

1413
description: |

‎Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
88
title: Qualcomm Technologies ath11k wireless devices
99

1010
maintainers:
11-
- Kalle Valo <kvalo@kernel.org>
1211
- Jeff Johnson <jjohnson@kernel.org>
1312

1413
description: |

‎Documentation/devicetree/bindings/net/wireless/qcom,ath12k-wsi.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ title: Qualcomm Technologies ath12k wireless devices (PCIe) with WSI interface
99

1010
maintainers:
1111
- Jeff Johnson <jjohnson@kernel.org>
12-
- Kalle Valo <kvalo@kernel.org>
1312

1413
description: |
1514
Qualcomm Technologies IEEE 802.11be PCIe devices with WSI interface.

‎Documentation/devicetree/bindings/net/wireless/qcom,ath12k.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ title: Qualcomm Technologies ath12k wireless devices (PCIe)
99

1010
maintainers:
1111
- Jeff Johnson <quic_jjohnson@quicinc.com>
12-
- Kalle Valo <kvalo@kernel.org>
1312

1413
description:
1514
Qualcomm Technologies IEEE 802.11be PCIe devices.

‎MAINTAINERS‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3655,7 +3655,6 @@ F: Documentation/devicetree/bindings/phy/phy-ath79-usb.txt
36553655
F: drivers/phy/qualcomm/phy-ath79-usb.c
36563656

36573657
ATHEROS ATH GENERIC UTILITIES
3658-
M: Kalle Valo <kvalo@kernel.org>
36593658
M: Jeff Johnson <jjohnson@kernel.org>
36603659
L: linux-wireless@vger.kernel.org
36613660
S: Supported
@@ -16438,7 +16437,7 @@ X: drivers/net/can/
1643816437
X: drivers/net/wireless/
1643916438

1644016439
NETWORKING DRIVERS (WIRELESS)
16441-
M: Kalle Valo <kvalo@kernel.org>
16440+
M: Johannes Berg <johannes@sipsolutions.net>
1644216441
L: linux-wireless@vger.kernel.org
1644316442
S: Maintained
1644416443
W: https://wireless.wiki.kernel.org/
@@ -19355,7 +19354,6 @@ Q: http://patchwork.linuxtv.org/project/linux-media/list/
1935519354
F: drivers/media/tuners/qt1010*
1935619355

1935719356
QUALCOMM ATH12K WIRELESS DRIVER
19358-
M: Kalle Valo <kvalo@kernel.org>
1935919357
M: Jeff Johnson <jjohnson@kernel.org>
1936019358
L: ath12k@lists.infradead.org
1936119359
S: Supported
@@ -19365,7 +19363,6 @@ F: drivers/net/wireless/ath/ath12k/
1936519363
N: ath12k
1936619364

1936719365
QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
19368-
M: Kalle Valo <kvalo@kernel.org>
1936919366
M: Jeff Johnson <jjohnson@kernel.org>
1937019367
L: ath10k@lists.infradead.org
1937119368
S: Supported
@@ -19375,7 +19372,6 @@ F: drivers/net/wireless/ath/ath10k/
1937519372
N: ath10k
1937619373

1937719374
QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
19378-
M: Kalle Valo <kvalo@kernel.org>
1937919375
M: Jeff Johnson <jjohnson@kernel.org>
1938019376
L: ath11k@lists.infradead.org
1938119377
S: Supported

‎drivers/net/wireless/ath/ath12k/wmi.c‎

Lines changed: 45 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4851,6 +4851,22 @@ static struct ath12k_reg_rule
48514851
return reg_rule_ptr;
48524852
}
48534853

4854+
static u8 ath12k_wmi_ignore_num_extra_rules(struct ath12k_wmi_reg_rule_ext_params *rule,
4855+
u32 num_reg_rules)
4856+
{
4857+
u8 num_invalid_5ghz_rules = 0;
4858+
u32 count, start_freq;
4859+
4860+
for (count = 0; count < num_reg_rules; count++) {
4861+
start_freq = le32_get_bits(rule[count].freq_info, REG_RULE_START_FREQ);
4862+
4863+
if (start_freq >= ATH12K_MIN_6G_FREQ)
4864+
num_invalid_5ghz_rules++;
4865+
}
4866+
4867+
return num_invalid_5ghz_rules;
4868+
}
4869+
48544870
static int ath12k_pull_reg_chan_list_ext_update_ev(struct ath12k_base *ab,
48554871
struct sk_buff *skb,
48564872
struct ath12k_reg_info *reg_info)
@@ -4861,6 +4877,7 @@ static int ath12k_pull_reg_chan_list_ext_update_ev(struct ath12k_base *ab,
48614877
u32 num_2g_reg_rules, num_5g_reg_rules;
48624878
u32 num_6g_reg_rules_ap[WMI_REG_CURRENT_MAX_AP_TYPE];
48634879
u32 num_6g_reg_rules_cl[WMI_REG_CURRENT_MAX_AP_TYPE][WMI_REG_MAX_CLIENT_TYPE];
4880+
u8 num_invalid_5ghz_ext_rules;
48644881
u32 total_reg_rules = 0;
48654882
int ret, i, j;
48664883

@@ -4954,20 +4971,6 @@ static int ath12k_pull_reg_chan_list_ext_update_ev(struct ath12k_base *ab,
49544971

49554972
memcpy(reg_info->alpha2, &ev->alpha2, REG_ALPHA2_LEN);
49564973

4957-
/* FIXME: Currently FW includes 6G reg rule also in 5G rule
4958-
* list for country US.
4959-
* Having same 6G reg rule in 5G and 6G rules list causes
4960-
* intersect check to be true, and same rules will be shown
4961-
* multiple times in iw cmd. So added hack below to avoid
4962-
* parsing 6G rule from 5G reg rule list, and this can be
4963-
* removed later, after FW updates to remove 6G reg rule
4964-
* from 5G rules list.
4965-
*/
4966-
if (memcmp(reg_info->alpha2, "US", 2) == 0) {
4967-
reg_info->num_5g_reg_rules = REG_US_5G_NUM_REG_RULES;
4968-
num_5g_reg_rules = reg_info->num_5g_reg_rules;
4969-
}
4970-
49714974
reg_info->dfs_region = le32_to_cpu(ev->dfs_region);
49724975
reg_info->phybitmap = le32_to_cpu(ev->phybitmap);
49734976
reg_info->num_phy = le32_to_cpu(ev->num_phy);
@@ -5070,8 +5073,29 @@ static int ath12k_pull_reg_chan_list_ext_update_ev(struct ath12k_base *ab,
50705073
}
50715074
}
50725075

5076+
ext_wmi_reg_rule += num_2g_reg_rules;
5077+
5078+
/* Firmware might include 6 GHz reg rule in 5 GHz rule list
5079+
* for few countries along with separate 6 GHz rule.
5080+
* Having same 6 GHz reg rule in 5 GHz and 6 GHz rules list
5081+
* causes intersect check to be true, and same rules will be
5082+
* shown multiple times in iw cmd.
5083+
* Hence, avoid parsing 6 GHz rule from 5 GHz reg rule list
5084+
*/
5085+
num_invalid_5ghz_ext_rules = ath12k_wmi_ignore_num_extra_rules(ext_wmi_reg_rule,
5086+
num_5g_reg_rules);
5087+
5088+
if (num_invalid_5ghz_ext_rules) {
5089+
ath12k_dbg(ab, ATH12K_DBG_WMI,
5090+
"CC: %s 5 GHz reg rules number %d from fw, %d number of invalid 5 GHz rules",
5091+
reg_info->alpha2, reg_info->num_5g_reg_rules,
5092+
num_invalid_5ghz_ext_rules);
5093+
5094+
num_5g_reg_rules = num_5g_reg_rules - num_invalid_5ghz_ext_rules;
5095+
reg_info->num_5g_reg_rules = num_5g_reg_rules;
5096+
}
5097+
50735098
if (num_5g_reg_rules) {
5074-
ext_wmi_reg_rule += num_2g_reg_rules;
50755099
reg_info->reg_rules_5g_ptr =
50765100
create_ext_reg_rules_from_wmi(num_5g_reg_rules,
50775101
ext_wmi_reg_rule);
@@ -5083,7 +5107,12 @@ static int ath12k_pull_reg_chan_list_ext_update_ev(struct ath12k_base *ab,
50835107
}
50845108
}
50855109

5086-
ext_wmi_reg_rule += num_5g_reg_rules;
5110+
/* We have adjusted the number of 5 GHz reg rules above. But still those
5111+
* many rules needs to be adjusted in ext_wmi_reg_rule.
5112+
*
5113+
* NOTE: num_invalid_5ghz_ext_rules will be 0 for rest other cases.
5114+
*/
5115+
ext_wmi_reg_rule += (num_5g_reg_rules + num_invalid_5ghz_ext_rules);
50875116

50885117
for (i = 0; i < WMI_REG_CURRENT_MAX_AP_TYPE; i++) {
50895118
reg_info->reg_rules_6g_ap_ptr[i] =

‎drivers/net/wireless/ath/ath12k/wmi.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4073,7 +4073,6 @@ struct ath12k_wmi_eht_rate_set_params {
40734073
#define MAX_REG_RULES 10
40744074
#define REG_ALPHA2_LEN 2
40754075
#define MAX_6G_REG_RULES 5
4076-
#define REG_US_5G_NUM_REG_RULES 4
40774076

40784077
enum wmi_start_event_param {
40794078
WMI_VDEV_START_RESP_EVENT = 0,

‎drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2712,7 +2712,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = {
27122712
BRCMF_PCIE_DEVICE(BRCM_PCIE_4350_DEVICE_ID, WCC),
27132713
BRCMF_PCIE_DEVICE_SUB(0x4355, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4355, WCC),
27142714
BRCMF_PCIE_DEVICE(BRCM_PCIE_4354_RAW_DEVICE_ID, WCC),
2715-
BRCMF_PCIE_DEVICE(BRCM_PCIE_4355_DEVICE_ID, WCC),
2715+
BRCMF_PCIE_DEVICE(BRCM_PCIE_4355_DEVICE_ID, WCC_SEED),
27162716
BRCMF_PCIE_DEVICE(BRCM_PCIE_4356_DEVICE_ID, WCC),
27172717
BRCMF_PCIE_DEVICE(BRCM_PCIE_43567_DEVICE_ID, WCC),
27182718
BRCMF_PCIE_DEVICE(BRCM_PCIE_43570_DEVICE_ID, WCC),
@@ -2723,7 +2723,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = {
27232723
BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_2G_DEVICE_ID, WCC),
27242724
BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_5G_DEVICE_ID, WCC),
27252725
BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_RAW_DEVICE_ID, WCC),
2726-
BRCMF_PCIE_DEVICE(BRCM_PCIE_4364_DEVICE_ID, WCC),
2726+
BRCMF_PCIE_DEVICE(BRCM_PCIE_4364_DEVICE_ID, WCC_SEED),
27272727
BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_DEVICE_ID, BCA),
27282728
BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_2G_DEVICE_ID, BCA),
27292729
BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_5G_DEVICE_ID, BCA),

0 commit comments

Comments
 (0)