Skip to content

Commit 10c18c4

Browse files
author
Ingo Molnar
committed
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents 9e49e24 + 1b5f3ba commit 10c18c4

File tree

321 files changed

+3301
-2492
lines changed

Some content is hidden

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

321 files changed

+3301
-2492
lines changed

‎Documentation/ABI/testing/sysfs-ata

Lines changed: 100 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,139 @@
11
What: /sys/class/ata_...
2-
Date: August 2008
3-
Contact: Gwendal Grignou<gwendal@google.com>
42
Description:
5-
6-
Provide a place in sysfs for storing the ATA topology of the system. This allows
7-
retrieving various information about ATA objects.
3+
Provide a place in sysfs for storing the ATA topology of the
4+
system. This allows retrieving various information about ATA
5+
objects.
86

97
Files under /sys/class/ata_port
108
-------------------------------
119

12-
For each port, a directory ataX is created where X is the ata_port_id of
13-
the port. The device parent is the ata host device.
10+
For each port, a directory ataX is created where X is the ata_port_id of the
11+
port. The device parent is the ata host device.
1412

15-
idle_irq (read)
1613

17-
Number of IRQ received by the port while idle [some ata HBA only].
14+
What: /sys/class/ata_port/ataX/nr_pmp_links
15+
What: /sys/class/ata_port/ataX/idle_irq
16+
Date: May, 2010
17+
KernelVersion: v2.6.37
18+
Contact: Gwendal Grignou <gwendal@chromium.org>
19+
Description:
20+
nr_pmp_links: (RO) If a SATA Port Multiplier (PM) is
21+
connected, the number of links behind it.
1822

19-
nr_pmp_links (read)
23+
idle_irq: (RO) Number of IRQ received by the port while
24+
idle [some ata HBA only].
2025

21-
If a SATA Port Multiplier (PM) is connected, number of link behind it.
26+
27+
What: /sys/class/ata_port/ataX/port_no
28+
Date: May, 2013
29+
KernelVersion: v3.11
30+
Contact: Gwendal Grignou <gwendal@chromium.org>
31+
Description:
32+
(RO) Host local port number. While registering host controller,
33+
port numbers are tracked based upon number of ports available on
34+
the controller. This attribute is needed by udev for composing
35+
persistent links in /dev/disk/by-path.
2236

2337
Files under /sys/class/ata_link
2438
-------------------------------
2539

26-
Behind each port, there is a ata_link. If there is a SATA PM in the
27-
topology, 15 ata_link objects are created.
28-
29-
If a link is behind a port, the directory name is linkX, where X is
30-
ata_port_id of the port.
31-
If a link is behind a PM, its name is linkX.Y where X is ata_port_id
32-
of the parent port and Y the PM port.
40+
Behind each port, there is a ata_link. If there is a SATA PM in the topology, 15
41+
ata_link objects are created.
3342

34-
hw_sata_spd_limit
43+
If a link is behind a port, the directory name is linkX, where X is ata_port_id
44+
of the port. If a link is behind a PM, its name is linkX.Y where X is
45+
ata_port_id of the parent port and Y the PM port.
3546

36-
Maximum speed supported by the connected SATA device.
3747

38-
sata_spd_limit
48+
What: /sys/class/ata_link/linkX[.Y]/hw_sata_spd_limit
49+
What: /sys/class/ata_link/linkX[.Y]/sata_spd_limit
50+
What: /sys/class/ata_link/linkX[.Y]/sata_spd
51+
Date: May, 2010
52+
KernelVersion: v2.6.37
53+
Contact: Gwendal Grignou <gwendal@chromium.org>
54+
Description:
55+
hw_sata_spd_limit: (RO) Maximum speed supported by the
56+
connected SATA device.
3957

40-
Maximum speed imposed by libata.
58+
sata_spd_limit: (RO) Maximum speed imposed by libata.
4159

42-
sata_spd
60+
sata_spd: (RO) Current speed of the link
61+
eg. 1.5, 3 Gbps etc.
4362

44-
Current speed of the link [1.5, 3Gps,...].
4563

4664
Files under /sys/class/ata_device
4765
---------------------------------
4866

