Skip to content

Commit 537c2e9

Browse files
kuba-mookuba-moo
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR. Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 237bb5f + cba9ffd commit 537c2e9

File tree

6,688 files changed

+451388
-100396
lines changed

Some content is hidden

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

6,688 files changed

+451388
-100396
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
*.xz
5353
*.zst
5454
Module.symvers
55+
dtbs-list
5556
modules.order
5657

5758
#

‎.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,8 @@ Mukesh Ojha <[email protected]> <[email protected]>
439439
Muna Sinada <[email protected]> <[email protected]>
440440
Murali Nalajala <[email protected]> <[email protected]>
441441
Mythri P K <[email protected]>
442+
Nadav Amit <[email protected]> <[email protected]>
443+
Nadav Amit <[email protected]> <[email protected]>
442444
Nadia Yvette Chambers <[email protected]> William Lee Irwin III <[email protected]>
443445
Naoya Horiguchi <[email protected]> <[email protected]>
444446
Nathan Chancellor <[email protected]> <[email protected]>

‎CREDITS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2960,6 +2960,11 @@ S: 2364 Old Trail Drive
29602960
S: Reston, Virginia 20191
29612961
S: USA
29622962

2963+
N: Sekhar Nori
2964+
E: [email protected]
2965+
D: Maintainer of Texas Instruments DaVinci machine support, contributor
2966+
D: to device drivers relevant to that SoC family.
2967+
29632968
N: Fredrik Noring
29642969
E: [email protected]
29652970
W: http://www.lysator.liu.se/~noring/

‎Documentation/ABI/obsolete/sysfs-gpio

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ Description:
2828
/label ... (r/o) descriptive, not necessarily unique
2929
/ngpio ... (r/o) number of GPIOs; numbered N to N + (ngpio - 1)
3030

31-
This ABI is deprecated and will be removed after 2020. It is
32-
replaced with the GPIO character device.
31+
This ABI is obsoleted by Documentation/ABI/testing/gpio-cdev and will be
32+
removed after 2020.

‎Documentation/ABI/testing/configfs-usb-gadget-ffs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ KernelVersion: 3.13
44
Description: The purpose of this directory is to create and remove it.
55

66
A corresponding USB function instance is created/removed.
7-
There are no attributes here.
87

9-
All parameters are set through FunctionFS.
8+
All attributes are read only:
9+
10+
============= ============================================
11+
ready 1 if the function is ready to be used, E.G.
12+
if userspace has written descriptors and
13+
strings to ep0, so the gadget can be
14+
enabled - 0 otherwise.
15+
============= ============================================
16+
17+
All other parameters are set through FunctionFS.

‎Documentation/ABI/testing/debugfs-cxl

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,37 @@ Description:
3333
device cannot clear poison from the address, -ENXIO is returned.
3434
The clear_poison attribute is only visible for devices
3535
supporting the capability.
36+
37+
What: /sys/kernel/debug/cxl/einj_types
38+
Date: January, 2024
39+
KernelVersion: v6.9
40+
Contact: [email protected]
41+
Description:
42+
(RO) Prints the CXL protocol error types made available by
43+
the platform in the format:
44+
45+
0x<error number> <error type>
46+
47+
The possible error types are (as of ACPI v6.5):
48+
49+
0x1000 CXL.cache Protocol Correctable
50+
0x2000 CXL.cache Protocol Uncorrectable non-fatal
51+
0x4000 CXL.cache Protocol Uncorrectable fatal
52+
0x8000 CXL.mem Protocol Correctable
53+
0x10000 CXL.mem Protocol Uncorrectable non-fatal
54+
0x20000 CXL.mem Protocol Uncorrectable fatal
55+
56+
The <error number> can be written to einj_inject to inject
57+
<error type> into a chosen dport.
58+
59+
What: /sys/kernel/debug/cxl/$dport_dev/einj_inject
60+
Date: January, 2024
61+
KernelVersion: v6.9
62+
Contact: [email protected]
63+
Description:
64+
(WO) Writing an integer to this file injects the corresponding
65+
CXL protocol error into $dport_dev ($dport_dev will be a device
66+
name from /sys/bus/pci/devices). The integer to type mapping for
67+
injection can be found by reading from einj_types. If the dport
68+
was enumerated in RCH mode, a CXL 1.1 error is injected, otherwise
69+
a CXL 2.0 error is injected.

‎Documentation/ABI/testing/debugfs-driver-qat

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,29 @@ Description: (RO) Read returns, for each Acceleration Engine (AE), the number
8181
<N>: Number of Compress and Verify (CnV) errors and type
8282
of the last CnV error detected by Acceleration
8383
Engine N.
84+
85+
What: /sys/kernel/debug/qat_<device>_<BDF>/heartbeat/inject_error
86+
Date: March 2024
87+
KernelVersion: 6.8
88+
Contact: [email protected]
89+
Description: (WO) Write to inject an error that simulates an heartbeat
90+
failure. This is to be used for testing purposes.
91+
92+
After writing this file, the driver stops arbitration on a
93+
random engine and disables the fetching of heartbeat counters.
94+
If a workload is running on the device, a job submitted to the
95+
accelerator might not get a response and a read of the
96+
`heartbeat/status` attribute might report -1, i.e. device
97+
unresponsive.
98+
The error is unrecoverable thus the device must be restarted to
99+
restore its functionality.
100+
101+
This attribute is available only when the kernel is built with
102+
CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION=y.
103+
104+
A write of 1 enables error injection.
105+
106+
The following example shows how to enable error injection::
107+
108+
# cd /sys/kernel/debug/qat_<device>_<BDF>
109+
# echo 1 > heartbeat/inject_error

