Skip to content

Commit

Permalink
Merge branch 'bpf/for-next' into sync-bpf-next
Browse files Browse the repository at this point in the history
  • Loading branch information
htejun committed Mar 29, 2024
2 parents e227931 + e478cf2 commit 368ada6
Show file tree
Hide file tree
Showing 10,016 changed files with 583,009 additions and 180,457 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .get_maintainer.ignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Alan Cox <[email protected]>
Alan Cox <[email protected]>
Christoph Hellwig <[email protected]>
Jeff Kirsher <[email protected]>
Marc Gonzalez <[email protected]>
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
*.xz
*.zst
Module.symvers
dtbs-list
modules.order

#
Expand Down
14 changes: 12 additions & 2 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ Kenneth W Chen <[email protected]>
Kenneth Westfield <[email protected]> <[email protected]>
Kiran Gunda <[email protected]> <[email protected]>
Kirill Tkhai <[email protected]> <[email protected]>
Kishon Vijay Abraham I <[email protected]> <[email protected]>
Konstantin Khlebnikov <[email protected]> <[email protected]>
Konstantin Khlebnikov <[email protected]> <[email protected]>
Koushik <[email protected]>
Expand All @@ -339,7 +340,8 @@ Lee Jones <[email protected]> <[email protected]>
Lee Jones <[email protected]> <[email protected]>
Lee Jones <[email protected]> <[email protected]>
Lee Jones <[email protected]> <[email protected]>
Leonard Crestez <[email protected]> Leonard Crestez <[email protected]>
Leonard Crestez <[email protected]> <[email protected]>
Leonard Crestez <[email protected]> <[email protected]>
Leonardo Bras <[email protected]> <[email protected]>
Leonard Göhrs <[email protected]>
Leonid I Ananiev <[email protected]>
Expand Down Expand Up @@ -438,6 +440,8 @@ Mukesh Ojha <[email protected]> <[email protected]>
Muna Sinada <[email protected]> <[email protected]>
Murali Nalajala <[email protected]> <[email protected]>
Mythri P K <[email protected]>
Nadav Amit <[email protected]> <[email protected]>
Nadav Amit <[email protected]> <[email protected]>
Nadia Yvette Chambers <[email protected]> William Lee Irwin III <[email protected]>
Naoya Horiguchi <[email protected]> <[email protected]>
Nathan Chancellor <[email protected]> <[email protected]>
Expand Down Expand Up @@ -494,7 +498,8 @@ Prasad Sodagudi <[email protected]> <[email protected]>
Punit Agrawal <[email protected]> <[email protected]>
Qais Yousef <[email protected]> <[email protected]>
Qais Yousef <[email protected]> <[email protected]>
Quentin Monnet <[email protected]> <[email protected]>
Quentin Monnet <[email protected]> <[email protected]>
Quentin Monnet <[email protected]> <[email protected]>
Quentin Perret <[email protected]> <[email protected]>
Rafael J. Wysocki <[email protected]> <[email protected]>
Rajeev Nandan <[email protected]> <[email protected]>
Expand Down Expand Up @@ -610,6 +615,11 @@ TripleX Chung <[email protected]> <[email protected]>
TripleX Chung <[email protected]> <[email protected]>
Tsuneo Yoshioka <[email protected]>
Tudor Ambarus <[email protected]> <[email protected]>
Tvrtko Ursulin <[email protected]> <[email protected]>
Tvrtko Ursulin <[email protected]> <[email protected]>
Tvrtko Ursulin <[email protected]> <[email protected]>
Tvrtko Ursulin <[email protected]> <[email protected]>
Tvrtko Ursulin <[email protected]> <[email protected]>
Tycho Andersen <[email protected]> <[email protected]>
Tzung-Bi Shih <[email protected]> <[email protected]>
Uwe Kleine-König <[email protected]>
Expand Down
10 changes: 10 additions & 0 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ D: dosfs, LILO, some fd features, ATM, various other hacks here and there
S: Buenos Aires
S: Argentina

NTFS FILESYSTEM
N: Anton Altaparmakov
E: [email protected]
D: NTFS filesystem

