Skip to content

Commit 60c07f8

Browse files
committed
Merge branches 'acpica-fixes', 'acpi-video' and 'acpi-processor'
* acpica-fixes: ACPICA / Hardware: Fix old register check in acpi_hw_get_access_bit_width() * acpi-video: ACPI / Thermal / video: fix max_level incorrect value * acpi-processor: ACPI / processor: Avoid reserving IO regions too early
3 parents 7f9bef9 + 9f9cd7e + 8631475 commit 60c07f8

File tree

9,220 files changed

+481558
-188124
lines changed

Some content is hidden

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

9,220 files changed

+481558
-188124
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Module.symvers
6262
/tar-install/
6363

6464
#
65-
# git files that we don't want to ignore even it they are dot-files
65+
# git files that we don't want to ignore even if they are dot-files
6666
#
6767
!.gitignore
6868
!.mailmap

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ Jean Tourrilhes <[email protected]>
6969
Jeff Garzik <[email protected]>
7070
Jens Axboe <[email protected]>
7171
Jens Osterkamp <[email protected]>
72+
John Paul Adrian Glaubitz <[email protected]>
7273
John Stultz <[email protected]>
7374
7475

CREDITS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,7 @@ D: Z85230 driver
768768
D: Former security contact point (please use [email protected])
769769
D: ex 2.2 maintainer
770770
D: 2.1.x modular sound
771+
D: Assigned major/minor numbers maintainer at lanana.org
771772
S: c/o Red Hat UK Ltd
772773
S: Alexandra House
773774
S: Alexandra Terrace

Documentation/ABI/obsolete/sysfs-driver-hid-roccat-savu

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ Date: Mai 2012
33
Contact: Stefan Achatz <[email protected]>
44
Description: The mouse can store 5 profiles which can be switched by the
55
press of a button. A profile is split into general settings and
6-
button settings. buttons holds informations about button layout.
7-
When written, this file lets one write the respective profile
8-
buttons to the mouse. The data has to be 47 bytes long.
6+
button settings. The buttons variable holds information about
7+
button layout. When written, this file lets one write the
8+
respective profile buttons to the mouse. The data has to be
9+
47 bytes long.
910
The mouse will reject invalid data.
1011
Which profile to write is determined by the profile number
1112
contained in the data.
@@ -26,8 +27,8 @@ Date: Mai 2012
2627
Contact: Stefan Achatz <[email protected]>
2728
Description: The mouse can store 5 profiles which can be switched by the
2829
press of a button. A profile is split into general settings and
29-
button settings. profile holds informations like resolution, sensitivity
30-
and light effects.
30+
button settings. A profile holds information like resolution,
31+
sensitivity and light effects.
3132
When written, this file lets one write the respective profile
3233
settings back to the mouse. The data has to be 43 bytes long.
3334
The mouse will reject invalid data.

Documentation/ABI/stable/sysfs-class-ubi

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,15 @@ Contact: Artem Bityutskiy <[email protected]>
107107
Description:
108108
Number of physical eraseblocks reserved for bad block handling.
109109

110+
What: /sys/class/ubi/ubiX/ro_mode
111+
Date: April 2016
112+
KernelVersion: 4.7
113+
114+
Description:
115+
Contains ASCII "1\n" if the read-only flag is set on this
116+
device, and "0\n" if it is cleared. UBI devices mark themselves
117+
as read-only when they detect an unrecoverable error.
118+
110119
What: /sys/class/ubi/ubiX/total_eraseblocks
111120
Date: July 2006
112121
KernelVersion: 2.6.22

Documentation/ABI/testing/sysfs-block-zram

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,3 +166,12 @@ Description:
166166
The mm_stat file is read-only and represents device's mm
167167
statistics (orig_data_size, compr_data_size, etc.) in a format
168168
similar to block layer statistics file format.
169+
170+
What: /sys/block/zram<id>/debug_stat
171+
Date: July 2016
172+
Contact: Sergey Senozhatsky <[email protected]>
173+
Description:
174+
The debug_stat file is read-only and represents various
175+
device's debugging info useful for kernel developers. Its
176+
format is not documented intentionally and may change
177+
anytime without any notice.

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