‎Documentation/ABI/testing/debugfs-hisi-hpre

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,28 @@ Description: QM debug registers(regs) read hardware register value. This
111111
node is used to show the change of the qm register values. This
112112
node can be help users to check the change of register values.
113113

114+
What: /sys/kernel/debug/hisi_hpre/<bdf>/qm/qm_state
115+
Date: Jan 2024
116+
Contact: [email protected]
117+
Description: Dump the state of the device.
118+
0: busy, 1: idle.
119+
Only available for PF, and take no other effect on HPRE.
120+
121+
What: /sys/kernel/debug/hisi_hpre/<bdf>/qm/dev_timeout
122+
Date: Feb 2024
123+
Contact: [email protected]
124+
Description: Set the wait time when stop queue fails. Available for both PF
125+
and VF, and take no other effect on HPRE.
126+
0: not wait(default), others value: wait dev_timeout * 20 microsecond.
127+
128+
What: /sys/kernel/debug/hisi_hpre/<bdf>/qm/dev_state
129+
Date: Feb 2024
130+
Contact: [email protected]
131+
Description: Dump the stop queue status of the QM. The default value is 0,
132+
if dev_timeout is set, when stop queue fails, the dev_state
133+
will return non-zero value. Available for both PF and VF,
134+
and take no other effect on HPRE.
135+
114136
What: /sys/kernel/debug/hisi_hpre/<bdf>/hpre_dfx/diff_regs
115137
Date: Mar 2022
116138
Contact: [email protected]

‎Documentation/ABI/testing/debugfs-hisi-sec

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,28 @@ Description: QM debug registers(regs) read hardware register value. This
9191
node is used to show the change of the qm register values. This
9292
node can be help users to check the change of register values.
9393

94+
What: /sys/kernel/debug/hisi_sec2/<bdf>/qm/qm_state
95+
Date: Jan 2024
96+
Contact: [email protected]
97+
Description: Dump the state of the device.
98+
0: busy, 1: idle.
99+
Only available for PF, and take no other effect on SEC.
100+
101+
What: /sys/kernel/debug/hisi_sec2/<bdf>/qm/dev_timeout
102+
Date: Feb 2024
103+
Contact: [email protected]
104+
Description: Set the wait time when stop queue fails. Available for both PF
105+
and VF, and take no other effect on SEC.
106+
0: not wait(default), others value: wait dev_timeout * 20 microsecond.
107+
108+
What: /sys/kernel/debug/hisi_sec2/<bdf>/qm/dev_state
109+
Date: Feb 2024
110+
Contact: [email protected]
111+
Description: Dump the stop queue status of the QM. The default value is 0,
112+
if dev_timeout is set, when stop queue fails, the dev_state
113+
will return non-zero value. Available for both PF and VF,
114+
and take no other effect on SEC.
115+
94116
What: /sys/kernel/debug/hisi_sec2/<bdf>/sec_dfx/diff_regs
95117
Date: Mar 2022
96118
Contact: [email protected]

‎Documentation/ABI/testing/debugfs-hisi-zip

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,28 @@ Description: QM debug registers(regs) read hardware register value. This
104104
node is used to show the change of the qm registers value. This
105105
node can be help users to check the change of register values.
106106

107+
What: /sys/kernel/debug/hisi_zip/<bdf>/qm/qm_state
108+
Date: Jan 2024
109+
Contact: [email protected]
110+
Description: Dump the state of the device.
111+
0: busy, 1: idle.
112+
Only available for PF, and take no other effect on ZIP.
113+
114+
What: /sys/kernel/debug/hisi_zip/<bdf>/qm/dev_timeout
115+
Date: Feb 2024
116+
Contact: [email protected]
117+
Description: Set the wait time when stop queue fails. Available for both PF
118+
and VF, and take no other effect on ZIP.
119+
0: not wait(default), others value: wait dev_timeout * 20 microsecond.
120+
121+
What: /sys/kernel/debug/hisi_zip/<bdf>/qm/dev_state
122+
Date: Feb 2024
123+
Contact: [email protected]
124+
Description: Dump the stop queue status of the QM. The default value is 0,
125+
if dev_timeout is set, when stop queue fails, the dev_state
126+
will return non-zero value. Available for both PF and VF,
127+
and take no other effect on ZIP.
128+
107129
What: /sys/kernel/debug/hisi_zip/<bdf>/zip_dfx/diff_regs
108130
Date: Mar 2022
109131
Contact: [email protected]

0 commit comments

Comments
 (0)