Skip to content

Commit 5183594

Browse files
committed
Merge tag 'net-next-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
Pull networking updates from Jakub Kicinski: "Not much excitement - a handful of large patchsets (devmem among them) did not make it in time. Core & protocols: - Use local_lock in addition to local_bh_disable() to protect per-CPU resources in networking, a step closer for local_bh_disable() not to act as a big lock on PREEMPT_RT - Use flex array for netdevice priv area, ensure its cache alignment - Add a sysctl knob to allow user to specify a default rto_min at socket init time. Bit of a big hammer but multiple companies were independently carrying such patch downstream so clearly it's useful - Support scheduling transmission of packets based on CLOCK_TAI - Un-pin TCP TIMEWAIT timer to avoid it firing on CPUs later cordoned off using cpusets - Support multiple L2TPv3 UDP tunnels using the same 5-tuple address - Allow configuration of multipath hash seed, to both allow synchronizing hashing of two routers, and preventing partial accidental sync - Improve TCP compliance with RFC 9293 for simultaneous connect() - Support sending NAT keepalives in IPsec ESP in UDP states. Userspace IKE daemon had to do this before, but the kernel can better keep track of it - Support sending supervision HSR frames with MAC addresses stored in ProxyNodeTable when RedBox (i.e. HSR-SAN) is enabled - Introduce IPPROTO_SMC for selecting SMC when socket is created - Allow UDP GSO transmit from devices with no checksum offload - openvswitch: add packet sampling via psample, separating the sampled traffic from "upcall" packets sent to user space for forwarding - nf_tables: shrink memory consumption for transaction objects Things we sprinkled into general kernel code: - Power Sequencing subsystem (used by Qualcomm Bluetooth driver for QCA6390) [ Already merged separately - Linus ] - Add IRQ information in sysfs for auxiliary bus - Introduce guard definition for local_lock - Add aligned flavor of __cacheline_group_{begin, end}() markings for grouping fields in structures BPF: - Notify user space (via epoll) when a struct_ops object is getting detached/unregistered - Add new kfuncs for a generic, open-coded bits iterator - Enable BPF programs to declare arrays of kptr, bpf_rb_root, and bpf_list_head - Support resilient split BTF which cuts down on duplication and makes BTF as compact as possible WRT BTF from modules - Add support for dumping kfunc prototypes from BTF which enables both detecting as well as dumping compilable prototypes for kfuncs - riscv64 BPF JIT improvements in particular to add 12-argument support for BPF trampolines and to utilize bpf_prog_pack for the latter - Add the capability to offload the netfilter flowtable in XDP layer through kfuncs Driver API: - Allow users to configure IRQ tresholds between which automatic IRQ moderation can choose - Expand Power Sourcing (PoE) status with power, class and failure reason. Support setting power limits - Track additional RSS contexts in the core, make sure configuration changes don't break them - Support IPsec crypto offload for IPv6 ESP and IPv4 UDP-encapsulated ESP data paths - Support updating firmware on SFP modules Tests and tooling: - mptcp: use net/lib.sh to manage netns - TCP-AO and TCP-MD5: replace debug prints used by tests with tracepoints - openvswitch: make test self-contained (don't depend on OvS CLI tools) Drivers: - Ethernet high-speed NICs: - Broadcom (bnxt): - increase the max total outstanding PTP TX packets to 4 - add timestamping statistics support - implement netdev_queue_mgmt_ops - support new RSS context API - Intel (100G, ice, idpf): - implement FEC statistics and dumping signal quality indicators - support E825C products (with 56Gbps PHYs) - nVidia/Mellanox: - support HW-GRO - mlx4/mlx5: support per-queue statistics via netlink - obey the max number of EQs setting in sub-functions - AMD/Solarflare: - support new RSS context API - AMD/Pensando: - ionic: rework fix for doorbell miss to lower overhead and skip it on new HW - Wangxun: - txgbe: support Flow Director perfect filters - Ethernet NICs consumer, embedded and virtual: - Add driver for Tehuti Networks TN40xx chips - Add driver for Meta's internal NIC chips - Add driver for Ethernet MAC on Airoha EN7581 SoCs - Add driver for Renesas Ethernet-TSN devices - Google cloud vNIC: - flow steering support - Microsoft vNIC: - support page sizes other than 4KB on ARM64 - vmware vNIC: - support latency measurement (update to version 9) - VirtIO net: - support for Byte Queue Limits - support configuring thresholds for automatic IRQ moderation - support for AF_XDP Rx zero-copy - Synopsys (stmmac): - support for STM32MP13 SoC - let platforms select the right PCS implementation - TI: - icssg-prueth: add multicast filtering support - icssg-prueth: enable PTP timestamping and PPS - Renesas: - ravb: improve Rx performance 30-400% by using page pool, theaded NAPI and timer-based IRQ coalescing - ravb: add MII support for R-Car V4M - Cadence (macb): - macb: add ARP support to Wake-On-LAN - Cortina: - use phylib for RX and TX pause configuration - Ethernet switches: - nVidia/Mellanox: - support configuration of multipath hash seed - report more accurate max MTU - use page_pool to improve Rx performance - MediaTek: - mt7530: add support for bridge port isolation - Qualcomm: - qca8k: add support for bridge port isolation - Microchip: - lan9371/2: add 100BaseTX PHY support - NXP: - vsc73xx: implement VLAN operations - Ethernet PHYs: - aquantia: enable support for aqr115c - aquantia: add support for PHY LEDs - realtek: add support for rtl8224 2.5Gbps PHY - xpcs: add memory-mapped device support - add BroadR-Reach link mode and support in Broadcom's PHY driver - CAN: - add document for ISO 15765-2 protocol support - mcp251xfd: workaround for erratum DS80000789E, use timestamps to catch when device returns incorrect FIFO status - WiFi: - mac80211/cfg80211: - parse Transmit Power Envelope (TPE) data in mac80211 instead of in drivers - improvements for 6 GHz regulatory flexibility - multi-link improvements - support multiple radios per wiphy - remove DEAUTH_NEED_MGD_TX_PREP flag - Intel (iwlwifi): - bump FW API to 91 for BZ/SC devices - report 64-bit radiotap timestamp - enable P2P low latency by default - handle Transmit Power Envelope (TPE) advertised by AP - remove support for older FW for new devices - fast resume (keeping the device configured) - mvm: re-enable Multi-Link Operation (MLO) - aggregation (A-MSDU) optimizations - MediaTek (mt76): - mt7925 Multi-Link Operation (MLO) support - Qualcomm (ath10k): - LED support for various chipsets - Qualcomm (ath12k): - remove unsupported Tx monitor handling - support channel 2 in 6 GHz band - support Spatial Multiplexing Power Save (SMPS) in 6 GHz band - supprt multiple BSSID (MBSSID) and Enhanced Multi-BSSID Advertisements (EMA) - support dynamic VLAN - add panic handler for resetting the firmware state - DebugFS support for datapath statistics - WCN7850: support for Wake on WLAN - Microchip (wilc1000): - read MAC address during probe to make it visible to user space - suspend/resume improvements - TI (wl18xx): - support newer firmware versions - RealTek (rtw89): - preparation for RTL8852BE-VT support - Wake on WLAN support for WiFi 6 chips - 36-bit PCI DMA support - RealTek (rtlwifi): - RTL8192DU support - Broadcom (brcmfmac): - Management Frame Protection support (to enable WPA3) - Bluetooth: - qualcomm: use the power sequencer for QCA6390 - btusb: mediatek: add ISO data transmission functions - hci_bcm4377: add BCM4388 support - btintel: add support for BlazarU core - btintel: add support for Whale Peak2 - btnxpuart: add support for AW693 A1 chipset - btnxpuart: add support for IW615 chipset - btusb: add Realtek RTL8852BE support ID 0x13d3:0x3591" * tag 'net-next-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (1589 commits) eth: fbnic: Fix spelling mistake "tiggerring" -> "triggering" tcp: Replace strncpy() with strscpy() wifi: ath12k: fix build vs old compiler tcp: Don't access uninit tcp_rsk(req)->ao_keyid in tcp_create_openreq_child(). eth: fbnic: Write the TCAM tables used for RSS control and Rx to host eth: fbnic: Add L2 address programming eth: fbnic: Add basic Rx handling eth: fbnic: Add basic Tx handling eth: fbnic: Add link detection eth: fbnic: Add initial messaging to notify FW of our presence eth: fbnic: Implement Rx queue alloc/start/stop/free eth: fbnic: Implement Tx queue alloc/start/stop/free eth: fbnic: Allocate a netdevice and napi vectors with queues eth: fbnic: Add FW communication mechanism eth: fbnic: Add message parsing for FW messages eth: fbnic: Add register init to set PCIe/Ethernet device config eth: fbnic: Allocate core device specific structures and devlink interface eth: fbnic: Add scaffolding for Meta's NIC driver PCI: Add Meta Platforms vendor ID net/sched: cls_flower: propagate tca[TCA_OPTIONS] to NL_REQ_ATTR_CHECK ...
2 parents 0434dbe + 77ae5e5 commit 5183594