Lines changed: 62 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@ Description: (RW) Add/remove a sink from a trace path. There can be multiple
66
source for a single sink.
77
ex: echo 1 > /sys/bus/coresight/devices/20010000.etb/enable_sink
88

9-
What: /sys/bus/coresight/devices/<memory_map>.etb/status
10-
Date: November 2014
11-
KernelVersion: 3.19
12-
Contact: Mathieu Poirier <[email protected]>
13-
Description: (R) List various control and status registers. The specific
14-
layout and content is driver specific.
15-
169
What: /sys/bus/coresight/devices/<memory_map>.etb/trigger_cntr
1710
Date: November 2014
1811
KernelVersion: 3.19
@@ -22,3 +15,65 @@ Description: (RW) Disables write access to the Trace RAM by stopping the
2215
following the trigger event. The number of 32-bit words written
2316
into the Trace RAM following the trigger event is equal to the
2417
value stored in this register+1 (from ARM ETB-TRM).
18+
19+
What: /sys/bus/coresight/devices/<memory_map>.etb/mgmt/rdp
20+
Date: March 2016
21+
KernelVersion: 4.7
22+
Contact: Mathieu Poirier <[email protected]>
23+
Description: (R) Defines the depth, in words, of the trace RAM in powers of
24+
2. The value is read directly from HW register RDP, 0x004.
25+
26+
What: /sys/bus/coresight/devices/<memory_map>.etb/mgmt/sts
27+
Date: March 2016
28+
KernelVersion: 4.7
29+
Contact: Mathieu Poirier <[email protected]>
30+
Description: (R) Shows the value held by the ETB status register. The value
31+
is read directly from HW register STS, 0x00C.
32+
33+
What: /sys/bus/coresight/devices/<memory_map>.etb/mgmt/rrp
34+
Date: March 2016
35+
KernelVersion: 4.7
36+
Contact: Mathieu Poirier <[email protected]>
37+
Description: (R) Shows the value held by the ETB RAM Read Pointer register
38+
that is used to read entries from the Trace RAM over the APB
39+
interface. The value is read directly from HW register RRP,
40+
0x014.
41+
42+
What: /sys/bus/coresight/devices/<memory_map>.etb/mgmt/rwp
43+
Date: March 2016
44+
KernelVersion: 4.7
45+
Contact: Mathieu Poirier <[email protected]>
46+
Description: (R) Shows the value held by the ETB RAM Write Pointer register
47+
that is used to sets the write pointer to write entries from
48+
the CoreSight bus into the Trace RAM. The value is read directly
49+
from HW register RWP, 0x018.
50+
51+
What: /sys/bus/coresight/devices/<memory_map>.etb/mgmt/trg
52+
Date: March 2016
53+
KernelVersion: 4.7
54+
Contact: Mathieu Poirier <[email protected]>
55+
Description: (R) Similar to "trigger_cntr" above except that this value is
56+
read directly from HW register TRG, 0x01C.
57+
58+
What: /sys/bus/coresight/devices/<memory_map>.etb/mgmt/ctl
59+
Date: March 2016
60+
KernelVersion: 4.7
61+
Contact: Mathieu Poirier <[email protected]>
62+
Description: (R) Shows the value held by the ETB Control register. The value
63+
is read directly from HW register CTL, 0x020.
64+
65+
What: /sys/bus/coresight/devices/<memory_map>.etb/mgmt/ffsr
66+
Date: March 2016
67+
KernelVersion: 4.7
68+
Contact: Mathieu Poirier <[email protected]>
69+
Description: (R) Shows the value held by the ETB Formatter and Flush Status
70+
register. The value is read directly from HW register FFSR,
71+
0x300.
72+
73+
What: /sys/bus/coresight/devices/<memory_map>.etb/mgmt/ffcr
74+
Date: March 2016
75+
KernelVersion: 4.7
76+
Contact: Mathieu Poirier <[email protected]>
77+
Description: (R) Shows the value held by the ETB Formatter and Flush Control
78+
register. The value is read directly from HW register FFCR,
79+
0x304.

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,19 @@ Contact: Mathieu Poirier <[email protected]>
359359
Description: (R) Print the content of the Peripheral ID3 Register
360360
(0xFEC). The value is taken directly from the HW.
361361

