Skip to content

Commit 05bd6e0

Browse files
committed
Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next
2 parents b895e66 + b4b11b5 commit 05bd6e0

File tree

12,927 files changed

+638899
-228269
lines changed

Some content is hidden

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

12,927 files changed

+638899
-228269
lines changed

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
*.o
3838
*.o.*
3939
*.patch
40+
*.rmeta
41+
*.rsi
4042
*.s
4143
*.so
4244
*.so.dbg
@@ -97,6 +99,7 @@ modules.order
9799
!.gitattributes
98100
!.gitignore
99101
!.mailmap
102+
!.rustfmt.toml
100103

101104
#
102105
# Generated include files
@@ -162,3 +165,6 @@ x509.genkey
162165

163166
# Documentation toolchain
164167
sphinx_*/
168+
169+
# Rust analyzer configuration
170+
/rust-project.json

.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>
@@ -71,6 +72,9 @@ Ben M Cahill <ben.m.cahill@intel.com>
7172
Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>
7273
Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>
7374
Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>
75+
Bjorn Andersson <andersson@kernel.org> <bjorn@kryo.se>
76+
Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@linaro.org>
77+
Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@sonymobile.com>
7478
Björn Steinbrink <B.Steinbrink@gmx.de>
7579
Björn Töpel <bjorn@kernel.org> <bjorn.topel@gmail.com>
7680
Björn Töpel <bjorn@kernel.org> <bjorn.topel@intel.com>
@@ -101,6 +105,7 @@ Christoph Hellwig <hch@lst.de>
101105
Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>
102106
Corey Minyard <minyard@acm.org>
103107
Damian Hobson-Garcia <dhobsong@igel.co.jp>
108+
Dan Carpenter <error27@gmail.com> <dan.carpenter@oracle.com>
104109
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
105110
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@iogearbox.net>
106111
Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
@@ -134,6 +139,7 @@ Filipe Lautert <filipe@icewall.org>
134139
Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au>
135140
Franck Bui-Huu <vagabon.xyz@gmail.com>
136141
Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
142+
Frank Rowand <frowand.list@gmail.com> <frank.rowand@sony.com>
137143
Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
138144
Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>
139145
Frank Zago <fzago@systemfabricworks.com>
@@ -333,6 +339,7 @@ Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
333339
Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>
334340
Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>
335341
Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>
342+
Oliver Upton <oliver.upton@linux.dev> <oupton@google.com>
336343
Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>
337344
Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
338345
Patrick Mochel <mochel@digitalimplant.org>
@@ -348,7 +355,8 @@ Peter Oruba <peter@oruba.de>
348355
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
349356
Praveen BP <praveenbp@ti.com>
350357
Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>
351-
Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
358+
Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>
359+
Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>
352360
Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
353361
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
354362
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
@@ -375,6 +383,7 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org>
375383
Santosh Shilimkar <ssantosh@kernel.org>
376384
Sarangdhar Joshi <spjoshi@codeaurora.org>
377385
Sascha Hauer <s.hauer@pengutronix.de>
386+
Satya Priya <quic_c_skakit@quicinc.com> <skakit@codeaurora.org>
378387
S.Çağlar Onur <caglar@pardus.org.tr>
379388
Sean Christopherson <seanjc@google.com> <sean.j.christopherson@intel.com>
380389
Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
@@ -409,6 +418,7 @@ TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>
409418
TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
410419
Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
411420
Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
421+
Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>
412422
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
413423
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
414424
Uwe Kleine-König <ukleinek@strlen.de>

.rustfmt.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
edition = "2021"
2+
newline_style = "Unix"
3+
4+
# Unstable options that help catching some mistakes in formatting and that we may want to enable
5+
# when they become stable.
6+
#
7+
# They are kept here since they are useful to run from time to time.
8+
#format_code_in_doc_comments = true
9+
#reorder_impl_items = true
10+
#comment_width = 100
11+
#wrap_comments = true
12+
#normalize_comments = true

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/

Documentation/ABI/stable/sysfs-driver-dma-idxd

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,17 @@ Contact: dmaengine@vger.kernel.org
227227
Description: Indicate the number of retires for an enqcmds submission on a sharedwq.
228228
A max value to set attribute is capped at 64.
229229

