Skip to content

Commit db55388

Browse files
committed
Merge: Wireless core and drivers rebase to v6.14
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6676 JIRA: https://issues.redhat.com/browse/RHEL-79791 JIRA: https://issues.redhat.com/browse/RHEL-81283 CVE: CVE-2024-58014 JIRA: https://issues.redhat.com/browse/RHEL-81384 CVE: CVE-2024-57989 JIRA: https://issues.redhat.com/browse/RHEL-81420 CVE: CVE-2024-58015 JIRA: https://issues.redhat.com/browse/RHEL-81445 CVE: CVE-2024-57995 JIRA: https://issues.redhat.com/browse/RHEL-81561 CVE: CVE-2024-57990 JIRA: https://issues.redhat.com/browse/RHEL-81370 CVE: CVE-2025-21729 JIRA: https://issues.redhat.com/browse/RHEL-82447 CVE: CVE-2024-58062 JIRA: https://issues.redhat.com/browse/RHEL-82463 CVE: CVE-2024-58072 JIRA: https://issues.redhat.com/browse/RHEL-82497 CVE: CVE-2025-21828 Tested: basic testing with several supported WiFi cards (Intel, Qualcomm, Mediatek and Realtek). Wireless core and drivers update to v6.14. Upstream status: linux.git wed (Mediatek feature for embedded systems to offload interconnected ethernet and wireless traffic) is not enabled but it is partially updated in order to get wireless update easier. Only necessary ethernet commits for this are included and later bug-fixes are not necessary: Omitted-fix: 53eb9b0 net: ethernet: mtk_ppe: fix possible NULL pointer dereference in mtk_flow_get_wdma_info Omitted-fix: 3ba5a61 arm64: dts: mediatek: mt7622: fix clock controllers Omitted-fix: 0097e86 net: ethernet: mtk_eth_soc: fix error code in mtk_flow_offload_replace() Omitted-fix: f27b405 net: ethernet: mtk_eth_soc: check max allowed hash in mtk_ppe_check_skb Omitted-fix: 17a5f6a net: ethernet: mtk_eth_soc: use after free in __mtk_ppe_check_skb() Omitted-fix: 0e80707 net: ethernet: mtk_eth_soc: fix typo in __mtk_foe_entry_clear Omitted-fix: ae3ed15 net: ethernet: mtk_eth_soc: fix state in __mtk_foe_entry_clear Omitted-fix: 603ea5e net: ethernet: mtk_eth_soc: fix memory leak in error path Omitted-fix: 9245313 net: ethernet: mtk_eth_soc: add missing ppe cache flush when deleting a flow Later fixes to be included in next rebases: Omitted-fix: fc88dee wifi: cfg80211: init wiphy_work before allocating rfkill fails Omitted-fix: 06e7000 wifi: mt76: mt792x: re-register CHANCTX_STA_CSA only for the mt7921 series Omitted-fix: 0ebb60d wifi: mt76: mt7925: adjust rm BSS flow to prevent next connection failure Omitted-fix: 766ea2c Revert "wifi: mt76: mt7925: Update mt7925_mcu_uni\_\[tx,rx\]\_ba for MLO" Omitted-fix: adc3fd2 wifi: mt76: mt7921: fix kernel panic due to null pointer dereference Omitted-fix: 4bada9b wifi: mt76: mt7925: fix the wrong link_idx when a p2p_device is present Omitted-fix: 899da18 wifi: mac80211: remove SSID from ML reconf Omitted-fix: 80834e7 wifi: mac80211: use supported selectors from assoc in ML reconf Omitted-fix: ceb3b35 wifi: ath12k: cleanup ath12k_mac_mlo_ready() Omitted-fix: b9c7299 wifi: ath12k: Fix locking in "QMI firmware ready" error paths Omitted-fix: 11d963d wifi: ath12k: use link specific bss_conf as well in ath12k_mac_vif_cache_flush() Omitted-fix: 4e635b8 wifi: ath12k: Fix pdev lookup in WBM error processing Omitted-fix: 9e935c0 wifi: brcmfmac: fix memory leak in brcmf_get_module_param Omitted-fix: 5f05c14 wifi: iwlwifi: pcie: set state to no-FW before reset handshake Omitted-fix: d49437a wifi: iwlwifi: back off on continuous errors Omitted-fix: bdd6d93 wifi: iwlwifi: re-add IWL_AMSDU_8K case Omitted-fix: 6d019ab wifi: ath12k: fix SLUB BUG - Object already free in ath12k_reg_free() Omitted-fix: 6af3969 wifi: ath12k: fix ATH12K_FLAG_REGISTERED flag handling Omitted-fix: ea24531 wifi: ath12k: fix NULL access in assign channel context handler Omitted-fix: d61c0b3 wifi: ath12k: Resolve multicast packet drop by populating key_cipher in ath12k_install_key() Omitted-fix: e9e094a wifi: ath12k: Prevent sending WMI commands to firmware during firmware crash General fixes to consider later but not directly related: Omitted-fix: 95767a5 docs: submitting-patches: document the format for affiliation Not supported (related commits included to get wireless rebase easier): Omitted-fix: 5ab202f wifi: ipw: select CRYPTO_LIB_ARC4 Omitted-fix: 18ae128 wifi: wlcore: sdio: Make use of irq_get_trigger_type() Omitted-fix: a3ede2b wifi: wlcore: sdio: Use helper to define resources Omitted-fix: bcd1371 wifi: p54: Use IRQF_NO_AUTOEN flag in request_irq() Omitted-fix: 7751110 wifi: qtnfmac: don't include lib80211.h Omitted-fix: 4fe9a5e wifi: libertas: don't select/include lib80211 Omitted-fix: 9e1a98a wifi: wext: merge adjacent CONFIG_COMPAT ifdef blocks Omitted-fix: be9be9f staging: rtl8192e: delete the driver Omitted-fix: 4991d2e staging: don't recommend using lib80211 Omitted-fix: 1b292a1 dt-bindings: wireless: wilc1000: Document WILC3000 compatible string Omitted-fix: 5a4d42c wifi: wl1251: Use IRQF_NO_AUTOEN flag in request_irq() Omitted-fix: 4302b3f arm64: dts: apple: Add WiFi module and antenna properties Signed-off-by: Jose Ignacio Tornos Martinez <[email protected]> Approved-by: Kamal Heib <[email protected]> Approved-by: Michal Schmidt <[email protected]> Approved-by: mheib <[email protected]> Approved-by: Davide Caratti <[email protected]> Approved-by: CKI KWF Bot <[email protected]> Merged-by: Jan Stancek <[email protected]>
2 parents 1f2e4a4 + 7d2e941 commit db55388