N: Tim Alpaerts
E: [email protected]
D: 802.2 class II logical link control layer,
Expand Down Expand Up @@ -2955,6 +2960,11 @@ S: 2364 Old Trail Drive
S: Reston, Virginia 20191
S: USA

N: Sekhar Nori
E: [email protected]
D: Maintainer of Texas Instruments DaVinci machine support, contributor
D: to device drivers relevant to that SoC family.

N: Fredrik Noring
E: [email protected]
W: http://www.lysator.liu.se/~noring/
Expand Down
4 changes: 2 additions & 2 deletions Documentation/ABI/obsolete/sysfs-gpio
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ Description:
/label ... (r/o) descriptive, not necessarily unique
/ngpio ... (r/o) number of GPIOs; numbered N to N + (ngpio - 1)

This ABI is deprecated and will be removed after 2020. It is
replaced with the GPIO character device.
This ABI is obsoleted by Documentation/ABI/testing/gpio-cdev and will be
removed after 2020.
12 changes: 10 additions & 2 deletions Documentation/ABI/testing/configfs-usb-gadget-ffs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ KernelVersion: 3.13
Description: The purpose of this directory is to create and remove it.

A corresponding USB function instance is created/removed.
There are no attributes here.

All parameters are set through FunctionFS.
All attributes are read only:

============= ============================================
ready 1 if the function is ready to be used, E.G.
if userspace has written descriptors and
strings to ep0, so the gadget can be
enabled - 0 otherwise.
============= ============================================

All other parameters are set through FunctionFS.
34 changes: 34 additions & 0 deletions Documentation/ABI/testing/debugfs-cxl
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,37 @@ Description:
device cannot clear poison from the address, -ENXIO is returned.
The clear_poison attribute is only visible for devices
supporting the capability.

What: /sys/kernel/debug/cxl/einj_types
Date: January, 2024
KernelVersion: v6.9
Contact: [email protected]
Description:
(RO) Prints the CXL protocol error types made available by
the platform in the format:

0x<error number> <error type>

The possible error types are (as of ACPI v6.5):

0x1000 CXL.cache Protocol Correctable
0x2000 CXL.cache Protocol Uncorrectable non-fatal
0x4000 CXL.cache Protocol Uncorrectable fatal
0x8000 CXL.mem Protocol Correctable
0x10000 CXL.mem Protocol Uncorrectable non-fatal
0x20000 CXL.mem Protocol Uncorrectable fatal

The <error number> can be written to einj_inject to inject
<error type> into a chosen dport.

What: /sys/kernel/debug/cxl/$dport_dev/einj_inject
Date: January, 2024
KernelVersion: v6.9
Contact: [email protected]
Description:
(WO) Writing an integer to this file injects the corresponding
CXL protocol error into $dport_dev ($dport_dev will be a device
name from /sys/bus/pci/devices). The integer to type mapping for
injection can be found by reading from einj_types. If the dport
was enumerated in RCH mode, a CXL 1.1 error is injected, otherwise
a CXL 2.0 error is injected.
26 changes: 26 additions & 0 deletions Documentation/ABI/testing/debugfs-driver-qat
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,29 @@ Description: (RO) Read returns, for each Acceleration Engine (AE), the number
<N>: Number of Compress and Verify (CnV) errors and type
of the last CnV error detected by Acceleration
Engine N.

What: /sys/kernel/debug/qat_<device>_<BDF>/heartbeat/inject_error
Date: March 2024
KernelVersion: 6.8
Contact: [email protected]
Description: (WO) Write to inject an error that simulates an heartbeat
failure. This is to be used for testing purposes.

After writing this file, the driver stops arbitration on a
random engine and disables the fetching of heartbeat counters.
If a workload is running on the device, a job submitted to the
accelerator might not get a response and a read of the
`heartbeat/status` attribute might report -1, i.e. device
unresponsive.
The error is unrecoverable thus the device must be restarted to
restore its functionality.

This attribute is available only when the kernel is built with
CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION=y.

A write of 1 enables error injection.

The following example shows how to enable error injection::

