Skip to content

Commit 5bee9c7

Browse files
authored
Merge pull request #2 from gregkh/master
update
2 parents 4b93c54 + bdb575f commit 5bee9c7

File tree

1,491 files changed

+45341
-17284
lines changed

Some content is hidden

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

1,491 files changed

+45341
-17284
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ Date: Aug 28, 2020
128128
KernelVersion: 5.10.0
129129
130130
Description: The last executed device administrative command's status/error.
131+
Also last configuration error overloaded.
132+
Writing to it will clear the status.
131133

132134
What: /sys/bus/dsa/devices/wq<m>.<n>/block_on_fault
133135
Date: Oct 27, 2020
@@ -211,6 +213,13 @@ Contact: [email protected]
211213
Description: Indicate whether ATS disable is turned on for the workqueue.
212214
0 indicates ATS is on, and 1 indicates ATS is off for the workqueue.
213215

216+
What: /sys/bus/dsa/devices/wq<m>.<n>/occupancy
217+
Date May 25, 2021
218+
KernelVersion: 5.14.0
219+
220+
Description: Show the current number of entries in this WQ if WQ Occupancy
221+
Support bit WQ capabilities is 1.
222+
214223
What: /sys/bus/dsa/devices/engine<m>.<n>/group_id
215224
Date: Oct 25, 2019
216225
KernelVersion: 5.6.0

Documentation/ABI/testing/debugfs-driver-habanalabs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,17 @@ Description: Sets the skip reset on timeout option for the device. Value of
215215
"0" means device will be reset in case some CS has timed out,
216216
otherwise it will not be reset.
217217

218+
What: /sys/kernel/debug/habanalabs/hl<n>/state_dump
219+
Date: Oct 2021
220+
KernelVersion: 5.15
221+
222+
Description: Gets the state dump occurring on a CS timeout or failure.
223+
State dump is used for debug and is created each time in case of
224+
a problem in a CS execution, before reset.
225+
Reading from the node returns the newest state dump available.
226+
Writing an integer X discards X state dumps, so that the
227+
next read would return X+1-st newest state dump.
228+
218229
What: /sys/kernel/debug/habanalabs/hl<n>/stop_on_err
219230
Date: Mar 2020
220231
KernelVersion: 5.6
@@ -230,6 +241,14 @@ Description: Displays a list with information about the currently user
230241
pointers (user virtual addresses) that are pinned and mapped
231242
to DMA addresses
232243

244+
What: /sys/kernel/debug/habanalabs/hl<n>/userptr_lookup
245+
Date: Aug 2021
246+
KernelVersion: 5.15
247+
248+
Description: Allows to search for specific user pointers (user virtual
249+
addresses) that are pinned and mapped to DMA addresses, and see
250+
their resolution to the specific dma address.
251+
233252
What: /sys/kernel/debug/habanalabs/hl<n>/vm
234253
Date: Jan 2019
235254
KernelVersion: 5.1

Documentation/ABI/testing/sysfs-bus-pci

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,23 @@ Description:
121121
child buses, and re-discover devices removed earlier
122122
from this part of the device tree.
123123

124+
What: /sys/bus/pci/devices/.../reset_method
125+
Date: August 2021
126+
Contact: Amey Narkhede <[email protected]>
127+
Description:
128+
Some devices allow an individual function to be reset
129+
without affecting other functions in the same slot.
130+
131+
For devices that have this support, a file named
132+
reset_method is present in sysfs. Reading this file
133+
gives names of the supported and enabled reset methods and
134+
their ordering. Writing a space-separated list of names of
135+
reset methods sets the reset methods and ordering to be
136+
used when resetting the device. Writing an empty string
137+
disables the ability to reset the device. Writing
138+
"default" enables all supported reset methods in the
139+
default ordering.
140+
124141
What: /sys/bus/pci/devices/.../reset
125142
Date: July 2009
126143
Contact: Michael S. Tsirkin <[email protected]>

Documentation/PCI/endpoint/pci-endpoint-cfs.rst

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ entries corresponding to EPF driver will be created by the EPF core.
4343
.. <EPF Driver1>/
4444
... <EPF Device 11>/
4545
... <EPF Device 21>/
46+
... <EPF Device 31>/
4647
.. <EPF Driver2>/
4748
... <EPF Device 12>/
4849
... <EPF Device 22>/
@@ -68,6 +69,7 @@ created)
6869
... subsys_vendor_id
6970
... subsys_id
7071
... interrupt_pin
72+
... <Symlink EPF Device 31>/
7173
... primary/
7274
... <Symlink EPC Device1>/
7375
... secondary/
@@ -79,6 +81,13 @@ interface should be added in 'primary' directory and symlink of endpoint
7981
controller connected to secondary interface should be added in 'secondary'
8082
directory.
8183