49-
Behind each link, up to two ata device are created.
50-
The name of the directory is devX[.Y].Z where:
51-
- X is ata_port_id of the port where the device is connected,
52-
- Y the port of the PM if any, and
53-
- Z the device id: for PATA, there is usually 2 devices [0,1],
54-
only 1 for SATA.
55-
56-
class
57-
Device class. Can be "ata" for disk, "atapi" for packet device,
58-
"pmp" for PM, or "none" if no device was found behind the link.
59-
60-
dma_mode
67+
Behind each link, up to two ata devices are created.
68+
The name of the directory is devX[.Y].Z where:
69+
- X is ata_port_id of the port where the device is connected,
70+
- Y the port of the PM if any, and
71+
- Z the device id: for PATA, there is usually 2 devices [0,1], only 1 for SATA.
72+
73+
74+
What: /sys/class/ata_device/devX[.Y].Z/spdn_cnt
75+
What: /sys/class/ata_device/devX[.Y].Z/gscr
76+
What: /sys/class/ata_device/devX[.Y].Z/ering
77+
What: /sys/class/ata_device/devX[.Y].Z/id
78+
What: /sys/class/ata_device/devX[.Y].Z/pio_mode
79+
What: /sys/class/ata_device/devX[.Y].Z/xfer_mode
80+
What: /sys/class/ata_device/devX[.Y].Z/dma_mode
81+
What: /sys/class/ata_device/devX[.Y].Z/class
82+
Date: May, 2010
83+
KernelVersion: v2.6.37
84+
Contact: Gwendal Grignou <gwendal@chromium.org>
85+
Description:
86+
spdn_cnt: (RO) Number of times libata decided to lower the
87+
speed of link due to errors.
6188

62-
Transfer modes supported by the device when in DMA mode.
63-
Mostly used by PATA device.
89+
gscr: (RO) Cached result of the dump of PM GSCR
90+
register. Valid registers are:
6491

65-
pio_mode
92+
0: SATA_PMP_GSCR_PROD_ID,
93+
1: SATA_PMP_GSCR_REV,
94+
2: SATA_PMP_GSCR_PORT_INFO,
95+
32: SATA_PMP_GSCR_ERROR,
96+
33: SATA_PMP_GSCR_ERROR_EN,
97+
64: SATA_PMP_GSCR_FEAT,
98+
96: SATA_PMP_GSCR_FEAT_EN,
99+
130: SATA_PMP_GSCR_SII_GPIO
66100

67-
Transfer modes supported by the device when in PIO mode.
68-
Mostly used by PATA device.
101+
Only valid if the device is a PM.
69102

70-
xfer_mode
103+
ering: (RO) Formatted output of the error ring of the
104+
device.
71105

72-
Current transfer mode.
106+
id: (RO) Cached result of IDENTIFY command, as
107+
described in ATA8 7.16 and 7.17. Only valid if
108+
the device is not a PM.
73109

74-
id
110+
pio_mode: (RO) Transfer modes supported by the device when
111+
in PIO mode. Mostly used by PATA device.
75112

76-
Cached result of IDENTIFY command, as described in ATA8 7.16 and 7.17.
77-
Only valid if the device is not a PM.
113+
xfer_mode: (RO) Current transfer mode
78114

79-
gscr
115+
dma_mode: (RO) Transfer modes supported by the device when
116+
in DMA mode. Mostly used by PATA device.
80117

81-
Cached result of the dump of PM GSCR register.
82-
Valid registers are:
83-
0: SATA_PMP_GSCR_PROD_ID,
84-
1: SATA_PMP_GSCR_REV,
85-
2: SATA_PMP_GSCR_PORT_INFO,
86-
32: SATA_PMP_GSCR_ERROR,
87-
33: SATA_PMP_GSCR_ERROR_EN,
88-
64: SATA_PMP_GSCR_FEAT,
89-
96: SATA_PMP_GSCR_FEAT_EN,
90-
130: SATA_PMP_GSCR_SII_GPIO
91-
Only valid if the device is a PM.
118+
class: (RO) Device class. Can be "ata" for disk,
119+
"atapi" for packet device, "pmp" for PM, or
120+
"none" if no device was found behind the link.
92121

93-
trim
94122

95-
Shows the DSM TRIM mode currently used by the device. Valid
96-
values are:
97-
unsupported: Drive does not support DSM TRIM
98-
unqueued: Drive supports unqueued DSM TRIM only
99-
queued: Drive supports queued DSM TRIM
100-
forced_unqueued: Drive's queued DSM support is known to be
101-
buggy and only unqueued TRIM commands
102-
are sent
123+
What: /sys/class/ata_device/devX[.Y].Z/trim
124+
Date: May, 2015
125+
KernelVersion: v4.10
126+
Contact: Gwendal Grignou <gwendal@chromium.org>
127+
Description:
128+
(RO) Shows the DSM TRIM mode currently used by the device. Valid
129+
values are:
103130