File tree

1,575 files changed

+93958
-25613
lines changed

Some content is hidden

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

1,575 files changed

+93958
-25613
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
What: /sys/bus/auxiliary/devices/.../irqs/
2+
Date: April, 2024
3+
Contact: Shay Drory <[email protected]>
4+
Description:
5+
The /sys/devices/.../irqs directory contains a variable set of
6+
files, with each file is named as irq number similar to PCI PF
7+
or VF's irq number located in msi_irqs directory.
8+
These irq files are added and removed dynamically when an IRQ
9+
is requested and freed respectively for the PCI SF.

Documentation/bpf/libbpf/libbpf_overview.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,14 @@ compilation and skeleton generation. Using Libbpf-rs will make building user
219219
space part of the BPF application easier. Note that the BPF program themselves
220220
must still be written in plain C.
221221

222+
libbpf logging
223+
==============
224+
225+
By default, libbpf logs informational and warning messages to stderr. The
226+
verbosity of these messages can be controlled by setting the environment
227+
variable LIBBPF_LOG_LEVEL to either warn, info, or debug. A custom log
228+
callback can be set using ``libbpf_set_print()``.
229+
222230
Additional Documentation
223231
========================
224232

Documentation/bpf/standardization/abi.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ The BPF calling convention is defined as:
2323