84+
The <EPF Device> directory can have a list of symbolic links
85+
(<Symlink EPF Device 31>) to other <EPF Device>. These symbolic links should
86+
be created by the user to represent the virtual functions that are bound to
87+
the physical function. In the above directory structure <EPF Device 11> is a
88+
physical function and <EPF Device 31> is a virtual function. An EPF device once
89+
it's linked to another EPF device, cannot be linked to a EPC device.
90+
8291
EPC Device
8392
==========
8493

@@ -98,7 +107,8 @@ entries corresponding to EPC device will be created by the EPC core.
98107

99108
The <EPC Device> directory will have a list of symbolic links to
100109
<EPF Device>. These symbolic links should be created by the user to
101-
represent the functions present in the endpoint device.
110+
represent the functions present in the endpoint device. Only <EPF Device>
111+
that represents a physical function can be linked to a EPC device.
102112

103113
The <EPC Device> directory will also have a *start* field. Once
104114
"1" is written to this field, the endpoint device will be ready to

Documentation/admin-guide/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ Configuring the kernel
259259
Compiling the kernel
260260
--------------------
261261

262-
- Make sure you have at least gcc 4.9 available.
262+
- Make sure you have at least gcc 5.1 available.
263263
For more information, refer to :ref:`Documentation/process/changes.rst <changes>`.
264264

265265
Please note that you can still run a.out user programs with this kernel.

Documentation/admin-guide/acpi/ssdt-overlays.rst

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,21 @@ following ASL code can be used::
3030
{
3131
Device (STAC)
3232
{
33-
Name (_ADR, Zero)
3433
Name (_HID, "BMA222E")
34+
Name (RBUF, ResourceTemplate ()
35+
{
36+
I2cSerialBus (0x0018, ControllerInitiated, 0x00061A80,
37+
AddressingMode7Bit, "\\_SB.I2C6", 0x00,
38+
ResourceConsumer, ,)
39+
GpioInt (Edge, ActiveHigh, Exclusive, PullDown, 0x0000,
40+
"\\_SB.GPO2", 0x00, ResourceConsumer, , )
41+
{ // Pin list
42+
0
43+
}
44+
})
3545

3646
Method (_CRS, 0, Serialized)
3747
{
38-
Name (RBUF, ResourceTemplate ()
39-
{
40-
I2cSerialBus (0x0018, ControllerInitiated, 0x00061A80,
41-
AddressingMode7Bit, "\\_SB.I2C6", 0x00,
42-
ResourceConsumer, ,)
43-
GpioInt (Edge, ActiveHigh, Exclusive, PullDown, 0x0000,
44-
"\\_SB.GPO2", 0x00, ResourceConsumer, , )
45-
{ // Pin list
46-
0
47-
}
48-
})
4948
Return (RBUF)
5049
}
5150
}
@@ -75,7 +74,7 @@ This option allows loading of user defined SSDTs from initrd and it is useful
7574
when the system does not support EFI or when there is not enough EFI storage.
7675

7776
It works in a similar way with initrd based ACPI tables override/upgrade: SSDT
78-
aml code must be placed in the first, uncompressed, initrd under the
77+
AML code must be placed in the first, uncompressed, initrd under the
7978
"kernel/firmware/acpi" path. Multiple files can be used and this will translate
8079
in loading multiple tables. Only SSDT and OEM tables are allowed. See
8180
initrd_table_override.txt for more details.
@@ -103,12 +102,14 @@ This is the preferred method, when EFI is supported on the platform, because it
103102
allows a persistent, OS independent way of storing the user defined SSDTs. There
104103
is also work underway to implement EFI support for loading user defined SSDTs
105104
and using this method will make it easier to convert to the EFI loading
106-
mechanism when that will arrive.
105+
mechanism when that will arrive. To enable it, the
106+
CONFIG_EFI_CUSTOM_SSDT_OVERLAYS shoyld be chosen to y.
107107

108-
In order to load SSDTs from an EFI variable the efivar_ssdt kernel command line
109-
parameter can be used. The argument for the option is the variable name to
110-
use. If there are multiple variables with the same name but with different
111-
vendor GUIDs, all of them will be loaded.
108+
In order to load SSDTs from an EFI variable the ``"efivar_ssdt=..."`` kernel
109+
command line parameter can be used (the name has a limitation of 16 characters).
110+
The argument for the option is the variable name to use. If there are multiple
111+
variables with the same name but with different vendor GUIDs, all of them will
112+
be loaded.
112113

113114
In order to store the AML code in an EFI variable the efivarfs filesystem can be
114115
used. It is enabled and mounted by default in /sys/firmware/efi/efivars in all
@@ -127,7 +128,7 @@ variable with the content from a given file::
127128

128129
#!/bin/sh -e
129130

130-
while ! [ -z "$1" ]; do
131+
while [ -n "$1" ]; do
131132
case "$1" in
132133
"-f") filename="$2"; shift;;
133134
"-g") guid="$2"; shift;;
@@ -167,14 +168,14 @@ variable with the content from a given file::
167168
Loading ACPI SSDTs from configfs
168169
================================
169170

