Skip to content

Commit b2e1184

Browse files
committed
Merge branch 'for-6.3/cleanup-relocations' into for-next
2 parents cad81ab + 0c05e7b commit b2e1184

File tree

6,526 files changed

+253057
-80872
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,526 files changed

+253057
-80872
lines changed

.clang-format

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ ForEachMacros:
222222
- 'for_each_component_dais'
223223
- 'for_each_component_dais_safe'
224224
- 'for_each_console'
225+
- 'for_each_console_srcu'
225226
- 'for_each_cpu'
226227
- 'for_each_cpu_and'
227228
- 'for_each_cpu_not'
@@ -535,6 +536,7 @@ ForEachMacros:
535536
- 'perf_hpp_list__for_each_sort_list_safe'
536537
- 'perf_pmu__for_each_hybrid_pmu'
537538
- 'ping_portaddr_for_each_entry'
539+
- 'ping_portaddr_for_each_entry_rcu'
538540
- 'plist_for_each'
539541
- 'plist_for_each_continue'
540542
- 'plist_for_each_entry'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
*.dtb
2121
*.dtbo
2222
*.dtb.S
23+
*.dtbo.S
2324
*.dwo
2425
*.elf
2526
*.gcno

.mailmap

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electr
2929
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
3030
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
3131
Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
32+
Alex Hung <alexhung@gmail.com> <alex.hung@canonical.com>
3233
Alex Shi <alexs@kernel.org> <alex.shi@intel.com>
3334
Alex Shi <alexs@kernel.org> <alex.shi@linaro.org>
3435
Alex Shi <alexs@kernel.org> <alex.shi@linux.alibaba.com>
@@ -104,6 +105,7 @@ Christoph Hellwig <hch@lst.de>
104105
Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>
105106
Corey Minyard <minyard@acm.org>
106107
Damian Hobson-Garcia <dhobsong@igel.co.jp>
108+
Dan Carpenter <error27@gmail.com> <dan.carpenter@oracle.com>
107109
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
108110
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@iogearbox.net>
109111
Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
@@ -137,6 +139,7 @@ Filipe Lautert <filipe@icewall.org>
137139
Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au>
138140
Franck Bui-Huu <vagabon.xyz@gmail.com>
139141
Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
142+
Frank Rowand <frowand.list@gmail.com> <frank.rowand@sony.com>
140143
Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
141144
Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>
142145
Frank Zago <fzago@systemfabricworks.com>
@@ -284,6 +287,7 @@ Matthew Wilcox <willy@infradead.org> <willy@linux.intel.com>
284287
Matthew Wilcox <willy@infradead.org> <willy@parisc-linux.org>
285288
Matthias Fuchs <socketcan@esd.eu> <matthias.fuchs@esd.eu>
286289
Matthieu CASTET <castet.matthieu@free.fr>
290+
Matti Vaittinen <mazziesaccount@gmail.com> <matti.vaittinen@fi.rohmeurope.com>
287291
Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
288292
Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
289293
Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
@@ -352,7 +356,8 @@ Peter Oruba <peter@oruba.de>
352356
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
353357
Praveen BP <praveenbp@ti.com>
354358
Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>
355-
Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
359+
Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>
360+
Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>
356361
Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
357362
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
358363
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
@@ -368,6 +373,8 @@ Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
368373
Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
369374
Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
370375
Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>
376+
Muchun Song <muchun.song@linux.dev> <songmuchun@bytedance.com>
377+
Muchun Song <muchun.song@linux.dev> <smuchun@gmail.com>
371378
Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
372379
Rudolf Marek <R.Marek@sh.cvut.cz>
373380
Rui Saraiva <rmps@joel.ist.utl.pt>
@@ -379,13 +386,15 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org>
379386
Santosh Shilimkar <ssantosh@kernel.org>
380387
Sarangdhar Joshi <spjoshi@codeaurora.org>
381388
Sascha Hauer <s.hauer@pengutronix.de>
389+
Satya Priya <quic_c_skakit@quicinc.com> <skakit@codeaurora.org>
382390
S.Çağlar Onur <caglar@pardus.org.tr>
383391
Sean Christopherson <seanjc@google.com> <sean.j.christopherson@intel.com>
384392
Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
385393
Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
386394
Sebastian Reichel <sre@kernel.org> <sre@debian.org>
387395
Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>
388396
Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
397+
Shannon Nelson <shannon.nelson@amd.com> <snelson@pensando.io>
389398
Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
390399
Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
391400
Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
@@ -413,6 +422,7 @@ TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>
413422
TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
414423
Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
415424
Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
425+
Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>
416426
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
417427
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
418428
Uwe Kleine-König <ukleinek@strlen.de>