2424
R0 - R5 are scratch registers and BPF programs needs to spill/fill them if
2525
necessary across calls.
26+
27+
The BPF program needs to store the return value into register R0 before doing an
28+
``EXIT``.

Documentation/bpf/standardization/instruction-set.rst

Lines changed: 193 additions & 140 deletions
Large diffs are not rendered by default.
Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/net/airoha,en7581-eth.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Airoha EN7581 Frame Engine Ethernet controller
8+
9+
maintainers:
10+
- Lorenzo Bianconi <[email protected]>
11+
12+
description:
13+
The frame engine ethernet controller can be found on Airoha SoCs.
14+
These SoCs have multi-GMAC ports.
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- airoha,en7581-eth
20+
21+
reg:
22+
items:
23+
- description: Frame engine base address
24+
- description: QDMA0 base address
25+
- description: QDMA1 base address
26+
27+
reg-names:
28+
items:
29+
- const: fe
30+
- const: qdma0
31+
- const: qdma1
32+
33+
interrupts:
34+
items:
35+
- description: QDMA lan irq0
36+
- description: QDMA lan irq1
37+
- description: QDMA lan irq2
38+
- description: QDMA lan irq3
39+
- description: QDMA wan irq0
40+
- description: QDMA wan irq1
41+
- description: QDMA wan irq2
42+
- description: QDMA wan irq3
43+
- description: FE error irq
44+
- description: PDMA irq
45+
46+
resets:
47+
maxItems: 8
48+
49+
reset-names:
50+
items:
51+
- const: fe
52+
- const: pdma
53+
- const: qdma
54+
- const: xsi-mac
55+
- const: hsi0-mac
56+
- const: hsi1-mac
57+
- const: hsi-mac
58+
- const: xfp-mac
59+
60+
"#address-cells":
61+
const: 1
62+
63+
"#size-cells":
64+
const: 0
65+
66+
patternProperties:
67+
"^ethernet@[1-4]$":
68+
type: object
69+
unevaluatedProperties: false
70+
$ref: ethernet-controller.yaml#
71+
description:
72+
Ethernet GMAC port associated to the MAC controller
73+
properties:
74+
compatible:
75+
const: airoha,eth-mac
76+
77+
reg:
78+
minimum: 1
79+
maximum: 4
80+
description: GMAC port identifier
81+
82+
required:
83+
- reg
84+
- compatible
85+
86+
required:
87+
- compatible
88+
- reg
89+
- interrupts
90+
- resets
91+
- reset-names
92+
93+
unevaluatedProperties: false
94+
95+
examples:
96+
- |
97+
#include <dt-bindings/interrupt-controller/arm-gic.h>
98+
#include <dt-bindings/interrupt-controller/irq.h>
99+
#include <dt-bindings/clock/en7523-clk.h>
100+
101+
soc {
102+
#address-cells = <2>;
103+
#size-cells = <2>;
104+
105+
eth: ethernet@1fb50000 {
106+
compatible = "airoha,en7581-eth";
107+
reg = <0 0x1fb50000 0 0x2600>,
108+
<0 0x1fb54000 0 0x2000>,
109+
<0 0x1fb56000 0 0x2000>;
110+
reg-names = "fe", "qdma0", "qdma1";
111+
112+
resets = <&scuclk 44>,
113+
<&scuclk 30>,
114+
<&scuclk 31>,
115+
<&scuclk 6>,
116+
<&scuclk 15>,
117+
<&scuclk 16>,
118+
<&scuclk 17>,
119+
<&scuclk 26>;
120+
reset-names = "fe", "pdma", "qdma", "xsi-mac",
121+
"hsi0-mac", "hsi1-mac", "hsi-mac",
122+
"xfp-mac";
123+
124+
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
125+
<GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,
126+
<GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,
127+
<GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>,
128+
<GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,
129+
<GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>,
130+
<GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>,
131+
<GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>,
132+
<GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>,
133+
<GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
134+
135+
#address-cells = <1>;
136+
#size-cells = <0>;
137+
138+
mac: ethernet@1 {
139+
compatible = "airoha,eth-mac";
140+
reg = <1>;
141+
};
142+
};
143+
};

