Skip to content

Commit 8d2932d

Browse files
joergroedeljoergroedel
committed
Merge branches 'iommu/fixes', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'arm/mediatek', 'arm/core', 'x86/vt-d' and 'core' into next
8 parents 99e8ccd + fff2fd1 + 3b6bb5b + aac7d39 + 087a908 + 2c9f1af + f7116e1 + d0f6f58 commit 8d2932d

File tree

1,244 files changed

+13484
-8002
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,244 files changed

+13484
-8002
lines changed

‎.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
137137
Rudolf Marek <R.Marek@sh.cvut.cz>
138138
Rui Saraiva <rmps@joel.ist.utl.pt>
139139
Sachin P Sant <ssant@in.ibm.com>
140+
Sarangdhar Joshi <spjoshi@codeaurora.org>
140141
Sam Ravnborg <sam@mars.ravnborg.org>
141142
Santosh Shilimkar <ssantosh@kernel.org>
142143
Santosh Shilimkar <santosh.shilimkar@oracle.org>
@@ -150,10 +151,13 @@ Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
150151
Simon Kelley <simon@thekelleys.org.uk>
151152
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
152153
Stephen Hemminger <shemminger@osdl.org>
154+
Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
155+
Subhash Jadavani <subhashj@codeaurora.org>
153156
Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
154157
Sumit Semwal <sumit.semwal@ti.com>
155158
Tejun Heo <htejun@gmail.com>
156159
Thomas Graf <tgraf@suug.ch>
160+
Thomas Pedersen <twp@codeaurora.org>
157161
Tony Luck <tony.luck@intel.com>
158162
Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
159163
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

‎Documentation/ABI/testing/sysfs-devices-deferred_probe

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎Documentation/ABI/testing/sysfs-kernel-iommu_groups

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,15 @@ Description: /sys/kernel/iommu_groups/ contains a number of sub-
1212
file if the IOMMU driver has chosen to register a more
1313
common name for the group.
1414
Users:
15+
16+
What: /sys/kernel/iommu_groups/reserved_regions
17+
Date: January 2017
18+
KernelVersion: v4.11
19+
Contact: Eric Auger <eric.auger@redhat.com>
20+
Description: /sys/kernel/iommu_groups/reserved_regions list IOVA
21+
regions that are reserved. Not necessarily all
22+
reserved regions are listed. This is typically used to
23+
output direct-mapped, MSI, non mappable regions. Each
24+
region is described on a single line: the 1st field is
25+
the base IOVA, the second is the end IOVA and the third
26+
field describes the type of the region.

‎Documentation/DMA-attributes.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,13 @@ So, this provides a way for drivers to avoid those error messages on calls
143143
where allocation failures are not a problem, and shouldn't bother the logs.
144144

145145
NOTE: At the moment DMA_ATTR_NO_WARN is only implemented on PowerPC.
146+
147+
DMA_ATTR_PRIVILEGED
148+
------------------------------
149+
150+
Some advanced peripherals such as remote processors and GPUs perform
151+
accesses to DMA buffers in both privileged "supervisor" and unprivileged
152+
"user" modes. This attribute is used to indicate to the DMA-mapping
153+
subsystem that the buffer is fully accessible at the elevated privilege
154+
level (and ideally inaccessible or at least read-only at the
155+
lesser-privileged levels).

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,16 @@
106106
use by PCI
107107
Format: <irq>,<irq>...
108108

109+
acpi_mask_gpe= [HW,ACPI]
110+
Due to the existence of _Lxx/_Exx, some GPEs triggered
111+
by unsupported hardware/firmware features can result in
112+
GPE floodings that cannot be automatically disabled by
113+
the GPE dispatcher.
114+
This facility can be used to prevent such uncontrolled
115+
GPE floodings.
116+
Format: <int>
117+
Support masking of GPEs numbered from 0x00 to 0x7f.
118+
109119
acpi_no_auto_serialize [HW,ACPI]
110120
Disable auto-serialization of AML methods
111121
AML control methods that contain the opcodes to create
@@ -3811,10 +3821,11 @@
38113821
it if 0 is given (See Documentation/cgroup-v1/memory.txt)
38123822