CREDITS

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -918,6 +918,11 @@ S: Ottawa, Ontario
918918
S: K1N 6Z9
919919
S: CANADA
920920

921+
N: Vivien Didelot
922+
E: vivien.didelot@gmail.com
923+
D: DSA framework and MV88E6XXX driver
924+
S: Montreal, Quebec, Canada
925+
921926
N: Jeff Dike
922927
E: jdike@karaya.com
923928
W: http://user-mode-linux.sourceforge.net
@@ -2447,6 +2452,10 @@ S: 482 Shadowgraph Dr.
24472452
S: San Jose, CA 95110
24482453
S: USA
24492454

2455+
N: Michal Marek
2456+
E: michal.lkml@markovi.net
2457+
D: Kbuild Maintainer 2009-2017
2458+
24502459
N: Martin Mares
24512460
E: mj@ucw.cz
24522461
W: http://www.ucw.cz/~mj/
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
What: /sys/kernel/debug/dell-wmi-ddv-<wmi_device_name>/fan_sensor_information
2+
Date: September 2022
3+
KernelVersion: 6.1
4+
Contact: Armin Wolf <W_Armin@gmx.de>
5+
Description:
6+
This file contains the contents of the fan sensor information buffer,
7+
which contains fan sensor entries and a terminating character (0xFF).
8+
9+
Each fan sensor entry consists of three bytes with an unknown meaning,
10+
interested people may use this file for reverse-engineering.
11+
12+
What: /sys/kernel/debug/dell-wmi-ddv-<wmi_device_name>/thermal_sensor_information
13+
Date: September 2022
14+
KernelVersion: 6.1
15+
Contact: Armin Wolf <W_Armin@gmx.de>
16+
Description:
17+
This file contains the contents of the thermal sensor information buffer,
18+
which contains thermal sensor entries and a terminating character (0xFF).
19+
20+
Each thermal sensor entry consists of five bytes with an unknown meaning,
21+
interested people may use this file for reverse-engineering.

Documentation/ABI/testing/sysfs-bus-nvdimm

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,17 @@ KernelVersion: 5.18
4141
Contact: Kajol Jain <kjain@linux.ibm.com>
4242
Description: (RO) This sysfs file exposes the cpumask which is designated to
4343
to retrieve nvdimm pmu event counter data.
44+
45+
What: /sys/bus/nd/devices/nmemX/cxl/id
46+
Date: November 2022
47+
KernelVersion: 6.2
48+
Contact: Dave Jiang <dave.jiang@intel.com>
49+
Description: (RO) Show the id (serial) of the device. This is CXL specific.
50+
51+
What: /sys/bus/nd/devices/nmemX/cxl/provider
52+
Date: November 2022
53+
KernelVersion: 6.2
54+
Contact: Dave Jiang <dave.jiang@intel.com>
55+
Description: (RO) Shows the CXL bridge device that ties to a CXL memory device
56+
to this NVDIMM device. I.e. the parent of the device returned is
57+
a /sys/bus/cxl/devices/memX instance.

Documentation/ABI/testing/sysfs-bus-pci

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,3 +457,36 @@ Description:
457457

