Skip to content

Commit f1b0c8d

Browse files
author
Ingo Molnar
committed
Merge branch 'linus' into x86/amd-iommu
2 parents d591b0a + 5b664cb commit f1b0c8d

File tree

4,356 files changed

+286890
-303282
lines changed

Some content is hidden

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

4,356 files changed

+286890
-303282
lines changed

‎.gitignore

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
# subdirectories here. Add them in the ".gitignore" file
44
# in that subdirectory instead.
55
#
6+
# NOTE! Please use 'git-ls-files -i --exclude-standard'
7+
# command after changing this file, to see if there are
8+
# any tracked files which get ignored after the change.
9+
#
610
# Normal rules
711
#
812
.*
@@ -18,19 +22,21 @@
1822
*.lst
1923
*.symtypes
2024
*.order
25+
*.elf
26+
*.bin
27+
*.gz
2128

2229
#
2330
# Top-level generic files
2431
#
2532
tags
2633
TAGS
27-
vmlinux*
28-
!vmlinux.lds.S
29-
!vmlinux.lds.h
34+
vmlinux
3035
System.map
3136
Module.markers
3237
Module.symvers
3338
!.gitignore
39+
!.mailmap
3440

3541
#
3642
# Generated include files

‎CREDITS

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2611,8 +2611,9 @@ S: Perth, Western Australia
26112611
S: Australia
26122612

