Skip to content

Commit 585a78c

Browse files
committed
Merge branch 'linus' into objtool/core, to pick up Xen dependencies
Pick up dependencies - freshly merged upstream via xen-next - before applying dependent objtool changes. Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents 3706458 + 6930840 commit 585a78c

4,979 files changed

Lines changed: 145365 additions & 215185 deletions

File tree

Some content is hidden

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

.mailmap

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ Aleksey Gorelov <aleksey_gorelov@phoenix.com>
2525
Alexander Lobakin <alobakin@pm.me> <alobakin@dlink.ru>
2626
Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com>
2727
Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>
28+
Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>
29+
Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>
2830
Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electrons.com>
2931
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
3032
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
@@ -130,6 +132,7 @@ Domen Puncer <domen@coderock.org>
130132
Douglas Gilbert <dougg@torque.net>
131133
Ed L. Cashin <ecashin@coraid.com>
132134
Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
135+
Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>
133136
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
134137
Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>
135138
Felipe W Damasio <felipewd@terra.com.br>
@@ -214,6 +217,7 @@ Jisheng Zhang <jszhang@kernel.org> <jszhang@marvell.com>
214217
Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>
215218
Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
216219
Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
220+
John Crispin <john@phrozen.org> <blogic@openwrt.org>
217221
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
218222
John Stultz <johnstul@us.ibm.com>
219223
Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>
@@ -371,6 +375,7 @@ Rémi Denis-Courmont <rdenis@simphalempin.com>
371375
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>
372376
Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>
373377
Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
378+
Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>
374379
Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
375380
Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
376381
Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>
@@ -422,6 +427,7 @@ Tony Luck <tony.luck@intel.com>
422427
TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>
423428
TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
424429
Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
430+
Tudor Ambarus <tudor.ambarus@linaro.org> <tudor.ambarus@microchip.com>
425431
Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
426432
Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>
427433
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

CREDITS

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,6 +1173,10 @@ D: Future Domain TMC-16x0 SCSI driver (author)
11731173
D: APM driver (early port)
11741174
D: DRM drivers (author of several)
11751175

1176+
N: Veaceslav Falico
1177+
E: vfalico@gmail.com
1178+
D: Co-maintainer and co-author of the network bonding driver.
1179+
11761180
N: János Farkas
11771181
E: chexum@shadow.banki.hu
11781182
D: romfs, various (mostly networking) fixes
@@ -2489,6 +2493,13 @@ D: XF86_Mach8
24892493
D: XF86_8514
24902494
D: cfdisk (curses based disk partitioning program)
24912495

2496+
N: Mat Martineau
2497+
E: mat@martineau.name
2498+
D: MPTCP subsystem co-maintainer 2020-2023
2499+
D: Keyctl restricted keyring and Diffie-Hellman UAPI
2500+
D: Bluetooth L2CAP ERTM mode and AMP
2501+
S: USA
2502+
24922503
N: John S. Marvin
24932504
E: jsm@fc.hp.com
24942505
D: PA-RISC port
@@ -4172,6 +4183,10 @@ S: B-1206 Jingmao Guojigongyu
41724183
S: 16 Baliqiao Nanjie, Beijing 101100
41734184
S: People's Repulic of China
41744185

4186+
N: Vlad Yasevich
4187+
E: vyasevich@gmail.com
4188+
D: SCTP protocol maintainer.
4189+
41754190
N: Aviad Yehezkel
41764191
E: aviadye@nvidia.com
41774192
D: Kernel TLS implementation and offload support.

Documentation/ABI/stable/sysfs-block

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,8 @@ Contact: linux-block@vger.kernel.org
432432
Description:
433433
[RW] This is the maximum number of kilobytes that the block
434434
layer will allow for a filesystem request. Must be smaller than
435-
or equal to the maximum size allowed by the hardware.
435+
or equal to the maximum size allowed by the hardware. Write 0
436+
to use default kernel settings.
436437

437438

438439
What: /sys/block/<disk>/queue/max_segment_size

Documentation/ABI/stable/sysfs-driver-mlxreg-io

Lines changed: 121 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,6 @@ Description: These files allow to each of ASICs by writing 1.
522522

523523
The files are write only.
524524

525-
526525
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/comm_chnl_ready
527526
Date: July 2022
528527
KernelVersion: 5.20
@@ -542,3 +541,124 @@ Description: The file indicates COME module hardware configuration.
542541
The purpose is to expose some minor BOM changes for the same system SKU.
543542