458458
The file is writable if the PF is bound to a driver that
459459
implements ->sriov_set_msix_vec_count().
460+
461+
What: /sys/bus/pci/devices/.../resourceN_resize
462+
Date: September 2022
463+
Contact: Alex Williamson <alex.williamson@redhat.com>
464+
Description:
465+
These files provide an interface to PCIe Resizable BAR support.
466+
A file is created for each BAR resource (N) supported by the
467+
PCIe Resizable BAR extended capability of the device. Reading
468+
each file exposes the bitmap of available resource sizes:
469+
470+
# cat resource1_resize
471+
00000000000001c0
472+
473+
The bitmap represents supported resource sizes for the BAR,
474+
where bit0 = 1MB, bit1 = 2MB, bit2 = 4MB, etc. In the above
475+
example the device supports 64MB, 128MB, and 256MB BAR sizes.
476+
477+
When writing the file, the user provides the bit position of
478+
the desired resource size, for example:
479+
480+
# echo 7 > resource1_resize
481+
482+
This indicates to set the size value corresponding to bit 7,
483+
128MB. The resulting size is 2 ^ (bit# + 20). This definition
484+
matches the PCIe specification of this capability.
485+
486+
In order to make use of resource resizing, all PCI drivers must
487+
be unbound from the device and peer devices under the same
488+
parent bridge may need to be soft removed. In the case of
489+
VGA devices, writing a resize value will remove low level
490+
console drivers from the device. Raw users of pci-sysfs
491+
resourceN attributes must be terminated prior to resizing.
492+
Success of the resizing operation is not guaranteed.

Documentation/ABI/testing/sysfs-devices-mapping

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
What: /sys/devices/uncore_iio_x/dieX
22
Date: February 2020
3-
Contact: Roman Sudarikov <roman.sudarikov@linux.intel.com>
3+
Contact: Alexander Antonov <alexander.antonov@linux.intel.com>
44
Description:
55
Each IIO stack (PCIe root port) has its own IIO PMON block, so
66
each dieX file (where X is die number) holds "Segment:Root Bus"
@@ -32,3 +32,31 @@ Description:
3232
IIO PMU 0 on die 1 belongs to PCI RP on bus 0x40, domain 0x0000
3333
IIO PMU 0 on die 2 belongs to PCI RP on bus 0x80, domain 0x0000
3434
IIO PMU 0 on die 3 belongs to PCI RP on bus 0xc0, domain 0x0000
35+
36+
What: /sys/devices/uncore_upi_x/dieX
37+
Date: March 2022
38+
Contact: Alexander Antonov <alexander.antonov@linux.intel.com>
39+
Description:
40+
Each /sys/devices/uncore_upi_X/dieY file holds "upi_Z,die_W"
41+
value that means UPI link number X on die Y is connected to UPI
42+
link Z on die W and this link between sockets can be monitored
43+
by UPI PMON block.
44+
For example, 4-die Sapphire Rapids platform has the following
45+
UPI 0 topology::
46+
47+
# tail /sys/devices/uncore_upi_0/die*
48+
==> /sys/devices/uncore_upi_0/die0 <==
49+
upi_1,die_1
50+
==> /sys/devices/uncore_upi_0/die1 <==
51+
upi_0,die_3
52+
==> /sys/devices/uncore_upi_0/die2 <==
53+
upi_1,die_3
54+
==> /sys/devices/uncore_upi_0/die3 <==
55+
upi_0,die_1
56+
57+
Which means::
58+
59+
UPI link 0 on die 0 is connected to UPI link 1 on die 1
60+
UPI link 0 on die 1 is connected to UPI link 0 on die 3
61+
UPI link 0 on die 2 is connected to UPI link 1 on die 3
62+
UPI link 0 on die 3 is connected to UPI link 0 on die 1
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
What: /sys/.../<device>/vfio-dev/vfioX/
2+
Date: September 2022
3+
Contact: Yi Liu <yi.l.liu@intel.com>
4+
Description:
5+
This directory is created when the device is bound to a
6+
vfio driver. The layout under this directory matches what
7+
exists for a standard 'struct device'. 'X' is a unique
8+
index marking this device in vfio.

Documentation/ABI/testing/sysfs-driver-intel_sdsi

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ KernelVersion: 5.18
44
Contact: "David E. Box" <david.e.box@linux.intel.com>
55
Description:
66
This directory contains interface files for accessing Intel
7-
Software Defined Silicon (SDSi) features on a CPU. X
8-
represents the socket instance (though not the socket ID).
9-
The socket ID is determined by reading the registers file
10-
and decoding it per the specification.
7+
On Demand (formerly Software Defined Silicon or SDSi) features
8+
on a CPU. X represents the socket instance (though not the
9+
socket ID). The socket ID is determined by reading the
10+
registers file and decoding it per the specification.
1111

12-
Some files communicate with SDSi hardware through a mailbox.
13-
Should the operation fail, one of the following error codes
14-
may be returned:
12+
Some files communicate with On Demand hardware through a
13+
mailbox. Should the operation fail, one of the following error
14+
codes may be returned:
1515

1616
========== =====
1717
Error Code Cause
1818
========== =====
1919
EIO General mailbox failure. Log may indicate cause.
2020
EBUSY Mailbox is owned by another agent.
21-
EPERM SDSI capability is not enabled in hardware.
21+
EPERM On Demand capability is not enabled in hardware.
2222
EPROTO Failure in mailbox protocol detected by driver.
2323
See log for details.
2424
EOVERFLOW For provision commands, the size of the data
@@ -54,26 +54,37 @@ KernelVersion: 5.18
5454
Contact: "David E. Box" <david.e.box@linux.intel.com>
5555
Description:
5656
(WO) Used to write an Authentication Key Certificate (AKC) to
57-
the SDSi NVRAM for the CPU. The AKC is used to authenticate a
58-
Capability Activation Payload. Mailbox command.
57+
the On Demand NVRAM for the CPU. The AKC is used to authenticate
58+
a Capability Activation Payload. Mailbox command.
5959

6060
What: /sys/bus/auxiliary/devices/intel_vsec.sdsi.X/provision_cap
6161
Date: Feb 2022
6262
KernelVersion: 5.18
6363
Contact: "David E. Box" <david.e.box@linux.intel.com>
6464
Description:
6565
(WO) Used to write a Capability Activation Payload (CAP) to the
66-
SDSi NVRAM for the CPU. CAPs are used to activate a given CPU
67-
feature. A CAP is validated by SDSi hardware using a previously
68-
provisioned AKC file. Upon successful authentication, the CPU
69-
configuration is updated. A cold reboot is required to fully
70-
activate the feature. Mailbox command.
66+
On Demand NVRAM for the CPU. CAPs are used to activate a given
67+
CPU feature. A CAP is validated by On Demand hardware using a
68+
previously provisioned AKC file. Upon successful authentication,
69+
the CPU configuration is updated. A cold reboot is required to
70+
fully activate the feature. Mailbox command.
71+
72+
What: /sys/bus/auxiliary/devices/intel_vsec.sdsi.X/meter_certificate
73+
Date: Nov 2022
74+
KernelVersion: 6.2
75+
Contact: "David E. Box" <david.e.box@linux.intel.com>
76+
Description:
77+
(RO) Used to read back the current meter certificate for the CPU
78+
from Intel On Demand hardware. The meter certificate contains
79+
utilization metrics of On Demand enabled features. Mailbox
80+
command.
7181

7282
What: /sys/bus/auxiliary/devices/intel_vsec.sdsi.X/state_certificate
7383
Date: Feb 2022
7484
KernelVersion: 5.18
7585
Contact: "David E. Box" <david.e.box@linux.intel.com>
7686
Description:
77-
(RO) Used to read back the current State Certificate for the CPU
78-
from SDSi hardware. The State Certificate contains information
79-
about the current licenses on the CPU. Mailbox command.
87+
(RO) Used to read back the current state certificate for the CPU
88+
from On Demand hardware. The state certificate contains
89+
information about the current licenses on the CPU. Mailbox
90+
command.

0 commit comments

Comments
 (0)