26132613
N: Miguel Ojeda Sandonis
2614-
E: maxextreme@gmail.com
2615-
W: http://maxextreme.googlepages.com/
2614+
E: miguel.ojeda.sandonis@gmail.com
2615+
W: http://miguelojeda.es
2616+
W: http://jair.lab.fi.uva.es/~migojed/
26162617
D: Author of the ks0108, cfag12864b and cfag12864bfb auxiliary display drivers.
26172618
D: Maintainer of the auxiliary display drivers tree (drivers/auxdisplay/*)
26182619
S: C/ Mieses 20, 9-B

‎Documentation/ABI/testing/sysfs-block

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,37 @@ Description:
2626
I/O statistics of partition <part>. The format is the
2727
same as the above-written /sys/block/<disk>/stat
2828
format.
29+
30+
31+
What: /sys/block/<disk>/integrity/format
32+
Date: June 2008
33+
Contact: Martin K. Petersen <martin.petersen@oracle.com>
34+
Description:
35+
Metadata format for integrity capable block device.
36+
E.g. T10-DIF-TYPE1-CRC.
37+
38+
39+
What: /sys/block/<disk>/integrity/read_verify
40+
Date: June 2008
41+
Contact: Martin K. Petersen <martin.petersen@oracle.com>
42+
Description:
43+
Indicates whether the block layer should verify the
44+
integrity of read requests serviced by devices that
45+
support sending integrity metadata.
46+
47+
48+
What: /sys/block/<disk>/integrity/tag_size
49+
Date: June 2008
50+
Contact: Martin K. Petersen <martin.petersen@oracle.com>
51+
Description:
52+
Number of bytes of integrity tag space available per
53+
512 bytes of data.
54+
55+
56+
What: /sys/block/<disk>/integrity/write_generate
57+
Date: June 2008
58+
Contact: Martin K. Petersen <martin.petersen@oracle.com>
59+
Description:
60+
Indicates whether the block layer should automatically
61+
generate checksums for write requests bound for
62+
devices that support receiving integrity metadata.

‎Documentation/ABI/testing/sysfs-bus-css

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
What: /sys/bus/css/devices/.../type
2+
Date: March 2008
3+
Contact: Cornelia Huck <cornelia.huck@de.ibm.com>
4+
linux-s390@vger.kernel.org
5+
Description: Contains the subchannel type, as reported by the hardware.
6+
This attribute is present for all subchannel types.
7+
8+
What: /sys/bus/css/devices/.../modalias
9+
Date: March 2008
10+
Contact: Cornelia Huck <cornelia.huck@de.ibm.com>
11+
linux-s390@vger.kernel.org
12+
Description: Contains the module alias as reported with uevents.
13+
It is of the format css:t<type> and present for all
14+
subchannel types.
15+
16+
What: /sys/bus/css/drivers/io_subchannel/.../chpids
17+
Date: December 2002
18+
Contact: Cornelia Huck <cornelia.huck@de.ibm.com>
19+
linux-s390@vger.kernel.org
20+
Description: Contains the ids of the channel paths used by this
21+
subchannel, as reported by the channel subsystem
22+
during subchannel recognition.
23+
Note: This is an I/O-subchannel specific attribute.
24+
Users: s390-tools, HAL
25+
26+
What: /sys/bus/css/drivers/io_subchannel/.../pimpampom
27+
Date: December 2002
28+
Contact: Cornelia Huck <cornelia.huck@de.ibm.com>
29+
linux-s390@vger.kernel.org
30+
Description: Contains the PIM/PAM/POM values, as reported by the
31+
channel subsystem when last queried by the common I/O
32+
layer (this implies that this attribute is not neccessarily
33+
in sync with the values current in the channel subsystem).
34+
Note: This is an I/O-subchannel specific attribute.
35+
Users: s390-tools, HAL

‎Documentation/ABI/testing/sysfs-firmware-acpi

Lines changed: 87 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -29,46 +29,46 @@ Description:
2929

3030
$ cd /sys/firmware/acpi/interrupts
3131
$ grep . *
32-
error:0
33-
ff_gbl_lock:0
34-
ff_pmtimer:0
35-
ff_pwr_btn:0
36-
ff_rt_clk:0
37-
ff_slp_btn:0
38-
gpe00:0
39-
gpe01:0
40-
gpe02:0
41-
gpe03:0
42-
gpe04:0
43-
gpe05:0
44-
gpe06:0
45-
gpe07:0
46-
gpe08:0
47-
gpe09:174
48-
gpe0A:0
49-
gpe0B:0
50-
gpe0C:0
51-
gpe0D:0
52-
gpe0E:0
53-
gpe0F:0
54-
gpe10:0
55-
gpe11:60
56-
gpe12:0
57-
gpe13:0
58-
gpe14:0
59-
gpe15:0
60-
gpe16:0
61-
gpe17:0
62-
gpe18:0
63-
gpe19:7
64-
gpe1A:0
65-
gpe1B:0
66-
gpe1C:0
67-
gpe1D:0
68-
gpe1E:0
69-
gpe1F:0
70-
gpe_all:241
71-
sci:241
32+
error: 0
33+
ff_gbl_lock: 0 enable
34+
ff_pmtimer: 0 invalid
35+
ff_pwr_btn: 0 enable
36+
ff_rt_clk: 2 disable
37+
ff_slp_btn: 0 invalid
38+
gpe00: 0 invalid
39+
gpe01: 0 enable
40+
gpe02: 108 enable
41+
gpe03: 0 invalid
42+
gpe04: 0 invalid
43+
gpe05: 0 invalid
44+
gpe06: 0 enable
45+
gpe07: 0 enable
46+
gpe08: 0 invalid
47+
gpe09: 0 invalid
48+
gpe0A: 0 invalid
49+
gpe0B: 0 invalid
50+
gpe0C: 0 invalid
51+
gpe0D: 0 invalid
52+
gpe0E: 0 invalid
53+
gpe0F: 0 invalid
54+
gpe10: 0 invalid
55+
gpe11: 0 invalid
56+
gpe12: 0 invalid
57+
gpe13: 0 invalid
58+
gpe14: 0 invalid
59+
gpe15: 0 invalid
60+
gpe16: 0 invalid
61+
gpe17: 1084 enable
62+
gpe18: 0 enable
63+
gpe19: 0 invalid
64+
gpe1A: 0 invalid
65+
gpe1B: 0 invalid
66+
gpe1C: 0 invalid
67+
gpe1D: 0 invalid
68+
gpe1E: 0 invalid
69+
gpe1F: 0 invalid
70+
gpe_all: 1192
71+
sci: 1194
7272

7373
sci - The total number of times the ACPI SCI
7474
has claimed an interrupt.
@@ -89,6 +89,13 @@ Description:
8989

9090
error - an interrupt that can't be accounted for above.
9191

92+
invalid: it's either a wakeup GPE or a GPE/Fixed Event that
93+
doesn't have an event handler.
94+
95+
disable: the GPE/Fixed Event is valid but disabled.
96+
97+
enable: the GPE/Fixed Event is valid and enabled.
98+
9299
Root has permission to clear any of these counters. Eg.
93100
# echo 0 > gpe11
94101

@@ -97,3 +104,43 @@ Description:
97104

98105
None of these counters has an effect on the function
99106
of the system, they are simply statistics.
107+
108+
Besides this, user can also write specific strings to these files
109+
to enable/disable/clear ACPI interrupts in user space, which can be
110+
used to debug some ACPI interrupt storm issues.
111+
112+
Note that only writting to VALID GPE/Fixed Event is allowed,
113+
i.e. user can only change the status of runtime GPE and
114+
Fixed Event with event handler installed.
115+
116+
Let's take power button fixed event for example, please kill acpid
117+
and other user space applications so that the machine won't shutdown
118+
when pressing the power button.
119+
# cat ff_pwr_btn
120+
0
121+
# press the power button for 3 times;
122+
# cat ff_pwr_btn
123+
3
124+
# echo disable > ff_pwr_btn
125+
# cat ff_pwr_btn
126+
disable
127+
# press the power button for 3 times;
128+
# cat ff_pwr_btn
129+
disable
130+
# echo enable > ff_pwr_btn
131+
# cat ff_pwr_btn
132+
4
133+
/*
134+
* this is because the status bit is set even if the enable bit is cleared,
135+
* and it triggers an ACPI fixed event when the enable bit is set again
136+
*/
137+
# press the power button for 3 times;
138+
# cat ff_pwr_btn
139+
7
140+
# echo disable > ff_pwr_btn
141+
# press the power button for 3 times;
142+
# echo clear > ff_pwr_btn /* clear the status bit */
143+
# echo disable > ff_pwr_btn
144+
# cat ff_pwr_btn
145+
7
146+

‎Documentation/ABI/testing/sysfs-firmware-memmap

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
What: /sys/firmware/memmap/
2+
Date: June 2008
3+
Contact: Bernhard Walle <bwalle@suse.de>
4+
Description:
5+
On all platforms, the firmware provides a memory map which the
6+
kernel reads. The resources from that memory map are registered
7+
in the kernel resource tree and exposed to userspace via
8+
/proc/iomem (together with other resources).
9+
10+
However, on most architectures that firmware-provided memory
11+
map is modified afterwards by the kernel itself, either because
12+
the kernel merges that memory map with other information or
13+
just because the user overwrites that memory map via command
14+
line.
15+
16+
kexec needs the raw firmware-provided memory map to setup the
17+
parameter segment of the kernel that should be booted with
18+
kexec. Also, the raw memory map is useful for debugging. For
19+
that reason, /sys/firmware/memmap is an interface that provides
20+
the raw memory map to userspace.
21+
22+
The structure is as follows: Under /sys/firmware/memmap there
23+
are subdirectories with the number of the entry as their name:
24+
25+
/sys/firmware/memmap/0
26+
/sys/firmware/memmap/1
27+
/sys/firmware/memmap/2
28+
/sys/firmware/memmap/3
29+
...
30+
31+
The maximum depends on the number of memory map entries provided
32+
by the firmware. The order is just the order that the firmware
33+
provides.
34+
35+
Each directory contains three files:
36+
37+
start : The start address (as hexadecimal number with the
38+
'0x' prefix).
39+
end : The end address, inclusive (regardless whether the
40+
firmware provides inclusive or exclusive ranges).
41+
type : Type of the entry as string. See below for a list of
42+
valid types.
43+
44+
So, for example:
45+
46+
/sys/firmware/memmap/0/start
47+
/sys/firmware/memmap/0/end
48+
/sys/firmware/memmap/0/type
49+
/sys/firmware/memmap/1/start
50+
...
51+
52+
Currently following types exist:
53+
54+
- System RAM
55+
- ACPI Tables
56+
- ACPI Non-volatile Storage
57+
- reserved
58+
59+
Following shell snippet can be used to display that memory
60+
map in a human-readable format:
61+
62+
-------------------- 8< ----------------------------------------
63+
#!/bin/bash
64+
cd /sys/firmware/memmap
65+
for dir in * ; do
66+
start=$(cat $dir/start)
67+
end=$(cat $dir/end)
68+
type=$(cat $dir/type)
69+
printf "%016x-%016x (%s)\n" $start $[ $end +1] "$type"
70+
done
71+
-------------------- >8 ----------------------------------------

‎Documentation/HOWTO

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ Bug Reporting
377377
bugzilla.kernel.org is where the Linux kernel developers track kernel
378378
bugs. Users are encouraged to report all bugs that they find in this
379379
tool. For details on how to use the kernel bugzilla, please see:
380-
http://test.kernel.org/bugzilla/faq.html
380+
http://bugzilla.kernel.org/page.cgi?id=faq.html
381381

382382
The file REPORTING-BUGS in the main kernel source directory has a good
383383
template for how to report a possible kernel bug, and details what kind

0 commit comments

Comments
 (0)