Skip to content

Commit 8d2932d

Browse files
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 <[email protected]>
137137
Rudolf Marek <[email protected]>
138138
Rui Saraiva <[email protected]>
139139
Sachin P Sant <[email protected]>
140+
Sarangdhar Joshi <[email protected]>
140141
Sam Ravnborg <[email protected]>
141142
Santosh Shilimkar <[email protected]>
142143
Santosh Shilimkar <[email protected]>
@@ -150,10 +151,13 @@ Shuah Khan <[email protected]> <[email protected]>
150151
Simon Kelley <[email protected]>
151152
Stéphane Witzmann <[email protected]>
152153
Stephen Hemminger <[email protected]>
154+
Subash Abhinov Kasiviswanathan <[email protected]>
155+
Subhash Jadavani <[email protected]>
153156
Sudeep Holla <[email protected]> Sudeep KarkadaNagesha <[email protected]>
154157
Sumit Semwal <[email protected]>
155158
Tejun Heo <[email protected]>
156159
Thomas Graf <[email protected]>
160+
Thomas Pedersen <[email protected]>
157161
Tony Luck <[email protected]>
158162
Tsuneo Yoshioka <[email protected]>
159163
Uwe Kleine-König <[email protected]>

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 <[email protected]>
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>;

0 commit comments

Comments
 (0)