362+
What: /sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcconfig
363+
Date: February 2016
364+
KernelVersion: 4.07
365+
Contact: Mathieu Poirier <[email protected]>
366+
Description: (R) Print the content of the trace configuration register
367+
(0x010) as currently set by SW.
368+
369+
What: /sys/bus/coresight/devices/<memory_map>.etm/mgmt/trctraceid
370+
Date: February 2016
371+
KernelVersion: 4.07
372+
Contact: Mathieu Poirier <[email protected]>
373+
Description: (R) Print the content of the trace ID register (0x040).
374+
362375
What: /sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr0
363376
Date: April 2015
364377
KernelVersion: 4.01
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
What: /sys/bus/coresight/devices/<memory_map>.stm/enable_source
2+
Date: April 2016
3+
KernelVersion: 4.7
4+
Contact: Mathieu Poirier <[email protected]>
5+
Description: (RW) Enable/disable tracing on this specific trace macrocell.
6+
Enabling the trace macrocell implies it has been configured
7+
properly and a sink has been identified for it. The path
8+
of coresight components linking the source to the sink is
9+
configured and managed automatically by the coresight framework.
10+
11+
What: /sys/bus/coresight/devices/<memory_map>.stm/hwevent_enable
12+
Date: April 2016
13+
KernelVersion: 4.7
14+
Contact: Mathieu Poirier <[email protected]>
15+
Description: (RW) Provides access to the HW event enable register, used in
16+
conjunction with HW event bank select register.
17+
18+
What: /sys/bus/coresight/devices/<memory_map>.stm/hwevent_select
19+
Date: April 2016
20+
KernelVersion: 4.7
21+
Contact: Mathieu Poirier <[email protected]>
22+
Description: (RW) Gives access to the HW event block select register
23+
(STMHEBSR) in order to configure up to 256 channels. Used in
24+
conjunction with "hwevent_enable" register as described above.
25+
26+
What: /sys/bus/coresight/devices/<memory_map>.stm/port_enable
27+
Date: April 2016
28+
KernelVersion: 4.7
29+
Contact: Mathieu Poirier <[email protected]>
30+
Description: (RW) Provides access to the stimulus port enable register
31+
(STMSPER). Used in conjunction with "port_select" described
32+
below.
33+
34+
What: /sys/bus/coresight/devices/<memory_map>.stm/port_select
35+
Date: April 2016
36+
KernelVersion: 4.7
37+
Contact: Mathieu Poirier <[email protected]>
38+
Description: (RW) Used to determine which bank of stimulus port bit in
39+
register STMSPER (see above) apply to.
40+
41+
What: /sys/bus/coresight/devices/<memory_map>.stm/status
42+
Date: April 2016
43+
KernelVersion: 4.7
44+
Contact: Mathieu Poirier <[email protected]>
45+
Description: (R) List various control and status registers. The specific
46+
layout and content is driver specific.
47+
48+
What: /sys/bus/coresight/devices/<memory_map>.stm/traceid
49+
Date: April 2016
50+
KernelVersion: 4.7
51+
Contact: Mathieu Poirier <[email protected]>
52+
Description: (RW) Holds the trace ID that will appear in the trace stream
53+
coming from this trace entity.

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

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,80 @@ Description: (RW) Disables write access to the Trace RAM by stopping the
66
formatter after a defined number of words have been stored
77
following the trigger event. Additional interface for this
88
driver are expected to be added as it matures.
9+
10+
What: /sys/bus/coresight/devices/<memory_map>.tmc/mgmt/rsz
11+
Date: March 2016
12+
KernelVersion: 4.7
13+
Contact: Mathieu Poirier <[email protected]>
14+
Description: (R) Defines the size, in 32-bit words, of the local RAM buffer.
15+
The value is read directly from HW register RSZ, 0x004.
16+
17+
What: /sys/bus/coresight/devices/<memory_map>.tmc/mgmt/sts
18+
Date: March 2016
19+
KernelVersion: 4.7
20+
Contact: Mathieu Poirier <[email protected]>
21+
Description: (R) Shows the value held by the TMC status register. The value
22+
is read directly from HW register STS, 0x00C.
23+
24+
What: /sys/bus/coresight/devices/<memory_map>.tmc/mgmt/rrp
25+
Date: March 2016
26+
KernelVersion: 4.7
27+
Contact: Mathieu Poirier <[email protected]>
28+
Description: (R) Shows the value held by the TMC RAM Read Pointer register
29+
that is used to read entries from the Trace RAM over the APB
30+
interface. The value is read directly from HW register RRP,
31+
0x014.
32+
33+
What: /sys/bus/coresight/devices/<memory_map>.tmc/mgmt/rwp
34+
Date: March 2016
35+
KernelVersion: 4.7
36+
Contact: Mathieu Poirier <[email protected]>
37+
Description: (R) Shows the value held by the TMC RAM Write Pointer register
38+
that is used to sets the write pointer to write entries from
39+
the CoreSight bus into the Trace RAM. The value is read directly
40+
from HW register RWP, 0x018.
41+
42+
What: /sys/bus/coresight/devices/<memory_map>.tmc/mgmt/trg
43+
Date: March 2016
44+
KernelVersion: 4.7
45+
Contact: Mathieu Poirier <[email protected]>
46+
Description: (R) Similar to "trigger_cntr" above except that this value is
47+
read directly from HW register TRG, 0x01C.
48+
49+
What: /sys/bus/coresight/devices/<memory_map>.tmc/mgmt/ctl
50+
Date: March 2016
51+
KernelVersion: 4.7
52+
Contact: Mathieu Poirier <[email protected]>
53+
Description: (R) Shows the value held by the TMC Control register. The value
54+
is read directly from HW register CTL, 0x020.
55+
56+
What: /sys/bus/coresight/devices/<memory_map>.tmc/mgmt/ffsr
57+
Date: March 2016
58+
KernelVersion: 4.7
59+
Contact: Mathieu Poirier <[email protected]>
60+
Description: (R) Shows the value held by the TMC Formatter and Flush Status
61+
register. The value is read directly from HW register FFSR,
62+
0x300.
63+
64+
What: /sys/bus/coresight/devices/<memory_map>.tmc/mgmt/ffcr
65+
Date: March 2016
66+
KernelVersion: 4.7
67+
Contact: Mathieu Poirier <[email protected]>
68+
Description: (R) Shows the value held by the TMC Formatter and Flush Control
69+
register. The value is read directly from HW register FFCR,
70+
0x304.
71+
72+
What: /sys/bus/coresight/devices/<memory_map>.tmc/mgmt/mode
73+
Date: March 2016
74+
KernelVersion: 4.7
75+
Contact: Mathieu Poirier <[email protected]>
76+
Description: (R) Shows the value held by the TMC Mode register, which
77+
indicate the mode the device has been configured to enact. The
78+
The value is read directly from the MODE register, 0x028.
79+
80+
What: /sys/bus/coresight/devices/<memory_map>.tmc/mgmt/devid
81+
Date: March 2016
82+
KernelVersion: 4.7
83+
Contact: Mathieu Poirier <[email protected]>
84+
Description: (R) Indicates the capabilities of the Coresight TMC.
85+
The value is read directly from the DEVID register, 0xFC8,

Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_24x7

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Contact: Linux on PowerPC Developer List <[email protected]>
44
Description:
55
Provides access to the binary "24x7 catalog" provided by the
66
hypervisor on POWER7 and 8 systems. This catalog lists events
7-
avaliable from the powerpc "hv_24x7" pmu. Its format is
7+
available from the powerpc "hv_24x7" pmu. Its format is
88
documented here:
99
https://raw.githubusercontent.com/jmesmon/catalog-24x7/master/hv-24x7-catalog.h
1010

0 commit comments

Comments
 (0)