File tree

539 files changed

+42028
-11603
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

539 files changed

+42028
-11603
lines changed
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: "http://devicetree.org/schemas/arm/mediatek/mediatek,mt7622-pcie-mirror.yaml#"
5+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
6+
7+
title: MediaTek PCIE Mirror Controller for MT7622
8+
9+
maintainers:
10+
- Lorenzo Bianconi <[email protected]>
11+
- Felix Fietkau <[email protected]>
12+
13+
description:
14+
The mediatek PCIE mirror provides a configuration interface for PCIE
15+
controller on MT7622 soc.
16+
17+
properties:
18+
compatible:
19+
items:
20+
- enum:
21+
- mediatek,mt7622-pcie-mirror
22+
- const: syscon
23+
24+
reg:
25+
maxItems: 1
26+
27+
required:
28+
- compatible
29+
- reg
30+
31+
additionalProperties: false
32+
33+
examples:
34+
- |
35+
soc {
36+
#address-cells = <2>;
37+
#size-cells = <2>;
38+
pcie_mirror: pcie-mirror@10000400 {
39+
compatible = "mediatek,mt7622-pcie-mirror", "syscon";
40+
reg = <0 0x10000400 0 0x10>;
41+
};
42+
};
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: "http://devicetree.org/schemas/arm/mediatek/mediatek,mt7622-wed.yaml#"
5+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
6+
7+
title: MediaTek Wireless Ethernet Dispatch Controller for MT7622
8+
9+
maintainers:
10+
- Lorenzo Bianconi <[email protected]>
11+
- Felix Fietkau <[email protected]>
12+
13+
description:
14+
The mediatek wireless ethernet dispatch controller can be configured to
15+
intercept and handle access to the WLAN DMA queues and PCIe interrupts
16+
and implement hardware flow offloading from ethernet to WLAN.
17+
18+
properties:
19+
compatible:
20+
items:
21+
- enum:
22+
- mediatek,mt7622-wed
23+
- const: syscon
24+
25+
reg:
26+
maxItems: 1
27+
28+
interrupts:
29+
maxItems: 1
30+
31+
required:
32+
- compatible
33+
- reg
34+
- interrupts
35+
36+
additionalProperties: false
37+
38+
examples:
39+
- |
40+
#include <dt-bindings/interrupt-controller/arm-gic.h>
41+
#include <dt-bindings/interrupt-controller/irq.h>
42+
soc {
43+
#address-cells = <2>;
44+
#size-cells = <2>;
45+
wed0: wed@1020a000 {
46+
compatible = "mediatek,mt7622-wed","syscon";
47+
reg = <0 0x1020a000 0 0x1000>;
48+
interrupts = <GIC_SPI 214 IRQ_TYPE_LEVEL_LOW>;
49+
};
50+
};