38133823
swiotlb= [ARM,IA-64,PPC,MIPS,X86]
3814-
Format: { <int> | force }
3824+
Format: { <int> | force | noforce }
38153825
<int> -- Number of I/O TLB slabs
38163826
force -- force using of bounce buffers even if they
38173827
wouldn't be automatically used by the kernel
3828+
noforce -- Never use bounce buffers (for debugging)
38183829

38193830
switches= [HW,M68k]
38203831

‎Documentation/block/queue-sysfs.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ This is the hardware sector size of the device, in bytes.
5454

5555
io_poll (RW)
5656
------------
57-
When read, this file shows the total number of block IO polls and how
58-
many returned success. Writing '0' to this file will disable polling
59-
for this device. Writing any non-zero value will enable this feature.
57+
When read, this file shows whether polling is enabled (1) or disabled
58+
(0). Writing '0' to this file will disable polling for this device.
59+
Writing any non-zero value will enable this feature.
6060

6161
io_poll_delay (RW)
6262
------------------

‎Documentation/devicetree/bindings/i2c/i2c.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ wants to support one of the below features, it should adapt the bindings below.
6262
"irq" and "wakeup" names are recognized by I2C core, other names are
6363
left to individual drivers.
6464

65+
- host-notify
66+
device uses SMBus host notify protocol instead of interrupt line.
67+
6568
- multi-master
6669
states that there is another master active on this bus. The OS can use
6770
this information to adapt power management to keep the arbitration awake
@@ -81,6 +84,11 @@ Binding may contain optional "interrupts" property, describing interrupts
8184
used by the device. I2C core will assign "irq" interrupt (or the very first
8285
interrupt if not using interrupt names) as primary interrupt for the slave.
8386

87+
Alternatively, devices supporting SMbus Host Notify, and connected to
88+
adapters that support this feature, may use "host-notify" property. I2C
89+
core will create a virtual interrupt for Host Notify and assign it as
90+
primary interrupt for the slave.
91+
8492
Also, if device is marked as a wakeup source, I2C core will set up "wakeup"
8593
interrupt for the device. If "wakeup" interrupt name is not present in the
8694
binding, then primary interrupt will be used as wakeup interrupt.

‎Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ This driver provides a simple power button event via an Interrupt.
88
Required properties:
99
- compatible: should be "ti,tps65217-pwrbutton" or "ti,tps65218-pwrbutton"
1010

11-
Required properties for TPS65218:
11+
Required properties:
1212
- interrupts: should be one of the following
13+
- <2>: For controllers compatible with tps65217
1314
- <3 IRQ_TYPE_EDGE_BOTH>: For controllers compatible with tps65218
1415

1516
Examples:
1617

1718
&tps {
1819
tps65217-pwrbutton {
1920
compatible = "ti,tps65217-pwrbutton";
21+
interrupts = <2>;
2022
};
2123
};
2224

‎Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ Properties:
1515
Second cell specifies the irq distribution mode to cores
1616
0=Round Robin; 1=cpu0, 2=cpu1, 4=cpu2, 8=cpu3
1717

18+
The second cell in interrupts property is deprecated and may be ignored by
19+
the kernel.
20+
1821
intc accessed via the special ARC AUX register interface, hence "reg" property
1922
is not specified.
2023

‎Documentation/devicetree/bindings/mtd/tango-nand.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Required properties:
55
- compatible: "sigma,smp8758-nand"
66
- reg: address/size of nfc_reg, nfc_mem, and pbus_reg
77
- dmas: reference to the DMA channel used by the controller
8-
- dma-names: "nfc_sbox"
8+
- dma-names: "rxtx"
99
- clocks: reference to the system clock
1010
- #address-cells: <1>
1111
- #size-cells: <0>
@@ -17,9 +17,9 @@ Example:
1717