Documentation/devicetree/bindings/net/arc_emac.txt

Lines changed: 0 additions & 46 deletions
This file was deleted.
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/net/bluetooth/mediatek,mt7622-bluetooth.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MediaTek SoC built-in Bluetooth
8+
9+
description:
10+
This device is a serial attached device to BTIF device and thus it must be a
11+
child node of the serial node with BTIF. The dt-bindings details for BTIF
12+
device can be known via Documentation/devicetree/bindings/serial/8250.yaml.
13+
14+
maintainers:
15+
- Sean Wang <[email protected]>
16+
17+
allOf:
18+
- $ref: bluetooth-controller.yaml#
19+
20+
properties:
21+
compatible:
22+
const: mediatek,mt7622-bluetooth
23+
24+
clocks:
25+
maxItems: 1
26+
27+
clock-names:
28+
const: ref
29+
30+
power-domains:
31+
maxItems: 1
32+
33+
required:
34+
- clocks
35+
- clock-names
36+
- power-domains
37+
38+
unevaluatedProperties: false
39+
40+
examples:
41+
- |
42+
#include <dt-bindings/power/mt7622-power.h>
43+
44+
serial {
45+
bluetooth {
46+
compatible = "mediatek,mt7622-bluetooth";
47+
power-domains = <&scpsys MT7622_POWER_DOMAIN_WB>;
48+
clocks = <&clk25m>;
49+
clock-names = "ref";
50+
};
51+
};

Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ properties:
3131
This property depends on the module vendor's
3232
configuration.
3333