Documentation/devicetree/bindings/net/mediatek-net.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,16 @@ Required properties:
4141
- mediatek,pctl: phandle to the syscon node that handles the ports slew rate
4242
and driver current: only for MT2701 and MT7623 SoC
4343

44+
Optional properties:
45+
- dma-coherent: present if dma operations are coherent
46+
- mediatek,cci-control: phandle to the cache coherent interconnect node
47+
- mediatek,hifsys: phandle to the mediatek hifsys controller used to provide
48+
various clocks and reset to the system.
49+
- mediatek,wed: a list of phandles to wireless ethernet dispatch nodes for
50+
MT7622 SoC.
51+
- mediatek,pcie-mirror: phandle to the mediatek pcie-mirror controller for
52+
MT7622 SoC.
53+
4454
* Ethernet MAC node
4555

4656
Required properties:

Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml

Lines changed: 60 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$id: http://devicetree.org/schemas/net/wireless/brcm,bcm4329-fmac.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Broadcom BCM4329 family fullmac wireless SDIO devices
7+
title: Broadcom BCM4329 family fullmac wireless SDIO/PCIE devices
88

99
maintainers:
1010
- Arend van Spriel <[email protected]>
@@ -15,6 +15,9 @@ description:
1515
These chips also have a Bluetooth portion described in a separate
1616
binding.
1717

18+
allOf:
19+
- $ref: ieee80211.yaml#
20+
1821
properties:
1922
compatible:
2023
oneOf:
@@ -38,14 +41,23 @@ properties:
3841
- brcm,bcm4354-fmac
3942
- brcm,bcm4356-fmac
4043
- brcm,bcm4359-fmac
44+
- brcm,bcm4366-fmac
4145
- cypress,cyw4373-fmac
4246
- cypress,cyw43012-fmac
47+
- infineon,cyw43439-fmac
4348
- const: brcm,bcm4329-fmac
44-
- const: brcm,bcm4329-fmac
49+
- enum:
50+
- brcm,bcm4329-fmac
51+
- pci14e4,43dc # BCM4355
52+
- pci14e4,4464 # BCM4364
53+
- pci14e4,4488 # BCM4377
54+
- pci14e4,4425 # BCM4378
55+
- pci14e4,4433 # BCM4387
56+
- pci14e4,449d # BCM43752
4557

4658
reg:
47-
description: SDIO function number for the device, for most cases
48-
this will be 1.
59+
description: SDIO function number for the device (for most cases
60+
this will be 1) or PCI device identifier.
4961

5062
interrupts:
5163
maxItems: 1
@@ -75,11 +87,54 @@ properties:
7587
items:
7688
pattern: '^[A-Z][A-Z]-[A-Z][0-9A-Z]-[0-9]+$'
7789

90+
brcm,ccode-map-trivial:
91+
description: |
92+
Use a trivial mapping of ISO3166 country codes to brcmfmac firmware
93+
country code and revision: cc -> { cc, 0 }. In other words, assume that
94+
the CLM blob firmware uses ISO3166 country codes as well, and that all
95+
revisions are zero. This property is mutually exclusive with
96+
brcm,ccode-map. If both properties are specified, then brcm,ccode-map
97+
takes precedence.
98+
type: boolean
99+
100+
brcm,cal-blob:
101+
$ref: /schemas/types.yaml#/definitions/uint8-array
102+
description: A per-device calibration blob for the Wi-Fi radio. This
103+
should be filled in by the bootloader from platform configuration
104+
data, if necessary, and will be uploaded to the device if present.
105+
106+
brcm,board-type:
107+
$ref: /schemas/types.yaml#/definitions/string
108+
description: Overrides the board type, which is normally the compatible of
109+
the root node. This can be used to decouple the overall system board or
110+
device name from the board type for WiFi purposes, which is used to
111+
construct firmware and NVRAM configuration filenames, allowing for
112+
multiple devices that share the same module or characteristics for the
113+
WiFi subsystem to share the same firmware/NVRAM files. On Apple platforms,
114+
this should be the Apple module-instance codename prefixed by "apple,",
115+
e.g. "apple,honshu".
116+
117+
apple,antenna-sku:
118+
$ref: /schemas/types.yaml#/definitions/string
119+
description: Antenna SKU used to identify a specific antenna configuration
120+
on Apple platforms. This is use to build firmware filenames, to allow
121+
platforms with different antenna configs to have different firmware and/or
122+
NVRAM. This would normally be filled in by the bootloader from platform
123+
configuration data.
124+
125+
clocks:
126+
items:
127+
- description: External Low Power Clock input (32.768KHz)
128+
129+
clock-names:
130+
items:
131+
- const: lpo
132+
78133
required:
79134
- compatible
80135
- reg
81136

82-
additionalProperties: false
137+
unevaluatedProperties: false
83138

84139
examples:
85140
- |

0 commit comments

Comments
 (0)