Skip to content

Commit 79790b6

Browse files
author
Thomas Hellström
committed
Merge drm/drm-next into drm-xe-next
Backmerging drm-next in order to get up-to-date and in particular to access commit 9ca5fac. Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
2 parents 12f4b58 + 6e1f415 commit 79790b6

File tree

11,451 files changed

+663198
-206100
lines changed

Some content is hidden

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

11,451 files changed

+663198
-206100
lines changed

.get_maintainer.ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
Alan Cox <alan@lxorguk.ukuu.org.uk>
22
Alan Cox <root@hraefn.swansea.linux.org.uk>
33
Christoph Hellwig <hch@lst.de>
4+
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
45
Marc Gonzalez <marc.w.gonzalez@free.fr>

.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: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,11 @@ Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
191191
Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
192192
Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>
193193
Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>
194-
Geliang Tang <geliang.tang@linux.dev> <geliang.tang@suse.com>
195-
Geliang Tang <geliang.tang@linux.dev> <geliangtang@xiaomi.com>
196-
Geliang Tang <geliang.tang@linux.dev> <geliangtang@gmail.com>
197-
Geliang Tang <geliang.tang@linux.dev> <geliangtang@163.com>
194+
Geliang Tang <geliang@kernel.org> <geliang.tang@linux.dev>
195+
Geliang Tang <geliang@kernel.org> <geliang.tang@suse.com>
196+
Geliang Tang <geliang@kernel.org> <geliangtang@xiaomi.com>
197+
Geliang Tang <geliang@kernel.org> <geliangtang@gmail.com>
198+
Geliang Tang <geliang@kernel.org> <geliangtang@163.com>
198199
Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>
199200
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
200201
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
@@ -289,6 +290,7 @@ Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
289290
John Crispin <john@phrozen.org> <blogic@openwrt.org>
290291
John Fastabend <john.fastabend@gmail.com> <john.r.fastabend@intel.com>
291292
John Keeping <john@keeping.me.uk> <john@metanate.com>
293+
John Moon <john@jmoon.dev> <quic_johmoo@quicinc.com>
292294
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
293295
John Stultz <johnstul@us.ibm.com>
294296
<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>
@@ -323,6 +325,7 @@ Kenneth W Chen <kenneth.w.chen@intel.com>
323325
Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org>
324326
Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>
325327
Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>
328+
Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>
326329
Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>
327330
Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
328331
Koushik <raghavendra.koushik@neterion.com>
@@ -337,13 +340,15 @@ Lee Jones <lee@kernel.org> <joneslee@google.com>
337340
Lee Jones <lee@kernel.org> <lee.jones@canonical.com>
338341
Lee Jones <lee@kernel.org> <lee.jones@linaro.org>
339342
Lee Jones <lee@kernel.org> <lee@ubuntu.com>
340-
Leonard Crestez <leonard.crestez@nxp.com> Leonard Crestez <cdleonard@gmail.com>
343+
Leonard Crestez <cdleonard@gmail.com> <leonard.crestez@nxp.com>
344+
Leonard Crestez <cdleonard@gmail.com> <leonard.crestez@intel.com>
341345
Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
342346
Leonard Göhrs <l.goehrs@pengutronix.de>
343347
Leonid I Ananiev <leonid.i.ananiev@intel.com>
344348
Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
345349
Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
346350
Leon Romanovsky <leon@kernel.org> <leonro@nvidia.com>
351+
Leo Yan <leo.yan@linux.dev> <leo.yan@linaro.org>
347352
Liam Mark <quic_lmark@quicinc.com> <lmark@codeaurora.org>
348353
Linas Vepstas <linas@austin.ibm.com>
349354
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
@@ -435,6 +440,8 @@ Mukesh Ojha <quic_mojha@quicinc.com> <mojha@codeaurora.org>
435440
Muna Sinada <quic_msinada@quicinc.com> <msinada@codeaurora.org>
436441
Murali Nalajala <quic_mnalajal@quicinc.com> <mnalajal@codeaurora.org>
437442
Mythri P K <mythripk@ti.com>
443+
Nadav Amit <nadav.amit@gmail.com> <namit@vmware.com>
444+
Nadav Amit <nadav.amit@gmail.com> <namit@cs.technion.ac.il>
438445
Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>
439446
Naoya Horiguchi <naoya.horiguchi@nec.com> <n-horiguchi@ah.jp.nec.com>
440447
Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
@@ -491,7 +498,8 @@ Prasad Sodagudi <quic_psodagud@quicinc.com> <psodagud@codeaurora.org>
491498
Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>
492499
Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>
493500
Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>
494-
Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
501+
Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>
502+
Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>
495503
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
496504
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
497505
Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
@@ -550,6 +558,7 @@ Senthilkumar N L <quic_snlakshm@quicinc.com> <snlakshm@codeaurora.org>
550558
Serge Hallyn <sergeh@kernel.org> <serge.hallyn@canonical.com>
551559
Serge Hallyn <sergeh@kernel.org> <serue@us.ibm.com>
552560
Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
561+
Shakeel Butt <shakeel.butt@linux.dev> <shakeelb@google.com>
553562
Shannon Nelson <shannon.nelson@amd.com> <snelson@pensando.io>
554563
Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@intel.com>
555564
Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@oracle.com>
@@ -568,6 +577,7 @@ Simon Kelley <simon@thekelleys.org.uk>
568577
Sricharan Ramabadhran <quic_srichara@quicinc.com> <sricharan@codeaurora.org>
569578
Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>
570579
Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>
580+
Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>
571581
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
572582
Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>
573583
Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>
@@ -605,6 +615,11 @@ TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>
605615
TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
606616
Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
607617
Tudor Ambarus <tudor.ambarus@linaro.org> <tudor.ambarus@microchip.com>
618+
Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko.ursulin@intel.com>
619+
Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko.ursulin@linux.intel.com>
620+
Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko.ursulin@sophos.com>
621+
Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko.ursulin@onelan.co.uk>
622+
Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko@ursulin.net>
608623
Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
609624
Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>
610625
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

CREDITS

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ D: dosfs, LILO, some fd features, ATM, various other hacks here and there
6363
S: Buenos Aires
6464
S: Argentina
6565

66+
NTFS FILESYSTEM
67+
N: Anton Altaparmakov
68+
E: anton@tuxera.com
69+
D: NTFS filesystem
70+
6671
N: Tim Alpaerts
6772
E: tim_alpaerts@toyota-motor-europe.com
6873
D: 802.2 class II logical link control layer,
@@ -2955,6 +2960,11 @@ S: 2364 Old Trail Drive
29552960
S: Reston, Virginia 20191
29562961
S: USA
29572962

2963+
N: Sekhar Nori
2964+
E: nori.sekhar@gmail.com
2965+
D: Maintainer of Texas Instruments DaVinci machine support, contributor
2966+
D: to device drivers relevant to that SoC family.
2967+
29582968
N: Fredrik Noring
29592969
E: noring@nocrew.org
29602970
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: linux-cxl@vger.kernel.org
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: linux-cxl@vger.kernel.org
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: qat-linux@intel.com
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: linux-crypto@vger.kernel.org
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: linux-crypto@vger.kernel.org
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: linux-crypto@vger.kernel.org
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: linux-crypto@vger.kernel.org

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: linux-crypto@vger.kernel.org
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: linux-crypto@vger.kernel.org
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: linux-crypto@vger.kernel.org
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: linux-crypto@vger.kernel.org

0 commit comments

Comments
 (0)