544543
The file is read only.
544+
545+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_pwr_converter_fail
546+
Date: February 2023
547+
KernelVersion: 6.3
548+
Contact: Vadim Pasternak <vadimp@nvidia.com>
549+
Description: This file shows the system reset cause due to power converter
550+
devices failure.
551+
Value 1 in file means this is reset cause, 0 - otherwise.
552+
553+
The file is read only.
554+
555+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot1_ap_reset
556+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot2_ap_reset
557+
Date: February 2023
558+
KernelVersion: 6.3
559+
Contact: Vadim Pasternak <vadimp@nvidia.com>
560+
Description: These files aim to monitor the status of the External Root of Trust (EROT)
561+
processor's RESET output to the Application Processor (AP).
562+
By reading this file, could be determined if the EROT has invalidated or
563+
revoked AP Firmware, at which point it will hold the AP in RESET until a
564+
valid firmware is loaded. This protects the AP from running an
565+
unauthorized firmware. In the normal flow, the AP reset should be released
566+
after the EROT validates the integrity of the FW, and it should be done so
567+
as quickly as possible so that the AP boots before the CPU starts to
568+
communicate to each ASIC.
569+
570+
The files are read only.
571+
572+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot1_recovery
573+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot2_recovery
574+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot1_reset
575+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot2_reset
576+
Date: February 2023
577+
KernelVersion: 6.3
578+
Contact: Vadim Pasternak <vadimp@nvidia.com>
579+
Description: These files aim to perform External Root of Trust (EROT) recovery
580+
sequence after EROT device failure.
581+
These EROT devices protect ASICs from unauthorized access and in normal
582+
flow their reset should be released with system power – earliest power
583+
up stage, so that EROTs can begin boot and authentication process before
584+
CPU starts to communicate to ASICs.
585+
Issuing a reset to the EROT while asserting the recovery signal will cause
586+
the EROT Application Processor to enter recovery mode so that the EROT FW
587+
can be updated/recovered.
588+
For reset/recovery the related file should be toggled by 1/0.
589+
590+
The files are read/write.
591+
592+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot1_wp
593+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot2_wp
594+
Date: February 2023
595+
KernelVersion: 6.3
596+
Contact: Vadim Pasternak <vadimp@nvidia.com>
597+
Description: These files allow access to External Root of Trust (EROT) for reset
598+
and recovery sequence after EROT device failure.
599+
Default is 0 (programming disabled).
600+
If the system is in locked-down mode writing this file will not be allowed.
601+
602+
The files are read/write.
603+
604+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/spi_chnl_select
605+
Date: February 2023
606+
KernelVersion: 6.3
607+
Contact: Vadim Pasternak <vadimp@nvidia.com>
608+
Description: This file allows SPI chip selection for External Root of Trust (EROT)
609+
device Out-of-Band recovery.
610+
File can be written with 0 or with 1. It selects which EROT can be accessed
611+
through SPI device.
612+
613+
The file is read/write.
614+
615+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/asic_pg_fail
616+
Date: February 2023
617+
KernelVersion: 6.3
618+
Contact: Vadim Pasternak vadimp@nvidia.com
619+
Description: This file shows ASIC Power Good status.
620+
Value 1 in file means ASIC Power Good failed, 0 - otherwise.
621+
622+
The file is read only.
623+
624+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/clk_brd1_boot_fail
625+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/clk_brd2_boot_fail
626+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/clk_brd_fail
627+
Date: February 2023
628+
KernelVersion: 6.3
629+
Contact: Vadim Pasternak vadimp@nvidia.com
630+
Description: These files are related to clock boards status in system.
631+
- clk_brd1_boot_fail: warning about 1-st clock board failed to boot from CI.
632+
- clk_brd2_boot_fail: warning about 2-nd clock board failed to boot from CI.
633+
- clk_brd_fail: error about common clock board boot failure.
634+
635+
The files are read only.
636+
637+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/clk_brd_prog_en
638+
Date: February 2023
639+
KernelVersion: 6.3
640+
Contact: Vadim Pasternak <vadimp@nvidia.com>
641+
Description: This file enables programming of clock boards.
642+
Default is 0 (programming disabled).
643+
If the system is in locked-down mode writing this file will not be allowed.
644+
645+
The file is read/write.
646+
647+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/pwr_converter_prog_en
648+
Date: February 2023
649+
KernelVersion: 6.3
650+
Contact: Vadim Pasternak <vadimp@nvidia.com>
651+
Description: This file enables programming of power converters.
652+
Default is 0 (programming disabled).
653+
If the system is in locked-down mode writing this file will not be allowed.
654+
655+
The file is read/write.
656+
657+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_ac_ok_fail
658+
Date: February 2023
659+
KernelVersion: 6.3
660+
Contact: Vadim Pasternak <vadimp@nvidia.com>
661+
Description: This file shows the system reset cause due to AC power failure.
662+
Value 1 in file means this is reset cause, 0 - otherwise.
663+
664+
The file is read only.