34+
firmware-name:
35+
maxItems: 1
36+
3437
required:
3538
- compatible
3639

@@ -42,5 +45,6 @@ examples:
4245
bluetooth {
4346
compatible = "nxp,88w8987-bt";
4447
fw-init-baudrate = <3000000>;
48+
firmware-name = "uartuart8987_bt_v0.bin";
4549
};
4650
};

Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ properties:
6262
vdddig-supply:
6363
description: VDD_DIG supply regulator handle
6464

65+
vddbtcmx-supply:
66+
description: VDD_BT_CMX supply regulator handle
67+
6568
vddbtcxmx-supply:
6669
description: VDD_BT_CXMX supply regulator handle
6770

@@ -74,6 +77,9 @@ properties:
7477
vddrfa1p7-supply:
7578
description: VDD_RFA_1P7 supply regulator handle
7679

80+
vddrfa1p8-supply:
81+
description: VDD_RFA_1P8 supply regulator handle
82+
7783
vddrfa1p2-supply:
7884
description: VDD_RFA_1P2 supply regulator handle
7985

@@ -86,6 +92,12 @@ properties:
8692
vddasd-supply:
8793
description: VDD_ASD supply regulator handle
8894

95+
vddwlcx-supply:
96+
description: VDD_WLCX supply regulator handle
97+
98+
vddwlmx-supply:
99+
description: VDD_WLMX supply regulator handle
100+
89101
max-speed:
90102
description: see Documentation/devicetree/bindings/serial/serial.yaml
91103

@@ -176,14 +188,27 @@ allOf:
176188
- qcom,wcn7850-bt
177189
then:
178190
required:
179-
- enable-gpios
180-
- swctrl-gpios
181-
- vddio-supply
191+
- vddrfacmn-supply
192+
- vddaon-supply
193+
- vddwlcx-supply
194+
- vddwlmx-supply
195+
- vddrfa0p8-supply
196+
- vddrfa1p2-supply
197+
- vddrfa1p8-supply
198+
- if:
199+
properties:
200+
compatible:
201+
contains:
202+
enum:
203+
- qcom,qca6390-bt
204+
then:
205+
required:
206+
- vddrfacmn-supply
182207
- vddaon-supply
183-
- vdddig-supply
208+
- vddbtcmx-supply
184209
- vddrfa0p8-supply
185210
- vddrfa1p2-supply
186-
- vddrfa1p9-supply
211+
- vddrfa1p7-supply
187212

188213
examples:
189214
- |

Documentation/devicetree/bindings/net/can/xilinx,can.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ $id: http://devicetree.org/schemas/net/can/xilinx,can.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title:
8-
Xilinx Axi CAN/Zynq CANPS controller
8+
Xilinx CAN and CANFD controller
99

1010
maintainers:
1111
- Appana Durga Kedareswara rao <[email protected]>

Documentation/devicetree/bindings/net/cdns,macb.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ patternProperties:
146146

147147
magic-packet:
148148
type: boolean
149+
deprecated: true
149150
description:
150151
Indicates that the hardware supports waking up via magic packet.
151152

0 commit comments

Comments
 (0)