# cd /sys/kernel/debug/qat_<device>_<BDF>
# echo 1 > heartbeat/inject_error
22 changes: 22 additions & 0 deletions Documentation/ABI/testing/debugfs-hisi-hpre
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,28 @@ Description: QM debug registers(regs) read hardware register value. This
node is used to show the change of the qm register values. This
node can be help users to check the change of register values.

What: /sys/kernel/debug/hisi_hpre/<bdf>/qm/qm_state
Date: Jan 2024
Contact: [email protected]
Description: Dump the state of the device.
0: busy, 1: idle.
Only available for PF, and take no other effect on HPRE.

What: /sys/kernel/debug/hisi_hpre/<bdf>/qm/dev_timeout
Date: Feb 2024
Contact: [email protected]
Description: Set the wait time when stop queue fails. Available for both PF
and VF, and take no other effect on HPRE.
0: not wait(default), others value: wait dev_timeout * 20 microsecond.

What: /sys/kernel/debug/hisi_hpre/<bdf>/qm/dev_state
Date: Feb 2024
Contact: [email protected]
Description: Dump the stop queue status of the QM. The default value is 0,
if dev_timeout is set, when stop queue fails, the dev_state
will return non-zero value. Available for both PF and VF,
and take no other effect on HPRE.

What: /sys/kernel/debug/hisi_hpre/<bdf>/hpre_dfx/diff_regs
Date: Mar 2022
Contact: [email protected]
Expand Down
22 changes: 22 additions & 0 deletions Documentation/ABI/testing/debugfs-hisi-sec
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,28 @@ Description: QM debug registers(regs) read hardware register value. This
node is used to show the change of the qm register values. This
node can be help users to check the change of register values.

What: /sys/kernel/debug/hisi_sec2/<bdf>/qm/qm_state
Date: Jan 2024
Contact: [email protected]
Description: Dump the state of the device.
0: busy, 1: idle.
Only available for PF, and take no other effect on SEC.

What: /sys/kernel/debug/hisi_sec2/<bdf>/qm/dev_timeout
Date: Feb 2024
Contact: [email protected]
Description: Set the wait time when stop queue fails. Available for both PF
and VF, and take no other effect on SEC.
0: not wait(default), others value: wait dev_timeout * 20 microsecond.

What: /sys/kernel/debug/hisi_sec2/<bdf>/qm/dev_state
Date: Feb 2024
Contact: [email protected]
Description: Dump the stop queue status of the QM. The default value is 0,
if dev_timeout is set, when stop queue fails, the dev_state
will return non-zero value. Available for both PF and VF,
and take no other effect on SEC.

What: /sys/kernel/debug/hisi_sec2/<bdf>/sec_dfx/diff_regs
Date: Mar 2022
Contact: [email protected]
Expand Down
22 changes: 22 additions & 0 deletions Documentation/ABI/testing/debugfs-hisi-zip
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,28 @@ Description: QM debug registers(regs) read hardware register value. This
node is used to show the change of the qm registers value. This
node can be help users to check the change of register values.

What: /sys/kernel/debug/hisi_zip/<bdf>/qm/qm_state
Date: Jan 2024
Contact: [email protected]
Description: Dump the state of the device.
0: busy, 1: idle.
Only available for PF, and take no other effect on ZIP.

What: /sys/kernel/debug/hisi_zip/<bdf>/qm/dev_timeout
Date: Feb 2024
Contact: [email protected]
Description: Set the wait time when stop queue fails. Available for both PF
and VF, and take no other effect on ZIP.
0: not wait(default), others value: wait dev_timeout * 20 microsecond.

What: /sys/kernel/debug/hisi_zip/<bdf>/qm/dev_state
Date: Feb 2024
Contact: [email protected]
Description: Dump the stop queue status of the QM. The default value is 0,
if dev_timeout is set, when stop queue fails, the dev_state
will return non-zero value. Available for both PF and VF,
and take no other effect on ZIP.

What: /sys/kernel/debug/hisi_zip/<bdf>/zip_dfx/diff_regs
Date: Mar 2022
Contact: [email protected]
Expand Down
Loading

0 comments on commit 368ada6

Please sign in to comment.