Documentation/ABI/stable/sysfs-hypervisor-xen

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,3 +120,16 @@ Contact: xen-devel@lists.xenproject.org
120120
Description: If running under Xen:
121121
The Xen version is in the format <major>.<minor><extra>
122122
This is the <minor> part of it.
123+
124+
What: /sys/hypervisor/start_flags/*
125+
Date: March 2023
126+
KernelVersion: 6.3.0
127+
Contact: xen-devel@lists.xenproject.org
128+
Description: If running under Xen:
129+
All bits in Xen's start-flags are represented as
130+
boolean files, returning '1' if set, '0' otherwise.
131+
This takes the place of the defunct /proc/xen/capabilities,
132+
which would contain "control_d" on dom0, and be empty
133+
otherwise. This flag is now exposed as "initdomain" in
134+
addition to the "privileged" flag; all other possible flags
135+
are accessible as "unknownXX".
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
What: /sys/kernel/debug/pktcdvd/pktcdvd[0-7]
2+
Date: Oct. 2006
3+
KernelVersion: 2.6.20
4+
Contact: Thomas Maier <balagi@justmail.de>
5+
Description:
6+
7+
The pktcdvd module (packet writing driver) creates
8+
these files in debugfs:
9+
10+
/sys/kernel/debug/pktcdvd/pktcdvd[0-7]/
11+
12+
==== ====== ====================================
13+
info 0444 Lots of driver statistics and infos.
14+
==== ====== ====================================
15+
16+
Example::
17+
18+
cat /sys/kernel/debug/pktcdvd/pktcdvd0/info

Documentation/ABI/testing/sysfs-bus-css

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
What: /sys/bus/css/devices/.../type
22
Date: March 2008
3-
Contact: Cornelia Huck <cornelia.huck@de.ibm.com>
4-
linux-s390@vger.kernel.org
3+
Contact: linux-s390@vger.kernel.org
54
Description: Contains the subchannel type, as reported by the hardware.
65
This attribute is present for all subchannel types.
76

87
What: /sys/bus/css/devices/.../modalias
98
Date: March 2008
10-
Contact: Cornelia Huck <cornelia.huck@de.ibm.com>
11-
linux-s390@vger.kernel.org
9+
Contact: linux-s390@vger.kernel.org
1210
Description: Contains the module alias as reported with uevents.
1311
It is of the format css:t<type> and present for all
1412
subchannel types.
1513

1614
What: /sys/bus/css/drivers/io_subchannel/.../chpids
1715
Date: December 2002
18-
Contact: Cornelia Huck <cornelia.huck@de.ibm.com>
19-
linux-s390@vger.kernel.org
16+
Contact: linux-s390@vger.kernel.org
2017
Description: Contains the ids of the channel paths used by this
2118
subchannel, as reported by the channel subsystem
2219
during subchannel recognition.
@@ -26,8 +23,7 @@ Users: s390-tools, HAL
2623

2724
What: /sys/bus/css/drivers/io_subchannel/.../pimpampom
2825
Date: December 2002
29-
Contact: Cornelia Huck <cornelia.huck@de.ibm.com>
30-
linux-s390@vger.kernel.org
26+
Contact: linux-s390@vger.kernel.org
3127
Description: Contains the PIM/PAM/POM values, as reported by the
3228
channel subsystem when last queried by the common I/O
3329
layer (this implies that this attribute is not necessarily
@@ -38,8 +34,7 @@ Users: s390-tools, HAL
3834

3935
What: /sys/bus/css/devices/.../driver_override
4036
Date: June 2019
41-
Contact: Cornelia Huck <cohuck@redhat.com>
42-
linux-s390@vger.kernel.org
37+
Contact: linux-s390@vger.kernel.org
4338
Description: This file allows the driver for a device to be specified. When
4439
specified, only a driver with a name matching the value written
4540
to driver_override will have an opportunity to bind to the
Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
sysfs interface
2+
---------------
3+
The pktcdvd module (packet writing driver) creates the following files in the
4+
sysfs: (<devid> is in the format major:minor)
5+
6+
What: /sys/class/pktcdvd/add
7+
What: /sys/class/pktcdvd/remove
8+
What: /sys/class/pktcdvd/device_map
9+
Date: Oct. 2006
10+
KernelVersion: 2.6.20
11+
Contact: Thomas Maier <balagi@justmail.de>
12+
Description:
13+
14+
========== ==============================================
15+
add (WO) Write a block device id (major:minor) to
16+
create a new pktcdvd device and map it to the
17+
block device.
18+
19+
remove (WO) Write the pktcdvd device id (major:minor)
20+
to remove the pktcdvd device.
21+
22+
device_map (RO) Shows the device mapping in format:
23+
pktcdvd[0-7] <pktdevid> <blkdevid>
24+
========== ==============================================
25+
26+
27+
What: /sys/class/pktcdvd/pktcdvd[0-7]/dev
28+
What: /sys/class/pktcdvd/pktcdvd[0-7]/uevent
29+
Date: Oct. 2006
30+
KernelVersion: 2.6.20
31+
Contact: Thomas Maier <balagi@justmail.de>
32+
Description:
33+
dev: (RO) Device id
34+
35+
uevent: (WO) To send a uevent
36+
37+
38+
What: /sys/class/pktcdvd/pktcdvd[0-7]/stat/packets_started
39+
What: /sys/class/pktcdvd/pktcdvd[0-7]/stat/packets_finished
40+
What: /sys/class/pktcdvd/pktcdvd[0-7]/stat/kb_written
41+
What: /sys/class/pktcdvd/pktcdvd[0-7]/stat/kb_read
42+
What: /sys/class/pktcdvd/pktcdvd[0-7]/stat/kb_read_gather
43+
What: /sys/class/pktcdvd/pktcdvd[0-7]/stat/reset
44+
Date: Oct. 2006
45+
KernelVersion: 2.6.20
46+
Contact: Thomas Maier <balagi@justmail.de>
47+
Description:
48+
packets_started: (RO) Number of started packets.
49+
50+
packets_finished: (RO) Number of finished packets.
51+
52+
kb_written: (RO) kBytes written.
53+
54+
kb_read: (RO) kBytes read.
55+
56+
kb_read_gather: (RO) kBytes read to fill write packets.
57+
58+
reset: (WO) Write any value to it to reset
59+
pktcdvd device statistic values, like
60+
bytes read/written.
61+
62+
63+
What: /sys/class/pktcdvd/pktcdvd[0-7]/write_queue/size
64+
What: /sys/class/pktcdvd/pktcdvd[0-7]/write_queue/congestion_off
65+
What: /sys/class/pktcdvd/pktcdvd[0-7]/write_queue/congestion_on
66+
Date: Oct. 2006
67+
KernelVersion: 2.6.20
68+
Contact: Thomas Maier <balagi@justmail.de>
69+
Description:
70+
============== ================================================
71+
size (RO) Contains the size of the bio write queue.
72+
73+
congestion_off (RW) If bio write queue size is below this mark,
74+
accept new bio requests from the block layer.
75+
76+
congestion_on (RW) If bio write queue size is higher as this
77+
mark, do no longer accept bio write requests
78+
from the block layer and wait till the pktcdvd
79+
device has processed enough bio's so that bio
80+
write queue size is below congestion off mark.
81+
A value of <= 0 disables congestion control.
82+
============== ================================================
83+
84+
85+
Example:
86+
--------
87+
To use the pktcdvd sysfs interface directly, you can do::
88+
89+
# create a new pktcdvd device mapped to /dev/hdc
90+
echo "22:0" >/sys/class/pktcdvd/add
91+
cat /sys/class/pktcdvd/device_map
92+
# assuming device pktcdvd0 was created, look at stat's
93+
cat /sys/class/pktcdvd/pktcdvd0/stat/kb_written
94+
# print the device id of the mapped block device
95+
fgrep pktcdvd0 /sys/class/pktcdvd/device_map
96+
# remove device, using pktcdvd0 device id 253:0
97+
echo "253:0" >/sys/class/pktcdvd/remove

0 commit comments

Comments
 (0)