104-
spdn_cnt
131+
unsupported: Drive does not support DSM TRIM
105132

106-
Number of time libata decided to lower the speed of link due to errors.
133+
unqueued: Drive supports unqueued DSM TRIM only
107134

108-
ering
135+
queued: Drive supports queued DSM TRIM
109136

110-
Formatted output of the error ring of the device.
137+
forced_unqueued: Drive's queued DSM support is known to
138+
be buggy and only unqueued TRIM commands
139+
are sent

‎Documentation/ABI/testing/sysfs-block-device

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
What: /sys/block/*/device/sw_activity
2+
Date: Jun, 2008
3+
KernelVersion: v2.6.27
4+
Contact: linux-ide@vger.kernel.org
5+
Description:
6+
(RW) Used by drivers which support software controlled activity
7+
LEDs.
8+
9+
It has the following valid values:
10+
11+
0 OFF - the LED is not activated on activity
12+
1 BLINK_ON - the LED blinks on every 10ms when activity is
13+
detected.
14+
2 BLINK_OFF - the LED is on when idle, and blinks off
15+
every 10ms when activity is detected.
16+
17+
Note that the user must turn sw_activity OFF it they wish to
18+
control the activity LED via the em_message file.
19+
20+
21+
What: /sys/block/*/device/unload_heads
22+
Date: Sep, 2008
23+
KernelVersion: v2.6.28
24+
Contact: linux-ide@vger.kernel.org
25+
Description:
26+
(RW) Hard disk shock protection
27+
28+
Writing an integer value to this file will take the heads of the
29+
respective drive off the platter and block all I/O operations
30+
for the specified number of milliseconds.
31+
32+
- If the device does not support the unload heads feature,
33+
access is denied with -EOPNOTSUPP.
34+
- The maximal value accepted for a timeout is 30000
35+
milliseconds.
36+
- A previously set timeout can be cancelled and disk can resume
37+
normal operation immediately by specifying a timeout of 0.
38+
- Some hard drives only comply with an earlier version of the
39+
ATA standard, but support the unload feature nonetheless.
40+
There is no safe way Linux can detect these devices, so this
41+
is not enabled by default. If it is known that your device
42+
does support the unload feature, then you can tell the kernel
43+
to enable it by writing -1. It can be disabled again by
44+
writing -2.
45+
- Values below -2 are rejected with -EINVAL
46+
47+
For more information, see
48+
Documentation/laptops/disk-shock-protection.txt
49+
50+
51+
What: /sys/block/*/device/ncq_prio_enable
52+
Date: Oct, 2016
53+
KernelVersion: v4.10
54+
Contact: linux-ide@vger.kernel.org
55+
Description:
56+
(RW) Write to the file to turn on or off the SATA ncq (native
57+
command queueing) support. By default this feature is turned
58+
off.

‎Documentation/ABI/testing/sysfs-class-scsi_host

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,92 @@ Description: This file contains the current status of the "SSD Smart Path"
2727
the direct i/o path to physical devices. This setting is
2828
controller wide, affecting all configured logical drives on the
2929
controller. This file is readable and writable.
30+
31+
What: /sys/class/scsi_host/hostX/link_power_management_policy
32+
Date: Oct, 2007
33+
KernelVersion: v2.6.24
34+
Contact: linux-ide@vger.kernel.org
35+
Description:
36+
(RW) This parameter allows the user to read and set the link
37+
(interface) power management.
38+
39+
There are four possible options:
40+
41+
min_power: Tell the controller to try to make the link use the
42+
least possible power when possible. This may sacrifice some
43+
performance due to increased latency when coming out of lower
44+
power states.
45+
46+
max_performance: Generally, this means no power management.
47+
Tell the controller to have performance be a priority over power
48+
management.
49+
50+
medium_power: Tell the controller to enter a lower power state
51+
when possible, but do not enter the lowest power state, thus
52+
improving latency over min_power setting.
53+
54+
med_power_with_dipm: Identical to the existing medium_power
55+
setting except that it enables dipm (device initiated power
56+
management) on top, which makes it match the Windows IRST (Intel
57+
Rapid Storage Technology) driver settings. This setting is also
58+
close to min_power, except that:
59+
a) It does not use host-initiated slumber mode, but it does
60+
allow device-initiated slumber
61+
b) It does not enable low power device sleep mode (DevSlp).
62+
63+
What: /sys/class/scsi_host/hostX/em_message
64+
What: /sys/class/scsi_host/hostX/em_message_type
65+
Date: Jun, 2008
66+
KernelVersion: v2.6.27
67+
Contact: linux-ide@vger.kernel.org
68+
Description:
69+
em_message: (RW) Enclosure management support. For the LED
70+
protocol, writes and reads correspond to the LED message format
71+
as defined in the AHCI spec.
72+
73+
The user must turn sw_activity (under /sys/block/*/device/) OFF
74+
it they wish to control the activity LED via the em_message
75+
file.
76+
77+
em_message_type: (RO) Displays the current enclosure management
78+
protocol that is being used by the driver (for eg. LED, SAF-TE,
79+
SES-2, SGPIO etc).
80+
81+
What: /sys/class/scsi_host/hostX/ahci_port_cmd
82+
What: /sys/class/scsi_host/hostX/ahci_host_caps
83+
What: /sys/class/scsi_host/hostX/ahci_host_cap2
84+
Date: Mar, 2010
85+
KernelVersion: v2.6.35
86+
Contact: linux-ide@vger.kernel.org
87+
Description:
88+
[to be documented]
89+
90+
What: /sys/class/scsi_host/hostX/ahci_host_version
91+
Date: Mar, 2010
92+
KernelVersion: v2.6.35
93+
Contact: linux-ide@vger.kernel.org
94+
Description:
95+
(RO) Display the version of the AHCI spec implemented by the
96+
host.
97+
98+
What: /sys/class/scsi_host/hostX/em_buffer
99+
Date: Apr, 2010
100+
KernelVersion: v2.6.35
101+
Contact: linux-ide@vger.kernel.org
102+
Description:
103+
(RW) Allows access to AHCI EM (enclosure management) buffer
104+
directly if the host supports EM.
105+
106+
For eg. the AHCI driver supports SGPIO EM messages but the
107+
SATA/AHCI specs do not define the SGPIO message format of the EM
108+
buffer. Different hardware(HW) vendors may have different
109+
definitions. With the em_buffer attribute, this issue can be
110+
solved by allowing HW vendors to provide userland drivers and
111+
tools for their SGPIO initiators.
112+
113+
What: /sys/class/scsi_host/hostX/em_message_supported
114+
Date: Oct, 2009
115+
KernelVersion: v2.6.39
116+
Contact: linux-ide@vger.kernel.org
117+
Description:
118+
(RO) Displays supported enclosure management message types.