170-
This option allows loading of user defined SSDTs from userspace via the configfs
171+
This option allows loading of user defined SSDTs from user space via the configfs
171172
interface. The CONFIG_ACPI_CONFIGFS option must be select and configfs must be
172173
mounted. In the following examples, we assume that configfs has been mounted in
173-
/config.
174+
/sys/kernel/config.
174175

175-
New tables can be loading by creating new directories in /config/acpi/table/ and
176-
writing the SSDT aml code in the aml attribute::
176+
New tables can be loading by creating new directories in /sys/kernel/config/acpi/table
177+
and writing the SSDT AML code in the aml attribute::
177178

178-
cd /config/acpi/table
179+
cd /sys/kernel/config/acpi/table
179180
mkdir my_ssdt
180181
cat ~/ssdt.aml > my_ssdt/aml

Documentation/admin-guide/bootconfig.rst

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ update the boot loader and the kernel image itself as long as the boot
178178
loader passes the correct initrd file size. If by any chance, the boot
179179
loader passes a longer size, the kernel fails to find the bootconfig data.
180180

181-
To do this operation, Linux kernel provides "bootconfig" command under
181+
To do this operation, Linux kernel provides ``bootconfig`` command under
182182
tools/bootconfig, which allows admin to apply or delete the config file
183183
to/from initrd image. You can build it by the following command::
184184

@@ -196,6 +196,43 @@ To remove the config from the image, you can use -d option as below::
196196
Then add "bootconfig" on the normal kernel command line to tell the
197197
kernel to look for the bootconfig at the end of the initrd file.
198198

199+
200+
Kernel parameters via Boot Config
201+
=================================
202+
203+
In addition to the kernel command line, the boot config can be used for
204+
passing the kernel parameters. All the key-value pairs under ``kernel``
205+
key will be passed to kernel cmdline directly. Moreover, the key-value
206+
pairs under ``init`` will be passed to init process via the cmdline.
207+
The parameters are concatinated with user-given kernel cmdline string
208+
as the following order, so that the command line parameter can override
209+
bootconfig parameters (this depends on how the subsystem handles parameters
210+
but in general, earlier parameter will be overwritten by later one.)::
211+
212+
[bootconfig params][cmdline params] -- [bootconfig init params][cmdline init params]
213+
214+
Here is an example of the bootconfig file for kernel/init parameters.::
215+
216+
kernel {
217+
root = 01234567-89ab-cdef-0123-456789abcd
218+
}
219+
init {
220+
splash
221+
}
222+
223+
This will be copied into the kernel cmdline string as the following::
224+
225+
root="01234567-89ab-cdef-0123-456789abcd" -- splash
226+
227+
If user gives some other command line like,::
228+
229+
ro bootconfig -- quiet
230+
231+
The final kernel cmdline will be the following::
232+
233+
root="01234567-89ab-cdef-0123-456789abcd" ro bootconfig -- splash quiet
234+
235+
199236
Config File Limitation
200237
======================
201238

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1758,6 +1758,11 @@
17581758
support for the idxd driver. By default it is set to
17591759
true (1).
17601760

1761+
idxd.tc_override= [HW]
1762+
Format: <bool>
1763+
Allow override of default traffic class configuration
1764+
for the device. By default it is set to false (0).
1765+
17611766
ieee754= [MIPS] Select IEEE Std 754 conformance mode
17621767
Format: { strict | legacy | 2008 | relaxed }
17631768
Default: strict
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
3+
========================
4+
Monitoring Data Accesses
5+
========================
6+
7+
:doc:`DAMON </vm/damon/index>` allows light-weight data access monitoring.
8+
Using DAMON, users can analyze the memory access patterns of their systems and
9+
optimize those.
10+
11+
.. toctree::
12+
:maxdepth: 2
13+
14+
start
15+
usage

0 commit comments

Comments
 (0)