1818
nandc: nand-controller@2c000 {
1919
compatible = "sigma,smp8758-nand";
20-
reg = <0x2c000 0x30 0x2d000 0x800 0x20000 0x1000>;
20+
reg = <0x2c000 0x30>, <0x2d000 0x800>, <0x20000 0x1000>;
2121
dmas = <&dma0 3>;
22-
dma-names = "nfc_sbox";
22+
dma-names = "rxtx";
2323
clocks = <&clkgen SYS_CLK>;
2424
#address-cells = <1>;
2525
#size-cells = <0>;

‎Documentation/devicetree/bindings/net/mediatek-net.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ have dual GMAC each represented by a child node..
77
* Ethernet controller node
88

99
Required properties:
10-
- compatible: Should be "mediatek,mt7623-eth"
10+
- compatible: Should be "mediatek,mt2701-eth"
1111
- reg: Address and length of the register set for the device
1212
- interrupts: Should contain the three frame engines interrupts in numeric
1313
order. These are fe_int0, fe_int1 and fe_int2.

‎Documentation/devicetree/bindings/net/phy.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ Optional Properties:
1919
specifications. If neither of these are specified, the default is to
2020
assume clause 22.
2121

22-
If the phy's identifier is known then the list may contain an entry
23-
of the form: "ethernet-phy-idAAAA.BBBB" where
22+
If the PHY reports an incorrect ID (or none at all) then the
23+
"compatible" list may contain an entry with the correct PHY ID in the
24+
form: "ethernet-phy-idAAAA.BBBB" where
2425
AAAA - The value of the 16 bit Phy Identifier 1 register as
2526
4 hex digits. This is the chip vendor OUI bits 3:18
2627
BBBB - The value of the 16 bit Phy Identifier 2 register as

‎Documentation/devicetree/bindings/net/ti,dp83867.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
Required properties:
44
- reg - The ID number for the phy, usually a small integer
55
- ti,rx-internal-delay - RGMII Receive Clock Delay - see dt-bindings/net/ti-dp83867.h
6-
for applicable values
6+
for applicable values. Required only if interface type is
7+
PHY_INTERFACE_MODE_RGMII_ID or PHY_INTERFACE_MODE_RGMII_RXID
78
- ti,tx-internal-delay - RGMII Transmit Clock Delay - see dt-bindings/net/ti-dp83867.h
8-
for applicable values
9+
for applicable values. Required only if interface type is
10+
PHY_INTERFACE_MODE_RGMII_ID or PHY_INTERFACE_MODE_RGMII_TXID
911
- ti,fifo-depth - Transmitt FIFO depth- see dt-bindings/net/ti-dp83867.h
1012
for applicable values
1113

‎Documentation/devicetree/bindings/power/supply/tps65217_charger.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@ TPS65217 Charger
22

33
Required Properties:
44
-compatible: "ti,tps65217-charger"
5+
-interrupts: TPS65217 interrupt numbers for the AC and USB charger input change.
6+
Should be <0> for the USB charger and <1> for the AC adapter.
7+
-interrupt-names: Should be "USB" and "AC"
58

69
This node is a subnode of the tps65217 PMIC.
710

811
Example:
912

1013
tps65217-charger {
11-
compatible = "ti,tps65090-charger";
14+
compatible = "ti,tps65217-charger";
15+
interrupts = <0>, <1>;
16+
interrupt-names = "USB", "AC";
1217
};

‎Documentation/devicetree/bindings/spi/sh-msiof.txt

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
Renesas MSIOF spi controller
22

33
Required properties:
4-
- compatible : "renesas,msiof-<soctype>" for SoCs,
5-
"renesas,sh-msiof" for SuperH, or
6-
"renesas,sh-mobile-msiof" for SH Mobile series.
7-
Examples with soctypes are:
8-
"renesas,msiof-r8a7790" (R-Car H2)
4+
- compatible : "renesas,msiof-r8a7790" (R-Car H2)
95
"renesas,msiof-r8a7791" (R-Car M2-W)
106
"renesas,msiof-r8a7792" (R-Car V2H)
117
"renesas,msiof-r8a7793" (R-Car M2-N)
128
"renesas,msiof-r8a7794" (R-Car E2)
139
"renesas,msiof-r8a7796" (R-Car M3-W)
1410
"renesas,msiof-sh73a0" (SH-Mobile AG5)
11+
"renesas,sh-mobile-msiof" (generic SH-Mobile compatibile device)
12+
"renesas,rcar-gen2-msiof" (generic R-Car Gen2 compatible device)
13+
"renesas,rcar-gen3-msiof" (generic R-Car Gen3 compatible device)
14+
"renesas,sh-msiof" (deprecated)
15+
16+
When compatible with the generic version, nodes
17+
must list the SoC-specific version corresponding
18+
to the platform first followed by the generic
19+
version.
20+
1521
- reg : A list of offsets and lengths of the register sets for
1622
the device.
1723
If only one register set is present, it is to be used
@@ -61,7 +67,8 @@ Documentation/devicetree/bindings/pinctrl/renesas,*.
6167
Example:
6268

6369
msiof0: spi@e6e20000 {
64-
compatible = "renesas,msiof-r8a7791";
70+
compatible = "renesas,msiof-r8a7791",
71+
"renesas,rcar-gen2-msiof";
6572
reg = <0 0xe6e20000 0 0x0064>;
6673
interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;
6774
clocks = <&mstp0_clks R8A7791_CLK_MSIOF0>;

‎Documentation/driver-api/infrastructure.rst

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,6 @@ Device Drivers DMA Management
5555
.. kernel-doc:: drivers/base/dma-mapping.c
5656
:export:
5757

58-
Device Drivers Power Management
59-
-------------------------------
60-
61-
.. kernel-doc:: drivers/base/power/main.c
62-
:export:
63-
64-
Device Drivers ACPI Support
65-
---------------------------
66-
67-
.. kernel-doc:: drivers/acpi/scan.c
68-
:export:
69-
70-
.. kernel-doc:: drivers/acpi/scan.c
71-
:internal:
72-
7358
Device drivers PnP support
7459
--------------------------
7560

‎Documentation/filesystems/proc.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,11 @@ asynchronous manner and the value may not be very precise. To see a precise
212212
snapshot of a moment, you can see /proc/<pid>/smaps file and scan page table.
213213
It's slow but very precise.
214214

215-
Table 1-2: Contents of the status files (as of 4.1)
215+
Table 1-2: Contents of the status files (as of 4.8)
216216
..............................................................................
217217
Field Content
218218
Name filename of the executable
219+
Umask file mode creation mask
219220
State state (R is running, S is sleeping, D is sleeping
220221
in an uninterruptible wait, Z is zombie,
221222
T is traced or stopped)
@@ -226,7 +227,6 @@ Table 1-2: Contents of the status files (as of 4.1)
226227
TracerPid PID of process tracing this process (0 if not)
227228
Uid Real, effective, saved set, and file system UIDs
228229
Gid Real, effective, saved set, and file system GIDs
229-
Umask file mode creation mask
230230
FDSize number of file descriptor slots currently allocated
231231
Groups supplementary group list
232232
NStgid descendant namespace thread group ID hierarchy
@@ -236,6 +236,7 @@ Table 1-2: Contents of the status files (as of 4.1)
236236
VmPeak peak virtual memory size
237237
VmSize total program size
238238
VmLck locked memory size
239+
VmPin pinned memory size
239240
VmHWM peak resident set size ("high water mark")
240241
VmRSS size of memory portions. It contains the three
241242
following parts (VmRSS = RssAnon + RssFile + RssShmem)

‎Documentation/networking/mpls-sysctl.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ platform_labels - INTEGER
55
possible to configure forwarding for label values equal to or
66
greater than the number of platform labels.
77

8-
A dense utliziation of the entries in the platform label table
9-
is possible and expected aas the platform labels are locally
8+
A dense utilization of the entries in the platform label table
9+
is possible and expected as the platform labels are locally
1010
allocated.
1111

1212
If the number of platform label table entries is set to 0 no

‎Documentation/power/states.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ only one way to cause the system to go into the Suspend-To-RAM state (write
3535
The default suspend mode (ie. the one to be used without writing anything into
3636
/sys/power/mem_sleep) is either "deep" (if Suspend-To-RAM is supported) or
3737
"s2idle", but it can be overridden by the value of the "mem_sleep_default"
38-
parameter in the kernel command line. On some ACPI-based systems, depending on
39-
the information in the FADT, the default may be "s2idle" even if Suspend-To-RAM
40-
is supported.
38+
parameter in the kernel command line.
4139

4240
The properties of all of the sleep states are described below.
4341

0 commit comments

Comments
 (0)