‎Documentation/accelerators/ocxl.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,11 @@ OCXL_IOCTL_IRQ_SET_FD:
152152
Associate an event fd to an AFU interrupt so that the user process
153153
can be notified when the AFU sends an interrupt.
154154

155+
OCXL_IOCTL_GET_METADATA:
156+
157+
Obtains configuration information from the card, such at the size of
158+
MMIO areas, the AFU version, and the PASID for the current context.
159+
155160

156161
mmap
157162
----

‎Documentation/devicetree/bindings/dma/mv-xor-v2.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ Required properties:
1111
interrupts.
1212

1313
Optional properties:
14-
- clocks: Optional reference to the clock used by the XOR engine.
14+
- clocks: Optional reference to the clocks used by the XOR engine.
15+
- clock-names: mandatory if there is a second clock, in this case the
16+
name must be "core" for the first clock and "reg" for the second
17+
one
18+
1519

1620
Example:
1721

‎Documentation/devicetree/bindings/usb/dwc2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Required properties:
1919
configured in FS mode;
2020
- "st,stm32f4x9-hsotg": The DWC2 USB HS controller instance in STM32F4x9 SoCs
2121
configured in HS mode;
22-
- "st,stm32f7xx-hsotg": The DWC2 USB HS controller instance in STM32F7xx SoCs
22+
- "st,stm32f7-hsotg": The DWC2 USB HS controller instance in STM32F7 SoCs
2323
configured in HS mode;
2424
- reg : Should contain 1 register range (address and length)
2525
- interrupts : Should contain 1 interrupt

0 commit comments

Comments
 (0)