230+
What: /sys/bus/dsa/devices/wq<m>.<n>/op_config
231+
Date: Sept 14, 2022
232+
KernelVersion: 6.0.0
233+
Contact: dmaengine@vger.kernel.org
234+
Description: Shows the operation capability bits displayed in bitmap format
235+
presented by %*pb printk() output format specifier.
236+
The attribute can be configured when the WQ is disabled in
237+
order to configure the WQ to accept specific bits that
238+
correlates to the operations allowed. It's visible only
239+
on platforms that support the capability.
240+
230241
What: /sys/bus/dsa/devices/engine<m>.<n>/group_id
231242
Date: Oct 25, 2019
232243
KernelVersion: 5.6.0
@@ -255,3 +266,27 @@ Contact: dmaengine@vger.kernel.org
255266
Description: Indicates the number of Read Buffers reserved for the use of
256267
engines in the group. See DSA spec v1.2 9.2.18 GRPCFG Read Buffers
257268
Reserved.
269+
270+
What: /sys/bus/dsa/devices/group<m>.<n>/desc_progress_limit
271+
Date: Sept 14, 2022
272+
KernelVersion: 6.0.0
273+
Contact: dmaengine@vger.kernel.org
274+
Description: Allows control of the number of work descriptors that can be
275+
concurrently processed by an engine in the group as a fraction
276+
of the Maximum Work Descriptors in Progress value specified in
277+
the ENGCAP register. The acceptable values are 0 (default),
278+
1 (1/2 of max value), 2 (1/4 of the max value), and 3 (1/8 of
279+
the max value). It's visible only on platforms that support
280+
the capability.
281+
282+
What: /sys/bus/dsa/devices/group<m>.<n>/batch_progress_limit
283+
Date: Sept 14, 2022
284+
KernelVersion: 6.0.0
285+
Contact: dmaengine@vger.kernel.org
286+
Description: Allows control of the number of batch descriptors that can be
287+
concurrently processed by an engine in the group as a fraction
288+
of the Maximum Batch Descriptors in Progress value specified in
289+
the ENGCAP register. The acceptable values are 0 (default),
290+
1 (1/2 of max value), 2 (1/4 of the max value), and 3 (1/8 of
291+
the max value). It's visible only on platforms that support
292+
the capability.

Documentation/ABI/testing/debugfs-cros-ec

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,25 @@ Description:
5454
this feature.
5555

5656
Output will be in the format: "0x%08x\n".
57+
58+
What: /sys/kernel/debug/<cros-ec-device>/suspend_timeout_ms
59+
Date: August 2022
60+
KernelVersion: 6.1
61+
Description:
62+
Some ECs have a feature where they will track transitions of
63+
a hardware-controlled sleep line, such as Intel's SLP_S0 line,
64+
in order to detect cases where a system failed to go into deep
65+
sleep states. The suspend_timeout_ms file controls the amount of
66+
time in milliseconds the EC will wait before declaring a sleep
67+
timeout event and attempting to wake the system.
68+
69+
Supply 0 to use the default value coded into EC firmware. Supply
70+
65535 (EC_HOST_SLEEP_TIMEOUT_INFINITE) to disable the EC sleep
71+
failure detection mechanism. Values in between 0 and 65535
72+
indicate the number of milliseconds the EC should wait after a
73+
sleep transition before declaring a timeout. This includes both
74+
the duration after a sleep command was received but before the
75+
hardware line changed, as well as the duration between when the
76+
hardware line changed and the kernel sent an EC resume command.
77+
78+
Output will be in the format: "%u\n".
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
What: /sys/bus/platform/drivers/amd_pmc/*/smu_fw_version
2+
Date: October 2022
3+
Contact: Mario Limonciello <mario.limonciello@amd.com>
4+
Description: Reading this file reports the version of the firmware loaded to
5+
System Management Unit (SMU) contained in AMD CPUs and
6+
APUs.
7+
8+
What: /sys/bus/platform/drivers/amd_pmc/*/smu_program
9+
Date: October 2022
10+
Contact: Mario Limonciello <mario.limonciello@amd.com>
11+
Description: Reading this file reports the program corresponding to the SMU
12+
firmware version. The program field is used to disambiguate two
13+
APU/CPU models that can share the same firmware binary.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
What: /sys/devices/platform/*/cnqf_enable
2+
Date: September 2022
3+
Contact: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
4+
Description: Reading this file tells if the AMD Platform Management(PMF)
5+
Cool n Quiet Framework(CnQF) feature is enabled or not.
6+
7+
This feature is not enabled by default and gets only turned on
8+
if OEM BIOS passes a "flag" to PMF ACPI function (index 11 or 12)
9+
or in case the user writes "on".
10+
11+
To turn off CnQF user can write "off" to the sysfs node.
12+
Note: Systems that support auto mode will not have this sysfs file
13+
available.

Documentation/ABI/testing/sysfs-bus-bcma

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Date: May 2011
33
KernelVersion: 3.0
44
Contact: Rafał Miłecki <zajec5@gmail.com>
55
Description:
6-
Each BCMA core has it's manufacturer id. See
6+
Each BCMA core has its manufacturer id. See
77
include/linux/bcma/bcma.h for possible values.
88

99
What: /sys/bus/bcma/devices/.../id

Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,3 +516,11 @@ Contact: Mathieu Poirier <mathieu.poirier@linaro.org>
516516
Description: (Read) Returns the number of special conditional P1 right-hand keys
517517
that the trace unit can use (0x194). The value is taken
518518
directly from the HW.
519+
520+
What: /sys/bus/coresight/devices/etm<N>/ts_source
521+
Date: October 2022
522+
KernelVersion: 6.1
523+
Contact: Mathieu Poirier <mathieu.poirier@linaro.org> or Suzuki K Poulose <suzuki.poulose@arm.com>
524+
Description: (Read) When FEAT_TRF is implemented, value of TRFCR_ELx.TS used for
525+
trace session. Otherwise -1 indicates an unknown time source. Check
526+
trcidr0.tssize to see if a global timestamp is available.

0 commit comments

Comments
 (0)