lael-labs/linux

Documentation/ABI/stable/sysfs-bus-usb+4−4

@@ -37,8 +37,8 @@ Description: · 36 unmodified lines
37	that the USB device has been connected to the machine. This	37	that the USB device has been connected to the machine. This
38	file is read-only.	38	file is read-only.
39	Users:	39	Users:
40	PowerTOP <power@bughost.org>	40	PowerTOP <powertop@lists.01.org>
41	http://www.lesswatts.org/projects/powertop/	41	https://01.org/powertop/
42		42
43	What: /sys/bus/usb/device/.../power/active_duration	43	What: /sys/bus/usb/device/.../power/active_duration
44	Date: January 2008	44	Date: January 2008
@@ -57,8 +57,8 @@ Description: · 12 unmodified lines
57	will give an integer percentage. Note that this does not	57	will give an integer percentage. Note that this does not
58	account for counter wrap.	58	account for counter wrap.
59	Users:	59	Users:
60	PowerTOP <power@bughost.org>	60	PowerTOP <powertop@lists.01.org>
61	http://www.lesswatts.org/projects/powertop/	61	https://01.org/powertop/
62		62
63	What: /sys/bus/usb/devices/<busnum>-<port[.port]>...:<config num>-<interface num>/supports_autosuspend	63	What: /sys/bus/usb/devices/<busnum>-<port[.port]>...:<config num>-<interface num>/supports_autosuspend
64	Date: January 2008	64	Date: January 2008

Documentation/ABI/testing/sysfs-devices-power+16−16

@@ -1,6 +1,6 @@
1	What: /sys/devices/.../power/	1	What: /sys/devices/.../power/
2	Date: January 2009	2	Date: January 2009
3	Contact: Rafael J. Wysocki <rjw@sisk.pl>	3	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
4	Description:	4	Description:
5	The /sys/devices/.../power directory contains attributes	5	The /sys/devices/.../power directory contains attributes
6	allowing the user space to check and modify some power	6	allowing the user space to check and modify some power
@@ -8,7 +8,7 @@ Description: · 1 unmodified line
8		8
9	What: /sys/devices/.../power/wakeup	9	What: /sys/devices/.../power/wakeup
10	Date: January 2009	10	Date: January 2009
11	Contact: Rafael J. Wysocki <rjw@sisk.pl>	11	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
12	Description:	12	Description:
13	The /sys/devices/.../power/wakeup attribute allows the user	13	The /sys/devices/.../power/wakeup attribute allows the user
14	space to check if the device is enabled to wake up the system	14	space to check if the device is enabled to wake up the system
@@ -34,7 +34,7 @@ Description: · 19 unmodified lines
34		34
35	What: /sys/devices/.../power/control	35	What: /sys/devices/.../power/control
36	Date: January 2009	36	Date: January 2009
37	Contact: Rafael J. Wysocki <rjw@sisk.pl>	37	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
38	Description:	38	Description:
39	The /sys/devices/.../power/control attribute allows the user	39	The /sys/devices/.../power/control attribute allows the user
40	space to control the run-time power management of the device.	40	space to control the run-time power management of the device.
@@ -53,7 +53,7 @@ Description: · 12 unmodified lines
53		53
54	What: /sys/devices/.../power/async	54	What: /sys/devices/.../power/async
55	Date: January 2009	55	Date: January 2009
56	Contact: Rafael J. Wysocki <rjw@sisk.pl>	56	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
57	Description:	57	Description:
58	The /sys/devices/.../async attribute allows the user space to	58	The /sys/devices/.../async attribute allows the user space to
59	enable or diasble the device's suspend and resume callbacks to	59	enable or diasble the device's suspend and resume callbacks to
@@ -79,7 +79,7 @@ Description: · 19 unmodified lines
79		79
80	What: /sys/devices/.../power/wakeup_count	80	What: /sys/devices/.../power/wakeup_count
81	Date: September 2010	81	Date: September 2010
82	Contact: Rafael J. Wysocki <rjw@sisk.pl>	82	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
83	Description:	83	Description:
84	The /sys/devices/.../wakeup_count attribute contains the number	84	The /sys/devices/.../wakeup_count attribute contains the number
85	of signaled wakeup events associated with the device. This	85	of signaled wakeup events associated with the device. This
@@ -88,7 +88,7 @@ Description: · 2 unmodified lines
88		88
89	What: /sys/devices/.../power/wakeup_active_count	89	What: /sys/devices/.../power/wakeup_active_count
90	Date: September 2010	90	Date: September 2010
91	Contact: Rafael J. Wysocki <rjw@sisk.pl>	91	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
92	Description:	92	Description:
93	The /sys/devices/.../wakeup_active_count attribute contains the	93	The /sys/devices/.../wakeup_active_count attribute contains the
94	number of times the processing of wakeup events associated with	94	number of times the processing of wakeup events associated with
@@ -98,7 +98,7 @@ Description: · 3 unmodified lines
98		98
99	What: /sys/devices/.../power/wakeup_abort_count	99	What: /sys/devices/.../power/wakeup_abort_count
100	Date: February 2012	100	Date: February 2012
101	Contact: Rafael J. Wysocki <rjw@sisk.pl>	101	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
102	Description:	102	Description:
103	The /sys/devices/.../wakeup_abort_count attribute contains the	103	The /sys/devices/.../wakeup_abort_count attribute contains the
104	number of times the processing of a wakeup event associated with	104	number of times the processing of a wakeup event associated with
@@ -109,7 +109,7 @@ Description: · 4 unmodified lines
109		109
110	What: /sys/devices/.../power/wakeup_expire_count	110	What: /sys/devices/.../power/wakeup_expire_count
111	Date: February 2012	111	Date: February 2012
112	Contact: Rafael J. Wysocki <rjw@sisk.pl>	112	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
113	Description:	113	Description:
114	The /sys/devices/.../wakeup_expire_count attribute contains the	114	The /sys/devices/.../wakeup_expire_count attribute contains the
115	number of times a wakeup event associated with the device has	115	number of times a wakeup event associated with the device has
@@ -119,7 +119,7 @@ Description: · 3 unmodified lines
119		119
120	What: /sys/devices/.../power/wakeup_active	120	What: /sys/devices/.../power/wakeup_active
121	Date: September 2010	121	Date: September 2010
122	Contact: Rafael J. Wysocki <rjw@sisk.pl>	122	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
123	Description:	123	Description:
124	The /sys/devices/.../wakeup_active attribute contains either 1,	124	The /sys/devices/.../wakeup_active attribute contains either 1,
125	or 0, depending on whether or not a wakeup event associated with	125	or 0, depending on whether or not a wakeup event associated with
@@ -129,7 +129,7 @@ Description: · 3 unmodified lines
129		129
130	What: /sys/devices/.../power/wakeup_total_time_ms	130	What: /sys/devices/.../power/wakeup_total_time_ms
131	Date: September 2010	131	Date: September 2010
132	Contact: Rafael J. Wysocki <rjw@sisk.pl>	132	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
133	Description:	133	Description:
134	The /sys/devices/.../wakeup_total_time_ms attribute contains	134	The /sys/devices/.../wakeup_total_time_ms attribute contains
135	the total time of processing wakeup events associated with the	135	the total time of processing wakeup events associated with the
@@ -139,7 +139,7 @@ Description: · 3 unmodified lines
139		139
140	What: /sys/devices/.../power/wakeup_max_time_ms	140	What: /sys/devices/.../power/wakeup_max_time_ms
141	Date: September 2010	141	Date: September 2010
142	Contact: Rafael J. Wysocki <rjw@sisk.pl>	142	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
143	Description:	143	Description:
144	The /sys/devices/.../wakeup_max_time_ms attribute contains	144	The /sys/devices/.../wakeup_max_time_ms attribute contains
145	the maximum time of processing a single wakeup event associated	145	the maximum time of processing a single wakeup event associated
@@ -149,7 +149,7 @@ Description: · 3 unmodified lines
149		149
150	What: /sys/devices/.../power/wakeup_last_time_ms	150	What: /sys/devices/.../power/wakeup_last_time_ms
151	Date: September 2010	151	Date: September 2010
152	Contact: Rafael J. Wysocki <rjw@sisk.pl>	152	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
153	Description:	153	Description:
154	The /sys/devices/.../wakeup_last_time_ms attribute contains	154	The /sys/devices/.../wakeup_last_time_ms attribute contains
155	the value of the monotonic clock corresponding to the time of	155	the value of the monotonic clock corresponding to the time of
@@ -160,7 +160,7 @@ Description: · 4 unmodified lines
160		160
161	What: /sys/devices/.../power/wakeup_prevent_sleep_time_ms	161	What: /sys/devices/.../power/wakeup_prevent_sleep_time_ms
162	Date: February 2012	162	Date: February 2012
163	Contact: Rafael J. Wysocki <rjw@sisk.pl>	163	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
164	Description:	164	Description:
165	The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute	165	The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute
166	contains the total time the device has been preventing	166	contains the total time the device has been preventing
@@ -189,7 +189,7 @@ Description: · 22 unmodified lines
189		189
190	What: /sys/devices/.../power/pm_qos_latency_us	190	What: /sys/devices/.../power/pm_qos_latency_us
191	Date: March 2012	191	Date: March 2012
192	Contact: Rafael J. Wysocki <rjw@sisk.pl>	192	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
193	Description:	193	Description:
194	The /sys/devices/.../power/pm_qos_resume_latency_us attribute	194	The /sys/devices/.../power/pm_qos_resume_latency_us attribute
195	contains the PM QoS resume latency limit for the given device,	195	contains the PM QoS resume latency limit for the given device,
@@ -207,7 +207,7 @@ Description: · 11 unmodified lines
207		207
208	What: /sys/devices/.../power/pm_qos_no_power_off	208	What: /sys/devices/.../power/pm_qos_no_power_off
209	Date: September 2012	209	Date: September 2012
210	Contact: Rafael J. Wysocki <rjw@sisk.pl>	210	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
211	Description:	211	Description:
212	The /sys/devices/.../power/pm_qos_no_power_off attribute	212	The /sys/devices/.../power/pm_qos_no_power_off attribute
213	is used for manipulating the PM QoS "no power off" flag. If	213	is used for manipulating the PM QoS "no power off" flag. If
@@ -222,7 +222,7 @@ Description: · 8 unmodified lines
222		222
223	What: /sys/devices/.../power/pm_qos_remote_wakeup	223	What: /sys/devices/.../power/pm_qos_remote_wakeup
224	Date: September 2012	224	Date: September 2012
225	Contact: Rafael J. Wysocki <rjw@sisk.pl>	225	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
226	Description:	226	Description:
227	The /sys/devices/.../power/pm_qos_remote_wakeup attribute	227	The /sys/devices/.../power/pm_qos_remote_wakeup attribute
228	is used for manipulating the PM QoS "remote wakeup required"	228	is used for manipulating the PM QoS "remote wakeup required"

Documentation/ABI/testing/sysfs-power+11−11

@@ -1,6 +1,6 @@
1	What: /sys/power/	1	What: /sys/power/
2	Date: August 2006	2	Date: August 2006
3	Contact: Rafael J. Wysocki <rjw@sisk.pl>	3	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
4	Description:	4	Description:
5	The /sys/power directory will contain files that will	5	The /sys/power directory will contain files that will
6	provide a unified interface to the power management	6	provide a unified interface to the power management
@@ -8,7 +8,7 @@ Description: · 1 unmodified line
8		8
9	What: /sys/power/state	9	What: /sys/power/state
10	Date: August 2006	10	Date: August 2006
11	Contact: Rafael J. Wysocki <rjw@sisk.pl>	11	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
12	Description:	12	Description:
13	The /sys/power/state file controls the system power state.	13	The /sys/power/state file controls the system power state.
14	Reading from this file returns what states are supported,	14	Reading from this file returns what states are supported,
@@ -22,7 +22,7 @@ Description: · 7 unmodified lines
22		22
23	What: /sys/power/disk	23	What: /sys/power/disk
24	Date: September 2006	24	Date: September 2006
25	Contact: Rafael J. Wysocki <rjw@sisk.pl>	25	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
26	Description:	26	Description:
27	The /sys/power/disk file controls the operating mode of the	27	The /sys/power/disk file controls the operating mode of the
28	suspend-to-disk mechanism. Reading from this file returns	28	suspend-to-disk mechanism. Reading from this file returns
@@ -67,7 +67,7 @@ Description: · 38 unmodified lines
67		67
68	What: /sys/power/image_size	68	What: /sys/power/image_size
69	Date: August 2006	69	Date: August 2006
70	Contact: Rafael J. Wysocki <rjw@sisk.pl>	70	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
71	Description:	71	Description:
72	The /sys/power/image_size file controls the size of the image	72	The /sys/power/image_size file controls the size of the image
73	created by the suspend-to-disk mechanism. It can be written a	73	created by the suspend-to-disk mechanism. It can be written a
@@ -84,7 +84,7 @@ Description: · 10 unmodified lines
84		84
85	What: /sys/power/pm_trace	85	What: /sys/power/pm_trace
86	Date: August 2006	86	Date: August 2006
87	Contact: Rafael J. Wysocki <rjw@sisk.pl>	87	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
88	Description:	88	Description:
89	The /sys/power/pm_trace file controls the code which saves the	89	The /sys/power/pm_trace file controls the code which saves the
90	last PM event point in the RTC across reboots, so that you can	90	last PM event point in the RTC across reboots, so that you can
@@ -133,7 +133,7 @@ Description: · 42 unmodified lines
133		133
134	What: /sys/power/pm_async	134	What: /sys/power/pm_async
135	Date: January 2009	135	Date: January 2009
136	Contact: Rafael J. Wysocki <rjw@sisk.pl>	136	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
137	Description:	137	Description:
138	The /sys/power/pm_async file controls the switch allowing the	138	The /sys/power/pm_async file controls the switch allowing the
139	user space to enable or disable asynchronous suspend and resume	139	user space to enable or disable asynchronous suspend and resume
@@ -146,7 +146,7 @@ Description: · 6 unmodified lines
146		146
147	What: /sys/power/wakeup_count	147	What: /sys/power/wakeup_count
148	Date: July 2010	148	Date: July 2010
149	Contact: Rafael J. Wysocki <rjw@sisk.pl>	149	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
150	Description:	150	Description:
151	The /sys/power/wakeup_count file allows user space to put the	151	The /sys/power/wakeup_count file allows user space to put the
152	system into a sleep state while taking into account the	152	system into a sleep state while taking into account the
@@ -161,7 +161,7 @@ Description: · 8 unmodified lines
161		161
162	What: /sys/power/reserved_size	162	What: /sys/power/reserved_size
163	Date: May 2011	163	Date: May 2011
164	Contact: Rafael J. Wysocki <rjw@sisk.pl>	164	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
165	Description:	165	Description:
166	The /sys/power/reserved_size file allows user space to control	166	The /sys/power/reserved_size file allows user space to control
167	the amount of memory reserved for allocations made by device	167	the amount of memory reserved for allocations made by device
@@ -175,7 +175,7 @@ Description: · 7 unmodified lines
175		175
176	What: /sys/power/autosleep	176	What: /sys/power/autosleep
177	Date: April 2012	177	Date: April 2012
178	Contact: Rafael J. Wysocki <rjw@sisk.pl>	178	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
179	Description:	179	Description:
180	The /sys/power/autosleep file can be written one of the strings	180	The /sys/power/autosleep file can be written one of the strings
181	returned by reads from /sys/power/state. If that happens, a	181	returned by reads from /sys/power/state. If that happens, a
@@ -192,7 +192,7 @@ Description: · 10 unmodified lines
192		192
193	What: /sys/power/wake_lock	193	What: /sys/power/wake_lock
194	Date: February 2012	194	Date: February 2012
195	Contact: Rafael J. Wysocki <rjw@sisk.pl>	195	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
196	Description:	196	Description:
197	The /sys/power/wake_lock file allows user space to create	197	The /sys/power/wake_lock file allows user space to create
198	wakeup source objects and activate them on demand (if one of	198	wakeup source objects and activate them on demand (if one of
@@ -219,7 +219,7 @@ Description: · 20 unmodified lines
219		219
220	What: /sys/power/wake_unlock	220	What: /sys/power/wake_unlock
221	Date: February 2012	221	Date: February 2012
222	Contact: Rafael J. Wysocki <rjw@sisk.pl>	222	Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
223	Description:	223	Description:
224	The /sys/power/wake_unlock file allows user space to deactivate	224	The /sys/power/wake_unlock file allows user space to deactivate
225	wakeup sources created with the help of /sys/power/wake_lock.	225	wakeup sources created with the help of /sys/power/wake_lock.

Documentation/acpi/dsdt-override.txt+1−1

@@ -4,4 +4,4 @@ CONFIG_ACPI_CUSTOM_DSDT builds the image into the kernel. · 3 unmodified lines
4		4
5	When to use this method is described in detail on the	5	When to use this method is described in detail on the
6	Linux/ACPI home page:	6	Linux/ACPI home page:
7	http://www.lesswatts.org/projects/acpi/overridingDSDT.php	7	https://01.org/linux-acpi/documentation/overriding-dsdt

Documentation/devicetree/bindings/memory.txt+0−168

@@ -1,168 +0,0 @@
1	* Memory binding *
2
3	The /memory node provides basic information about the address and size
4	of the physical memory. This node is usually filled or updated by the
5	bootloader, depending on the actual memory configuration of the given
6	hardware.
7
8	The memory layout is described by the following node:
9
10	/ {
11	#address-cells = <(n)>;
12	#size-cells = <(m)>;
13	memory {
14	device_type = "memory";
15	reg = <(baseaddr1) (size1)
16	(baseaddr2) (size2)
17	...
18	(baseaddrN) (sizeN)>;
19	};
20	...
21	};
22
23	A memory node follows the typical device tree rules for "reg" property:
24	n: number of cells used to store base address value
25	m: number of cells used to store size value
26	baseaddrX: defines a base address of the defined memory bank
27	sizeX: the size of the defined memory bank
28
29
30	More than one memory bank can be defined.
31
32
33	* Reserved memory regions *
34
35	In /memory/reserved-memory node one can create child nodes describing
36	particular reserved (excluded from normal use) memory regions. Such
37	memory regions are usually designed for the special usage by various
38	device drivers. A good example are contiguous memory allocations or
39	memory sharing with other operating system on the same hardware board.
40	Those special memory regions might depend on the board configuration and
41	devices used on the target system.
42
43	Parameters for each memory region can be encoded into the device tree
44	with the following convention:
45
46	[(label):] (name) {
47	compatible = "linux,contiguous-memory-region", "reserved-memory-region";
48	reg = <(address) (size)>;
49	(linux,default-contiguous-region);
50	};
51
52	compatible: one or more of:
53	- "linux,contiguous-memory-region" - enables binding of this
54	region to Contiguous Memory Allocator (special region for
55	contiguous memory allocations, shared with movable system
56	memory, Linux kernel-specific).
57	- "reserved-memory-region" - compatibility is defined, given
58	region is assigned for exclusive usage for by the respective
59	devices.
60
61	reg: standard property defining the base address and size of
62	the memory region
63
64	linux,default-contiguous-region: property indicating that the region
65	is the default region for all contiguous memory
66	allocations, Linux specific (optional)
67
68	It is optional to specify the base address, so if one wants to use
69	autoconfiguration of the base address, '0' can be specified as a base
70	address in the 'reg' property.
71
72	The /memory/reserved-memory node must contain the same #address-cells
73	and #size-cells value as the root node.
74
75
76	* Device node's properties *
77
78	Once regions in the /memory/reserved-memory node have been defined, they
79	may be referenced by other device nodes. Bindings that wish to reference
80	memory regions should explicitly document their use of the following
81	property:
82
83	memory-region = <&phandle_to_defined_region>;
84
85	This property indicates that the device driver should use the memory
86	region pointed by the given phandle.
87
88
89	* Example *
90
91	This example defines a memory consisting of 4 memory banks. 3 contiguous
92	regions are defined for Linux kernel, one default of all device drivers
93	(named contig_mem, placed at 0x72000000, 64MiB), one dedicated to the
94	framebuffer device (labelled display_mem, placed at 0x78000000, 8MiB)
95	and one for multimedia processing (labelled multimedia_mem, placed at
96	0x77000000, 64MiB). 'display_mem' region is then assigned to fb@12300000
97	device for DMA memory allocations (Linux kernel drivers will use CMA is
98	available or dma-exclusive usage otherwise). 'multimedia_mem' is
99	assigned to scaler@12500000 and codec@12600000 devices for contiguous
100	memory allocations when CMA driver is enabled.
101
102	The reason for creating a separate region for framebuffer device is to
103	match the framebuffer base address to the one configured by bootloader,
104	so once Linux kernel drivers starts no glitches on the displayed boot
105	logo appears. Scaller and codec drivers should share the memory
106	allocations.
107
108	/ {
109	#address-cells = <1>;
110	#size-cells = <1>;
111
112	/* ... */
113
114	memory {
115	reg = <0x40000000 0x10000000
116	0x50000000 0x10000000
117	0x60000000 0x10000000
118	0x70000000 0x10000000>;
119
120	reserved-memory {
121	#address-cells = <1>;
122	#size-cells = <1>;
123
124	/*
125	* global autoconfigured region for contiguous allocations
126	* (used only with Contiguous Memory Allocator)
127	*/
128	contig_region@0 {
129	compatible = "linux,contiguous-memory-region";
130	reg = <0x0 0x4000000>;
131	linux,default-contiguous-region;
132	};
133
134	/*
135	* special region for framebuffer
136	*/
137	display_region: region@78000000 {
138	compatible = "linux,contiguous-memory-region", "reserved-memory-region";
139	reg = <0x78000000 0x800000>;
140	};
141
142	/*
143	* special region for multimedia processing devices
144	*/
145	multimedia_region: region@77000000 {
146	compatible = "linux,contiguous-memory-region";
147	reg = <0x77000000 0x4000000>;
148	};
149	};
150	};
151
152	/* ... */
153
154	fb0: fb@12300000 {
155	status = "okay";
156	memory-region = <&display_region>;
157	};
158
159	scaler: scaler@12500000 {
160	status = "okay";
161	memory-region = <&multimedia_region>;
162	};
163
164	codec: codec@12600000 {
165	status = "okay";
166	memory-region = <&multimedia_region>;
167	};
168	};

Documentation/devicetree/bindings/mmc/tmio_mmc.txt+10−7

 described in mmc.txt, can be used. Additionally the following tmio_mmc-specific
 optional bindings can be used.
+Required properties:
+- compatible:	"renesas,sdhi-shmobile" - a generic sh-mobile SDHI unit
+		"renesas,sdhi-sh7372" - SDHI IP on SH7372 SoC
+		"renesas,sdhi-sh73a0" - SDHI IP on SH73A0 SoC
+		"renesas,sdhi-r8a73a4" - SDHI IP on R8A73A4 SoC
+		"renesas,sdhi-r8a7740" - SDHI IP on R8A7740 SoC
+		"renesas,sdhi-r8a7778" - SDHI IP on R8A7778 SoC
+		"renesas,sdhi-r8a7779" - SDHI IP on R8A7779 SoC
+		"renesas,sdhi-r8a7790" - SDHI IP on R8A7790 SoC
 Optional properties:
 - toshiba,mmc-wrprotect-disable: write-protect detection is unavailable
-When used with Renesas SDHI hardware, the following compatibility strings
-configure various model-specific properties:
-"renesas,sh7372-sdhi":	(default) compatible with SH7372
-"renesas,r8a7740-sdhi":	compatible with R8A7740: certain MMC/SD commands have to
-			wait for the interface to become idle.

Documentation/sound/alsa/HD-Audio-Models.txt+1−0

@@ -28,6 +28,7 @@ ALC269/270/275/276/28x/29x · 27 unmodified lines
28	alc269-dmic Enable ALC269(VA) digital mic workaround	28	alc269-dmic Enable ALC269(VA) digital mic workaround
29	alc271-dmic Enable ALC271X digital mic workaround	29	alc271-dmic Enable ALC271X digital mic workaround
30	inv-dmic Inverted internal mic workaround	30	inv-dmic Inverted internal mic workaround
		31	headset-mic Indicates a combined headset (headphone+mic) jack
31	lenovo-dock Enables docking station I/O for some Lenovos	32	lenovo-dock Enables docking station I/O for some Lenovos
32	dell-headset-multi Headset jack, which can also be used as mic-in	33	dell-headset-multi Headset jack, which can also be used as mic-in
33	dell-headset-dock Headset jack (without mic-in), and also dock I/O	34	dell-headset-dock Headset jack (without mic-in), and also dock I/O

MAINTAINERS+40−14

@@ -237,11 +237,11 @@ F: drivers/platform/x86/acer-wmi.c · 236 unmodified lines
237		237
238	ACPI	238	ACPI
239	M: Len Brown <lenb@kernel.org>	239	M: Len Brown <lenb@kernel.org>
240	M: Rafael J. Wysocki <rjw@sisk.pl>	240	M: Rafael J. Wysocki <rjw@rjwysocki.net>
241	L: linux-acpi@vger.kernel.org	241	L: linux-acpi@vger.kernel.org
242	W: http://www.lesswatts.org/projects/acpi/	242	W: https://01.org/linux-acpi
243	Q: http://patchwork.kernel.org/project/linux-acpi/list/	243	Q: https://patchwork.kernel.org/project/linux-acpi/list/
244	T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	244	T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
245	S: Supported	245	S: Supported
246	F: drivers/acpi/	246	F: drivers/acpi/
247	F: drivers/pnp/pnpacpi/	247	F: drivers/pnp/pnpacpi/
@@ -256,21 +256,21 @@ F: drivers/pci///acpi · 8 unmodified lines
256	ACPI FAN DRIVER	256	ACPI FAN DRIVER
257	M: Zhang Rui <rui.zhang@intel.com>	257	M: Zhang Rui <rui.zhang@intel.com>
258	L: linux-acpi@vger.kernel.org	258	L: linux-acpi@vger.kernel.org
259	W: http://www.lesswatts.org/projects/acpi/	259	W: https://01.org/linux-acpi
260	S: Supported	260	S: Supported
261	F: drivers/acpi/fan.c	261	F: drivers/acpi/fan.c
262		262
263	ACPI THERMAL DRIVER	263	ACPI THERMAL DRIVER
264	M: Zhang Rui <rui.zhang@intel.com>	264	M: Zhang Rui <rui.zhang@intel.com>
265	L: linux-acpi@vger.kernel.org	265	L: linux-acpi@vger.kernel.org
266	W: http://www.lesswatts.org/projects/acpi/	266	W: https://01.org/linux-acpi
267	S: Supported	267	S: Supported
268	F: drivers/acpi/thermal	268	F: drivers/acpi/thermal
269		269
270	ACPI VIDEO DRIVER	270	ACPI VIDEO DRIVER
271	M: Zhang Rui <rui.zhang@intel.com>	271	M: Zhang Rui <rui.zhang@intel.com>
272	L: linux-acpi@vger.kernel.org	272	L: linux-acpi@vger.kernel.org
273	W: http://www.lesswatts.org/projects/acpi/	273	W: https://01.org/linux-acpi
274	S: Supported	274	S: Supported
275	F: drivers/acpi/video.c	275	F: drivers/acpi/video.c
276		276
@@ -824,15 +824,21 @@ S: Maintained · 547 unmodified lines
824	F: arch/arm/mach-gemini/	824	F: arch/arm/mach-gemini/
825		825
826	ARM/CSR SIRFPRIMA2 MACHINE SUPPORT	826	ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
827	M: Barry Song <baohua.song@csr.com>	827	M: Barry Song <baohua@kernel.org>
828	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)	828	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
829	T: git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git	829	T: git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git
830	S: Maintained	830	S: Maintained
831	F: arch/arm/mach-prima2/	831	F: arch/arm/mach-prima2/
		832	F: drivers/clk/clk-prima2.c
		833	F: drivers/clocksource/timer-prima2.c
		834	F: drivers/clocksource/timer-marco.c
832	F: drivers/dma/sirf-dma.c	835	F: drivers/dma/sirf-dma.c
833	F: drivers/i2c/busses/i2c-sirf.c	836	F: drivers/i2c/busses/i2c-sirf.c
		837	F: drivers/input/misc/sirfsoc-onkey.c
		838	F: drivers/irqchip/irq-sirfsoc.c
834	F: drivers/mmc/host/sdhci-sirf.c	839	F: drivers/mmc/host/sdhci-sirf.c
835	F: drivers/pinctrl/sirf/	840	F: drivers/pinctrl/sirf/
		841	F: drivers/rtc/rtc-sirfsoc.c
836	F: drivers/spi/spi-sirf.c	842	F: drivers/spi/spi-sirf.c
837		843
838	ARM/EBSA110 MACHINE SUPPORT	844	ARM/EBSA110 MACHINE SUPPORT
@@ -2295,7 +2301,7 @@ S: Maintained · 1456 unmodified lines
2295	F: drivers/net/ethernet/ti/cpmac.c	2301	F: drivers/net/ethernet/ti/cpmac.c
2296		2302
2297	CPU FREQUENCY DRIVERS	2303	CPU FREQUENCY DRIVERS
2298	M: Rafael J. Wysocki <rjw@sisk.pl>	2304	M: Rafael J. Wysocki <rjw@rjwysocki.net>
2299	M: Viresh Kumar <viresh.kumar@linaro.org>	2305	M: Viresh Kumar <viresh.kumar@linaro.org>
2300	L: cpufreq@vger.kernel.org	2306	L: cpufreq@vger.kernel.org
2301	L: linux-pm@vger.kernel.org	2307	L: linux-pm@vger.kernel.org
@@ -2326,7 +2332,7 @@ S: Maintained · 24 unmodified lines
2326	F: drivers/cpuidle/cpuidle-big_little.c	2332	F: drivers/cpuidle/cpuidle-big_little.c
2327		2333
2328	CPUIDLE DRIVERS	2334	CPUIDLE DRIVERS
2329	M: Rafael J. Wysocki <rjw@sisk.pl>	2335	M: Rafael J. Wysocki <rjw@rjwysocki.net>
2330	M: Daniel Lezcano <daniel.lezcano@linaro.org>	2336	M: Daniel Lezcano <daniel.lezcano@linaro.org>
2331	L: linux-pm@vger.kernel.org	2337	L: linux-pm@vger.kernel.org
2332	S: Maintained	2338	S: Maintained
@@ -3548,7 +3554,7 @@ F: fs/freevxfs/ · 1215 unmodified lines
3548		3554
3549	FREEZER	3555	FREEZER
3550	M: Pavel Machek <pavel@ucw.cz>	3556	M: Pavel Machek <pavel@ucw.cz>
3551	M: "Rafael J. Wysocki" <rjw@sisk.pl>	3557	M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
3552	L: linux-pm@vger.kernel.org	3558	L: linux-pm@vger.kernel.org
3553	S: Supported	3559	S: Supported
3554	F: Documentation/power/freezing-of-tasks.txt	3560	F: Documentation/power/freezing-of-tasks.txt
@@ -3619,6 +3625,12 @@ L: linux-scsi@vger.kernel.org · 64 unmodified lines
3619	S: Odd Fixes (e.g., new signatures)	3625	S: Odd Fixes (e.g., new signatures)
3620	F: drivers/scsi/fdomain.*	3626	F: drivers/scsi/fdomain.*
3621		3627
		3628	GCOV BASED KERNEL PROFILING
		3629	M: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
		3630	S: Maintained
		3631	F: kernel/gcov/
		3632	F: Documentation/gcov.txt
		3633
3622	GDT SCSI DISK ARRAY CONTROLLER DRIVER	3634	GDT SCSI DISK ARRAY CONTROLLER DRIVER
3623	M: Achim Leubner <achim_leubner@adaptec.com>	3635	M: Achim Leubner <achim_leubner@adaptec.com>
3624	L: linux-scsi@vger.kernel.org	3636	L: linux-scsi@vger.kernel.org
@@ -3884,7 +3896,7 @@ F: drivers/video/hgafb.c · 259 unmodified lines
3884		3896
3885	HIBERNATION (aka Software Suspend, aka swsusp)	3897	HIBERNATION (aka Software Suspend, aka swsusp)
3886	M: Pavel Machek <pavel@ucw.cz>	3898	M: Pavel Machek <pavel@ucw.cz>
3887	M: "Rafael J. Wysocki" <rjw@sisk.pl>	3899	M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
3888	L: linux-pm@vger.kernel.org	3900	L: linux-pm@vger.kernel.org
3889	S: Supported	3901	S: Supported
3890	F: arch/x86/power/	3902	F: arch/x86/power/
@@ -4334,7 +4346,7 @@ F: drivers/video/i810/ · 443 unmodified lines
4334	INTEL MENLOW THERMAL DRIVER	4346	INTEL MENLOW THERMAL DRIVER
4335	M: Sujith Thomas <sujith.thomas@intel.com>	4347	M: Sujith Thomas <sujith.thomas@intel.com>
4336	L: platform-driver-x86@vger.kernel.org	4348	L: platform-driver-x86@vger.kernel.org
4337	W: http://www.lesswatts.org/projects/acpi/	4349	W: https://01.org/linux-acpi
4338	S: Supported	4350	S: Supported
4339	F: drivers/platform/x86/intel_menlow.c	4351	F: drivers/platform/x86/intel_menlow.c
4340		4352
@@ -4471,6 +4483,13 @@ L: linux-serial@vger.kernel.org · 130 unmodified lines
4471	S: Maintained	4483	S: Maintained
4472	F: drivers/tty/serial/ioc3_serial.c	4484	F: drivers/tty/serial/ioc3_serial.c
4473		4485
		4486	IOMMU DRIVERS
		4487	M: Joerg Roedel <joro@8bytes.org>
		4488	L: iommu@lists.linux-foundation.org
		4489	T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
		4490	S: Maintained
		4491	F: drivers/iommu/
		4492
4474	IP MASQUERADING	4493	IP MASQUERADING
4475	M: Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>	4494	M: Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
4476	S: Maintained	4495	S: Maintained
@@ -7812,6 +7831,13 @@ F: Documentation/sound/alsa/soc/ · 3335 unmodified lines
7812	F: sound/soc/	7831	F: sound/soc/
7813	F: include/sound/soc*	7832	F: include/sound/soc*
7814		7833
		7834	SOUND - DMAENGINE HELPERS
		7835	M: Lars-Peter Clausen <lars@metafoo.de>
		7836	S: Supported
		7837	F: include/sound/dmaengine_pcm.h
		7838	F: sound/core/pcm_dmaengine.c
		7839	F: sound/soc/soc-generic-dmaengine-pcm.c
		7840
7815	SPARC + UltraSPARC (sparc/sparc64)	7841	SPARC + UltraSPARC (sparc/sparc64)
7816	M: "David S. Miller" <davem@davemloft.net>	7842	M: "David S. Miller" <davem@davemloft.net>
7817	L: sparclinux@vger.kernel.org	7843	L: sparclinux@vger.kernel.org
@@ -8091,7 +8117,7 @@ F: drivers/sh/ · 273 unmodified lines
8091	SUSPEND TO RAM	8117	SUSPEND TO RAM
8092	M: Len Brown <len.brown@intel.com>	8118	M: Len Brown <len.brown@intel.com>
8093	M: Pavel Machek <pavel@ucw.cz>	8119	M: Pavel Machek <pavel@ucw.cz>
8094	M: "Rafael J. Wysocki" <rjw@sisk.pl>	8120	M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
8095	L: linux-pm@vger.kernel.org	8121	L: linux-pm@vger.kernel.org
8096	S: Supported	8122	S: Supported
8097	F: Documentation/power/	8123	F: Documentation/power/

Makefile+1−1

@@ -1,7 +1,7 @@
1	VERSION = 3	1	VERSION = 3
2	PATCHLEVEL = 12	2	PATCHLEVEL = 12
3	SUBLEVEL = 0	3	SUBLEVEL = 0
4	EXTRAVERSION = -rc3	4	EXTRAVERSION = -rc6
5	NAME = One Giant Leap for Frogkind	5	NAME = One Giant Leap for Frogkind
6		6
7	# DOCUMENTATION	7	# DOCUMENTATION

arch/arc/kernel/ptrace.c+1−1

@@ -102,7 +102,7 @@ static int genregs_set(struct task_struct *target, · 101 unmodified lines
102	REG_IGNORE_ONE(pad2);	102	REG_IGNORE_ONE(pad2);
103	REG_IN_CHUNK(callee, efa, cregs); /* callee_regs[r25..r13] */	103	REG_IN_CHUNK(callee, efa, cregs); /* callee_regs[r25..r13] */
104	REG_IGNORE_ONE(efa); /* efa update invalid */	104	REG_IGNORE_ONE(efa); /* efa update invalid */
105	REG_IN_ONE(stop_pc, &ptregs->ret); /* stop_pc: PC update */	105	REG_IGNORE_ONE(stop_pc); /* PC updated via @ret */
106		106
107	return ret;	107	return ret;
108	}	108	}

arch/arc/kernel/signal.c+13−12

 {
 	struct rt_sigframe __user *sf;
 	unsigned int magic;
-	int err;
 	struct pt_regs *regs = current_pt_regs();
 	/* Always make any pending restarted system calls return -EINTR */
 	if (!access_ok(VERIFY_READ, sf, sizeof(*sf)))
 		goto badframe;
-	err = restore_usr_regs(regs, sf);
+	if (__get_user(magic, &sf->sigret_magic))
-	err |= __get_user(magic, &sf->sigret_magic);
-	if (err)
 		goto badframe;
 	if (unlikely(is_do_ss_needed(magic)))
 		if (restore_altstack(&sf->uc.uc_stack))
 			goto badframe;
+	if (restore_usr_regs(regs, sf))
+		goto badframe;
 	/* Don't restart from sigreturn */
 	syscall_wont_restart(regs);
 	if (!sf)
 		return 1;
+	/*
+	 * w/o SA_SIGINFO, struct ucontext is partially populated (only
+	 * uc_mcontext/uc_sigmask) for kernel's normal user state preservation
+	 * during signal handler execution. This works for SA_SIGINFO as well
+	 * although the semantics are now overloaded (the same reg state can be
+	 * inspected by userland: but are they allowed to fiddle with it ?
+	 */
+	err |= stash_usr_regs(sf, regs, set);
 	/*
 	 * SA_SIGINFO requires 3 args to signal handler:
 	 *  #1: sig-no (common to any handler)
 		magic = MAGIC_SIGALTSTK;
 	}
-	/*
-	 * w/o SA_SIGINFO, struct ucontext is partially populated (only
-	 * uc_mcontext/uc_sigmask) for kernel's normal user state preservation
-	 * during signal handler execution. This works for SA_SIGINFO as well
-	 * although the semantics are now overloaded (the same reg state can be
-	 * inspected by userland: but are they allowed to fiddle with it ?
-	 */
-	err |= stash_usr_regs(sf, regs, set);
 	err |= __put_user(magic, &sf->sigret_magic);
 	if (err)
 		return err;

arch/arm/Makefile+7−2

 # Convert bzImage to zImage
 bzImage: zImage
-zImage Image xipImage bootpImage uImage: vmlinux
+BOOT_TARGETS	= zImage Image xipImage bootpImage uImage
+INSTALL_TARGETS	= zinstall uinstall install
+PHONY += bzImage $(BOOT_TARGETS) $(INSTALL_TARGETS)
+$(BOOT_TARGETS): vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
-zinstall uinstall install: vmlinux
+$(INSTALL_TARGETS):
 	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 %.dtb: | scripts

arch/arm/boot/Makefile+8−8

arch/arm/boot/dts/Makefile+2−0

@@ -41,6 +41,8 @@ dtb-$(CONFIG_ARCH_AT91) += sama5d33ek.dtb · 40 unmodified lines
41	dtb-$(CONFIG_ARCH_AT91) += sama5d34ek.dtb	41	dtb-$(CONFIG_ARCH_AT91) += sama5d34ek.dtb
42	dtb-$(CONFIG_ARCH_AT91) += sama5d35ek.dtb	42	dtb-$(CONFIG_ARCH_AT91) += sama5d35ek.dtb
43		43
		44	dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
		45
44	dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb	46	dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
45	dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb \	47	dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb \
46	bcm28155-ap.dtb	48	bcm28155-ap.dtb

arch/arm/boot/dts/armada-370-netgear-rn102.dts+32−17

 	};
 	soc {
+		ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000
+			  MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
+		pcie-controller {
+			status = "okay";
+			/* Connected to Marvell SATA controller */
+			pcie@1,0 {
+				/* Port 0, Lane 0 */
+				status = "okay";
+			};
+			/* Connected to FL1009 USB 3.0 controller */
+			pcie@2,0 {
+				/* Port 1, Lane 0 */
+				status = "okay";
+			};
+		};
 		internal-regs {
 			serial@12000 {
 				clock-frequency = <200000000>;
 					marvell,pins = "mpp56";
 					marvell,function = "gpio";
 				};
+				poweroff: poweroff {
+					marvell,pins = "mpp8";
+					marvell,function = "gpio";
+				};
 			};
 			mdio {
 					pwm_polarity = <0>;
 				};
 			};
-			pcie-controller {
-				status = "okay";
-				/* Connected to Marvell SATA controller */
-				pcie@1,0 {
-					/* Port 0, Lane 0 */
-					status = "okay";
-				};
-				/* Connected to FL1009 USB 3.0 controller */
-				pcie@2,0 {
-					/* Port 1, Lane 0 */
-					status = "okay";
-				};
-			};
 		};
 	};
 		button@1 {
 			label = "Power Button";
 			linux,code = <116>;     /* KEY_POWER */
-			gpios = <&gpio1 30 1>;
+			gpios = <&gpio1 30 0>;
 		};
 		button@2 {
 		};
 	};
+	gpio_poweroff {
+		compatible = "gpio-poweroff";
+		pinctrl-0 = <&poweroff>;
+		pinctrl-names = "default";
+		gpios = <&gpio0 8 1>;
+	};
 };

arch/arm/boot/dts/armada-xp.dtsi+11−0

@@ -70,6 +70,8 @@ · 69 unmodified lines
70		70
71	timer@20300 {	71	timer@20300 {
72	compatible = "marvell,armada-xp-timer";	72	compatible = "marvell,armada-xp-timer";
		73	clocks = <&coreclk 2>, <&refclk>;
		74	clock-names = "nbclk", "fixed";
73	};	75	};
74		76
75	coreclk: mvebu-sar@18230 {	77	coreclk: mvebu-sar@18230 {
@@ -169,4 +171,13 @@ · 93 unmodified lines
169	};	171	};
170	};	172	};
171	};	173	};
		174
		175	clocks {
		176	/* 25 MHz reference crystal */
		177	refclk: oscillator {
		178	compatible = "fixed-clock";
		179	#clock-cells = <0>;
		180	clock-frequency = <25000000>;
		181	};
		182	};
172	};	183	};

arch/arm/boot/dts/at91sam9x5.dtsi+4−2

 							 AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_NONE>;	/* PA8 periph A */
 					};
-					pinctrl_uart2_rts: uart2_rts-0 {
+					pinctrl_usart2_rts: usart2_rts-0 {
 						atmel,pins =
 							<AT91_PIOB 0 AT91_PERIPH_B AT91_PINCTRL_NONE>;	/* PB0 periph B */
 					};
-					pinctrl_uart2_cts: uart2_cts-0 {
+					pinctrl_usart2_cts: usart2_cts-0 {
 						atmel,pins =
 							<AT91_PIOB 1 AT91_PERIPH_B AT91_PINCTRL_NONE>;	/* PB1 periph B */
 					};
 				interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>;
 				dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(0)>;
 				dma-names = "rxtx";
+				pinctrl-names = "default";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				status = "disabled";
 				interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0>;
 				dmas = <&dma1 1 AT91_DMA_CFG_PER_ID(0)>;
 				dma-names = "rxtx";
+				pinctrl-names = "default";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				status = "disabled";

arch/arm/boot/dts/atlas6.dtsi+12−0

 				interrupts = <17>;
 				fifosize = <128>;
 				clocks = <&clks 13>;
+				sirf,uart-dma-rx-channel = <21>;
+				sirf,uart-dma-tx-channel = <2>;
 			};
 			uart1: uart@b0060000 {
 				interrupts = <19>;
 				fifosize = <128>;
 				clocks = <&clks 15>;
+				sirf,uart-dma-rx-channel = <6>;
+				sirf,uart-dma-tx-channel = <7>;
 			};
 			usp0: usp@b0080000 {
 				compatible = "sirf,prima2-usp";
 				reg = <0xb0080000 0x10000>;
 				interrupts = <20>;
+				fifosize = <128>;
 				clocks = <&clks 28>;
+				sirf,usp-dma-rx-channel = <17>;
+				sirf,usp-dma-tx-channel = <18>;
 			};
 			usp1: usp@b0090000 {
 				compatible = "sirf,prima2-usp";
 				reg = <0xb0090000 0x10000>;
 				interrupts = <21>;
+				fifosize = <128>;
 				clocks = <&clks 29>;
+				sirf,usp-dma-rx-channel = <14>;
+				sirf,usp-dma-tx-channel = <15>;
 			};
 			dmac0: dma-controller@b00b0000 {
 				compatible = "sirf,prima2-vip";
 				reg = <0xb00C0000 0x10000>;
 				clocks = <&clks 31>;
+				interrupts = <14>;
+				sirf,vip-dma-rx-channel = <16>;
 			};
 			spi0: spi@b00d0000 {

arch/arm/boot/dts/exynos5250.dtsi+5−0

 			     <1 14 0xf08>,
 			     <1 11 0xf08>,
 			     <1 10 0xf08>;
+		/* Unfortunately we need this since some versions of U-Boot
+		 * on Exynos don't set the CNTFRQ register, so we need the
+		 * value from DT.
+		 */
+		clock-frequency = <24000000>;
 	};
 	mct@101C0000 {

arch/arm/boot/dts/kirkwood.dtsi+2−1

 		cpu@0 {
 			device_type = "cpu";
 			compatible = "marvell,feroceon";
+			reg = <0>;
 			clocks = <&core_clk 1>, <&core_clk 3>, <&gate_clk 11>;
 			clock-names = "cpu_clk", "ddrclk", "powersave";
 		};
 		xor@60900 {
 			compatible = "marvell,orion-xor";
 			reg = <0x60900 0x100
-			       0xd0B00 0x100>;
+			       0x60B00 0x100>;
 			status = "okay";
 			clocks = <&gate_clk 16>;

arch/arm/boot/dts/omap3-beagle-xm.dts+1−1

@@ -11,7 +11,7 @@ · 10 unmodified lines
11		11
12	/ {	12	/ {
13	model = "TI OMAP3 BeagleBoard xM";	13	model = "TI OMAP3 BeagleBoard xM";
14	compatible = "ti,omap3-beagle-xm", "ti,omap3-beagle", "ti,omap3";	14	compatible = "ti,omap3-beagle-xm", "ti,omap36xx", "ti,omap3";
15		15
16	cpus {	16	cpus {
17	cpu@0 {	17	cpu@0 {

arch/arm/boot/dts/omap3.dtsi+2−2

@@ -108,7 +108,7 @@ · 107 unmodified lines
108	#address-cells = <1>;	108	#address-cells = <1>;
109	#size-cells = <0>;	109	#size-cells = <0>;
110	pinctrl-single,register-width = <16>;	110	pinctrl-single,register-width = <16>;
111	pinctrl-single,function-mask = <0x7f1f>;	111	pinctrl-single,function-mask = <0xff1f>;
112	};	112	};
113		113
114	omap3_pmx_wkup: pinmux@0x48002a00 {	114	omap3_pmx_wkup: pinmux@0x48002a00 {
@@ -117,7 +117,7 @@ · 2 unmodified lines
117	#address-cells = <1>;	117	#address-cells = <1>;
118	#size-cells = <0>;	118	#size-cells = <0>;
119	pinctrl-single,register-width = <16>;	119	pinctrl-single,register-width = <16>;
120	pinctrl-single,function-mask = <0x7f1f>;	120	pinctrl-single,function-mask = <0xff1f>;
121	};	121	};
122		122
123	gpio1: gpio@48310000 {	123	gpio1: gpio@48310000 {

arch/arm/boot/dts/prima2.dtsi+23−4

 			compatible = "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges = <0xb0000000 0xb0000000 0x180000>;
+			ranges = <0xb0000000 0xb0000000 0x180000>,
+			       <0x56000000 0x56000000 0x1b00000>;
 			timer@b0020000 {
 				compatible = "sirf,prima2-tick";
 			uart0: uart@b0050000 {
 				cell-index = <0>;
 				compatible = "sirf,prima2-uart";
-				reg = <0xb0050000 0x10000>;
+				reg = <0xb0050000 0x1000>;
 				interrupts = <17>;
+				fifosize = <128>;
 				clocks = <&clks 13>;
+				sirf,uart-dma-rx-channel = <21>;
+				sirf,uart-dma-tx-channel = <2>;
 			};
 			uart1: uart@b0060000 {
 				cell-index = <1>;
 				compatible = "sirf,prima2-uart";
-				reg = <0xb0060000 0x10000>;
+				reg = <0xb0060000 0x1000>;
 				interrupts = <18>;
+				fifosize = <32>;
 				clocks = <&clks 14>;
 			};
 			uart2: uart@b0070000 {
 				cell-index = <2>;
 				compatible = "sirf,prima2-uart";
-				reg = <0xb0070000 0x10000>;
+				reg = <0xb0070000 0x1000>;
 				interrupts = <19>;
+				fifosize = <128>;
 				clocks = <&clks 15>;
+				sirf,uart-dma-rx-channel = <6>;
+				sirf,uart-dma-tx-channel = <7>;
 			};
 			usp0: usp@b0080000 {
 				compatible = "sirf,prima2-usp";
 				reg = <0xb0080000 0x10000>;
 				interrupts = <20>;
+				fifosize = <128>;
 				clocks = <&clks 28>;
+				sirf,usp-dma-rx-channel = <17>;
+				sirf,usp-dma-tx-channel = <18>;
 			};
 			usp1: usp@b0090000 {
 				compatible = "sirf,prima2-usp";
 				reg = <0xb0090000 0x10000>;
 				interrupts = <21>;
+				fifosize = <128>;
 				clocks = <&clks 29>;
+				sirf,usp-dma-rx-channel = <14>;
+				sirf,usp-dma-tx-channel = <15>;
 			};
 			usp2: usp@b00a0000 {
 				compatible = "sirf,prima2-usp";
 				reg = <0xb00a0000 0x10000>;
 				interrupts = <22>;
+				fifosize = <128>;
 				clocks = <&clks 30>;
+				sirf,usp-dma-rx-channel = <10>;
+				sirf,usp-dma-tx-channel = <11>;
 			};
 			dmac0: dma-controller@b00b0000 {
 				compatible = "sirf,prima2-vip";
 				reg = <0xb00C0000 0x10000>;
 				clocks = <&clks 31>;
+				interrupts = <14>;
+				sirf,vip-dma-rx-channel = <16>;
 			};
 			spi0: spi@b00d0000 {

arch/arm/boot/dts/r8a73a4.dtsi+3−3

@@ -193,7 +193,7 @@ · 192 unmodified lines
193	};	193	};
194		194
195	sdhi0: sdhi@ee100000 {	195	sdhi0: sdhi@ee100000 {
196	compatible = "renesas,r8a73a4-sdhi";	196	compatible = "renesas,sdhi-r8a73a4";
197	reg = <0 0xee100000 0 0x100>;	197	reg = <0 0xee100000 0 0x100>;
198	interrupt-parent = <&gic>;	198	interrupt-parent = <&gic>;
199	interrupts = <0 165 4>;	199	interrupts = <0 165 4>;
@@ -202,7 +202,7 @@ · 2 unmodified lines
202	};	202	};
203		203
204	sdhi1: sdhi@ee120000 {	204	sdhi1: sdhi@ee120000 {
205	compatible = "renesas,r8a73a4-sdhi";	205	compatible = "renesas,sdhi-r8a73a4";
206	reg = <0 0xee120000 0 0x100>;	206	reg = <0 0xee120000 0 0x100>;
207	interrupt-parent = <&gic>;	207	interrupt-parent = <&gic>;
208	interrupts = <0 166 4>;	208	interrupts = <0 166 4>;
@@ -211,7 +211,7 @@ · 2 unmodified lines
211	};	211	};
212		212
213	sdhi2: sdhi@ee140000 {	213	sdhi2: sdhi@ee140000 {
214	compatible = "renesas,r8a73a4-sdhi";	214	compatible = "renesas,sdhi-r8a73a4";
215	reg = <0 0xee140000 0 0x100>;	215	reg = <0 0xee140000 0 0x100>;
216	interrupt-parent = <&gic>;	216	interrupt-parent = <&gic>;
217	interrupts = <0 167 4>;	217	interrupts = <0 167 4>;

arch/arm/boot/dts/r8a7778.dtsi+0−1

@@ -96,6 +96,5 @@ · 95 unmodified lines
96	pfc: pfc@fffc0000 {	96	pfc: pfc@fffc0000 {
97	compatible = "renesas,pfc-r8a7778";	97	compatible = "renesas,pfc-r8a7778";
98	reg = <0xfffc000 0x118>;	98	reg = <0xfffc000 0x118>;
99	#gpio-range-cells = <3>;
100	};	99	};
101	};	100	};

arch/arm/boot/dts/r8a7779.dtsi+0−1

@@ -188,7 +188,6 @@ · 187 unmodified lines
188	pfc: pfc@fffc0000 {	188	pfc: pfc@fffc0000 {
189	compatible = "renesas,pfc-r8a7779";	189	compatible = "renesas,pfc-r8a7779";
190	reg = <0xfffc0000 0x23c>;	190	reg = <0xfffc0000 0x23c>;
191	#gpio-range-cells = <3>;
192	};	191	};
193		192
194	thermal@ffc48000 {	193	thermal@ffc48000 {

arch/arm/boot/dts/r8a7790.dtsi+4−5

 	pfc: pfc@e6060000 {
 		compatible = "renesas,pfc-r8a7790";
 		reg = <0 0xe6060000 0 0x250>;
-		#gpio-range-cells = <3>;
 	};
 	sdhi0: sdhi@ee100000 {
-		compatible = "renesas,r8a7790-sdhi";
+		compatible = "renesas,sdhi-r8a7790";
 		reg = <0 0xee100000 0 0x100>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 165 4>;
 	};
 	sdhi1: sdhi@ee120000 {
-		compatible = "renesas,r8a7790-sdhi";
+		compatible = "renesas,sdhi-r8a7790";
 		reg = <0 0xee120000 0 0x100>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 166 4>;
 	};
 	sdhi2: sdhi@ee140000 {
-		compatible = "renesas,r8a7790-sdhi";
+		compatible = "renesas,sdhi-r8a7790";
 		reg = <0 0xee140000 0 0x100>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 167 4>;
 	};
 	sdhi3: sdhi@ee160000 {
-		compatible = "renesas,r8a7790-sdhi";
+		compatible = "renesas,sdhi-r8a7790";
 		reg = <0 0xee160000 0 0x100>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 168 4>;

arch/arm/boot/dts/sh73a0.dtsi+3−3

@@ -196,7 +196,7 @@ · 195 unmodified lines
196	};	196	};
197		197
198	sdhi0: sdhi@ee100000 {	198	sdhi0: sdhi@ee100000 {
199	compatible = "renesas,r8a7740-sdhi";	199	compatible = "renesas,sdhi-r8a7740";
200	reg = <0xee100000 0x100>;	200	reg = <0xee100000 0x100>;
201	interrupt-parent = <&gic>;	201	interrupt-parent = <&gic>;
202	interrupts = <0 83 4	202	interrupts = <0 83 4
@@ -208,7 +208,7 @@ · 5 unmodified lines
208		208
209	/* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */	209	/* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */
210	sdhi1: sdhi@ee120000 {	210	sdhi1: sdhi@ee120000 {
211	compatible = "renesas,r8a7740-sdhi";	211	compatible = "renesas,sdhi-r8a7740";
212	reg = <0xee120000 0x100>;	212	reg = <0xee120000 0x100>;
213	interrupt-parent = <&gic>;	213	interrupt-parent = <&gic>;
214	interrupts = <0 88 4	214	interrupts = <0 88 4
@@ -219,7 +219,7 @@ · 4 unmodified lines
219	};	219	};
220		220
221	sdhi2: sdhi@ee140000 {	221	sdhi2: sdhi@ee140000 {
222	compatible = "renesas,r8a7740-sdhi";	222	compatible = "renesas,sdhi-r8a7740";
223	reg = <0xee140000 0x100>;	223	reg = <0xee140000 0x100>;
224	interrupt-parent = <&gic>;	224	interrupt-parent = <&gic>;
225	interrupts = <0 104 4	225	interrupts = <0 104 4

arch/arm/boot/install.sh+14−0

@@ -20,6 +20,20 @@ · 19 unmodified lines
20	# $4 - default install path (blank if root directory)	20	# $4 - default install path (blank if root directory)
21	#	21	#
22		22
		23	verify () {
		24	if [ ! -f "$1" ]; then
		25	echo "" 1>&2
		26	echo " *** Missing file: $1" 1>&2
		27	echo ' *** You need to run "make" before "make install".' 1>&2
		28	echo "" 1>&2
		29	exit 1
		30	fi
		31	}
		32
		33	# Make sure the files actually exist
		34	verify "$2"
		35	verify "$3"
		36
23	# User may have a custom install script	37	# User may have a custom install script
24	if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi	38	if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
25	if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi	39	if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi

arch/arm/common/edma.c+31−7

 	.ccnt = 1,
 };
+static const struct of_device_id edma_of_ids[] = {
+	{ .compatible = "ti,edma3", },
+	{}
+};
 /*****************************************************************************/
 static void map_dmach_queue(unsigned ctlr, unsigned ch_no,
 static int prepare_unused_channel_list(struct device *dev, void *data)
 {
 	struct platform_device *pdev = to_platform_device(dev);
-	int i, ctlr;
+	int i, count, ctlr;
+	struct of_phandle_args  dma_spec;
+	if (dev->of_node) {
+		count = of_property_count_strings(dev->of_node, "dma-names");
+		if (count < 0)
+			return 0;
+		for (i = 0; i < count; i++) {
+			if (of_parse_phandle_with_args(dev->of_node, "dmas",
+						       "#dma-cells", i,
+						       &dma_spec))
+				continue;
+			if (!of_match_node(edma_of_ids, dma_spec.np)) {
+				of_node_put(dma_spec.np);
+				continue;
+			}
+			clear_bit(EDMA_CHAN_SLOT(dma_spec.args[0]),
+				  edma_cc[0]->edma_unused);
+			of_node_put(dma_spec.np);
+		}
+		return 0;
+	}
+	/* For non-OF case */
 	for (i = 0; i < pdev->num_resources; i++) {
 		if ((pdev->resource[i].flags & IORESOURCE_DMA) &&
 				(int)pdev->resource[i].start >= 0) {
 			ctlr = EDMA_CTLR(pdev->resource[i].start);
 			clear_bit(EDMA_CHAN_SLOT(pdev->resource[i].start),
-					edma_cc[ctlr]->edma_unused);
+				  edma_cc[ctlr]->edma_unused);
 		}
 	}
 	return 0;
 }
-static const struct of_device_id edma_of_ids[] = {
-	{ .compatible = "ti,edma3", },
-	{}
-};
 static struct platform_driver edma_driver = {
 	.driver = {
 		.name	= "edma",

arch/arm/common/mcpm_entry.c+4−2

 {
 	phys_reset_t phys_reset;
-	BUG_ON(!platform_ops);
+	if (WARN_ON_ONCE(!platform_ops || !platform_ops->power_down))
+		return;
 	BUG_ON(!irqs_disabled());
 	/*
 {
 	phys_reset_t phys_reset;
-	BUG_ON(!platform_ops);
+	if (WARN_ON_ONCE(!platform_ops || !platform_ops->suspend))
+		return;
 	BUG_ON(!irqs_disabled());
 	/* Very similar to mcpm_cpu_power_down() */

arch/arm/common/sharpsl_param.c+4−1

 #include <linux/module.h>
 #include <linux/string.h>
 #include <asm/mach/sharpsl_param.h>
+#include <asm/memory.h>
 /*
  * Certain hardware parameters determined at the time of device manufacture,
  */
 #ifdef CONFIG_ARCH_SA1100
 #define PARAM_BASE	0xe8ffc000
+#define param_start(x)	(void *)(x)
 #else
 #define PARAM_BASE	0xa0000a00
+#define param_start(x)	__va(x)
 #endif
 #define MAGIC_CHG(a,b,c,d) ( ( d << 24 ) | ( c << 16 )  | ( b << 8 ) | a )
 void sharpsl_save_param(void)
 {
-	memcpy(&sharpsl_param, (void *)PARAM_BASE, sizeof(struct sharpsl_param_info));
+	memcpy(&sharpsl_param, param_start(PARAM_BASE), sizeof(struct sharpsl_param_info));
 	if (sharpsl_param.comadj_keyword != COMADJ_MAGIC)
 		sharpsl_param.comadj=-1;

arch/arm/configs/multi_v7_defconfig+1−0

@@ -135,6 +135,7 @@ CONFIG_MMC=y · 134 unmodified lines
135	CONFIG_MMC_ARMMMCI=y	135	CONFIG_MMC_ARMMMCI=y
136	CONFIG_MMC_SDHCI=y	136	CONFIG_MMC_SDHCI=y
137	CONFIG_MMC_SDHCI_PLTFM=y	137	CONFIG_MMC_SDHCI_PLTFM=y
		138	CONFIG_MMC_SDHCI_ESDHC_IMX=y
138	CONFIG_MMC_SDHCI_TEGRA=y	139	CONFIG_MMC_SDHCI_TEGRA=y
139	CONFIG_MMC_SDHCI_SPEAR=y	140	CONFIG_MMC_SDHCI_SPEAR=y
140	CONFIG_MMC_OMAP=y	141	CONFIG_MMC_OMAP=y

arch/arm/include/asm/Kbuild+0−1

@@ -31,5 +31,4 @@ generic-y += termbits.h · 30 unmodified lines
31	generic-y += termios.h	31	generic-y += termios.h
32	generic-y += timex.h	32	generic-y += timex.h
33	generic-y += trace_clock.h	33	generic-y += trace_clock.h
34	generic-y += types.h
35	generic-y += unaligned.h	34	generic-y += unaligned.h

arch/arm/include/asm/jump_label.h+1−1

@@ -16,7 +16,7 @@ · 15 unmodified lines
16		16
17	static __always_inline bool arch_static_branch(struct static_key *key)	17	static __always_inline bool arch_static_branch(struct static_key *key)
18	{	18	{
19	asm goto("1:\n\t"	19	asm_volatile_goto("1:\n\t"
20	JUMP_LABEL_NOP "\n\t"	20	JUMP_LABEL_NOP "\n\t"
21	".pushsection __jump_table, \"aw\"\n\t"	21	".pushsection __jump_table, \"aw\"\n\t"
22	".word 1b, %l[l_yes], %c0\n\t"	22	".word 1b, %l[l_yes], %c0\n\t"

arch/arm/include/asm/mcpm.h+10−4

  *
  * This must be called with interrupts disabled.
  *
- * This does not return.  Re-entry in the kernel is expected via
+ * On success this does not return.  Re-entry in the kernel is expected
- * mcpm_entry_point.
+ * via mcpm_entry_point.
+ *
+ * This will return if mcpm_platform_register() has not been called
+ * previously in which case the caller should take appropriate action.
  */
 void mcpm_cpu_power_down(void);
  *
  * This must be called with interrupts disabled.
  *
- * This does not return.  Re-entry in the kernel is expected via
+ * On success this does not return.  Re-entry in the kernel is expected
- * mcpm_entry_point.
+ * via mcpm_entry_point.
+ *
+ * This will return if mcpm_platform_register() has not been called
+ * previously in which case the caller should take appropriate action.
  */
 void mcpm_cpu_suspend(u64 expected_residency);

arch/arm/include/asm/syscall.h+6−0

 					 unsigned int i, unsigned int n,
 					 unsigned long *args)
 {
+	if (n == 0)
+		return;
 	if (i + n > SYSCALL_MAX_ARGS) {
 		unsigned long *args_bad = args + SYSCALL_MAX_ARGS - i;
 		unsigned int n_bad = n + i - SYSCALL_MAX_ARGS;
 					 unsigned int i, unsigned int n,
 					 const unsigned long *args)
 {
+	if (n == 0)
+		return;
 	if (i + n > SYSCALL_MAX_ARGS) {
 		pr_warning("%s called with max args %d, handling only %d\n",
 			   __func__, i + n, SYSCALL_MAX_ARGS);

arch/arm/kernel/head.S+20−1

@@ -487,7 +487,26 @@ __fixup_smp: · 486 unmodified lines
487	mrc p15, 0, r0, c0, c0, 5 @ read MPIDR	487	mrc p15, 0, r0, c0, c0, 5 @ read MPIDR
488	and r0, r0, #0xc0000000 @ multiprocessing extensions and	488	and r0, r0, #0xc0000000 @ multiprocessing extensions and
489	teq r0, #0x80000000 @ not part of a uniprocessor system?	489	teq r0, #0x80000000 @ not part of a uniprocessor system?
490	moveq pc, lr @ yes, assume SMP	490	bne __fixup_smp_on_up @ no, assume UP
		491
		492	@ Core indicates it is SMP. Check for Aegis SOC where a single
		493	@ Cortex-A9 CPU is present but SMP operations fault.
		494	mov r4, #0x41000000
		495	orr r4, r4, #0x0000c000
		496	orr r4, r4, #0x00000090
		497	teq r3, r4 @ Check for ARM Cortex-A9
		498	movne pc, lr @ Not ARM Cortex-A9,
		499
		500	@ If a future SoC does use 0x0 as the PERIPH_BASE, then the
		501	@ below address check will need to be #ifdef'd or equivalent
		502	@ for the Aegis platform.
		503	mrc p15, 4, r0, c15, c0 @ get SCU base address
		504	teq r0, #0x0 @ '0' on actual UP A9 hardware
		505	beq __fixup_smp_on_up @ So its an A9 UP
		506	ldr r0, [r0, #4] @ read SCU Config
		507	and r0, r0, #0x3 @ number of CPUs
		508	teq r0, #0x0 @ is 1?
		509	movne pc, lr
491		510
492	__fixup_smp_on_up:	511	__fixup_smp_on_up:
493	adr r0, 1f	512	adr r0, 1f

arch/arm/mach-at91/at91rm9200_time.c+1−1

@@ -93,7 +93,7 @@ static irqreturn_t at91rm9200_timer_interrupt(int irq, void *dev_id) · 92 unmodified lines
93		93
94	static struct irqaction at91rm9200_timer_irq = {	94	static struct irqaction at91rm9200_timer_irq = {
95	.name = "at91_tick",	95	.name = "at91_tick",
96	.flags = IRQF_SHARED \| IRQF_DISABLED \| IRQF_TIMER \| IRQF_IRQPOLL,	96	.flags = IRQF_SHARED \| IRQF_TIMER \| IRQF_IRQPOLL,
97	.handler = at91rm9200_timer_interrupt,	97	.handler = at91rm9200_timer_interrupt,
98	.irq = NR_IRQS_LEGACY + AT91_ID_SYS,	98	.irq = NR_IRQS_LEGACY + AT91_ID_SYS,
99	};	99	};

arch/arm/mach-at91/at91sam926x_time.c+1−1

@@ -171,7 +171,7 @@ static irqreturn_t at91sam926x_pit_interrupt(int irq, void *dev_id) · 170 unmodified lines
171		171
172	static struct irqaction at91sam926x_pit_irq = {	172	static struct irqaction at91sam926x_pit_irq = {
173	.name = "at91_tick",	173	.name = "at91_tick",
174	.flags = IRQF_SHARED \| IRQF_DISABLED \| IRQF_TIMER \| IRQF_IRQPOLL,	174	.flags = IRQF_SHARED \| IRQF_TIMER \| IRQF_IRQPOLL,
175	.handler = at91sam926x_pit_interrupt,	175	.handler = at91sam926x_pit_interrupt,
176	.irq = NR_IRQS_LEGACY + AT91_ID_SYS,	176	.irq = NR_IRQS_LEGACY + AT91_ID_SYS,
177	};	177	};

arch/arm/mach-at91/at91sam9g45_reset.S+8−0

 #include "at91_rstc.h"
 			.arm
+/*
+ * at91_ramc_base is an array void*
+ * init at NULL if only one DDR controler is present in or DT
+ */
 			.globl	at91sam9g45_restart
 at91sam9g45_restart:
 			ldr	r5, =at91_ramc_base		@ preload constants
 			ldr	r0, [r5]
+			ldr	r5, [r5, #4]			@ ddr1
+			cmp	r5, #0
 			ldr	r4, =at91_rstc_base
 			ldr	r1, [r4]
 			.balign	32				@ align to cache line
+			strne	r2, [r5, #AT91_DDRSDRC_RTR]	@ disable DDR1 access
+			strne	r3, [r5, #AT91_DDRSDRC_LPR]	@ power down DDR1
 			str	r2, [r0, #AT91_DDRSDRC_RTR]	@ disable DDR0 access
 			str	r3, [r0, #AT91_DDRSDRC_LPR]	@ power down DDR0
 			str	r4, [r1, #AT91_RSTC_CR]		@ reset processor

arch/arm/mach-at91/at91x40_time.c+1−1

@@ -57,7 +57,7 @@ static irqreturn_t at91x40_timer_interrupt(int irq, void *dev_id) · 56 unmodified lines
57		57
58	static struct irqaction at91x40_timer_irq = {	58	static struct irqaction at91x40_timer_irq = {
59	.name = "at91_tick",	59	.name = "at91_tick",
60	.flags = IRQF_DISABLED \| IRQF_TIMER,	60	.flags = IRQF_TIMER,
61	.handler = at91x40_timer_interrupt	61	.handler = at91x40_timer_interrupt
62	};	62	};
63		63

arch/arm/mach-davinci/board-dm365-evm.c+1−1

@@ -176,7 +176,7 @@ static struct at24_platform_data eeprom_info = { · 175 unmodified lines
176	.context = (void *)0x7f00,	176	.context = (void *)0x7f00,
177	};	177	};
178		178
179	static struct snd_platform_data dm365_evm_snd_data = {	179	static struct snd_platform_data dm365_evm_snd_data __maybe_unused = {
180	.asp_chan_q = EVENTQ_3,	180	.asp_chan_q = EVENTQ_3,
181	};	181	};
182		182

arch/arm/mach-davinci/include/mach/serial.h+2−2

 #include <mach/hardware.h>
-#include <linux/platform_device.h>
 #define DAVINCI_UART0_BASE	(IO_PHYS + 0x20000)
 #define DAVINCI_UART1_BASE	(IO_PHYS + 0x20400)
 #define DAVINCI_UART2_BASE	(IO_PHYS + 0x20800)
 #define UART_DM646X_SCR_TX_WATERMARK	0x08
 #ifndef __ASSEMBLY__
+#include <linux/platform_device.h>
 extern int davinci_serial_init(struct platform_device *);
 #endif

arch/arm/mach-integrator/pci_v3.h+7−0

@@ -1,2 +1,9 @@
1	/* Simple oneliner include to the PCIv3 early init */	1	/* Simple oneliner include to the PCIv3 early init */
		2	#ifdef CONFIG_PCI
2	extern int pci_v3_early_init(void);	3	extern int pci_v3_early_init(void);
		4	#else
		5	static inline int pci_v3_early_init(void)
		6	{
		7	return 0;
		8	}
		9	#endif

arch/arm/mach-mvebu/coherency.c+7−1

 		coherency_base = of_iomap(np, 0);
 		coherency_cpu_base = of_iomap(np, 1);
 		set_cpu_coherent(cpu_logical_map(smp_processor_id()), 0);
+		of_node_put(np);
 	}
 	return 0;
 static int __init coherency_late_init(void)
 {
-	if (of_find_matching_node(NULL, of_coherency_table))
+	struct device_node *np;
+	np = of_find_matching_node(NULL, of_coherency_table);
+	if (np) {
 		bus_register_notifier(&platform_bus_type,
 				      &mvebu_hwcc_platform_nb);
+		of_node_put(np);
+	}
 	return 0;
 }

arch/arm/mach-mvebu/pmsu.c+1−0

@@ -67,6 +67,7 @@ int __init armada_370_xp_pmsu_init(void) · 66 unmodified lines
67	pr_info("Initializing Power Management Service Unit\n");	67	pr_info("Initializing Power Management Service Unit\n");
68	pmsu_mp_base = of_iomap(np, 0);	68	pmsu_mp_base = of_iomap(np, 0);
69	pmsu_reset_base = of_iomap(np, 1);	69	pmsu_reset_base = of_iomap(np, 1);
		70	of_node_put(np);
70	}	71	}
71		72
72	return 0;	73	return 0;

arch/arm/mach-mvebu/system-controller.c+1−0

@@ -98,6 +98,7 @@ static int __init mvebu_system_controller_init(void) · 97 unmodified lines
98	BUG_ON(!match);	98	BUG_ON(!match);
99	system_controller_base = of_iomap(np, 0);	99	system_controller_base = of_iomap(np, 0);
100	mvebu_sc = (struct mvebu_system_controller *)match->data;	100	mvebu_sc = (struct mvebu_system_controller *)match->data;
		101	of_node_put(np);
101	}	102	}
102		103
103	return 0;	104	return 0;

arch/arm/mach-omap2/board-generic.c+18−0

@@ -129,6 +129,24 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") · 128 unmodified lines
129	.restart = omap3xxx_restart,	129	.restart = omap3xxx_restart,
130	MACHINE_END	130	MACHINE_END
131		131
		132	static const char *omap36xx_boards_compat[] __initdata = {
		133	"ti,omap36xx",
		134	NULL,
		135	};
		136
		137	DT_MACHINE_START(OMAP36XX_DT, "Generic OMAP36xx (Flattened Device Tree)")
		138	.reserve = omap_reserve,
		139	.map_io = omap3_map_io,
		140	.init_early = omap3630_init_early,
		141	.init_irq = omap_intc_of_init,
		142	.handle_irq = omap3_intc_handle_irq,
		143	.init_machine = omap_generic_init,
		144	.init_late = omap3_init_late,
		145	.init_time = omap3_sync32k_timer_init,
		146	.dt_compat = omap36xx_boards_compat,
		147	.restart = omap3xxx_restart,
		148	MACHINE_END
		149
132	static const char *omap3_gp_boards_compat[] __initdata = {	150	static const char *omap3_gp_boards_compat[] __initdata = {
133	"ti,omap3-beagle",	151	"ti,omap3-beagle",
134	"timll,omap3-devkit8000",	152	"timll,omap3-devkit8000",

arch/arm/mach-omap2/board-rx51-peripherals.c+9−0

 		.name		= "lp5523:kb1",
 		.chan_nr	= 0,
 		.led_current	= 50,
+		.max_current	= 100,
 	}, {
 		.name		= "lp5523:kb2",
 		.chan_nr	= 1,
 		.led_current	= 50,
+		.max_current	= 100,
 	}, {
 		.name		= "lp5523:kb3",
 		.chan_nr	= 2,
 		.led_current	= 50,
+		.max_current	= 100,
 	}, {
 		.name		= "lp5523:kb4",
 		.chan_nr	= 3,
 		.led_current	= 50,
+		.max_current	= 100,
 	}, {
 		.name		= "lp5523:b",
 		.chan_nr	= 4,
 		.led_current	= 50,
+		.max_current	= 100,
 	}, {
 		.name		= "lp5523:g",
 		.chan_nr	= 5,
 		.led_current	= 50,
+		.max_current	= 100,
 	}, {
 		.name		= "lp5523:r",
 		.chan_nr	= 6,
 		.led_current	= 50,
+		.max_current	= 100,
 	}, {
 		.name		= "lp5523:kb5",
 		.chan_nr	= 7,
 		.led_current	= 50,
+		.max_current	= 100,
 	}, {
 		.name		= "lp5523:kb6",
 		.chan_nr	= 8,
 		.led_current	= 50,
+		.max_current	= 100,
 	}
 };

arch/arm/mach-omap2/gpmc-onenand.c+11−1

@@ -272,9 +272,19 @@ static int omap2_onenand_setup_async(void __iomem *onenand_base) · 271 unmodified lines
272	struct gpmc_timings t;	272	struct gpmc_timings t;
273	int ret;	273	int ret;
274		274
275	if (gpmc_onenand_data->of_node)	275	if (gpmc_onenand_data->of_node) {
276	gpmc_read_settings_dt(gpmc_onenand_data->of_node,	276	gpmc_read_settings_dt(gpmc_onenand_data->of_node,
277	&onenand_async);	277	&onenand_async);
		278	if (onenand_async.sync_read \|\| onenand_async.sync_write) {
		279	if (onenand_async.sync_write)
		280	gpmc_onenand_data->flags \|=
		281	ONENAND_SYNC_READWRITE;
		282	else
		283	gpmc_onenand_data->flags \|= ONENAND_SYNC_READ;
		284	onenand_async.sync_read = false;
		285	onenand_async.sync_write = false;
		286	}
		287	}
278		288
279	omap2_onenand_set_async_mode(onenand_base);	289	omap2_onenand_set_async_mode(onenand_base);
280		290

arch/arm/mach-omap2/mux.h+1−3

 #define OMAP_PULL_UP			(1 << 4)
 #define OMAP_ALTELECTRICALSEL		(1 << 5)
-/* 34xx specific mux bit defines */
+/* omap3/4/5 specific mux bit defines */
 #define OMAP_INPUT_EN			(1 << 8)
 #define OMAP_OFF_EN			(1 << 9)
 #define OMAP_OFFOUT_EN			(1 << 10)
 #define OMAP_OFF_PULL_EN		(1 << 12)
 #define OMAP_OFF_PULL_UP		(1 << 13)
 #define OMAP_WAKEUP_EN			(1 << 14)
-/* 44xx specific mux bit defines */
 #define OMAP_WAKEUP_EVENT		(1 << 15)
 /* Active pin states */

arch/arm/mach-omap2/timer.c+2−2

@@ -628,7 +628,7 @@ void __init omap4_local_timer_init(void) · 627 unmodified lines
628	#endif /* CONFIG_HAVE_ARM_TWD */	628	#endif /* CONFIG_HAVE_ARM_TWD */
629	#endif /* CONFIG_ARCH_OMAP4 */	629	#endif /* CONFIG_ARCH_OMAP4 */
630		630
631	#ifdef CONFIG_SOC_OMAP5	631	#if defined(CONFIG_SOC_OMAP5) \|\| defined(CONFIG_SOC_DRA7XX)
632	void __init omap5_realtime_timer_init(void)	632	void __init omap5_realtime_timer_init(void)
633	{	633	{
634	omap4_sync32k_timer_init();	634	omap4_sync32k_timer_init();
@@ -636,7 +636,7 @@ void __init omap5_realtime_timer_init(void) · 1 unmodified line
636		636
637	clocksource_of_init();	637	clocksource_of_init();
638	}	638	}
639	#endif /* CONFIG_SOC_OMAP5 */	639	#endif /* CONFIG_SOC_OMAP5 \|\| CONFIG_SOC_DRA7XX */
640		640
641	/**	641	/**
642	* omap_timer_init - build and register timer device with an	642	* omap_timer_init - build and register timer device with an

arch/arm/mach-shmobile/board-armadillo800eva.c+2−2

@@ -1108,9 +1108,9 @@ static const struct pinctrl_map eva_pinctrl_map[] = { · 1107 unmodified lines
1108	PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.1", "pfc-r8a7740",	1108	PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.1", "pfc-r8a7740",
1109	"fsib_mclk_in", "fsib"),	1109	"fsib_mclk_in", "fsib"),
1110	/* GETHER */	1110	/* GETHER */
1111	PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7740",	1111	PIN_MAP_MUX_GROUP_DEFAULT("r8a7740-gether", "pfc-r8a7740",
1112	"gether_mii", "gether"),	1112	"gether_mii", "gether"),
1113	PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7740",	1113	PIN_MAP_MUX_GROUP_DEFAULT("r8a7740-gether", "pfc-r8a7740",
1114	"gether_int", "gether"),	1114	"gether_int", "gether"),
1115	/* HDMI */	1115	/* HDMI */
1116	PIN_MAP_MUX_GROUP_DEFAULT("sh-mobile-hdmi", "pfc-r8a7740",	1116	PIN_MAP_MUX_GROUP_DEFAULT("sh-mobile-hdmi", "pfc-r8a7740",

arch/arm/mach-shmobile/board-lager.c+26−1

@@ -29,6 +29,7 @@ · 28 unmodified lines
29	#include <linux/pinctrl/machine.h>	29	#include <linux/pinctrl/machine.h>
30	#include <linux/platform_data/gpio-rcar.h>	30	#include <linux/platform_data/gpio-rcar.h>
31	#include <linux/platform_device.h>	31	#include <linux/platform_device.h>
		32	#include <linux/phy.h>
32	#include <linux/regulator/fixed.h>	33	#include <linux/regulator/fixed.h>
33	#include <linux/regulator/machine.h>	34	#include <linux/regulator/machine.h>
34	#include <linux/sh_eth.h>	35	#include <linux/sh_eth.h>
@@ -155,6 +156,30 @@ static void __init lager_add_standard_devices(void) · 120 unmodified lines
155	&ether_pdata, sizeof(ether_pdata));	156	&ether_pdata, sizeof(ether_pdata));
156	}	157	}
157		158
		159	/*
		160	* Ether LEDs on the Lager board are named LINK and ACTIVE which corresponds
		161	* to non-default 01 setting of the Micrel KSZ8041 PHY control register 1 bits
		162	* 14-15. We have to set them back to 01 from the default 00 value each time
		163	* the PHY is reset. It's also important because the PHY's LED0 signal is
		164	* connected to SoC's ETH_LINK signal and in the PHY's default mode it will
		165	* bounce on and off after each packet, which we apparently want to avoid.
		166	*/
		167	static int lager_ksz8041_fixup(struct phy_device *phydev)
		168	{
		169	u16 phyctrl1 = phy_read(phydev, 0x1e);
		170
		171	phyctrl1 &= ~0xc000;
		172	phyctrl1 \|= 0x4000;
		173	return phy_write(phydev, 0x1e, phyctrl1);
		174	}
		175
		176	static void __init lager_init(void)
		177	{
		178	lager_add_standard_devices();
		179
		180	phy_register_fixup_for_id("r8a7790-ether-ff:01", lager_ksz8041_fixup);
		181	}
		182
158	static const char *lager_boards_compat_dt[] __initdata = {	183	static const char *lager_boards_compat_dt[] __initdata = {
159	"renesas,lager",	184	"renesas,lager",
160	NULL,	185	NULL,
@@ -163,6 +188,6 @@ static const char *lager_boards_compat_dt[] __initdata = { · 2 unmodified lines
163	DT_MACHINE_START(LAGER_DT, "lager")	188	DT_MACHINE_START(LAGER_DT, "lager")
164	.init_early = r8a7790_init_delay,	189	.init_early = r8a7790_init_delay,
165	.init_time = r8a7790_timer_init,	190	.init_time = r8a7790_timer_init,
166	.init_machine = lager_add_standard_devices,	191	.init_machine = lager_init,
167	.dt_compat = lager_boards_compat_dt,	192	.dt_compat = lager_boards_compat_dt,
168	MACHINE_END	193	MACHINE_END

arch/arm/mach-vexpress/tc2_pm.c+10−1

 	} else
 		BUG();
+	/*
+	 * If the CPU is committed to power down, make sure
+	 * the power controller will be in charge of waking it
+	 * up upon IRQ, ie IRQ lines are cut from GIC CPU IF
+	 * to the CPU by disabling the GIC CPU IF to prevent wfi
+	 * from completing execution behind power controller back
+	 */
+	if (!skip_wfi)
+		gic_cpu_if_down();
 	if (last_man && __mcpm_outbound_enter_critical(cpu, cluster)) {
 		arch_spin_unlock(&tc2_pm_lock);
 	cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
 	cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
 	ve_spc_set_resume_addr(cluster, cpu, virt_to_phys(mcpm_entry_point));
-	gic_cpu_if_down();
 	tc2_pm_down(residency);
 }

arch/arm/mm/dma-mapping.c+28−15

 				break;
 		len = (j - i) << PAGE_SHIFT;
-		ret = iommu_map(mapping->domain, iova, phys, len, 0);
+		ret = iommu_map(mapping->domain, iova, phys, len,
+				IOMMU_READ|IOMMU_WRITE);
 		if (ret < 0)
 			goto fail;
 		iova += len;
 					 GFP_KERNEL);
 }
+static int __dma_direction_to_prot(enum dma_data_direction dir)
+{
+	int prot;
+	switch (dir) {
+	case DMA_BIDIRECTIONAL:
+		prot = IOMMU_READ | IOMMU_WRITE;
+		break;
+	case DMA_TO_DEVICE:
+		prot = IOMMU_READ;
+		break;
+	case DMA_FROM_DEVICE:
+		prot = IOMMU_WRITE;
+		break;
+	default:
+		prot = 0;
+	}
+	return prot;
+}
 /*
  * Map a part of the scatter-gather list into contiguous io address space
  */
 	int ret = 0;
 	unsigned int count;
 	struct scatterlist *s;
+	int prot;
 	size = PAGE_ALIGN(size);
 	*handle = DMA_ERROR_CODE;
 			!dma_get_attr(DMA_ATTR_SKIP_CPU_SYNC, attrs))
 			__dma_page_cpu_to_dev(sg_page(s), s->offset, s->length, dir);
-		ret = iommu_map(mapping->domain, iova, phys, len, 0);
+		prot = __dma_direction_to_prot(dir);
+		ret = iommu_map(mapping->domain, iova, phys, len, prot);
 		if (ret < 0)
 			goto fail;
 		count += len >> PAGE_SHIFT;
 	if (dma_addr == DMA_ERROR_CODE)
 		return dma_addr;
-	switch (dir) {
+	prot = __dma_direction_to_prot(dir);
-	case DMA_BIDIRECTIONAL:
-		prot = IOMMU_READ | IOMMU_WRITE;
-		break;
-	case DMA_TO_DEVICE:
-		prot = IOMMU_READ;
-		break;
-	case DMA_FROM_DEVICE:
-		prot = IOMMU_WRITE;
-		break;
-	default:
-		prot = 0;
-	}
 	ret = iommu_map(mapping->domain, dma_addr, page_to_phys(page), len, prot);
 	if (ret < 0)

arch/arm/mm/init.c+0−3

 #include <linux/nodemask.h>
 #include <linux/initrd.h>
 #include <linux/of_fdt.h>
-#include <linux/of_reserved_mem.h>
 #include <linux/highmem.h>
 #include <linux/gfp.h>
 #include <linux/memblock.h>
 	if (mdesc->reserve)
 		mdesc->reserve();
-	early_init_dt_scan_reserved_mem();
 	/*
 	 * reserve memory for DMA contigouos allocations,
 	 * must come from DMA area inside low memory

arch/arm64/Kconfig.debug+0−7

@@ -6,13 +6,6 @@ config FRAME_POINTER · 5 unmodified lines
6	bool	6	bool
7	default y	7	default y
8		8
9	config DEBUG_STACK_USAGE
10	bool "Enable stack utilization instrumentation"
11	depends on DEBUG_KERNEL
12	help
13	Enables the display of the minimum amount of free stack which each
14	task has ever had available in the sysrq-T output.
15
16	config EARLY_PRINTK	9	config EARLY_PRINTK
17	bool "Early printk support"	10	bool "Early printk support"
18	default y	11	default y

arch/arm64/configs/defconfig+4−1

 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
-# CONFIG_BLK_DEV is not set
+CONFIG_BLK_DEV=y
 CONFIG_SCSI=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
+CONFIG_EXT4_FS=y
 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
 # CONFIG_EXT3_FS_XATTR is not set
 CONFIG_FUSE_FS=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_FTRACE is not set
 CONFIG_ATOMIC64_SELFTEST=y
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_BLK=y

arch/arm64/include/asm/uaccess.h+6−4

 #define get_user(x, ptr)						\
 ({									\
+	__typeof__(*(ptr)) __user *__p = (ptr);				\
 	might_fault();							\
-	access_ok(VERIFY_READ, (ptr), sizeof(*(ptr))) ?			\
+	access_ok(VERIFY_READ, __p, sizeof(*__p)) ?			\
-		__get_user((x), (ptr)) :				\
+		__get_user((x), __p) :					\
 		((x) = 0, -EFAULT);					\
 })
 #define put_user(x, ptr)						\
 ({									\
+	__typeof__(*(ptr)) __user *__p = (ptr);				\
 	might_fault();							\
-	access_ok(VERIFY_WRITE, (ptr), sizeof(*(ptr))) ?		\
+	access_ok(VERIFY_WRITE, __p, sizeof(*__p)) ?			\
-		__put_user((x), (ptr)) :				\
+		__put_user((x), __p) :					\
 		-EFAULT;						\
 })

arch/arm64/kernel/fpsimd.c+2−0

 void fpsimd_flush_thread(void)
 {
+	preempt_disable();
 	memset(&current->thread.fpsimd_state, 0, sizeof(struct fpsimd_state));
 	fpsimd_load_state(&current->thread.fpsimd_state);
+	preempt_enable();
 }
 #ifdef CONFIG_KERNEL_MODE_NEON

arch/arm64/mm/tlb.S+1−1

@@ -35,7 +35,7 @@ · 34 unmodified lines
35	*/	35	*/
36	ENTRY(__cpu_flush_user_tlb_range)	36	ENTRY(__cpu_flush_user_tlb_range)
37	vma_vm_mm x3, x2 // get vma->vm_mm	37	vma_vm_mm x3, x2 // get vma->vm_mm
38	mmid x3, x3 // get vm_mm->context.id	38	mmid w3, x3 // get vm_mm->context.id
39	dsb sy	39	dsb sy
40	lsr x0, x0, #12 // align address	40	lsr x0, x0, #12 // align address
41	lsr x1, x1, #12	41	lsr x1, x1, #12

arch/mips/alchemy/board-mtx1.c+1−1

@@ -276,7 +276,7 @@ static struct platform_device mtx1_pci_host = { · 275 unmodified lines
276	.resource = alchemy_pci_host_res,	276	.resource = alchemy_pci_host_res,
277	};	277	};
278		278
279	static struct __initdata platform_device * mtx1_devs[] = {	279	static struct platform_device *mtx1_devs[] __initdata = {
280	&mtx1_pci_host,	280	&mtx1_pci_host,
281	&mtx1_gpio_leds,	281	&mtx1_gpio_leds,
282	&mtx1_wdt,	282	&mtx1_wdt,

arch/mips/include/asm/jump_label.h+1−1

@@ -22,7 +22,7 @@ · 21 unmodified lines
22		22
23	static __always_inline bool arch_static_branch(struct static_key *key)	23	static __always_inline bool arch_static_branch(struct static_key *key)
24	{	24	{
25	asm goto("1:\tnop\n\t"	25	asm_volatile_goto("1:\tnop\n\t"
26	"nop\n\t"	26	"nop\n\t"
27	".pushsection __jump_table, \"aw\"\n\t"	27	".pushsection __jump_table, \"aw\"\n\t"
28	WORD_INSN " 1b, %l[l_yes], %0\n\t"	28	WORD_INSN " 1b, %l[l_yes], %0\n\t"

arch/mips/kernel/octeon_switch.S+1−1

@@ -73,7 +73,7 @@ · 72 unmodified lines
73	3:	73	3:
74		74
75	#if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)	75	#if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)
76	PTR_L t8, __stack_chk_guard	76	PTR_LA t8, __stack_chk_guard
77	LONG_L t9, TASK_STACK_CANARY(a1)	77	LONG_L t9, TASK_STACK_CANARY(a1)
78	LONG_S t9, 0(t8)	78	LONG_S t9, 0(t8)
79	#endif	79	#endif

arch/mips/kernel/r2300_switch.S+1−1

@@ -67,7 +67,7 @@ LEAF(resume) · 66 unmodified lines
67	1:	67	1:
68		68
69	#if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)	69	#if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)
70	PTR_L t8, __stack_chk_guard	70	PTR_LA t8, __stack_chk_guard
71	LONG_L t9, TASK_STACK_CANARY(a1)	71	LONG_L t9, TASK_STACK_CANARY(a1)
72	LONG_S t9, 0(t8)	72	LONG_S t9, 0(t8)
73	#endif	73	#endif

arch/mips/kernel/r4k_switch.S+1−1

@@ -69,7 +69,7 @@ · 68 unmodified lines
69	1:	69	1:
70		70
71	#if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)	71	#if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)
72	PTR_L t8, __stack_chk_guard	72	PTR_LA t8, __stack_chk_guard
73	LONG_L t9, TASK_STACK_CANARY(a1)	73	LONG_L t9, TASK_STACK_CANARY(a1)
74	LONG_S t9, 0(t8)	74	LONG_S t9, 0(t8)
75	#endif	75	#endif

arch/mips/mm/c-r4k.c+2−0

 			r4k_blast_scache();
 		else
 			blast_scache_range(addr, addr + size);
+		preempt_enable();
 		__sync();
 		return;
 	}
 			 */
 			blast_inv_scache_range(addr, addr + size);
 		}
+		preempt_enable();
 		__sync();
 		return;
 	}

arch/parisc/configs/712_defconfig+2−0

 CONFIG_LLC2=m
 CONFIG_NET_PKTGEN=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_PARPORT=y

arch/parisc/configs/a500_defconfig+2−0

 CONFIG_LLC2=m
 CONFIG_NET_PKTGEN=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_BLK_DEV_UMEM=m

arch/parisc/configs/b180_defconfig+3−0

 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=16
 CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_SLAB=y
 CONFIG_MODULES=y
 CONFIG_MODVERSIONS=y
 # CONFIG_INET_LRO is not set
 CONFIG_IPV6=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_PARPORT=y
 CONFIG_PARPORT_PC=y

arch/parisc/configs/c3000_defconfig+3−0

 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=16
 CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_EXPERT=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_IP_NF_QUEUE=m
 CONFIG_NET_PKTGEN=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_BLK_DEV_UMEM=m

arch/parisc/configs/c8000_defconfig+2−0

 CONFIG_LLC2=m
 CONFIG_DNS_RESOLVER=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 CONFIG_PARPORT=y
 CONFIG_PARPORT_PC=y

arch/parisc/configs/default_defconfig+2−0

 CONFIG_INET6_IPCOMP=y
 CONFIG_LLC2=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_PARPORT=y

arch/parisc/include/asm/traps.h+1−1

@@ -6,7 +6,7 @@ struct pt_regs; · 5 unmodified lines
6		6
7	/* traps.c */	7	/* traps.c */
8	void parisc_terminate(char msg, struct pt_regs regs,	8	void parisc_terminate(char msg, struct pt_regs regs,
9	int code, unsigned long offset);	9	int code, unsigned long offset) __noreturn __cold;
10		10
11	/* mm/fault.c */	11	/* mm/fault.c */
12	void do_page_fault(struct pt_regs *regs, unsigned long code,	12	void do_page_fault(struct pt_regs *regs, unsigned long code,

arch/parisc/kernel/smp.c+1−7

 	IPI_NOP=0,
 	IPI_RESCHEDULE=1,
 	IPI_CALL_FUNC,
-	IPI_CALL_FUNC_SINGLE,
 	IPI_CPU_START,
 	IPI_CPU_STOP,
 	IPI_CPU_TEST
 				generic_smp_call_function_interrupt();
 				break;
-			case IPI_CALL_FUNC_SINGLE:
-				smp_debug(100, KERN_DEBUG "CPU%d IPI_CALL_FUNC_SINGLE\n", this_cpu);
-				generic_smp_call_function_single_interrupt();
-				break;
 			case IPI_CPU_START:
 				smp_debug(100, KERN_DEBUG "CPU%d IPI_CPU_START\n", this_cpu);
 				break;
 void arch_send_call_function_single_ipi(int cpu)
 {
-	send_IPI_single(cpu, IPI_CALL_FUNC_SINGLE);
+	send_IPI_single(cpu, IPI_CALL_FUNC);
 }
 /*

arch/parisc/kernel/traps.c+3−8

 	do_exit(SIGSEGV);
 }
-int syscall_ipi(int (*syscall) (struct pt_regs *), struct pt_regs *regs)
-{
-	return syscall(regs);
-}
 /* gdb uses break 4,8 */
 #define GDB_BREAK_INSN 0x10004
 static void handle_gdb_break(struct pt_regs *regs, int wot)
 	else {
 	    /*
-	     * The kernel should never fault on its own address space.
+	     * The kernel should never fault on its own address space,
+	     * unless pagefault_disable() was called before.
 	     */
-	    if (fault_space == 0)
+	    if (fault_space == 0 && !in_atomic())
 	    {
 		pdc_chassis_send_status(PDC_CHASSIS_DIRECT_PANIC);
 		parisc_terminate("Kernel Fault", regs, code, fault_address);
 	    }
 	}

arch/parisc/lib/memcpy.c+14−1

@@ -56,7 +56,7 @@ · 55 unmodified lines
56	#ifdef __KERNEL__	56	#ifdef __KERNEL__
57	#include <linux/module.h>	57	#include <linux/module.h>
58	#include <linux/compiler.h>	58	#include <linux/compiler.h>
59	#include <asm/uaccess.h>	59	#include <linux/uaccess.h>
60	#define s_space "%%sr1"	60	#define s_space "%%sr1"
61	#define d_space "%%sr2"	61	#define d_space "%%sr2"
62	#else	62	#else
@@ -524,4 +524,17 @@ EXPORT_SYMBOL(copy_to_user); · 461 unmodified lines
524	EXPORT_SYMBOL(copy_from_user);	524	EXPORT_SYMBOL(copy_from_user);
525	EXPORT_SYMBOL(copy_in_user);	525	EXPORT_SYMBOL(copy_in_user);
526	EXPORT_SYMBOL(memcpy);	526	EXPORT_SYMBOL(memcpy);
		527
		528	long probe_kernel_read(void dst, const void src, size_t size)
		529	{
		530	unsigned long addr = (unsigned long)src;
		531
		532	if (size < 0 \|\| addr < PAGE_SIZE)
		533	return -EFAULT;
		534
		535	/* check for I/O space F_EXTEND(0xfff00000) access as well? */
		536
		537	return __probe_kernel_read(dst, src, size);
		538	}
		539
527	#endif	540	#endif

arch/parisc/mm/fault.c+10−5

 			      unsigned long address)
 {
 	struct vm_area_struct *vma, *prev_vma;
-	struct task_struct *tsk = current;
+	struct task_struct *tsk;
-	struct mm_struct *mm = tsk->mm;
+	struct mm_struct *mm;
 	unsigned long acc_type;
 	int fault;
-	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
+	unsigned int flags;
-	if (in_atomic() || !mm)
+	if (in_atomic())
 		goto no_context;
+	tsk = current;
+	mm = tsk->mm;
+	if (!mm)
+		goto no_context;
+	flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 	if (user_mode(regs))
 		flags |= FAULT_FLAG_USER;
 	acc_type = parisc_acctyp(code, regs->iir);
 	if (acc_type & VM_WRITE)
 		flags |= FAULT_FLAG_WRITE;
 retry:

arch/powerpc/include/asm/jump_label.h+1−1

@@ -19,7 +19,7 @@ · 18 unmodified lines
19		19
20	static __always_inline bool arch_static_branch(struct static_key *key)	20	static __always_inline bool arch_static_branch(struct static_key *key)
21	{	21	{
22	asm goto("1:\n\t"	22	asm_volatile_goto("1:\n\t"
23	"nop\n\t"	23	"nop\n\t"
24	".pushsection __jump_table, \"aw\"\n\t"	24	".pushsection __jump_table, \"aw\"\n\t"
25	JUMP_ENTRY_TYPE "1b, %l[l_yes], %c0\n\t"	25	JUMP_ENTRY_TYPE "1b, %l[l_yes], %c0\n\t"

arch/powerpc/kernel/iommu.c+1−1

@@ -661,7 +661,7 @@ struct iommu_table iommu_init_table(struct iommu_table tbl, int nid) · 660 unmodified lines
661	/* number of bytes needed for the bitmap */	661	/* number of bytes needed for the bitmap */
662	sz = BITS_TO_LONGS(tbl->it_size) * sizeof(unsigned long);	662	sz = BITS_TO_LONGS(tbl->it_size) * sizeof(unsigned long);
663		663
664	page = alloc_pages_node(nid, GFP_ATOMIC, get_order(sz));	664	page = alloc_pages_node(nid, GFP_KERNEL, get_order(sz));
665	if (!page)	665	if (!page)
666	panic("iommu_init_table: Can't allocate %ld bytes\n", sz);	666	panic("iommu_init_table: Can't allocate %ld bytes\n", sz);
667	tbl->it_map = page_address(page);	667	tbl->it_map = page_address(page);

arch/powerpc/kernel/irq.c+3−2

 void do_IRQ(struct pt_regs *regs)
 {
 	struct pt_regs *old_regs = set_irq_regs(regs);
-	struct thread_info *curtp, *irqtp;
+	struct thread_info *curtp, *irqtp, *sirqtp;
 	/* Switch to the irq stack to handle this */
 	curtp = current_thread_info();
 	irqtp = hardirq_ctx[raw_smp_processor_id()];
+	sirqtp = softirq_ctx[raw_smp_processor_id()];
 	/* Already there ? */
-	if (unlikely(curtp == irqtp)) {
+	if (unlikely(curtp == irqtp || curtp == sirqtp)) {
 		__do_irq(regs);
 		set_irq_regs(old_regs);
 		return;

arch/powerpc/kernel/sysfs.c+16−2

 #include <asm/machdep.h>
 #include <asm/smp.h>
 #include <asm/pmc.h>
+#include <asm/firmware.h>
 #include "cacheinfo.h"
 SYSFS_PMCSETUP(dscr, SPRN_DSCR);
 SYSFS_PMCSETUP(pir, SPRN_PIR);
+/*
+  Lets only enable read for phyp resources and
+  enable write when needed with a separate function.
+  Lets be conservative and default to pseries.
+*/
 static DEVICE_ATTR(mmcra, 0600, show_mmcra, store_mmcra);
 static DEVICE_ATTR(spurr, 0400, show_spurr, NULL);
 static DEVICE_ATTR(dscr, 0600, show_dscr, store_dscr);
-static DEVICE_ATTR(purr, 0600, show_purr, store_purr);
+static DEVICE_ATTR(purr, 0400, show_purr, store_purr);
 static DEVICE_ATTR(pir, 0400, show_pir, NULL);
 unsigned long dscr_default = 0;
 EXPORT_SYMBOL(dscr_default);
+static void add_write_permission_dev_attr(struct device_attribute *attr)
+{
+	attr->attr.mode |= 0200;
+}
 static ssize_t show_dscr_default(struct device *dev,
 		struct device_attribute *attr, char *buf)
 {
 	if (cpu_has_feature(CPU_FTR_MMCRA))
 		device_create_file(s, &dev_attr_mmcra);
-	if (cpu_has_feature(CPU_FTR_PURR))
+	if (cpu_has_feature(CPU_FTR_PURR)) {
+		if (!firmware_has_feature(FW_FEATURE_LPAR))
+			add_write_permission_dev_attr(&dev_attr_purr);
 		device_create_file(s, &dev_attr_purr);
+	}
 	if (cpu_has_feature(CPU_FTR_SPURR))
 		device_create_file(s, &dev_attr_spurr);

arch/powerpc/kernel/tm.S+64−31

 	TABORT(R3)
 	blr
+	.section	".toc","aw"
+DSCR_DEFAULT:
+	.tc dscr_default[TC],dscr_default
+	.section	".text"
 /* void tm_reclaim(struct thread_struct *thread,
  *                 unsigned long orig_msr,
 	mr	r15, r14
 	ori	r15, r15, MSR_FP
 	li	r16, MSR_RI
+	ori	r16, r16, MSR_EE /* IRQs hard off */
 	andc	r15, r15, r16
 	oris	r15, r15, MSR_VEC@h
 #ifdef CONFIG_VSX
 	std	r1, PACATMSCRATCH(r13)
 	ld	r1, PACAR1(r13)
+	/* Store the PPR in r11 and reset to decent value */
+	std	r11, GPR11(r1)			/* Temporary stash */
+	mfspr	r11, SPRN_PPR
+	HMT_MEDIUM
 	/* Now get some more GPRS free */
 	std	r7, GPR7(r1)			/* Temporary stash */
 	std	r12, GPR12(r1)			/* ''   ''    ''   */
 	ld	r12, STACK_PARAM(0)(r1)		/* Param 0, thread_struct * */
+	std	r11, THREAD_TM_PPR(r12)		/* Store PPR and free r11 */
 	addi	r7, r12, PT_CKPT_REGS		/* Thread's ckpt_regs */
 	/* Make r7 look like an exception frame so that we
 	SAVE_GPR(0, r7)				/* user r0 */
 	SAVE_GPR(2, r7)			/* user r2 */
 	SAVE_4GPRS(3, r7)			/* user r3-r6 */
-	SAVE_4GPRS(8, r7)			/* user r8-r11 */
+	SAVE_GPR(8, r7)				/* user r8 */
+	SAVE_GPR(9, r7)				/* user r9 */
+	SAVE_GPR(10, r7)			/* user r10 */
 	ld	r3, PACATMSCRATCH(r13)		/* user r1 */
 	ld	r4, GPR7(r1)			/* user r7 */
-	ld	r5, GPR12(r1)			/* user r12 */
+	ld	r5, GPR11(r1)			/* user r11 */
-	GET_SCRATCH0(6)				/* user r13 */
+	ld	r6, GPR12(r1)			/* user r12 */
+	GET_SCRATCH0(8)				/* user r13 */
 	std	r3, GPR1(r7)
 	std	r4, GPR7(r7)
-	std	r5, GPR12(r7)
+	std	r5, GPR11(r7)
-	std	r6, GPR13(r7)
+	std	r6, GPR12(r7)
+	std	r8, GPR13(r7)
 	SAVE_NVGPRS(r7)				/* user r14-r31 */
 	std	r6, _XER(r7)
-	/* ******************** TAR, PPR, DSCR ********** */
+	/* ******************** TAR, DSCR ********** */
 	mfspr	r3, SPRN_TAR
-	mfspr	r4, SPRN_PPR
+	mfspr	r4, SPRN_DSCR
-	mfspr	r5, SPRN_DSCR
 	std	r3, THREAD_TM_TAR(r12)
-	std	r4, THREAD_TM_PPR(r12)
+	std	r4, THREAD_TM_DSCR(r12)
-	std	r5, THREAD_TM_DSCR(r12)
 	/* MSR and flags:  We don't change CRs, and we don't need to alter
 	 * MSR.
 	std	r3, THREAD_TM_TFHAR(r12)
 	std	r4, THREAD_TM_TFIAR(r12)
-	/* AMR and PPR are checkpointed too, but are unsupported by Linux. */
+	/* AMR is checkpointed too, but is unsupported by Linux. */
 	/* Restore original MSR/IRQ state & clear TM mode */
 	ld	r14, TM_FRAME_L0(r1)		/* Orig MSR */
 	mtcr	r4
 	mtlr	r0
 	ld	r2, 40(r1)
+	/* Load system default DSCR */
+	ld	r4, DSCR_DEFAULT@toc(r2)
+	ld	r0, 0(r4)
+	mtspr	SPRN_DSCR, r0
 	blr
 restore_gprs:
-	/* ******************** TAR, PPR, DSCR ********** */
+	/* ******************** CR,LR,CCR,MSR ********** */
-	ld	r4, THREAD_TM_TAR(r3)
+	ld	r4, _CTR(r7)
-	ld	r5, THREAD_TM_PPR(r3)
+	ld	r5, _LINK(r7)
-	ld	r6, THREAD_TM_DSCR(r3)
+	ld	r6, _CCR(r7)
+	ld	r8, _XER(r7)
-	mtspr	SPRN_TAR,	r4
+	mtctr	r4
-	mtspr	SPRN_PPR,	r5
+	mtlr	r5
-	mtspr	SPRN_DSCR,	r6
+	mtcr	r6
+	mtxer	r8
-	/* ******************** CR,LR,CCR,MSR ********** */
+	/* ******************** TAR ******************** */
-	ld	r3, _CTR(r7)
+	ld	r4, THREAD_TM_TAR(r3)
-	ld	r4, _LINK(r7)
+	mtspr	SPRN_TAR,	r4
-	ld	r5, _CCR(r7)
-	ld	r6, _XER(r7)
-	mtctr	r3
+	/* Load up the PPR and DSCR in GPRs only at this stage */
-	mtlr	r4
+	ld	r5, THREAD_TM_DSCR(r3)
-	mtcr	r5
+	ld	r6, THREAD_TM_PPR(r3)
-	mtxer	r6
 	/* Clear the MSR RI since we are about to change R1.  EE is already off
 	 */
 	mtmsrd	r4, 1
 	REST_4GPRS(0, r7)			/* GPR0-3 */
-	REST_GPR(4, r7)				/* GPR4-6 */
+	REST_GPR(4, r7)				/* GPR4 */
-	REST_GPR(5, r7)
-	REST_GPR(6, r7)
 	REST_4GPRS(8, r7)			/* GPR8-11 */
 	REST_2GPRS(12, r7)			/* GPR12-13 */
 	REST_NVGPRS(r7)				/* GPR14-31 */
-	ld	r7, GPR7(r7)			/* GPR7 */
+	/* Load up PPR and DSCR here so we don't run with user values for long
+	 */
+	mtspr	SPRN_DSCR, r5
+	mtspr	SPRN_PPR, r6
+	REST_GPR(5, r7)				/* GPR5-7 */
+	REST_GPR(6, r7)
+	ld	r7, GPR7(r7)
 	/* Commit register state as checkpointed state: */
 	TRECHKPT
+	HMT_MEDIUM
 	/* Our transactional state has now changed.
 	 *
 	 * Now just get out of here.  Transactional (current) state will be
 	mtcr	r4
 	mtlr	r0
 	ld	r2, 40(r1)
+	/* Load system default DSCR */
+	ld	r4, DSCR_DEFAULT@toc(r2)
+	ld	r0, 0(r4)
+	mtspr	SPRN_DSCR, r0
 	blr
 	/* ****************************************************************** */

arch/powerpc/kernel/vio.c+8−4

 	const char *cp;
 	dn = dev->of_node;
-	if (!dn)
+	if (!dn) {
-		return -ENODEV;
+		strcat(buf, "\n");
+		return strlen(buf);
+	}
 	cp = of_get_property(dn, "compatible", NULL);
-	if (!cp)
+	if (!cp) {
-		return -ENODEV;
+		strcat(buf, "\n");
+		return strlen(buf);
+	}
 	return sprintf(buf, "vio:T%sS%s\n", vio_dev->type, cp);
 }

arch/powerpc/kvm/book3s_hv_rmhandlers.S+1−1

@@ -1066,7 +1066,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_206) · 1065 unmodified lines
1066	BEGIN_FTR_SECTION	1066	BEGIN_FTR_SECTION
1067	mfspr r8, SPRN_DSCR	1067	mfspr r8, SPRN_DSCR
1068	ld r7, HSTATE_DSCR(r13)	1068	ld r7, HSTATE_DSCR(r13)
1069	std r8, VCPU_DSCR(r7)	1069	std r8, VCPU_DSCR(r9)
1070	mtspr SPRN_DSCR, r7	1070	mtspr SPRN_DSCR, r7
1071	END_FTR_SECTION_IFSET(CPU_FTR_ARCH_206)	1071	END_FTR_SECTION_IFSET(CPU_FTR_ARCH_206)
1072		1072

arch/powerpc/kvm/e500_mmu_host.c+17−1

 	unsigned long hva;
 	int pfnmap = 0;
 	int tsize = BOOK3E_PAGESZ_4K;
+	int ret = 0;
+	unsigned long mmu_seq;
+	struct kvm *kvm = vcpu_e500->vcpu.kvm;
+	/* used to check for invalidations in progress */
+	mmu_seq = kvm->mmu_notifier_seq;
+	smp_rmb();
 	/*
 	 * Translate guest physical to true physical, acquiring
 		gvaddr &= ~((tsize_pages << PAGE_SHIFT) - 1);
 	}
+	spin_lock(&kvm->mmu_lock);
+	if (mmu_notifier_retry(kvm, mmu_seq)) {
+		ret = -EAGAIN;
+		goto out;
+	}
 	kvmppc_e500_ref_setup(ref, gtlbe, pfn);
 	kvmppc_e500_setup_stlbe(&vcpu_e500->vcpu, gtlbe, tsize,
 	/* Clear i-cache for new pages */
 	kvmppc_mmu_flush_icache(pfn);
+out:
+	spin_unlock(&kvm->mmu_lock);
 	/* Drop refcount on page, so that mmu notifiers can clear it */
 	kvm_release_pfn_clean(pfn);
-	return 0;
+	return ret;
 }
 /* XXX only map the one-one case, for now use TLB0 */

arch/powerpc/lib/checksum_64.S+42−16

 	blr
-	.macro source
+	.macro srcnr
 100:
 	.section __ex_table,"a"
 	.align 3
-	.llong 100b,.Lsrc_error
+	.llong 100b,.Lsrc_error_nr
 	.previous
 	.endm
-	.macro dest
+	.macro source
+150:
+	.section __ex_table,"a"
+	.align 3
+	.llong 150b,.Lsrc_error
+	.previous
+	.endm
+	.macro dstnr
 200:
 	.section __ex_table,"a"
 	.align 3
-	.llong 200b,.Ldest_error
+	.llong 200b,.Ldest_error_nr
+	.previous
+	.endm
+	.macro dest
+250:
+	.section __ex_table,"a"
+	.align 3
+	.llong 250b,.Ldest_error
 	.previous
 	.endm
 	rldicl. r6,r3,64-1,64-2		/* r6 = (r3 & 0x3) >> 1 */
 	beq	.Lcopy_aligned
-	li	r7,4
+	li	r9,4
-	sub	r6,r7,r6
+	sub	r6,r9,r6
 	mtctr	r6
 1:
-source;	lhz	r6,0(r3)		/* align to doubleword */
+srcnr;	lhz	r6,0(r3)		/* align to doubleword */
 	subi	r5,r5,2
 	addi	r3,r3,2
 	adde	r0,r0,r6
-dest;	sth	r6,0(r4)
+dstnr;	sth	r6,0(r4)
 	addi	r4,r4,2
 	bdnz	1b
 	mtctr	r6
 3:
-source;	ld	r6,0(r3)
+srcnr;	ld	r6,0(r3)
 	addi	r3,r3,8
 	adde	r0,r0,r6
-dest;	std	r6,0(r4)
+dstnr;	std	r6,0(r4)
 	addi	r4,r4,8
 	bdnz	3b
 	srdi.	r6,r5,2
 	beq	.Lcopy_tail_halfword
-source;	lwz	r6,0(r3)
+srcnr;	lwz	r6,0(r3)
 	addi	r3,r3,4
 	adde	r0,r0,r6
-dest;	stw	r6,0(r4)
+dstnr;	stw	r6,0(r4)
 	addi	r4,r4,4
 	subi	r5,r5,4
 	srdi.	r6,r5,1
 	beq	.Lcopy_tail_byte
-source;	lhz	r6,0(r3)
+srcnr;	lhz	r6,0(r3)
 	addi	r3,r3,2
 	adde	r0,r0,r6
-dest;	sth	r6,0(r4)
+dstnr;	sth	r6,0(r4)
 	addi	r4,r4,2
 	subi	r5,r5,2
 	andi.	r6,r5,1
 	beq	.Lcopy_finish
-source;	lbz	r6,0(r3)
+srcnr;	lbz	r6,0(r3)
 	sldi	r9,r6,8			/* Pad the byte out to 16 bits */
 	adde	r0,r0,r9
-dest;	stb	r6,0(r4)
+dstnr;	stb	r6,0(r4)
 .Lcopy_finish:
 	addze	r0,r0			/* add in final carry */
 	blr
 .Lsrc_error:
+	ld	r14,STK_REG(R14)(r1)
+	ld	r15,STK_REG(R15)(r1)
+	ld	r16,STK_REG(R16)(r1)
+	addi	r1,r1,STACKFRAMESIZE
+.Lsrc_error_nr:
 	cmpdi	0,r7,0
 	beqlr
 	li	r6,-EFAULT
 	blr
 .Ldest_error:
+	ld	r14,STK_REG(R14)(r1)
+	ld	r15,STK_REG(R15)(r1)
+	ld	r16,STK_REG(R16)(r1)
+	addi	r1,r1,STACKFRAMESIZE
+.Ldest_error_nr:
 	cmpdi	0,r8,0
 	beqlr
 	li	r6,-EFAULT

arch/powerpc/mm/init_64.c+4−0

@@ -300,5 +300,9 @@ void vmemmap_free(unsigned long start, unsigned long end) · 299 unmodified lines
300	{	300	{
301	}	301	}
302		302
		303	void register_page_bootmem_memmap(unsigned long section_nr,
		304	struct page *start_page, unsigned long size)
		305	{
		306	}
303	#endif /* CONFIG_SPARSEMEM_VMEMMAP */	307	#endif /* CONFIG_SPARSEMEM_VMEMMAP */
304		308

arch/powerpc/mm/mem.c+9−0

 }
 #endif /* ! CONFIG_NEED_MULTIPLE_NODES */
+static void __init register_page_bootmem_info(void)
+{
+	int i;
+	for_each_online_node(i)
+		register_page_bootmem_info_node(NODE_DATA(i));
+}
 void __init mem_init(void)
 {
 #ifdef CONFIG_SWIOTLB
 	swiotlb_init(0);
 #endif
+	register_page_bootmem_info();
 	high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);
 	set_max_mapnr(max_pfn);
 	free_all_bootmem();

arch/powerpc/perf/power8-pmu.c+3−2

 #define MMCR1_UNIT_SHIFT(pmc)		(60 - (4 * ((pmc) - 1)))
 #define MMCR1_COMBINE_SHIFT(pmc)	(35 - ((pmc) - 1))
 #define MMCR1_PMCSEL_SHIFT(pmc)		(24 - (((pmc) - 1)) * 8)
+#define MMCR1_FAB_SHIFT			36
 #define MMCR1_DC_QUAL_SHIFT		47
 #define MMCR1_IC_QUAL_SHIFT		46
 		 * the threshold bits are used for the match value.
 		 */
 		if (event_is_fab_match(event[i])) {
-			mmcr1 |= (event[i] >> EVENT_THR_CTL_SHIFT) &
+			mmcr1 |= ((event[i] >> EVENT_THR_CTL_SHIFT) &
-				  EVENT_THR_CTL_MASK;
+				  EVENT_THR_CTL_MASK) << MMCR1_FAB_SHIFT;
 		} else {
 			val = (event[i] >> EVENT_THR_CTL_SHIFT) & EVENT_THR_CTL_MASK;
 			mmcra |= val << MMCRA_THR_CTL_SHIFT;

arch/s390/include/asm/jump_label.h+1−1

@@ -15,7 +15,7 @@ · 14 unmodified lines
15		15
16	static __always_inline bool arch_static_branch(struct static_key *key)	16	static __always_inline bool arch_static_branch(struct static_key *key)
17	{	17	{
18	asm goto("0: brcl 0,0\n"	18	asm_volatile_goto("0: brcl 0,0\n"
19	".pushsection __jump_table, \"aw\"\n"	19	".pushsection __jump_table, \"aw\"\n"
20	ASM_ALIGN "\n"	20	ASM_ALIGN "\n"
21	ASM_PTR " 0b, %l[label], %0\n"	21	ASM_PTR " 0b, %l[label], %0\n"

arch/s390/include/asm/pgtable.h+3−1

 static inline void pgste_set_pte(pte_t *ptep, pte_t entry)
 {
-	if (!MACHINE_HAS_ESOP && (pte_val(entry) & _PAGE_WRITE)) {
+	if (!MACHINE_HAS_ESOP &&
+	    (pte_val(entry) & _PAGE_PRESENT) &&
+	    (pte_val(entry) & _PAGE_WRITE)) {
 		/*
 		 * Without enhanced suppression-on-protection force
 		 * the dirty bit on for all writable ptes.

arch/s390/include/asm/timex.h+14−14

 typedef unsigned long long cycles_t;
-static inline unsigned long long get_tod_clock(void)
-{
-	unsigned long long clk;
-#ifdef CONFIG_HAVE_MARCH_Z9_109_FEATURES
-	asm volatile(".insn s,0xb27c0000,%0" : "=Q" (clk) : : "cc");
-#else
-	asm volatile("stck %0" : "=Q" (clk) : : "cc");
-#endif
-	return clk;
-}
 static inline void get_tod_clock_ext(char *clk)
 {
 	asm volatile("stcke %0" : "=Q" (*clk) : : "cc");
 }
-static inline unsigned long long get_tod_clock_xt(void)
+static inline unsigned long long get_tod_clock(void)
 {
 	unsigned char clk[16];
 	get_tod_clock_ext(clk);
 	return *((unsigned long long *)&clk[1]);
 }
+static inline unsigned long long get_tod_clock_fast(void)
+{
+#ifdef CONFIG_HAVE_MARCH_Z9_109_FEATURES
+	unsigned long long clk;
+	asm volatile("stckf %0" : "=Q" (clk) : : "cc");
+	return clk;
+#else
+	return get_tod_clock();
+#endif
+}
 static inline cycles_t get_cycles(void)
 {
 	return (cycles_t) get_tod_clock() >> 2;
  */
 static inline unsigned long long get_tod_clock_monotonic(void)
 {
-	return get_tod_clock_xt() - sched_clock_base_cc;
+	return get_tod_clock() - sched_clock_base_cc;
 }
 /**

arch/s390/kernel/compat_signal.c+2−2

@@ -99,7 +99,7 @@ int copy_siginfo_to_user32(compat_siginfo_t __user to, siginfo_t from) · 98 unmodified lines
99	break;	99	break;
100	}	100	}
101	}	101	}
102	return err;	102	return err ? -EFAULT : 0;
103	}	103	}
104		104
105	int copy_siginfo_from_user32(siginfo_t to, compat_siginfo_t __user from)	105	int copy_siginfo_from_user32(siginfo_t to, compat_siginfo_t __user from)
@@ -148,7 +148,7 @@ int copy_siginfo_from_user32(siginfo_t to, compat_siginfo_t __user from) · 42 unmodified lines
148	break;	148	break;
149	}	149	}
150	}	150	}
151	return err;	151	return err ? -EFAULT : 0;
152	}	152	}
153		153
154	static int save_sigregs32(struct pt_regs regs, _sigregs32 __user sregs)	154	static int save_sigregs32(struct pt_regs regs, _sigregs32 __user sregs)

arch/s390/kernel/crash_dump.c+20−22

@@ -40,28 +40,26 @@ static inline void load_real_addr(void addr) · 39 unmodified lines
40	}	40	}
41		41
42	/*	42	/*
43	* Copy up to one page to vmalloc or real memory	43	* Copy real to virtual or real memory
44	*/	44	*/
45	static ssize_t copy_page_real(void buf, void src, size_t csize)	45	static int copy_from_realmem(void dest, void src, size_t count)
46	{	46	{
47	size_t size;	47	unsigned long size;
		48	int rc;
48		49
49	if (is_vmalloc_addr(buf)) {	50	if (!count)
50	BUG_ON(csize >= PAGE_SIZE);	51	return 0;
51	/* If buf is not page aligned, copy first part */	52	if (!is_vmalloc_or_module_addr(dest))
52	size = min(roundup(__pa(buf), PAGE_SIZE) - __pa(buf), csize);	53	return memcpy_real(dest, src, count);
53	if (size) {	54	do {
54	if (memcpy_real(load_real_addr(buf), src, size))	55	size = min(count, PAGE_SIZE - (__pa(dest) & ~PAGE_MASK));
55	return -EFAULT;	56	if (memcpy_real(load_real_addr(dest), src, size))
56	buf += size;	57	return -EFAULT;
57	src += size;	58	count -= size;
58	}	59	dest += size;
59	/* Copy second part */	60	src += size;
60	size = csize - size;	61	} while (count);
61	return (size) ? memcpy_real(load_real_addr(buf), src, size) : 0;	62	return 0;
62	} else {
63	return memcpy_real(buf, src, csize);
64	}
65	}	63	}
66		64
67	/*	65	/*
@@ -114,7 +112,7 @@ static ssize_t copy_oldmem_page_kdump(char *buf, size_t csize, · 46 unmodified lines
114	rc = copy_to_user_real((void __force __user *) buf,	112	rc = copy_to_user_real((void __force __user *) buf,
115	(void *) src, csize);	113	(void *) src, csize);
116	else	114	else
117	rc = copy_page_real(buf, (void *) src, csize);	115	rc = copy_from_realmem(buf, (void *) src, csize);
118	return (rc == 0) ? rc : csize;	116	return (rc == 0) ? rc : csize;
119	}	117	}
120		118
@@ -210,7 +208,7 @@ int copy_from_oldmem(void dest, void src, size_t count) · 89 unmodified lines
210	if (OLDMEM_BASE) {	208	if (OLDMEM_BASE) {
211	if ((unsigned long) src < OLDMEM_SIZE) {	209	if ((unsigned long) src < OLDMEM_SIZE) {
212	copied = min(count, OLDMEM_SIZE - (unsigned long) src);	210	copied = min(count, OLDMEM_SIZE - (unsigned long) src);
213	rc = memcpy_real(dest, src + OLDMEM_BASE, copied);	211	rc = copy_from_realmem(dest, src + OLDMEM_BASE, copied);
214	if (rc)	212	if (rc)
215	return rc;	213	return rc;
216	}	214	}
@@ -223,7 +221,7 @@ int copy_from_oldmem(void dest, void src, size_t count) · 6 unmodified lines
223	return rc;	221	return rc;
224	}	222	}
225	}	223	}
226	return memcpy_real(dest + copied, src + copied, count - copied);	224	return copy_from_realmem(dest + copied, src + copied, count - copied);
227	}	225	}
228		226
229	/*	227	/*

arch/s390/kernel/debug.c+1−1

@@ -867,7 +867,7 @@ static inline void · 866 unmodified lines
867	debug_finish_entry(debug_info_t * id, debug_entry_t* active, int level,	867	debug_finish_entry(debug_info_t * id, debug_entry_t* active, int level,
868	int exception)	868	int exception)
869	{	869	{
870	active->id.stck = get_tod_clock();	870	active->id.stck = get_tod_clock_fast();
871	active->id.fields.cpuid = smp_processor_id();	871	active->id.fields.cpuid = smp_processor_id();
872	active->caller = __builtin_return_address(0);	872	active->caller = __builtin_return_address(0);
873	active->id.fields.exception = exception;	873	active->id.fields.exception = exception;

arch/s390/kernel/entry.S+1−0

@@ -266,6 +266,7 @@ sysc_sigpending: · 265 unmodified lines
266	tm __TI_flags+3(%r12),_TIF_SYSCALL	266	tm __TI_flags+3(%r12),_TIF_SYSCALL
267	jno sysc_return	267	jno sysc_return
268	lm %r2,%r7,__PT_R2(%r11) # load svc arguments	268	lm %r2,%r7,__PT_R2(%r11) # load svc arguments
		269	l %r10,__TI_sysc_table(%r12) # 31 bit system call table
269	xr %r8,%r8 # svc 0 returns -ENOSYS	270	xr %r8,%r8 # svc 0 returns -ENOSYS
270	clc __PT_INT_CODE+2(2,%r11),BASED(.Lnr_syscalls+2)	271	clc __PT_INT_CODE+2(2,%r11),BASED(.Lnr_syscalls+2)
271	jnl sysc_nr_ok # invalid svc number -> do svc 0	272	jnl sysc_nr_ok # invalid svc number -> do svc 0

arch/s390/kernel/entry64.S+1−0

@@ -297,6 +297,7 @@ sysc_sigpending: · 296 unmodified lines
297	tm __TI_flags+7(%r12),_TIF_SYSCALL	297	tm __TI_flags+7(%r12),_TIF_SYSCALL
298	jno sysc_return	298	jno sysc_return
299	lmg %r2,%r7,__PT_R2(%r11) # load svc arguments	299	lmg %r2,%r7,__PT_R2(%r11) # load svc arguments
		300	lg %r10,__TI_sysc_table(%r12) # address of system call table
300	lghi %r8,0 # svc 0 returns -ENOSYS	301	lghi %r8,0 # svc 0 returns -ENOSYS
301	llgh %r1,__PT_INT_CODE+2(%r11) # load new svc number	302	llgh %r1,__PT_INT_CODE+2(%r11) # load new svc number
302	cghi %r1,NR_syscalls	303	cghi %r1,NR_syscalls

arch/s390/kernel/kprobes.c+5−1

 	case 0xac:	/* stnsm */
 	case 0xad:	/* stosm */
 		return -EINVAL;
+	case 0xc6:
+		switch (insn[0] & 0x0f) {
+		case 0x00: /* exrl   */
+			return -EINVAL;
+		}
 	}
 	switch (insn[0]) {
 	case 0x0101:	/* pr	 */
 		break;
 	case 0xc6:
 		switch (insn[0] & 0x0f) {
-		case 0x00: /* exrl   */
 		case 0x02: /* pfdrl  */
 		case 0x04: /* cghrl  */
 		case 0x05: /* chrl   */

arch/s390/kvm/interrupt.c+3−3

@@ -385,7 +385,7 @@ static int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu) · 384 unmodified lines
385	}	385	}
386		386
387	if ((!rc) && (vcpu->arch.sie_block->ckc <	387	if ((!rc) && (vcpu->arch.sie_block->ckc <
388	get_tod_clock() + vcpu->arch.sie_block->epoch)) {	388	get_tod_clock_fast() + vcpu->arch.sie_block->epoch)) {
389	if ((!psw_extint_disabled(vcpu)) &&	389	if ((!psw_extint_disabled(vcpu)) &&
390	(vcpu->arch.sie_block->gcr[0] & 0x800ul))	390	(vcpu->arch.sie_block->gcr[0] & 0x800ul))
391	rc = 1;	391	rc = 1;
@@ -425,7 +425,7 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu) · 33 unmodified lines
425	goto no_timer;	425	goto no_timer;
426	}	426	}
427		427
428	now = get_tod_clock() + vcpu->arch.sie_block->epoch;	428	now = get_tod_clock_fast() + vcpu->arch.sie_block->epoch;
429	if (vcpu->arch.sie_block->ckc < now) {	429	if (vcpu->arch.sie_block->ckc < now) {
430	__unset_cpu_idle(vcpu);	430	__unset_cpu_idle(vcpu);
431	return 0;	431	return 0;
@@ -515,7 +515,7 @@ void kvm_s390_deliver_pending_interrupts(struct kvm_vcpu *vcpu) · 83 unmodified lines
515	}	515	}
516		516
517	if ((vcpu->arch.sie_block->ckc <	517	if ((vcpu->arch.sie_block->ckc <
518	get_tod_clock() + vcpu->arch.sie_block->epoch))	518	get_tod_clock_fast() + vcpu->arch.sie_block->epoch))
519	__try_deliver_ckc_interrupt(vcpu);	519	__try_deliver_ckc_interrupt(vcpu);
520		520
521	if (atomic_read(&fi->active)) {	521	if (atomic_read(&fi->active)) {

arch/s390/lib/delay.c+7−7

@@ -44,7 +44,7 @@ static void __udelay_disabled(unsigned long long usecs) · 43 unmodified lines
44	do {	44	do {
45	set_clock_comparator(end);	45	set_clock_comparator(end);
46	vtime_stop_cpu();	46	vtime_stop_cpu();
47	} while (get_tod_clock() < end);	47	} while (get_tod_clock_fast() < end);
48	lockdep_on();	48	lockdep_on();
49	__ctl_load(cr0, 0, 0);	49	__ctl_load(cr0, 0, 0);
50	__ctl_load(cr6, 6, 6);	50	__ctl_load(cr6, 6, 6);
@@ -55,7 +55,7 @@ static void __udelay_enabled(unsigned long long usecs) · 4 unmodified lines
55	{	55	{
56	u64 clock_saved, end;	56	u64 clock_saved, end;
57		57
58	end = get_tod_clock() + (usecs << 12);	58	end = get_tod_clock_fast() + (usecs << 12);
59	do {	59	do {
60	clock_saved = 0;	60	clock_saved = 0;
61	if (end < S390_lowcore.clock_comparator) {	61	if (end < S390_lowcore.clock_comparator) {
@@ -65,7 +65,7 @@ static void __udelay_enabled(unsigned long long usecs) · 3 unmodified lines
65	vtime_stop_cpu();	65	vtime_stop_cpu();
66	if (clock_saved)	66	if (clock_saved)
67	local_tick_enable(clock_saved);	67	local_tick_enable(clock_saved);
68	} while (get_tod_clock() < end);	68	} while (get_tod_clock_fast() < end);
69	}	69	}
70		70
71	/*	71	/*
@@ -109,8 +109,8 @@ void udelay_simple(unsigned long long usecs) · 37 unmodified lines
109	{	109	{
110	u64 end;	110	u64 end;
111		111
112	end = get_tod_clock() + (usecs << 12);	112	end = get_tod_clock_fast() + (usecs << 12);
113	while (get_tod_clock() < end)	113	while (get_tod_clock_fast() < end)
114	cpu_relax();	114	cpu_relax();
115	}	115	}
116		116
@@ -120,10 +120,10 @@ void __ndelay(unsigned long long nsecs) · 3 unmodified lines
120		120
121	nsecs <<= 9;	121	nsecs <<= 9;
122	do_div(nsecs, 125);	122	do_div(nsecs, 125);
123	end = get_tod_clock() + nsecs;	123	end = get_tod_clock_fast() + nsecs;
124	if (nsecs & ~0xfffUL)	124	if (nsecs & ~0xfffUL)
125	__udelay(nsecs >> 12);	125	__udelay(nsecs >> 12);
126	while (get_tod_clock() < end)	126	while (get_tod_clock_fast() < end)
127	barrier();	127	barrier();
128	}	128	}
129	EXPORT_SYMBOL(__ndelay);	129	EXPORT_SYMBOL(__ndelay);

arch/sparc/Kconfig+6−1

 	  Only choose N if you know in advance that you will not need to modify
 	  OpenPROM settings on the running system.
-# Makefile helper
+# Makefile helpers
 config SPARC64_PCI
 	bool
 	default y
 	depends on SPARC64 && PCI
+config SPARC64_PCI_MSI
+	bool
+	default y
+	depends on SPARC64_PCI && PCI_MSI
 endmenu
 menu "Executable file formats"

arch/sparc/include/asm/floppy_64.h+1−1

@@ -254,7 +254,7 @@ static int sun_fd_request_irq(void) · 253 unmodified lines
254	once = 1;	254	once = 1;
255		255
256	error = request_irq(FLOPPY_IRQ, sparc_floppy_irq,	256	error = request_irq(FLOPPY_IRQ, sparc_floppy_irq,
257	IRQF_DISABLED, "floppy", NULL);	257	0, "floppy", NULL);
258		258
259	return ((error == 0) ? 0 : -1);	259	return ((error == 0) ? 0 : -1);
260	}	260	}

arch/sparc/include/asm/jump_label.h+1−1

@@ -9,7 +9,7 @@ · 8 unmodified lines
9		9
10	static __always_inline bool arch_static_branch(struct static_key *key)	10	static __always_inline bool arch_static_branch(struct static_key *key)
11	{	11	{
12	asm goto("1:\n\t"	12	asm_volatile_goto("1:\n\t"
13	"nop\n\t"	13	"nop\n\t"
14	"nop\n\t"	14	"nop\n\t"
15	".pushsection __jump_table, \"aw\"\n\t"	15	".pushsection __jump_table, \"aw\"\n\t"

arch/sparc/kernel/Makefile+2−1

@@ -1,3 +1,4 @@
		1
1	#	2	#
2	# Makefile for the linux kernel.	3	# Makefile for the linux kernel.
3	#	4	#
@@ -99,7 +100,7 @@ obj-$(CONFIG_STACKTRACE) += stacktrace.o · 95 unmodified lines
99	obj-$(CONFIG_SPARC64_PCI) += pci.o pci_common.o psycho_common.o	100	obj-$(CONFIG_SPARC64_PCI) += pci.o pci_common.o psycho_common.o
100	obj-$(CONFIG_SPARC64_PCI) += pci_psycho.o pci_sabre.o pci_schizo.o	101	obj-$(CONFIG_SPARC64_PCI) += pci_psycho.o pci_sabre.o pci_schizo.o
101	obj-$(CONFIG_SPARC64_PCI) += pci_sun4v.o pci_sun4v_asm.o pci_fire.o	102	obj-$(CONFIG_SPARC64_PCI) += pci_sun4v.o pci_sun4v_asm.o pci_fire.o
102	obj-$(CONFIG_PCI_MSI) += pci_msi.o	103	obj-$(CONFIG_SPARC64_PCI_MSI) += pci_msi.o
103		104
104	obj-$(CONFIG_COMPAT) += sys32.o sys_sparc32.o signal32.o	105	obj-$(CONFIG_COMPAT) += sys32.o sys_sparc32.o signal32.o
105		106

arch/sparc/kernel/ds.c+2−3

@@ -849,9 +849,8 @@ void ldom_reboot(const char *boot_command) · 848 unmodified lines
849	if (boot_command && strlen(boot_command)) {	849	if (boot_command && strlen(boot_command)) {
850	unsigned long len;	850	unsigned long len;
851		851
852	strcpy(full_boot_str, "boot ");	852	snprintf(full_boot_str, sizeof(full_boot_str), "boot %s",
853	strlcpy(full_boot_str + strlen("boot "), boot_command,	853	boot_command);
854	sizeof(full_boot_str));
855	len = strlen(full_boot_str);	854	len = strlen(full_boot_str);
856		855
857	if (reboot_data_supported) {	856	if (reboot_data_supported) {

arch/sparc/kernel/ldc.c+2−2

@@ -1249,12 +1249,12 @@ int ldc_bind(struct ldc_channel lp, const char name) · 1248 unmodified lines
1249	snprintf(lp->rx_irq_name, LDC_IRQ_NAME_MAX, "%s RX", name);	1249	snprintf(lp->rx_irq_name, LDC_IRQ_NAME_MAX, "%s RX", name);
1250	snprintf(lp->tx_irq_name, LDC_IRQ_NAME_MAX, "%s TX", name);	1250	snprintf(lp->tx_irq_name, LDC_IRQ_NAME_MAX, "%s TX", name);
1251		1251
1252	err = request_irq(lp->cfg.rx_irq, ldc_rx, IRQF_DISABLED,	1252	err = request_irq(lp->cfg.rx_irq, ldc_rx, 0,
1253	lp->rx_irq_name, lp);	1253	lp->rx_irq_name, lp);
1254	if (err)	1254	if (err)
1255	return err;	1255	return err;
1256		1256
1257	err = request_irq(lp->cfg.tx_irq, ldc_tx, IRQF_DISABLED,	1257	err = request_irq(lp->cfg.tx_irq, ldc_tx, 0,
1258	lp->tx_irq_name, lp);	1258	lp->tx_irq_name, lp);
1259	if (err) {	1259	if (err) {
1260	free_irq(lp->cfg.rx_irq, lp);	1260	free_irq(lp->cfg.rx_irq, lp);

arch/tile/include/asm/atomic.h+3−2

  *
  * Atomically sets @v to @i and returns old @v
  */
-static inline u64 atomic64_xchg(atomic64_t *v, u64 n)
+static inline long long atomic64_xchg(atomic64_t *v, long long n)
 {
 	return xchg64(&v->counter, n);
 }
  * Atomically checks if @v holds @o and replaces it with @n if so.
  * Returns the old value at @v.
  */
-static inline u64 atomic64_cmpxchg(atomic64_t *v, u64 o, u64 n)
+static inline long long atomic64_cmpxchg(atomic64_t *v, long long o,
+					long long n)
 {
 	return cmpxchg64(&v->counter, o, n);
 }

arch/tile/include/asm/atomic_32.h+15−12

 /* A 64bit atomic type */
 typedef struct {
-	u64 __aligned(8) counter;
+	long long counter;
 } atomic64_t;
 #define ATOMIC64_INIT(val) { (val) }
  *
  * Atomically reads the value of @v.
  */
-static inline u64 atomic64_read(const atomic64_t *v)
+static inline long long atomic64_read(const atomic64_t *v)
 {
 	/*
 	 * Requires an atomic op to read both 32-bit parts consistently.
 	 * Casting away const is safe since the atomic support routines
 	 * do not write to memory if the value has not been modified.
 	 */
-	return _atomic64_xchg_add((u64 *)&v->counter, 0);
+	return _atomic64_xchg_add((long long *)&v->counter, 0);
 }
 /**
  *
  * Atomically adds @i to @v.
  */
-static inline void atomic64_add(u64 i, atomic64_t *v)
+static inline void atomic64_add(long long i, atomic64_t *v)
 {
 	_atomic64_xchg_add(&v->counter, i);
 }
  *
  * Atomically adds @i to @v and returns @i + @v
  */
-static inline u64 atomic64_add_return(u64 i, atomic64_t *v)
+static inline long long atomic64_add_return(long long i, atomic64_t *v)
 {
 	smp_mb();  /* barrier for proper semantics */
 	return _atomic64_xchg_add(&v->counter, i) + i;
  * Atomically adds @a to @v, so long as @v was not already @u.
  * Returns non-zero if @v was not @u, and zero otherwise.
  */
-static inline u64 atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
+static inline long long atomic64_add_unless(atomic64_t *v, long long a,
+					long long u)
 {
 	smp_mb();  /* barrier for proper semantics */
 	return _atomic64_xchg_add_unless(&v->counter, a, u) != u;
  * atomic64_set() can't be just a raw store, since it would be lost if it
  * fell between the load and store of one of the other atomic ops.
  */
-static inline void atomic64_set(atomic64_t *v, u64 n)
+static inline void atomic64_set(atomic64_t *v, long long n)
 {
 	_atomic64_xchg(&v->counter, n);
 }
 extern struct __get_user __atomic_or(volatile int *p, int *lock, int n);
 extern struct __get_user __atomic_andn(volatile int *p, int *lock, int n);
 extern struct __get_user __atomic_xor(volatile int *p, int *lock, int n);
-extern u64 __atomic64_cmpxchg(volatile u64 *p, int *lock, u64 o, u64 n);
+extern long long __atomic64_cmpxchg(volatile long long *p, int *lock,
-extern u64 __atomic64_xchg(volatile u64 *p, int *lock, u64 n);
+					long long o, long long n);
-extern u64 __atomic64_xchg_add(volatile u64 *p, int *lock, u64 n);
+extern long long __atomic64_xchg(volatile long long *p, int *lock, long long n);
-extern u64 __atomic64_xchg_add_unless(volatile u64 *p,
+extern long long __atomic64_xchg_add(volatile long long *p, int *lock,
-				      int *lock, u64 o, u64 n);
+					long long n);
+extern long long __atomic64_xchg_add_unless(volatile long long *p,
+					int *lock, long long o, long long n);
 /* Return failure from the atomic wrappers. */
 struct __get_user __atomic_bad_address(int __user *addr);

arch/tile/include/asm/cmpxchg.h+17−11

 int _atomic_xchg_add(int *v, int i);
 int _atomic_xchg_add_unless(int *v, int a, int u);
 int _atomic_cmpxchg(int *ptr, int o, int n);
-u64 _atomic64_xchg(u64 *v, u64 n);
+long long _atomic64_xchg(long long *v, long long n);
-u64 _atomic64_xchg_add(u64 *v, u64 i);
+long long _atomic64_xchg_add(long long *v, long long i);
-u64 _atomic64_xchg_add_unless(u64 *v, u64 a, u64 u);
+long long _atomic64_xchg_add_unless(long long *v, long long a, long long u);
-u64 _atomic64_cmpxchg(u64 *v, u64 o, u64 n);
+long long _atomic64_cmpxchg(long long *v, long long o, long long n);
 #define xchg(ptr, n)							\
 	({								\
 		if (sizeof(*(ptr)) != 4)				\
 			__cmpxchg_called_with_bad_pointer();		\
 		smp_mb();						\
-		(typeof(*(ptr)))_atomic_cmpxchg((int *)ptr, (int)o, (int)n); \
+		(typeof(*(ptr)))_atomic_cmpxchg((int *)ptr, (int)o,	\
+						(int)n);		\
 	})
 #define xchg64(ptr, n)							\
 		if (sizeof(*(ptr)) != 8)				\
 			__xchg_called_with_bad_pointer();		\
 		smp_mb();						\
-		(typeof(*(ptr)))_atomic64_xchg((u64 *)(ptr), (u64)(n));	\
+		(typeof(*(ptr)))_atomic64_xchg((long long *)(ptr),	\
+						(long long)(n));	\
 	})
 #define cmpxchg64(ptr, o, n)						\
 		if (sizeof(*(ptr)) != 8)				\
 			__cmpxchg_called_with_bad_pointer();		\
 		smp_mb();						\
-		(typeof(*(ptr)))_atomic64_cmpxchg((u64 *)ptr, (u64)o, (u64)n); \
+		(typeof(*(ptr)))_atomic64_cmpxchg((long long *)ptr,	\
+					(long long)o, (long long)n);	\
 	})
 #else
 		switch (sizeof(*(ptr))) {				\
 		case 4:							\
 			__x = (typeof(__x))(unsigned long)		\
-				__insn_exch4((ptr), (u32)(unsigned long)(n)); \
+				__insn_exch4((ptr),			\
+					(u32)(unsigned long)(n));	\
 			break;						\
 		case 8:							\
-			__x = (typeof(__x))			\
+			__x = (typeof(__x))				\
 				__insn_exch((ptr), (unsigned long)(n));	\
 			break;						\
 		default:						\
 		switch (sizeof(*(ptr))) {				\
 		case 4:							\
 			__x = (typeof(__x))(unsigned long)		\
-				__insn_cmpexch4((ptr), (u32)(unsigned long)(n)); \
+				__insn_cmpexch4((ptr),			\
+					(u32)(unsigned long)(n));	\
 			break;						\
 		case 8:							\
-			__x = (typeof(__x))__insn_cmpexch((ptr), (u64)(n)); \
+			__x = (typeof(__x))__insn_cmpexch((ptr),	\
+						(long long)(n));	\
 			break;						\
 		default:						\
 			__cmpxchg_called_with_bad_pointer();		\

arch/tile/include/asm/percpu.h+31−3

@@ -15,9 +15,37 @@ · 14 unmodified lines
15	#ifndef _ASM_TILE_PERCPU_H	15	#ifndef _ASM_TILE_PERCPU_H
16	#define _ASM_TILE_PERCPU_H	16	#define _ASM_TILE_PERCPU_H
17		17
18	register unsigned long __my_cpu_offset __asm__("tp");	18	register unsigned long my_cpu_offset_reg asm("tp");
19	#define __my_cpu_offset __my_cpu_offset	19
20	#define set_my_cpu_offset(tp) (__my_cpu_offset = (tp))	20	#ifdef CONFIG_PREEMPT
		21	/*
		22	* For full preemption, we can't just use the register variable
		23	* directly, since we need barrier() to hazard against it, causing the
		24	* compiler to reload anything computed from a previous "tp" value.
		25	* But we also don't want to use volatile asm, since we'd like the
		26	* compiler to be able to cache the value across multiple percpu reads.
		27	* So we use a fake stack read as a hazard against barrier().
		28	* The 'U' constraint is like 'm' but disallows postincrement.
		29	*/
		30	static inline unsigned long __my_cpu_offset(void)
		31	{
		32	unsigned long tp;
		33	register unsigned long *sp asm("sp");
		34	asm("move %0, tp" : "=r" (tp) : "U" (*sp));
		35	return tp;
		36	}
		37	#define __my_cpu_offset __my_cpu_offset()
		38	#else
		39	/*
		40	* We don't need to hazard against barrier() since "tp" doesn't ever
		41	* change with PREEMPT_NONE, and with PREEMPT_VOLUNTARY it only
		42	* changes at function call points, at which we are already re-reading
		43	* the value of "tp" due to "my_cpu_offset_reg" being a global variable.
		44	*/
		45	#define __my_cpu_offset my_cpu_offset_reg
		46	#endif
		47
		48	#define set_my_cpu_offset(tp) (my_cpu_offset_reg = (tp))
21		49
22	#include <asm-generic/percpu.h>	50	#include <asm-generic/percpu.h>
23		51

arch/tile/kernel/hardwall.c+3−3

@@ -66,7 +66,7 @@ static struct hardwall_type hardwall_types[] = { · 65 unmodified lines
66	0,	66	0,
67	"udn",	67	"udn",
68	LIST_HEAD_INIT(hardwall_types[HARDWALL_UDN].list),	68	LIST_HEAD_INIT(hardwall_types[HARDWALL_UDN].list),
69	__SPIN_LOCK_INITIALIZER(hardwall_types[HARDWALL_UDN].lock),	69	__SPIN_LOCK_UNLOCKED(hardwall_types[HARDWALL_UDN].lock),
70	NULL	70	NULL
71	},	71	},
72	#ifndef __tilepro__	72	#ifndef __tilepro__
@@ -77,7 +77,7 @@ static struct hardwall_type hardwall_types[] = { · 4 unmodified lines
77	1, /* disabled pending hypervisor support */	77	1, /* disabled pending hypervisor support */
78	"idn",	78	"idn",
79	LIST_HEAD_INIT(hardwall_types[HARDWALL_IDN].list),	79	LIST_HEAD_INIT(hardwall_types[HARDWALL_IDN].list),
80	__SPIN_LOCK_INITIALIZER(hardwall_types[HARDWALL_IDN].lock),	80	__SPIN_LOCK_UNLOCKED(hardwall_types[HARDWALL_IDN].lock),
81	NULL	81	NULL
82	},	82	},
83	{ /* access to user-space IPI */	83	{ /* access to user-space IPI */
@@ -87,7 +87,7 @@ static struct hardwall_type hardwall_types[] = { · 3 unmodified lines
87	0,	87	0,
88	"ipi",	88	"ipi",
89	LIST_HEAD_INIT(hardwall_types[HARDWALL_IPI].list),	89	LIST_HEAD_INIT(hardwall_types[HARDWALL_IPI].list),
90	__SPIN_LOCK_INITIALIZER(hardwall_types[HARDWALL_IPI].lock),	90	__SPIN_LOCK_UNLOCKED(hardwall_types[HARDWALL_IPI].lock),
91	NULL	91	NULL
92	},	92	},
93	#endif	93	#endif

arch/tile/kernel/intvec_32.S+3−0

 	}
 	bzt     r28, 1f
 	bnz     r29, 1f
+	/* Disable interrupts explicitly for preemption. */
+	IRQ_DISABLE(r20,r21)
+	TRACE_IRQS_OFF
 	jal     preempt_schedule_irq
 	FEEDBACK_REENTER(interrupt_return)
 1:

arch/tile/kernel/intvec_64.S+3−0

 	}
 	beqzt   r28, 1f
 	bnez    r29, 1f
+	/* Disable interrupts explicitly for preemption. */
+	IRQ_DISABLE(r20,r21)
+	TRACE_IRQS_OFF
 	jal     preempt_schedule_irq
 	FEEDBACK_REENTER(interrupt_return)
 1:

arch/tile/kernel/stack.c+5−7

 #include <linux/mmzone.h>
 #include <linux/dcache.h>
 #include <linux/fs.h>
+#include <linux/string.h>
 #include <asm/backtrace.h>
 #include <asm/page.h>
 #include <asm/ucontext.h>
 	}
 	if (vma->vm_file) {
-		char *s;
 		p = d_path(&vma->vm_file->f_path, buf, bufsize);
 		if (IS_ERR(p))
 			p = "?";
-		s = strrchr(p, '/');
+		name = kbasename(p);
-		if (s)
-			p = s+1;
 	} else {
-		p = "anon";
+		name = "anon";
 	}
 	/* Generate a string description of the vma info. */
-	namelen = strlen(p);
+	namelen = strlen(name);
 	remaining = (bufsize - 1) - namelen;
-	memmove(buf, p, namelen);
+	memmove(buf, name, namelen);
 	snprintf(buf + namelen, remaining, "[%lx+%lx] ",
 		 vma->vm_start, vma->vm_end - vma->vm_start);
 }

arch/tile/lib/atomic_32.c+4−4

@@ -107,19 +107,19 @@ unsigned long _atomic_xor(volatile unsigned long *p, unsigned long mask) · 106 unmodified lines
107	EXPORT_SYMBOL(_atomic_xor);	107	EXPORT_SYMBOL(_atomic_xor);
108		108
109		109
110	u64 _atomic64_xchg(u64 *v, u64 n)	110	long long _atomic64_xchg(long long *v, long long n)
111	{	111	{
112	return __atomic64_xchg(v, __atomic_setup(v), n);	112	return __atomic64_xchg(v, __atomic_setup(v), n);
113	}	113	}
114	EXPORT_SYMBOL(_atomic64_xchg);	114	EXPORT_SYMBOL(_atomic64_xchg);
115		115
116	u64 _atomic64_xchg_add(u64 *v, u64 i)	116	long long _atomic64_xchg_add(long long *v, long long i)
117	{	117	{
118	return __atomic64_xchg_add(v, __atomic_setup(v), i);	118	return __atomic64_xchg_add(v, __atomic_setup(v), i);
119	}	119	}
120	EXPORT_SYMBOL(_atomic64_xchg_add);	120	EXPORT_SYMBOL(_atomic64_xchg_add);
121		121
122	u64 _atomic64_xchg_add_unless(u64 *v, u64 a, u64 u)	122	long long _atomic64_xchg_add_unless(long long *v, long long a, long long u)
123	{	123	{
124	/*	124	/*
125	* Note: argument order is switched here since it is easier	125	* Note: argument order is switched here since it is easier
@@ -130,7 +130,7 @@ u64 _atomic64_xchg_add_unless(u64 *v, u64 a, u64 u) · 4 unmodified lines
130	}	130	}
131	EXPORT_SYMBOL(_atomic64_xchg_add_unless);	131	EXPORT_SYMBOL(_atomic64_xchg_add_unless);
132		132
133	u64 _atomic64_cmpxchg(u64 *v, u64 o, u64 n)	133	long long _atomic64_cmpxchg(long long *v, long long o, long long n)
134	{	134	{
135	return __atomic64_cmpxchg(v, __atomic_setup(v), o, n);	135	return __atomic64_cmpxchg(v, __atomic_setup(v), o, n);
136	}	136	}

arch/x86/Kconfig+4−3

 config X86_UP_APIC
 	bool "Local APIC support on uniprocessors"
-	depends on X86_32 && !SMP && !X86_32_NON_STANDARD
+	depends on X86_32 && !SMP && !X86_32_NON_STANDARD && !PCI_MSI
 	---help---
 	  A local APIC (Advanced Programmable Interrupt Controller) is an
 	  integrated interrupt controller in the CPU. If you have a single-CPU
 config X86_LOCAL_APIC
 	def_bool y
-	depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC
+	depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC || PCI_MSI
 config X86_IO_APIC
 	def_bool y
-	depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC
+	depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC || PCI_MSI
 config X86_VISWS_APIC
 	def_bool y
 config MICROCODE
 	tristate "CPU microcode loading support"
+	depends on CPU_SUP_AMD || CPU_SUP_INTEL
 	select FW_LOADER
 	---help---

arch/x86/include/asm/cpufeature.h+3−3

@@ -374,7 +374,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit) · 373 unmodified lines
374	* Catch too early usage of this before alternatives	374	* Catch too early usage of this before alternatives
375	* have run.	375	* have run.
376	*/	376	*/
377	asm goto("1: jmp %l[t_warn]\n"	377	asm_volatile_goto("1: jmp %l[t_warn]\n"
378	"2:\n"	378	"2:\n"
379	".section .altinstructions,\"a\"\n"	379	".section .altinstructions,\"a\"\n"
380	" .long 1b - .\n"	380	" .long 1b - .\n"
@@ -388,7 +388,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit) · 7 unmodified lines
388		388
389	#endif	389	#endif
390		390
391	asm goto("1: jmp %l[t_no]\n"	391	asm_volatile_goto("1: jmp %l[t_no]\n"
392	"2:\n"	392	"2:\n"
393	".section .altinstructions,\"a\"\n"	393	".section .altinstructions,\"a\"\n"
394	" .long 1b - .\n"	394	" .long 1b - .\n"
@@ -453,7 +453,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit) · 58 unmodified lines
453	* have. Thus, we force the jump to the widest, 4-byte, signed relative	453	* have. Thus, we force the jump to the widest, 4-byte, signed relative
454	* offset even though the last would often fit in less bytes.	454	* offset even though the last would often fit in less bytes.
455	*/	455	*/
456	asm goto("1: .byte 0xe9\n .long %l[t_dynamic] - 2f\n"	456	asm_volatile_goto("1: .byte 0xe9\n .long %l[t_dynamic] - 2f\n"
457	"2:\n"	457	"2:\n"
458	".section .altinstructions,\"a\"\n"	458	".section .altinstructions,\"a\"\n"
459	" .long 1b - .\n" /* src offset */	459	" .long 1b - .\n" /* src offset */

arch/x86/include/asm/jump_label.h+1−1

@@ -18,7 +18,7 @@ · 17 unmodified lines
18		18
19	static __always_inline bool arch_static_branch(struct static_key *key)	19	static __always_inline bool arch_static_branch(struct static_key *key)
20	{	20	{
21	asm goto("1:"	21	asm_volatile_goto("1:"
22	".byte " __stringify(STATIC_KEY_INIT_NOP) "\n\t"	22	".byte " __stringify(STATIC_KEY_INIT_NOP) "\n\t"
23	".pushsection __jump_table, \"aw\" \n\t"	23	".pushsection __jump_table, \"aw\" \n\t"
24	_ASM_ALIGN "\n\t"	24	_ASM_ALIGN "\n\t"

arch/x86/include/asm/mutex_64.h+2−2

@@ -20,7 +20,7 @@ · 19 unmodified lines
20	static inline void __mutex_fastpath_lock(atomic_t *v,	20	static inline void __mutex_fastpath_lock(atomic_t *v,
21	void (fail_fn)(atomic_t ))	21	void (fail_fn)(atomic_t ))
22	{	22	{
23	asm volatile goto(LOCK_PREFIX " decl %0\n"	23	asm_volatile_goto(LOCK_PREFIX " decl %0\n"
24	" jns %l[exit]\n"	24	" jns %l[exit]\n"
25	: : "m" (v->counter)	25	: : "m" (v->counter)
26	: "memory", "cc"	26	: "memory", "cc"
@@ -75,7 +75,7 @@ static inline int __mutex_fastpath_lock_retval(atomic_t *count) · 48 unmodified lines
75	static inline void __mutex_fastpath_unlock(atomic_t *v,	75	static inline void __mutex_fastpath_unlock(atomic_t *v,
76	void (fail_fn)(atomic_t ))	76	void (fail_fn)(atomic_t ))
77	{	77	{
78	asm volatile goto(LOCK_PREFIX " incl %0\n"	78	asm_volatile_goto(LOCK_PREFIX " incl %0\n"
79	" jg %l[exit]\n"	79	" jg %l[exit]\n"
80	: : "m" (v->counter)	80	: : "m" (v->counter)
81	: "memory", "cc"	81	: "memory", "cc"

arch/x86/kernel/apic/x2apic_uv_x.c+1−1

@@ -113,7 +113,7 @@ static int __init early_get_pnodeid(void) · 112 unmodified lines
113	break;	113	break;
114	case UV3_HUB_PART_NUMBER:	114	case UV3_HUB_PART_NUMBER:
115	case UV3_HUB_PART_NUMBER_X:	115	case UV3_HUB_PART_NUMBER_X:
116	uv_min_hub_revision_id += UV3_HUB_REVISION_BASE - 1;	116	uv_min_hub_revision_id += UV3_HUB_REVISION_BASE;
117	break;	117	break;
118	}	118	}
119		119

arch/x86/kernel/cpu/perf_event.c+3−8

 	userpg->cap_user_rdpmc = x86_pmu.attr_rdpmc;
 	userpg->pmc_width = x86_pmu.cntval_bits;
-	if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC))
+	if (!sched_clock_stable)
-		return;
-	if (!boot_cpu_has(X86_FEATURE_NONSTOP_TSC))
 		return;
 	userpg->cap_user_time = 1;
 	userpg->time_shift = CYC2NS_SCALE_FACTOR;
 	userpg->time_offset = this_cpu_read(cyc2ns_offset) - now;
-	if (sched_clock_stable && !check_tsc_disabled()) {
+	userpg->cap_user_time_zero = 1;
-		userpg->cap_user_time_zero = 1;
+	userpg->time_zero = this_cpu_read(cyc2ns_offset);
-		userpg->time_zero = this_cpu_read(cyc2ns_offset);
-	}
 }
 /*

arch/x86/kernel/kvm.c+14−3

@@ -775,11 +775,22 @@ void __init kvm_spinlock_init(void) · 774 unmodified lines
775	if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT))	775	if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT))
776	return;	776	return;
777		777
778	printk(KERN_INFO "KVM setup paravirtual spinlock\n");	778	pv_lock_ops.lock_spinning = PV_CALLEE_SAVE(kvm_lock_spinning);
		779	pv_lock_ops.unlock_kick = kvm_unlock_kick;
		780	}
		781
		782	static __init int kvm_spinlock_init_jump(void)
		783	{
		784	if (!kvm_para_available())
		785	return 0;
		786	if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT))
		787	return 0;
779		788
780	static_key_slow_inc(&paravirt_ticketlocks_enabled);	789	static_key_slow_inc(&paravirt_ticketlocks_enabled);
		790	printk(KERN_INFO "KVM setup paravirtual spinlock\n");
781		791
782	pv_lock_ops.lock_spinning = PV_CALLEE_SAVE(kvm_lock_spinning);	792	return 0;
783	pv_lock_ops.unlock_kick = kvm_unlock_kick;
784	}	793	}
		794	early_initcall(kvm_spinlock_init_jump);
		795
785	#endif /* CONFIG_PARAVIRT_SPINLOCKS */	796	#endif /* CONFIG_PARAVIRT_SPINLOCKS */

arch/x86/kernel/reboot.c+8−0

@@ -326,6 +326,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { · 325 unmodified lines
326	DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6320"),	326	DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6320"),
327	},	327	},
328	},	328	},
		329	{ /* Handle problems with rebooting on the Latitude E5410. */
		330	.callback = set_pci_reboot,
		331	.ident = "Dell Latitude E5410",
		332	.matches = {
		333	DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
		334	DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E5410"),
		335	},
		336	},
329	{ /* Handle problems with rebooting on the Latitude E5420. */	337	{ /* Handle problems with rebooting on the Latitude E5420. */
330	.callback = set_pci_reboot,	338	.callback = set_pci_reboot,
331	.ident = "Dell Latitude E5420",	339	.ident = "Dell Latitude E5420",

arch/x86/kernel/sysfb_simplefb.c+2−2

@@ -72,14 +72,14 @@ __init int create_simplefb(const struct screen_info *si, · 71 unmodified lines
72	* the part that is occupied by the framebuffer */	72	* the part that is occupied by the framebuffer */
73	len = mode->height * mode->stride;	73	len = mode->height * mode->stride;
74	len = PAGE_ALIGN(len);	74	len = PAGE_ALIGN(len);
75	if (len > si->lfb_size << 16) {	75	if (len > (u64)si->lfb_size << 16) {
76	printk(KERN_WARNING "sysfb: VRAM smaller than advertised\n");	76	printk(KERN_WARNING "sysfb: VRAM smaller than advertised\n");
77	return -EINVAL;	77	return -EINVAL;
78	}	78	}
79		79
80	/* setup IORESOURCE_MEM as framebuffer memory */	80	/* setup IORESOURCE_MEM as framebuffer memory */
81	memset(&res, 0, sizeof(res));	81	memset(&res, 0, sizeof(res));
82	res.flags = IORESOURCE_MEM;	82	res.flags = IORESOURCE_MEM \| IORESOURCE_BUSY;
83	res.name = simplefb_resname;	83	res.name = simplefb_resname;
84	res.start = si->lfb_base;	84	res.start = si->lfb_base;
85	res.end = si->lfb_base + len - 1;	85	res.end = si->lfb_base + len - 1;

arch/x86/kvm/vmx.c+12−12

 static void ept_load_pdptrs(struct kvm_vcpu *vcpu)
 {
+	struct kvm_mmu *mmu = vcpu->arch.walk_mmu;
 	if (!test_bit(VCPU_EXREG_PDPTR,
 		      (unsigned long *)&vcpu->arch.regs_dirty))
 		return;
 	if (is_paging(vcpu) && is_pae(vcpu) && !is_long_mode(vcpu)) {
-		vmcs_write64(GUEST_PDPTR0, vcpu->arch.mmu.pdptrs[0]);
+		vmcs_write64(GUEST_PDPTR0, mmu->pdptrs[0]);
-		vmcs_write64(GUEST_PDPTR1, vcpu->arch.mmu.pdptrs[1]);
+		vmcs_write64(GUEST_PDPTR1, mmu->pdptrs[1]);
-		vmcs_write64(GUEST_PDPTR2, vcpu->arch.mmu.pdptrs[2]);
+		vmcs_write64(GUEST_PDPTR2, mmu->pdptrs[2]);
-		vmcs_write64(GUEST_PDPTR3, vcpu->arch.mmu.pdptrs[3]);
+		vmcs_write64(GUEST_PDPTR3, mmu->pdptrs[3]);
 	}
 }
 static void ept_save_pdptrs(struct kvm_vcpu *vcpu)
 {
+	struct kvm_mmu *mmu = vcpu->arch.walk_mmu;
 	if (is_paging(vcpu) && is_pae(vcpu) && !is_long_mode(vcpu)) {
-		vcpu->arch.mmu.pdptrs[0] = vmcs_read64(GUEST_PDPTR0);
+		mmu->pdptrs[0] = vmcs_read64(GUEST_PDPTR0);
-		vcpu->arch.mmu.pdptrs[1] = vmcs_read64(GUEST_PDPTR1);
+		mmu->pdptrs[1] = vmcs_read64(GUEST_PDPTR1);
-		vcpu->arch.mmu.pdptrs[2] = vmcs_read64(GUEST_PDPTR2);
+		mmu->pdptrs[2] = vmcs_read64(GUEST_PDPTR2);
-		vcpu->arch.mmu.pdptrs[3] = vmcs_read64(GUEST_PDPTR3);
+		mmu->pdptrs[3] = vmcs_read64(GUEST_PDPTR3);
 	}
 	__set_bit(VCPU_EXREG_PDPTR,
 		vmcs_write64(GUEST_PDPTR1, vmcs12->guest_pdptr1);
 		vmcs_write64(GUEST_PDPTR2, vmcs12->guest_pdptr2);
 		vmcs_write64(GUEST_PDPTR3, vmcs12->guest_pdptr3);
-		__clear_bit(VCPU_EXREG_PDPTR,
-				(unsigned long *)&vcpu->arch.regs_avail);
-		__clear_bit(VCPU_EXREG_PDPTR,
-				(unsigned long *)&vcpu->arch.regs_dirty);
 	}
 	kvm_register_write(vcpu, VCPU_REGS_RSP, vmcs12->guest_rsp);

arch/x86/pci/mmconfig-shared.c+6−1

 	if (!(pci_probe & PCI_PROBE_MMCONF) || pci_mmcfg_arch_init_failed)
 		return -ENODEV;
-	if (start > end || !addr)
+	if (start > end)
 		return -EINVAL;
 	mutex_lock(&pci_mmcfg_lock);
 		return -EEXIST;
 	}
+	if (!addr) {
+		mutex_unlock(&pci_mmcfg_lock);
+		return -EINVAL;
+	}
 	rc = -EBUSY;
 	cfg = pci_mmconfig_alloc(seg, start, end, addr);
 	if (cfg == NULL) {

arch/x86/xen/smp.c+9−0

@@ -278,6 +278,15 @@ static void __init xen_smp_prepare_boot_cpu(void) · 277 unmodified lines
278	old memory can be recycled */	278	old memory can be recycled */
279	make_lowmem_page_readwrite(xen_initial_gdt);	279	make_lowmem_page_readwrite(xen_initial_gdt);
280		280
		281	#ifdef CONFIG_X86_32
		282	/*
		283	* Xen starts us with XEN_FLAT_RING1_DS, but linux code
		284	* expects __USER_DS
		285	*/
		286	loadsegment(ds, __USER_DS);
		287	loadsegment(es, __USER_DS);
		288	#endif
		289
281	xen_filter_cpu_maps();	290	xen_filter_cpu_maps();
282	xen_setup_vcpu_info_placement();	291	xen_setup_vcpu_info_placement();
283	}	292	}

block/partitions/efi.c+6−1

 	 * the disk size.
 	 *
 	 * Hybrid MBRs do not necessarily comply with this.
+	 *
+	 * Consider a bad value here to be a warning to support dd'ing
+	 * an image from a smaller disk to a larger disk.
 	 */
 	if (ret == GPT_MBR_PROTECTIVE) {
 		sz = le32_to_cpu(mbr->partition_record[part].size_in_lba);
 		if (sz != (uint32_t) total_sectors - 1 && sz != 0xFFFFFFFF)
-			ret = 0;
+			pr_debug("GPT: mbr size in lba (%u) different than whole disk (%u).\n",
+				 sz, min_t(uint32_t,
+					   total_sectors - 1, 0xFFFFFFFF));
 	}
 done:
 	return ret;

drivers/acpi/Kconfig+4−4

@@ -24,7 +24,7 @@ menuconfig ACPI · 23 unmodified lines
24	are configured, ACPI is used.	24	are configured, ACPI is used.
25		25
26	The project home page for the Linux ACPI subsystem is here:	26	The project home page for the Linux ACPI subsystem is here:
27	<http://www.lesswatts.org/projects/acpi/>	27	<https://01.org/linux-acpi>
28		28
29	Linux support for ACPI is based on Intel Corporation's ACPI	29	Linux support for ACPI is based on Intel Corporation's ACPI
30	Component Architecture (ACPI CA). For more information on the	30	Component Architecture (ACPI CA). For more information on the
@@ -123,9 +123,9 @@ config ACPI_BUTTON · 92 unmodified lines
123	default y	123	default y
124	help	124	help
125	This driver handles events on the power, sleep, and lid buttons.	125	This driver handles events on the power, sleep, and lid buttons.
126	A daemon reads /proc/acpi/event and perform user-defined actions	126	A daemon reads events from input devices or via netlink and
127	such as shutting down the system. This is necessary for	127	performs user-defined actions such as shutting down the system.
128	software-controlled poweroff.	128	This is necessary for software-controlled poweroff.
129		129
130	To compile this driver as a module, choose M here:	130	To compile this driver as a module, choose M here:
131	the module will be called button.	131	the module will be called button.

drivers/acpi/device_pm.c+0−56

@@ -1025,60 +1025,4 @@ void acpi_dev_pm_detach(struct device *dev, bool power_off) · 1024 unmodified lines
1025	}	1025	}
1026	}	1026	}
1027	EXPORT_SYMBOL_GPL(acpi_dev_pm_detach);	1027	EXPORT_SYMBOL_GPL(acpi_dev_pm_detach);
1028
1029	/**
1030	* acpi_dev_pm_add_dependent - Add physical device depending for PM.
1031	* @handle: Handle of ACPI device node.
1032	* @depdev: Device depending on that node for PM.
1033	*/
1034	void acpi_dev_pm_add_dependent(acpi_handle handle, struct device *depdev)
1035	{
1036	struct acpi_device_physical_node *dep;
1037	struct acpi_device *adev;
1038
1039	if (!depdev \|\| acpi_bus_get_device(handle, &adev))
1040	return;
1041
1042	mutex_lock(&adev->physical_node_lock);
1043
1044	list_for_each_entry(dep, &adev->power_dependent, node)
1045	if (dep->dev == depdev)
1046	goto out;
1047
1048	dep = kzalloc(sizeof(*dep), GFP_KERNEL);
1049	if (dep) {
1050	dep->dev = depdev;
1051	list_add_tail(&dep->node, &adev->power_dependent);
1052	}
1053
1054	out:
1055	mutex_unlock(&adev->physical_node_lock);
1056	}
1057	EXPORT_SYMBOL_GPL(acpi_dev_pm_add_dependent);
1058
1059	/**
1060	* acpi_dev_pm_remove_dependent - Remove physical device depending for PM.
1061	* @handle: Handle of ACPI device node.
1062	* @depdev: Device depending on that node for PM.
1063	*/
1064	void acpi_dev_pm_remove_dependent(acpi_handle handle, struct device *depdev)
1065	{
1066	struct acpi_device_physical_node *dep;
1067	struct acpi_device *adev;
1068
1069	if (!depdev \|\| acpi_bus_get_device(handle, &adev))
1070	return;
1071
1072	mutex_lock(&adev->physical_node_lock);
1073
1074	list_for_each_entry(dep, &adev->power_dependent, node)
1075	if (dep->dev == depdev) {
1076	list_del(&dep->node);
1077	kfree(dep);
1078	break;
1079	}
1080
1081	mutex_unlock(&adev->physical_node_lock);
1082	}
1083	EXPORT_SYMBOL_GPL(acpi_dev_pm_remove_dependent);
1084	#endif /* CONFIG_PM */	1028	#endif /* CONFIG_PM */

drivers/acpi/power.c+4−100

@@ -59,16 +59,9 @@ ACPI_MODULE_NAME("power"); · 58 unmodified lines
59	#define ACPI_POWER_RESOURCE_STATE_ON 0x01	59	#define ACPI_POWER_RESOURCE_STATE_ON 0x01
60	#define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF	60	#define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF
61		61
62	struct acpi_power_dependent_device {
63	struct list_head node;
64	struct acpi_device *adev;
65	struct work_struct work;
66	};
67
68	struct acpi_power_resource {	62	struct acpi_power_resource {
69	struct acpi_device device;	63	struct acpi_device device;
70	struct list_head list_node;	64	struct list_head list_node;
71	struct list_head dependent;
72	char *name;	65	char *name;
73	u32 system_level;	66	u32 system_level;
74	u32 order;	67	u32 order;
@@ -233,32 +226,6 @@ static int acpi_power_get_list_state(struct list_head list, int state) · 158 unmodified lines
233	return 0;	226	return 0;
234	}	227	}
235		228
236	static void acpi_power_resume_dependent(struct work_struct *work)
237	{
238	struct acpi_power_dependent_device *dep;
239	struct acpi_device_physical_node *pn;
240	struct acpi_device *adev;
241	int state;
242
243	dep = container_of(work, struct acpi_power_dependent_device, work);
244	adev = dep->adev;
245	if (acpi_power_get_inferred_state(adev, &state))
246	return;
247
248	if (state > ACPI_STATE_D0)
249	return;
250
251	mutex_lock(&adev->physical_node_lock);
252
253	list_for_each_entry(pn, &adev->physical_node_list, node)
254	pm_request_resume(pn->dev);
255
256	list_for_each_entry(pn, &adev->power_dependent, node)
257	pm_request_resume(pn->dev);
258
259	mutex_unlock(&adev->physical_node_lock);
260	}
261
262	static int __acpi_power_on(struct acpi_power_resource *resource)	229	static int __acpi_power_on(struct acpi_power_resource *resource)
263	{	230	{
264	acpi_status status = AE_OK;	231	acpi_status status = AE_OK;
@@ -283,14 +250,8 @@ static int acpi_power_on_unlocked(struct acpi_power_resource *resource) · 18 unmodified lines
283	resource->name));	250	resource->name));
284	} else {	251	} else {
285	result = __acpi_power_on(resource);	252	result = __acpi_power_on(resource);
286	if (result) {	253	if (result)
287	resource->ref_count--;	254	resource->ref_count--;
288	} else {
289	struct acpi_power_dependent_device *dep;
290
291	list_for_each_entry(dep, &resource->dependent, node)
292	schedule_work(&dep->work);
293	}
294	}	255	}
295	return result;	256	return result;
296	}	257	}
@@ -390,52 +351,6 @@ static int acpi_power_on_list(struct list_head *list) · 93 unmodified lines
390	return result;	351	return result;
391	}	352	}
392		353
393	static void acpi_power_add_dependent(struct acpi_power_resource *resource,
394	struct acpi_device *adev)
395	{
396	struct acpi_power_dependent_device *dep;
397
398	mutex_lock(&resource->resource_lock);
399
400	list_for_each_entry(dep, &resource->dependent, node)
401	if (dep->adev == adev)
402	goto out;
403
404	dep = kzalloc(sizeof(*dep), GFP_KERNEL);
405	if (!dep)
406	goto out;
407
408	dep->adev = adev;
409	INIT_WORK(&dep->work, acpi_power_resume_dependent);
410	list_add_tail(&dep->node, &resource->dependent);
411
412	out:
413	mutex_unlock(&resource->resource_lock);
414	}
415
416	static void acpi_power_remove_dependent(struct acpi_power_resource *resource,
417	struct acpi_device *adev)
418	{
419	struct acpi_power_dependent_device *dep;
420	struct work_struct *work = NULL;
421
422	mutex_lock(&resource->resource_lock);
423
424	list_for_each_entry(dep, &resource->dependent, node)
425	if (dep->adev == adev) {
426	list_del(&dep->node);
427	work = &dep->work;
428	break;
429	}
430
431	mutex_unlock(&resource->resource_lock);
432
433	if (work) {
434	cancel_work_sync(work);
435	kfree(dep);
436	}
437	}
438
439	static struct attribute *attrs[] = {	354	static struct attribute *attrs[] = {
440	NULL,	355	NULL,
441	};	356	};
@@ -524,8 +439,6 @@ static void acpi_power_expose_hide(struct acpi_device *adev, · 82 unmodified lines
524		439
525	void acpi_power_add_remove_device(struct acpi_device *adev, bool add)	440	void acpi_power_add_remove_device(struct acpi_device *adev, bool add)
526	{	441	{
527	struct acpi_device_power_state *ps;
528	struct acpi_power_resource_entry *entry;
529	int state;	442	int state;
530		443
531	if (adev->wakeup.flags.valid)	444	if (adev->wakeup.flags.valid)
@@ -535,16 +448,6 @@ void acpi_power_add_remove_device(struct acpi_device *adev, bool add) · 3 unmodified lines
535	if (!adev->power.flags.power_resources)	448	if (!adev->power.flags.power_resources)
536	return;	449	return;
537		450
538	ps = &adev->power.states[ACPI_STATE_D0];
539	list_for_each_entry(entry, &ps->resources, node) {
540	struct acpi_power_resource *resource = entry->resource;
541
542	if (add)
543	acpi_power_add_dependent(resource, adev);
544	else
545	acpi_power_remove_dependent(resource, adev);
546	}
547
548	for (state = ACPI_STATE_D0; state <= ACPI_STATE_D3_HOT; state++)	451	for (state = ACPI_STATE_D0; state <= ACPI_STATE_D3_HOT; state++)
549	acpi_power_expose_hide(adev,	452	acpi_power_expose_hide(adev,
550	&adev->power.states[state].resources,	453	&adev->power.states[state].resources,
@@ -882,7 +785,6 @@ int acpi_add_power_resource(acpi_handle handle) · 331 unmodified lines
882	acpi_init_device_object(device, handle, ACPI_BUS_TYPE_POWER,	785	acpi_init_device_object(device, handle, ACPI_BUS_TYPE_POWER,
883	ACPI_STA_DEFAULT);	786	ACPI_STA_DEFAULT);
884	mutex_init(&resource->resource_lock);	787	mutex_init(&resource->resource_lock);
885	INIT_LIST_HEAD(&resource->dependent);
886	INIT_LIST_HEAD(&resource->list_node);	788	INIT_LIST_HEAD(&resource->list_node);
887	resource->name = device->pnp.bus_id;	789	resource->name = device->pnp.bus_id;
888	strcpy(acpi_device_name(device), ACPI_POWER_DEVICE_NAME);	790	strcpy(acpi_device_name(device), ACPI_POWER_DEVICE_NAME);
@@ -936,8 +838,10 @@ void acpi_resume_power_resources(void) · 47 unmodified lines
936	mutex_lock(&resource->resource_lock);	838	mutex_lock(&resource->resource_lock);
937		839
938	result = acpi_power_get_state(resource->device.handle, &state);	840	result = acpi_power_get_state(resource->device.handle, &state);
939	if (result)	841	if (result) {
		842	mutex_unlock(&resource->resource_lock);
940	continue;	843	continue;
		844	}
941		845
942	if (state == ACPI_POWER_RESOURCE_STATE_OFF	846	if (state == ACPI_POWER_RESOURCE_STATE_OFF
943	&& resource->ref_count) {	847	&& resource->ref_count) {

drivers/acpi/scan.c+1−2

 	}
 	return 0;
 }
-EXPORT_SYMBOL_GPL(acpi_bus_get_device);
+EXPORT_SYMBOL(acpi_bus_get_device);
 int acpi_device_add(struct acpi_device *device,
 		    void (*release)(struct device *))
 	INIT_LIST_HEAD(&device->wakeup_list);
 	INIT_LIST_HEAD(&device->physical_node_list);
 	mutex_init(&device->physical_node_lock);
-	INIT_LIST_HEAD(&device->power_dependent);
 	new_bus_id = kzalloc(sizeof(struct acpi_device_bus_id), GFP_KERNEL);
 	if (!new_bus_id) {

drivers/ata/ahci.c+1−1

@@ -1343,7 +1343,7 @@ static int ahci_init_one(struct pci_dev pdev, const struct pci_device_id ent) · 1342 unmodified lines
1343	if (!(hpriv->cap & HOST_CAP_SSS) \|\| ahci_ignore_sss)	1343	if (!(hpriv->cap & HOST_CAP_SSS) \|\| ahci_ignore_sss)
1344	host->flags \|= ATA_HOST_PARALLEL_SCAN;	1344	host->flags \|= ATA_HOST_PARALLEL_SCAN;
1345	else	1345	else
1346	printk(KERN_INFO "ahci: SSS flag set, parallel bus scan disabled\n");	1346	dev_info(&pdev->dev, "SSS flag set, parallel bus scan disabled\n");
1347		1347
1348	if (pi.flags & ATA_FLAG_EM)	1348	if (pi.flags & ATA_FLAG_EM)
1349	ahci_reset_em(host);	1349	ahci_reset_em(host);

drivers/ata/ahci_platform.c+1−1

@@ -184,7 +184,7 @@ static int ahci_probe(struct platform_device *pdev) · 183 unmodified lines
184	if (!(hpriv->cap & HOST_CAP_SSS) \|\| ahci_ignore_sss)	184	if (!(hpriv->cap & HOST_CAP_SSS) \|\| ahci_ignore_sss)
185	host->flags \|= ATA_HOST_PARALLEL_SCAN;	185	host->flags \|= ATA_HOST_PARALLEL_SCAN;
186	else	186	else
187	printk(KERN_INFO "ahci: SSS flag set, parallel bus scan disabled\n");	187	dev_info(dev, "SSS flag set, parallel bus scan disabled\n");
188		188
189	if (pi.flags & ATA_FLAG_EM)	189	if (pi.flags & ATA_FLAG_EM)
190	ahci_reset_em(host);	190	ahci_reset_em(host);

drivers/ata/libahci.c+9−1

 				rc = ap->ops->transmit_led_message(ap,
 							       emp->led_state,
 							       4);
+				/*
+				 * If busy, give a breather but do not
+				 * release EH ownership by using msleep()
+				 * instead of ata_msleep().  EM Transmit
+				 * bit is busy for the whole host and
+				 * releasing ownership will cause other
+				 * ports to fail the same way.
+				 */
 				if (rc == -EBUSY)
-					ata_msleep(ap, 1);
+					msleep(1);
 				else
 					break;
 			}

drivers/ata/libata-acpi.c+0−14

@@ -1035,17 +1035,3 @@ void ata_acpi_on_disable(struct ata_device *dev) · 1034 unmodified lines
1035	{	1035	{
1036	ata_acpi_clear_gtf(dev);	1036	ata_acpi_clear_gtf(dev);
1037	}	1037	}
1038
1039	void ata_scsi_acpi_bind(struct ata_device *dev)
1040	{
1041	acpi_handle handle = ata_dev_acpi_handle(dev);
1042	if (handle)
1043	acpi_dev_pm_add_dependent(handle, &dev->sdev->sdev_gendev);
1044	}
1045
1046	void ata_scsi_acpi_unbind(struct ata_device *dev)
1047	{
1048	acpi_handle handle = ata_dev_acpi_handle(dev);
1049	if (handle)
1050	acpi_dev_pm_remove_dependent(handle, &dev->sdev->sdev_gendev);
1051	}

drivers/ata/libata-eh.c+3−3

@@ -1322,14 +1322,14 @@ void ata_eh_qc_complete(struct ata_queued_cmd *qc) · 1321 unmodified lines
1322	* should be retried. To be used from EH.	1322	* should be retried. To be used from EH.
1323	*	1323	*
1324	* SCSI midlayer limits the number of retries to scmd->allowed.	1324	* SCSI midlayer limits the number of retries to scmd->allowed.
1325	* scmd->retries is decremented for commands which get retried	1325	* scmd->allowed is incremented for commands which get retried
1326	* due to unrelated failures (qc->err_mask is zero).	1326	* due to unrelated failures (qc->err_mask is zero).
1327	*/	1327	*/
1328	void ata_eh_qc_retry(struct ata_queued_cmd *qc)	1328	void ata_eh_qc_retry(struct ata_queued_cmd *qc)
1329	{	1329	{
1330	struct scsi_cmnd *scmd = qc->scsicmd;	1330	struct scsi_cmnd *scmd = qc->scsicmd;
1331	if (!qc->err_mask && scmd->retries)	1331	if (!qc->err_mask)
1332	scmd->retries--;	1332	scmd->allowed++;
1333	__ata_eh_qc_complete(qc);	1333	__ata_eh_qc_complete(qc);
1334	}	1334	}
1335		1335

drivers/ata/libata-scsi.c+0−3

 			if (!IS_ERR(sdev)) {
 				dev->sdev = sdev;
 				scsi_device_put(sdev);
-				ata_scsi_acpi_bind(dev);
 			} else {
 				dev->sdev = NULL;
 			}
 	struct scsi_device *sdev;
 	unsigned long flags;
-	ata_scsi_acpi_unbind(dev);
 	/* Alas, we need to grab scan_mutex to ensure SCSI device
 	 * state doesn't change underneath us and thus
 	 * scsi_device_get() always succeeds.  The mutex locking can

drivers/ata/libata.h+0−4

 extern void ata_acpi_bind_port(struct ata_port *ap);
 extern void ata_acpi_bind_dev(struct ata_device *dev);
 extern acpi_handle ata_dev_acpi_handle(struct ata_device *dev);
-extern void ata_scsi_acpi_bind(struct ata_device *dev);
-extern void ata_scsi_acpi_unbind(struct ata_device *dev);
 #else
 static inline void ata_acpi_dissociate(struct ata_host *host) { }
 static inline int ata_acpi_on_suspend(struct ata_port *ap) { return 0; }
 				      pm_message_t state) { }
 static inline void ata_acpi_bind_port(struct ata_port *ap) {}
 static inline void ata_acpi_bind_dev(struct ata_device *dev) {}
-static inline void ata_scsi_acpi_bind(struct ata_device *dev) {}
-static inline void ata_scsi_acpi_unbind(struct ata_device *dev) {}
 #endif
 /* libata-scsi.c */

drivers/ata/pata_isapnp.c+1−1

@@ -78,7 +78,7 @@ static int isapnp_init_one(struct pnp_dev idev, const struct pnp_device_id dev · 77 unmodified lines
78		78
79	ap->ioaddr.cmd_addr = cmd_addr;	79	ap->ioaddr.cmd_addr = cmd_addr;
80		80
81	if (pnp_port_valid(idev, 1) == 0) {	81	if (pnp_port_valid(idev, 1)) {
82	ctl_addr = devm_ioport_map(&idev->dev,	82	ctl_addr = devm_ioport_map(&idev->dev,
83	pnp_port_start(idev, 1), 1);	83	pnp_port_start(idev, 1), 1);
84	ap->ioaddr.altstatus_addr = ctl_addr;	84	ap->ioaddr.altstatus_addr = ctl_addr;

drivers/base/memory.c+5−2

 		online_type = ONLINE_KEEP;
 	else if (!strncmp(buf, "offline", min_t(int, count, 7)))
 		online_type = -1;
-	else
+	else {
-		return -EINVAL;
+		ret = -EINVAL;
+		goto err;
+	}
 	switch (online_type) {
 	case ONLINE_KERNEL:
 		ret = -EINVAL; /* should never happen */
 	}
+err:
 	unlock_device_hotplug();
 	if (ret)

drivers/bus/mvebu-mbus.c+9−3

 					 phys_addr_t sdramwins_phys_base,
 					 size_t sdramwins_size)
 {
+	struct device_node *np;
 	int win;
 	mbus->mbuswins_base = ioremap(mbuswins_phys_base, mbuswins_size);
 		return -ENOMEM;
 	}
-	if (of_find_compatible_node(NULL, NULL, "marvell,coherency-fabric"))
+	np = of_find_compatible_node(NULL, NULL, "marvell,coherency-fabric");
+	if (np) {
 		mbus->hw_io_coherency = 1;
+		of_node_put(np);
+	}
 	for (win = 0; win < mbus->soc->num_wins; win++)
 		mvebu_mbus_disable_window(mbus, win);
 	int ret;
 	/*
-	 * These are optional, so we clear them and they'll
+	 * These are optional, so we make sure that resource_size(x) will
-	 * be zero if they are missing from the DT.
+	 * return 0.
 	 */
 	memset(mem, 0, sizeof(struct resource));
+	mem->end = -1;
 	memset(io, 0, sizeof(struct resource));
+	io->end = -1;
 	ret = of_property_read_u32_array(np, "pcie-mem-aperture", reg, ARRAY_SIZE(reg));
 	if (!ret) {

drivers/char/random.c+5−6

  */
 void add_device_randomness(const void *buf, unsigned int size)
 {
-	unsigned long time = get_cycles() ^ jiffies;
+	unsigned long time = random_get_entropy() ^ jiffies;
 	mix_pool_bytes(&input_pool, buf, size, NULL);
 	mix_pool_bytes(&input_pool, &time, sizeof(time), NULL);
 		goto out;
 	sample.jiffies = jiffies;
-	sample.cycles = get_cycles();
+	sample.cycles = random_get_entropy();
 	sample.num = num;
 	mix_pool_bytes(&input_pool, &sample, sizeof(sample), NULL);
 	struct fast_pool	*fast_pool = &__get_cpu_var(irq_randomness);
 	struct pt_regs		*regs = get_irq_regs();
 	unsigned long		now = jiffies;
-	__u32			input[4], cycles = get_cycles();
+	__u32			input[4], cycles = random_get_entropy();
 	input[0] = cycles ^ jiffies;
 	input[1] = irq;
 static u32 random_int_secret[MD5_MESSAGE_BYTES / 4] ____cacheline_aligned;
-static int __init random_int_secret_init(void)
+int random_int_secret_init(void)
 {
 	get_random_bytes(random_int_secret, sizeof(random_int_secret));
 	return 0;
 }
-late_initcall(random_int_secret_init);
 /*
  * Get a random word for internal kernel use only. Similar to urandom but
 	hash = get_cpu_var(get_random_int_hash);
-	hash[0] += current->pid + jiffies + get_cycles();
+	hash[0] += current->pid + jiffies + random_get_entropy();
 	md5_transform(hash, random_int_secret);
 	ret = hash[0];
 	put_cpu_var(get_random_int_hash);

drivers/char/tpm/xen-tpmfront.c+1−0

@@ -10,6 +10,7 @@ · 9 unmodified lines
10	#include <linux/errno.h>	10	#include <linux/errno.h>
11	#include <linux/err.h>	11	#include <linux/err.h>
12	#include <linux/interrupt.h>	12	#include <linux/interrupt.h>
		13	#include <xen/xen.h>
13	#include <xen/events.h>	14	#include <xen/events.h>
14	#include <xen/interface/io/tpmif.h>	15	#include <xen/interface/io/tpmif.h>
15	#include <xen/grant_table.h>	16	#include <xen/grant_table.h>

drivers/cpufreq/cpufreq-cpu0.c+1−1

@@ -229,7 +229,7 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) · 228 unmodified lines
229	if (of_property_read_u32(np, "clock-latency", &transition_latency))	229	if (of_property_read_u32(np, "clock-latency", &transition_latency))
230	transition_latency = CPUFREQ_ETERNAL;	230	transition_latency = CPUFREQ_ETERNAL;
231		231
232	if (cpu_reg) {	232	if (!IS_ERR(cpu_reg)) {
233	struct opp *opp;	233	struct opp *opp;
234	unsigned long min_uV, max_uV;	234	unsigned long min_uV, max_uV;
235	int i;	235	int i;

drivers/cpufreq/intel_pstate.c+8−5

 static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
 {
 	int max_perf, min_perf;
+	u64 val;
 	intel_pstate_get_min_max(cpu, &min_perf, &max_perf);
 	trace_cpu_frequency(pstate * 100000, cpu->cpu);
 	cpu->pstate.current_pstate = pstate;
-	wrmsrl(MSR_IA32_PERF_CTL, pstate << 8);
+	val = pstate << 8;
+	if (limits.no_turbo)
+		val |= (u64)1 << 32;
+	wrmsrl(MSR_IA32_PERF_CTL, val);
 }
 static inline void intel_pstate_pstate_increase(struct cpudata *cpu, int steps)
 static int intel_pstate_cpu_init(struct cpufreq_policy *policy)
 {
-	int rc, min_pstate, max_pstate;
 	struct cpudata *cpu;
+	int rc;
 	rc = intel_pstate_init_cpu(policy->cpu);
 	if (rc)
 	else
 		policy->policy = CPUFREQ_POLICY_POWERSAVE;
-	intel_pstate_get_min_max(cpu, &min_pstate, &max_pstate);
+	policy->min = cpu->pstate.min_pstate * 100000;
-	policy->min = min_pstate * 100000;
+	policy->max = cpu->pstate.turbo_pstate * 100000;
-	policy->max = max_pstate * 100000;
 	/* cpuinfo and default policy values */
 	policy->cpuinfo.min_freq = cpu->pstate.min_pstate * 100000;

drivers/cpufreq/s3c64xx-cpufreq.c+1−1

@@ -166,7 +166,7 @@ static void __init s3c64xx_cpufreq_config_regulator(void) · 165 unmodified lines
166	if (freq->frequency == CPUFREQ_ENTRY_INVALID)	166	if (freq->frequency == CPUFREQ_ENTRY_INVALID)
167	continue;	167	continue;
168		168
169	dvfs = &s3c64xx_dvfs_table[freq->index];	169	dvfs = &s3c64xx_dvfs_table[freq->driver_data];
170	found = 0;	170	found = 0;
171		171
172	for (i = 0; i < count; i++) {	172	for (i = 0; i < count; i++) {

drivers/cpufreq/spear-cpufreq.c+1−1

@@ -113,7 +113,7 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy, · 112 unmodified lines
113	unsigned int target_freq, unsigned int relation)	113	unsigned int target_freq, unsigned int relation)
114	{	114	{
115	struct cpufreq_freqs freqs;	115	struct cpufreq_freqs freqs;
116	unsigned long newfreq;	116	long newfreq;
117	struct clk *srcclk;	117	struct clk *srcclk;
118	int index, ret, mult = 1;	118	int index, ret, mult = 1;
119		119

drivers/dma/Kconfig+1−0

@@ -198,6 +198,7 @@ config TI_EDMA · 197 unmodified lines
198	depends on ARCH_DAVINCI \|\| ARCH_OMAP	198	depends on ARCH_DAVINCI \|\| ARCH_OMAP
199	select DMA_ENGINE	199	select DMA_ENGINE
200	select DMA_VIRTUAL_CHANNELS	200	select DMA_VIRTUAL_CHANNELS
		201	select TI_PRIV_EDMA
201	default n	202	default n
202	help	203	help
203	Enable support for the TI EDMA controller. This DMA	204	Enable support for the TI EDMA controller. This DMA

drivers/dma/edma.c+2−1

 						EDMA_SLOT_ANY);
 			if (echan->slot[i] < 0) {
 				dev_err(dev, "Failed to allocate slot\n");
+				kfree(edesc);
 				return NULL;
 			}
 		}
 }
 module_exit(edma_exit);
-MODULE_AUTHOR("Matt Porter <mporter@ti.com>");
+MODULE_AUTHOR("Matt Porter <matt.porter@linaro.org>");
 MODULE_DESCRIPTION("TI EDMA DMA engine driver");
 MODULE_LICENSE("GPL v2");

drivers/dma/imx-dma.c+15−16

 	struct imxdma_engine *imxdma = imxdmac->imxdma;
 	int chno = imxdmac->channel;
 	struct imxdma_desc *desc;
+	unsigned long flags;
-	spin_lock(&imxdma->lock);
+	spin_lock_irqsave(&imxdma->lock, flags);
 	if (list_empty(&imxdmac->ld_active)) {
-		spin_unlock(&imxdma->lock);
+		spin_unlock_irqrestore(&imxdma->lock, flags);
 		goto out;
 	}
 	desc = list_first_entry(&imxdmac->ld_active,
 				struct imxdma_desc,
 				node);
-	spin_unlock(&imxdma->lock);
+	spin_unlock_irqrestore(&imxdma->lock, flags);
 	if (desc->sg) {
 		u32 tmp;
 {
 	struct imxdma_channel *imxdmac = to_imxdma_chan(d->desc.chan);
 	struct imxdma_engine *imxdma = imxdmac->imxdma;
-	unsigned long flags;
 	int slot = -1;
 	int i;
 	switch (d->type) {
 	case IMXDMA_DESC_INTERLEAVED:
 		/* Try to get a free 2D slot */
-		spin_lock_irqsave(&imxdma->lock, flags);
 		for (i = 0; i < IMX_DMA_2D_SLOTS; i++) {
 			if ((imxdma->slots_2d[i].count > 0) &&
 			((imxdma->slots_2d[i].xsr != d->x) ||
 			slot = i;
 			break;
 		}
-		if (slot < 0) {
+		if (slot < 0)
-			spin_unlock_irqrestore(&imxdma->lock, flags);
 			return -EBUSY;
-		}
 		imxdma->slots_2d[slot].xsr = d->x;
 		imxdma->slots_2d[slot].ysr = d->y;
 		imxdmac->slot_2d = slot;
 		imxdmac->enabled_2d = true;
-		spin_unlock_irqrestore(&imxdma->lock, flags);
 		if (slot == IMX_DMA_2D_SLOT_A) {
 			d->config_mem &= ~CCR_MSEL_B;
 	struct imxdma_channel *imxdmac = (void *)data;
 	struct imxdma_engine *imxdma = imxdmac->imxdma;
 	struct imxdma_desc *desc;
+	unsigned long flags;
-	spin_lock(&imxdma->lock);
+	spin_lock_irqsave(&imxdma->lock, flags);
 	if (list_empty(&imxdmac->ld_active)) {
 		/* Someone might have called terminate all */
-		goto out;
+		spin_unlock_irqrestore(&imxdma->lock, flags);
+		return;
 	}
 	desc = list_first_entry(&imxdmac->ld_active, struct imxdma_desc, node);
-	if (desc->desc.callback)
-		desc->desc.callback(desc->desc.callback_param);
 	/* If we are dealing with a cyclic descriptor, keep it on ld_active
 	 * and dont mark the descriptor as complete.
 	 * Only in non-cyclic cases it would be marked as complete
 				 __func__, imxdmac->channel);
 	}
 out:
-	spin_unlock(&imxdma->lock);
+	spin_unlock_irqrestore(&imxdma->lock, flags);
+	if (desc->desc.callback)
+		desc->desc.callback(desc->desc.callback_param);
 }
 static int imxdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
 	kfree(imxdmac->sg_list);
 	imxdmac->sg_list = kcalloc(periods + 1,
-			sizeof(struct scatterlist), GFP_KERNEL);
+			sizeof(struct scatterlist), GFP_ATOMIC);
 	if (!imxdmac->sg_list)
 		return NULL;

drivers/dma/sh/rcar-hpbdma.c+5−4

 	void __iomem *base;
 	const struct hpb_dmae_slave_config *cfg;
 	char dev_id[16];		/* unique name per DMAC of channel */
+	dma_addr_t slave_addr;
 };
 struct hpb_dmae_device {
 		hpb_chan->xfer_mode = XFER_DOUBLE;
 	} else {
 		dev_err(hpb_chan->shdma_chan.dev, "DCR setting error");
-		shdma_free_irq(&hpb_chan->shdma_chan);
 		return -EINVAL;
 	}
 	return 0;
 }
-static int hpb_dmae_set_slave(struct shdma_chan *schan, int slave_id, bool try)
+static int hpb_dmae_set_slave(struct shdma_chan *schan, int slave_id,
+			      dma_addr_t slave_addr, bool try)
 {
 	struct hpb_dmae_chan *chan = to_chan(schan);
 	const struct hpb_dmae_slave_config *sc =
 	if (try)
 		return 0;
 	chan->cfg = sc;
+	chan->slave_addr = slave_addr ? : sc->addr;
 	return hpb_dmae_alloc_chan_resources(chan, sc);
 }
 {
 	struct hpb_dmae_chan *chan = to_chan(schan);
-	return chan->cfg->addr;
+	return chan->slave_addr;
 }
 static struct shdma_desc *hpb_dmae_embedded_desc(void *buf, int i)
 	shdma_for_each_chan(schan, &hpbdev->shdma_dev, i) {
 		BUG_ON(!schan);
-		shdma_free_irq(schan);
 		shdma_chan_remove(schan);
 	}
 	dma_dev->chancnt = 0;

drivers/gpio/gpio-lynxpoint.c+3−2

 	struct lp_gpio *lg = irq_data_get_irq_handler_data(data);
 	struct irq_chip *chip = irq_data_get_irq_chip(data);
 	u32 base, pin, mask;
-	unsigned long reg, pending;
+	unsigned long reg, ena, pending;
 	unsigned virq;
 	/* check from GPIO controller which pin triggered the interrupt */
 	for (base = 0; base < lg->chip.ngpio; base += 32) {
 		reg = lp_gpio_reg(&lg->chip, base, LP_INT_STAT);
+		ena = lp_gpio_reg(&lg->chip, base, LP_INT_ENABLE);
-		while ((pending = inl(reg))) {
+		while ((pending = (inl(reg) & inl(ena)))) {
 			pin = __ffs(pending);
 			mask = BIT(pin);
 			/* Clear before handling so we don't lose an edge */

drivers/gpio/gpio-omap.c+101−57

@@ -63,6 +63,7 @@ struct gpio_bank { · 62 unmodified lines
63	struct gpio_chip chip;	63	struct gpio_chip chip;
64	struct clk *dbck;	64	struct clk *dbck;
65	u32 mod_usage;	65	u32 mod_usage;
		66	u32 irq_usage;
66	u32 dbck_enable_mask;	67	u32 dbck_enable_mask;
67	bool dbck_enabled;	68	bool dbck_enabled;
68	struct device *dev;	69	struct device *dev;
@@ -86,6 +87,9 @@ struct gpio_bank { · 17 unmodified lines
86	#define GPIO_BIT(bank, gpio) (1 << GPIO_INDEX(bank, gpio))	87	#define GPIO_BIT(bank, gpio) (1 << GPIO_INDEX(bank, gpio))
87	#define GPIO_MOD_CTRL_BIT BIT(0)	88	#define GPIO_MOD_CTRL_BIT BIT(0)
88		89
		90	#define BANK_USED(bank) (bank->mod_usage \|\| bank->irq_usage)
		91	#define LINE_USED(line, offset) (line & (1 << offset))
		92
89	static int irq_to_gpio(struct gpio_bank *bank, unsigned int gpio_irq)	93	static int irq_to_gpio(struct gpio_bank *bank, unsigned int gpio_irq)
90	{	94	{
91	return bank->chip.base + gpio_irq;	95	return bank->chip.base + gpio_irq;
@@ -420,15 +424,69 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, · 328 unmodified lines
420	return 0;	424	return 0;
421	}	425	}
422		426
		427	static void _enable_gpio_module(struct gpio_bank *bank, unsigned offset)
		428	{
		429	if (bank->regs->pinctrl) {
		430	void __iomem *reg = bank->base + bank->regs->pinctrl;
		431
		432	/* Claim the pin for MPU */
		433	__raw_writel(__raw_readl(reg) \| (1 << offset), reg);
		434	}
		435
		436	if (bank->regs->ctrl && !BANK_USED(bank)) {
		437	void __iomem *reg = bank->base + bank->regs->ctrl;
		438	u32 ctrl;
		439
		440	ctrl = __raw_readl(reg);
		441	/* Module is enabled, clocks are not gated */
		442	ctrl &= ~GPIO_MOD_CTRL_BIT;
		443	__raw_writel(ctrl, reg);
		444	bank->context.ctrl = ctrl;
		445	}
		446	}
		447
		448	static void _disable_gpio_module(struct gpio_bank *bank, unsigned offset)
		449	{
		450	void __iomem *base = bank->base;
		451
		452	if (bank->regs->wkup_en &&
		453	!LINE_USED(bank->mod_usage, offset) &&
		454	!LINE_USED(bank->irq_usage, offset)) {
		455	/* Disable wake-up during idle for dynamic tick */
		456	_gpio_rmw(base, bank->regs->wkup_en, 1 << offset, 0);
		457	bank->context.wake_en =
		458	__raw_readl(bank->base + bank->regs->wkup_en);
		459	}
		460
		461	if (bank->regs->ctrl && !BANK_USED(bank)) {
		462	void __iomem *reg = bank->base + bank->regs->ctrl;
		463	u32 ctrl;
		464
		465	ctrl = __raw_readl(reg);
		466	/* Module is disabled, clocks are gated */
		467	ctrl \|= GPIO_MOD_CTRL_BIT;
		468	__raw_writel(ctrl, reg);
		469	bank->context.ctrl = ctrl;
		470	}
		471	}
		472
		473	static int gpio_is_input(struct gpio_bank *bank, int mask)
		474	{
		475	void __iomem *reg = bank->base + bank->regs->direction;
		476
		477	return __raw_readl(reg) & mask;
		478	}
		479
423	static int gpio_irq_type(struct irq_data *d, unsigned type)	480	static int gpio_irq_type(struct irq_data *d, unsigned type)
424	{	481	{
425	struct gpio_bank *bank = irq_data_get_irq_chip_data(d);	482	struct gpio_bank *bank = irq_data_get_irq_chip_data(d);
426	unsigned gpio = 0;	483	unsigned gpio = 0;
427	int retval;	484	int retval;
428	unsigned long flags;	485	unsigned long flags;
		486	unsigned offset;
429		487
430	if (WARN_ON(!bank->mod_usage))	488	if (!BANK_USED(bank))
431	return -EINVAL;	489	pm_runtime_get_sync(bank->dev);
432		490
433	#ifdef CONFIG_ARCH_OMAP1	491	#ifdef CONFIG_ARCH_OMAP1
434	if (d->irq > IH_MPUIO_BASE)	492	if (d->irq > IH_MPUIO_BASE)
@@ -446,7 +504,17 @@ static int gpio_irq_type(struct irq_data *d, unsigned type) · 11 unmodified lines
446	return -EINVAL;	504	return -EINVAL;
447		505
448	spin_lock_irqsave(&bank->lock, flags);	506	spin_lock_irqsave(&bank->lock, flags);
449	retval = _set_gpio_triggering(bank, GPIO_INDEX(bank, gpio), type);	507	offset = GPIO_INDEX(bank, gpio);
		508	retval = _set_gpio_triggering(bank, offset, type);
		509	if (!LINE_USED(bank->mod_usage, offset)) {
		510	_enable_gpio_module(bank, offset);
		511	_set_gpio_direction(bank, offset, 1);
		512	} else if (!gpio_is_input(bank, 1 << offset)) {
		513	spin_unlock_irqrestore(&bank->lock, flags);
		514	return -EINVAL;
		515	}
		516
		517	bank->irq_usage \|= 1 << GPIO_INDEX(bank, gpio);
450	spin_unlock_irqrestore(&bank->lock, flags);	518	spin_unlock_irqrestore(&bank->lock, flags);
451		519
452	if (type & (IRQ_TYPE_LEVEL_LOW \| IRQ_TYPE_LEVEL_HIGH))	520	if (type & (IRQ_TYPE_LEVEL_LOW \| IRQ_TYPE_LEVEL_HIGH))
@@ -603,35 +671,19 @@ static int omap_gpio_request(struct gpio_chip *chip, unsigned offset) · 150 unmodified lines
603	* If this is the first gpio_request for the bank,	671	* If this is the first gpio_request for the bank,
604	* enable the bank module.	672	* enable the bank module.
605	*/	673	*/
606	if (!bank->mod_usage)	674	if (!BANK_USED(bank))
607	pm_runtime_get_sync(bank->dev);	675	pm_runtime_get_sync(bank->dev);
608		676
609	spin_lock_irqsave(&bank->lock, flags);	677	spin_lock_irqsave(&bank->lock, flags);
610	/* Set trigger to none. You need to enable the desired trigger with	678	/* Set trigger to none. You need to enable the desired trigger with
611	* request_irq() or set_irq_type().	679	* request_irq() or set_irq_type(). Only do this if the IRQ line has
		680	* not already been requested.
612	*/	681	*/
613	_set_gpio_triggering(bank, offset, IRQ_TYPE_NONE);	682	if (!LINE_USED(bank->irq_usage, offset)) {
614		683	_set_gpio_triggering(bank, offset, IRQ_TYPE_NONE);
615	if (bank->regs->pinctrl) {	684	_enable_gpio_module(bank, offset);
616	void __iomem *reg = bank->base + bank->regs->pinctrl;
617
618	/* Claim the pin for MPU */
619	__raw_writel(__raw_readl(reg) \| (1 << offset), reg);
620	}
621
622	if (bank->regs->ctrl && !bank->mod_usage) {
623	void __iomem *reg = bank->base + bank->regs->ctrl;
624	u32 ctrl;
625
626	ctrl = __raw_readl(reg);
627	/* Module is enabled, clocks are not gated */
628	ctrl &= ~GPIO_MOD_CTRL_BIT;
629	__raw_writel(ctrl, reg);
630	bank->context.ctrl = ctrl;
631	}	685	}
632
633	bank->mod_usage \|= 1 << offset;	686	bank->mod_usage \|= 1 << offset;
634
635	spin_unlock_irqrestore(&bank->lock, flags);	687	spin_unlock_irqrestore(&bank->lock, flags);
636		688
637	return 0;	689	return 0;
@@ -640,31 +692,11 @@ static int omap_gpio_request(struct gpio_chip *chip, unsigned offset) · 2 unmodified lines
640	static void omap_gpio_free(struct gpio_chip *chip, unsigned offset)	692	static void omap_gpio_free(struct gpio_chip *chip, unsigned offset)
641	{	693	{
642	struct gpio_bank *bank = container_of(chip, struct gpio_bank, chip);	694	struct gpio_bank *bank = container_of(chip, struct gpio_bank, chip);
643	void __iomem *base = bank->base;
644	unsigned long flags;	695	unsigned long flags;
645		696
646	spin_lock_irqsave(&bank->lock, flags);	697	spin_lock_irqsave(&bank->lock, flags);
647
648	if (bank->regs->wkup_en) {
649	/* Disable wake-up during idle for dynamic tick */
650	_gpio_rmw(base, bank->regs->wkup_en, 1 << offset, 0);
651	bank->context.wake_en =
652	__raw_readl(bank->base + bank->regs->wkup_en);
653	}
654
655	bank->mod_usage &= ~(1 << offset);	698	bank->mod_usage &= ~(1 << offset);
656		699	_disable_gpio_module(bank, offset);
657	if (bank->regs->ctrl && !bank->mod_usage) {
658	void __iomem *reg = bank->base + bank->regs->ctrl;
659	u32 ctrl;
660
661	ctrl = __raw_readl(reg);
662	/* Module is disabled, clocks are gated */
663	ctrl \|= GPIO_MOD_CTRL_BIT;
664	__raw_writel(ctrl, reg);
665	bank->context.ctrl = ctrl;
666	}
667
668	_reset_gpio(bank, bank->chip.base + offset);	700	_reset_gpio(bank, bank->chip.base + offset);
669	spin_unlock_irqrestore(&bank->lock, flags);	701	spin_unlock_irqrestore(&bank->lock, flags);
670		702
@@ -672,7 +704,7 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset) · 1 unmodified line
672	* If this is the last gpio to be freed in the bank,	704	* If this is the last gpio to be freed in the bank,
673	* disable the bank module.	705	* disable the bank module.
674	*/	706	*/
675	if (!bank->mod_usage)	707	if (!BANK_USED(bank))
676	pm_runtime_put(bank->dev);	708	pm_runtime_put(bank->dev);
677	}	709	}
678		710
@@ -762,10 +794,20 @@ static void gpio_irq_shutdown(struct irq_data *d) · 83 unmodified lines
762	struct gpio_bank *bank = irq_data_get_irq_chip_data(d);	794	struct gpio_bank *bank = irq_data_get_irq_chip_data(d);
763	unsigned int gpio = irq_to_gpio(bank, d->hwirq);	795	unsigned int gpio = irq_to_gpio(bank, d->hwirq);
764	unsigned long flags;	796	unsigned long flags;
		797	unsigned offset = GPIO_INDEX(bank, gpio);
765		798
766	spin_lock_irqsave(&bank->lock, flags);	799	spin_lock_irqsave(&bank->lock, flags);
		800	bank->irq_usage &= ~(1 << offset);
		801	_disable_gpio_module(bank, offset);
767	_reset_gpio(bank, gpio);	802	_reset_gpio(bank, gpio);
768	spin_unlock_irqrestore(&bank->lock, flags);	803	spin_unlock_irqrestore(&bank->lock, flags);
		804
		805	/*
		806	* If this is the last IRQ to be freed in the bank,
		807	* disable the bank module.
		808	*/
		809	if (!BANK_USED(bank))
		810	pm_runtime_put(bank->dev);
769	}	811	}
770		812
771	static void gpio_ack_irq(struct irq_data *d)	813	static void gpio_ack_irq(struct irq_data *d)
@@ -897,13 +939,6 @@ static int gpio_input(struct gpio_chip *chip, unsigned offset) · 125 unmodified lines
897	return 0;	939	return 0;
898	}	940	}
899		941
900	static int gpio_is_input(struct gpio_bank *bank, int mask)
901	{
902	void __iomem *reg = bank->base + bank->regs->direction;
903
904	return __raw_readl(reg) & mask;
905	}
906
907	static int gpio_get(struct gpio_chip *chip, unsigned offset)	942	static int gpio_get(struct gpio_chip *chip, unsigned offset)
908	{	943	{
909	struct gpio_bank *bank;	944	struct gpio_bank *bank;
@@ -922,13 +957,22 @@ static int gpio_output(struct gpio_chip *chip, unsigned offset, int value) · 12 unmodified lines
922	{	957	{
923	struct gpio_bank *bank;	958	struct gpio_bank *bank;
924	unsigned long flags;	959	unsigned long flags;
		960	int retval = 0;
925		961
926	bank = container_of(chip, struct gpio_bank, chip);	962	bank = container_of(chip, struct gpio_bank, chip);
927	spin_lock_irqsave(&bank->lock, flags);	963	spin_lock_irqsave(&bank->lock, flags);
		964
		965	if (LINE_USED(bank->irq_usage, offset)) {
		966	retval = -EINVAL;
		967	goto exit;
		968	}
		969
928	bank->set_dataout(bank, offset, value);	970	bank->set_dataout(bank, offset, value);
929	_set_gpio_direction(bank, offset, 0);	971	_set_gpio_direction(bank, offset, 0);
		972
		973	exit:
930	spin_unlock_irqrestore(&bank->lock, flags);	974	spin_unlock_irqrestore(&bank->lock, flags);
931	return 0;	975	return retval;
932	}	976	}
933		977
934	static int gpio_debounce(struct gpio_chip *chip, unsigned offset,	978	static int gpio_debounce(struct gpio_chip *chip, unsigned offset,
@@ -1400,7 +1444,7 @@ void omap2_gpio_prepare_for_idle(int pwr_mode) · 465 unmodified lines
1400	struct gpio_bank *bank;	1444	struct gpio_bank *bank;
1401		1445
1402	list_for_each_entry(bank, &omap_gpio_list, node) {	1446	list_for_each_entry(bank, &omap_gpio_list, node) {
1403	if (!bank->mod_usage \|\| !bank->loses_context)	1447	if (!BANK_USED(bank) \|\| !bank->loses_context)
1404	continue;	1448	continue;
1405		1449
1406	bank->power_mode = pwr_mode;	1450	bank->power_mode = pwr_mode;
@@ -1414,7 +1458,7 @@ void omap2_gpio_resume_after_idle(void) · 7 unmodified lines
1414	struct gpio_bank *bank;	1458	struct gpio_bank *bank;
1415		1459
1416	list_for_each_entry(bank, &omap_gpio_list, node) {	1460	list_for_each_entry(bank, &omap_gpio_list, node) {
1417	if (!bank->mod_usage \|\| !bank->loses_context)	1461	if (!BANK_USED(bank) \|\| !bank->loses_context)
1418	continue;	1462	continue;
1419		1463
1420	pm_runtime_get_sync(bank->dev);	1464	pm_runtime_get_sync(bank->dev);

drivers/gpio/gpio-rcar.c+3−4

 	if (pdata) {
 		p->config = *pdata;
 	} else if (IS_ENABLED(CONFIG_OF) && np) {
-		ret = of_parse_phandle_with_args(np, "gpio-ranges",
+		ret = of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3, 0,
-				"#gpio-range-cells", 0, &args);
+						       &args);
-		p->config.number_of_pins = ret == 0 && args.args_count == 3
+		p->config.number_of_pins = ret == 0 ? args.args[2]
-					 ? args.args[2]
 					 : RCAR_MAX_GPIO_PER_BANK;
 		p->config.gpio_base = -1;
 	}

drivers/gpio/gpiolib.c+4−2

  */
 static int desc_to_gpio(const struct gpio_desc *desc)
 {
-	return desc->chip->base + gpio_chip_hwgpio(desc);
+	return desc - &gpio_desc[0];
 }
 	int			status = -EPROBE_DEFER;
 	unsigned long		flags;
-	if (!desc || !desc->chip) {
+	if (!desc) {
 		pr_warn("%s: invalid GPIO\n", __func__);
 		return -EINVAL;
 	}
 	spin_lock_irqsave(&gpio_lock, flags);
 	chip = desc->chip;
+	if (chip == NULL)
+		goto done;
 	if (!try_module_get(chip->owner))
 		goto done;

drivers/gpu/drm/drm_drv.c+8−1

@@ -402,9 +402,16 @@ long drm_ioctl(struct file *filp, · 401 unmodified lines
402	cmd = ioctl->cmd_drv;	402	cmd = ioctl->cmd_drv;
403	}	403	}
404	else if ((nr >= DRM_COMMAND_END) \|\| (nr < DRM_COMMAND_BASE)) {	404	else if ((nr >= DRM_COMMAND_END) \|\| (nr < DRM_COMMAND_BASE)) {
		405	u32 drv_size;
		406
405	ioctl = &drm_ioctls[nr];	407	ioctl = &drm_ioctls[nr];
406	cmd = ioctl->cmd;	408
		409	drv_size = _IOC_SIZE(ioctl->cmd);
407	usize = asize = _IOC_SIZE(cmd);	410	usize = asize = _IOC_SIZE(cmd);
		411	if (drv_size > asize)
		412	asize = drv_size;
		413
		414	cmd = ioctl->cmd;
408	} else	415	} else
409	goto err_i1;	416	goto err_i1;
410		417

drivers/gpu/drm/drm_edid.c+2−0

 			/* Speaker Allocation Data Block */
 			if (dbl == 3) {
 				*sadb = kmalloc(dbl, GFP_KERNEL);
+				if (!*sadb)
+					return -ENOMEM;
 				memcpy(*sadb, &db[1], dbl);
 				count = dbl;
 				break;

drivers/gpu/drm/drm_fb_helper.c+0−8

@@ -407,14 +407,6 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode) · 406 unmodified lines
407	struct drm_connector *connector;	407	struct drm_connector *connector;
408	int i, j;	408	int i, j;
409		409
410	/*
411	* fbdev->blank can be called from irq context in case of a panic.
412	* Since we already have our own special panic handler which will
413	* restore the fbdev console mode completely, just bail out early.
414	*/
415	if (oops_in_progress)
416	return;
417
418	/*	410	/*
419	* fbdev->blank can be called from irq context in case of a panic.	411	* fbdev->blank can be called from irq context in case of a panic.
420	* Since we already have our own special panic handler which will	412	* Since we already have our own special panic handler which will

drivers/gpu/drm/gma500/gtt.c+1−0

@@ -204,6 +204,7 @@ static int psb_gtt_attach_pages(struct gtt_range *gt) · 203 unmodified lines
204	if (IS_ERR(pages))	204	if (IS_ERR(pages))
205	return PTR_ERR(pages);	205	return PTR_ERR(pages);
206		206
		207	gt->npage = gt->gem.size / PAGE_SIZE;
207	gt->pages = pages;	208	gt->pages = pages;
208		209
209	return 0;	210	return 0;

drivers/gpu/drm/i915/i915_dma.c+3−12

 	 * then we do not take part in VGA arbitration and the
 	 * vga_client_register() fails with -ENODEV.
 	 */
-	if (!HAS_PCH_SPLIT(dev)) {
+	ret = vga_client_register(dev->pdev, dev, NULL, i915_vga_set_decode);
-		ret = vga_client_register(dev->pdev, dev, NULL,
+	if (ret && ret != -ENODEV)
-					  i915_vga_set_decode);
+		goto out;
-		if (ret && ret != -ENODEV)
-			goto out;
-	}
 	intel_register_dsm_handler();
 	 */
 	intel_fbdev_initial_config(dev);
-	/*
-	 * Must do this after fbcon init so that
-	 * vgacon_save_screen() works during the handover.
-	 */
-	i915_disable_vga_mem(dev);
 	/* Only enable hotplug handling once the fbdev is fully set up. */
 	dev_priv->enable_hotplug_processing = true;

drivers/gpu/drm/i915/i915_drv.c+4−1

 		intel_modeset_suspend_hw(dev);
 	}
+	i915_gem_suspend_gtt_mappings(dev);
 	i915_save_state(dev);
 	intel_opregion_fini(dev);
 		mutex_lock(&dev->struct_mutex);
 		i915_gem_restore_gtt_mappings(dev);
 		mutex_unlock(&dev->struct_mutex);
-	}
+	} else if (drm_core_check_feature(dev, DRIVER_MODESET))
+		i915_check_and_clear_faults(dev);
 	__i915_drm_thaw(dev);

drivers/gpu/drm/i915/i915_drv.h+6−2

 	/* FIXME: Need a more generic return type */
 	gen6_gtt_pte_t (*pte_encode)(dma_addr_t addr,
-				     enum i915_cache_level level);
+				     enum i915_cache_level level,
+				     bool valid); /* Create a valid PTE */
 	void (*clear_range)(struct i915_address_space *vm,
 			    unsigned int first_entry,
-			    unsigned int num_entries);
+			    unsigned int num_entries,
+			    bool use_scratch);
 	void (*insert_entries)(struct i915_address_space *vm,
 			       struct sg_table *st,
 			       unsigned int first_entry,
 void i915_ppgtt_unbind_object(struct i915_hw_ppgtt *ppgtt,
 			      struct drm_i915_gem_object *obj);
+void i915_check_and_clear_faults(struct drm_device *dev);
+void i915_gem_suspend_gtt_mappings(struct drm_device *dev);
 void i915_gem_restore_gtt_mappings(struct drm_device *dev);
 int __must_check i915_gem_gtt_prepare_object(struct drm_i915_gem_object *obj);
 void i915_gem_gtt_bind_object(struct drm_i915_gem_object *obj,

drivers/gpu/drm/i915/i915_gem_gtt.c+85−24

 #define HSW_WT_ELLC_LLC_AGE0		HSW_CACHEABILITY_CONTROL(0x6)
 static gen6_gtt_pte_t snb_pte_encode(dma_addr_t addr,
-				     enum i915_cache_level level)
+				     enum i915_cache_level level,
+				     bool valid)
 {
-	gen6_gtt_pte_t pte = GEN6_PTE_VALID;
+	gen6_gtt_pte_t pte = valid ? GEN6_PTE_VALID : 0;
 	pte |= GEN6_PTE_ADDR_ENCODE(addr);
 	switch (level) {
 }
 static gen6_gtt_pte_t ivb_pte_encode(dma_addr_t addr,
-				     enum i915_cache_level level)
+				     enum i915_cache_level level,
+				     bool valid)
 {
-	gen6_gtt_pte_t pte = GEN6_PTE_VALID;
+	gen6_gtt_pte_t pte = valid ? GEN6_PTE_VALID : 0;
 	pte |= GEN6_PTE_ADDR_ENCODE(addr);
 	switch (level) {
 #define BYT_PTE_SNOOPED_BY_CPU_CACHES	(1 << 2)
 static gen6_gtt_pte_t byt_pte_encode(dma_addr_t addr,
-				     enum i915_cache_level level)
+				     enum i915_cache_level level,
+				     bool valid)
 {
-	gen6_gtt_pte_t pte = GEN6_PTE_VALID;
+	gen6_gtt_pte_t pte = valid ? GEN6_PTE_VALID : 0;
 	pte |= GEN6_PTE_ADDR_ENCODE(addr);
 	/* Mark the page as writeable.  Other platforms don't have a
 }
 static gen6_gtt_pte_t hsw_pte_encode(dma_addr_t addr,
-				     enum i915_cache_level level)
+				     enum i915_cache_level level,
+				     bool valid)
 {
-	gen6_gtt_pte_t pte = GEN6_PTE_VALID;
+	gen6_gtt_pte_t pte = valid ? GEN6_PTE_VALID : 0;
 	pte |= HSW_PTE_ADDR_ENCODE(addr);
 	if (level != I915_CACHE_NONE)
 }
 static gen6_gtt_pte_t iris_pte_encode(dma_addr_t addr,
-				      enum i915_cache_level level)
+				      enum i915_cache_level level,
+				      bool valid)
 {
-	gen6_gtt_pte_t pte = GEN6_PTE_VALID;
+	gen6_gtt_pte_t pte = valid ? GEN6_PTE_VALID : 0;
 	pte |= HSW_PTE_ADDR_ENCODE(addr);
 	switch (level) {
 /* PPGTT support for Sandybdrige/Gen6 and later */
 static void gen6_ppgtt_clear_range(struct i915_address_space *vm,
 				   unsigned first_entry,
-				   unsigned num_entries)
+				   unsigned num_entries,
+				   bool use_scratch)
 {
 	struct i915_hw_ppgtt *ppgtt =
 		container_of(vm, struct i915_hw_ppgtt, base);
 	unsigned first_pte = first_entry % I915_PPGTT_PT_ENTRIES;
 	unsigned last_pte, i;
-	scratch_pte = vm->pte_encode(vm->scratch.addr, I915_CACHE_LLC);
+	scratch_pte = vm->pte_encode(vm->scratch.addr, I915_CACHE_LLC, true);
 	while (num_entries) {
 		last_pte = first_pte + num_entries;
 		dma_addr_t page_addr;
 		page_addr = sg_page_iter_dma_address(&sg_iter);
-		pt_vaddr[act_pte] = vm->pte_encode(page_addr, cache_level);
+		pt_vaddr[act_pte] = vm->pte_encode(page_addr, cache_level, true);
 		if (++act_pte == I915_PPGTT_PT_ENTRIES) {
 			kunmap_atomic(pt_vaddr);
 			act_pt++;
 	}
 	ppgtt->base.clear_range(&ppgtt->base, 0,
-				ppgtt->num_pd_entries * I915_PPGTT_PT_ENTRIES);
+				ppgtt->num_pd_entries * I915_PPGTT_PT_ENTRIES, true);
 	ppgtt->pd_offset = first_pd_entry_in_global_pt * sizeof(gen6_gtt_pte_t);
 {
 	ppgtt->base.clear_range(&ppgtt->base,
 				i915_gem_obj_ggtt_offset(obj) >> PAGE_SHIFT,
-				obj->base.size >> PAGE_SHIFT);
+				obj->base.size >> PAGE_SHIFT,
+				true);
 }
 extern int intel_iommu_gfx_mapped;
 		dev_priv->mm.interruptible = interruptible;
 }
+void i915_check_and_clear_faults(struct drm_device *dev)
+{
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	struct intel_ring_buffer *ring;
+	int i;
+	if (INTEL_INFO(dev)->gen < 6)
+		return;
+	for_each_ring(ring, dev_priv, i) {
+		u32 fault_reg;
+		fault_reg = I915_READ(RING_FAULT_REG(ring));
+		if (fault_reg & RING_FAULT_VALID) {
+			DRM_DEBUG_DRIVER("Unexpected fault\n"
+					 "\tAddr: 0x%08lx\\n"
+					 "\tAddress space: %s\n"
+					 "\tSource ID: %d\n"
+					 "\tType: %d\n",
+					 fault_reg & PAGE_MASK,
+					 fault_reg & RING_FAULT_GTTSEL_MASK ? "GGTT" : "PPGTT",
+					 RING_FAULT_SRCID(fault_reg),
+					 RING_FAULT_FAULT_TYPE(fault_reg));
+			I915_WRITE(RING_FAULT_REG(ring),
+				   fault_reg & ~RING_FAULT_VALID);
+		}
+	}
+	POSTING_READ(RING_FAULT_REG(&dev_priv->ring[RCS]));
+}
+void i915_gem_suspend_gtt_mappings(struct drm_device *dev)
+{
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	/* Don't bother messing with faults pre GEN6 as we have little
+	 * documentation supporting that it's a good idea.
+	 */
+	if (INTEL_INFO(dev)->gen < 6)
+		return;
+	i915_check_and_clear_faults(dev);
+	dev_priv->gtt.base.clear_range(&dev_priv->gtt.base,
+				       dev_priv->gtt.base.start / PAGE_SIZE,
+				       dev_priv->gtt.base.total / PAGE_SIZE,
+				       false);
+}
 void i915_gem_restore_gtt_mappings(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_i915_gem_object *obj;
+	i915_check_and_clear_faults(dev);
 	/* First fill our portion of the GTT with scratch pages */
 	dev_priv->gtt.base.clear_range(&dev_priv->gtt.base,
 				       dev_priv->gtt.base.start / PAGE_SIZE,
-				       dev_priv->gtt.base.total / PAGE_SIZE);
+				       dev_priv->gtt.base.total / PAGE_SIZE,
+				       true);
 	list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) {
 		i915_gem_clflush_object(obj, obj->pin_display);
 	for_each_sg_page(st->sgl, &sg_iter, st->nents, 0) {
 		addr = sg_page_iter_dma_address(&sg_iter);
-		iowrite32(vm->pte_encode(addr, level), &gtt_entries[i]);
+		iowrite32(vm->pte_encode(addr, level, true), &gtt_entries[i]);
 		i++;
 	}
 	 */
 	if (i != 0)
 		WARN_ON(readl(&gtt_entries[i-1]) !=
-			vm->pte_encode(addr, level));
+			vm->pte_encode(addr, level, true));
 	/* This next bit makes the above posting read even more important. We
 	 * want to flush the TLBs only after we're certain all the PTE updates
 static void gen6_ggtt_clear_range(struct i915_address_space *vm,
 				  unsigned int first_entry,
-				  unsigned int num_entries)
+				  unsigned int num_entries,
+				  bool use_scratch)
 {
 	struct drm_i915_private *dev_priv = vm->dev->dev_private;
 	gen6_gtt_pte_t scratch_pte, __iomem *gtt_base =
 		 first_entry, num_entries, max_entries))
 		num_entries = max_entries;
-	scratch_pte = vm->pte_encode(vm->scratch.addr, I915_CACHE_LLC);
+	scratch_pte = vm->pte_encode(vm->scratch.addr, I915_CACHE_LLC, use_scratch);
 	for (i = 0; i < num_entries; i++)
 		iowrite32(scratch_pte, &gtt_base[i]);
 	readl(gtt_base);
 static void i915_ggtt_clear_range(struct i915_address_space *vm,
 				  unsigned int first_entry,
-				  unsigned int num_entries)
+				  unsigned int num_entries,
+				  bool unused)
 {
 	intel_gtt_clear_range(first_entry, num_entries);
 }
 	dev_priv->gtt.base.clear_range(&dev_priv->gtt.base,
 				       entry,
-				       obj->base.size >> PAGE_SHIFT);
+				       obj->base.size >> PAGE_SHIFT,
+				       true);
 	obj->has_global_gtt_mapping = 0;
 }
 		const unsigned long count = (hole_end - hole_start) / PAGE_SIZE;
 		DRM_DEBUG_KMS("clearing unused GTT space: [%lx, %lx]\n",
 			      hole_start, hole_end);
-		ggtt_vm->clear_range(ggtt_vm, hole_start / PAGE_SIZE, count);
+		ggtt_vm->clear_range(ggtt_vm, hole_start / PAGE_SIZE, count, true);
 	}
 	/* And finally clear the reserved guard page */
-	ggtt_vm->clear_range(ggtt_vm, end / PAGE_SIZE - 1, 1);
+	ggtt_vm->clear_range(ggtt_vm, end / PAGE_SIZE - 1, 1, true);
 }
 static bool

drivers/gpu/drm/i915/i915_reg.h+12−0

 #define   ARB_MODE_SWIZZLE_IVB	(1<<5)
 #define RENDER_HWS_PGA_GEN7	(0x04080)
 #define RING_FAULT_REG(ring)	(0x4094 + 0x100*(ring)->id)
+#define   RING_FAULT_GTTSEL_MASK (1<<11)
+#define   RING_FAULT_SRCID(x)	((x >> 3) & 0xff)
+#define   RING_FAULT_FAULT_TYPE(x) ((x >> 1) & 0x3)
+#define   RING_FAULT_VALID	(1<<0)
 #define DONE_REG		0x40b0
 #define BSD_HWS_PGA_GEN7	(0x04180)
 #define BLT_HWS_PGA_GEN7	(0x04280)
 #define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG		0x9030
 #define  GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB	(1<<11)
+#define HSW_SCRATCH1				0xb038
+#define  HSW_SCRATCH1_L3_DATA_ATOMICS_DISABLE	(1<<27)
 #define HSW_FUSE_STRAP		0x42014
 #define  HSW_CDCLK_LIMIT	(1 << 24)
 #define FDI_RX_CHICKEN(pipe) _PIPE(pipe, _FDI_RXA_CHICKEN, _FDI_RXB_CHICKEN)
 #define SOUTH_DSPCLK_GATE_D	0xc2020
+#define  PCH_DPLUNIT_CLOCK_GATE_DISABLE (1<<30)
 #define  PCH_DPLSUNIT_CLOCK_GATE_DISABLE (1<<29)
+#define  PCH_CPUNIT_CLOCK_GATE_DISABLE (1<<14)
 #define  PCH_LP_PARTITION_LEVEL_DISABLE  (1<<12)
 /* CPU: FDI_TX */
 #define GEN7_ROW_CHICKEN2_GT2		0xf4f4
 #define   DOP_CLOCK_GATING_DISABLE	(1<<0)
+#define HSW_ROW_CHICKEN3		0xe49c
+#define  HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE    (1 << 6)
 #define G4X_AUD_VID_DID			(dev_priv->info->display_mmio_offset + 0x62020)
 #define INTEL_AUDIO_DEVCL		0x808629FB
 #define INTEL_AUDIO_DEVBLC		0x80862801

drivers/gpu/drm/i915/intel_display.c+2−36

@@ -3941,8 +3941,6 @@ static void intel_connector_check_state(struct intel_connector *connector) · 3940 unmodified lines
3941	* consider. */	3941	* consider. */
3942	void intel_connector_dpms(struct drm_connector *connector, int mode)	3942	void intel_connector_dpms(struct drm_connector *connector, int mode)
3943	{	3943	{
3944	struct intel_encoder *encoder = intel_attached_encoder(connector);
3945
3946	/* All the simple cases only support two dpms states. */	3944	/* All the simple cases only support two dpms states. */
3947	if (mode != DRM_MODE_DPMS_ON)	3945	if (mode != DRM_MODE_DPMS_ON)
3948	mode = DRM_MODE_DPMS_OFF;	3946	mode = DRM_MODE_DPMS_OFF;
@@ -3953,10 +3951,8 @@ void intel_connector_dpms(struct drm_connector *connector, int mode) · 4 unmodified lines
3953	connector->dpms = mode;	3951	connector->dpms = mode;
3954		3952
3955	/* Only need to change hw state when actually enabled */	3953	/* Only need to change hw state when actually enabled */
3956	if (encoder->base.crtc)	3954	if (connector->encoder)
3957	intel_encoder_dpms(encoder, mode);	3955	intel_encoder_dpms(to_intel_encoder(connector->encoder), mode);
3958	else
3959	WARN_ON(encoder->connectors_active != false);
3960		3956
3961	intel_modeset_check_state(connector->dev);	3957	intel_modeset_check_state(connector->dev);
3962	}	3958	}
@@ -10049,33 +10045,6 @@ static void i915_disable_vga(struct drm_device *dev) · 6086 unmodified lines
10049	POSTING_READ(vga_reg);	10045	POSTING_READ(vga_reg);
10050	}	10046	}
10051		10047
10052	static void i915_enable_vga_mem(struct drm_device *dev)
10053	{
10054	/* Enable VGA memory on Intel HD */
10055	if (HAS_PCH_SPLIT(dev)) {
10056	vga_get_uninterruptible(dev->pdev, VGA_RSRC_LEGACY_IO);
10057	outb(inb(VGA_MSR_READ) \| VGA_MSR_MEM_EN, VGA_MSR_WRITE);
10058	vga_set_legacy_decoding(dev->pdev, VGA_RSRC_LEGACY_IO \|
10059	VGA_RSRC_LEGACY_MEM \|
10060	VGA_RSRC_NORMAL_IO \|
10061	VGA_RSRC_NORMAL_MEM);
10062	vga_put(dev->pdev, VGA_RSRC_LEGACY_IO);
10063	}
10064	}
10065
10066	void i915_disable_vga_mem(struct drm_device *dev)
10067	{
10068	/* Disable VGA memory on Intel HD */
10069	if (HAS_PCH_SPLIT(dev)) {
10070	vga_get_uninterruptible(dev->pdev, VGA_RSRC_LEGACY_IO);
10071	outb(inb(VGA_MSR_READ) & ~VGA_MSR_MEM_EN, VGA_MSR_WRITE);
10072	vga_set_legacy_decoding(dev->pdev, VGA_RSRC_LEGACY_IO \|
10073	VGA_RSRC_NORMAL_IO \|
10074	VGA_RSRC_NORMAL_MEM);
10075	vga_put(dev->pdev, VGA_RSRC_LEGACY_IO);
10076	}
10077	}
10078
10079	void intel_modeset_init_hw(struct drm_device *dev)	10048	void intel_modeset_init_hw(struct drm_device *dev)
10080	{	10049	{
10081	intel_init_power_well(dev);	10050	intel_init_power_well(dev);
@@ -10354,7 +10323,6 @@ void i915_redisable_vga(struct drm_device *dev) · 272 unmodified lines
10354	if (I915_READ(vga_reg) != VGA_DISP_DISABLE) {	10323	if (I915_READ(vga_reg) != VGA_DISP_DISABLE) {
10355	DRM_DEBUG_KMS("Something enabled VGA plane, disabling it\n");	10324	DRM_DEBUG_KMS("Something enabled VGA plane, disabling it\n");
10356	i915_disable_vga(dev);	10325	i915_disable_vga(dev);
10357	i915_disable_vga_mem(dev);
10358	}	10326	}
10359	}	10327	}
10360		10328
@@ -10568,8 +10536,6 @@ void intel_modeset_cleanup(struct drm_device *dev) · 207 unmodified lines
10568		10536
10569	intel_disable_fbc(dev);	10537	intel_disable_fbc(dev);
10570		10538
10571	i915_enable_vga_mem(dev);
10572
10573	intel_disable_gt_powersave(dev);	10539	intel_disable_gt_powersave(dev);
10574		10540
10575	ironlake_teardown_rc6(dev);	10541	ironlake_teardown_rc6(dev);

drivers/gpu/drm/i915/intel_dp.c+1−1

@@ -1467,7 +1467,7 @@ static void intel_edp_psr_setup(struct intel_dp *intel_dp) · 1466 unmodified lines
1467		1467
1468	/* Avoid continuous PSR exit by masking memup and hpd */	1468	/* Avoid continuous PSR exit by masking memup and hpd */
1469	I915_WRITE(EDP_PSR_DEBUG_CTL, EDP_PSR_DEBUG_MASK_MEMUP \|	1469	I915_WRITE(EDP_PSR_DEBUG_CTL, EDP_PSR_DEBUG_MASK_MEMUP \|
1470	EDP_PSR_DEBUG_MASK_HPD);	1470	EDP_PSR_DEBUG_MASK_HPD \| EDP_PSR_DEBUG_MASK_LPSP);
1471		1471
1472	intel_dp->psr_setup_done = true;	1472	intel_dp->psr_setup_done = true;
1473	}	1473	}

drivers/gpu/drm/i915/intel_drv.h+0−1

@@ -793,6 +793,5 @@ extern void hsw_pc8_disable_interrupts(struct drm_device *dev); · 792 unmodified lines
793	extern void hsw_pc8_restore_interrupts(struct drm_device *dev);	793	extern void hsw_pc8_restore_interrupts(struct drm_device *dev);
794	extern void intel_aux_display_runtime_get(struct drm_i915_private *dev_priv);	794	extern void intel_aux_display_runtime_get(struct drm_i915_private *dev_priv);
795	extern void intel_aux_display_runtime_put(struct drm_i915_private *dev_priv);	795	extern void intel_aux_display_runtime_put(struct drm_i915_private *dev_priv);
796	extern void i915_disable_vga_mem(struct drm_device *dev);
797		796
798	#endif /* __INTEL_DRV_H__ */	797	#endif /* __INTEL_DRV_H__ */

drivers/gpu/drm/i915/intel_pm.c+10−3

 				      dev_priv->rps.rpe_delay),
 			 dev_priv->rps.rpe_delay);
-	INIT_DELAYED_WORK(&dev_priv->rps.vlv_work, vlv_rps_timer_work);
 	valleyview_set_rps(dev_priv->dev, dev_priv->rps.rpe_delay);
 	gen6_enable_rps_interrupts(dev);
 	 * gating for the panel power sequencer or it will fail to
 	 * start up when no ports are active.
 	 */
-	I915_WRITE(SOUTH_DSPCLK_GATE_D, PCH_DPLSUNIT_CLOCK_GATE_DISABLE);
+	I915_WRITE(SOUTH_DSPCLK_GATE_D, PCH_DPLSUNIT_CLOCK_GATE_DISABLE |
+		   PCH_DPLUNIT_CLOCK_GATE_DISABLE |
+		   PCH_CPUNIT_CLOCK_GATE_DISABLE);
 	I915_WRITE(SOUTH_CHICKEN2, I915_READ(SOUTH_CHICKEN2) |
 		   DPLS_EDP_PPS_FIX_DIS);
 	/* The below fixes the weird display corruption, a few pixels shifted
 	I915_WRITE(GEN7_L3_CHICKEN_MODE_REGISTER,
 			GEN7_WA_L3_CHICKEN_MODE);
+	/* L3 caching of data atomics doesn't work -- disable it. */
+	I915_WRITE(HSW_SCRATCH1, HSW_SCRATCH1_L3_DATA_ATOMICS_DISABLE);
+	I915_WRITE(HSW_ROW_CHICKEN3,
+		   _MASKED_BIT_ENABLE(HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE));
 	/* This is required by WaCatErrorRejectionIssue:hsw */
 	I915_WRITE(GEN7_SQ_CHICKEN_MBCUNIT_CONFIG,
 			I915_READ(GEN7_SQ_CHICKEN_MBCUNIT_CONFIG) |
 	INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work,
 			  intel_gen6_powersave_work);
+	INIT_DELAYED_WORK(&dev_priv->rps.vlv_work, vlv_rps_timer_work);
 }

drivers/gpu/drm/nouveau/core/subdev/mc/base.c+1−1

@@ -113,7 +113,7 @@ nouveau_mc_create_(struct nouveau_object parent, struct nouveau_object engine, · 112 unmodified lines
113	pmc->use_msi = false;	113	pmc->use_msi = false;
114	break;	114	break;
115	default:	115	default:
116	pmc->use_msi = nouveau_boolopt(device->cfgopt, "NvMSI", true);	116	pmc->use_msi = nouveau_boolopt(device->cfgopt, "NvMSI", false);
117	if (pmc->use_msi) {	117	if (pmc->use_msi) {
118	pmc->use_msi = pci_enable_msi(device->pdev) == 0;	118	pmc->use_msi = pci_enable_msi(device->pdev) == 0;
119	if (pmc->use_msi) {	119	if (pmc->use_msi) {

drivers/gpu/drm/radeon/atombios_encoders.c+36−18

 	switch (connector->connector_type) {
 	case DRM_MODE_CONNECTOR_DVII:
 	case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */
-		if ((radeon_connector->audio == RADEON_AUDIO_ENABLE) ||
+		if (radeon_audio != 0) {
-		    (drm_detect_hdmi_monitor(radeon_connector->edid) &&
+			if (radeon_connector->use_digital &&
-		     (radeon_connector->audio == RADEON_AUDIO_AUTO)))
+			    (radeon_connector->audio == RADEON_AUDIO_ENABLE))
-			return ATOM_ENCODER_MODE_HDMI;
+				return ATOM_ENCODER_MODE_HDMI;
-		else if (radeon_connector->use_digital)
+			else if (drm_detect_hdmi_monitor(radeon_connector->edid) &&
+				 (radeon_connector->audio == RADEON_AUDIO_AUTO))
+				return ATOM_ENCODER_MODE_HDMI;
+			else if (radeon_connector->use_digital)
+				return ATOM_ENCODER_MODE_DVI;
+			else
+				return ATOM_ENCODER_MODE_CRT;
+		} else if (radeon_connector->use_digital) {
 			return ATOM_ENCODER_MODE_DVI;
-		else
+		} else {
 			return ATOM_ENCODER_MODE_CRT;
+		}
 		break;
 	case DRM_MODE_CONNECTOR_DVID:
 	case DRM_MODE_CONNECTOR_HDMIA:
 	default:
-		if ((radeon_connector->audio == RADEON_AUDIO_ENABLE) ||
+		if (radeon_audio != 0) {
-		    (drm_detect_hdmi_monitor(radeon_connector->edid) &&
+			if (radeon_connector->audio == RADEON_AUDIO_ENABLE)
-		     (radeon_connector->audio == RADEON_AUDIO_AUTO)))
+				return ATOM_ENCODER_MODE_HDMI;
-			return ATOM_ENCODER_MODE_HDMI;
+			else if (drm_detect_hdmi_monitor(radeon_connector->edid) &&
-		else
+				 (radeon_connector->audio == RADEON_AUDIO_AUTO))
+				return ATOM_ENCODER_MODE_HDMI;
+			else
+				return ATOM_ENCODER_MODE_DVI;
+		} else {
 			return ATOM_ENCODER_MODE_DVI;
+		}
 		break;
 	case DRM_MODE_CONNECTOR_LVDS:
 		return ATOM_ENCODER_MODE_LVDS;
 	case DRM_MODE_CONNECTOR_DisplayPort:
 		dig_connector = radeon_connector->con_priv;
 		if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||
-		    (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))
+		    (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP)) {
 			return ATOM_ENCODER_MODE_DP;
-		else if ((radeon_connector->audio == RADEON_AUDIO_ENABLE) ||
+		} else if (radeon_audio != 0) {
-			 (drm_detect_hdmi_monitor(radeon_connector->edid) &&
+			if (radeon_connector->audio == RADEON_AUDIO_ENABLE)
-			  (radeon_connector->audio == RADEON_AUDIO_AUTO)))
+				return ATOM_ENCODER_MODE_HDMI;
-			return ATOM_ENCODER_MODE_HDMI;
+			else if (drm_detect_hdmi_monitor(radeon_connector->edid) &&
-		else
+				 (radeon_connector->audio == RADEON_AUDIO_AUTO))
+				return ATOM_ENCODER_MODE_HDMI;
+			else
+				return ATOM_ENCODER_MODE_DVI;
+		} else {
 			return ATOM_ENCODER_MODE_DVI;
+		}
 		break;
 	case DRM_MODE_CONNECTOR_eDP:
 		return ATOM_ENCODER_MODE_DP;
 			 * does the same thing and more.
 			 */
 			if ((rdev->family != CHIP_RV710) && (rdev->family != CHIP_RV730) &&
-			    (rdev->family != CHIP_RS880))
+			    (rdev->family != CHIP_RS780) && (rdev->family != CHIP_RS880))
 				atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0);
 		}
 		if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(encoder)) && connector) {

drivers/gpu/drm/radeon/btc_dpm.c+3−3

@@ -1930,7 +1930,7 @@ static int btc_set_mc_special_registers(struct radeon_device *rdev, · 1929 unmodified lines
1930	}	1930	}
1931	j++;	1931	j++;
1932		1932
1933	if (j > SMC_EVERGREEN_MC_REGISTER_ARRAY_SIZE)	1933	if (j >= SMC_EVERGREEN_MC_REGISTER_ARRAY_SIZE)
1934	return -EINVAL;	1934	return -EINVAL;
1935		1935
1936	tmp = RREG32(MC_PMG_CMD_MRS);	1936	tmp = RREG32(MC_PMG_CMD_MRS);
@@ -1945,7 +1945,7 @@ static int btc_set_mc_special_registers(struct radeon_device *rdev, · 8 unmodified lines
1945	}	1945	}
1946	j++;	1946	j++;
1947		1947
1948	if (j > SMC_EVERGREEN_MC_REGISTER_ARRAY_SIZE)	1948	if (j >= SMC_EVERGREEN_MC_REGISTER_ARRAY_SIZE)
1949	return -EINVAL;	1949	return -EINVAL;
1950	break;	1950	break;
1951	case MC_SEQ_RESERVE_M >> 2:	1951	case MC_SEQ_RESERVE_M >> 2:
@@ -1959,7 +1959,7 @@ static int btc_set_mc_special_registers(struct radeon_device *rdev, · 7 unmodified lines
1959	}	1959	}
1960	j++;	1960	j++;
1961		1961
1962	if (j > SMC_EVERGREEN_MC_REGISTER_ARRAY_SIZE)	1962	if (j >= SMC_EVERGREEN_MC_REGISTER_ARRAY_SIZE)
1963	return -EINVAL;	1963	return -EINVAL;
1964	break;	1964	break;
1965	default:	1965	default:

drivers/gpu/drm/radeon/cik.c+10−0

 static void cik_program_aspm(struct radeon_device *rdev);
 static void cik_init_pg(struct radeon_device *rdev);
 static void cik_init_cg(struct radeon_device *rdev);
+static void cik_fini_pg(struct radeon_device *rdev);
+static void cik_fini_cg(struct radeon_device *rdev);
 static void cik_enable_gui_idle_interrupt(struct radeon_device *rdev,
 					  bool enable);
 			       fw_name);
 			release_firmware(rdev->smc_fw);
 			rdev->smc_fw = NULL;
+			err = 0;
 		} else if (rdev->smc_fw->size != smc_req_size) {
 			printk(KERN_ERR
 			       "cik_smc: Bogus length %zu in firmware \"%s\"\n",
 	r = radeon_ib_get(rdev, ring->idx, &ib, NULL, 256);
 	if (r) {
 		DRM_ERROR("radeon: failed to get ib (%d).\n", r);
+		radeon_scratch_free(rdev, scratch);
 		return r;
 	}
 	ib.ptr[0] = PACKET3(PACKET3_SET_UCONFIG_REG, 1);
 	r = radeon_fence_wait(ib.fence, false);
 	if (r) {
 		DRM_ERROR("radeon: fence wait failed (%d).\n", r);
+		radeon_scratch_free(rdev, scratch);
+		radeon_ib_free(rdev, &ib);
 		return r;
 	}
 	for (i = 0; i < rdev->usec_timeout; i++) {
 	dev_info(rdev->dev, "  VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n",
 		 RREG32(VM_CONTEXT1_PROTECTION_FAULT_STATUS));
+	/* disable CG/PG */
+	cik_fini_pg(rdev);
+	cik_fini_cg(rdev);
 	/* stop the rlc */
 	cik_rlc_stop(rdev);

drivers/gpu/drm/radeon/dce6_afmt.c+3−0

@@ -113,6 +113,9 @@ void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder) · 112 unmodified lines
113	u8 *sadb;	113	u8 *sadb;
114	int sad_count;	114	int sad_count;
115		115
		116	/* XXX: setting this register causes hangs on some asics */
		117	return;
		118
116	if (!dig->afmt->pin)	119	if (!dig->afmt->pin)
117	return;	120	return;
118		121

drivers/gpu/drm/radeon/evergreen.c+1−1

@@ -3131,7 +3131,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev) · 3130 unmodified lines
3131	rdev->config.evergreen.sx_max_export_size = 256;	3131	rdev->config.evergreen.sx_max_export_size = 256;
3132	rdev->config.evergreen.sx_max_export_pos_size = 64;	3132	rdev->config.evergreen.sx_max_export_pos_size = 64;
3133	rdev->config.evergreen.sx_max_export_smx_size = 192;	3133	rdev->config.evergreen.sx_max_export_smx_size = 192;
3134	rdev->config.evergreen.max_hw_contexts = 8;	3134	rdev->config.evergreen.max_hw_contexts = 4;
3135	rdev->config.evergreen.sq_num_cf_insts = 2;	3135	rdev->config.evergreen.sq_num_cf_insts = 2;
3136		3136
3137	rdev->config.evergreen.sc_prim_fifo_size = 0x40;	3137	rdev->config.evergreen.sc_prim_fifo_size = 0x40;

drivers/gpu/drm/radeon/evergreen_hdmi.c+4−2

 	u8 *sadb;
 	int sad_count;
+	/* XXX: setting this register causes hangs on some asics */
+	return;
 	list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) {
 		if (connector->encoder == encoder)
 			radeon_connector = to_radeon_connector(connector);
 	/* fglrx clears sth in AFMT_AUDIO_PACKET_CONTROL2 here */
 	WREG32(HDMI_ACR_PACKET_CONTROL + offset,
-	       HDMI_ACR_AUTO_SEND | /* allow hw to sent ACR packets when required */
+	       HDMI_ACR_AUTO_SEND); /* allow hw to sent ACR packets when required */
-	       HDMI_ACR_SOURCE); /* select SW CTS value */
 	evergreen_hdmi_update_ACR(encoder, mode->clock);

drivers/gpu/drm/radeon/evergreend.h+2−2

@@ -1501,7 +1501,7 @@ · 1500 unmodified lines
1501	* 6. COMMAND [29:22] \| BYTE_COUNT [20:0]	1501	* 6. COMMAND [29:22] \| BYTE_COUNT [20:0]
1502	*/	1502	*/
1503	# define PACKET3_CP_DMA_DST_SEL(x) ((x) << 20)	1503	# define PACKET3_CP_DMA_DST_SEL(x) ((x) << 20)
1504	/* 0 - SRC_ADDR	1504	/* 0 - DST_ADDR
1505	* 1 - GDS	1505	* 1 - GDS
1506	*/	1506	*/
1507	# define PACKET3_CP_DMA_ENGINE(x) ((x) << 27)	1507	# define PACKET3_CP_DMA_ENGINE(x) ((x) << 27)
@@ -1516,7 +1516,7 @@ · 8 unmodified lines
1516	# define PACKET3_CP_DMA_CP_SYNC (1 << 31)	1516	# define PACKET3_CP_DMA_CP_SYNC (1 << 31)
1517	/* COMMAND */	1517	/* COMMAND */
1518	# define PACKET3_CP_DMA_DIS_WC (1 << 21)	1518	# define PACKET3_CP_DMA_DIS_WC (1 << 21)
1519	# define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 23)	1519	# define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 22)
1520	/* 0 - none	1520	/* 0 - none
1521	* 1 - 8 in 16	1521	* 1 - 8 in 16
1522	* 2 - 8 in 32	1522	* 2 - 8 in 32

drivers/gpu/drm/radeon/ni.c+1−0

@@ -804,6 +804,7 @@ int ni_init_microcode(struct radeon_device *rdev) · 803 unmodified lines
804	fw_name);	804	fw_name);
805	release_firmware(rdev->smc_fw);	805	release_firmware(rdev->smc_fw);
806	rdev->smc_fw = NULL;	806	rdev->smc_fw = NULL;
		807	err = 0;
807	} else if (rdev->smc_fw->size != smc_req_size) {	808	} else if (rdev->smc_fw->size != smc_req_size) {
808	printk(KERN_ERR	809	printk(KERN_ERR
809	"ni_mc: Bogus length %zu in firmware \"%s\"\n",	810	"ni_mc: Bogus length %zu in firmware \"%s\"\n",

drivers/gpu/drm/radeon/r600.c+1−0

@@ -2302,6 +2302,7 @@ int r600_init_microcode(struct radeon_device *rdev) · 2301 unmodified lines
2302	fw_name);	2302	fw_name);
2303	release_firmware(rdev->smc_fw);	2303	release_firmware(rdev->smc_fw);
2304	rdev->smc_fw = NULL;	2304	rdev->smc_fw = NULL;
		2305	err = 0;
2305	} else if (rdev->smc_fw->size != smc_req_size) {	2306	} else if (rdev->smc_fw->size != smc_req_size) {
2306	printk(KERN_ERR	2307	printk(KERN_ERR
2307	"smc: Bogus length %zu in firmware \"%s\"\n",	2308	"smc: Bogus length %zu in firmware \"%s\"\n",

drivers/gpu/drm/radeon/r600_hdmi.c+17−7

 static const struct radeon_hdmi_acr r600_hdmi_predefined_acr[] = {
     /*	     32kHz	  44.1kHz	48kHz    */
     /* Clock      N     CTS      N     CTS      N     CTS */
-    {  25174,  4576,  28125,  7007,  31250,  6864,  28125 }, /*  25,20/1.001 MHz */
+    {  25175,  4576,  28125,  7007,  31250,  6864,  28125 }, /*  25,20/1.001 MHz */
     {  25200,  4096,  25200,  6272,  28000,  6144,  25200 }, /*  25.20       MHz */
     {  27000,  4096,  27000,  6272,  30000,  6144,  27000 }, /*  27.00       MHz */
     {  27027,  4096,  27027,  6272,  30030,  6144,  27027 }, /*  27.00*1.001 MHz */
     {  54000,  4096,  54000,  6272,  60000,  6144,  54000 }, /*  54.00       MHz */
     {  54054,  4096,  54054,  6272,  60060,  6144,  54054 }, /*  54.00*1.001 MHz */
-    {  74175, 11648, 210937, 17836, 234375, 11648, 140625 }, /*  74.25/1.001 MHz */
+    {  74176, 11648, 210937, 17836, 234375, 11648, 140625 }, /*  74.25/1.001 MHz */
     {  74250,  4096,  74250,  6272,  82500,  6144,  74250 }, /*  74.25       MHz */
-    { 148351, 11648, 421875,  8918, 234375,  5824, 140625 }, /* 148.50/1.001 MHz */
+    { 148352, 11648, 421875,  8918, 234375,  5824, 140625 }, /* 148.50/1.001 MHz */
     { 148500,  4096, 148500,  6272, 165000,  6144, 148500 }, /* 148.50       MHz */
     {      0,  4096,      0,  6272,      0,  6144,      0 }  /* Other */
 };
  */
 static void r600_hdmi_calc_cts(uint32_t clock, int *CTS, int N, int freq)
 {
-	if (*CTS == 0)
+	u64 n;
-		*CTS = clock * N / (128 * freq) * 1000;
+	u32 d;
+	if (*CTS == 0) {
+		n = (u64)clock * (u64)N * 1000ULL;
+		d = 128 * freq;
+		do_div(n, d);
+		*CTS = n;
+	}
 	DRM_DEBUG("Using ACR timing N=%d CTS=%d for frequency %d\n",
 		  N, *CTS, freq);
 }
 	u8 *sadb;
 	int sad_count;
+	/* XXX: setting this register causes hangs on some asics */
+	return;
 	list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) {
 		if (connector->encoder == encoder)
 			radeon_connector = to_radeon_connector(connector);
 	}
 	WREG32(HDMI0_ACR_PACKET_CONTROL + offset,
-	       HDMI0_ACR_AUTO_SEND | /* allow hw to sent ACR packets when required */
+	       HDMI0_ACR_SOURCE | /* select SW CTS value - XXX verify that hw CTS works on all families */
-	       HDMI0_ACR_SOURCE); /* select SW CTS value */
+	       HDMI0_ACR_AUTO_SEND); /* allow hw to sent ACR packets when required */
 	WREG32(HDMI0_VBI_PACKET_CONTROL + offset,
 	       HDMI0_NULL_SEND | /* send null packets when required */

drivers/gpu/drm/radeon/r600d.h+1−1

@@ -1523,7 +1523,7 @@ · 1522 unmodified lines
1523	*/	1523	*/
1524	# define PACKET3_CP_DMA_CP_SYNC (1 << 31)	1524	# define PACKET3_CP_DMA_CP_SYNC (1 << 31)
1525	/* COMMAND */	1525	/* COMMAND */
1526	# define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 23)	1526	# define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 22)
1527	/* 0 - none	1527	/* 0 - none
1528	* 1 - 8 in 16	1528	* 1 - 8 in 16
1529	* 2 - 8 in 32	1529	* 2 - 8 in 32

drivers/gpu/drm/radeon/radeon_connectors.c+21−12

 			drm_object_attach_property(&radeon_connector->base.base,
 						      rdev->mode_info.underscan_vborder_property,
 						      0);
-			drm_object_attach_property(&radeon_connector->base.base,
+			if (radeon_audio != 0)
-						   rdev->mode_info.audio_property,
+				drm_object_attach_property(&radeon_connector->base.base,
-						   RADEON_AUDIO_DISABLE);
+							   rdev->mode_info.audio_property,
+							   (radeon_audio == 1) ?
+							   RADEON_AUDIO_AUTO :
+							   RADEON_AUDIO_DISABLE);
 			subpixel_order = SubPixelHorizontalRGB;
 			connector->interlace_allowed = true;
 			if (connector_type == DRM_MODE_CONNECTOR_HDMIB)
 							      rdev->mode_info.underscan_vborder_property,
 							      0);
 			}
-			if (ASIC_IS_DCE2(rdev)) {
+			if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
 				drm_object_attach_property(&radeon_connector->base.base,
-							      rdev->mode_info.audio_property,
+							   rdev->mode_info.audio_property,
-							      RADEON_AUDIO_DISABLE);
+							   (radeon_audio == 1) ?
+							   RADEON_AUDIO_AUTO :
+							   RADEON_AUDIO_DISABLE);
 			}
 			if (connector_type == DRM_MODE_CONNECTOR_DVII) {
 				radeon_connector->dac_load_detect = true;
 							      rdev->mode_info.underscan_vborder_property,
 							      0);
 			}
-			if (ASIC_IS_DCE2(rdev)) {
+			if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
 				drm_object_attach_property(&radeon_connector->base.base,
-							      rdev->mode_info.audio_property,
+							   rdev->mode_info.audio_property,
-							      RADEON_AUDIO_DISABLE);
+							   (radeon_audio == 1) ?
+							   RADEON_AUDIO_AUTO :
+							   RADEON_AUDIO_DISABLE);
 			}
 			subpixel_order = SubPixelHorizontalRGB;
 			connector->interlace_allowed = true;
 							      rdev->mode_info.underscan_vborder_property,
 							      0);
 			}
-			if (ASIC_IS_DCE2(rdev)) {
+			if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
 				drm_object_attach_property(&radeon_connector->base.base,
-							      rdev->mode_info.audio_property,
+							   rdev->mode_info.audio_property,
-							      RADEON_AUDIO_DISABLE);
+							   (radeon_audio == 1) ?
+							   RADEON_AUDIO_AUTO :
+							   RADEON_AUDIO_DISABLE);
 			}
 			connector->interlace_allowed = true;
 			/* in theory with a DP to VGA converter... */

drivers/gpu/drm/radeon/radeon_cs.c+1−2

@@ -85,9 +85,8 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p) · 84 unmodified lines
85	VRAM, also but everything into VRAM on AGP cards to avoid	85	VRAM, also but everything into VRAM on AGP cards to avoid
86	image corruptions */	86	image corruptions */
87	if (p->ring == R600_RING_TYPE_UVD_INDEX &&	87	if (p->ring == R600_RING_TYPE_UVD_INDEX &&
88	p->rdev->family < CHIP_PALM &&
89	(i == 0 \|\| drm_pci_device_is_agp(p->rdev->ddev))) {	88	(i == 0 \|\| drm_pci_device_is_agp(p->rdev->ddev))) {
90		89	/* TODO: is this still needed for NI+ ? */
91	p->relocs[i].lobj.domain =	90	p->relocs[i].lobj.domain =
92	RADEON_GEM_DOMAIN_VRAM;	91	RADEON_GEM_DOMAIN_VRAM;
93		92

drivers/gpu/drm/radeon/radeon_drv.c+2−2

@@ -153,7 +153,7 @@ int radeon_benchmarking = 0; · 152 unmodified lines
153	int radeon_testing = 0;	153	int radeon_testing = 0;
154	int radeon_connector_table = 0;	154	int radeon_connector_table = 0;
155	int radeon_tv = 1;	155	int radeon_tv = 1;
156	int radeon_audio = 1;	156	int radeon_audio = -1;
157	int radeon_disp_priority = 0;	157	int radeon_disp_priority = 0;
158	int radeon_hw_i2c = 0;	158	int radeon_hw_i2c = 0;
159	int radeon_pcie_gen2 = -1;	159	int radeon_pcie_gen2 = -1;
@@ -196,7 +196,7 @@ module_param_named(connector_table, radeon_connector_table, int, 0444); · 36 unmodified lines
196	MODULE_PARM_DESC(tv, "TV enable (0 = disable)");	196	MODULE_PARM_DESC(tv, "TV enable (0 = disable)");
197	module_param_named(tv, radeon_tv, int, 0444);	197	module_param_named(tv, radeon_tv, int, 0444);
198		198
199	MODULE_PARM_DESC(audio, "Audio enable (1 = enable)");	199	MODULE_PARM_DESC(audio, "Audio enable (-1 = auto, 0 = disable, 1 = enable)");
200	module_param_named(audio, radeon_audio, int, 0444);	200	module_param_named(audio, radeon_audio, int, 0444);
201		201
202	MODULE_PARM_DESC(disp_priority, "Display Priority (0 = auto, 1 = normal, 2 = high)");	202	MODULE_PARM_DESC(disp_priority, "Display Priority (0 = auto, 1 = normal, 2 = high)");

drivers/gpu/drm/radeon/radeon_pm.c+3−0

 		if (enable) {
 			mutex_lock(&rdev->pm.mutex);
 			rdev->pm.dpm.uvd_active = true;
+			/* disable this for now */
+#if 0
 			if ((rdev->pm.dpm.sd == 1) && (rdev->pm.dpm.hd == 0))
 				dpm_state = POWER_STATE_TYPE_INTERNAL_UVD_SD;
 			else if ((rdev->pm.dpm.sd == 2) && (rdev->pm.dpm.hd == 0))
 			else if ((rdev->pm.dpm.sd == 0) && (rdev->pm.dpm.hd == 2))
 				dpm_state = POWER_STATE_TYPE_INTERNAL_UVD_HD2;
 			else
+#endif
 				dpm_state = POWER_STATE_TYPE_INTERNAL_UVD;
 			rdev->pm.dpm.state = dpm_state;
 			mutex_unlock(&rdev->pm.mutex);

drivers/gpu/drm/radeon/radeon_test.c+2−2

@@ -36,8 +36,8 @@ static void radeon_do_test_moves(struct radeon_device *rdev, int flag) · 35 unmodified lines
36	struct radeon_bo *vram_obj = NULL;	36	struct radeon_bo *vram_obj = NULL;
37	struct radeon_bo **gtt_obj = NULL;	37	struct radeon_bo **gtt_obj = NULL;
38	uint64_t gtt_addr, vram_addr;	38	uint64_t gtt_addr, vram_addr;
39	unsigned i, n, size;	39	unsigned n, size;
40	int r, ring;	40	int i, r, ring;
41		41
42	switch (flag) {	42	switch (flag) {
43	case RADEON_TEST_COPY_DMA:	43	case RADEON_TEST_COPY_DMA:

drivers/gpu/drm/radeon/radeon_uvd.c+4−2

 		return -EINVAL;
 	}
-	if (p->rdev->family < CHIP_PALM && (cmd == 0 || cmd == 0x3) &&
+	/* TODO: is this still necessary on NI+ ? */
+	if ((cmd == 0 || cmd == 0x3) &&
 	    (start >> 28) != (p->rdev->uvd.gpu_addr >> 28)) {
 		DRM_ERROR("msg/fb buffer %LX-%LX out of 256MB segment!\n",
 			  start, end);
 		    (rdev->pm.dpm.hd != hd)) {
 			rdev->pm.dpm.sd = sd;
 			rdev->pm.dpm.hd = hd;
-			streams_changed = true;
+			/* disable this for now */
+			/*streams_changed = true;*/
 		}
 	}

drivers/gpu/drm/radeon/si.c+11−0

 			       uint32_t incr, uint32_t flags);
 static void si_enable_gui_idle_interrupt(struct radeon_device *rdev,
 					 bool enable);
+static void si_fini_pg(struct radeon_device *rdev);
+static void si_fini_cg(struct radeon_device *rdev);
+static void si_rlc_stop(struct radeon_device *rdev);
 static const u32 verde_rlc_save_restore_register_list[] =
 {
 		       fw_name);
 		release_firmware(rdev->smc_fw);
 		rdev->smc_fw = NULL;
+		err = 0;
 	} else if (rdev->smc_fw->size != smc_req_size) {
 		printk(KERN_ERR
 		       "si_smc: Bogus length %zu in firmware \"%s\"\n",
 	dev_info(rdev->dev, "  VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n",
 		 RREG32(VM_CONTEXT1_PROTECTION_FAULT_STATUS));
+	/* disable PG/CG */
+	si_fini_pg(rdev);
+	si_fini_cg(rdev);
+	/* stop the rlc */
+	si_rlc_stop(rdev);
 	/* Disable CP parsing/prefetching */
 	WREG32(CP_ME_CNTL, CP_ME_HALT | CP_PFP_HALT | CP_CE_HALT);

drivers/gpu/drm/radeon/si_dpm.c+3−3

@@ -5208,7 +5208,7 @@ static int si_set_mc_special_registers(struct radeon_device *rdev, · 5207 unmodified lines
5208	table->mc_reg_table_entry[k].mc_data[j] \|= 0x100;	5208	table->mc_reg_table_entry[k].mc_data[j] \|= 0x100;
5209	}	5209	}
5210	j++;	5210	j++;
5211	if (j > SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)	5211	if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
5212	return -EINVAL;	5212	return -EINVAL;
5213		5213
5214	if (!pi->mem_gddr5) {	5214	if (!pi->mem_gddr5) {
@@ -5218,7 +5218,7 @@ static int si_set_mc_special_registers(struct radeon_device *rdev, · 3 unmodified lines
5218	table->mc_reg_table_entry[k].mc_data[j] =	5218	table->mc_reg_table_entry[k].mc_data[j] =
5219	(table->mc_reg_table_entry[k].mc_data[i] & 0xffff0000) >> 16;	5219	(table->mc_reg_table_entry[k].mc_data[i] & 0xffff0000) >> 16;
5220	j++;	5220	j++;
5221	if (j > SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)	5221	if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
5222	return -EINVAL;	5222	return -EINVAL;
5223	}	5223	}
5224	break;	5224	break;
@@ -5231,7 +5231,7 @@ static int si_set_mc_special_registers(struct radeon_device *rdev, · 6 unmodified lines
5231	(temp_reg & 0xffff0000) \|	5231	(temp_reg & 0xffff0000) \|
5232	(table->mc_reg_table_entry[k].mc_data[i] & 0x0000ffff);	5232	(table->mc_reg_table_entry[k].mc_data[i] & 0x0000ffff);
5233	j++;	5233	j++;
5234	if (j > SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)	5234	if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
5235	return -EINVAL;	5235	return -EINVAL;
5236	break;	5236	break;
5237	default:	5237	default:

drivers/gpu/drm/radeon/sid.h+2−2

@@ -1553,7 +1553,7 @@ · 1552 unmodified lines
1553	* 6. COMMAND [30:21] \| BYTE_COUNT [20:0]	1553	* 6. COMMAND [30:21] \| BYTE_COUNT [20:0]
1554	*/	1554	*/
1555	# define PACKET3_CP_DMA_DST_SEL(x) ((x) << 20)	1555	# define PACKET3_CP_DMA_DST_SEL(x) ((x) << 20)
1556	/* 0 - SRC_ADDR	1556	/* 0 - DST_ADDR
1557	* 1 - GDS	1557	* 1 - GDS
1558	*/	1558	*/
1559	# define PACKET3_CP_DMA_ENGINE(x) ((x) << 27)	1559	# define PACKET3_CP_DMA_ENGINE(x) ((x) << 27)
@@ -1568,7 +1568,7 @@ · 8 unmodified lines
1568	# define PACKET3_CP_DMA_CP_SYNC (1 << 31)	1568	# define PACKET3_CP_DMA_CP_SYNC (1 << 31)
1569	/* COMMAND */	1569	/* COMMAND */
1570	# define PACKET3_CP_DMA_DIS_WC (1 << 21)	1570	# define PACKET3_CP_DMA_DIS_WC (1 << 21)
1571	# define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 23)	1571	# define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 22)
1572	/* 0 - none	1572	/* 0 - none
1573	* 1 - 8 in 16	1573	* 1 - 8 in 16
1574	* 2 - 8 in 32	1574	* 2 - 8 in 32

drivers/gpu/drm/radeon/trinity_dpm.c+1−1

@@ -1868,7 +1868,7 @@ int trinity_dpm_init(struct radeon_device *rdev) · 1867 unmodified lines
1868	for (i = 0; i < SUMO_MAX_HARDWARE_POWERLEVELS; i++)	1868	for (i = 0; i < SUMO_MAX_HARDWARE_POWERLEVELS; i++)
1869	pi->at[i] = TRINITY_AT_DFLT;	1869	pi->at[i] = TRINITY_AT_DFLT;
1870		1870
1871	pi->enable_bapm = true;	1871	pi->enable_bapm = false;
1872	pi->enable_nbps_policy = true;	1872	pi->enable_nbps_policy = true;
1873	pi->enable_sclk_ds = true;	1873	pi->enable_sclk_ds = true;
1874	pi->enable_gfx_power_gating = true;	1874	pi->enable_gfx_power_gating = true;

drivers/gpu/drm/radeon/uvd_v1_0.c+2−2

@@ -212,8 +212,8 @@ int uvd_v1_0_start(struct radeon_device *rdev) · 211 unmodified lines
212	/* enable VCPU clock */	212	/* enable VCPU clock */
213	WREG32(UVD_VCPU_CNTL, 1 << 9);	213	WREG32(UVD_VCPU_CNTL, 1 << 9);
214		214
215	/* enable UMC and NC0 */	215	/* enable UMC */
216	WREG32_P(UVD_LMI_CTRL2, 1 << 13, ~((1 << 8) \| (1 << 13)));	216	WREG32_P(UVD_LMI_CTRL2, 0, ~(1 << 8));
217		217
218	/* boot up the VCPU */	218	/* boot up the VCPU */
219	WREG32(UVD_SOFT_RESET, 0);	219	WREG32(UVD_SOFT_RESET, 0);

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c+12−5

@@ -740,9 +740,17 @@ static void vmw_postclose(struct drm_device *dev, · 739 unmodified lines
740	struct vmw_fpriv *vmw_fp;	740	struct vmw_fpriv *vmw_fp;
741		741
742	vmw_fp = vmw_fpriv(file_priv);	742	vmw_fp = vmw_fpriv(file_priv);
743	ttm_object_file_release(&vmw_fp->tfile);	743
744	if (vmw_fp->locked_master)	744	if (vmw_fp->locked_master) {
		745	struct vmw_master *vmaster =
		746	vmw_master(vmw_fp->locked_master);
		747
		748	ttm_lock_set_kill(&vmaster->lock, true, SIGTERM);
		749	ttm_vt_unlock(&vmaster->lock);
745	drm_master_put(&vmw_fp->locked_master);	750	drm_master_put(&vmw_fp->locked_master);
		751	}
		752
		753	ttm_object_file_release(&vmw_fp->tfile);
746	kfree(vmw_fp);	754	kfree(vmw_fp);
747	}	755	}
748		756
@@ -925,14 +933,13 @@ static void vmw_master_drop(struct drm_device *dev, · 176 unmodified lines
925		933
926	vmw_fp->locked_master = drm_master_get(file_priv->master);	934	vmw_fp->locked_master = drm_master_get(file_priv->master);
927	ret = ttm_vt_lock(&vmaster->lock, false, vmw_fp->tfile);	935	ret = ttm_vt_lock(&vmaster->lock, false, vmw_fp->tfile);
928	vmw_execbuf_release_pinned_bo(dev_priv);
929
930	if (unlikely((ret != 0))) {	936	if (unlikely((ret != 0))) {
931	DRM_ERROR("Unable to lock TTM at VT switch.\n");	937	DRM_ERROR("Unable to lock TTM at VT switch.\n");
932	drm_master_put(&vmw_fp->locked_master);	938	drm_master_put(&vmw_fp->locked_master);
933	}	939	}
934		940
935	ttm_lock_set_kill(&vmaster->lock, true, SIGTERM);	941	ttm_lock_set_kill(&vmaster->lock, false, SIGTERM);
		942	vmw_execbuf_release_pinned_bo(dev_priv);
936		943
937	if (!dev_priv->enable_fb) {	944	if (!dev_priv->enable_fb) {
938	ret = ttm_bo_evict_mm(&dev_priv->bdev, TTM_PL_VRAM);	945	ret = ttm_bo_evict_mm(&dev_priv->bdev, TTM_PL_VRAM);

drivers/gpu/drm/vmwgfx/vmwgfx_resource.c+1−1

@@ -970,7 +970,7 @@ void vmw_resource_unreserve(struct vmw_resource *res, · 969 unmodified lines
970	if (new_backup)	970	if (new_backup)
971	res->backup_offset = new_backup_offset;	971	res->backup_offset = new_backup_offset;
972		972
973	if (!res->func->may_evict)	973	if (!res->func->may_evict \|\| res->id == -1)
974	return;	974	return;
975		975
976	write_lock(&dev_priv->resource_lock);	976	write_lock(&dev_priv->resource_lock);

drivers/hid/Kconfig+1−0

@@ -241,6 +241,7 @@ config HID_HOLTEK · 240 unmodified lines
241	- Sharkoon Drakonia / Perixx MX-2000 gaming mice	241	- Sharkoon Drakonia / Perixx MX-2000 gaming mice
242	- Tracer Sniper TRM-503 / NOVA Gaming Slider X200 /	242	- Tracer Sniper TRM-503 / NOVA Gaming Slider X200 /
243	Zalman ZM-GM1	243	Zalman ZM-GM1
		244	- SHARKOON DarkGlider Gaming mouse
244		245
245	config HOLTEK_FF	246	config HOLTEK_FF
246	bool "Holtek On Line Grip force feedback support"	247	bool "Holtek On Line Grip force feedback support"

drivers/hid/hid-core.c+8−5

 static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)
 {
-	__u32 raw_value;
+	__s32 raw_value;
 	switch (item->tag) {
 	case HID_GLOBAL_ITEM_TAG_PUSH:
 		return 0;
 	case HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT:
-		/* Units exponent negative numbers are given through a
+		/* Many devices provide unit exponent as a two's complement
-		 * two's complement.
+		 * nibble due to the common misunderstanding of HID
-		 * See "6.2.2.7 Global Items" for more information. */
+		 * specification 1.11, 6.2.2.7 Global Items. Attempt to handle
-		raw_value = item_udata(item);
+		 * both this and the standard encoding. */
+		raw_value = item_sdata(item);
 		if (!(raw_value & 0xfffffff0))
 			parser->global.unit_exponent = hid_snto32(raw_value, 4);
 		else
 	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_580) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_JESS2, USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD) },
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ION, USB_DEVICE_ID_ICADE) },
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) },
+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO2, USB_DEVICE_ID_NINTENDO_WIIMOTE) },
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) },
 	{ }
 };

drivers/hid/hid-holtek-mouse.c+4−0

  * - USB ID 04d9:a067, sold as Sharkoon Drakonia and Perixx MX-2000
  * - USB ID 04d9:a04a, sold as Tracer Sniper TRM-503, NOVA Gaming Slider X200
  *   and Zalman ZM-GM1
+ * - USB ID 04d9:a081, sold as SHARKOON DarkGlider Gaming mouse
  */
 static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc,
 			}
 			break;
 		case USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A:
+		case USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081:
 			if (*rsize >= 113 && rdesc[106] == 0xff && rdesc[107] == 0x7f
 					&& rdesc[111] == 0xff && rdesc[112] == 0x7f) {
 				hid_info(hdev, "Fixing up report descriptor\n");
 			USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT,
 			USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT,
+			USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081) },
 	{ }
 };
 MODULE_DEVICE_TABLE(hid, holtek_mouse_devices);

drivers/hid/hid-ids.h+7−0

 #define USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD	0xa055
 #define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067	0xa067
 #define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A	0xa04a
+#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081	0xa081
 #define USB_VENDOR_ID_IMATION		0x0718
 #define USB_DEVICE_ID_DISC_STAKKA	0xd000
 #define USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN	0x0003
 #define USB_VENDOR_ID_NINTENDO		0x057e
+#define USB_VENDOR_ID_NINTENDO2		0x054c
 #define USB_DEVICE_ID_NINTENDO_WIIMOTE	0x0306
 #define USB_DEVICE_ID_NINTENDO_WIIMOTE2	0x0330
 #define USB_DEVICE_ID_SYNAPTICS_COMP_TP	0x0009
 #define USB_DEVICE_ID_SYNAPTICS_WTP	0x0010
 #define USB_DEVICE_ID_SYNAPTICS_DPAD	0x0013
+#define USB_DEVICE_ID_SYNAPTICS_LTS1	0x0af8
+#define USB_DEVICE_ID_SYNAPTICS_LTS2	0x1d10
 #define USB_VENDOR_ID_THINGM		0x27b8
 #define USB_DEVICE_ID_BLINK1		0x01ed
 #define USB_VENDOR_ID_PRIMAX	0x0461
 #define USB_DEVICE_ID_PRIMAX_KEYBOARD	0x4e05
+#define USB_VENDOR_ID_SIS	0x0457
+#define USB_DEVICE_ID_SIS_TS	0x1013
 #endif

drivers/hid/hid-input.c+4−9

 	return -EINVAL;
 }
 /**
  * hidinput_calc_abs_res - calculate an absolute axis resolution
  * @field: the HID report field to calculate resolution for
 	case ABS_MT_TOOL_Y:
 	case ABS_MT_TOUCH_MAJOR:
 	case ABS_MT_TOUCH_MINOR:
-		if (field->unit & 0xffffff00)		/* Not a length */
+		if (field->unit == 0x11) {		/* If centimeters */
-			return 0;
-		unit_exponent += hid_snto32(field->unit >> 4, 4) - 1;
-		switch (field->unit & 0xf) {
-		case 0x1:				/* If centimeters */
 			/* Convert to millimeters */
 			unit_exponent += 1;
-			break;
+		} else if (field->unit == 0x13) {	/* If inches */
-		case 0x3:				/* If inches */
 			/* Convert to millimeters */
 			prev = physical_extents;
 			physical_extents *= 254;
 			if (physical_extents < prev)
 				return 0;
 			unit_exponent -= 1;
-			break;
+		} else {
-		default:
 			return 0;
 		}
 		break;

drivers/hid/hid-roccat-kone.c+1−1

@@ -382,7 +382,7 @@ static ssize_t kone_sysfs_write_profilex(struct file *fp, · 381 unmodified lines
382	}	382	}
383	#define PROFILE_ATTR(number) \	383	#define PROFILE_ATTR(number) \
384	static struct bin_attribute bin_attr_profile##number = { \	384	static struct bin_attribute bin_attr_profile##number = { \
385	.attr = { .name = "profile##number", .mode = 0660 }, \	385	.attr = { .name = "profile" #number, .mode = 0660 }, \
386	.size = sizeof(struct kone_profile), \	386	.size = sizeof(struct kone_profile), \
387	.read = kone_sysfs_read_profilex, \	387	.read = kone_sysfs_read_profilex, \
388	.write = kone_sysfs_write_profilex, \	388	.write = kone_sysfs_write_profilex, \

drivers/hid/hid-roccat-koneplus.c+2−2

@@ -229,13 +229,13 @@ static ssize_t koneplus_sysfs_read_profilex_buttons(struct file *fp, · 228 unmodified lines
229		229
230	#define PROFILE_ATTR(number) \	230	#define PROFILE_ATTR(number) \
231	static struct bin_attribute bin_attr_profile##number##_settings = { \	231	static struct bin_attribute bin_attr_profile##number##_settings = { \
232	.attr = { .name = "profile##number##_settings", .mode = 0440 }, \	232	.attr = { .name = "profile" #number "_settings", .mode = 0440 }, \
233	.size = KONEPLUS_SIZE_PROFILE_SETTINGS, \	233	.size = KONEPLUS_SIZE_PROFILE_SETTINGS, \
234	.read = koneplus_sysfs_read_profilex_settings, \	234	.read = koneplus_sysfs_read_profilex_settings, \
235	.private = &profile_numbers[number-1], \	235	.private = &profile_numbers[number-1], \
236	}; \	236	}; \
237	static struct bin_attribute bin_attr_profile##number##_buttons = { \	237	static struct bin_attribute bin_attr_profile##number##_buttons = { \
238	.attr = { .name = "profile##number##_buttons", .mode = 0440 }, \	238	.attr = { .name = "profile" #number "_buttons", .mode = 0440 }, \
239	.size = KONEPLUS_SIZE_PROFILE_BUTTONS, \	239	.size = KONEPLUS_SIZE_PROFILE_BUTTONS, \
240	.read = koneplus_sysfs_read_profilex_buttons, \	240	.read = koneplus_sysfs_read_profilex_buttons, \
241	.private = &profile_numbers[number-1], \	241	.private = &profile_numbers[number-1], \

drivers/hid/hid-roccat-kovaplus.c+2−2

@@ -257,13 +257,13 @@ static ssize_t kovaplus_sysfs_read_profilex_buttons(struct file *fp, · 256 unmodified lines
257		257
258	#define PROFILE_ATTR(number) \	258	#define PROFILE_ATTR(number) \
259	static struct bin_attribute bin_attr_profile##number##_settings = { \	259	static struct bin_attribute bin_attr_profile##number##_settings = { \
260	.attr = { .name = "profile##number##_settings", .mode = 0440 }, \	260	.attr = { .name = "profile" #number "_settings", .mode = 0440 }, \
261	.size = KOVAPLUS_SIZE_PROFILE_SETTINGS, \	261	.size = KOVAPLUS_SIZE_PROFILE_SETTINGS, \
262	.read = kovaplus_sysfs_read_profilex_settings, \	262	.read = kovaplus_sysfs_read_profilex_settings, \
263	.private = &profile_numbers[number-1], \	263	.private = &profile_numbers[number-1], \
264	}; \	264	}; \
265	static struct bin_attribute bin_attr_profile##number##_buttons = { \	265	static struct bin_attribute bin_attr_profile##number##_buttons = { \
266	.attr = { .name = "profile##number##_buttons", .mode = 0440 }, \	266	.attr = { .name = "profile" #number "_buttons", .mode = 0440 }, \
267	.size = KOVAPLUS_SIZE_PROFILE_BUTTONS, \	267	.size = KOVAPLUS_SIZE_PROFILE_BUTTONS, \
268	.read = kovaplus_sysfs_read_profilex_buttons, \	268	.read = kovaplus_sysfs_read_profilex_buttons, \
269	.private = &profile_numbers[number-1], \	269	.private = &profile_numbers[number-1], \

drivers/hid/hid-roccat-pyra.c+2−2

@@ -225,13 +225,13 @@ static ssize_t pyra_sysfs_read_profilex_buttons(struct file *fp, · 224 unmodified lines
225		225
226	#define PROFILE_ATTR(number) \	226	#define PROFILE_ATTR(number) \
227	static struct bin_attribute bin_attr_profile##number##_settings = { \	227	static struct bin_attribute bin_attr_profile##number##_settings = { \
228	.attr = { .name = "profile##number##_settings", .mode = 0440 }, \	228	.attr = { .name = "profile" #number "_settings", .mode = 0440 }, \
229	.size = PYRA_SIZE_PROFILE_SETTINGS, \	229	.size = PYRA_SIZE_PROFILE_SETTINGS, \
230	.read = pyra_sysfs_read_profilex_settings, \	230	.read = pyra_sysfs_read_profilex_settings, \
231	.private = &profile_numbers[number-1], \	231	.private = &profile_numbers[number-1], \
232	}; \	232	}; \
233	static struct bin_attribute bin_attr_profile##number##_buttons = { \	233	static struct bin_attribute bin_attr_profile##number##_buttons = { \
234	.attr = { .name = "profile##number##_buttons", .mode = 0440 }, \	234	.attr = { .name = "profile" #number "_buttons", .mode = 0440 }, \
235	.size = PYRA_SIZE_PROFILE_BUTTONS, \	235	.size = PYRA_SIZE_PROFILE_BUTTONS, \
236	.read = pyra_sysfs_read_profilex_buttons, \	236	.read = pyra_sysfs_read_profilex_buttons, \
237	.private = &profile_numbers[number-1], \	237	.private = &profile_numbers[number-1], \

drivers/hid/hid-wiimote-core.c+4−1

 		goto done;
 	}
-	if (vendor == USB_VENDOR_ID_NINTENDO) {
+	if (vendor == USB_VENDOR_ID_NINTENDO ||
+	    vendor == USB_VENDOR_ID_NINTENDO2) {
 		if (product == USB_DEVICE_ID_NINTENDO_WIIMOTE) {
 			devtype = WIIMOTE_DEV_GEN10;
 			goto done;
 static const struct hid_device_id wiimote_hid_devices[] = {
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO,
 				USB_DEVICE_ID_NINTENDO_WIIMOTE) },
+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO2,
+				USB_DEVICE_ID_NINTENDO_WIIMOTE) },
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO,
 				USB_DEVICE_ID_NINTENDO_WIIMOTE2) },
 	{ }

drivers/hid/hid-wiimote-modules.c+29−11

  * the rumble motor, this flag shouldn't be set.
  */
+/* used by wiimod_rumble and wiipro_rumble */
+static void wiimod_rumble_worker(struct work_struct *work)
+{
+	struct wiimote_data *wdata = container_of(work, struct wiimote_data,
+						  rumble_worker);
+	spin_lock_irq(&wdata->state.lock);
+	wiiproto_req_rumble(wdata, wdata->state.cache_rumble);
+	spin_unlock_irq(&wdata->state.lock);
+}
 static int wiimod_rumble_play(struct input_dev *dev, void *data,
 			      struct ff_effect *eff)
 {
 	struct wiimote_data *wdata = input_get_drvdata(dev);
 	__u8 value;
-	unsigned long flags;
 	/*
 	 * The wiimote supports only a single rumble motor so if any magnitude
 	else
 		value = 0;
-	spin_lock_irqsave(&wdata->state.lock, flags);
+	/* Locking state.lock here might deadlock with input_event() calls.
-	wiiproto_req_rumble(wdata, value);
+	 * schedule_work acts as barrier. Merging multiple changes is fine. */
-	spin_unlock_irqrestore(&wdata->state.lock, flags);
+	wdata->state.cache_rumble = value;
+	schedule_work(&wdata->rumble_worker);
 	return 0;
 }
 static int wiimod_rumble_probe(const struct wiimod_ops *ops,
 			       struct wiimote_data *wdata)
 {
+	INIT_WORK(&wdata->rumble_worker, wiimod_rumble_worker);
 	set_bit(FF_RUMBLE, wdata->input->ffbit);
 	if (input_ff_create_memless(wdata->input, NULL, wiimod_rumble_play))
 		return -ENOMEM;
 {
 	unsigned long flags;
+	cancel_work_sync(&wdata->rumble_worker);
 	spin_lock_irqsave(&wdata->state.lock, flags);
 	wiiproto_req_rumble(wdata, 0);
 	spin_unlock_irqrestore(&wdata->state.lock, flags);
 {
 	struct wiimote_data *wdata = input_get_drvdata(dev);
 	__u8 value;
-	unsigned long flags;
 	/*
 	 * The wiimote supports only a single rumble motor so if any magnitude
 	else
 		value = 0;
-	spin_lock_irqsave(&wdata->state.lock, flags);
+	/* Locking state.lock here might deadlock with input_event() calls.
-	wiiproto_req_rumble(wdata, value);
+	 * schedule_work acts as barrier. Merging multiple changes is fine. */
-	spin_unlock_irqrestore(&wdata->state.lock, flags);
+	wdata->state.cache_rumble = value;
+	schedule_work(&wdata->rumble_worker);
 	return 0;
 }
 {
 	int ret, i;
+	INIT_WORK(&wdata->rumble_worker, wiimod_rumble_worker);
 	wdata->extension.input = input_allocate_device();
 	if (!wdata->extension.input)
 		return -ENOMEM;
 	if (!wdata->extension.input)
 		return;
+	input_unregister_device(wdata->extension.input);
+	wdata->extension.input = NULL;
+	cancel_work_sync(&wdata->rumble_worker);
 	spin_lock_irqsave(&wdata->state.lock, flags);
 	wiiproto_req_rumble(wdata, 0);
 	spin_unlock_irqrestore(&wdata->state.lock, flags);
-	input_unregister_device(wdata->extension.input);
-	wdata->extension.input = NULL;
 }
 static const struct wiimod_ops wiimod_pro = {

drivers/hid/hid-wiimote.h+3−1

 	__u8 *cmd_read_buf;
 	__u8 cmd_read_size;
-	/* calibration data */
+	/* calibration/cache data */
 	__u16 calib_bboard[4][3];
+	__u8 cache_rumble;
 };
 struct wiimote_data {
 	struct hid_device *hdev;
 	struct input_dev *input;
+	struct work_struct rumble_worker;
 	struct led_classdev *leds[4];
 	struct input_dev *accel;
 	struct input_dev *ir;

drivers/hid/hidraw.c+14−7

@@ -308,18 +308,25 @@ static int hidraw_fasync(int fd, struct file *file, int on) · 307 unmodified lines
308	static void drop_ref(struct hidraw *hidraw, int exists_bit)	308	static void drop_ref(struct hidraw *hidraw, int exists_bit)
309	{	309	{
310	if (exists_bit) {	310	if (exists_bit) {
311	hid_hw_close(hidraw->hid);
312	hidraw->exist = 0;	311	hidraw->exist = 0;
313	if (hidraw->open)	312	if (hidraw->open) {
		313	hid_hw_close(hidraw->hid);
314	wake_up_interruptible(&hidraw->wait);	314	wake_up_interruptible(&hidraw->wait);
		315	}
315	} else {	316	} else {
316	--hidraw->open;	317	--hidraw->open;
317	}	318	}
318		319	if (!hidraw->open) {
319	if (!hidraw->open && !hidraw->exist) {	320	if (!hidraw->exist) {
320	device_destroy(hidraw_class, MKDEV(hidraw_major, hidraw->minor));	321	device_destroy(hidraw_class,
321	hidraw_table[hidraw->minor] = NULL;	322	MKDEV(hidraw_major, hidraw->minor));
322	kfree(hidraw);	323	hidraw_table[hidraw->minor] = NULL;
		324	kfree(hidraw);
		325	} else {
		326	/* close device for last reader */
		327	hid_hw_power(hidraw->hid, PM_HINT_NORMAL);
		328	hid_hw_close(hidraw->hid);
		329	}
323	}	330	}
324	}	331	}
325		332

drivers/hid/uhid.c+2−1

 static struct miscdevice uhid_misc = {
 	.fops		= &uhid_fops,
-	.minor		= MISC_DYNAMIC_MINOR,
+	.minor		= UHID_MINOR,
 	.name		= UHID_NAME,
 };
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("David Herrmann <dh.herrmann@gmail.com>");
 MODULE_DESCRIPTION("User-space I/O driver support for HID subsystem");
+MODULE_ALIAS_MISCDEV(UHID_MINOR);
 MODULE_ALIAS("devname:" UHID_NAME);

drivers/hid/usbhid/hid-quirks.c+3−0

 	{ USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X, HID_QUIRK_MULTI_INPUT },
 	{ USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X, HID_QUIRK_MULTI_INPUT },
 	{ USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_DUOSENSE, HID_QUIRK_NO_INIT_REPORTS },
+	{ USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_LTS1, HID_QUIRK_NO_INIT_REPORTS },
+	{ USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_LTS2, HID_QUIRK_NO_INIT_REPORTS },
+	{ USB_VENDOR_ID_SIS, USB_DEVICE_ID_SIS_TS, HID_QUIRK_NO_INIT_REPORTS },
 	{ 0, 0 }
 };

drivers/hwmon/applesmc.c+13−0

 static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len)
 {
+	u8 status, data = 0;
 	int i;
 	if (send_command(cmd) || send_argument(key)) {
 		return -EIO;
 	}
+	/* This has no effect on newer (2012) SMCs */
 	if (send_byte(len, APPLESMC_DATA_PORT)) {
 		pr_warn("%.4s: read len fail\n", key);
 		return -EIO;
 		buffer[i] = inb(APPLESMC_DATA_PORT);
 	}
+	/* Read the data port until bit0 is cleared */
+	for (i = 0; i < 16; i++) {
+		udelay(APPLESMC_MIN_WAIT);
+		status = inb(APPLESMC_CMD_PORT);
+		if (!(status & 0x01))
+			break;
+		data = inb(APPLESMC_DATA_PORT);
+	}
+	if (i)
+		pr_warn("flushed %d bytes, last value is: %d\n", i, data);
 	return 0;
 }

drivers/i2c/busses/i2c-designware-platdrv.c+3−2

 MODULE_ALIAS("platform:i2c_designware");
 static struct platform_driver dw_i2c_driver = {
-	.remove		= dw_i2c_remove,
+	.probe = dw_i2c_probe,
+	.remove = dw_i2c_remove,
 	.driver		= {
 		.name	= "i2c_designware",
 		.owner	= THIS_MODULE,
 static int __init dw_i2c_init_driver(void)
 {
-	return platform_driver_probe(&dw_i2c_driver, dw_i2c_probe);
+	return platform_driver_register(&dw_i2c_driver);
 }
 subsys_initcall(dw_i2c_init_driver);

drivers/i2c/busses/i2c-imx.c+6−5

 	clk_disable_unprepare(i2c_imx->clk);
 }
-static void __init i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx,
+static void i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx,
 							unsigned int rate)
 {
 	struct imx_i2c_clk_pair *i2c_clk_div = i2c_imx->hwdata->clk_div;
 	.functionality	= i2c_imx_func,
 };
-static int __init i2c_imx_probe(struct platform_device *pdev)
+static int i2c_imx_probe(struct platform_device *pdev)
 {
 	const struct of_device_id *of_id = of_match_device(i2c_imx_dt_ids,
 							   &pdev->dev);
 	return 0;   /* Return OK */
 }
-static int __exit i2c_imx_remove(struct platform_device *pdev)
+static int i2c_imx_remove(struct platform_device *pdev)
 {
 	struct imx_i2c_struct *i2c_imx = platform_get_drvdata(pdev);
 }
 static struct platform_driver i2c_imx_driver = {
-	.remove		= __exit_p(i2c_imx_remove),
+	.probe = i2c_imx_probe,
+	.remove = i2c_imx_remove,
 	.driver	= {
 		.name	= DRIVER_NAME,
 		.owner	= THIS_MODULE,
 static int __init i2c_adap_imx_init(void)
 {
-	return platform_driver_probe(&i2c_imx_driver, i2c_imx_probe);
+	return platform_driver_register(&i2c_imx_driver);
 }
 subsys_initcall(i2c_adap_imx_init);

drivers/i2c/busses/i2c-mxs.c+2−1

 		   .owner = THIS_MODULE,
 		   .of_match_table = mxs_i2c_dt_ids,
 		   },
+	.probe = mxs_i2c_probe,
 	.remove = mxs_i2c_remove,
 };
 static int __init mxs_i2c_init(void)
 {
-	return platform_driver_probe(&mxs_i2c_driver, mxs_i2c_probe);
+	return platform_driver_register(&mxs_i2c_driver);
 }
 subsys_initcall(mxs_i2c_init);

drivers/i2c/busses/i2c-omap.c+3−0

 		/*
 		 * ProDB0017052: Clear ARDY bit twice
 		 */
+		if (stat & OMAP_I2C_STAT_ARDY)
+			omap_i2c_ack_stat(dev, OMAP_I2C_STAT_ARDY);
 		if (stat & (OMAP_I2C_STAT_ARDY | OMAP_I2C_STAT_NACK |
 					OMAP_I2C_STAT_AL)) {
 			omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_RRDY |

drivers/i2c/busses/i2c-stu300.c+5−6

 	.functionality	= stu300_func,
 };
-static int __init
+static int stu300_probe(struct platform_device *pdev)
-stu300_probe(struct platform_device *pdev)
 {
 	struct stu300_dev *dev;
 	struct i2c_adapter *adap;
 #define STU300_I2C_PM	NULL
 #endif
-static int __exit
+static int stu300_remove(struct platform_device *pdev)
-stu300_remove(struct platform_device *pdev)
 {
 	struct stu300_dev *dev = platform_get_drvdata(pdev);
 		.pm	= STU300_I2C_PM,
 		.of_match_table = stu300_dt_match,
 	},
-	.remove		= __exit_p(stu300_remove),
+	.probe = stu300_probe,
+	.remove = stu300_remove,
 };
 static int __init stu300_init(void)
 {
-	return platform_driver_probe(&stu300_i2c_driver, stu300_probe);
+	return platform_driver_register(&stu300_i2c_driver);
 }
 static void __exit stu300_exit(void)

drivers/i2c/i2c-core.c+3−0

@@ -1134,6 +1134,9 @@ static void acpi_i2c_register_devices(struct i2c_adapter *adap) · 1133 unmodified lines
1134	acpi_handle handle;	1134	acpi_handle handle;
1135	acpi_status status;	1135	acpi_status status;
1136		1136
		1137	if (!adap->dev.parent)
		1138	return;
		1139
1137	handle = ACPI_HANDLE(adap->dev.parent);	1140	handle = ACPI_HANDLE(adap->dev.parent);
1138	if (!handle)	1141	if (!handle)
1139	return;	1142	return;

drivers/i2c/muxes/i2c-arb-gpio-challenge.c+1−1

@@ -200,7 +200,7 @@ static int i2c_arbitrator_probe(struct platform_device *pdev) · 199 unmodified lines
200	arb->parent = of_find_i2c_adapter_by_node(parent_np);	200	arb->parent = of_find_i2c_adapter_by_node(parent_np);
201	if (!arb->parent) {	201	if (!arb->parent) {
202	dev_err(dev, "Cannot find parent bus\n");	202	dev_err(dev, "Cannot find parent bus\n");
203	return -EINVAL;	203	return -EPROBE_DEFER;
204	}	204	}
205		205
206	/* Actually add the mux adapter */	206	/* Actually add the mux adapter */

drivers/i2c/muxes/i2c-mux-gpio.c+9−5

 	struct device_node *adapter_np, *child;
 	struct i2c_adapter *adapter;
 	unsigned *values, *gpios;
-	int i = 0;
+	int i = 0, ret;
 	if (!np)
 		return -ENODEV;
 	adapter = of_find_i2c_adapter_by_node(adapter_np);
 	if (!adapter) {
 		dev_err(&pdev->dev, "Cannot find parent bus\n");
-		return -ENODEV;
+		return -EPROBE_DEFER;
 	}
 	mux->data.parent = i2c_adapter_id(adapter);
 	put_device(&adapter->dev);
 		return -ENOMEM;
 	}
-	for (i = 0; i < mux->data.n_gpios; i++)
+	for (i = 0; i < mux->data.n_gpios; i++) {
-		gpios[i] = of_get_named_gpio(np, "mux-gpios", i);
+		ret = of_get_named_gpio(np, "mux-gpios", i);
+		if (ret < 0)
+			return ret;
+		gpios[i] = ret;
+	}
 	mux->data.gpios = gpios;
 	if (!parent) {
 		dev_err(&pdev->dev, "Parent adapter (%d) not found\n",
 			mux->data.parent);
-		return -ENODEV;
+		return -EPROBE_DEFER;
 	}
 	mux->parent = parent;

drivers/i2c/muxes/i2c-mux-pinctrl.c+2−2

@@ -113,7 +113,7 @@ static int i2c_mux_pinctrl_parse_dt(struct i2c_mux_pinctrl *mux, · 112 unmodified lines
113	adapter = of_find_i2c_adapter_by_node(adapter_np);	113	adapter = of_find_i2c_adapter_by_node(adapter_np);
114	if (!adapter) {	114	if (!adapter) {
115	dev_err(mux->dev, "Cannot find parent bus\n");	115	dev_err(mux->dev, "Cannot find parent bus\n");
116	return -ENODEV;	116	return -EPROBE_DEFER;
117	}	117	}
118	mux->pdata->parent_bus_num = i2c_adapter_id(adapter);	118	mux->pdata->parent_bus_num = i2c_adapter_id(adapter);
119	put_device(&adapter->dev);	119	put_device(&adapter->dev);
@@ -211,7 +211,7 @@ static int i2c_mux_pinctrl_probe(struct platform_device *pdev) · 91 unmodified lines
211	if (!mux->parent) {	211	if (!mux->parent) {
212	dev_err(&pdev->dev, "Parent adapter (%d) not found\n",	212	dev_err(&pdev->dev, "Parent adapter (%d) not found\n",
213	mux->pdata->parent_bus_num);	213	mux->pdata->parent_bus_num);
214	ret = -ENODEV;	214	ret = -EPROBE_DEFER;
215	goto err;	215	goto err;
216	}	216	}
217		217

drivers/iio/amplifiers/ad8366.c+1−3

@@ -185,10 +185,8 @@ static int ad8366_remove(struct spi_device *spi) · 184 unmodified lines
185		185
186	iio_device_unregister(indio_dev);	186	iio_device_unregister(indio_dev);
187		187
188	if (!IS_ERR(reg)) {	188	if (!IS_ERR(reg))
189	regulator_disable(reg);	189	regulator_disable(reg);
190	regulator_put(reg);
191	}
192		190
193	return 0;	191	return 0;
194	}	192	}

drivers/iio/frequency/adf4350.c+4−2

@@ -525,8 +525,10 @@ static int adf4350_probe(struct spi_device *spi) · 524 unmodified lines
525	}	525	}
526		526
527	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));	527	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
528	if (indio_dev == NULL)	528	if (indio_dev == NULL) {
529	return -ENOMEM;	529	ret = -ENOMEM;
		530	goto error_disable_clk;
		531	}
530		532
531	st = iio_priv(indio_dev);	533	st = iio_priv(indio_dev);
532		534

drivers/iio/industrialio-buffer.c+3−0

@@ -477,6 +477,9 @@ void iio_disable_all_buffers(struct iio_dev *indio_dev) · 476 unmodified lines
477	indio_dev->currentmode = INDIO_DIRECT_MODE;	477	indio_dev->currentmode = INDIO_DIRECT_MODE;
478	if (indio_dev->setup_ops->postdisable)	478	if (indio_dev->setup_ops->postdisable)
479	indio_dev->setup_ops->postdisable(indio_dev);	479	indio_dev->setup_ops->postdisable(indio_dev);
		480
		481	if (indio_dev->available_scan_masks == NULL)
		482	kfree(indio_dev->active_scan_mask);
480	}	483	}
481		484
482	int iio_update_buffers(struct iio_dev *indio_dev,	485	int iio_update_buffers(struct iio_dev *indio_dev,

drivers/iio/industrialio-core.c+1−1

 		iio_device_unregister_trigger_consumer(indio_dev);
 	iio_device_unregister_eventset(indio_dev);
 	iio_device_unregister_sysfs(indio_dev);
-	iio_device_unregister_debugfs(indio_dev);
 	ida_simple_remove(&iio_ida, indio_dev->id);
 	kfree(indio_dev);
 	if (indio_dev->chrdev.dev)
 		cdev_del(&indio_dev->chrdev);
+	iio_device_unregister_debugfs(indio_dev);
 	iio_disable_all_buffers(indio_dev);

drivers/iio/magnetometer/st_magn_core.c+9−9

@@ -29,9 +29,9 @@ · 28 unmodified lines
29	#define ST_MAGN_NUMBER_DATA_CHANNELS 3	29	#define ST_MAGN_NUMBER_DATA_CHANNELS 3
30		30
31	/* DEFAULT VALUE FOR SENSORS */	31	/* DEFAULT VALUE FOR SENSORS */
32	#define ST_MAGN_DEFAULT_OUT_X_L_ADDR 0X04	32	#define ST_MAGN_DEFAULT_OUT_X_H_ADDR 0X03
33	#define ST_MAGN_DEFAULT_OUT_Y_L_ADDR 0X08	33	#define ST_MAGN_DEFAULT_OUT_Y_H_ADDR 0X07
34	#define ST_MAGN_DEFAULT_OUT_Z_L_ADDR 0X06	34	#define ST_MAGN_DEFAULT_OUT_Z_H_ADDR 0X05
35		35
36	/* FULLSCALE */	36	/* FULLSCALE */
37	#define ST_MAGN_FS_AVL_1300MG 1300	37	#define ST_MAGN_FS_AVL_1300MG 1300
@@ -117,16 +117,16 @@ · 79 unmodified lines
117	static const struct iio_chan_spec st_magn_16bit_channels[] = {	117	static const struct iio_chan_spec st_magn_16bit_channels[] = {
118	ST_SENSORS_LSM_CHANNELS(IIO_MAGN,	118	ST_SENSORS_LSM_CHANNELS(IIO_MAGN,
119	BIT(IIO_CHAN_INFO_RAW) \| BIT(IIO_CHAN_INFO_SCALE),	119	BIT(IIO_CHAN_INFO_RAW) \| BIT(IIO_CHAN_INFO_SCALE),
120	ST_SENSORS_SCAN_X, 1, IIO_MOD_X, 's', IIO_LE, 16, 16,	120	ST_SENSORS_SCAN_X, 1, IIO_MOD_X, 's', IIO_BE, 16, 16,
121	ST_MAGN_DEFAULT_OUT_X_L_ADDR),	121	ST_MAGN_DEFAULT_OUT_X_H_ADDR),
122	ST_SENSORS_LSM_CHANNELS(IIO_MAGN,	122	ST_SENSORS_LSM_CHANNELS(IIO_MAGN,
123	BIT(IIO_CHAN_INFO_RAW) \| BIT(IIO_CHAN_INFO_SCALE),	123	BIT(IIO_CHAN_INFO_RAW) \| BIT(IIO_CHAN_INFO_SCALE),
124	ST_SENSORS_SCAN_Y, 1, IIO_MOD_Y, 's', IIO_LE, 16, 16,	124	ST_SENSORS_SCAN_Y, 1, IIO_MOD_Y, 's', IIO_BE, 16, 16,
125	ST_MAGN_DEFAULT_OUT_Y_L_ADDR),	125	ST_MAGN_DEFAULT_OUT_Y_H_ADDR),
126	ST_SENSORS_LSM_CHANNELS(IIO_MAGN,	126	ST_SENSORS_LSM_CHANNELS(IIO_MAGN,
127	BIT(IIO_CHAN_INFO_RAW) \| BIT(IIO_CHAN_INFO_SCALE),	127	BIT(IIO_CHAN_INFO_RAW) \| BIT(IIO_CHAN_INFO_SCALE),
128	ST_SENSORS_SCAN_Z, 1, IIO_MOD_Z, 's', IIO_LE, 16, 16,	128	ST_SENSORS_SCAN_Z, 1, IIO_MOD_Z, 's', IIO_BE, 16, 16,
129	ST_MAGN_DEFAULT_OUT_Z_L_ADDR),	129	ST_MAGN_DEFAULT_OUT_Z_H_ADDR),
130	IIO_CHAN_SOFT_TIMESTAMP(3)	130	IIO_CHAN_SOFT_TIMESTAMP(3)
131	};	131	};
132		132

drivers/infiniband/Kconfig+11−0

@@ -31,6 +31,17 @@ config INFINIBAND_USER_ACCESS · 30 unmodified lines
31	libibverbs, libibcm and a hardware driver library from	31	libibverbs, libibcm and a hardware driver library from
32	<http://www.openfabrics.org/git/>.	32	<http://www.openfabrics.org/git/>.
33		33
		34	config INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
		35	bool "Experimental and unstable ABI for userspace access to flow steering verbs"
		36	depends on INFINIBAND_USER_ACCESS
		37	depends on STAGING
		38	---help---
		39	The final ABI for userspace access to flow steering verbs
		40	has not been defined. To use the current ABI, *WHICH WILL
		41	CHANGE IN THE FUTURE*, say Y here.
		42
		43	If unsure, say N.
		44
34	config INFINIBAND_USER_MEM	45	config INFINIBAND_USER_MEM
35	bool	46	bool
36	depends on INFINIBAND_USER_ACCESS != n	47	depends on INFINIBAND_USER_ACCESS != n

drivers/infiniband/core/uverbs.h+2−0

 IB_UVERBS_DECLARE_CMD(create_xsrq);
 IB_UVERBS_DECLARE_CMD(open_xrcd);
 IB_UVERBS_DECLARE_CMD(close_xrcd);
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
 IB_UVERBS_DECLARE_CMD(create_flow);
 IB_UVERBS_DECLARE_CMD(destroy_flow);
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 #endif /* UVERBS_H */

drivers/infiniband/core/uverbs_cmd.c+4−0

 static struct uverbs_lock_class ah_lock_class	= { .name = "AH-uobj" };
 static struct uverbs_lock_class srq_lock_class	= { .name = "SRQ-uobj" };
 static struct uverbs_lock_class xrcd_lock_class = { .name = "XRCD-uobj" };
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
 static struct uverbs_lock_class rule_lock_class = { .name = "RULE-uobj" };
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 #define INIT_UDATA(udata, ibuf, obuf, ilen, olen)			\
 	do {								\
 	return ret ? ret : in_len;
 }
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
 static int kern_spec_to_ib_spec(struct ib_kern_spec *kern_spec,
 				union ib_flow_spec *ib_spec)
 {
 	return ret ? ret : in_len;
 }
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 static int __uverbs_create_xsrq(struct ib_uverbs_file *file,
 				struct ib_uverbs_create_xsrq *cmd,

drivers/infiniband/core/uverbs_main.c+6−0

 	[IB_USER_VERBS_CMD_CLOSE_XRCD]		= ib_uverbs_close_xrcd,
 	[IB_USER_VERBS_CMD_CREATE_XSRQ]		= ib_uverbs_create_xsrq,
 	[IB_USER_VERBS_CMD_OPEN_QP]		= ib_uverbs_open_qp,
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
 	[IB_USER_VERBS_CMD_CREATE_FLOW]		= ib_uverbs_create_flow,
 	[IB_USER_VERBS_CMD_DESTROY_FLOW]	= ib_uverbs_destroy_flow
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 };
 static void ib_uverbs_add_one(struct ib_device *device);
 	if (!(file->device->ib_dev->uverbs_cmd_mask & (1ull << hdr.command)))
 		return -ENOSYS;
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
 	if (hdr.command >= IB_USER_VERBS_CMD_THRESHOLD) {
 		struct ib_uverbs_cmd_hdr_ex hdr_ex;
 						     (hdr_ex.out_words +
 						      hdr_ex.provider_out_words) * 4);
 	} else {
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 		if (hdr.in_words * 4 != count)
 			return -EINVAL;
 						     buf + sizeof(hdr),
 						     hdr.in_words * 4,
 						     hdr.out_words * 4);
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
 	}
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 }
 static int ib_uverbs_mmap(struct file *filp, struct vm_area_struct *vma)

drivers/infiniband/hw/amso1100/c2_ae.c+1−1

@@ -141,7 +141,7 @@ static const char *to_qp_state_str(int state) · 140 unmodified lines
141	return "C2_QP_STATE_ERROR";	141	return "C2_QP_STATE_ERROR";
142	default:	142	default:
143	return "<invalid QP state>";	143	return "<invalid QP state>";
144	};	144	}
145	}	145	}
146		146
147	void c2_ae_event(struct c2_dev *c2dev, u32 mq_index)	147	void c2_ae_event(struct c2_dev *c2dev, u32 mq_index)

drivers/infiniband/hw/mlx4/main.c+2−0

 		ibdev->ib_dev.create_flow	= mlx4_ib_create_flow;
 		ibdev->ib_dev.destroy_flow	= mlx4_ib_destroy_flow;
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
 		ibdev->ib_dev.uverbs_cmd_mask	|=
 			(1ull << IB_USER_VERBS_CMD_CREATE_FLOW) |
 			(1ull << IB_USER_VERBS_CMD_DESTROY_FLOW);
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 	}
 	mlx4_ib_alloc_eqs(dev, ibdev);

drivers/infiniband/hw/mlx5/main.c+10−6

 static int alloc_comp_eqs(struct mlx5_ib_dev *dev)
 {
 	struct mlx5_eq_table *table = &dev->mdev.priv.eq_table;
+	char name[MLX5_MAX_EQ_NAME];
 	struct mlx5_eq *eq, *n;
 	int ncomp_vec;
 	int nent;
 			goto clean;
 		}
-		snprintf(eq->name, MLX5_MAX_EQ_NAME, "mlx5_comp%d", i);
+		snprintf(name, MLX5_MAX_EQ_NAME, "mlx5_comp%d", i);
 		err = mlx5_create_map_eq(&dev->mdev, eq,
 					 i + MLX5_EQ_VEC_COMP_BASE, nent, 0,
-					 eq->name,
+					 name, &dev->mdev.priv.uuari.uars[0]);
-					 &dev->mdev.priv.uuari.uars[0]);
 		if (err) {
 			kfree(eq);
 			goto clean;
 	props->max_srq_sge	   = max_rq_sg - 1;
 	props->max_fast_reg_page_list_len = (unsigned int)-1;
 	props->local_ca_ack_delay  = dev->mdev.caps.local_ca_ack_delay;
-	props->atomic_cap	   = dev->mdev.caps.flags & MLX5_DEV_CAP_FLAG_ATOMIC ?
+	props->atomic_cap	   = IB_ATOMIC_NONE;
-		IB_ATOMIC_HCA : IB_ATOMIC_NONE;
+	props->masked_atomic_cap   = IB_ATOMIC_NONE;
-	props->masked_atomic_cap   = IB_ATOMIC_HCA;
 	props->max_pkeys	   = be16_to_cpup((__be16 *)(out_mad->data + 28));
 	props->max_mcast_grp	   = 1 << dev->mdev.caps.log_max_mcg;
 	props->max_mcast_qp_attach = dev->mdev.caps.max_qp_mcg;
 	ibev.device	      = &ibdev->ib_dev;
 	ibev.element.port_num = port;
+	if (port < 1 || port > ibdev->num_ports) {
+		mlx5_ib_warn(ibdev, "warning: event on port %d\n", port);
+		return;
+	}
 	if (ibdev->ib_active)
 		ib_dispatch_event(&ibev);
 }

drivers/infiniband/hw/mlx5/mr.c+33−37

 	DEF_CACHE_SIZE	= 10,
 };
+enum {
+	MLX5_UMR_ALIGN	= 2048
+};
 static __be64 *mr_align(__be64 *ptr, int align)
 {
 	unsigned long mask = align - 1;
 static int add_keys(struct mlx5_ib_dev *dev, int c, int num)
 {
-	struct device *ddev = dev->ib_dev.dma_device;
 	struct mlx5_mr_cache *cache = &dev->cache;
 	struct mlx5_cache_ent *ent = &cache->ent[c];
 	struct mlx5_create_mkey_mbox_in *in;
 	struct mlx5_ib_mr *mr;
 	int npages = 1 << ent->order;
-	int size = sizeof(u64) * npages;
 	int err = 0;
 	int i;
 		}
 		mr->order = ent->order;
 		mr->umred = 1;
-		mr->pas = kmalloc(size + 0x3f, GFP_KERNEL);
-		if (!mr->pas) {
-			kfree(mr);
-			err = -ENOMEM;
-			goto out;
-		}
-		mr->dma = dma_map_single(ddev, mr_align(mr->pas, 0x40), size,
-					 DMA_TO_DEVICE);
-		if (dma_mapping_error(ddev, mr->dma)) {
-			kfree(mr->pas);
-			kfree(mr);
-			err = -ENOMEM;
-			goto out;
-		}
 		in->seg.status = 1 << 6;
 		in->seg.xlt_oct_size = cpu_to_be32((npages + 1) / 2);
 		in->seg.qpn_mkey7_0 = cpu_to_be32(0xffffff << 8);
 					    sizeof(*in));
 		if (err) {
 			mlx5_ib_warn(dev, "create mkey failed %d\n", err);
-			dma_unmap_single(ddev, mr->dma, size, DMA_TO_DEVICE);
-			kfree(mr->pas);
 			kfree(mr);
 			goto out;
 		}
 static void remove_keys(struct mlx5_ib_dev *dev, int c, int num)
 {
-	struct device *ddev = dev->ib_dev.dma_device;
 	struct mlx5_mr_cache *cache = &dev->cache;
 	struct mlx5_cache_ent *ent = &cache->ent[c];
 	struct mlx5_ib_mr *mr;
-	int size;
 	int err;
 	int i;
 		ent->size--;
 		spin_unlock(&ent->lock);
 		err = mlx5_core_destroy_mkey(&dev->mdev, &mr->mmr);
-		if (err) {
+		if (err)
 			mlx5_ib_warn(dev, "failed destroy mkey\n");
-		} else {
+		else
-			size = ALIGN(sizeof(u64) * (1 << mr->order), 0x40);
-			dma_unmap_single(ddev, mr->dma, size, DMA_TO_DEVICE);
-			kfree(mr->pas);
 			kfree(mr);
-		}
 	}
 }
 static void clean_keys(struct mlx5_ib_dev *dev, int c)
 {
-	struct device *ddev = dev->ib_dev.dma_device;
 	struct mlx5_mr_cache *cache = &dev->cache;
 	struct mlx5_cache_ent *ent = &cache->ent[c];
 	struct mlx5_ib_mr *mr;
-	int size;
 	int err;
+	cancel_delayed_work(&ent->dwork);
 	while (1) {
 		spin_lock(&ent->lock);
 		if (list_empty(&ent->head)) {
 		ent->size--;
 		spin_unlock(&ent->lock);
 		err = mlx5_core_destroy_mkey(&dev->mdev, &mr->mmr);
-		if (err) {
+		if (err)
 			mlx5_ib_warn(dev, "failed destroy mkey\n");
-		} else {
+		else
-			size = ALIGN(sizeof(u64) * (1 << mr->order), 0x40);
-			dma_unmap_single(ddev, mr->dma, size, DMA_TO_DEVICE);
-			kfree(mr->pas);
 			kfree(mr);
-		}
 	}
 }
 	int i;
 	dev->cache.stopped = 1;
-	destroy_workqueue(dev->cache.wq);
+	flush_workqueue(dev->cache.wq);
 	mlx5_mr_cache_debugfs_cleanup(dev);
 	for (i = 0; i < MAX_MR_CACHE_ENTRIES; i++)
 		clean_keys(dev, i);
+	destroy_workqueue(dev->cache.wq);
 	return 0;
 }
 				  int page_shift, int order, int access_flags)
 {
 	struct mlx5_ib_dev *dev = to_mdev(pd->device);
+	struct device *ddev = dev->ib_dev.dma_device;
 	struct umr_common *umrc = &dev->umrc;
 	struct ib_send_wr wr, *bad;
 	struct mlx5_ib_mr *mr;
 	struct ib_sge sg;
+	int size = sizeof(u64) * npages;
 	int err;
 	int i;
 	if (!mr)
 		return ERR_PTR(-EAGAIN);
-	mlx5_ib_populate_pas(dev, umem, page_shift, mr_align(mr->pas, 0x40), 1);
+	mr->pas = kmalloc(size + MLX5_UMR_ALIGN - 1, GFP_KERNEL);
+	if (!mr->pas) {
+		err = -ENOMEM;
+		goto error;
+	}
+	mlx5_ib_populate_pas(dev, umem, page_shift,
+			     mr_align(mr->pas, MLX5_UMR_ALIGN), 1);
+	mr->dma = dma_map_single(ddev, mr_align(mr->pas, MLX5_UMR_ALIGN), size,
+				 DMA_TO_DEVICE);
+	if (dma_mapping_error(ddev, mr->dma)) {
+		kfree(mr->pas);
+		err = -ENOMEM;
+		goto error;
+	}
 	memset(&wr, 0, sizeof(wr));
 	wr.wr_id = (u64)(unsigned long)mr;
 	wait_for_completion(&mr->done);
 	up(&umrc->sem);
+	dma_unmap_single(ddev, mr->dma, size, DMA_TO_DEVICE);
+	kfree(mr->pas);
 	if (mr->status != IB_WC_SUCCESS) {
 		mlx5_ib_warn(dev, "reg umr failed\n");
 		err = -EFAULT;

drivers/infiniband/hw/mlx5/qp.c+30−50

@@ -203,7 +203,7 @@ static int sq_overhead(enum ib_qp_type qp_type) · 202 unmodified lines
203		203
204	switch (qp_type) {	204	switch (qp_type) {
205	case IB_QPT_XRC_INI:	205	case IB_QPT_XRC_INI:
206	size = sizeof(struct mlx5_wqe_xrc_seg);	206	size += sizeof(struct mlx5_wqe_xrc_seg);
207	/* fall through */	207	/* fall through */
208	case IB_QPT_RC:	208	case IB_QPT_RC:
209	size += sizeof(struct mlx5_wqe_ctrl_seg) +	209	size += sizeof(struct mlx5_wqe_ctrl_seg) +
@@ -211,20 +211,23 @@ static int sq_overhead(enum ib_qp_type qp_type) · 1 unmodified line
211	sizeof(struct mlx5_wqe_raddr_seg);	211	sizeof(struct mlx5_wqe_raddr_seg);
212	break;	212	break;
213		213
		214	case IB_QPT_XRC_TGT:
		215	return 0;
		216
214	case IB_QPT_UC:	217	case IB_QPT_UC:
215	size = sizeof(struct mlx5_wqe_ctrl_seg) +	218	size += sizeof(struct mlx5_wqe_ctrl_seg) +
216	sizeof(struct mlx5_wqe_raddr_seg);	219	sizeof(struct mlx5_wqe_raddr_seg);
217	break;	220	break;
218		221
219	case IB_QPT_UD:	222	case IB_QPT_UD:
220	case IB_QPT_SMI:	223	case IB_QPT_SMI:
221	case IB_QPT_GSI:	224	case IB_QPT_GSI:
222	size = sizeof(struct mlx5_wqe_ctrl_seg) +	225	size += sizeof(struct mlx5_wqe_ctrl_seg) +
223	sizeof(struct mlx5_wqe_datagram_seg);	226	sizeof(struct mlx5_wqe_datagram_seg);
224	break;	227	break;
225		228
226	case MLX5_IB_QPT_REG_UMR:	229	case MLX5_IB_QPT_REG_UMR:
227	size = sizeof(struct mlx5_wqe_ctrl_seg) +	230	size += sizeof(struct mlx5_wqe_ctrl_seg) +
228	sizeof(struct mlx5_wqe_umr_ctrl_seg) +	231	sizeof(struct mlx5_wqe_umr_ctrl_seg) +
229	sizeof(struct mlx5_mkey_seg);	232	sizeof(struct mlx5_mkey_seg);
230	break;	233	break;
@@ -270,7 +273,8 @@ static int calc_sq_size(struct mlx5_ib_dev dev, struct ib_qp_init_attr attr, · 39 unmodified lines
270	return wqe_size;	273	return wqe_size;
271		274
272	if (wqe_size > dev->mdev.caps.max_sq_desc_sz) {	275	if (wqe_size > dev->mdev.caps.max_sq_desc_sz) {
273	mlx5_ib_dbg(dev, "\n");	276	mlx5_ib_dbg(dev, "wqe_size(%d) > max_sq_desc_sz(%d)\n",
		277	wqe_size, dev->mdev.caps.max_sq_desc_sz);
274	return -EINVAL;	278	return -EINVAL;
275	}	279	}
276		280
@@ -280,9 +284,15 @@ static int calc_sq_size(struct mlx5_ib_dev dev, struct ib_qp_init_attr attr, · 3 unmodified lines
280		284
281	wq_size = roundup_pow_of_two(attr->cap.max_send_wr * wqe_size);	285	wq_size = roundup_pow_of_two(attr->cap.max_send_wr * wqe_size);
282	qp->sq.wqe_cnt = wq_size / MLX5_SEND_WQE_BB;	286	qp->sq.wqe_cnt = wq_size / MLX5_SEND_WQE_BB;
		287	if (qp->sq.wqe_cnt > dev->mdev.caps.max_wqes) {
		288	mlx5_ib_dbg(dev, "wqe count(%d) exceeds limits(%d)\n",
		289	qp->sq.wqe_cnt, dev->mdev.caps.max_wqes);
		290	return -ENOMEM;
		291	}
283	qp->sq.wqe_shift = ilog2(MLX5_SEND_WQE_BB);	292	qp->sq.wqe_shift = ilog2(MLX5_SEND_WQE_BB);
284	qp->sq.max_gs = attr->cap.max_send_sge;	293	qp->sq.max_gs = attr->cap.max_send_sge;
285	qp->sq.max_post = 1 << ilog2(wq_size / wqe_size);	294	qp->sq.max_post = wq_size / wqe_size;
		295	attr->cap.max_send_wr = qp->sq.max_post;
286		296
287	return wq_size;	297	return wq_size;
288	}	298	}
@@ -1280,6 +1290,11 @@ static enum mlx5_qp_optpar opt_mask[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE][MLX5_Q · 991 unmodified lines
1280	MLX5_QP_OPTPAR_Q_KEY,	1290	MLX5_QP_OPTPAR_Q_KEY,
1281	[MLX5_QP_ST_MLX] = MLX5_QP_OPTPAR_PKEY_INDEX \|	1291	[MLX5_QP_ST_MLX] = MLX5_QP_OPTPAR_PKEY_INDEX \|
1282	MLX5_QP_OPTPAR_Q_KEY,	1292	MLX5_QP_OPTPAR_Q_KEY,
		1293	[MLX5_QP_ST_XRC] = MLX5_QP_OPTPAR_ALT_ADDR_PATH \|
		1294	MLX5_QP_OPTPAR_RRE \|
		1295	MLX5_QP_OPTPAR_RAE \|
		1296	MLX5_QP_OPTPAR_RWE \|
		1297	MLX5_QP_OPTPAR_PKEY_INDEX,
1283	},	1298	},
1284	},	1299	},
1285	[MLX5_QP_STATE_RTR] = {	1300	[MLX5_QP_STATE_RTR] = {
@@ -1314,6 +1329,11 @@ static enum mlx5_qp_optpar opt_mask[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE][MLX5_Q · 28 unmodified lines
1314	[MLX5_QP_STATE_RTS] = {	1329	[MLX5_QP_STATE_RTS] = {
1315	[MLX5_QP_ST_UD] = MLX5_QP_OPTPAR_Q_KEY,	1330	[MLX5_QP_ST_UD] = MLX5_QP_OPTPAR_Q_KEY,
1316	[MLX5_QP_ST_MLX] = MLX5_QP_OPTPAR_Q_KEY,	1331	[MLX5_QP_ST_MLX] = MLX5_QP_OPTPAR_Q_KEY,
		1332	[MLX5_QP_ST_UC] = MLX5_QP_OPTPAR_RWE,
		1333	[MLX5_QP_ST_RC] = MLX5_QP_OPTPAR_RNR_TIMEOUT \|
		1334	MLX5_QP_OPTPAR_RWE \|
		1335	MLX5_QP_OPTPAR_RAE \|
		1336	MLX5_QP_OPTPAR_RRE,
1317	},	1337	},
1318	},	1338	},
1319	};	1339	};
@@ -1651,29 +1671,6 @@ static __always_inline void set_raddr_seg(struct mlx5_wqe_raddr_seg *rseg, · 331 unmodified lines
1651	rseg->reserved = 0;	1671	rseg->reserved = 0;
1652	}	1672	}
1653		1673
1654	static void set_atomic_seg(struct mlx5_wqe_atomic_seg aseg, struct ib_send_wr wr)
1655	{
1656	if (wr->opcode == IB_WR_ATOMIC_CMP_AND_SWP) {
1657	aseg->swap_add = cpu_to_be64(wr->wr.atomic.swap);
1658	aseg->compare = cpu_to_be64(wr->wr.atomic.compare_add);
1659	} else if (wr->opcode == IB_WR_MASKED_ATOMIC_FETCH_AND_ADD) {
1660	aseg->swap_add = cpu_to_be64(wr->wr.atomic.compare_add);
1661	aseg->compare = cpu_to_be64(wr->wr.atomic.compare_add_mask);
1662	} else {
1663	aseg->swap_add = cpu_to_be64(wr->wr.atomic.compare_add);
1664	aseg->compare = 0;
1665	}
1666	}
1667
1668	static void set_masked_atomic_seg(struct mlx5_wqe_masked_atomic_seg *aseg,
1669	struct ib_send_wr *wr)
1670	{
1671	aseg->swap_add = cpu_to_be64(wr->wr.atomic.swap);
1672	aseg->swap_add_mask = cpu_to_be64(wr->wr.atomic.swap_mask);
1673	aseg->compare = cpu_to_be64(wr->wr.atomic.compare_add);
1674	aseg->compare_mask = cpu_to_be64(wr->wr.atomic.compare_add_mask);
1675	}
1676
1677	static void set_datagram_seg(struct mlx5_wqe_datagram_seg *dseg,	1674	static void set_datagram_seg(struct mlx5_wqe_datagram_seg *dseg,
1678	struct ib_send_wr *wr)	1675	struct ib_send_wr *wr)
1679	{	1676	{
@@ -2063,28 +2060,11 @@ int mlx5_ib_post_send(struct ib_qp ibqp, struct ib_send_wr wr, · 383 unmodified lines
2063		2060
2064	case IB_WR_ATOMIC_CMP_AND_SWP:	2061	case IB_WR_ATOMIC_CMP_AND_SWP:
2065	case IB_WR_ATOMIC_FETCH_AND_ADD:	2062	case IB_WR_ATOMIC_FETCH_AND_ADD:
2066	set_raddr_seg(seg, wr->wr.atomic.remote_addr,
2067	wr->wr.atomic.rkey);
2068	seg += sizeof(struct mlx5_wqe_raddr_seg);
2069
2070	set_atomic_seg(seg, wr);
2071	seg += sizeof(struct mlx5_wqe_atomic_seg);
2072
2073	size += (sizeof(struct mlx5_wqe_raddr_seg) +
2074	sizeof(struct mlx5_wqe_atomic_seg)) / 16;
2075	break;
2076
2077	case IB_WR_MASKED_ATOMIC_CMP_AND_SWP:	2063	case IB_WR_MASKED_ATOMIC_CMP_AND_SWP:
2078	set_raddr_seg(seg, wr->wr.atomic.remote_addr,	2064	mlx5_ib_warn(dev, "Atomic operations are not supported yet\n");
2079	wr->wr.atomic.rkey);	2065	err = -ENOSYS;
2080	seg += sizeof(struct mlx5_wqe_raddr_seg);	2066	*bad_wr = wr;
2081		2067	goto out;
2082	set_masked_atomic_seg(seg, wr);
2083	seg += sizeof(struct mlx5_wqe_masked_atomic_seg);
2084
2085	size += (sizeof(struct mlx5_wqe_raddr_seg) +
2086	sizeof(struct mlx5_wqe_masked_atomic_seg)) / 16;
2087	break;
2088		2068
2089	case IB_WR_LOCAL_INV:	2069	case IB_WR_LOCAL_INV:
2090	next_fence = MLX5_FENCE_MODE_INITIATOR_SMALL;	2070	next_fence = MLX5_FENCE_MODE_INITIATOR_SMALL;

drivers/infiniband/hw/mlx5/srq.c+3−1

 	mlx5_vfree(in);
 	if (err) {
 		mlx5_ib_dbg(dev, "create SRQ failed, err %d\n", err);
-		goto err_srq;
+		goto err_usr_kern_srq;
 	}
 	mlx5_ib_dbg(dev, "create SRQ with srqn 0x%x\n", srq->msrq.srqn);
 err_core:
 	mlx5_core_destroy_srq(&dev->mdev, &srq->msrq);
+err_usr_kern_srq:
 	if (pd->uobject)
 		destroy_srq_user(pd, srq);
 	else

drivers/infiniband/hw/mthca/mthca_eq.c+1−1

@@ -357,7 +357,7 @@ static int mthca_eq_int(struct mthca_dev dev, struct mthca_eq eq) · 356 unmodified lines
357	mthca_warn(dev, "Unhandled event %02x(%02x) on EQ %d\n",	357	mthca_warn(dev, "Unhandled event %02x(%02x) on EQ %d\n",
358	eqe->type, eqe->subtype, eq->eqn);	358	eqe->type, eqe->subtype, eq->eqn);
359	break;	359	break;
360	};	360	}
361		361
362	set_eqe_hw(eqe);	362	set_eqe_hw(eqe);
363	++eq->cons_index;	363	++eq->cons_index;

drivers/infiniband/hw/ocrdma/ocrdma_hw.c+3−3

@@ -150,7 +150,7 @@ enum ib_qp_state get_ibqp_state(enum ocrdma_qp_state qps) · 149 unmodified lines
150	return IB_QPS_SQE;	150	return IB_QPS_SQE;
151	case OCRDMA_QPS_ERR:	151	case OCRDMA_QPS_ERR:
152	return IB_QPS_ERR;	152	return IB_QPS_ERR;
153	};	153	}
154	return IB_QPS_ERR;	154	return IB_QPS_ERR;
155	}	155	}
156		156
@@ -171,7 +171,7 @@ static enum ocrdma_qp_state get_ocrdma_qp_state(enum ib_qp_state qps) · 14 unmodified lines
171	return OCRDMA_QPS_SQE;	171	return OCRDMA_QPS_SQE;
172	case IB_QPS_ERR:	172	case IB_QPS_ERR:
173	return OCRDMA_QPS_ERR;	173	return OCRDMA_QPS_ERR;
174	};	174	}
175	return OCRDMA_QPS_ERR;	175	return OCRDMA_QPS_ERR;
176	}	176	}
177		177
@@ -1982,7 +1982,7 @@ int ocrdma_mbx_create_qp(struct ocrdma_qp qp, struct ib_qp_init_attr attrs, · 1804 unmodified lines
1982	break;	1982	break;
1983	default:	1983	default:
1984	return -EINVAL;	1984	return -EINVAL;
1985	};	1985	}
1986		1986
1987	cmd = ocrdma_init_emb_mqe(OCRDMA_CMD_CREATE_QP, sizeof(*cmd));	1987	cmd = ocrdma_init_emb_mqe(OCRDMA_CMD_CREATE_QP, sizeof(*cmd));
1988	if (!cmd)	1988	if (!cmd)

drivers/infiniband/hw/ocrdma/ocrdma_main.c+1−1

@@ -531,7 +531,7 @@ static void ocrdma_event_handler(struct ocrdma_dev *dev, u32 event) · 530 unmodified lines
531	case BE_DEV_DOWN:	531	case BE_DEV_DOWN:
532	ocrdma_close(dev);	532	ocrdma_close(dev);
533	break;	533	break;
534	};	534	}
535	}	535	}
536		536
537	static struct ocrdma_driver ocrdma_drv = {	537	static struct ocrdma_driver ocrdma_drv = {

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c+3−3

@@ -141,7 +141,7 @@ static inline void get_link_speed_and_width(struct ocrdma_dev *dev, · 140 unmodified lines
141	/* Unsupported */	141	/* Unsupported */
142	*ib_speed = IB_SPEED_SDR;	142	*ib_speed = IB_SPEED_SDR;
143	*ib_width = IB_WIDTH_1X;	143	*ib_width = IB_WIDTH_1X;
144	};	144	}
145	}	145	}
146		146
147		147
@@ -2331,7 +2331,7 @@ static enum ib_wc_status ocrdma_to_ibwc_err(u16 status) · 2183 unmodified lines
2331	default:	2331	default:
2332	ibwc_status = IB_WC_GENERAL_ERR;	2332	ibwc_status = IB_WC_GENERAL_ERR;
2333	break;	2333	break;
2334	};	2334	}
2335	return ibwc_status;	2335	return ibwc_status;
2336	}	2336	}
2337		2337
@@ -2370,7 +2370,7 @@ static void ocrdma_update_wc(struct ocrdma_qp qp, struct ib_wc ibwc, · 32 unmodified lines
2370	pr_err("%s() invalid opcode received = 0x%x\n",	2370	pr_err("%s() invalid opcode received = 0x%x\n",
2371	__func__, hdr->cw & OCRDMA_WQE_OPCODE_MASK);	2371	__func__, hdr->cw & OCRDMA_WQE_OPCODE_MASK);
2372	break;	2372	break;
2373	};	2373	}
2374	}	2374	}
2375		2375
2376	static void ocrdma_set_cqe_status_flushed(struct ocrdma_qp *qp,	2376	static void ocrdma_set_cqe_status_flushed(struct ocrdma_qp *qp,

drivers/infiniband/ulp/srpt/ib_srpt.c+6−8

 	int resp_data_len;
 	int resp_len;
-	resp_data_len = (rsp_code == SRP_TSK_MGMT_SUCCESS) ? 0 : 4;
+	resp_data_len = 4;
 	resp_len = sizeof(*srp_rsp) + resp_data_len;
 	srp_rsp = ioctx->ioctx.buf;
 				    + atomic_xchg(&ch->req_lim_delta, 0));
 	srp_rsp->tag = tag;
-	if (rsp_code != SRP_TSK_MGMT_SUCCESS) {
+	srp_rsp->flags |= SRP_RSP_FLAG_RSPVALID;
-		srp_rsp->flags |= SRP_RSP_FLAG_RSPVALID;
+	srp_rsp->resp_data_len = cpu_to_be32(resp_data_len);
-		srp_rsp->resp_data_len = cpu_to_be32(resp_data_len);
+	srp_rsp->data[3] = rsp_code;
-		srp_rsp->data[3] = rsp_code;
-	}
 	return resp_len;
 }
 	transport_deregister_session(se_sess);
 	ch->sess = NULL;
+	ib_destroy_cm_id(ch->cm_id);
 	srpt_destroy_ch_ib(ch);
 	srpt_free_ioctx_ring((struct srpt_ioctx **)ch->ioctx_ring,
 	list_del(&ch->list);
 	spin_unlock_irq(&sdev->spinlock);
-	ib_destroy_cm_id(ch->cm_id);
 	if (ch->release_done)
 		complete(ch->release_done);

drivers/iommu/Kconfig+1−1

@@ -52,7 +52,7 @@ config AMD_IOMMU · 51 unmodified lines
52	select PCI_PRI	52	select PCI_PRI
53	select PCI_PASID	53	select PCI_PASID
54	select IOMMU_API	54	select IOMMU_API
55	depends on X86_64 && PCI && ACPI && X86_IO_APIC	55	depends on X86_64 && PCI && ACPI
56	---help---	56	---help---
57	With this option you can enable support for AMD IOMMU hardware in	57	With this option you can enable support for AMD IOMMU hardware in
58	your system. An IOMMU is a hardware component which provides	58	your system. An IOMMU is a hardware component which provides

drivers/iommu/arm-smmu.c+7−6

 	u32				cbar;
 	pgd_t				*pgd;
 };
+#define INVALID_IRPTNDX			0xff
 #define ARM_SMMU_CB_ASID(cfg)		((cfg)->cbndx)
 #define ARM_SMMU_CB_VMID(cfg)		((cfg)->cbndx + 1)
 	if (IS_ERR_VALUE(ret)) {
 		dev_err(smmu->dev, "failed to request context IRQ %d (%u)\n",
 			root_cfg->irptndx, irq);
-		root_cfg->irptndx = -1;
+		root_cfg->irptndx = INVALID_IRPTNDX;
 		goto out_free_context;
 	}
 	writel_relaxed(0, cb_base + ARM_SMMU_CB_SCTLR);
 	arm_smmu_tlb_inv_context(root_cfg);
-	if (root_cfg->irptndx != -1) {
+	if (root_cfg->irptndx != INVALID_IRPTNDX) {
 		irq = smmu->irqs[smmu->num_global_irqs + root_cfg->irptndx];
 		free_irq(irq, domain);
 	}
 		goto out_put_parent;
 	}
-	arm_smmu_device_reset(smmu);
 	for (i = 0; i < smmu->num_global_irqs; ++i) {
 		err = request_irq(smmu->irqs[i],
 				  arm_smmu_global_fault,
 	spin_lock(&arm_smmu_devices_lock);
 	list_add(&smmu->list, &arm_smmu_devices);
 	spin_unlock(&arm_smmu_devices_lock);
+	arm_smmu_device_reset(smmu);
 	return 0;
 out_free_irqs:
 		return ret;
 	/* Oh, for a proper bus abstraction */
-	if (!iommu_present(&platform_bus_type));
+	if (!iommu_present(&platform_bus_type))
 		bus_set_iommu(&platform_bus_type, &arm_smmu_ops);
-	if (!iommu_present(&amba_bustype));
+	if (!iommu_present(&amba_bustype))
 		bus_set_iommu(&amba_bustype, &arm_smmu_ops);
 	return 0;

drivers/md/bcache/request.c+2−3

 		closure_bio_submit(bio, cl, s->d);
 	} else {
 		bch_writeback_add(dc);
+		s->op.cache_bio = bio;
 		if (bio->bi_rw & REQ_FLUSH) {
 			/* Also need to send a flush to the backing device */
-			struct bio *flush = bio_alloc_bioset(0, GFP_NOIO,
+			struct bio *flush = bio_alloc_bioset(GFP_NOIO, 0,
 							     dc->disk.bio_split);
 			flush->bi_rw	= WRITE_FLUSH;
 			flush->bi_private = cl;
 			closure_bio_submit(flush, cl, s->d);
-		} else {
-			s->op.cache_bio = bio;
 		}
 	}
 out:

drivers/md/dm-snap-persistent.c+12−6

 	return NUM_SNAPSHOT_HDR_CHUNKS + ((ps->exceptions_per_area + 1) * area);
 }
+static void skip_metadata(struct pstore *ps)
+{
+	uint32_t stride = ps->exceptions_per_area + 1;
+	chunk_t next_free = ps->next_free;
+	if (sector_div(next_free, stride) == NUM_SNAPSHOT_HDR_CHUNKS)
+		ps->next_free++;
+}
 /*
  * Read or write a metadata area.  Remembering to skip the first
  * chunk which holds the header.
 	ps->current_area--;
+	skip_metadata(ps);
 	return 0;
 }
 					struct dm_exception *e)
 {
 	struct pstore *ps = get_info(store);
-	uint32_t stride;
-	chunk_t next_free;
 	sector_t size = get_dev_size(dm_snap_cow(store->snap)->bdev);
 	/* Is there enough room ? */
 	 * Move onto the next free pending, making sure to take
 	 * into account the location of the metadata chunks.
 	 */
-	stride = (ps->exceptions_per_area + 1);
+	ps->next_free++;
-	next_free = ++ps->next_free;
+	skip_metadata(ps);
-	if (sector_div(next_free, stride) == 1)
-		ps->next_free++;
 	atomic_inc(&ps->pending_count);
 	return 0;

drivers/media/dvb-frontends/tda10071.c+1−8

 		{ 0xd5, 0x03, 0x03 },
 	};
-	/* firmware status */
+	if (priv->warm) {
-	ret = tda10071_rd_reg(priv, 0x51, &tmp);
-	if (ret)
-		goto error;
-	if (!tmp) {
 		/* warm state - wake up device from sleep */
-		priv->warm = 1;
 		for (i = 0; i < ARRAY_SIZE(tab); i++) {
 			ret = tda10071_wr_reg_mask(priv, tab[i].reg,
 			goto error;
 	} else {
 		/* cold state - try to download firmware */
-		priv->warm = 0;
 		/* request the firmware, this will block and timeout */
 		ret = request_firmware(&fw, fw_file, priv->i2c->dev.parent);

drivers/media/i2c/ad9389b.c+6−9

@@ -628,16 +628,13 @@ static int ad9389b_s_stream(struct v4l2_subdev *sd, int enable) · 627 unmodified lines
628		628
629	static const struct v4l2_dv_timings_cap ad9389b_timings_cap = {	629	static const struct v4l2_dv_timings_cap ad9389b_timings_cap = {
630	.type = V4L2_DV_BT_656_1120,	630	.type = V4L2_DV_BT_656_1120,
631	.bt = {	631	/* keep this initialization for compatibility with GCC < 4.4.6 */
632	.max_width = 1920,	632	.reserved = { 0 },
633	.max_height = 1200,	633	V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000,
634	.min_pixelclock = 25000000,	634	V4L2_DV_BT_STD_CEA861 \| V4L2_DV_BT_STD_DMT \|
635	.max_pixelclock = 170000000,
636	.standards = V4L2_DV_BT_STD_CEA861 \| V4L2_DV_BT_STD_DMT \|
637	V4L2_DV_BT_STD_GTF \| V4L2_DV_BT_STD_CVT,	635	V4L2_DV_BT_STD_GTF \| V4L2_DV_BT_STD_CVT,
638	.capabilities = V4L2_DV_BT_CAP_PROGRESSIVE \|	636	V4L2_DV_BT_CAP_PROGRESSIVE \| V4L2_DV_BT_CAP_REDUCED_BLANKING \|
639	V4L2_DV_BT_CAP_REDUCED_BLANKING \| V4L2_DV_BT_CAP_CUSTOM,	637	V4L2_DV_BT_CAP_CUSTOM)
640	},
641	};	638	};
642		639
643	static int ad9389b_s_dv_timings(struct v4l2_subdev *sd,	640	static int ad9389b_s_dv_timings(struct v4l2_subdev *sd,

drivers/media/i2c/adv7511.c+9−9

 static const struct v4l2_dv_timings_cap adv7511_timings_cap = {
 	.type = V4L2_DV_BT_656_1120,
-	.bt = {
+	/* keep this initialization for compatibility with GCC < 4.4.6 */
-		.max_width = ADV7511_MAX_WIDTH,
+	.reserved = { 0 },
-		.max_height = ADV7511_MAX_HEIGHT,
+	V4L2_INIT_BT_TIMINGS(0, ADV7511_MAX_WIDTH, 0, ADV7511_MAX_HEIGHT,
-		.min_pixelclock = ADV7511_MIN_PIXELCLOCK,
+		ADV7511_MIN_PIXELCLOCK, ADV7511_MAX_PIXELCLOCK,
-		.max_pixelclock = ADV7511_MAX_PIXELCLOCK,
+		V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
-		.standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
 			V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,
-		.capabilities = V4L2_DV_BT_CAP_PROGRESSIVE |
+		V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
-			V4L2_DV_BT_CAP_REDUCED_BLANKING | V4L2_DV_BT_CAP_CUSTOM,
+			V4L2_DV_BT_CAP_CUSTOM)
-	},
 };
 static inline struct adv7511_state *get_adv7511_state(struct v4l2_subdev *sd)
 	state->i2c_edid = i2c_new_dummy(client->adapter, state->i2c_edid_addr >> 1);
 	if (state->i2c_edid == NULL) {
 		v4l2_err(sd, "failed to register edid i2c client\n");
+		err = -ENOMEM;
 		goto err_entity;
 	}
 	state->work_queue = create_singlethread_workqueue(sd->name);
 	if (state->work_queue == NULL) {
 		v4l2_err(sd, "could not create workqueue\n");
+		err = -ENOMEM;
 		goto err_unreg_cec;
 	}

drivers/media/i2c/adv7842.c+12−18

@@ -546,30 +546,24 @@ static inline bool is_digital_input(struct v4l2_subdev *sd) · 545 unmodified lines
546		546
547	static const struct v4l2_dv_timings_cap adv7842_timings_cap_analog = {	547	static const struct v4l2_dv_timings_cap adv7842_timings_cap_analog = {
548	.type = V4L2_DV_BT_656_1120,	548	.type = V4L2_DV_BT_656_1120,
549	.bt = {	549	/* keep this initialization for compatibility with GCC < 4.4.6 */
550	.max_width = 1920,	550	.reserved = { 0 },
551	.max_height = 1200,	551	V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000,
552	.min_pixelclock = 25000000,	552	V4L2_DV_BT_STD_CEA861 \| V4L2_DV_BT_STD_DMT \|
553	.max_pixelclock = 170000000,
554	.standards = V4L2_DV_BT_STD_CEA861 \| V4L2_DV_BT_STD_DMT \|
555	V4L2_DV_BT_STD_GTF \| V4L2_DV_BT_STD_CVT,	553	V4L2_DV_BT_STD_GTF \| V4L2_DV_BT_STD_CVT,
556	.capabilities = V4L2_DV_BT_CAP_PROGRESSIVE \|	554	V4L2_DV_BT_CAP_PROGRESSIVE \| V4L2_DV_BT_CAP_REDUCED_BLANKING \|
557	V4L2_DV_BT_CAP_REDUCED_BLANKING \| V4L2_DV_BT_CAP_CUSTOM,	555	V4L2_DV_BT_CAP_CUSTOM)
558	},
559	};	556	};
560		557
561	static const struct v4l2_dv_timings_cap adv7842_timings_cap_digital = {	558	static const struct v4l2_dv_timings_cap adv7842_timings_cap_digital = {
562	.type = V4L2_DV_BT_656_1120,	559	.type = V4L2_DV_BT_656_1120,
563	.bt = {	560	/* keep this initialization for compatibility with GCC < 4.4.6 */
564	.max_width = 1920,	561	.reserved = { 0 },
565	.max_height = 1200,	562	V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000,
566	.min_pixelclock = 25000000,	563	V4L2_DV_BT_STD_CEA861 \| V4L2_DV_BT_STD_DMT \|
567	.max_pixelclock = 225000000,
568	.standards = V4L2_DV_BT_STD_CEA861 \| V4L2_DV_BT_STD_DMT \|
569	V4L2_DV_BT_STD_GTF \| V4L2_DV_BT_STD_CVT,	564	V4L2_DV_BT_STD_GTF \| V4L2_DV_BT_STD_CVT,
570	.capabilities = V4L2_DV_BT_CAP_PROGRESSIVE \|	565	V4L2_DV_BT_CAP_PROGRESSIVE \| V4L2_DV_BT_CAP_REDUCED_BLANKING \|
571	V4L2_DV_BT_CAP_REDUCED_BLANKING \| V4L2_DV_BT_CAP_CUSTOM,	566	V4L2_DV_BT_CAP_CUSTOM)
572	},
573	};	567	};
574		568
575	static inline const struct v4l2_dv_timings_cap *	569	static inline const struct v4l2_dv_timings_cap *

drivers/media/i2c/ths8200.c+4−8

 static const struct v4l2_dv_timings_cap ths8200_timings_cap = {
 	.type = V4L2_DV_BT_656_1120,
-	.bt = {
+	/* keep this initialization for compatibility with GCC < 4.4.6 */
-		.max_width = 1920,
+	.reserved = { 0 },
-		.max_height = 1080,
+	V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1080, 25000000, 148500000,
-		.min_pixelclock = 25000000,
+		V4L2_DV_BT_STD_CEA861, V4L2_DV_BT_CAP_PROGRESSIVE)
-		.max_pixelclock = 148500000,
-		.standards = V4L2_DV_BT_STD_CEA861,
-		.capabilities = V4L2_DV_BT_CAP_PROGRESSIVE,
-	},
 };
 static inline struct ths8200_state *to_state(struct v4l2_subdev *sd)

drivers/media/pci/saa7134/saa7134-video.c+1−0

@@ -1455,6 +1455,7 @@ static int video_release(struct file *file) · 1454 unmodified lines
1455		1455
1456	/* stop video capture */	1456	/* stop video capture */
1457	if (res_check(fh, RESOURCE_VIDEO)) {	1457	if (res_check(fh, RESOURCE_VIDEO)) {
		1458	pm_qos_remove_request(&dev->qos_request);
1458	videobuf_streamoff(&fh->cap);	1459	videobuf_streamoff(&fh->cap);
1459	res_free(dev,fh,RESOURCE_VIDEO);	1460	res_free(dev,fh,RESOURCE_VIDEO);
1460	}	1461	}

drivers/media/platform/s5p-jpeg/jpeg-core.c+1−0

@@ -1423,6 +1423,7 @@ static int s5p_jpeg_probe(struct platform_device *pdev) · 1422 unmodified lines
1423	jpeg->vfd_decoder->release = video_device_release;	1423	jpeg->vfd_decoder->release = video_device_release;
1424	jpeg->vfd_decoder->lock = &jpeg->lock;	1424	jpeg->vfd_decoder->lock = &jpeg->lock;
1425	jpeg->vfd_decoder->v4l2_dev = &jpeg->v4l2_dev;	1425	jpeg->vfd_decoder->v4l2_dev = &jpeg->v4l2_dev;
		1426	jpeg->vfd_decoder->vfl_dir = VFL_DIR_M2M;
1426		1427
1427	ret = video_register_device(jpeg->vfd_decoder, VFL_TYPE_GRABBER, -1);	1428	ret = video_register_device(jpeg->vfd_decoder, VFL_TYPE_GRABBER, -1);
1428	if (ret) {	1429	if (ret) {

drivers/media/platform/sh_vou.c+1−1

@@ -776,7 +776,7 @@ static int sh_vou_try_fmt_vid_out(struct file file, void priv, · 775 unmodified lines
776	v4l_bound_align_image(&pix->width, 0, VOU_MAX_IMAGE_WIDTH, 1,	776	v4l_bound_align_image(&pix->width, 0, VOU_MAX_IMAGE_WIDTH, 1,
777	&pix->height, 0, VOU_MAX_IMAGE_HEIGHT, 1, 0);	777	&pix->height, 0, VOU_MAX_IMAGE_HEIGHT, 1, 0);
778		778
779	for (i = 0; ARRAY_SIZE(vou_fmt); i++)	779	for (i = 0; i < ARRAY_SIZE(vou_fmt); i++)
780	if (vou_fmt[i].pfmt == pix->pixelformat)	780	if (vou_fmt[i].pfmt == pix->pixelformat)
781	return 0;	781	return 0;
782		782

drivers/media/platform/soc_camera/mx3_camera.c+2−3

 	struct idmac_channel *ichan = mx3_cam->idmac_channel[0];
 	struct idmac_video_param *video = &ichan->params.video;
 	const struct soc_mbus_pixelfmt *host_fmt = icd->current_fmt->host_fmt;
-	unsigned long flags;
 	dma_cookie_t cookie;
 	size_t new_size;
 		memset(vb2_plane_vaddr(vb, 0), 0xaa, vb2_get_plane_payload(vb, 0));
 #endif
-	spin_lock_irqsave(&mx3_cam->lock, flags);
+	spin_lock_irq(&mx3_cam->lock);
 	list_add_tail(&buf->queue, &mx3_cam->capture);
 	if (!mx3_cam->active)
 	if (mx3_cam->active == buf)
 		mx3_cam->active = NULL;
-	spin_unlock_irqrestore(&mx3_cam->lock, flags);
+	spin_unlock_irq(&mx3_cam->lock);
 error:
 	vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);
 }

drivers/media/tuners/e4000.c+2−1

  */
 #include "e4000_priv.h"
+#include <linux/math64.h>
 /* write multiple registers */
 static int e4000_wr_regs(struct e4000_priv *priv, u8 reg, u8 *val, int len)
 	 * or more.
 	 */
 	f_vco = c->frequency * e4000_pll_lut[i].mul;
-	sigma_delta = 0x10000UL * (f_vco % priv->cfg->clock) / priv->cfg->clock;
+	sigma_delta = div_u64(0x10000ULL * (f_vco % priv->cfg->clock), priv->cfg->clock);
 	buf[0] = f_vco / priv->cfg->clock;
 	buf[1] = (sigma_delta >> 0) & 0xff;
 	buf[2] = (sigma_delta >> 8) & 0xff;

drivers/media/usb/stkwebcam/stk-webcam.c+7−0

@@ -111,6 +111,13 @@ static const struct dmi_system_id stk_upside_down_dmi_table[] = { · 110 unmodified lines
111	DMI_MATCH(DMI_PRODUCT_NAME, "F3JC")	111	DMI_MATCH(DMI_PRODUCT_NAME, "F3JC")
112	}	112	}
113	},	113	},
		114	{
		115	.ident = "T12Rg-H",
		116	.matches = {
		117	DMI_MATCH(DMI_SYS_VENDOR, "HCL Infosystems Limited"),
		118	DMI_MATCH(DMI_PRODUCT_NAME, "T12Rg-H")
		119	}
		120	},
114	{}	121	{}
115	};	122	};
116		123

drivers/media/usb/uvc/uvc_driver.c+18−0

@@ -2090,6 +2090,15 @@ static struct usb_device_id uvc_ids[] = { · 2089 unmodified lines
2090	.bInterfaceSubClass = 1,	2090	.bInterfaceSubClass = 1,
2091	.bInterfaceProtocol = 0,	2091	.bInterfaceProtocol = 0,
2092	.driver_info = UVC_QUIRK_PROBE_MINMAX },	2092	.driver_info = UVC_QUIRK_PROBE_MINMAX },
		2093	/* Microsoft Lifecam NX-3000 */
		2094	{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
		2095	\| USB_DEVICE_ID_MATCH_INT_INFO,
		2096	.idVendor = 0x045e,
		2097	.idProduct = 0x0721,
		2098	.bInterfaceClass = USB_CLASS_VIDEO,
		2099	.bInterfaceSubClass = 1,
		2100	.bInterfaceProtocol = 0,
		2101	.driver_info = UVC_QUIRK_PROBE_DEF },
2093	/* Microsoft Lifecam VX-7000 */	2102	/* Microsoft Lifecam VX-7000 */
2094	{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE	2103	{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
2095	\| USB_DEVICE_ID_MATCH_INT_INFO,	2104	\| USB_DEVICE_ID_MATCH_INT_INFO,
@@ -2174,6 +2183,15 @@ static struct usb_device_id uvc_ids[] = { · 78 unmodified lines
2174	.bInterfaceSubClass = 1,	2183	.bInterfaceSubClass = 1,
2175	.bInterfaceProtocol = 0,	2184	.bInterfaceProtocol = 0,
2176	.driver_info = UVC_QUIRK_PROBE_DEF },	2185	.driver_info = UVC_QUIRK_PROBE_DEF },
		2186	/* Dell SP2008WFP Monitor */
		2187	{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
		2188	\| USB_DEVICE_ID_MATCH_INT_INFO,
		2189	.idVendor = 0x05a9,
		2190	.idProduct = 0x2641,
		2191	.bInterfaceClass = USB_CLASS_VIDEO,
		2192	.bInterfaceSubClass = 1,
		2193	.bInterfaceProtocol = 0,
		2194	.driver_info = UVC_QUIRK_PROBE_DEF },
2177	/* Dell Alienware X51 */	2195	/* Dell Alienware X51 */
2178	{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE	2196	{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
2179	\| USB_DEVICE_ID_MATCH_INT_INFO,	2197	\| USB_DEVICE_ID_MATCH_INT_INFO,

drivers/media/v4l2-core/videobuf2-core.c+3−1

@@ -353,7 +353,9 @@ static int __verify_length(struct vb2_buffer vb, const struct v4l2_buffer b) · 352 unmodified lines
353		353
354	if (b->m.planes[plane].bytesused > length)	354	if (b->m.planes[plane].bytesused > length)
355	return -EINVAL;	355	return -EINVAL;
356	if (b->m.planes[plane].data_offset >=	356
		357	if (b->m.planes[plane].data_offset > 0 &&
		358	b->m.planes[plane].data_offset >=
357	b->m.planes[plane].bytesused)	359	b->m.planes[plane].bytesused)
358	return -EINVAL;	360	return -EINVAL;
359	}	361	}

drivers/media/v4l2-core/videobuf2-dma-contig.c+82−5

@@ -423,6 +423,39 @@ static inline int vma_is_io(struct vm_area_struct *vma) · 422 unmodified lines
423	return !!(vma->vm_flags & (VM_IO \| VM_PFNMAP));	423	return !!(vma->vm_flags & (VM_IO \| VM_PFNMAP));
424	}	424	}
425		425
		426	static int vb2_dc_get_user_pfn(unsigned long start, int n_pages,
		427	struct vm_area_struct vma, unsigned long res)
		428	{
		429	unsigned long pfn, start_pfn, prev_pfn;
		430	unsigned int i;
		431	int ret;
		432
		433	if (!vma_is_io(vma))
		434	return -EFAULT;
		435
		436	ret = follow_pfn(vma, start, &pfn);
		437	if (ret)
		438	return ret;
		439
		440	start_pfn = pfn;
		441	start += PAGE_SIZE;
		442
		443	for (i = 1; i < n_pages; ++i, start += PAGE_SIZE) {
		444	prev_pfn = pfn;
		445	ret = follow_pfn(vma, start, &pfn);
		446
		447	if (ret) {
		448	pr_err("no page for address %lu\n", start);
		449	return ret;
		450	}
		451	if (pfn != prev_pfn + 1)
		452	return -EINVAL;
		453	}
		454
		455	*res = start_pfn;
		456	return 0;
		457	}
		458
426	static int vb2_dc_get_user_pages(unsigned long start, struct page **pages,	459	static int vb2_dc_get_user_pages(unsigned long start, struct page **pages,
427	int n_pages, struct vm_area_struct *vma, int write)	460	int n_pages, struct vm_area_struct *vma, int write)
428	{	461	{
@@ -433,6 +466,9 @@ static int vb2_dc_get_user_pages(unsigned long start, struct page **pages, · 4 unmodified lines
433	unsigned long pfn;	466	unsigned long pfn;
434	int ret = follow_pfn(vma, start, &pfn);	467	int ret = follow_pfn(vma, start, &pfn);
435		468
		469	if (!pfn_valid(pfn))
		470	return -EINVAL;
		471
436	if (ret) {	472	if (ret) {
437	pr_err("no page for address %lu\n", start);	473	pr_err("no page for address %lu\n", start);
438	return ret;	474	return ret;
@@ -468,16 +504,49 @@ static void vb2_dc_put_userptr(void *buf_priv) · 29 unmodified lines
468	struct vb2_dc_buf *buf = buf_priv;	504	struct vb2_dc_buf *buf = buf_priv;
469	struct sg_table *sgt = buf->dma_sgt;	505	struct sg_table *sgt = buf->dma_sgt;
470		506
471	dma_unmap_sg(buf->dev, sgt->sgl, sgt->orig_nents, buf->dma_dir);	507	if (sgt) {
472	if (!vma_is_io(buf->vma))	508	dma_unmap_sg(buf->dev, sgt->sgl, sgt->orig_nents, buf->dma_dir);
473	vb2_dc_sgt_foreach_page(sgt, vb2_dc_put_dirty_page);	509	if (!vma_is_io(buf->vma))
		510	vb2_dc_sgt_foreach_page(sgt, vb2_dc_put_dirty_page);
474		511
475	sg_free_table(sgt);	512	sg_free_table(sgt);
476	kfree(sgt);	513	kfree(sgt);
		514	}
477	vb2_put_vma(buf->vma);	515	vb2_put_vma(buf->vma);
478	kfree(buf);	516	kfree(buf);
479	}	517	}
480		518
		519	/*
		520	* For some kind of reserved memory there might be no struct page available,
		521	* so all that can be done to support such 'pages' is to try to convert
		522	* pfn to dma address or at the last resort just assume that
		523	* dma address == physical address (like it has been assumed in earlier version
		524	* of videobuf2-dma-contig
		525	*/
		526
		527	#ifdef __arch_pfn_to_dma
		528	static inline dma_addr_t vb2_dc_pfn_to_dma(struct device *dev, unsigned long pfn)
		529	{
		530	return (dma_addr_t)__arch_pfn_to_dma(dev, pfn);
		531	}
		532	#elif defined(__pfn_to_bus)
		533	static inline dma_addr_t vb2_dc_pfn_to_dma(struct device *dev, unsigned long pfn)
		534	{
		535	return (dma_addr_t)__pfn_to_bus(pfn);
		536	}
		537	#elif defined(__pfn_to_phys)
		538	static inline dma_addr_t vb2_dc_pfn_to_dma(struct device *dev, unsigned long pfn)
		539	{
		540	return (dma_addr_t)__pfn_to_phys(pfn);
		541	}
		542	#else
		543	static inline dma_addr_t vb2_dc_pfn_to_dma(struct device *dev, unsigned long pfn)
		544	{
		545	/* really, we cannot do anything better at this point */
		546	return (dma_addr_t)(pfn) << PAGE_SHIFT;
		547	}
		548	#endif
		549
481	static void vb2_dc_get_userptr(void alloc_ctx, unsigned long vaddr,	550	static void vb2_dc_get_userptr(void alloc_ctx, unsigned long vaddr,
482	unsigned long size, int write)	551	unsigned long size, int write)
483	{	552	{
@@ -548,6 +617,14 @@ static void vb2_dc_get_userptr(void alloc_ctx, unsigned long vaddr, · 64 unmodified lines
548	/* extract page list from userspace mapping */	617	/* extract page list from userspace mapping */
549	ret = vb2_dc_get_user_pages(start, pages, n_pages, vma, write);	618	ret = vb2_dc_get_user_pages(start, pages, n_pages, vma, write);
550	if (ret) {	619	if (ret) {
		620	unsigned long pfn;
		621	if (vb2_dc_get_user_pfn(start, n_pages, vma, &pfn) == 0) {
		622	buf->dma_addr = vb2_dc_pfn_to_dma(buf->dev, pfn);
		623	buf->size = size;
		624	kfree(pages);
		625	return buf;
		626	}
		627
551	pr_err("failed to get user pages\n");	628	pr_err("failed to get user pages\n");
552	goto fail_vma;	629	goto fail_vma;
553	}	630	}

drivers/mmc/host/sh_mobile_sdhi.c+8−8

@@ -113,14 +113,14 @@ static const struct sh_mobile_sdhi_ops sdhi_ops = { · 112 unmodified lines
113	};	113	};
114		114
115	static const struct of_device_id sh_mobile_sdhi_of_match[] = {	115	static const struct of_device_id sh_mobile_sdhi_of_match[] = {
116	{ .compatible = "renesas,shmobile-sdhi" },	116	{ .compatible = "renesas,sdhi-shmobile" },
117	{ .compatible = "renesas,sh7372-sdhi" },	117	{ .compatible = "renesas,sdhi-sh7372" },
118	{ .compatible = "renesas,sh73a0-sdhi", .data = &sh_mobile_sdhi_of_cfg[0], },	118	{ .compatible = "renesas,sdhi-sh73a0", .data = &sh_mobile_sdhi_of_cfg[0], },
119	{ .compatible = "renesas,r8a73a4-sdhi", .data = &sh_mobile_sdhi_of_cfg[0], },	119	{ .compatible = "renesas,sdhi-r8a73a4", .data = &sh_mobile_sdhi_of_cfg[0], },
120	{ .compatible = "renesas,r8a7740-sdhi", .data = &sh_mobile_sdhi_of_cfg[0], },	120	{ .compatible = "renesas,sdhi-r8a7740", .data = &sh_mobile_sdhi_of_cfg[0], },
121	{ .compatible = "renesas,r8a7778-sdhi", .data = &sh_mobile_sdhi_of_cfg[0], },	121	{ .compatible = "renesas,sdhi-r8a7778", .data = &sh_mobile_sdhi_of_cfg[0], },
122	{ .compatible = "renesas,r8a7779-sdhi", .data = &sh_mobile_sdhi_of_cfg[0], },	122	{ .compatible = "renesas,sdhi-r8a7779", .data = &sh_mobile_sdhi_of_cfg[0], },
123	{ .compatible = "renesas,r8a7790-sdhi", .data = &sh_mobile_sdhi_of_cfg[0], },	123	{ .compatible = "renesas,sdhi-r8a7790", .data = &sh_mobile_sdhi_of_cfg[0], },
124	{},	124	{},
125	};	125	};
126	MODULE_DEVICE_TABLE(of, sh_mobile_sdhi_of_match);	126	MODULE_DEVICE_TABLE(of, sh_mobile_sdhi_of_match);

drivers/mtd/devices/m25p80.c+15−2

@@ -168,12 +168,25 @@ static inline int write_disable(struct m25p *flash) · 167 unmodified lines
168	*/	168	*/
169	static inline int set_4byte(struct m25p *flash, u32 jedec_id, int enable)	169	static inline int set_4byte(struct m25p *flash, u32 jedec_id, int enable)
170	{	170	{
		171	int status;
		172	bool need_wren = false;
		173
171	switch (JEDEC_MFR(jedec_id)) {	174	switch (JEDEC_MFR(jedec_id)) {
172	case CFI_MFR_MACRONIX:
173	case CFI_MFR_ST: /* Micron, actually */	175	case CFI_MFR_ST: /* Micron, actually */
		176	/* Some Micron need WREN command; all will accept it */
		177	need_wren = true;
		178	case CFI_MFR_MACRONIX:
174	case 0xEF /* winbond */:	179	case 0xEF /* winbond */:
		180	if (need_wren)
		181	write_enable(flash);
		182
175	flash->command[0] = enable ? OPCODE_EN4B : OPCODE_EX4B;	183	flash->command[0] = enable ? OPCODE_EN4B : OPCODE_EX4B;
176	return spi_write(flash->spi, flash->command, 1);	184	status = spi_write(flash->spi, flash->command, 1);
		185
		186	if (need_wren)
		187	write_disable(flash);
		188
		189	return status;
177	default:	190	default:
178	/* Spansion style */	191	/* Spansion style */
179	flash->command[0] = OPCODE_BRWR;	192	flash->command[0] = OPCODE_BRWR;

drivers/mtd/nand/nand_base.c+3−5

 	len = le16_to_cpu(p->ext_param_page_length) * 16;
 	ep = kmalloc(len, GFP_KERNEL);
-	if (!ep) {
+	if (!ep)
-		ret = -ENOMEM;
+		return -ENOMEM;
-		goto ext_out;
-	}
 	/* Send our own NAND_CMD_PARAM. */
 	chip->cmdfunc(mtd, NAND_CMD_PARAM, 0, -1);
 	}
 	pr_info("ONFI extended param page detected.\n");
-	return 0;
+	ret = 0;
 ext_out:
 	kfree(ep);

drivers/net/can/at91_can.c+2−2

@@ -1405,10 +1405,10 @@ static int at91_can_remove(struct platform_device *pdev) · 1404 unmodified lines
1405		1405
1406	static const struct platform_device_id at91_can_id_table[] = {	1406	static const struct platform_device_id at91_can_id_table[] = {
1407	{	1407	{
1408	.name = "at91_can",	1408	.name = "at91sam9x5_can",
1409	.driver_data = (kernel_ulong_t)&at91_at91sam9x5_data,	1409	.driver_data = (kernel_ulong_t)&at91_at91sam9x5_data,
1410	}, {	1410	}, {
1411	.name = "at91sam9x5_can",	1411	.name = "at91_can",
1412	.driver_data = (kernel_ulong_t)&at91_at91sam9263_data,	1412	.driver_data = (kernel_ulong_t)&at91_at91sam9263_data,
1413	}, {	1413	}, {
1414	/* sentinel */	1414	/* sentinel */

drivers/net/can/flexcan.c+10−4

 #define FLEXCAN_MCR_BCC			BIT(16)
 #define FLEXCAN_MCR_LPRIO_EN		BIT(13)
 #define FLEXCAN_MCR_AEN			BIT(12)
-#define FLEXCAN_MCR_MAXMB(x)		((x) & 0xf)
+#define FLEXCAN_MCR_MAXMB(x)		((x) & 0x1f)
 #define FLEXCAN_MCR_IDAM_A		(0 << 8)
 #define FLEXCAN_MCR_IDAM_B		(1 << 8)
 #define FLEXCAN_MCR_IDAM_C		(2 << 8)
 	 *
 	 */
 	reg_mcr = flexcan_read(&regs->mcr);
+	reg_mcr &= ~FLEXCAN_MCR_MAXMB(0xff);
 	reg_mcr |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_FEN | FLEXCAN_MCR_HALT |
 		FLEXCAN_MCR_SUPV | FLEXCAN_MCR_WRN_EN |
-		FLEXCAN_MCR_IDAM_C | FLEXCAN_MCR_SRX_DIS;
+		FLEXCAN_MCR_IDAM_C | FLEXCAN_MCR_SRX_DIS |
+		FLEXCAN_MCR_MAXMB(FLEXCAN_TX_BUF_ID);
 	netdev_dbg(dev, "%s: writing mcr=0x%08x", __func__, reg_mcr);
 	flexcan_write(reg_mcr, &regs->mcr);
 	netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl);
 	flexcan_write(reg_ctrl, &regs->ctrl);
+	/* Abort any pending TX, mark Mailbox as INACTIVE */
+	flexcan_write(FLEXCAN_MB_CNT_CODE(0x4),
+		      &regs->cantxfg[FLEXCAN_TX_BUF_ID].can_ctrl);
 	/* acceptance mask/acceptance code (accept everything) */
 	flexcan_write(0x0, &regs->rxgmask);
 	flexcan_write(0x0, &regs->rx14mask);
 }
 static const struct of_device_id flexcan_of_match[] = {
-	{ .compatible = "fsl,p1010-flexcan", .data = &fsl_p1010_devtype_data, },
-	{ .compatible = "fsl,imx28-flexcan", .data = &fsl_imx28_devtype_data, },
 	{ .compatible = "fsl,imx6q-flexcan", .data = &fsl_imx6q_devtype_data, },
+	{ .compatible = "fsl,imx28-flexcan", .data = &fsl_imx28_devtype_data, },
+	{ .compatible = "fsl,p1010-flexcan", .data = &fsl_p1010_devtype_data, },
 	{ /* sentinel */ },
 };
 MODULE_DEVICE_TABLE(of, flexcan_of_match);

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h+10−5

 /* TM (timers) host DB constants */
 #define TM_ILT_PAGE_SZ_HW	0
 #define TM_ILT_PAGE_SZ		(4096 << TM_ILT_PAGE_SZ_HW) /* 4K */
-/* #define TM_CONN_NUM		(CNIC_STARTING_CID+CNIC_ISCSI_CXT_MAX) */
+#define TM_CONN_NUM		(BNX2X_FIRST_VF_CID + \
-#define TM_CONN_NUM		1024
+				 BNX2X_VF_CIDS + \
+				 CNIC_ISCSI_CID_MAX)
 #define TM_ILT_SZ		(8 * TM_CONN_NUM)
 #define TM_ILT_LINES		DIV_ROUND_UP(TM_ILT_SZ, TM_ILT_PAGE_SZ)
 #define PCI_32BIT_FLAG			(1 << 1)
 #define ONE_PORT_FLAG			(1 << 2)
 #define NO_WOL_FLAG			(1 << 3)
-#define USING_DAC_FLAG			(1 << 4)
 #define USING_MSIX_FLAG			(1 << 5)
 #define USING_MSI_FLAG			(1 << 6)
 #define DISABLE_MSI_FLAG		(1 << 7)
 	u16			rx_ticks_int;
 	u16			rx_ticks;
 /* Maximal coalescing timeout in us */
-#define BNX2X_MAX_COALESCE_TOUT		(0xf0*12)
+#define BNX2X_MAX_COALESCE_TOUT		(0xff*BNX2X_BTR)
 	u32			lin_cnt;
 void bnx2x_prep_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae,
 			       u8 src_type, u8 dst_type);
-int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae);
+int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae,
+			       u32 *comp);
 /* FLR related routines */
 u32 bnx2x_flr_clnup_poll_count(struct bnx2x *bp);
 #define NUM_MACS	8
 void bnx2x_set_local_cmng(struct bnx2x *bp);
+#define MCPR_SCRATCH_BASE(bp) \
+	(CHIP_IS_E1x(bp) ? MCP_REG_MCPR_SCRATCH : MCP_A_REG_MCPR_SCRATCH)
 #endif /* bnx2x.h */

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c+1−0

@@ -681,6 +681,7 @@ static void bnx2x_gro_receive(struct bnx2x bp, struct bnx2x_fastpath fp, · 680 unmodified lines
681	}	681	}
682	}	682	}
683	#endif	683	#endif
		684	skb_record_rx_queue(skb, fp->rx_queue);
684	napi_gro_receive(&fp->napi, skb);	685	napi_gro_receive(&fp->napi, skb);
685	}	686	}
686		687

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c+2−38

@@ -894,17 +894,8 @@ static void bnx2x_get_regs(struct net_device *dev, · 893 unmodified lines
894	* will re-enable parity attentions right after the dump.	894	* will re-enable parity attentions right after the dump.
895	*/	895	*/
896		896
897	/* Disable parity on path 0 */
898	bnx2x_pretend_func(bp, 0);
899	bnx2x_disable_blocks_parity(bp);	897	bnx2x_disable_blocks_parity(bp);
900		898
901	/* Disable parity on path 1 */
902	bnx2x_pretend_func(bp, 1);
903	bnx2x_disable_blocks_parity(bp);
904
905	/* Return to current function */
906	bnx2x_pretend_func(bp, BP_ABS_FUNC(bp));
907
908	dump_hdr.header_size = (sizeof(struct dump_header) / 4) - 1;	899	dump_hdr.header_size = (sizeof(struct dump_header) / 4) - 1;
909	dump_hdr.preset = DUMP_ALL_PRESETS;	900	dump_hdr.preset = DUMP_ALL_PRESETS;
910	dump_hdr.version = BNX2X_DUMP_VERSION;	901	dump_hdr.version = BNX2X_DUMP_VERSION;
@@ -931,18 +922,9 @@ static void bnx2x_get_regs(struct net_device *dev, · 20 unmodified lines
931	/* Actually read the registers */	922	/* Actually read the registers */
932	__bnx2x_get_regs(bp, p);	923	__bnx2x_get_regs(bp, p);
933		924
934	/* Re-enable parity attentions on path 0 */	925	/* Re-enable parity attentions */
935	bnx2x_pretend_func(bp, 0);
936	bnx2x_clear_blocks_parity(bp);	926	bnx2x_clear_blocks_parity(bp);
937	bnx2x_enable_blocks_parity(bp);	927	bnx2x_enable_blocks_parity(bp);
938
939	/* Re-enable parity attentions on path 1 */
940	bnx2x_pretend_func(bp, 1);
941	bnx2x_clear_blocks_parity(bp);
942	bnx2x_enable_blocks_parity(bp);
943
944	/* Return to current function */
945	bnx2x_pretend_func(bp, BP_ABS_FUNC(bp));
946	}	928	}
947		929
948	static int bnx2x_get_preset_regs_len(struct net_device *dev, u32 preset)	930	static int bnx2x_get_preset_regs_len(struct net_device *dev, u32 preset)
@@ -996,17 +978,8 @@ static int bnx2x_get_dump_data(struct net_device *dev, · 47 unmodified lines
996	* will re-enable parity attentions right after the dump.	978	* will re-enable parity attentions right after the dump.
997	*/	979	*/
998		980
999	/* Disable parity on path 0 */
1000	bnx2x_pretend_func(bp, 0);
1001	bnx2x_disable_blocks_parity(bp);	981	bnx2x_disable_blocks_parity(bp);
1002		982
1003	/* Disable parity on path 1 */
1004	bnx2x_pretend_func(bp, 1);
1005	bnx2x_disable_blocks_parity(bp);
1006
1007	/* Return to current function */
1008	bnx2x_pretend_func(bp, BP_ABS_FUNC(bp));
1009
1010	dump_hdr.header_size = (sizeof(struct dump_header) / 4) - 1;	983	dump_hdr.header_size = (sizeof(struct dump_header) / 4) - 1;
1011	dump_hdr.preset = bp->dump_preset_idx;	984	dump_hdr.preset = bp->dump_preset_idx;
1012	dump_hdr.version = BNX2X_DUMP_VERSION;	985	dump_hdr.version = BNX2X_DUMP_VERSION;
@@ -1035,19 +1008,10 @@ static int bnx2x_get_dump_data(struct net_device *dev, · 22 unmodified lines
1035	/* Actually read the registers */	1008	/* Actually read the registers */
1036	__bnx2x_get_preset_regs(bp, p, dump_hdr.preset);	1009	__bnx2x_get_preset_regs(bp, p, dump_hdr.preset);
1037		1010
1038	/* Re-enable parity attentions on path 0 */	1011	/* Re-enable parity attentions */
1039	bnx2x_pretend_func(bp, 0);
1040	bnx2x_clear_blocks_parity(bp);	1012	bnx2x_clear_blocks_parity(bp);
1041	bnx2x_enable_blocks_parity(bp);	1013	bnx2x_enable_blocks_parity(bp);
1042		1014
1043	/* Re-enable parity attentions on path 1 */
1044	bnx2x_pretend_func(bp, 1);
1045	bnx2x_clear_blocks_parity(bp);
1046	bnx2x_enable_blocks_parity(bp);
1047
1048	/* Return to current function */
1049	bnx2x_pretend_func(bp, BP_ABS_FUNC(bp));
1050
1051	return 0;	1015	return 0;
1052	}	1016	}
1053		1017

drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h+25−13

  * [30] MCP Latched ump_tx_parity
  * [31] MCP Latched scpad_parity
  */
-#define MISC_AEU_ENABLE_MCP_PRTY_BITS	\
+#define MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS	\
 	(AEU_INPUTS_ATTN_BITS_MCP_LATCHED_ROM_PARITY | \
 	 AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_RX_PARITY | \
-	 AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY | \
+	 AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY)
+#define MISC_AEU_ENABLE_MCP_PRTY_BITS	\
+	(MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS | \
 	 AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY)
 /* Below registers control the MCP parity attention output. When
  * MISC_AEU_ENABLE_MCP_PRTY_BITS are set - attentions are
  * enabled, when cleared - disabled.
  */
-static const u32 mcp_attn_ctl_regs[] = {
+static const struct {
-	MISC_REG_AEU_ENABLE4_FUNC_0_OUT_0,
+	u32 addr;
-	MISC_REG_AEU_ENABLE4_NIG_0,
+	u32 bits;
-	MISC_REG_AEU_ENABLE4_PXP_0,
+} mcp_attn_ctl_regs[] = {
-	MISC_REG_AEU_ENABLE4_FUNC_1_OUT_0,
+	{ MISC_REG_AEU_ENABLE4_FUNC_0_OUT_0,
-	MISC_REG_AEU_ENABLE4_NIG_1,
+		MISC_AEU_ENABLE_MCP_PRTY_BITS },
-	MISC_REG_AEU_ENABLE4_PXP_1
+	{ MISC_REG_AEU_ENABLE4_NIG_0,
+		MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS },
+	{ MISC_REG_AEU_ENABLE4_PXP_0,
+		MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS },
+	{ MISC_REG_AEU_ENABLE4_FUNC_1_OUT_0,
+		MISC_AEU_ENABLE_MCP_PRTY_BITS },
+	{ MISC_REG_AEU_ENABLE4_NIG_1,
+		MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS },
+	{ MISC_REG_AEU_ENABLE4_PXP_1,
+		MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS }
 };
 static inline void bnx2x_set_mcp_parity(struct bnx2x *bp, u8 enable)
 	u32 reg_val;
 	for (i = 0; i < ARRAY_SIZE(mcp_attn_ctl_regs); i++) {
-		reg_val = REG_RD(bp, mcp_attn_ctl_regs[i]);
+		reg_val = REG_RD(bp, mcp_attn_ctl_regs[i].addr);
 		if (enable)
-			reg_val |= MISC_AEU_ENABLE_MCP_PRTY_BITS;
+			reg_val |= mcp_attn_ctl_regs[i].bits;
 		else
-			reg_val &= ~MISC_AEU_ENABLE_MCP_PRTY_BITS;
+			reg_val &= ~mcp_attn_ctl_regs[i].bits;
-		REG_WR(bp, mcp_attn_ctl_regs[i], reg_val);
+		REG_WR(bp, mcp_attn_ctl_regs[i].addr, reg_val);
 	}
 }

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c+212−176

@@ -503,9 +503,9 @@ void bnx2x_prep_dmae_with_comp(struct bnx2x *bp, · 502 unmodified lines
503	}	503	}
504		504
505	/* issue a dmae command over the init-channel and wait for completion */	505	/* issue a dmae command over the init-channel and wait for completion */
506	int bnx2x_issue_dmae_with_comp(struct bnx2x bp, struct dmae_command dmae)	506	int bnx2x_issue_dmae_with_comp(struct bnx2x bp, struct dmae_command dmae,
		507	u32 *comp)
507	{	508	{
508	u32 *wb_comp = bnx2x_sp(bp, wb_comp);
509	int cnt = CHIP_REV_IS_SLOW(bp) ? (400000) : 4000;	509	int cnt = CHIP_REV_IS_SLOW(bp) ? (400000) : 4000;
510	int rc = 0;	510	int rc = 0;
511		511
@@ -518,14 +518,14 @@ int bnx2x_issue_dmae_with_comp(struct bnx2x bp, struct dmae_command dmae) · 6 unmodified lines
518	spin_lock_bh(&bp->dmae_lock);	518	spin_lock_bh(&bp->dmae_lock);
519		519
520	/* reset completion */	520	/* reset completion */
521	*wb_comp = 0;	521	*comp = 0;
522		522
523	/* post the command on the channel used for initializations */	523	/* post the command on the channel used for initializations */
524	bnx2x_post_dmae(bp, dmae, INIT_DMAE_C(bp));	524	bnx2x_post_dmae(bp, dmae, INIT_DMAE_C(bp));
525		525
526	/* wait for completion */	526	/* wait for completion */
527	udelay(5);	527	udelay(5);
528	while ((*wb_comp & ~DMAE_PCI_ERR_FLAG) != DMAE_COMP_VAL) {	528	while ((*comp & ~DMAE_PCI_ERR_FLAG) != DMAE_COMP_VAL) {
529		529
530	if (!cnt \|\|	530	if (!cnt \|\|
531	(bp->recovery_state != BNX2X_RECOVERY_DONE &&	531	(bp->recovery_state != BNX2X_RECOVERY_DONE &&
@@ -537,7 +537,7 @@ int bnx2x_issue_dmae_with_comp(struct bnx2x bp, struct dmae_command dmae) · 5 unmodified lines
537	cnt--;	537	cnt--;
538	udelay(50);	538	udelay(50);
539	}	539	}
540	if (*wb_comp & DMAE_PCI_ERR_FLAG) {	540	if (*comp & DMAE_PCI_ERR_FLAG) {
541	BNX2X_ERR("DMAE PCI error!\n");	541	BNX2X_ERR("DMAE PCI error!\n");
542	rc = DMAE_PCI_ERROR;	542	rc = DMAE_PCI_ERROR;
543	}	543	}
@@ -574,7 +574,7 @@ void bnx2x_write_dmae(struct bnx2x *bp, dma_addr_t dma_addr, u32 dst_addr, · 30 unmodified lines
574	dmae.len = len32;	574	dmae.len = len32;
575		575
576	/* issue the command and wait for completion */	576	/* issue the command and wait for completion */
577	rc = bnx2x_issue_dmae_with_comp(bp, &dmae);	577	rc = bnx2x_issue_dmae_with_comp(bp, &dmae, bnx2x_sp(bp, wb_comp));
578	if (rc) {	578	if (rc) {
579	BNX2X_ERR("DMAE returned failure %d\n", rc);	579	BNX2X_ERR("DMAE returned failure %d\n", rc);
580	bnx2x_panic();	580	bnx2x_panic();
@@ -611,7 +611,7 @@ void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32) · 30 unmodified lines
611	dmae.len = len32;	611	dmae.len = len32;
612		612
613	/* issue the command and wait for completion */	613	/* issue the command and wait for completion */
614	rc = bnx2x_issue_dmae_with_comp(bp, &dmae);	614	rc = bnx2x_issue_dmae_with_comp(bp, &dmae, bnx2x_sp(bp, wb_comp));
615	if (rc) {	615	if (rc) {
616	BNX2X_ERR("DMAE returned failure %d\n", rc);	616	BNX2X_ERR("DMAE returned failure %d\n", rc);
617	bnx2x_panic();	617	bnx2x_panic();
@@ -751,6 +751,10 @@ static int bnx2x_mc_assert(struct bnx2x *bp) · 133 unmodified lines
751	return rc;	751	return rc;
752	}	752	}
753		753
		754	#define MCPR_TRACE_BUFFER_SIZE (0x800)
		755	#define SCRATCH_BUFFER_SIZE(bp) \
		756	(CHIP_IS_E1(bp) ? 0x10000 : (CHIP_IS_E1H(bp) ? 0x20000 : 0x28000))
		757
754	void bnx2x_fw_dump_lvl(struct bnx2x bp, const char lvl)	758	void bnx2x_fw_dump_lvl(struct bnx2x bp, const char lvl)
755	{	759	{
756	u32 addr, val;	760	u32 addr, val;
@@ -775,7 +779,17 @@ void bnx2x_fw_dump_lvl(struct bnx2x bp, const char lvl) · 18 unmodified lines
775	trace_shmem_base = bp->common.shmem_base;	779	trace_shmem_base = bp->common.shmem_base;
776	else	780	else
777	trace_shmem_base = SHMEM2_RD(bp, other_shmem_base_addr);	781	trace_shmem_base = SHMEM2_RD(bp, other_shmem_base_addr);
778	addr = trace_shmem_base - 0x800;	782
		783	/* sanity */
		784	if (trace_shmem_base < MCPR_SCRATCH_BASE(bp) + MCPR_TRACE_BUFFER_SIZE \|\|
		785	trace_shmem_base >= MCPR_SCRATCH_BASE(bp) +
		786	SCRATCH_BUFFER_SIZE(bp)) {
		787	BNX2X_ERR("Unable to dump trace buffer (mark %x)\n",
		788	trace_shmem_base);
		789	return;
		790	}
		791
		792	addr = trace_shmem_base - MCPR_TRACE_BUFFER_SIZE;
779		793
780	/* validate TRCB signature */	794	/* validate TRCB signature */
781	mark = REG_RD(bp, addr);	795	mark = REG_RD(bp, addr);
@@ -787,14 +801,17 @@ void bnx2x_fw_dump_lvl(struct bnx2x bp, const char lvl) · 5 unmodified lines
787	/* read cyclic buffer pointer */	801	/* read cyclic buffer pointer */
788	addr += 4;	802	addr += 4;
789	mark = REG_RD(bp, addr);	803	mark = REG_RD(bp, addr);
790	mark = (CHIP_IS_E1x(bp) ? MCP_REG_MCPR_SCRATCH : MCP_A_REG_MCPR_SCRATCH)	804	mark = MCPR_SCRATCH_BASE(bp) + ((mark + 0x3) & ~0x3) - 0x08000000;
791	+ ((mark + 0x3) & ~0x3) - 0x08000000;	805	if (mark >= trace_shmem_base \|\| mark < addr + 4) {
		806	BNX2X_ERR("Mark doesn't fall inside Trace Buffer\n");
		807	return;
		808	}
792	printk("%s" "begin fw dump (mark 0x%x)\n", lvl, mark);	809	printk("%s" "begin fw dump (mark 0x%x)\n", lvl, mark);
793		810
794	printk("%s", lvl);	811	printk("%s", lvl);
795		812
796	/* dump buffer after the mark */	813	/* dump buffer after the mark */
797	for (offset = mark; offset <= trace_shmem_base; offset += 0x8*4) {	814	for (offset = mark; offset < trace_shmem_base; offset += 0x8*4) {
798	for (word = 0; word < 8; word++)	815	for (word = 0; word < 8; word++)
799	data[word] = htonl(REG_RD(bp, offset + 4*word));	816	data[word] = htonl(REG_RD(bp, offset + 4*word));
800	data[8] = 0x0;	817	data[8] = 0x0;
@@ -4280,65 +4297,60 @@ static void _print_next_block(int idx, const char *blk) · 3479 unmodified lines
4280	pr_cont("%s%s", idx ? ", " : "", blk);	4297	pr_cont("%s%s", idx ? ", " : "", blk);
4281	}	4298	}
4282		4299
4283	static int bnx2x_check_blocks_with_parity0(struct bnx2x *bp, u32 sig,	4300	static bool bnx2x_check_blocks_with_parity0(struct bnx2x *bp, u32 sig,
4284	int par_num, bool print)	4301	int *par_num, bool print)
4285	{	4302	{
4286	int i = 0;	4303	u32 cur_bit;
4287	u32 cur_bit = 0;	4304	bool res;
		4305	int i;
		4306
		4307	res = false;
		4308
4288	for (i = 0; sig; i++) {	4309	for (i = 0; sig; i++) {
4289	cur_bit = ((u32)0x1 << i);	4310	cur_bit = (0x1UL << i);
4290	if (sig & cur_bit) {	4311	if (sig & cur_bit) {
4291	switch (cur_bit) {	4312	res \|= true; /* Each bit is real error! */
4292	case AEU_INPUTS_ATTN_BITS_BRB_PARITY_ERROR:	4313
4293	if (print) {	4314	if (print) {
4294	_print_next_block(par_num++, "BRB");	4315	switch (cur_bit) {
		4316	case AEU_INPUTS_ATTN_BITS_BRB_PARITY_ERROR:
		4317	_print_next_block((*par_num)++, "BRB");
4295	_print_parity(bp,	4318	_print_parity(bp,
4296	BRB1_REG_BRB1_PRTY_STS);	4319	BRB1_REG_BRB1_PRTY_STS);
4297	}	4320	break;
4298	break;	4321	case AEU_INPUTS_ATTN_BITS_PARSER_PARITY_ERROR:
4299	case AEU_INPUTS_ATTN_BITS_PARSER_PARITY_ERROR:	4322	_print_next_block((*par_num)++,
4300	if (print) {	4323	"PARSER");
4301	_print_next_block(par_num++, "PARSER");
4302	_print_parity(bp, PRS_REG_PRS_PRTY_STS);	4324	_print_parity(bp, PRS_REG_PRS_PRTY_STS);
4303	}	4325	break;
4304	break;	4326	case AEU_INPUTS_ATTN_BITS_TSDM_PARITY_ERROR:
4305	case AEU_INPUTS_ATTN_BITS_TSDM_PARITY_ERROR:	4327	_print_next_block((*par_num)++, "TSDM");
4306	if (print) {
4307	_print_next_block(par_num++, "TSDM");
4308	_print_parity(bp,	4328	_print_parity(bp,
4309	TSDM_REG_TSDM_PRTY_STS);	4329	TSDM_REG_TSDM_PRTY_STS);
4310	}	4330	break;
4311	break;	4331	case AEU_INPUTS_ATTN_BITS_SEARCHER_PARITY_ERROR:
4312	case AEU_INPUTS_ATTN_BITS_SEARCHER_PARITY_ERROR:	4332	_print_next_block((*par_num)++,
4313	if (print) {
4314	_print_next_block(par_num++,
4315	"SEARCHER");	4333	"SEARCHER");
4316	_print_parity(bp, SRC_REG_SRC_PRTY_STS);	4334	_print_parity(bp, SRC_REG_SRC_PRTY_STS);
4317	}	4335	break;
4318	break;	4336	case AEU_INPUTS_ATTN_BITS_TCM_PARITY_ERROR:
4319	case AEU_INPUTS_ATTN_BITS_TCM_PARITY_ERROR:	4337	_print_next_block((*par_num)++, "TCM");
4320	if (print) {	4338	_print_parity(bp, TCM_REG_TCM_PRTY_STS);
4321	_print_next_block(par_num++, "TCM");	4339	break;
4322	_print_parity(bp,	4340	case AEU_INPUTS_ATTN_BITS_TSEMI_PARITY_ERROR:
4323	TCM_REG_TCM_PRTY_STS);	4341	_print_next_block((*par_num)++,
4324	}	4342	"TSEMI");
4325	break;
4326	case AEU_INPUTS_ATTN_BITS_TSEMI_PARITY_ERROR:
4327	if (print) {
4328	_print_next_block(par_num++, "TSEMI");
4329	_print_parity(bp,	4343	_print_parity(bp,
4330	TSEM_REG_TSEM_PRTY_STS_0);	4344	TSEM_REG_TSEM_PRTY_STS_0);
4331	_print_parity(bp,	4345	_print_parity(bp,
4332	TSEM_REG_TSEM_PRTY_STS_1);	4346	TSEM_REG_TSEM_PRTY_STS_1);
4333	}	4347	break;
4334	break;	4348	case AEU_INPUTS_ATTN_BITS_PBCLIENT_PARITY_ERROR:
4335	case AEU_INPUTS_ATTN_BITS_PBCLIENT_PARITY_ERROR:	4349	_print_next_block((*par_num)++, "XPB");
4336	if (print) {
4337	_print_next_block(par_num++, "XPB");
4338	_print_parity(bp, GRCBASE_XPB +	4350	_print_parity(bp, GRCBASE_XPB +
4339	PB_REG_PB_PRTY_STS);	4351	PB_REG_PB_PRTY_STS);
		4352	break;
4340	}	4353	}
4341	break;
4342	}	4354	}
4343		4355
4344	/* Clear the bit */	4356	/* Clear the bit */
@@ -4346,53 +4358,59 @@ static int bnx2x_check_blocks_with_parity0(struct bnx2x *bp, u32 sig, · 1 unmodified line
4346	}	4358	}
4347	}	4359	}
4348		4360
4349	return par_num;	4361	return res;
4350	}	4362	}
4351		4363
4352	static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig,	4364	static bool bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig,
4353	int par_num, bool *global,	4365	int par_num, bool global,
4354	bool print)	4366	bool print)
4355	{	4367	{
4356	int i = 0;	4368	u32 cur_bit;
4357	u32 cur_bit = 0;	4369	bool res;
		4370	int i;
		4371
		4372	res = false;
		4373
4358	for (i = 0; sig; i++) {	4374	for (i = 0; sig; i++) {
4359	cur_bit = ((u32)0x1 << i);	4375	cur_bit = (0x1UL << i);
4360	if (sig & cur_bit) {	4376	if (sig & cur_bit) {
		4377	res \|= true; /* Each bit is real error! */
4361	switch (cur_bit) {	4378	switch (cur_bit) {
4362	case AEU_INPUTS_ATTN_BITS_PBF_PARITY_ERROR:	4379	case AEU_INPUTS_ATTN_BITS_PBF_PARITY_ERROR:
4363	if (print) {	4380	if (print) {
4364	_print_next_block(par_num++, "PBF");	4381	_print_next_block((*par_num)++, "PBF");
4365	_print_parity(bp, PBF_REG_PBF_PRTY_STS);	4382	_print_parity(bp, PBF_REG_PBF_PRTY_STS);
4366	}	4383	}
4367	break;	4384	break;
4368	case AEU_INPUTS_ATTN_BITS_QM_PARITY_ERROR:	4385	case AEU_INPUTS_ATTN_BITS_QM_PARITY_ERROR:
4369	if (print) {	4386	if (print) {
4370	_print_next_block(par_num++, "QM");	4387	_print_next_block((*par_num)++, "QM");
4371	_print_parity(bp, QM_REG_QM_PRTY_STS);	4388	_print_parity(bp, QM_REG_QM_PRTY_STS);
4372	}	4389	}
4373	break;	4390	break;
4374	case AEU_INPUTS_ATTN_BITS_TIMERS_PARITY_ERROR:	4391	case AEU_INPUTS_ATTN_BITS_TIMERS_PARITY_ERROR:
4375	if (print) {	4392	if (print) {
4376	_print_next_block(par_num++, "TM");	4393	_print_next_block((*par_num)++, "TM");
4377	_print_parity(bp, TM_REG_TM_PRTY_STS);	4394	_print_parity(bp, TM_REG_TM_PRTY_STS);
4378	}	4395	}
4379	break;	4396	break;
4380	case AEU_INPUTS_ATTN_BITS_XSDM_PARITY_ERROR:	4397	case AEU_INPUTS_ATTN_BITS_XSDM_PARITY_ERROR:
4381	if (print) {	4398	if (print) {
4382	_print_next_block(par_num++, "XSDM");	4399	_print_next_block((*par_num)++, "XSDM");
4383	_print_parity(bp,	4400	_print_parity(bp,
4384	XSDM_REG_XSDM_PRTY_STS);	4401	XSDM_REG_XSDM_PRTY_STS);
4385	}	4402	}
4386	break;	4403	break;
4387	case AEU_INPUTS_ATTN_BITS_XCM_PARITY_ERROR:	4404	case AEU_INPUTS_ATTN_BITS_XCM_PARITY_ERROR:
4388	if (print) {	4405	if (print) {
4389	_print_next_block(par_num++, "XCM");	4406	_print_next_block((*par_num)++, "XCM");
4390	_print_parity(bp, XCM_REG_XCM_PRTY_STS);	4407	_print_parity(bp, XCM_REG_XCM_PRTY_STS);
4391	}	4408	}
4392	break;	4409	break;
4393	case AEU_INPUTS_ATTN_BITS_XSEMI_PARITY_ERROR:	4410	case AEU_INPUTS_ATTN_BITS_XSEMI_PARITY_ERROR:
4394	if (print) {	4411	if (print) {
4395	_print_next_block(par_num++, "XSEMI");	4412	_print_next_block((*par_num)++,
		4413	"XSEMI");
4396	_print_parity(bp,	4414	_print_parity(bp,
4397	XSEM_REG_XSEM_PRTY_STS_0);	4415	XSEM_REG_XSEM_PRTY_STS_0);
4398	_print_parity(bp,	4416	_print_parity(bp,
@@ -4401,7 +4419,7 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig, · 2 unmodified lines
4401	break;	4419	break;
4402	case AEU_INPUTS_ATTN_BITS_DOORBELLQ_PARITY_ERROR:	4420	case AEU_INPUTS_ATTN_BITS_DOORBELLQ_PARITY_ERROR:
4403	if (print) {	4421	if (print) {
4404	_print_next_block(par_num++,	4422	_print_next_block((*par_num)++,
4405	"DOORBELLQ");	4423	"DOORBELLQ");
4406	_print_parity(bp,	4424	_print_parity(bp,
4407	DORQ_REG_DORQ_PRTY_STS);	4425	DORQ_REG_DORQ_PRTY_STS);
@@ -4409,7 +4427,7 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig, · 1 unmodified line
4409	break;	4427	break;
4410	case AEU_INPUTS_ATTN_BITS_NIG_PARITY_ERROR:	4428	case AEU_INPUTS_ATTN_BITS_NIG_PARITY_ERROR:
4411	if (print) {	4429	if (print) {
4412	_print_next_block(par_num++, "NIG");	4430	_print_next_block((*par_num)++, "NIG");
4413	if (CHIP_IS_E1x(bp)) {	4431	if (CHIP_IS_E1x(bp)) {
4414	_print_parity(bp,	4432	_print_parity(bp,
4415	NIG_REG_NIG_PRTY_STS);	4433	NIG_REG_NIG_PRTY_STS);
@@ -4423,32 +4441,34 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig, · 7 unmodified lines
4423	break;	4441	break;
4424	case AEU_INPUTS_ATTN_BITS_VAUX_PCI_CORE_PARITY_ERROR:	4442	case AEU_INPUTS_ATTN_BITS_VAUX_PCI_CORE_PARITY_ERROR:
4425	if (print)	4443	if (print)
4426	_print_next_block(par_num++,	4444	_print_next_block((*par_num)++,
4427	"VAUX PCI CORE");	4445	"VAUX PCI CORE");
4428	*global = true;	4446	*global = true;
4429	break;	4447	break;
4430	case AEU_INPUTS_ATTN_BITS_DEBUG_PARITY_ERROR:	4448	case AEU_INPUTS_ATTN_BITS_DEBUG_PARITY_ERROR:
4431	if (print) {	4449	if (print) {
4432	_print_next_block(par_num++, "DEBUG");	4450	_print_next_block((*par_num)++,
		4451	"DEBUG");
4433	_print_parity(bp, DBG_REG_DBG_PRTY_STS);	4452	_print_parity(bp, DBG_REG_DBG_PRTY_STS);
4434	}	4453	}
4435	break;	4454	break;
4436	case AEU_INPUTS_ATTN_BITS_USDM_PARITY_ERROR:	4455	case AEU_INPUTS_ATTN_BITS_USDM_PARITY_ERROR:
4437	if (print) {	4456	if (print) {
4438	_print_next_block(par_num++, "USDM");	4457	_print_next_block((*par_num)++, "USDM");
4439	_print_parity(bp,	4458	_print_parity(bp,
4440	USDM_REG_USDM_PRTY_STS);	4459	USDM_REG_USDM_PRTY_STS);
4441	}	4460	}
4442	break;	4461	break;
4443	case AEU_INPUTS_ATTN_BITS_UCM_PARITY_ERROR:	4462	case AEU_INPUTS_ATTN_BITS_UCM_PARITY_ERROR:
4444	if (print) {	4463	if (print) {
4445	_print_next_block(par_num++, "UCM");	4464	_print_next_block((*par_num)++, "UCM");
4446	_print_parity(bp, UCM_REG_UCM_PRTY_STS);	4465	_print_parity(bp, UCM_REG_UCM_PRTY_STS);
4447	}	4466	}
4448	break;	4467	break;
4449	case AEU_INPUTS_ATTN_BITS_USEMI_PARITY_ERROR:	4468	case AEU_INPUTS_ATTN_BITS_USEMI_PARITY_ERROR:
4450	if (print) {	4469	if (print) {
4451	_print_next_block(par_num++, "USEMI");	4470	_print_next_block((*par_num)++,
		4471	"USEMI");
4452	_print_parity(bp,	4472	_print_parity(bp,
4453	USEM_REG_USEM_PRTY_STS_0);	4473	USEM_REG_USEM_PRTY_STS_0);
4454	_print_parity(bp,	4474	_print_parity(bp,
@@ -4457,21 +4477,21 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig, · 2 unmodified lines
4457	break;	4477	break;
4458	case AEU_INPUTS_ATTN_BITS_UPB_PARITY_ERROR:	4478	case AEU_INPUTS_ATTN_BITS_UPB_PARITY_ERROR:
4459	if (print) {	4479	if (print) {
4460	_print_next_block(par_num++, "UPB");	4480	_print_next_block((*par_num)++, "UPB");
4461	_print_parity(bp, GRCBASE_UPB +	4481	_print_parity(bp, GRCBASE_UPB +
4462	PB_REG_PB_PRTY_STS);	4482	PB_REG_PB_PRTY_STS);
4463	}	4483	}
4464	break;	4484	break;
4465	case AEU_INPUTS_ATTN_BITS_CSDM_PARITY_ERROR:	4485	case AEU_INPUTS_ATTN_BITS_CSDM_PARITY_ERROR:
4466	if (print) {	4486	if (print) {
4467	_print_next_block(par_num++, "CSDM");	4487	_print_next_block((*par_num)++, "CSDM");
4468	_print_parity(bp,	4488	_print_parity(bp,
4469	CSDM_REG_CSDM_PRTY_STS);	4489	CSDM_REG_CSDM_PRTY_STS);
4470	}	4490	}
4471	break;	4491	break;
4472	case AEU_INPUTS_ATTN_BITS_CCM_PARITY_ERROR:	4492	case AEU_INPUTS_ATTN_BITS_CCM_PARITY_ERROR:
4473	if (print) {	4493	if (print) {
4474	_print_next_block(par_num++, "CCM");	4494	_print_next_block((*par_num)++, "CCM");
4475	_print_parity(bp, CCM_REG_CCM_PRTY_STS);	4495	_print_parity(bp, CCM_REG_CCM_PRTY_STS);
4476	}	4496	}
4477	break;	4497	break;
@@ -4482,80 +4502,73 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig, · 4 unmodified lines
4482	}	4502	}
4483	}	4503	}
4484		4504
4485	return par_num;	4505	return res;
4486	}	4506	}
4487		4507
4488	static int bnx2x_check_blocks_with_parity2(struct bnx2x *bp, u32 sig,	4508	static bool bnx2x_check_blocks_with_parity2(struct bnx2x *bp, u32 sig,
4489	int par_num, bool print)	4509	int *par_num, bool print)
4490	{	4510	{
4491	int i = 0;	4511	u32 cur_bit;
4492	u32 cur_bit = 0;	4512	bool res;
		4513	int i;
		4514
		4515	res = false;
		4516
4493	for (i = 0; sig; i++) {	4517	for (i = 0; sig; i++) {
4494	cur_bit = ((u32)0x1 << i);	4518	cur_bit = (0x1UL << i);
4495	if (sig & cur_bit) {	4519	if (sig & cur_bit) {
4496	switch (cur_bit) {	4520	res \|= true; /* Each bit is real error! */
4497	case AEU_INPUTS_ATTN_BITS_CSEMI_PARITY_ERROR:	4521	if (print) {
4498	if (print) {	4522	switch (cur_bit) {
4499	_print_next_block(par_num++, "CSEMI");	4523	case AEU_INPUTS_ATTN_BITS_CSEMI_PARITY_ERROR:
		4524	_print_next_block((*par_num)++,
		4525	"CSEMI");
4500	_print_parity(bp,	4526	_print_parity(bp,
4501	CSEM_REG_CSEM_PRTY_STS_0);	4527	CSEM_REG_CSEM_PRTY_STS_0);
4502	_print_parity(bp,	4528	_print_parity(bp,
4503	CSEM_REG_CSEM_PRTY_STS_1);	4529	CSEM_REG_CSEM_PRTY_STS_1);
4504	}	4530	break;
4505	break;	4531	case AEU_INPUTS_ATTN_BITS_PXP_PARITY_ERROR:
4506	case AEU_INPUTS_ATTN_BITS_PXP_PARITY_ERROR:	4532	_print_next_block((*par_num)++, "PXP");
4507	if (print) {
4508	_print_next_block(par_num++, "PXP");
4509	_print_parity(bp, PXP_REG_PXP_PRTY_STS);	4533	_print_parity(bp, PXP_REG_PXP_PRTY_STS);
4510	_print_parity(bp,	4534	_print_parity(bp,
4511	PXP2_REG_PXP2_PRTY_STS_0);	4535	PXP2_REG_PXP2_PRTY_STS_0);
4512	_print_parity(bp,	4536	_print_parity(bp,
4513	PXP2_REG_PXP2_PRTY_STS_1);	4537	PXP2_REG_PXP2_PRTY_STS_1);
4514	}	4538	break;
4515	break;	4539	case AEU_IN_ATTN_BITS_PXPPCICLOCKCLIENT_PARITY_ERROR:
4516	case AEU_IN_ATTN_BITS_PXPPCICLOCKCLIENT_PARITY_ERROR:	4540	_print_next_block((*par_num)++,
4517	if (print)	4541	"PXPPCICLOCKCLIENT");
4518	_print_next_block(par_num++,	4542	break;
4519	"PXPPCICLOCKCLIENT");	4543	case AEU_INPUTS_ATTN_BITS_CFC_PARITY_ERROR:
4520	break;	4544	_print_next_block((*par_num)++, "CFC");
4521	case AEU_INPUTS_ATTN_BITS_CFC_PARITY_ERROR:
4522	if (print) {
4523	_print_next_block(par_num++, "CFC");
4524	_print_parity(bp,	4545	_print_parity(bp,
4525	CFC_REG_CFC_PRTY_STS);	4546	CFC_REG_CFC_PRTY_STS);
4526	}	4547	break;
4527	break;	4548	case AEU_INPUTS_ATTN_BITS_CDU_PARITY_ERROR:
4528	case AEU_INPUTS_ATTN_BITS_CDU_PARITY_ERROR:	4549	_print_next_block((*par_num)++, "CDU");
4529	if (print) {
4530	_print_next_block(par_num++, "CDU");
4531	_print_parity(bp, CDU_REG_CDU_PRTY_STS);	4550	_print_parity(bp, CDU_REG_CDU_PRTY_STS);
4532	}	4551	break;
4533	break;	4552	case AEU_INPUTS_ATTN_BITS_DMAE_PARITY_ERROR:
4534	case AEU_INPUTS_ATTN_BITS_DMAE_PARITY_ERROR:	4553	_print_next_block((*par_num)++, "DMAE");
4535	if (print) {
4536	_print_next_block(par_num++, "DMAE");
4537	_print_parity(bp,	4554	_print_parity(bp,
4538	DMAE_REG_DMAE_PRTY_STS);	4555	DMAE_REG_DMAE_PRTY_STS);
4539	}	4556	break;
4540	break;	4557	case AEU_INPUTS_ATTN_BITS_IGU_PARITY_ERROR:
4541	case AEU_INPUTS_ATTN_BITS_IGU_PARITY_ERROR:	4558	_print_next_block((*par_num)++, "IGU");
4542	if (print) {
4543	_print_next_block(par_num++, "IGU");
4544	if (CHIP_IS_E1x(bp))	4559	if (CHIP_IS_E1x(bp))
4545	_print_parity(bp,	4560	_print_parity(bp,
4546	HC_REG_HC_PRTY_STS);	4561	HC_REG_HC_PRTY_STS);
4547	else	4562	else
4548	_print_parity(bp,	4563	_print_parity(bp,
4549	IGU_REG_IGU_PRTY_STS);	4564	IGU_REG_IGU_PRTY_STS);
4550	}	4565	break;
4551	break;	4566	case AEU_INPUTS_ATTN_BITS_MISC_PARITY_ERROR:
4552	case AEU_INPUTS_ATTN_BITS_MISC_PARITY_ERROR:	4567	_print_next_block((*par_num)++, "MISC");
4553	if (print) {
4554	_print_next_block(par_num++, "MISC");
4555	_print_parity(bp,	4568	_print_parity(bp,
4556	MISC_REG_MISC_PRTY_STS);	4569	MISC_REG_MISC_PRTY_STS);
		4570	break;
4557	}	4571	}
4558	break;
4559	}	4572	}
4560		4573
4561	/* Clear the bit */	4574	/* Clear the bit */
@@ -4563,40 +4576,49 @@ static int bnx2x_check_blocks_with_parity2(struct bnx2x *bp, u32 sig, · 1 unmodified line
4563	}	4576	}
4564	}	4577	}
4565		4578
4566	return par_num;	4579	return res;
4567	}	4580	}
4568		4581
4569	static int bnx2x_check_blocks_with_parity3(u32 sig, int par_num,	4582	static bool bnx2x_check_blocks_with_parity3(struct bnx2x *bp, u32 sig,
4570	bool *global, bool print)	4583	int par_num, bool global,
		4584	bool print)
4571	{	4585	{
4572	int i = 0;	4586	bool res = false;
4573	u32 cur_bit = 0;	4587	u32 cur_bit;
		4588	int i;
		4589
4574	for (i = 0; sig; i++) {	4590	for (i = 0; sig; i++) {
4575	cur_bit = ((u32)0x1 << i);	4591	cur_bit = (0x1UL << i);
4576	if (sig & cur_bit) {	4592	if (sig & cur_bit) {
4577	switch (cur_bit) {	4593	switch (cur_bit) {
4578	case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_ROM_PARITY:	4594	case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_ROM_PARITY:
4579	if (print)	4595	if (print)
4580	_print_next_block(par_num++, "MCP ROM");	4596	_print_next_block((*par_num)++,
		4597	"MCP ROM");
4581	*global = true;	4598	*global = true;
		4599	res \|= true;
4582	break;	4600	break;
4583	case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_RX_PARITY:	4601	case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_RX_PARITY:
4584	if (print)	4602	if (print)
4585	_print_next_block(par_num++,	4603	_print_next_block((*par_num)++,
4586	"MCP UMP RX");	4604	"MCP UMP RX");
4587	*global = true;	4605	*global = true;
		4606	res \|= true;
4588	break;	4607	break;
4589	case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY:	4608	case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY:
4590	if (print)	4609	if (print)
4591	_print_next_block(par_num++,	4610	_print_next_block((*par_num)++,
4592	"MCP UMP TX");	4611	"MCP UMP TX");
4593	*global = true;	4612	*global = true;
		4613	res \|= true;
4594	break;	4614	break;
4595	case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY:	4615	case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY:
4596	if (print)	4616	if (print)
4597	_print_next_block(par_num++,	4617	_print_next_block((*par_num)++,
4598	"MCP SCPAD");	4618	"MCP SCPAD");
4599	*global = true;	4619	/* clear latched SCPAD PATIRY from MCP */
		4620	REG_WR(bp, MISC_REG_AEU_CLR_LATCH_SIGNAL,
		4621	1UL << 10);
4600	break;	4622	break;
4601	}	4623	}
4602		4624
@@ -4605,45 +4627,50 @@ static int bnx2x_check_blocks_with_parity3(u32 sig, int par_num, · 2 unmodified lines
4605	}	4627	}
4606	}	4628	}
4607		4629
4608	return par_num;	4630	return res;
4609	}	4631	}
4610		4632
4611	static int bnx2x_check_blocks_with_parity4(struct bnx2x *bp, u32 sig,	4633	static bool bnx2x_check_blocks_with_parity4(struct bnx2x *bp, u32 sig,
4612	int par_num, bool print)	4634	int *par_num, bool print)
4613	{	4635	{
4614	int i = 0;	4636	u32 cur_bit;
4615	u32 cur_bit = 0;	4637	bool res;
		4638	int i;
		4639
		4640	res = false;
		4641
4616	for (i = 0; sig; i++) {	4642	for (i = 0; sig; i++) {
4617	cur_bit = ((u32)0x1 << i);	4643	cur_bit = (0x1UL << i);
4618	if (sig & cur_bit) {	4644	if (sig & cur_bit) {
4619	switch (cur_bit) {	4645	res \|= true; /* Each bit is real error! */
4620	case AEU_INPUTS_ATTN_BITS_PGLUE_PARITY_ERROR:	4646	if (print) {
4621	if (print) {	4647	switch (cur_bit) {
4622	_print_next_block(par_num++, "PGLUE_B");	4648	case AEU_INPUTS_ATTN_BITS_PGLUE_PARITY_ERROR:
		4649	_print_next_block((*par_num)++,
		4650	"PGLUE_B");
4623	_print_parity(bp,	4651	_print_parity(bp,
4624	PGLUE_B_REG_PGLUE_B_PRTY_STS);	4652	PGLUE_B_REG_PGLUE_B_PRTY_STS);
4625	}	4653	break;
4626	break;	4654	case AEU_INPUTS_ATTN_BITS_ATC_PARITY_ERROR:
4627	case AEU_INPUTS_ATTN_BITS_ATC_PARITY_ERROR:	4655	_print_next_block((*par_num)++, "ATC");
4628	if (print) {
4629	_print_next_block(par_num++, "ATC");
4630	_print_parity(bp,	4656	_print_parity(bp,
4631	ATC_REG_ATC_PRTY_STS);	4657	ATC_REG_ATC_PRTY_STS);
		4658	break;
4632	}	4659	}
4633	break;
4634	}	4660	}
4635
4636	/* Clear the bit */	4661	/* Clear the bit */
4637	sig &= ~cur_bit;	4662	sig &= ~cur_bit;
4638	}	4663	}
4639	}	4664	}
4640		4665
4641	return par_num;	4666	return res;
4642	}	4667	}
4643		4668
4644	static bool bnx2x_parity_attn(struct bnx2x bp, bool global, bool print,	4669	static bool bnx2x_parity_attn(struct bnx2x bp, bool global, bool print,
4645	u32 *sig)	4670	u32 *sig)
4646	{	4671	{
		4672	bool res = false;
		4673
4647	if ((sig[0] & HW_PRTY_ASSERT_SET_0) \|\|	4674	if ((sig[0] & HW_PRTY_ASSERT_SET_0) \|\|
4648	(sig[1] & HW_PRTY_ASSERT_SET_1) \|\|	4675	(sig[1] & HW_PRTY_ASSERT_SET_1) \|\|
4649	(sig[2] & HW_PRTY_ASSERT_SET_2) \|\|	4676	(sig[2] & HW_PRTY_ASSERT_SET_2) \|\|
@@ -4660,23 +4687,22 @@ static bool bnx2x_parity_attn(struct bnx2x bp, bool global, bool print, · 10 unmodified lines
4660	if (print)	4687	if (print)
4661	netdev_err(bp->dev,	4688	netdev_err(bp->dev,
4662	"Parity errors detected in blocks: ");	4689	"Parity errors detected in blocks: ");
4663	par_num = bnx2x_check_blocks_with_parity0(bp,	4690	res \|= bnx2x_check_blocks_with_parity0(bp,
4664	sig[0] & HW_PRTY_ASSERT_SET_0, par_num, print);	4691	sig[0] & HW_PRTY_ASSERT_SET_0, &par_num, print);
4665	par_num = bnx2x_check_blocks_with_parity1(bp,	4692	res \|= bnx2x_check_blocks_with_parity1(bp,
4666	sig[1] & HW_PRTY_ASSERT_SET_1, par_num, global, print);	4693	sig[1] & HW_PRTY_ASSERT_SET_1, &par_num, global, print);
4667	par_num = bnx2x_check_blocks_with_parity2(bp,	4694	res \|= bnx2x_check_blocks_with_parity2(bp,
4668	sig[2] & HW_PRTY_ASSERT_SET_2, par_num, print);	4695	sig[2] & HW_PRTY_ASSERT_SET_2, &par_num, print);
4669	par_num = bnx2x_check_blocks_with_parity3(	4696	res \|= bnx2x_check_blocks_with_parity3(bp,
4670	sig[3] & HW_PRTY_ASSERT_SET_3, par_num, global, print);	4697	sig[3] & HW_PRTY_ASSERT_SET_3, &par_num, global, print);
4671	par_num = bnx2x_check_blocks_with_parity4(bp,	4698	res \|= bnx2x_check_blocks_with_parity4(bp,
4672	sig[4] & HW_PRTY_ASSERT_SET_4, par_num, print);	4699	sig[4] & HW_PRTY_ASSERT_SET_4, &par_num, print);
4673		4700
4674	if (print)	4701	if (print)
4675	pr_cont("\n");	4702	pr_cont("\n");
		4703	}
4676		4704
4677	return true;	4705	return res;
4678	} else
4679	return false;
4680	}	4706	}
4681		4707
4682	/**	4708	/**
@@ -7126,7 +7152,7 @@ static int bnx2x_init_hw_port(struct bnx2x *bp) · 2443 unmodified lines
7126	int port = BP_PORT(bp);	7152	int port = BP_PORT(bp);
7127	int init_phase = port ? PHASE_PORT1 : PHASE_PORT0;	7153	int init_phase = port ? PHASE_PORT1 : PHASE_PORT0;
7128	u32 low, high;	7154	u32 low, high;
7129	u32 val;	7155	u32 val, reg;
7130		7156
7131	DP(NETIF_MSG_HW, "starting port init port %d\n", port);	7157	DP(NETIF_MSG_HW, "starting port init port %d\n", port);
7132		7158
@@ -7271,6 +7297,17 @@ static int bnx2x_init_hw_port(struct bnx2x *bp) · 138 unmodified lines
7271	val \|= CHIP_IS_E1(bp) ? 0 : 0x10;	7297	val \|= CHIP_IS_E1(bp) ? 0 : 0x10;
7272	REG_WR(bp, MISC_REG_AEU_MASK_ATTN_FUNC_0 + port*4, val);	7298	REG_WR(bp, MISC_REG_AEU_MASK_ATTN_FUNC_0 + port*4, val);
7273		7299
		7300	/* SCPAD_PARITY should NOT trigger close the gates */
		7301	reg = port ? MISC_REG_AEU_ENABLE4_NIG_1 : MISC_REG_AEU_ENABLE4_NIG_0;
		7302	REG_WR(bp, reg,
		7303	REG_RD(bp, reg) &
		7304	~AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY);
		7305
		7306	reg = port ? MISC_REG_AEU_ENABLE4_PXP_1 : MISC_REG_AEU_ENABLE4_PXP_0;
		7307	REG_WR(bp, reg,
		7308	REG_RD(bp, reg) &
		7309	~AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY);
		7310
7274	bnx2x_init_block(bp, BLOCK_NIG, init_phase);	7311	bnx2x_init_block(bp, BLOCK_NIG, init_phase);
7275		7312
7276	if (!CHIP_IS_E1x(bp)) {	7313	if (!CHIP_IS_E1x(bp)) {
@@ -11693,9 +11730,6 @@ static int bnx2x_init_bp(struct bnx2x *bp) · 4416 unmodified lines
11693	static int bnx2x_open(struct net_device *dev)	11730	static int bnx2x_open(struct net_device *dev)
11694	{	11731	{
11695	struct bnx2x *bp = netdev_priv(dev);	11732	struct bnx2x *bp = netdev_priv(dev);
11696	bool global = false;
11697	int other_engine = BP_PATH(bp) ? 0 : 1;
11698	bool other_load_status, load_status;
11699	int rc;	11733	int rc;
11700		11734
11701	bp->stats_init = true;	11735	bp->stats_init = true;
@@ -11711,6 +11745,10 @@ static int bnx2x_open(struct net_device *dev) · 9 unmodified lines
11711	* Parity recovery is only relevant for PF driver.	11745	* Parity recovery is only relevant for PF driver.
11712	*/	11746	*/
11713	if (IS_PF(bp)) {	11747	if (IS_PF(bp)) {
		11748	int other_engine = BP_PATH(bp) ? 0 : 1;
		11749	bool other_load_status, load_status;
		11750	bool global = false;
		11751
11714	other_load_status = bnx2x_get_load_status(bp, other_engine);	11752	other_load_status = bnx2x_get_load_status(bp, other_engine);
11715	load_status = bnx2x_get_load_status(bp, BP_PATH(bp));	11753	load_status = bnx2x_get_load_status(bp, BP_PATH(bp));
11716	if (!bnx2x_reset_is_done(bp, BP_PATH(bp)) \|\|	11754	if (!bnx2x_reset_is_done(bp, BP_PATH(bp)) \|\|
@@ -12103,7 +12141,6 @@ static int bnx2x_set_coherency_mask(struct bnx2x *bp) · 386 unmodified lines
12103	struct device *dev = &bp->pdev->dev;	12141	struct device *dev = &bp->pdev->dev;
12104		12142
12105	if (dma_set_mask(dev, DMA_BIT_MASK(64)) == 0) {	12143	if (dma_set_mask(dev, DMA_BIT_MASK(64)) == 0) {
12106	bp->flags \|= USING_DAC_FLAG;
12107	if (dma_set_coherent_mask(dev, DMA_BIT_MASK(64)) != 0) {	12144	if (dma_set_coherent_mask(dev, DMA_BIT_MASK(64)) != 0) {
12108	dev_err(dev, "dma_set_coherent_mask failed, aborting\n");	12145	dev_err(dev, "dma_set_coherent_mask failed, aborting\n");
12109	return -EIO;	12146	return -EIO;
@@ -12274,8 +12311,7 @@ static int bnx2x_init_dev(struct bnx2x bp, struct pci_dev pdev, · 164 unmodified lines
12274	NETIF_F_TSO \| NETIF_F_TSO_ECN \| NETIF_F_TSO6 \| NETIF_F_HIGHDMA;	12311	NETIF_F_TSO \| NETIF_F_TSO_ECN \| NETIF_F_TSO6 \| NETIF_F_HIGHDMA;
12275		12312
12276	dev->features \|= dev->hw_features \| NETIF_F_HW_VLAN_CTAG_RX;	12313	dev->features \|= dev->hw_features \| NETIF_F_HW_VLAN_CTAG_RX;
12277	if (bp->flags & USING_DAC_FLAG)	12314	dev->features \|= NETIF_F_HIGHDMA;
12278	dev->features \|= NETIF_F_HIGHDMA;
12279		12315
12280	/* Add Loopback capability to the device */	12316	/* Add Loopback capability to the device */
12281	dev->hw_features \|= NETIF_F_LOOPBACK;	12317	dev->hw_features \|= NETIF_F_LOOPBACK;
@@ -12615,24 +12651,24 @@ static int set_max_cos_est(int chip_id) · 333 unmodified lines
12615	return BNX2X_MULTI_TX_COS_E1X;	12651	return BNX2X_MULTI_TX_COS_E1X;
12616	case BCM57712:	12652	case BCM57712:
12617	case BCM57712_MF:	12653	case BCM57712_MF:
12618	case BCM57712_VF:
12619	return BNX2X_MULTI_TX_COS_E2_E3A0;	12654	return BNX2X_MULTI_TX_COS_E2_E3A0;
12620	case BCM57800:	12655	case BCM57800:
12621	case BCM57800_MF:	12656	case BCM57800_MF:
12622	case BCM57800_VF:
12623	case BCM57810:	12657	case BCM57810:
12624	case BCM57810_MF:	12658	case BCM57810_MF:
12625	case BCM57840_4_10:	12659	case BCM57840_4_10:
12626	case BCM57840_2_20:	12660	case BCM57840_2_20:
12627	case BCM57840_O:	12661	case BCM57840_O:
12628	case BCM57840_MFO:	12662	case BCM57840_MFO:
12629	case BCM57810_VF:
12630	case BCM57840_MF:	12663	case BCM57840_MF:
12631	case BCM57840_VF:
12632	case BCM57811:	12664	case BCM57811:
12633	case BCM57811_MF:	12665	case BCM57811_MF:
12634	case BCM57811_VF:
12635	return BNX2X_MULTI_TX_COS_E3B0;	12666	return BNX2X_MULTI_TX_COS_E3B0;
		12667	case BCM57712_VF:
		12668	case BCM57800_VF:
		12669	case BCM57810_VF:
		12670	case BCM57840_VF:
		12671	case BCM57811_VF:
12636	return 1;	12672	return 1;
12637	default:	12673	default:
12638	pr_err("Unknown board_type (%d), aborting\n", chip_id);	12674	pr_err("Unknown board_type (%d), aborting\n", chip_id);

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c+17−12

 				 bnx2x_vfop_qdtor, cmd->done);
 		return bnx2x_vfop_transition(bp, vf, bnx2x_vfop_qdtor,
 					     cmd->block);
+	} else {
+		BNX2X_ERR("VF[%d] failed to add a vfop\n", vf->abs_vfid);
+		return -ENOMEM;
 	}
-	DP(BNX2X_MSG_IOV, "VF[%d] failed to add a vfop. rc %d\n",
-	   vf->abs_vfid, vfop->rc);
-	return -ENOMEM;
 }
 static void
 		rc = bnx2x_del_all_macs(bp, mac_obj, BNX2X_ETH_MAC, true);
 		if (rc) {
 			BNX2X_ERR("failed to delete eth macs\n");
-			return -EINVAL;
+			rc = -EINVAL;
+			goto out;
 		}
 		/* remove existing uc list macs */
 		rc = bnx2x_del_all_macs(bp, mac_obj, BNX2X_UC_LIST_MAC, true);
 		if (rc) {
 			BNX2X_ERR("failed to delete uc_list macs\n");
-			return -EINVAL;
+			rc = -EINVAL;
+			goto out;
 		}
 		/* configure the new mac to device */
 		bnx2x_set_mac_one(bp, (u8 *)&bulletin->mac, mac_obj, true,
 				  BNX2X_ETH_MAC, &ramrod_flags);
+out:
 		bnx2x_unlock_vf_pf_channel(bp, vf, CHANNEL_TLV_PF_SET_MAC);
 	}
 					  &ramrod_flags);
 		if (rc) {
 			BNX2X_ERR("failed to delete vlans\n");
-			return -EINVAL;
+			rc = -EINVAL;
+			goto out;
 		}
 		/* send queue update ramrod to configure default vlan and silent
 			rc = bnx2x_config_vlan_mac(bp, &ramrod_param);
 			if (rc) {
 				BNX2X_ERR("failed to configure vlan\n");
-				return -EINVAL;
+				rc =  -EINVAL;
+				goto out;
 			}
 			/* configure default vlan to vf queue and set silent
 		rc = bnx2x_queue_state_change(bp, &q_params);
 		if (rc) {
 			BNX2X_ERR("Failed to configure default VLAN\n");
-			return rc;
+			goto out;
 		}
 		/* clear the flag indicating that this VF needs its vlan
-		 * (will only be set if the HV configured th Vlan before vf was
+		 * (will only be set if the HV configured the Vlan before vf was
-		 * and we were called because the VF came up later
+		 * up and we were called because the VF came up later
 		 */
+out:
 		vf->cfg_flags &= ~VF_CFG_VLAN;
 		bnx2x_unlock_vf_pf_channel(bp, vf, CHANNEL_TLV_PF_SET_VLAN);
 	}
-	return 0;
+	return rc;
 }
 /* crc is the first field in the bulletin board. Compute the crc over the

drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c+1−1

@@ -196,7 +196,7 @@ static void bnx2x_hw_stats_post(struct bnx2x *bp) · 195 unmodified lines
196		196
197	} else if (bp->func_stx) {	197	} else if (bp->func_stx) {
198	*stats_comp = 0;	198	*stats_comp = 0;
199	bnx2x_post_dmae(bp, dmae, INIT_DMAE_C(bp));	199	bnx2x_issue_dmae_with_comp(bp, dmae, stats_comp);
200	}	200	}
201	}	201	}
202		202

drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c+1−1

@@ -1020,7 +1020,7 @@ static int bnx2x_copy32_vf_dmae(struct bnx2x *bp, u8 from_vf, · 1019 unmodified lines
1020	dmae.len = len32;	1020	dmae.len = len32;
1021		1021
1022	/* issue the command and wait for completion */	1022	/* issue the command and wait for completion */
1023	return bnx2x_issue_dmae_with_comp(bp, &dmae);	1023	return bnx2x_issue_dmae_with_comp(bp, &dmae, bnx2x_sp(bp, wb_comp));
1024	}	1024	}
1025		1025
1026	static void bnx2x_vf_mbx_resp_single_tlv(struct bnx2x *bp,	1026	static void bnx2x_vf_mbx_resp_single_tlv(struct bnx2x *bp,

drivers/net/ethernet/davicom/dm9000.c+38−18

 /* DM9000 network board routine ---------------------------- */
-static void
-dm9000_reset(board_info_t * db)
-{
-	dev_dbg(db->dev, "resetting device\n");
-	/* RESET device */
-	writeb(DM9000_NCR, db->io_addr);
-	udelay(200);
-	writeb(NCR_RST, db->io_data);
-	udelay(200);
-}
 /*
  *   Read a byte from I/O port
  */
 	writeb(value, db->io_data);
 }
+static void
+dm9000_reset(board_info_t *db)
+{
+	dev_dbg(db->dev, "resetting device\n");
+	/* Reset DM9000, see DM9000 Application Notes V1.22 Jun 11, 2004 page 29
+	 * The essential point is that we have to do a double reset, and the
+	 * instruction is to set LBK into MAC internal loopback mode.
+	 */
+	iow(db, DM9000_NCR, 0x03);
+	udelay(100); /* Application note says at least 20 us */
+	if (ior(db, DM9000_NCR) & 1)
+		dev_err(db->dev, "dm9000 did not respond to first reset\n");
+	iow(db, DM9000_NCR, 0);
+	iow(db, DM9000_NCR, 0x03);
+	udelay(100);
+	if (ior(db, DM9000_NCR) & 1)
+		dev_err(db->dev, "dm9000 did not respond to second reset\n");
+}
 /* routines for sending block to chip */
 static void dm9000_outblk_8bit(void __iomem *reg, void *data, int count)
 static void dm9000_show_carrier(board_info_t *db,
 				unsigned carrier, unsigned nsr)
 {
+	int lpa;
 	struct net_device *ndev = db->ndev;
+	struct mii_if_info *mii = &db->mii;
 	unsigned ncr = dm9000_read_locked(db, DM9000_NCR);
-	if (carrier)
+	if (carrier) {
-		dev_info(db->dev, "%s: link up, %dMbps, %s-duplex, no LPA\n",
+		lpa = mii->mdio_read(mii->dev, mii->phy_id, MII_LPA);
+		dev_info(db->dev,
+			 "%s: link up, %dMbps, %s-duplex, lpa 0x%04X\n",
 			 ndev->name, (nsr & NSR_SPEED) ? 10 : 100,
-			 (ncr & NCR_FDX) ? "full" : "half");
+			 (ncr & NCR_FDX) ? "full" : "half", lpa);
-	else
+	} else {
 		dev_info(db->dev, "%s: link down\n", ndev->name);
+	}
 }
 static void
 			(dev->features & NETIF_F_RXCSUM) ? RCSR_CSUM : 0);
 	iow(db, DM9000_GPCR, GPCR_GEP_CNTL);	/* Let GPIO0 output */
+	iow(db, DM9000_GPR, 0);
-	dm9000_phy_write(dev, 0, MII_BMCR, BMCR_RESET); /* PHY RESET */
+	/* If we are dealing with DM9000B, some extra steps are required: a
-	dm9000_phy_write(dev, 0, MII_DM_DSPCR, DSPCR_INIT_PARAM); /* Init */
+	 * manual phy reset, and setting init params.
+	 */
+	if (db->type == TYPE_DM9000B) {
+		dm9000_phy_write(dev, 0, MII_BMCR, BMCR_RESET);
+		dm9000_phy_write(dev, 0, MII_DM_DSPCR, DSPCR_INIT_PARAM);
+	}
 	ncr = (db->flags & DM9000_PLATF_EXT_PHY) ? NCR_EXT_PHY : 0;

drivers/net/ethernet/freescale/gianfar.c+28−10

 #include <asm/io.h>
 #include <asm/reg.h>
+#include <asm/mpc85xx.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <linux/module.h>
 	}
 }
-static void gfar_detect_errata(struct gfar_private *priv)
+static void __gfar_detect_errata_83xx(struct gfar_private *priv)
 {
-	struct device *dev = &priv->ofdev->dev;
 	unsigned int pvr = mfspr(SPRN_PVR);
 	unsigned int svr = mfspr(SPRN_SVR);
 	unsigned int mod = (svr >> 16) & 0xfff6; /* w/o E suffix */
 	    (pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0))
 		priv->errata |= GFAR_ERRATA_76;
-	/* MPC8313 and MPC837x all rev */
+	/* MPC8313 Rev < 2.0 */
-	if ((pvr == 0x80850010 && mod == 0x80b0) ||
+	if (pvr == 0x80850010 && mod == 0x80b0 && rev < 0x0020)
-	    (pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0))
+		priv->errata |= GFAR_ERRATA_12;
-		priv->errata |= GFAR_ERRATA_A002;
+}
-	/* MPC8313 Rev < 2.0, MPC8548 rev 2.0 */
+static void __gfar_detect_errata_85xx(struct gfar_private *priv)
-	if ((pvr == 0x80850010 && mod == 0x80b0 && rev < 0x0020) ||
+{
-	    (pvr == 0x80210020 && mod == 0x8030 && rev == 0x0020))
+	unsigned int svr = mfspr(SPRN_SVR);
+	if ((SVR_SOC_VER(svr) == SVR_8548) && (SVR_REV(svr) == 0x20))
 		priv->errata |= GFAR_ERRATA_12;
+	if (((SVR_SOC_VER(svr) == SVR_P2020) && (SVR_REV(svr) < 0x20)) ||
+	    ((SVR_SOC_VER(svr) == SVR_P2010) && (SVR_REV(svr) < 0x20)))
+		priv->errata |= GFAR_ERRATA_76; /* aka eTSEC 20 */
+}
+static void gfar_detect_errata(struct gfar_private *priv)
+{
+	struct device *dev = &priv->ofdev->dev;
+	/* no plans to fix */
+	priv->errata |= GFAR_ERRATA_A002;
+	if (pvr_version_is(PVR_VER_E500V1) || pvr_version_is(PVR_VER_E500V2))
+		__gfar_detect_errata_85xx(priv);
+	else /* non-mpc85xx parts, i.e. e300 core based */
+		__gfar_detect_errata_83xx(priv);
 	if (priv->errata)
 		dev_info(dev, "enabled errata workarounds, flags: 0x%x\n",
 	/* Normaly TSEC should not hang on GRS commands, so we should
 	 * actually wait for IEVENT_GRSC flag.
 	 */
-	if (likely(!gfar_has_errata(priv, GFAR_ERRATA_A002)))
+	if (!gfar_has_errata(priv, GFAR_ERRATA_A002))
 		return 0;
 	/* Read the eTSEC register at offset 0xD1C. If bits 7-14 are

drivers/net/ethernet/mellanox/mlx5/core/cmd.c+15−13

 	return 0;
 }
-static void calc_block_sig(struct mlx5_cmd_prot_block *block, u8 token)
+static void calc_block_sig(struct mlx5_cmd_prot_block *block, u8 token,
+			   int csum)
 {
 	block->token = token;
-	block->ctrl_sig = ~xor8_buf(block->rsvd0, sizeof(*block) - sizeof(block->data) - 2);
+	if (csum) {
-	block->sig = ~xor8_buf(block, sizeof(*block) - 1);
+		block->ctrl_sig = ~xor8_buf(block->rsvd0, sizeof(*block) -
+					    sizeof(block->data) - 2);
+		block->sig = ~xor8_buf(block, sizeof(*block) - 1);
+	}
 }
-static void calc_chain_sig(struct mlx5_cmd_msg *msg, u8 token)
+static void calc_chain_sig(struct mlx5_cmd_msg *msg, u8 token, int csum)
 {
 	struct mlx5_cmd_mailbox *next = msg->next;
 	while (next) {
-		calc_block_sig(next->buf, token);
+		calc_block_sig(next->buf, token, csum);
 		next = next->next;
 	}
 }
-static void set_signature(struct mlx5_cmd_work_ent *ent)
+static void set_signature(struct mlx5_cmd_work_ent *ent, int csum)
 {
 	ent->lay->sig = ~xor8_buf(ent->lay, sizeof(*ent->lay));
-	calc_chain_sig(ent->in, ent->token);
+	calc_chain_sig(ent->in, ent->token, csum);
-	calc_chain_sig(ent->out, ent->token);
+	calc_chain_sig(ent->out, ent->token, csum);
 }
 static void poll_timeout(struct mlx5_cmd_work_ent *ent)
 	lay->type = MLX5_PCI_CMD_XPORT;
 	lay->token = ent->token;
 	lay->status_own = CMD_OWNER_HW;
-	if (!cmd->checksum_disabled)
+	set_signature(ent, !cmd->checksum_disabled);
-		set_signature(ent);
 	dump_command(dev, ent, 1);
 	ktime_get_ts(&ent->ts1);
 		copy = min_t(int, size, MLX5_CMD_DATA_BLOCK_SIZE);
 		block = next->buf;
-		if (xor8_buf(block, sizeof(*block)) != 0xff)
-			return -EINVAL;
 		memcpy(to, block->data, copy);
 		to += copy;
 		goto err_map;
 	}
+	cmd->checksum_disabled = 1;
 	cmd->max_reg_cmds = (1 << cmd->log_sz) - 1;
 	cmd->bitmask = (1 << cmd->max_reg_cmds) - 1;
 	case MLX5_CMD_STAT_BAD_SYS_STATE_ERR:		return -EIO;
 	case MLX5_CMD_STAT_BAD_RES_ERR:			return -EINVAL;
 	case MLX5_CMD_STAT_RES_BUSY:			return -EBUSY;
-	case MLX5_CMD_STAT_LIM_ERR:			return -EINVAL;
+	case MLX5_CMD_STAT_LIM_ERR:			return -ENOMEM;
 	case MLX5_CMD_STAT_BAD_RES_STATE_ERR:		return -EINVAL;
 	case MLX5_CMD_STAT_IX_ERR:			return -EINVAL;
 	case MLX5_CMD_STAT_NO_RES_ERR:			return -EAGAIN;

drivers/net/ethernet/mellanox/mlx5/core/eq.c+3−1

 		goto err_in;
 	}
+	snprintf(eq->name, MLX5_MAX_EQ_NAME, "%s@pci:%s",
+		 name, pci_name(dev->pdev));
 	eq->eqn = out.eq_number;
 	err = request_irq(table->msix_arr[vecidx].vector, mlx5_msix_handler, 0,
-			  name, eq);
+			  eq->name, eq);
 	if (err)
 		goto err_eq;

drivers/net/ethernet/mellanox/mlx5/core/main.c+5−16

 	struct mlx5_cmd_set_hca_cap_mbox_in *set_ctx = NULL;
 	struct mlx5_cmd_query_hca_cap_mbox_in query_ctx;
 	struct mlx5_cmd_set_hca_cap_mbox_out set_out;
-	struct mlx5_profile *prof = dev->profile;
 	u64 flags;
-	int csum = 1;
 	int err;
 	memset(&query_ctx, 0, sizeof(query_ctx));
 	memcpy(&set_ctx->hca_cap, &query_out->hca_cap,
 	       sizeof(set_ctx->hca_cap));
-	if (prof->mask & MLX5_PROF_MASK_CMDIF_CSUM) {
-		csum = !!prof->cmdif_csum;
-		flags = be64_to_cpu(set_ctx->hca_cap.flags);
-		if (csum)
-			flags |= MLX5_DEV_CAP_FLAG_CMDIF_CSUM;
-		else
-			flags &= ~MLX5_DEV_CAP_FLAG_CMDIF_CSUM;
-		set_ctx->hca_cap.flags = cpu_to_be64(flags);
-	}
 	if (dev->profile->mask & MLX5_PROF_MASK_QP_SIZE)
 		set_ctx->hca_cap.log_max_qp = dev->profile->log_max_qp;
+	flags = be64_to_cpu(query_out->hca_cap.flags);
+	/* disable checksum */
+	flags &= ~MLX5_DEV_CAP_FLAG_CMDIF_CSUM;
+	set_ctx->hca_cap.flags = cpu_to_be64(flags);
 	memset(&set_out, 0, sizeof(set_out));
 	set_ctx->hca_cap.log_uar_page_sz = cpu_to_be16(PAGE_SHIFT - 12);
 	set_ctx->hdr.opcode = cpu_to_be16(MLX5_CMD_OP_SET_HCA_CAP);
 	if (err)
 		goto query_ex;
-	if (!csum)
-		dev->cmd.checksum_disabled = 1;
 query_ex:
 	kfree(query_out);
 	kfree(set_ctx);

drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c+14−2

 	__be64			pas[0];
 };
+enum {
+	MAX_RECLAIM_TIME_MSECS	= 5000,
+};
 static int insert_page(struct mlx5_core_dev *dev, u64 addr, struct page *page, u16 func_id)
 {
 	struct rb_root *root = &dev->priv.page_root;
 	int err;
 	int i;
+	if (nclaimed)
+		*nclaimed = 0;
 	memset(&in, 0, sizeof(in));
 	outlen = sizeof(*out) + npages * sizeof(out->pas[0]);
 	out = mlx5_vzalloc(outlen);
 int mlx5_reclaim_startup_pages(struct mlx5_core_dev *dev)
 {
-	unsigned long end = jiffies + msecs_to_jiffies(5000);
+	unsigned long end = jiffies + msecs_to_jiffies(MAX_RECLAIM_TIME_MSECS);
 	struct fw_page *fwp;
 	struct rb_node *p;
+	int nclaimed = 0;
 	int err;
 	do {
 		p = rb_first(&dev->priv.page_root);
 		if (p) {
 			fwp = rb_entry(p, struct fw_page, rb_node);
-			err = reclaim_pages(dev, fwp->func_id, optimal_reclaimed_pages(), NULL);
+			err = reclaim_pages(dev, fwp->func_id,
+					    optimal_reclaimed_pages(),
+					    &nclaimed);
 			if (err) {
 				mlx5_core_warn(dev, "failed reclaiming pages (%d)\n", err);
 				return err;
 			}
+			if (nclaimed)
+				end = jiffies + msecs_to_jiffies(MAX_RECLAIM_TIME_MSECS);
 		}
 		if (time_after(jiffies, end)) {
 			mlx5_core_warn(dev, "FW did not return all pages. giving up...\n");

drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c+1−1

@@ -691,7 +691,7 @@ static int qlcnic_set_channels(struct net_device *dev, · 690 unmodified lines
691	return err;	691	return err;
692	}	692	}
693		693
694	if (channel->tx_count) {	694	if (qlcnic_82xx_check(adapter) && channel->tx_count) {
695	err = qlcnic_validate_max_tx_rings(adapter, channel->tx_count);	695	err = qlcnic_validate_max_tx_rings(adapter, channel->tx_count);
696	if (err)	696	if (err)
697	return err;	697	return err;

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c+1−7

 	u8 max_hw = QLCNIC_MAX_TX_RINGS;
 	u32 max_allowed;
-	if (!qlcnic_82xx_check(adapter)) {
-		netdev_err(netdev, "No Multi TX-Q support\n");
-		return -EINVAL;
-	}
 	if (!qlcnic_use_msi_x && !qlcnic_use_msi) {
 		netdev_err(netdev, "No Multi TX-Q support in INT-x mode\n");
 		return -EINVAL;
 	u8 max_hw = adapter->ahw->max_rx_ques;
 	u32 max_allowed;
-	if (qlcnic_82xx_check(adapter) && !qlcnic_use_msi_x &&
+	if (!qlcnic_use_msi_x && !qlcnic_use_msi) {
-	    !qlcnic_use_msi) {
 		netdev_err(netdev, "No RSS support in INT-x mode\n");
 		return -EINVAL;
 	}

drivers/net/ethernet/renesas/sh_eth.c+4−4

 	.eesr_err_check	= EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT |
 			  EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE |
 			  EESR_TDE | EESR_ECI,
-	.fdr_value	= 0x0000070f,
-	.rmcr_value	= 0x00000001,
 	.apr		= 1,
 	.mpr		= 1,
 	.tpauser	= 1,
 	.bculr		= 1,
 	.hw_swap	= 1,
-	.rpadir		= 1,
-	.rpadir_value   = 2 << 16,
 	.no_trimd	= 1,
 	.no_ade		= 1,
 	.tsu		= 1,
 	.eesr_err_check	= EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT |
 			  EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE |
 			  EESR_TDE | EESR_ECI,
+	.fdr_value	= 0x0000070f,
+	.rmcr_value	= 0x00000001,
 	.apr		= 1,
 	.mpr		= 1,
 	.tpauser	= 1,
 	.bculr		= 1,
 	.hw_swap	= 1,
+	.rpadir		= 1,
+	.rpadir_value   = 2 << 16,
 	.no_trimd	= 1,
 	.no_ade		= 1,
 	.tsu		= 1,

drivers/net/ethernet/smsc/smc91x.h+2−4

 			void __iomem *__ioaddr = ioaddr;		\
 			if (__len >= 2 && (unsigned long)__ptr & 2) {	\
 				__len -= 2;				\
-				SMC_outw(*(u16 *)__ptr, ioaddr,		\
+				SMC_outsw(ioaddr, DATA_REG(lp), __ptr, 1); \
-					DATA_REG(lp));		\
 				__ptr += 2;				\
 			}						\
 			if (SMC_CAN_USE_DATACS && lp->datacs)		\
 			SMC_outsl(__ioaddr, DATA_REG(lp), __ptr, __len>>2); \
 			if (__len & 2) {				\
 				__ptr += (__len & ~3);			\
-				SMC_outw(*((u16 *)__ptr), ioaddr,	\
+				SMC_outsw(ioaddr, DATA_REG(lp), __ptr, 1); \
-					 DATA_REG(lp));		\
 			}						\
 		} else if (SMC_16BIT(lp))				\
 			SMC_outsw(ioaddr, DATA_REG(lp), p, (l) >> 1);	\

drivers/net/ethernet/ti/cpsw.c+1−8

 static irqreturn_t cpsw_interrupt(int irq, void *dev_id)
 {
 	struct cpsw_priv *priv = dev_id;
-	u32 rx, tx, rx_thresh;
-	rx_thresh = __raw_readl(&priv->wr_regs->rx_thresh_stat);
-	rx = __raw_readl(&priv->wr_regs->rx_stat);
-	tx = __raw_readl(&priv->wr_regs->tx_stat);
-	if (!rx_thresh && !rx && !tx)
-		return IRQ_NONE;
 	cpsw_intr_disable(priv);
 	if (priv->irq_enabled == true) {
 		}
 	}
+	napi_enable(&priv->napi);
 	cpdma_ctlr_start(priv->dma);
 	cpsw_intr_enable(priv);
-	napi_enable(&priv->napi);
 	cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_RX);
 	cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_TX);

drivers/net/ethernet/ti/davinci_emac.c+1−2

@@ -876,8 +876,7 @@ static void emac_dev_mcast_set(struct net_device *ndev) · 875 unmodified lines
876	netdev_mc_count(ndev) > EMAC_DEF_MAX_MULTICAST_ADDRESSES) {	876	netdev_mc_count(ndev) > EMAC_DEF_MAX_MULTICAST_ADDRESSES) {
877	mbp_enable = (mbp_enable \| EMAC_MBP_RXMCAST);	877	mbp_enable = (mbp_enable \| EMAC_MBP_RXMCAST);
878	emac_add_mcast(priv, EMAC_ALL_MULTI_SET, NULL);	878	emac_add_mcast(priv, EMAC_ALL_MULTI_SET, NULL);
879	}	879	} else if (!netdev_mc_empty(ndev)) {
880	if (!netdev_mc_empty(ndev)) {
881	struct netdev_hw_addr *ha;	880	struct netdev_hw_addr *ha;
882		881
883	mbp_enable = (mbp_enable \| EMAC_MBP_RXMCAST);	882	mbp_enable = (mbp_enable \| EMAC_MBP_RXMCAST);

drivers/net/hamradio/yam.c+0−1

@@ -975,7 +975,6 @@ static int yam_ioctl(struct net_device dev, struct ifreq ifr, int cmd) · 974 unmodified lines
975	return -EINVAL; /* Cannot change this parameter when up */	975	return -EINVAL; /* Cannot change this parameter when up */
976	if ((ym = kmalloc(sizeof(struct yamdrv_ioctl_mcs), GFP_KERNEL)) == NULL)	976	if ((ym = kmalloc(sizeof(struct yamdrv_ioctl_mcs), GFP_KERNEL)) == NULL)
977	return -ENOBUFS;	977	return -ENOBUFS;
978	ym->bitrate = 9600;
979	if (copy_from_user(ym, ifr->ifr_data, sizeof(struct yamdrv_ioctl_mcs))) {	978	if (copy_from_user(ym, ifr->ifr_data, sizeof(struct yamdrv_ioctl_mcs))) {
980	kfree(ym);	979	kfree(ym);
981	return -EFAULT;	980	return -EFAULT;

drivers/net/usb/ax88179_178a.c+20−3

 #define AX_RXHDR_L4_TYPE_TCP			16
 #define AX_RXHDR_L3CSUM_ERR			2
 #define AX_RXHDR_L4CSUM_ERR			1
-#define AX_RXHDR_CRC_ERR			((u32)BIT(31))
+#define AX_RXHDR_CRC_ERR			((u32)BIT(29))
-#define AX_RXHDR_DROP_ERR			((u32)BIT(30))
+#define AX_RXHDR_DROP_ERR			((u32)BIT(31))
 #define AX_ACCESS_MAC				0x01
 #define AX_ACCESS_PHY				0x02
 #define AX_ACCESS_EEPROM			0x04
 	.tx_fixup = ax88179_tx_fixup,
 };
+static const struct driver_info samsung_info = {
+	.description = "Samsung USB Ethernet Adapter",
+	.bind = ax88179_bind,
+	.unbind = ax88179_unbind,
+	.status = ax88179_status,
+	.link_reset = ax88179_link_reset,
+	.reset = ax88179_reset,
+	.stop = ax88179_stop,
+	.flags = FLAG_ETHER | FLAG_FRAMING_AX,
+	.rx_fixup = ax88179_rx_fixup,
+	.tx_fixup = ax88179_tx_fixup,
+};
 static const struct usb_device_id products[] = {
 {
 	/* ASIX AX88179 10/100/1000 */
 }, {
 	/* Sitecom USB 3.0 to Gigabit Adapter */
 	USB_DEVICE(0x0df6, 0x0072),
-	.driver_info = (unsigned long) &sitecom_info,
+	.driver_info = (unsigned long)&sitecom_info,
+}, {
+	/* Samsung USB Ethernet Adapter */
+	USB_DEVICE(0x04e8, 0xa100),
+	.driver_info = (unsigned long)&samsung_info,
 },
 	{ },
 };

drivers/net/usb/qmi_wwan.c+1−0

@@ -730,6 +730,7 @@ static const struct usb_device_id products[] = { · 729 unmodified lines
730	{QMI_FIXED_INTF(0x2357, 0x9000, 4)}, /* TP-LINK MA260 */	730	{QMI_FIXED_INTF(0x2357, 0x9000, 4)}, /* TP-LINK MA260 */
731	{QMI_FIXED_INTF(0x1bc7, 0x1200, 5)}, /* Telit LE920 */	731	{QMI_FIXED_INTF(0x1bc7, 0x1200, 5)}, /* Telit LE920 */
732	{QMI_FIXED_INTF(0x1bc7, 0x1201, 2)}, /* Telit LE920 */	732	{QMI_FIXED_INTF(0x1bc7, 0x1201, 2)}, /* Telit LE920 */
		733	{QMI_FIXED_INTF(0x0b3c, 0xc005, 6)}, /* Olivetti Olicard 200 */
733	{QMI_FIXED_INTF(0x1e2d, 0x0060, 4)}, /* Cinterion PLxx */	734	{QMI_FIXED_INTF(0x1e2d, 0x0060, 4)}, /* Cinterion PLxx */
734		735
735	/* 4. Gobi 1000 devices */	736	/* 4. Gobi 1000 devices */

drivers/net/usb/usbnet.c+3−1

 	if (dev->can_dma_sg && !(info->flags & FLAG_SEND_ZLP) &&
 		!(info->flags & FLAG_MULTI_PACKET)) {
 		dev->padding_pkt = kzalloc(1, GFP_KERNEL);
-		if (!dev->padding_pkt)
+		if (!dev->padding_pkt) {
+			status = -ENOMEM;
 			goto out4;
+		}
 	}
 	status = register_netdev (net);

drivers/net/virtio_net.c+13−1

 		return -EINVAL;
 	} else {
 		vi->curr_queue_pairs = queue_pairs;
-		schedule_delayed_work(&vi->refill, 0);
+		/* virtnet_open() will refill when device is going to up. */
+		if (dev->flags & IFF_UP)
+			schedule_delayed_work(&vi->refill, 0);
 	}
 	return 0;
 {
 	struct virtnet_info *vi = container_of(nfb, struct virtnet_info, nb);
+	mutex_lock(&vi->config_lock);
+	if (!vi->config_enable)
+		goto done;
 	switch(action & ~CPU_TASKS_FROZEN) {
 	case CPU_ONLINE:
 	case CPU_DOWN_FAILED:
 	default:
 		break;
 	}
+done:
+	mutex_unlock(&vi->config_lock);
 	return NOTIFY_OK;
 }
 	vi->config_enable = true;
 	mutex_unlock(&vi->config_lock);
+	rtnl_lock();
 	virtnet_set_queues(vi, vi->curr_queue_pairs);
+	rtnl_unlock();
 	return 0;
 }

drivers/net/wan/farsync.c+1−0

@@ -1972,6 +1972,7 @@ fst_get_iface(struct fst_card_info card, struct fst_port_info port, · 1971 unmodified lines
1972	}	1972	}
1973		1973
1974	i = port->index;	1974	i = port->index;
		1975	memset(&sync, 0, sizeof(sync));
1975	sync.clock_rate = FST_RDL(card, portConfig[i].lineSpeed);	1976	sync.clock_rate = FST_RDL(card, portConfig[i].lineSpeed);
1976	/* Lucky card and linux use same encoding here */	1977	/* Lucky card and linux use same encoding here */
1977	sync.clock_type = FST_RDB(card, portConfig[i].internalClock) ==	1978	sync.clock_type = FST_RDB(card, portConfig[i].internalClock) ==

drivers/net/wan/wanxl.c+1−0

@@ -355,6 +355,7 @@ static int wanxl_ioctl(struct net_device dev, struct ifreq ifr, int cmd) · 354 unmodified lines
355	ifr->ifr_settings.size = size; /* data size wanted */	355	ifr->ifr_settings.size = size; /* data size wanted */
356	return -ENOBUFS;	356	return -ENOBUFS;
357	}	357	}
		358	memset(&line, 0, sizeof(line));
358	line.clock_type = get_status(port)->clocking;	359	line.clock_type = get_status(port)->clocking;
359	line.clock_rate = 0;	360	line.clock_rate = 0;
360	line.loopback = 0;	361	line.loopback = 0;

drivers/net/wireless/ath/ath9k/main.c+11−12

 	struct ath_hw *ah = sc->sc_ah;
 	struct ath_common *common = ath9k_hw_common(ah);
 	unsigned long flags;
+	int i;
 	if (ath_startrecv(sc) != 0) {
 		ath_err(common, "Unable to restart recv logic\n");
 		}
 	work:
 		ath_restart_work(sc);
+		for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
+			if (!ATH_TXQ_SETUP(sc, i))
+				continue;
+			spin_lock_bh(&sc->tx.txq[i].axq_lock);
+			ath_txq_schedule(sc, &sc->tx.txq[i]);
+			spin_unlock_bh(&sc->tx.txq[i].axq_lock);
+		}
 	}
 	ieee80211_wake_queues(sc->hw);
 static int ath_reset(struct ath_softc *sc)
 {
-	int i, r;
+	int r;
 	ath9k_ps_wakeup(sc);
 	r = ath_reset_internal(sc, NULL);
-	for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
-		if (!ATH_TXQ_SETUP(sc, i))
-			continue;
-		spin_lock_bh(&sc->tx.txq[i].axq_lock);
-		ath_txq_schedule(sc, &sc->tx.txq[i]);
-		spin_unlock_bh(&sc->tx.txq[i].axq_lock);
-	}
 	ath9k_ps_restore(sc);
 	return r;

drivers/net/wireless/cw1200/cw1200_spi.c+2−0

 	struct hwbus_priv *self = dev_id;
 	if (self->core) {
+		cw1200_spi_lock(self);
 		cw1200_irq_handler(self->core);
+		cw1200_spi_unlock(self);
 		return IRQ_HANDLED;
 	} else {
 		return IRQ_NONE;

drivers/net/wireless/iwlwifi/iwl-6000.c+6−0

 	.ht_params = &iwl6000_ht_params,
 };
+const struct iwl_cfg iwl6035_2agn_sff_cfg = {
+	.name = "Intel(R) Centrino(R) Ultimate-N 6235 AGN",
+	IWL_DEVICE_6035,
+	.ht_params = &iwl6000_ht_params,
+};
 const struct iwl_cfg iwl1030_bgn_cfg = {
 	.name = "Intel(R) Centrino(R) Wireless-N 1030 BGN",
 	IWL_DEVICE_6030,

drivers/net/wireless/iwlwifi/iwl-config.h+1−0

@@ -280,6 +280,7 @@ extern const struct iwl_cfg iwl2000_2bgn_cfg; · 279 unmodified lines
280	extern const struct iwl_cfg iwl2000_2bgn_d_cfg;	280	extern const struct iwl_cfg iwl2000_2bgn_d_cfg;
281	extern const struct iwl_cfg iwl2030_2bgn_cfg;	281	extern const struct iwl_cfg iwl2030_2bgn_cfg;
282	extern const struct iwl_cfg iwl6035_2agn_cfg;	282	extern const struct iwl_cfg iwl6035_2agn_cfg;
		283	extern const struct iwl_cfg iwl6035_2agn_sff_cfg;
283	extern const struct iwl_cfg iwl105_bgn_cfg;	284	extern const struct iwl_cfg iwl105_bgn_cfg;
284	extern const struct iwl_cfg iwl105_bgn_d_cfg;	285	extern const struct iwl_cfg iwl105_bgn_d_cfg;
285	extern const struct iwl_cfg iwl135_bgn_cfg;	286	extern const struct iwl_cfg iwl135_bgn_cfg;

drivers/net/wireless/iwlwifi/iwl-trans.h+4−2

 {
 	int ret;
-	WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE,
+	if (trans->state != IWL_TRANS_FW_ALIVE) {
-		  "%s bad state = %d", __func__, trans->state);
+		IWL_ERR(trans, "%s bad state = %d", __func__, trans->state);
+		return -EIO;
+	}
 	if (!(cmd->flags & CMD_ASYNC))
 		lock_map_acquire_read(&trans->sync_cmd_lockdep_map);

drivers/net/wireless/iwlwifi/mvm/power.c+4−1

@@ -273,7 +273,10 @@ static void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm, · 272 unmodified lines
273	if (!mvmvif->queue_params[ac].uapsd)	273	if (!mvmvif->queue_params[ac].uapsd)
274	continue;	274	continue;
275		275
276	cmd->flags \|= cpu_to_le16(POWER_FLAGS_ADVANCE_PM_ENA_MSK);	276	if (mvm->cur_ucode != IWL_UCODE_WOWLAN)
		277	cmd->flags \|=
		278	cpu_to_le16(POWER_FLAGS_ADVANCE_PM_ENA_MSK);
		279
277	cmd->uapsd_ac_flags \|= BIT(ac);	280	cmd->uapsd_ac_flags \|= BIT(ac);
278		281
279	/* QNDP TID - the highest TID with no admission control */	282	/* QNDP TID - the highest TID with no admission control */

drivers/net/wireless/iwlwifi/mvm/scan.c+11−1

 			return false;
 		}
+		/*
+		 * If scan cannot be aborted, it means that we had a
+		 * SCAN_COMPLETE_NOTIFICATION in the pipe and it called
+		 * ieee80211_scan_completed already.
+		 */
 		IWL_DEBUG_SCAN(mvm, "Scan cannot be aborted, exit now: %d\n",
 			       *resp);
 		return true;
 					       SCAN_COMPLETE_NOTIFICATION };
 	int ret;
+	if (mvm->scan_status == IWL_MVM_SCAN_NONE)
+		return;
 	iwl_init_notification_wait(&mvm->notif_wait, &wait_scan_abort,
 				   scan_abort_notif,
 				   ARRAY_SIZE(scan_abort_notif),
 				   iwl_mvm_scan_abort_notif, NULL);
-	ret = iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_CMD, CMD_SYNC, 0, NULL);
+	ret = iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_CMD,
+				   CMD_SYNC | CMD_SEND_IN_RFKILL, 0, NULL);
 	if (ret) {
 		IWL_ERR(mvm, "Couldn't send SCAN_ABORT_CMD: %d\n", ret);
+		/* mac80211's state will be cleaned in the fw_restart flow */
 		goto out_remove_notif;
 	}

drivers/net/wireless/iwlwifi/pcie/drv.c+42−0

 /* 6x00 Series */
 	{IWL_PCI_DEVICE(0x422B, 0x1101, iwl6000_3agn_cfg)},
+	{IWL_PCI_DEVICE(0x422B, 0x1108, iwl6000_3agn_cfg)},
 	{IWL_PCI_DEVICE(0x422B, 0x1121, iwl6000_3agn_cfg)},
+	{IWL_PCI_DEVICE(0x422B, 0x1128, iwl6000_3agn_cfg)},
 	{IWL_PCI_DEVICE(0x422C, 0x1301, iwl6000i_2agn_cfg)},
 	{IWL_PCI_DEVICE(0x422C, 0x1306, iwl6000i_2abg_cfg)},
 	{IWL_PCI_DEVICE(0x422C, 0x1307, iwl6000i_2bg_cfg)},
 	{IWL_PCI_DEVICE(0x422C, 0x1321, iwl6000i_2agn_cfg)},
 	{IWL_PCI_DEVICE(0x422C, 0x1326, iwl6000i_2abg_cfg)},
 	{IWL_PCI_DEVICE(0x4238, 0x1111, iwl6000_3agn_cfg)},
+	{IWL_PCI_DEVICE(0x4238, 0x1118, iwl6000_3agn_cfg)},
 	{IWL_PCI_DEVICE(0x4239, 0x1311, iwl6000i_2agn_cfg)},
 	{IWL_PCI_DEVICE(0x4239, 0x1316, iwl6000i_2abg_cfg)},
 	{IWL_PCI_DEVICE(0x0082, 0x1301, iwl6005_2agn_cfg)},
 	{IWL_PCI_DEVICE(0x0082, 0x1306, iwl6005_2abg_cfg)},
 	{IWL_PCI_DEVICE(0x0082, 0x1307, iwl6005_2bg_cfg)},
+	{IWL_PCI_DEVICE(0x0082, 0x1308, iwl6005_2agn_cfg)},
 	{IWL_PCI_DEVICE(0x0082, 0x1321, iwl6005_2agn_cfg)},
 	{IWL_PCI_DEVICE(0x0082, 0x1326, iwl6005_2abg_cfg)},
+	{IWL_PCI_DEVICE(0x0082, 0x1328, iwl6005_2agn_cfg)},
 	{IWL_PCI_DEVICE(0x0085, 0x1311, iwl6005_2agn_cfg)},
+	{IWL_PCI_DEVICE(0x0085, 0x1318, iwl6005_2agn_cfg)},
 	{IWL_PCI_DEVICE(0x0085, 0x1316, iwl6005_2abg_cfg)},
 	{IWL_PCI_DEVICE(0x0082, 0xC020, iwl6005_2agn_sff_cfg)},
 	{IWL_PCI_DEVICE(0x0085, 0xC220, iwl6005_2agn_sff_cfg)},
+	{IWL_PCI_DEVICE(0x0085, 0xC228, iwl6005_2agn_sff_cfg)},
 	{IWL_PCI_DEVICE(0x0082, 0x4820, iwl6005_2agn_d_cfg)},
 	{IWL_PCI_DEVICE(0x0082, 0x1304, iwl6005_2agn_mow1_cfg)},/* low 5GHz active */
 	{IWL_PCI_DEVICE(0x0082, 0x1305, iwl6005_2agn_mow2_cfg)},/* high 5GHz active */
 /* 6x35 Series */
 	{IWL_PCI_DEVICE(0x088E, 0x4060, iwl6035_2agn_cfg)},
+	{IWL_PCI_DEVICE(0x088E, 0x406A, iwl6035_2agn_sff_cfg)},
 	{IWL_PCI_DEVICE(0x088F, 0x4260, iwl6035_2agn_cfg)},
+	{IWL_PCI_DEVICE(0x088F, 0x426A, iwl6035_2agn_sff_cfg)},
 	{IWL_PCI_DEVICE(0x088E, 0x4460, iwl6035_2agn_cfg)},
+	{IWL_PCI_DEVICE(0x088E, 0x446A, iwl6035_2agn_sff_cfg)},
 	{IWL_PCI_DEVICE(0x088E, 0x4860, iwl6035_2agn_cfg)},
 	{IWL_PCI_DEVICE(0x088F, 0x5260, iwl6035_2agn_cfg)},
 #if IS_ENABLED(CONFIG_IWLMVM)
 /* 7000 Series */
 	{IWL_PCI_DEVICE(0x08B1, 0x4070, iwl7260_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x08B1, 0x4072, iwl7260_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0x4170, iwl7260_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0x4060, iwl7260_2n_cfg)},
+	{IWL_PCI_DEVICE(0x08B1, 0x406A, iwl7260_2n_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0x4160, iwl7260_2n_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0x4062, iwl7260_n_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0x4162, iwl7260_n_cfg)},
 	{IWL_PCI_DEVICE(0x08B2, 0x4270, iwl7260_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x08B2, 0x4272, iwl7260_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x08B2, 0x4260, iwl7260_2n_cfg)},
+	{IWL_PCI_DEVICE(0x08B2, 0x426A, iwl7260_2n_cfg)},
 	{IWL_PCI_DEVICE(0x08B2, 0x4262, iwl7260_n_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0x4470, iwl7260_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x08B1, 0x4472, iwl7260_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0x4460, iwl7260_2n_cfg)},
+	{IWL_PCI_DEVICE(0x08B1, 0x446A, iwl7260_2n_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0x4462, iwl7260_n_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0x4870, iwl7260_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0x486E, iwl7260_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0x4A70, iwl7260_2ac_cfg_high_temp)},
 	{IWL_PCI_DEVICE(0x08B1, 0x4A6E, iwl7260_2ac_cfg_high_temp)},
 	{IWL_PCI_DEVICE(0x08B1, 0x4A6C, iwl7260_2ac_cfg_high_temp)},
+	{IWL_PCI_DEVICE(0x08B1, 0x4570, iwl7260_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x08B1, 0x4560, iwl7260_2n_cfg)},
+	{IWL_PCI_DEVICE(0x08B2, 0x4370, iwl7260_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x08B2, 0x4360, iwl7260_2n_cfg)},
+	{IWL_PCI_DEVICE(0x08B1, 0x5070, iwl7260_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0x4020, iwl7260_2n_cfg)},
+	{IWL_PCI_DEVICE(0x08B1, 0x402A, iwl7260_2n_cfg)},
 	{IWL_PCI_DEVICE(0x08B2, 0x4220, iwl7260_2n_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0x4420, iwl7260_2n_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0xC070, iwl7260_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x08B1, 0xC072, iwl7260_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0xC170, iwl7260_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0xC060, iwl7260_2n_cfg)},
+	{IWL_PCI_DEVICE(0x08B1, 0xC06A, iwl7260_2n_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0xC160, iwl7260_2n_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0xC062, iwl7260_n_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0xC162, iwl7260_n_cfg)},
+	{IWL_PCI_DEVICE(0x08B1, 0xC770, iwl7260_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x08B1, 0xC760, iwl7260_2n_cfg)},
 	{IWL_PCI_DEVICE(0x08B2, 0xC270, iwl7260_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x08B2, 0xC272, iwl7260_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x08B2, 0xC260, iwl7260_2n_cfg)},
+	{IWL_PCI_DEVICE(0x08B2, 0xC26A, iwl7260_n_cfg)},
 	{IWL_PCI_DEVICE(0x08B2, 0xC262, iwl7260_n_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0xC470, iwl7260_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x08B1, 0xC472, iwl7260_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0xC460, iwl7260_2n_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0xC462, iwl7260_n_cfg)},
+	{IWL_PCI_DEVICE(0x08B1, 0xC570, iwl7260_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x08B1, 0xC560, iwl7260_2n_cfg)},
+	{IWL_PCI_DEVICE(0x08B2, 0xC370, iwl7260_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x08B1, 0xC360, iwl7260_2n_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0xC020, iwl7260_2n_cfg)},
+	{IWL_PCI_DEVICE(0x08B1, 0xC02A, iwl7260_2n_cfg)},
 	{IWL_PCI_DEVICE(0x08B2, 0xC220, iwl7260_2n_cfg)},
 	{IWL_PCI_DEVICE(0x08B1, 0xC420, iwl7260_2n_cfg)},
 /* 3160 Series */
 	{IWL_PCI_DEVICE(0x08B3, 0x0070, iwl3160_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x08B3, 0x0072, iwl3160_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x08B3, 0x0170, iwl3160_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x08B3, 0x0172, iwl3160_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x08B3, 0x0060, iwl3160_2n_cfg)},
 	{IWL_PCI_DEVICE(0x08B3, 0x0062, iwl3160_n_cfg)},
 	{IWL_PCI_DEVICE(0x08B4, 0x0270, iwl3160_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x08B4, 0x0272, iwl3160_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x08B3, 0x0470, iwl3160_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x08B3, 0x0472, iwl3160_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x08B4, 0x0370, iwl3160_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x08B3, 0x8070, iwl3160_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x08B3, 0x8072, iwl3160_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x08B3, 0x8170, iwl3160_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x08B3, 0x8172, iwl3160_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x08B3, 0x8060, iwl3160_2n_cfg)},
 	{IWL_PCI_DEVICE(0x08B3, 0x8062, iwl3160_n_cfg)},
 	{IWL_PCI_DEVICE(0x08B4, 0x8270, iwl3160_2ac_cfg)},
 	{IWL_PCI_DEVICE(0x08B3, 0x8470, iwl3160_2ac_cfg)},
+	{IWL_PCI_DEVICE(0x08B3, 0x8570, iwl3160_2ac_cfg)},
 #endif /* CONFIG_IWLMVM */
 	{0}

drivers/net/wireless/iwlwifi/pcie/tx.c+2−0

@@ -1102,6 +1102,8 @@ void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo, · 1101 unmodified lines
1102	* non-AGG queue.	1102	* non-AGG queue.
1103	*/	1103	*/
1104	iwl_clear_bits_prph(trans, SCD_AGGR_SEL, BIT(txq_id));	1104	iwl_clear_bits_prph(trans, SCD_AGGR_SEL, BIT(txq_id));
		1105
		1106	ssn = trans_pcie->txq[txq_id].q.read_ptr;
1105	}	1107	}
1106		1108
1107	/* Place first TFD at index corresponding to start sequence number.	1109	/* Place first TFD at index corresponding to start sequence number.

drivers/net/wireless/mwifiex/join.c+8−2

  */
 int mwifiex_deauthenticate(struct mwifiex_private *priv, u8 *mac)
 {
+	int ret = 0;
 	if (!priv->media_connected)
 		return 0;
 	switch (priv->bss_mode) {
 	case NL80211_IFTYPE_STATION:
 	case NL80211_IFTYPE_P2P_CLIENT:
-		return mwifiex_deauthenticate_infra(priv, mac);
+		ret = mwifiex_deauthenticate_infra(priv, mac);
+		if (ret)
+			cfg80211_disconnected(priv->netdev, 0, NULL, 0,
+					      GFP_KERNEL);
+		break;
 	case NL80211_IFTYPE_ADHOC:
 		return mwifiex_send_cmd_sync(priv,
 					     HostCmd_CMD_802_11_AD_HOC_STOP,
 		break;
 	}
-	return 0;
+	return ret;
 }
 EXPORT_SYMBOL_GPL(mwifiex_deauthenticate);

drivers/net/wireless/mwifiex/sta_event.c+2−1

 	dev_dbg(adapter->dev,
 		"info: successfully disconnected from %pM: reason code %d\n",
 		priv->cfg_bssid, reason_code);
-	if (priv->bss_mode == NL80211_IFTYPE_STATION) {
+	if (priv->bss_mode == NL80211_IFTYPE_STATION ||
+	    priv->bss_mode == NL80211_IFTYPE_P2P_CLIENT) {
 		cfg80211_disconnected(priv->netdev, reason_code, NULL, 0,
 				      GFP_KERNEL);
 	}

drivers/net/wireless/rtlwifi/rtl8192cu/trx.c+2−1

 					(bool)GET_RX_DESC_PAGGR(pdesc));
 	rx_status->mactime = GET_RX_DESC_TSFL(pdesc);
 	if (phystatus) {
-		p_drvinfo = (struct rx_fwinfo_92c *)(pdesc + RTL_RX_DESC_SIZE);
+		p_drvinfo = (struct rx_fwinfo_92c *)(skb->data +
+						     stats->rx_bufshift);
 		rtl92c_translate_rx_signal_stuff(hw, skb, stats, pdesc,
 						 p_drvinfo);
 	}

drivers/of/Kconfig+0−6

@@ -74,10 +74,4 @@ config OF_MTD · 73 unmodified lines
74	depends on MTD	74	depends on MTD
75	def_bool y	75	def_bool y
76		76
77	config OF_RESERVED_MEM
78	depends on OF_FLATTREE && (DMA_CMA \|\| (HAVE_GENERIC_DMA_COHERENT && HAVE_MEMBLOCK))
79	def_bool y
80	help
81	Initialization code for DMA reserved memory
82
83	endmenu # OF	77	endmenu # OF

drivers/of/Makefile+0−1

@@ -9,4 +9,3 @@ obj-$(CONFIG_OF_MDIO) += of_mdio.o · 8 unmodified lines
9	obj-$(CONFIG_OF_PCI) += of_pci.o	9	obj-$(CONFIG_OF_PCI) += of_pci.o
10	obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o	10	obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o
11	obj-$(CONFIG_OF_MTD) += of_mtd.o	11	obj-$(CONFIG_OF_MTD) += of_mtd.o
12	obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o

drivers/of/base.c+1−3

 	struct device_node *cpun, *cpus;
 	cpus = of_find_node_by_path("/cpus");
-	if (!cpus) {
+	if (!cpus)
-		pr_warn("Missing cpus node, bailing out\n");
 		return NULL;
-	}
 	for_each_child_of_node(cpus, cpun) {
 		if (of_node_cmp(cpun->type, "cpu"))

drivers/of/fdt.c+0−12

@@ -18,7 +18,6 @@ · 17 unmodified lines
18	#include <linux/string.h>	18	#include <linux/string.h>
19	#include <linux/errno.h>	19	#include <linux/errno.h>
20	#include <linux/slab.h>	20	#include <linux/slab.h>
21	#include <linux/random.h>
22		21
23	#include <asm/setup.h> /* for COMMAND_LINE_SIZE */	22	#include <asm/setup.h> /* for COMMAND_LINE_SIZE */
24	#ifdef CONFIG_PPC	23	#ifdef CONFIG_PPC
@@ -803,14 +802,3 @@ void __init unflatten_device_tree(void) · 778 unmodified lines
803	}	802	}
804		803
805	#endif /* CONFIG_OF_EARLY_FLATTREE */	804	#endif /* CONFIG_OF_EARLY_FLATTREE */
806
807	/* Feed entire flattened device tree into the random pool */
808	static int __init add_fdt_randomness(void)
809	{
810	if (initial_boot_params)
811	add_device_randomness(initial_boot_params,
812	be32_to_cpu(initial_boot_params->totalsize));
813
814	return 0;
815	}
816	core_initcall(add_fdt_randomness);

drivers/of/of_reserved_mem.c+0−173

@@ -1,173 +0,0 @@
1	/*
2	* Device tree based initialization code for reserved memory.
3	*
4	* Copyright (c) 2013 Samsung Electronics Co., Ltd.
5	* http://www.samsung.com
6	* Author: Marek Szyprowski <m.szyprowski@samsung.com>
7	*
8	* This program is free software; you can redistribute it and/or
9	* modify it under the terms of the GNU General Public License as
10	* published by the Free Software Foundation; either version 2 of the
11	* License or (at your optional) any later version of the license.
12	*/
13
14	#include <linux/memblock.h>
15	#include <linux/err.h>
16	#include <linux/of.h>
17	#include <linux/of_fdt.h>
18	#include <linux/of_platform.h>
19	#include <linux/mm.h>
20	#include <linux/sizes.h>
21	#include <linux/mm_types.h>
22	#include <linux/dma-contiguous.h>
23	#include <linux/dma-mapping.h>
24	#include <linux/of_reserved_mem.h>
25
26	#define MAX_RESERVED_REGIONS 16
27	struct reserved_mem {
28	phys_addr_t base;
29	unsigned long size;
30	struct cma *cma;
31	char name[32];
32	};
33	static struct reserved_mem reserved_mem[MAX_RESERVED_REGIONS];
34	static int reserved_mem_count;
35
36	static int __init fdt_scan_reserved_mem(unsigned long node, const char *uname,
37	int depth, void *data)
38	{
39	struct reserved_mem *rmem = &reserved_mem[reserved_mem_count];
40	phys_addr_t base, size;
41	int is_cma, is_reserved;
42	unsigned long len;
43	const char *status;
44	__be32 *prop;
45
46	is_cma = IS_ENABLED(CONFIG_DMA_CMA) &&
47	of_flat_dt_is_compatible(node, "linux,contiguous-memory-region");
48	is_reserved = of_flat_dt_is_compatible(node, "reserved-memory-region");
49
50	if (!is_reserved && !is_cma) {
51	/* ignore node and scan next one */
52	return 0;
53	}
54
55	status = of_get_flat_dt_prop(node, "status", &len);
56	if (status && strcmp(status, "okay") != 0) {
57	/* ignore disabled node nad scan next one */
58	return 0;
59	}
60
61	prop = of_get_flat_dt_prop(node, "reg", &len);
62	if (!prop \|\| (len < (dt_root_size_cells + dt_root_addr_cells) *
63	sizeof(__be32))) {
64	pr_err("Reserved mem: node %s, incorrect \"reg\" property\n",
65	uname);
66	/* ignore node and scan next one */
67	return 0;
68	}
69	base = dt_mem_next_cell(dt_root_addr_cells, &prop);
70	size = dt_mem_next_cell(dt_root_size_cells, &prop);
71
72	if (!size) {
73	/* ignore node and scan next one */
74	return 0;
75	}
76
77	pr_info("Reserved mem: found %s, memory base %lx, size %ld MiB\n",
78	uname, (unsigned long)base, (unsigned long)size / SZ_1M);
79
80	if (reserved_mem_count == ARRAY_SIZE(reserved_mem))
81	return -ENOSPC;
82
83	rmem->base = base;
84	rmem->size = size;
85	strlcpy(rmem->name, uname, sizeof(rmem->name));
86
87	if (is_cma) {
88	struct cma *cma;
89	if (dma_contiguous_reserve_area(size, base, 0, &cma) == 0) {
90	rmem->cma = cma;
91	reserved_mem_count++;
92	if (of_get_flat_dt_prop(node,
93	"linux,default-contiguous-region",
94	NULL))
95	dma_contiguous_set_default(cma);
96	}
97	} else if (is_reserved) {
98	if (memblock_remove(base, size) == 0)
99	reserved_mem_count++;
100	else
101	pr_err("Failed to reserve memory for %s\n", uname);
102	}
103
104	return 0;
105	}
106
107	static struct reserved_mem get_dma_memory_region(struct device dev)
108	{
109	struct device_node *node;
110	const char *name;
111	int i;
112
113	node = of_parse_phandle(dev->of_node, "memory-region", 0);
114	if (!node)
115	return NULL;
116
117	name = kbasename(node->full_name);
118	for (i = 0; i < reserved_mem_count; i++)
119	if (strcmp(name, reserved_mem[i].name) == 0)
120	return &reserved_mem[i];
121	return NULL;
122	}
123
124	/**
125	* of_reserved_mem_device_init() - assign reserved memory region to given device
126	*
127	* This function assign memory region pointed by "memory-region" device tree
128	* property to the given device.
129	*/
130	void of_reserved_mem_device_init(struct device *dev)
131	{
132	struct reserved_mem *region = get_dma_memory_region(dev);
133	if (!region)
134	return;
135
136	if (region->cma) {
137	dev_set_cma_area(dev, region->cma);
138	pr_info("Assigned CMA %s to %s device\n", region->name,
139	dev_name(dev));
140	} else {
141	if (dma_declare_coherent_memory(dev, region->base, region->base,
142	region->size, DMA_MEMORY_MAP \| DMA_MEMORY_EXCLUSIVE) != 0)
143	pr_info("Declared reserved memory %s to %s device\n",
144	region->name, dev_name(dev));
145	}
146	}
147
148	/**
149	* of_reserved_mem_device_release() - release reserved memory device structures
150	*
151	* This function releases structures allocated for memory region handling for
152	* the given device.
153	*/
154	void of_reserved_mem_device_release(struct device *dev)
155	{
156	struct reserved_mem *region = get_dma_memory_region(dev);
157	if (!region && !region->cma)
158	dma_release_declared_memory(dev);
159	}
160
161	/**
162	* early_init_dt_scan_reserved_mem() - create reserved memory regions
163	*
164	* This function grabs memory from early allocator for device exclusive use
165	* defined in device tree structures. It should be called by arch specific code
166	* once the early allocator (memblock) has been activated and all other
167	* subsystems have already allocated/reserved memory.
168	*/
169	void __init early_init_dt_scan_reserved_mem(void)
170	{
171	of_scan_flat_dt_by_path("/memory/reserved-memory",
172	fdt_scan_reserved_mem, NULL);
173	}

drivers/of/platform.c+0−4

 #include <linux/of_device.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
-#include <linux/of_reserved_mem.h>
 #include <linux/platform_device.h>
 const struct of_device_id of_default_bus_match_table[] = {
 	dev->dev.bus = &platform_bus_type;
 	dev->dev.platform_data = platform_data;
-	of_reserved_mem_device_init(&dev->dev);
 	/* We do not fill the DMA ops for platform devices by default.
 	 * This is currently the responsibility of the platform code
 	 * to do such, possibly using a device notifier
 	if (of_device_add(dev) != 0) {
 		platform_device_put(dev);
-		of_reserved_mem_device_release(&dev->dev);
 		return NULL;
 	}

drivers/pci/hotplug/acpiphp_glue.c+5−3

 		/*
 		 * This bridge should have been registered as a hotplug function
-		 * under its parent, so the context has to be there.  If not, we
+		 * under its parent, so the context should be there, unless the
-		 * are in deep goo.
+		 * parent is going to be handled by pciehp, in which case this
+		 * bridge is not interesting to us either.
 		 */
 		mutex_lock(&acpiphp_context_lock);
 		context = acpiphp_get_context(handle);
-		if (WARN_ON(!context)) {
+		if (!context) {
 			mutex_unlock(&acpiphp_context_lock);
 			put_device(&bus->dev);
+			pci_dev_put(bridge->pci_dev);
 			kfree(bridge);
 			return;
 		}

drivers/pinctrl/pinconf.c+2−2

@@ -490,7 +490,7 @@ exit: · 489 unmodified lines
490	* <devicename> <state> <pinname> are values that should match the pinctrl-maps	490	* <devicename> <state> <pinname> are values that should match the pinctrl-maps
491	* <newvalue> reflects the new config and is driver dependant	491	* <newvalue> reflects the new config and is driver dependant
492	*/	492	*/
493	static int pinconf_dbg_config_write(struct file *file,	493	static ssize_t pinconf_dbg_config_write(struct file *file,
494	const char __user user_buf, size_t count, loff_t ppos)	494	const char __user user_buf, size_t count, loff_t ppos)
495	{	495	{
496	struct pinctrl_maps *maps_node;	496	struct pinctrl_maps *maps_node;
@@ -508,7 +508,7 @@ static int pinconf_dbg_config_write(struct file *file, · 11 unmodified lines
508	int i;	508	int i;
509		509
510	/* Get userspace string and assure termination */	510	/* Get userspace string and assure termination */
511	buf_size = min(count, (size_t)(sizeof(buf)-1));	511	buf_size = min(count, sizeof(buf) - 1);
512	if (copy_from_user(buf, user_buf, buf_size))	512	if (copy_from_user(buf, user_buf, buf_size))
513	return -EFAULT;	513	return -EFAULT;
514	buf[buf_size] = 0;	514	buf[buf_size] = 0;

drivers/pinctrl/pinctrl-exynos.c+6−6

drivers/pinctrl/pinctrl-palmas.c+3−2

 		param = pinconf_to_config_param(configs[i]);
 		param_val = pinconf_to_config_argument(configs[i]);
+		if (param == PIN_CONFIG_BIAS_PULL_PIN_DEFAULT)
+			continue;
 		switch (param) {
-		case PIN_CONFIG_BIAS_PULL_PIN_DEFAULT:
-			return 0;
 		case PIN_CONFIG_BIAS_DISABLE:
 		case PIN_CONFIG_BIAS_PULL_UP:
 		case PIN_CONFIG_BIAS_PULL_DOWN:

drivers/pinctrl/pinctrl-tegra114.c+2−3

  *
  * Copyright (c) 2012-2013, NVIDIA CORPORATION.  All rights reserved.
  *
- * Arthur:  Pritesh Raithatha <praithatha@nvidia.com>
+ * Author:  Pritesh Raithatha <praithatha@nvidia.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
 };
 module_platform_driver(tegra114_pinctrl_driver);
-MODULE_ALIAS("platform:tegra114-pinctrl");
 MODULE_AUTHOR("Pritesh Raithatha <praithatha@nvidia.com>");
-MODULE_DESCRIPTION("NVIDIA Tegra114 pincontrol driver");
+MODULE_DESCRIPTION("NVIDIA Tegra114 pinctrl driver");
 MODULE_LICENSE("GPL v2");

drivers/platform/x86/Kconfig+1−0

@@ -504,6 +504,7 @@ config ASUS_WMI · 503 unmodified lines
504	depends on BACKLIGHT_CLASS_DEVICE	504	depends on BACKLIGHT_CLASS_DEVICE
505	depends on RFKILL \|\| RFKILL = n	505	depends on RFKILL \|\| RFKILL = n
506	depends on HOTPLUG_PCI	506	depends on HOTPLUG_PCI
		507	depends on ACPI_VIDEO \|\| ACPI_VIDEO = n
507	select INPUT_SPARSEKMAP	508	select INPUT_SPARSEKMAP
508	select LEDS_CLASS	509	select LEDS_CLASS
509	select NEW_LEDS	510	select NEW_LEDS

drivers/platform/x86/sony-laptop.c+9−17

 		 "default is -1 (automatic)");
 #endif
-static int kbd_backlight = 1;
+static int kbd_backlight = -1;
 module_param(kbd_backlight, int, 0444);
 MODULE_PARM_DESC(kbd_backlight,
 		 "set this to 0 to disable keyboard backlight, "
-		 "1 to enable it (default: 0)");
+		 "1 to enable it (default: no change from current value)");
-static int kbd_backlight_timeout;	/* = 0 */
+static int kbd_backlight_timeout = -1;
 module_param(kbd_backlight_timeout, int, 0444);
 MODULE_PARM_DESC(kbd_backlight_timeout,
-		 "set this to 0 to set the default 10 seconds timeout, "
+		 "meaningful values vary from 0 to 3 and their meaning depends "
-		 "1 for 30 seconds, 2 for 60 seconds and 3 to disable timeout "
+		 "on the model (default: no change from current value)");
-		 "(default: 0)");
 #ifdef CONFIG_PM_SLEEP
 static void sony_nc_kbd_backlight_resume(void);
 	if (!kbdbl_ctl)
 		return -ENOMEM;
+	kbdbl_ctl->mode = kbd_backlight;
+	kbdbl_ctl->timeout = kbd_backlight_timeout;
 	kbdbl_ctl->handle = handle;
 	if (handle == 0x0137)
 		kbdbl_ctl->base = 0x0C00;
 	if (ret)
 		goto outmode;
-	__sony_nc_kbd_backlight_mode_set(kbd_backlight);
+	__sony_nc_kbd_backlight_mode_set(kbdbl_ctl->mode);
-	__sony_nc_kbd_backlight_timeout_set(kbd_backlight_timeout);
+	__sony_nc_kbd_backlight_timeout_set(kbdbl_ctl->timeout);
 	return 0;
 static void sony_nc_kbd_backlight_cleanup(struct platform_device *pd)
 {
 	if (kbdbl_ctl) {
-		int result;
 		device_remove_file(&pd->dev, &kbdbl_ctl->mode_attr);
 		device_remove_file(&pd->dev, &kbdbl_ctl->timeout_attr);
-		/* restore the default hw behaviour */
-		sony_call_snc_handle(kbdbl_ctl->handle,
-				kbdbl_ctl->base | 0x10000, &result);
-		sony_call_snc_handle(kbdbl_ctl->handle,
-				kbdbl_ctl->base + 0x200, &result);
 		kfree(kbdbl_ctl);
 		kbdbl_ctl = NULL;
 	}

drivers/s390/block/dasd_eckd.c+71−27

 	int intensity = 0;
 	int r0_perm;
 	int nr_tracks;
+	int use_prefix;
 	startdev = dasd_alias_get_start_dev(base);
 	if (!startdev)
 		intensity = fdata->intensity;
 	}
+	use_prefix = base_priv->features.feature[8] & 0x01;
 	switch (intensity) {
 	case 0x00:	/* Normal format */
 	case 0x08:	/* Normal format, use cdl. */
 		cplength = 2 + (rpt*nr_tracks);
-		datasize = sizeof(struct PFX_eckd_data) +
+		if (use_prefix)
-			sizeof(struct LO_eckd_data) +
+			datasize = sizeof(struct PFX_eckd_data) +
-			rpt * nr_tracks * sizeof(struct eckd_count);
+				sizeof(struct LO_eckd_data) +
+				rpt * nr_tracks * sizeof(struct eckd_count);
+		else
+			datasize = sizeof(struct DE_eckd_data) +
+				sizeof(struct LO_eckd_data) +
+				rpt * nr_tracks * sizeof(struct eckd_count);
 		break;
 	case 0x01:	/* Write record zero and format track. */
 	case 0x09:	/* Write record zero and format track, use cdl. */
 		cplength = 2 + rpt * nr_tracks;
-		datasize = sizeof(struct PFX_eckd_data) +
+		if (use_prefix)
-			sizeof(struct LO_eckd_data) +
+			datasize = sizeof(struct PFX_eckd_data) +
-			sizeof(struct eckd_count) +
+				sizeof(struct LO_eckd_data) +
-			rpt * nr_tracks * sizeof(struct eckd_count);
+				sizeof(struct eckd_count) +
+				rpt * nr_tracks * sizeof(struct eckd_count);
+		else
+			datasize = sizeof(struct DE_eckd_data) +
+				sizeof(struct LO_eckd_data) +
+				sizeof(struct eckd_count) +
+				rpt * nr_tracks * sizeof(struct eckd_count);
 		break;
 	case 0x04:	/* Invalidate track. */
 	case 0x0c:	/* Invalidate track, use cdl. */
 		cplength = 3;
-		datasize = sizeof(struct PFX_eckd_data) +
+		if (use_prefix)
-			sizeof(struct LO_eckd_data) +
+			datasize = sizeof(struct PFX_eckd_data) +
-			sizeof(struct eckd_count);
+				sizeof(struct LO_eckd_data) +
+				sizeof(struct eckd_count);
+		else
+			datasize = sizeof(struct DE_eckd_data) +
+				sizeof(struct LO_eckd_data) +
+				sizeof(struct eckd_count);
 		break;
 	default:
 		dev_warn(&startdev->cdev->dev,
 	switch (intensity & ~0x08) {
 	case 0x00: /* Normal format. */
-		prefix(ccw++, (struct PFX_eckd_data *) data,
+		if (use_prefix) {
-		       fdata->start_unit, fdata->stop_unit,
+			prefix(ccw++, (struct PFX_eckd_data *) data,
-		       DASD_ECKD_CCW_WRITE_CKD, base, startdev);
+			       fdata->start_unit, fdata->stop_unit,
-		/* grant subsystem permission to format R0 */
+			       DASD_ECKD_CCW_WRITE_CKD, base, startdev);
-		if (r0_perm)
+			/* grant subsystem permission to format R0 */
-			((struct PFX_eckd_data *)data)
+			if (r0_perm)
-				->define_extent.ga_extended |= 0x04;
+				((struct PFX_eckd_data *)data)
-		data += sizeof(struct PFX_eckd_data);
+					->define_extent.ga_extended |= 0x04;
+			data += sizeof(struct PFX_eckd_data);
+		} else {
+			define_extent(ccw++, (struct DE_eckd_data *) data,
+				      fdata->start_unit, fdata->stop_unit,
+				      DASD_ECKD_CCW_WRITE_CKD, startdev);
+			/* grant subsystem permission to format R0 */
+			if (r0_perm)
+				((struct DE_eckd_data *) data)
+					->ga_extended |= 0x04;
+			data += sizeof(struct DE_eckd_data);
+		}
 		ccw[-1].flags |= CCW_FLAG_CC;
 		locate_record(ccw++, (struct LO_eckd_data *) data,
 			      fdata->start_unit, 0, rpt*nr_tracks,
 		data += sizeof(struct LO_eckd_data);
 		break;
 	case 0x01: /* Write record zero + format track. */
-		prefix(ccw++, (struct PFX_eckd_data *) data,
+		if (use_prefix) {
-		       fdata->start_unit, fdata->stop_unit,
+			prefix(ccw++, (struct PFX_eckd_data *) data,
-		       DASD_ECKD_CCW_WRITE_RECORD_ZERO,
+			       fdata->start_unit, fdata->stop_unit,
-		       base, startdev);
+			       DASD_ECKD_CCW_WRITE_RECORD_ZERO,
-		data += sizeof(struct PFX_eckd_data);
+			       base, startdev);
+			data += sizeof(struct PFX_eckd_data);
+		} else {
+			define_extent(ccw++, (struct DE_eckd_data *) data,
+			       fdata->start_unit, fdata->stop_unit,
+			       DASD_ECKD_CCW_WRITE_RECORD_ZERO, startdev);
+			data += sizeof(struct DE_eckd_data);
+		}
 		ccw[-1].flags |= CCW_FLAG_CC;
 		locate_record(ccw++, (struct LO_eckd_data *) data,
 			      fdata->start_unit, 0, rpt * nr_tracks + 1,
 		data += sizeof(struct LO_eckd_data);
 		break;
 	case 0x04: /* Invalidate track. */
-		prefix(ccw++, (struct PFX_eckd_data *) data,
+		if (use_prefix) {
-		       fdata->start_unit, fdata->stop_unit,
+			prefix(ccw++, (struct PFX_eckd_data *) data,
-		       DASD_ECKD_CCW_WRITE_CKD, base, startdev);
+			       fdata->start_unit, fdata->stop_unit,
-		data += sizeof(struct PFX_eckd_data);
+			       DASD_ECKD_CCW_WRITE_CKD, base, startdev);
+			data += sizeof(struct PFX_eckd_data);
+		} else {
+			define_extent(ccw++, (struct DE_eckd_data *) data,
+			       fdata->start_unit, fdata->stop_unit,
+			       DASD_ECKD_CCW_WRITE_CKD, startdev);
+			data += sizeof(struct DE_eckd_data);
+		}
 		ccw[-1].flags |= CCW_FLAG_CC;
 		locate_record(ccw++, (struct LO_eckd_data *) data,
 			      fdata->start_unit, 0, 1,

drivers/s390/char/sclp.c+2−2

@@ -486,7 +486,7 @@ sclp_sync_wait(void) · 485 unmodified lines
486	timeout = 0;	486	timeout = 0;
487	if (timer_pending(&sclp_request_timer)) {	487	if (timer_pending(&sclp_request_timer)) {
488	/* Get timeout TOD value */	488	/* Get timeout TOD value */
489	timeout = get_tod_clock() +	489	timeout = get_tod_clock_fast() +
490	sclp_tod_from_jiffies(sclp_request_timer.expires -	490	sclp_tod_from_jiffies(sclp_request_timer.expires -
491	jiffies);	491	jiffies);
492	}	492	}
@@ -508,7 +508,7 @@ sclp_sync_wait(void) · 15 unmodified lines
508	while (sclp_running_state != sclp_running_state_idle) {	508	while (sclp_running_state != sclp_running_state_idle) {
509	/* Check for expired request timer */	509	/* Check for expired request timer */
510	if (timer_pending(&sclp_request_timer) &&	510	if (timer_pending(&sclp_request_timer) &&
511	get_tod_clock() > timeout &&	511	get_tod_clock_fast() > timeout &&
512	del_timer(&sclp_request_timer))	512	del_timer(&sclp_request_timer))
513	sclp_request_timer.function(sclp_request_timer.data);	513	sclp_request_timer.function(sclp_request_timer.data);
514	cpu_relax();	514	cpu_relax();

drivers/s390/char/sclp_cmd.c+5−3

 	if (sccb->header.response_code != 0x20)
 		return 0;
-	if (sccb->sclp_send_mask & (EVTYP_MSG_MASK | EVTYP_PMSGCMD_MASK))
+	if (!(sccb->sclp_send_mask & (EVTYP_OPCMD_MASK | EVTYP_PMSGCMD_MASK)))
-		return 1;
+		return 0;
-	return 0;
+	if (!(sccb->sclp_receive_mask & (EVTYP_MSG_MASK | EVTYP_PMSGCMD_MASK)))
+		return 0;
+	return 1;
 }
 bool __init sclp_has_vt220(void)

drivers/s390/char/tty3270.c+1−1

@@ -810,7 +810,7 @@ static void tty3270_resize_work(struct work_struct *work) · 809 unmodified lines
810	struct winsize ws;	810	struct winsize ws;
811		811
812	screen = tty3270_alloc_screen(tp->n_rows, tp->n_cols);	812	screen = tty3270_alloc_screen(tp->n_rows, tp->n_cols);
813	if (!screen)	813	if (IS_ERR(screen))
814	return;	814	return;
815	/* Switch to new output size */	815	/* Switch to new output size */
816	spin_lock_bh(&tp->view.lock);	816	spin_lock_bh(&tp->view.lock);

drivers/s390/char/vmlogrdr.c+1−1

@@ -313,7 +313,7 @@ static int vmlogrdr_open (struct inode inode, struct file filp) · 312 unmodified lines
313	int ret;	313	int ret;
314		314
315	dev_num = iminor(inode);	315	dev_num = iminor(inode);
316	if (dev_num > MAXMINOR)	316	if (dev_num >= MAXMINOR)
317	return -ENODEV;	317	return -ENODEV;
318	logptr = &sys_ser[dev_num];	318	logptr = &sys_ser[dev_num];
319		319

drivers/s390/cio/cio.c+2−2

@@ -878,9 +878,9 @@ static void css_reset(void) · 877 unmodified lines
878	atomic_inc(&chpid_reset_count);	878	atomic_inc(&chpid_reset_count);
879	}	879	}
880	/* Wait for machine check for all channel paths. */	880	/* Wait for machine check for all channel paths. */
881	timeout = get_tod_clock() + (RCHP_TIMEOUT << 12);	881	timeout = get_tod_clock_fast() + (RCHP_TIMEOUT << 12);
882	while (atomic_read(&chpid_reset_count) != 0) {	882	while (atomic_read(&chpid_reset_count) != 0) {
883	if (get_tod_clock() > timeout)	883	if (get_tod_clock_fast() > timeout)
884	break;	884	break;
885	cpu_relax();	885	cpu_relax();
886	}	886	}

drivers/s390/cio/qdio_main.c+5−5

@@ -338,10 +338,10 @@ again: · 337 unmodified lines
338	retries++;	338	retries++;
339		339
340	if (!start_time) {	340	if (!start_time) {
341	start_time = get_tod_clock();	341	start_time = get_tod_clock_fast();
342	goto again;	342	goto again;
343	}	343	}
344	if ((get_tod_clock() - start_time) < QDIO_BUSY_BIT_PATIENCE)	344	if (get_tod_clock_fast() - start_time < QDIO_BUSY_BIT_PATIENCE)
345	goto again;	345	goto again;
346	}	346	}
347	if (retries) {	347	if (retries) {
@@ -504,7 +504,7 @@ static int get_inbound_buffer_frontier(struct qdio_q *q) · 156 unmodified lines
504	int count, stop;	504	int count, stop;
505	unsigned char state = 0;	505	unsigned char state = 0;
506		506
507	q->timestamp = get_tod_clock();	507	q->timestamp = get_tod_clock_fast();
508		508
509	/*	509	/*
510	* Don't check 128 buffers, as otherwise qdio_inbound_q_moved	510	* Don't check 128 buffers, as otherwise qdio_inbound_q_moved
@@ -595,7 +595,7 @@ static inline int qdio_inbound_q_done(struct qdio_q *q) · 84 unmodified lines
595	* At this point we know, that inbound first_to_check	595	* At this point we know, that inbound first_to_check
596	* has (probably) not moved (see qdio_inbound_processing).	596	* has (probably) not moved (see qdio_inbound_processing).
597	*/	597	*/
598	if (get_tod_clock() > q->u.in.timestamp + QDIO_INPUT_THRESHOLD) {	598	if (get_tod_clock_fast() > q->u.in.timestamp + QDIO_INPUT_THRESHOLD) {
599	DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "in done:%02x",	599	DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "in done:%02x",
600	q->first_to_check);	600	q->first_to_check);
601	return 1;	601	return 1;
@@ -728,7 +728,7 @@ static int get_outbound_buffer_frontier(struct qdio_q *q) · 126 unmodified lines
728	int count, stop;	728	int count, stop;
729	unsigned char state = 0;	729	unsigned char state = 0;
730		730
731	q->timestamp = get_tod_clock();	731	q->timestamp = get_tod_clock_fast();
732		732
733	if (need_siga_sync(q))	733	if (need_siga_sync(q))
734	if (((queue_type(q) != QDIO_IQDIO_QFMT) &&	734	if (((queue_type(q) != QDIO_IQDIO_QFMT) &&

drivers/spi/spi-atmel.c+2−1

 	/* Initialize the hardware */
 	ret = clk_prepare_enable(clk);
 	if (ret)
-		goto out_unmap_regs;
+		goto out_free_irq;
 	spi_writel(as, CR, SPI_BIT(SWRST));
 	spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */
 	if (as->caps.has_wdrbt) {
 	spi_writel(as, CR, SPI_BIT(SWRST));
 	spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */
 	clk_disable_unprepare(clk);
+out_free_irq:
 	free_irq(irq, master);
 out_unmap_regs:
 	iounmap(as->regs);

drivers/spi/spi-clps711x.c+0−3

 			       dev_name(&pdev->dev), hw);
 	if (ret) {
 		dev_err(&pdev->dev, "Can't request IRQ\n");
-		clk_put(hw->spi_clk);
 		goto clk_out;
 	}
 			gpio_free(hw->chipselect[i]);
 	spi_master_put(master);
-	kfree(master);
 	return ret;
 }
 			gpio_free(hw->chipselect[i]);
 	spi_unregister_master(master);
-	kfree(master);
 	return 0;
 }

drivers/spi/spi-fsl-dspi.c+2−8

 	master->bus_num = bus_num;
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!res) {
-		dev_err(&pdev->dev, "can't get platform resource\n");
-		ret = -EINVAL;
-		goto out_master_put;
-	}
 	dspi->base = devm_ioremap_resource(&pdev->dev, res);
-	if (!dspi->base) {
+	if (IS_ERR(dspi->base)) {
-		ret = -EINVAL;
+		ret = PTR_ERR(dspi->base);
 		goto out_master_put;
 	}

drivers/spi/spi-mpc512x-psc.c+3−1

 	psc_num = master->bus_num;
 	snprintf(clk_name, sizeof(clk_name), "psc%d_mclk", psc_num);
 	clk = devm_clk_get(dev, clk_name);
-	if (IS_ERR(clk))
+	if (IS_ERR(clk)) {
+		ret = PTR_ERR(clk);
 		goto free_irq;
+	}
 	ret = clk_prepare_enable(clk);
 	if (ret)
 		goto free_irq;

drivers/spi/spi-pxa2xx.c+10−1

@@ -546,8 +546,17 @@ static irqreturn_t ssp_int(int irq, void *dev_id) · 545 unmodified lines
546	if (pm_runtime_suspended(&drv_data->pdev->dev))	546	if (pm_runtime_suspended(&drv_data->pdev->dev))
547	return IRQ_NONE;	547	return IRQ_NONE;
548		548
549	sccr1_reg = read_SSCR1(reg);	549	/*
		550	* If the device is not yet in RPM suspended state and we get an
		551	* interrupt that is meant for another device, check if status bits
		552	* are all set to one. That means that the device is already
		553	* powered off.
		554	*/
550	status = read_SSSR(reg);	555	status = read_SSSR(reg);
		556	if (status == ~0)
		557	return IRQ_NONE;
		558
		559	sccr1_reg = read_SSCR1(reg);
551		560
552	/* Ignore possible writes if we don't need to write */	561	/* Ignore possible writes if we don't need to write */
553	if (!(sccr1_reg & SSCR1_TIE))	562	if (!(sccr1_reg & SSCR1_TIE))

drivers/spi/spi-s3c64xx.c+2−2

 	       S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN,
 	       sdd->regs + S3C64XX_SPI_INT_EN);
+	pm_runtime_enable(&pdev->dev);
 	if (spi_register_master(master)) {
 		dev_err(&pdev->dev, "cannot register SPI master\n");
 		ret = -EBUSY;
 					mem_res,
 					sdd->rx_dma.dmach, sdd->tx_dma.dmach);
-	pm_runtime_enable(&pdev->dev);
 	return 0;
 err3:

drivers/spi/spi-sh-hspi.c+2−2

 		goto error1;
 	}
+	pm_runtime_enable(&pdev->dev);
 	master->num_chipselect	= 1;
 	master->bus_num		= pdev->id;
 	master->setup		= hspi_setup;
 		goto error1;
 	}
-	pm_runtime_enable(&pdev->dev);
 	return 0;
  error1:

drivers/staging/comedi/drivers/ni_65xx.c+10−15

@@ -369,28 +369,23 @@ static int ni_65xx_dio_insn_bits(struct comedi_device *dev, · 368 unmodified lines
369	{	369	{
370	const struct ni_65xx_board *board = comedi_board(dev);	370	const struct ni_65xx_board *board = comedi_board(dev);
371	struct ni_65xx_private *devpriv = dev->private;	371	struct ni_65xx_private *devpriv = dev->private;
372	unsigned base_bitfield_channel;	372	int base_bitfield_channel;
373	const unsigned max_ports_per_bitfield = 5;
374	unsigned read_bits = 0;	373	unsigned read_bits = 0;
375	unsigned j;	374	int last_port_offset = ni_65xx_port_by_channel(s->n_chan - 1);
		375	int port_offset;
376		376
377	base_bitfield_channel = CR_CHAN(insn->chanspec);	377	base_bitfield_channel = CR_CHAN(insn->chanspec);
378	for (j = 0; j < max_ports_per_bitfield; ++j) {	378	for (port_offset = ni_65xx_port_by_channel(base_bitfield_channel);
379	const unsigned port_offset =	379	port_offset <= last_port_offset; port_offset++) {
380	ni_65xx_port_by_channel(base_bitfield_channel) + j;	380	unsigned port = sprivate(s)->base_port + port_offset;
381	const unsigned port =	381	int base_port_channel = port_offset * ni_65xx_channels_per_port;
382	sprivate(s)->base_port + port_offset;
383	unsigned base_port_channel;
384	unsigned port_mask, port_data, port_read_bits;	382	unsigned port_mask, port_data, port_read_bits;
385	int bitshift;	383	int bitshift = base_port_channel - base_bitfield_channel;
386	if (port >= ni_65xx_total_num_ports(board))	384
		385	if (bitshift >= 32)
387	break;	386	break;
388	base_port_channel = port_offset * ni_65xx_channels_per_port;
389	port_mask = data[0];	387	port_mask = data[0];
390	port_data = data[1];	388	port_data = data[1];
391	bitshift = base_port_channel - base_bitfield_channel;
392	if (bitshift >= 32 \|\| bitshift <= -32)
393	break;
394	if (bitshift > 0) {	389	if (bitshift > 0) {
395	port_mask >>= bitshift;	390	port_mask >>= bitshift;
396	port_data >>= bitshift;	391	port_data >>= bitshift;

drivers/staging/media/msi3101/Kconfig+1−0

@@ -1,3 +1,4 @@
1	config USB_MSI3101	1	config USB_MSI3101
2	tristate "Mirics MSi3101 SDR Dongle"	2	tristate "Mirics MSi3101 SDR Dongle"
3	depends on USB && VIDEO_DEV && VIDEO_V4L2	3	depends on USB && VIDEO_DEV && VIDEO_V4L2
		4	select VIDEOBUF2_VMALLOC

drivers/staging/media/msi3101/sdr-msi3101.c+8−2

 	/* Absolute min and max number of buffers available for mmap() */
 	*nbuffers = 32;
 	*nplanes = 1;
-	sizes[0] = PAGE_ALIGN(3 * 3072); /* 3 * 768 * 4 */
+	/*
+	 *   3, wMaxPacketSize 3x 1024 bytes
+	 * 504, max IQ sample pairs per 1024 frame
+	 *   2, two samples, I and Q
+	 *   4, 32-bit float
+	 */
+	sizes[0] = PAGE_ALIGN(3 * 504 * 2 * 4); /* = 12096 */
 	dev_dbg(&s->udev->dev, "%s: nbuffers=%d sizes[0]=%d\n",
 			__func__, *nbuffers, sizes[0]);
 	return 0;
 			f->frequency * 625UL / 10UL);
 }
-const struct v4l2_ioctl_ops msi3101_ioctl_ops = {
+static const struct v4l2_ioctl_ops msi3101_ioctl_ops = {
 	.vidioc_querycap          = msi3101_querycap,
 	.vidioc_enum_input        = msi3101_enum_input,

drivers/target/iscsi/iscsi_target.c+9−4

 static void iscsit_ack_from_expstatsn(struct iscsi_conn *conn, u32 exp_statsn)
 {
-	struct iscsi_cmd *cmd;
+	LIST_HEAD(ack_list);
+	struct iscsi_cmd *cmd, *cmd_p;
 	conn->exp_statsn = exp_statsn;
 		return;
 	spin_lock_bh(&conn->cmd_lock);
-	list_for_each_entry(cmd, &conn->conn_cmd_list, i_conn_node) {
+	list_for_each_entry_safe(cmd, cmd_p, &conn->conn_cmd_list, i_conn_node) {
 		spin_lock(&cmd->istate_lock);
 		if ((cmd->i_state == ISTATE_SENT_STATUS) &&
 		    iscsi_sna_lt(cmd->stat_sn, exp_statsn)) {
 			cmd->i_state = ISTATE_REMOVE;
 			spin_unlock(&cmd->istate_lock);
-			iscsit_add_cmd_to_immediate_queue(cmd, conn,
+			list_move_tail(&cmd->i_conn_node, &ack_list);
-						cmd->i_state);
 			continue;
 		}
 		spin_unlock(&cmd->istate_lock);
 	}
 	spin_unlock_bh(&conn->cmd_lock);
+	list_for_each_entry_safe(cmd, cmd_p, &ack_list, i_conn_node) {
+		list_del(&cmd->i_conn_node);
+		iscsit_free_cmd(cmd, false);
+	}
 }
 static int iscsit_allocate_iovecs(struct iscsi_cmd *cmd)

drivers/target/iscsi/iscsi_target_nego.c+1−1

@@ -1192,7 +1192,7 @@ get_target: · 1191 unmodified lines
1192	*/	1192	*/
1193	alloc_tags:	1193	alloc_tags:
1194	tag_num = max_t(u32, ISCSIT_MIN_TAGS, queue_depth);	1194	tag_num = max_t(u32, ISCSIT_MIN_TAGS, queue_depth);
1195	tag_num += ISCSIT_EXTRA_TAGS;	1195	tag_num += (tag_num / 2) + ISCSIT_EXTRA_TAGS;
1196	tag_size = sizeof(struct iscsi_cmd) + conn->conn_transport->priv_size;	1196	tag_size = sizeof(struct iscsi_cmd) + conn->conn_transport->priv_size;
1197		1197
1198	ret = transport_alloc_session_tags(sess->se_sess, tag_num, tag_size);	1198	ret = transport_alloc_session_tags(sess->se_sess, tag_num, tag_size);

drivers/target/iscsi/iscsi_target_util.c+2−2

@@ -736,7 +736,7 @@ void iscsit_free_cmd(struct iscsi_cmd *cmd, bool shutdown) · 735 unmodified lines
736	* Fallthrough	736	* Fallthrough
737	*/	737	*/
738	case ISCSI_OP_SCSI_TMFUNC:	738	case ISCSI_OP_SCSI_TMFUNC:
739	rc = transport_generic_free_cmd(&cmd->se_cmd, 1);	739	rc = transport_generic_free_cmd(&cmd->se_cmd, shutdown);
740	if (!rc && shutdown && se_cmd && se_cmd->se_sess) {	740	if (!rc && shutdown && se_cmd && se_cmd->se_sess) {
741	__iscsit_free_cmd(cmd, true, shutdown);	741	__iscsit_free_cmd(cmd, true, shutdown);
742	target_put_sess_cmd(se_cmd->se_sess, se_cmd);	742	target_put_sess_cmd(se_cmd->se_sess, se_cmd);
@@ -752,7 +752,7 @@ void iscsit_free_cmd(struct iscsi_cmd *cmd, bool shutdown) · 9 unmodified lines
752	se_cmd = &cmd->se_cmd;	752	se_cmd = &cmd->se_cmd;
753	__iscsit_free_cmd(cmd, true, shutdown);	753	__iscsit_free_cmd(cmd, true, shutdown);
754		754
755	rc = transport_generic_free_cmd(&cmd->se_cmd, 1);	755	rc = transport_generic_free_cmd(&cmd->se_cmd, shutdown);
756	if (!rc && shutdown && se_cmd->se_sess) {	756	if (!rc && shutdown && se_cmd->se_sess) {
757	__iscsit_free_cmd(cmd, true, shutdown);	757	__iscsit_free_cmd(cmd, true, shutdown);
758	target_put_sess_cmd(se_cmd->se_sess, se_cmd);	758	target_put_sess_cmd(se_cmd->se_sess, se_cmd);

drivers/target/target_core_sbc.c+26−2

 {
 	struct se_device *dev = cmd->se_dev;
-	cmd->se_cmd_flags |= SCF_COMPARE_AND_WRITE_POST;
+	/*
+	 * Only set SCF_COMPARE_AND_WRITE_POST to force a response fall-through
+	 * within target_complete_ok_work() if the command was successfully
+	 * sent to the backend driver.
+	 */
+	spin_lock_irq(&cmd->t_state_lock);
+	if ((cmd->transport_state & CMD_T_SENT) && !cmd->scsi_status)
+		cmd->se_cmd_flags |= SCF_COMPARE_AND_WRITE_POST;
+	spin_unlock_irq(&cmd->t_state_lock);
 	/*
 	 * Unlock ->caw_sem originally obtained during sbc_compare_and_write()
 	 * before the original READ I/O submission.
 {
 	struct se_device *dev = cmd->se_dev;
 	struct scatterlist *write_sg = NULL, *sg;
-	unsigned char *buf, *addr;
+	unsigned char *buf = NULL, *addr;
 	struct sg_mapping_iter m;
 	unsigned int offset = 0, len;
 	unsigned int nlbas = cmd->t_task_nolb;
 	 */
 	if (!cmd->t_data_sg || !cmd->t_bidi_data_sg)
 		return TCM_NO_SENSE;
+	/*
+	 * Immediately exit + release dev->caw_sem if command has already
+	 * been failed with a non-zero SCSI status.
+	 */
+	if (cmd->scsi_status) {
+		pr_err("compare_and_write_callback: non zero scsi_status:"
+			" 0x%02x\n", cmd->scsi_status);
+		goto out;
+	}
 	buf = kzalloc(cmd->data_length, GFP_KERNEL);
 	if (!buf) {
 		cmd->transport_complete_callback = NULL;
 		return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
 	}
+	/*
+	 * Reset cmd->data_length to individual block_size in order to not
+	 * confuse backend drivers that depend on this value matching the
+	 * size of the I/O being submitted.
+	 */
+	cmd->data_length = cmd->t_task_nolb * dev->dev_attrib.block_size;
 	ret = cmd->execute_rw(cmd, cmd->t_bidi_data_sg, cmd->t_bidi_data_nents,
 			      DMA_FROM_DEVICE);

drivers/target/target_core_transport.c+15−5

 {
 	int rc;
-	se_sess->sess_cmd_map = kzalloc(tag_num * tag_size, GFP_KERNEL);
+	se_sess->sess_cmd_map = kzalloc(tag_num * tag_size,
+					GFP_KERNEL | __GFP_NOWARN | __GFP_REPEAT);
 	if (!se_sess->sess_cmd_map) {
-		pr_err("Unable to allocate se_sess->sess_cmd_map\n");
+		se_sess->sess_cmd_map = vzalloc(tag_num * tag_size);
-		return -ENOMEM;
+		if (!se_sess->sess_cmd_map) {
+			pr_err("Unable to allocate se_sess->sess_cmd_map\n");
+			return -ENOMEM;
+		}
 	}
 	rc = percpu_ida_init(&se_sess->sess_tag_pool, tag_num);
 	if (rc < 0) {
 		pr_err("Unable to init se_sess->sess_tag_pool,"
 			" tag_num: %u\n", tag_num);
-		kfree(se_sess->sess_cmd_map);
+		if (is_vmalloc_addr(se_sess->sess_cmd_map))
+			vfree(se_sess->sess_cmd_map);
+		else
+			kfree(se_sess->sess_cmd_map);
 		se_sess->sess_cmd_map = NULL;
 		return -ENOMEM;
 	}
 {
 	if (se_sess->sess_cmd_map) {
 		percpu_ida_destroy(&se_sess->sess_tag_pool);
-		kfree(se_sess->sess_cmd_map);
+		if (is_vmalloc_addr(se_sess->sess_cmd_map))
+			vfree(se_sess->sess_cmd_map);
+		else
+			kfree(se_sess->sess_cmd_map);
 	}
 	kmem_cache_free(se_sess_cache, se_sess);
 }

drivers/target/target_core_xcopy.c+2−2

@@ -298,8 +298,8 @@ static int target_xcopy_parse_segdesc_02(struct se_cmd *se_cmd, struct xcopy_op · 297 unmodified lines
298	(unsigned long long)xop->dst_lba);	298	(unsigned long long)xop->dst_lba);
299		299
300	if (dc != 0) {	300	if (dc != 0) {
301	xop->dbl = (desc[29] << 16) & 0xff;	301	xop->dbl = (desc[29] & 0xff) << 16;
302	xop->dbl \|= (desc[30] << 8) & 0xff;	302	xop->dbl \|= (desc[30] & 0xff) << 8;
303	xop->dbl \|= desc[31] & 0xff;	303	xop->dbl \|= desc[31] & 0xff;
304		304
305	pr_debug("XCOPY seg desc 0x02: DC=1 w/ dbl: %u\n", xop->dbl);	305	pr_debug("XCOPY seg desc 0x02: DC=1 w/ dbl: %u\n", xop->dbl);

drivers/thermal/samsung/exynos_thermal_common.c+0−2

@@ -310,8 +310,6 @@ void exynos_report_trigger(struct thermal_sensor_conf *conf) · 309 unmodified lines
310	}	310	}
311		311
312	th_zone = conf->pzone_data;	312	th_zone = conf->pzone_data;
313	if (th_zone->therm_dev)
314	return;
315		313
316	if (th_zone->bind == false) {	314	if (th_zone->bind == false) {
317	for (i = 0; i < th_zone->cool_dev_size; i++) {	315	for (i = 0; i < th_zone->cool_dev_size; i++) {

drivers/thermal/samsung/exynos_tmu.c+8−4

 	con = readl(data->base + reg->tmu_ctrl);
+	if (pdata->test_mux)
+		con |= (pdata->test_mux << reg->test_mux_addr_shift);
 	if (pdata->reference_voltage) {
 		con &= ~(reg->buf_vref_sel_mask << reg->buf_vref_sel_shift);
 		con |= pdata->reference_voltage << reg->buf_vref_sel_shift;
 	},
 	{
 		.compatible = "samsung,exynos4412-tmu",
-		.data = (void *)EXYNOS5250_TMU_DRV_DATA,
+		.data = (void *)EXYNOS4412_TMU_DRV_DATA,
 	},
 	{
 		.compatible = "samsung,exynos5250-tmu",
 	if (ret)
 		return ret;
-	if (pdata->type == SOC_ARCH_EXYNOS ||
+	if (pdata->type == SOC_ARCH_EXYNOS4210 ||
-		pdata->type == SOC_ARCH_EXYNOS4210 ||
+	    pdata->type == SOC_ARCH_EXYNOS4412 ||
-				pdata->type == SOC_ARCH_EXYNOS5440)
+	    pdata->type == SOC_ARCH_EXYNOS5250 ||
+	    pdata->type == SOC_ARCH_EXYNOS5440)
 		data->soc = pdata->type;
 	else {
 		ret = -EINVAL;

drivers/thermal/samsung/exynos_tmu.h+6−1

 enum soc_type {
 	SOC_ARCH_EXYNOS4210 = 1,
-	SOC_ARCH_EXYNOS,
+	SOC_ARCH_EXYNOS4412,
+	SOC_ARCH_EXYNOS5250,
 	SOC_ARCH_EXYNOS5440,
 };
  * @triminfo_reload_shift: shift of triminfo reload enable bit in triminfo_ctrl
 	reg.
  * @tmu_ctrl: TMU main controller register.
+ * @test_mux_addr_shift: shift bits of test mux address.
  * @buf_vref_sel_shift: shift bits of reference voltage in tmu_ctrl register.
  * @buf_vref_sel_mask: mask bits of reference voltage in tmu_ctrl register.
  * @therm_trip_mode_shift: shift bits of tripping mode in tmu_ctrl register.
 	u32	triminfo_reload_shift;
 	u32	tmu_ctrl;
+	u32     test_mux_addr_shift;
 	u32	buf_vref_sel_shift;
 	u32	buf_vref_sel_mask;
 	u32	therm_trip_mode_shift;
  * @first_point_trim: temp value of the first point trimming
  * @second_point_trim: temp value of the second point trimming
  * @default_temp_offset: default temperature offset in case of no trimming
+ * @test_mux; information if SoC supports test MUX
  * @cal_type: calibration type for temperature
  * @cal_mode: calibration mode for temperature
  * @freq_clip_table: Table representing frequency reduction percentage.
 	u8 first_point_trim;
 	u8 second_point_trim;
 	u8 default_temp_offset;
+	u8 test_mux;
 	enum calibration_type cal_type;
 	enum calibration_mode cal_mode;

drivers/thermal/samsung/exynos_tmu_data.c+24−6

 };
 #endif
-#if defined(CONFIG_SOC_EXYNOS5250) || defined(CONFIG_SOC_EXYNOS4412)
+#if defined(CONFIG_SOC_EXYNOS4412) || defined(CONFIG_SOC_EXYNOS5250)
-static const struct exynos_tmu_registers exynos5250_tmu_registers = {
+static const struct exynos_tmu_registers exynos4412_tmu_registers = {
 	.triminfo_data = EXYNOS_TMU_REG_TRIMINFO,
 	.triminfo_25_shift = EXYNOS_TRIMINFO_25_SHIFT,
 	.triminfo_85_shift = EXYNOS_TRIMINFO_85_SHIFT,
 	.triminfo_ctrl = EXYNOS_TMU_TRIMINFO_CON,
 	.triminfo_reload_shift = EXYNOS_TRIMINFO_RELOAD_SHIFT,
 	.tmu_ctrl = EXYNOS_TMU_REG_CONTROL,
+	.test_mux_addr_shift = EXYNOS4412_MUX_ADDR_SHIFT,
 	.buf_vref_sel_shift = EXYNOS_TMU_REF_VOLTAGE_SHIFT,
 	.buf_vref_sel_mask = EXYNOS_TMU_REF_VOLTAGE_MASK,
 	.therm_trip_mode_shift = EXYNOS_TMU_TRIP_MODE_SHIFT,
 	.emul_time_mask = EXYNOS_EMUL_TIME_MASK,
 };
-#define EXYNOS5250_TMU_DATA \
+#define EXYNOS4412_TMU_DATA \
 	.threshold_falling = 10, \
 	.trigger_levels[0] = 85, \
 	.trigger_levels[1] = 103, \
 		.temp_level = 103, \
 	}, \
 	.freq_tab_count = 2, \
-	.type = SOC_ARCH_EXYNOS, \
+	.registers = &exynos4412_tmu_registers, \
-	.registers = &exynos5250_tmu_registers, \
 	.features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_TRIM_RELOAD | \
 			TMU_SUPPORT_FALLING_TRIP | TMU_SUPPORT_READY_STATUS | \
 			TMU_SUPPORT_EMUL_TIME)
+#endif
+#if defined(CONFIG_SOC_EXYNOS4412)
+struct exynos_tmu_init_data const exynos4412_default_tmu_data = {
+	.tmu_data = {
+		{
+			EXYNOS4412_TMU_DATA,
+			.type = SOC_ARCH_EXYNOS4412,
+			.test_mux = EXYNOS4412_MUX_ADDR_VALUE,
+		},
+	},
+	.tmu_count = 1,
+};
+#endif
+#if defined(CONFIG_SOC_EXYNOS5250)
 struct exynos_tmu_init_data const exynos5250_default_tmu_data = {
 	.tmu_data = {
-		{ EXYNOS5250_TMU_DATA },
+		{
+			EXYNOS4412_TMU_DATA,
+			.type = SOC_ARCH_EXYNOS5250,
+		},
 	},
 	.tmu_count = 1,
 };

drivers/thermal/samsung/exynos_tmu_data.h+12−1

 #define EXYNOS_MAX_TRIGGER_PER_REG	4
+/* Exynos4412 specific */
+#define EXYNOS4412_MUX_ADDR_VALUE          6
+#define EXYNOS4412_MUX_ADDR_SHIFT          20
 /*exynos5440 specific registers*/
 #define EXYNOS5440_TMU_S0_7_TRIM		0x000
 #define EXYNOS5440_TMU_S0_7_CTRL		0x020
 #define EXYNOS4210_TMU_DRV_DATA (NULL)
 #endif
-#if (defined(CONFIG_SOC_EXYNOS5250) || defined(CONFIG_SOC_EXYNOS4412))
+#if defined(CONFIG_SOC_EXYNOS4412)
+extern struct exynos_tmu_init_data const exynos4412_default_tmu_data;
+#define EXYNOS4412_TMU_DRV_DATA (&exynos4412_default_tmu_data)
+#else
+#define EXYNOS4412_TMU_DRV_DATA (NULL)
+#endif
+#if defined(CONFIG_SOC_EXYNOS5250)
 extern struct exynos_tmu_init_data const exynos5250_default_tmu_data;
 #define EXYNOS5250_TMU_DRV_DATA (&exynos5250_default_tmu_data)
 #else

drivers/thermal/thermal_hwmon.c+1−1

@@ -159,7 +159,7 @@ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz) · 158 unmodified lines
159		159
160	INIT_LIST_HEAD(&hwmon->tz_list);	160	INIT_LIST_HEAD(&hwmon->tz_list);
161	strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);	161	strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);
162	hwmon->device = hwmon_device_register(&tz->device);	162	hwmon->device = hwmon_device_register(NULL);
163	if (IS_ERR(hwmon->device)) {	163	if (IS_ERR(hwmon->device)) {
164	result = PTR_ERR(hwmon->device);	164	result = PTR_ERR(hwmon->device);
165	goto free_mem;	165	goto free_mem;

drivers/thermal/ti-soc-thermal/ti-thermal-common.c+1−0

@@ -110,6 +110,7 @@ static inline int ti_thermal_get_temp(struct thermal_zone_device *thermal, · 109 unmodified lines
110	} else {	110	} else {
111	dev_err(bgp->dev,	111	dev_err(bgp->dev,
112	"Failed to read PCB state. Using defaults\n");	112	"Failed to read PCB state. Using defaults\n");
		113	ret = 0;
113	}	114	}
114	}	115	}
115	*temp = ti_thermal_hotspot_temperature(tmp, slope, constant);	116	*temp = ti_thermal_hotspot_temperature(tmp, slope, constant);

drivers/thermal/x86_pkg_temp_thermal.c+8−6

 	int phy_id = topology_physical_package_id(cpu);
 	struct phy_dev_entry *phdev = pkg_temp_thermal_get_phy_entry(cpu);
 	bool notify = false;
+	unsigned long flags;
 	if (!phdev)
 		return;
-	spin_lock(&pkg_work_lock);
+	spin_lock_irqsave(&pkg_work_lock, flags);
 	++pkg_work_cnt;
 	if (unlikely(phy_id > max_phy_id)) {
-		spin_unlock(&pkg_work_lock);
+		spin_unlock_irqrestore(&pkg_work_lock, flags);
 		return;
 	}
 	pkg_work_scheduled[phy_id] = 0;
-	spin_unlock(&pkg_work_lock);
+	spin_unlock_irqrestore(&pkg_work_lock, flags);
 	enable_pkg_thres_interrupt();
 	rdmsrl(MSR_IA32_PACKAGE_THERM_STATUS, msr_val);
 	int thres_count;
 	u32 eax, ebx, ecx, edx;
 	u8 *temp;
+	unsigned long flags;
 	cpuid(6, &eax, &ebx, &ecx, &edx);
 	thres_count = ebx & 0x07;
 		goto err_ret_unlock;
 	}
-	spin_lock(&pkg_work_lock);
+	spin_lock_irqsave(&pkg_work_lock, flags);
 	if (topology_physical_package_id(cpu) > max_phy_id)
 		max_phy_id = topology_physical_package_id(cpu);
 	temp = krealloc(pkg_work_scheduled,
 			(max_phy_id+1) * sizeof(u8), GFP_ATOMIC);
 	if (!temp) {
-		spin_unlock(&pkg_work_lock);
+		spin_unlock_irqrestore(&pkg_work_lock, flags);
 		err = -ENOMEM;
 		goto err_ret_free;
 	}
 	pkg_work_scheduled = temp;
 	pkg_work_scheduled[topology_physical_package_id(cpu)] = 0;
-	spin_unlock(&pkg_work_lock);
+	spin_unlock_irqrestore(&pkg_work_lock, flags);
 	phy_dev_entry->phys_proc_id = topology_physical_package_id(cpu);
 	phy_dev_entry->first_cpu = cpu;

drivers/tty/hvc/hvc_xen.c+1−0

@@ -636,6 +636,7 @@ struct console xenboot_console = { · 635 unmodified lines
636	.name = "xenboot",	636	.name = "xenboot",
637	.write = xenboot_write_console,	637	.write = xenboot_write_console,
638	.flags = CON_PRINTBUFFER \| CON_BOOT \| CON_ANYTIME,	638	.flags = CON_PRINTBUFFER \| CON_BOOT \| CON_ANYTIME,
		639	.index = -1,
639	};	640	};
640	#endif /* CONFIG_EARLY_PRINTK */	641	#endif /* CONFIG_EARLY_PRINTK */
641		642

drivers/tty/n_tty.c+26−20

@@ -2183,28 +2183,34 @@ static ssize_t n_tty_read(struct tty_struct tty, struct file file, · 2182 unmodified lines
2183		2183
2184	if (!input_available_p(tty, 0)) {	2184	if (!input_available_p(tty, 0)) {
2185	if (test_bit(TTY_OTHER_CLOSED, &tty->flags)) {	2185	if (test_bit(TTY_OTHER_CLOSED, &tty->flags)) {
2186	retval = -EIO;	2186	up_read(&tty->termios_rwsem);
2187	break;	2187	tty_flush_to_ldisc(tty);
2188	}	2188	down_read(&tty->termios_rwsem);
2189	if (tty_hung_up_p(file))	2189	if (!input_available_p(tty, 0)) {
2190	break;	2190	retval = -EIO;
2191	if (!timeout)	2191	break;
2192	break;	2192	}
2193	if (file->f_flags & O_NONBLOCK) {	2193	} else {
2194	retval = -EAGAIN;	2194	if (tty_hung_up_p(file))
2195	break;	2195	break;
2196	}	2196	if (!timeout)
2197	if (signal_pending(current)) {	2197	break;
2198	retval = -ERESTARTSYS;	2198	if (file->f_flags & O_NONBLOCK) {
2199	break;	2199	retval = -EAGAIN;
2200	}	2200	break;
2201	n_tty_set_room(tty);	2201	}
2202	up_read(&tty->termios_rwsem);	2202	if (signal_pending(current)) {
		2203	retval = -ERESTARTSYS;
		2204	break;
		2205	}
		2206	n_tty_set_room(tty);
		2207	up_read(&tty->termios_rwsem);
2203		2208
2204	timeout = schedule_timeout(timeout);	2209	timeout = schedule_timeout(timeout);
2205		2210
2206	down_read(&tty->termios_rwsem);	2211	down_read(&tty->termios_rwsem);
2207	continue;	2212	continue;
		2213	}
2208	}	2214	}
2209	__set_current_state(TASK_RUNNING);	2215	__set_current_state(TASK_RUNNING);
2210		2216

drivers/tty/serial/imx.c+0−3

@@ -1912,9 +1912,6 @@ static int serial_imx_probe_dt(struct imx_port *sport, · 1911 unmodified lines
1912		1912
1913	sport->devdata = of_id->data;	1913	sport->devdata = of_id->data;
1914		1914
1915	if (of_device_is_stdout_path(np))
1916	add_preferred_console(imx_reg.cons->name, sport->port.line, 0);
1917
1918	return 0;	1915	return 0;
1919	}	1916	}
1920	#else	1917	#else

drivers/tty/serial/vt8500_serial.c+3−2

 	if (!mmres || !irqres)
 		return -ENODEV;
-	if (np)
+	if (np) {
 		port = of_alias_get_id(np, "serial");
 		if (port >= VT8500_MAX_PORTS)
 			port = -1;
-	else
+	} else {
 		port = -1;
+	}
 	if (port < 0) {
 		/* calculate the port id */

drivers/usb/chipidea/ci_hdrc_pci.c+6−1

 		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0829),
 		.driver_data = (kernel_ulong_t)&penwell_pci_platdata,
 	},
-	{ 0, 0, 0, 0, 0, 0, 0 /* end: all zeroes */ }
+	{
+		/* Intel Clovertrail */
+		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe006),
+		.driver_data = (kernel_ulong_t)&penwell_pci_platdata,
+	},
+	{ 0 } /* end: all zeroes */
 };
 MODULE_DEVICE_TABLE(pci, ci_hdrc_pci_id_table);

drivers/usb/chipidea/host.c+4−2

 {
 	struct usb_hcd *hcd = ci->hcd;
-	usb_remove_hcd(hcd);
+	if (hcd) {
-	usb_put_hcd(hcd);
+		usb_remove_hcd(hcd);
+		usb_put_hcd(hcd);
+	}
 	if (ci->platdata->reg_vbus)
 		regulator_disable(ci->platdata->reg_vbus);
 }

drivers/usb/core/quirks.c+6−0

 	/* Alcor Micro Corp. Hub */
 	{ USB_DEVICE(0x058f, 0x9254), .driver_info = USB_QUIRK_RESET_RESUME },
+	/* MicroTouch Systems touchscreen */
+	{ USB_DEVICE(0x0596, 0x051e), .driver_info = USB_QUIRK_RESET_RESUME },
 	/* appletouch */
 	{ USB_DEVICE(0x05ac, 0x021a), .driver_info = USB_QUIRK_RESET_RESUME },
 	/* Broadcom BCM92035DGROM BT dongle */
 	{ USB_DEVICE(0x0a5c, 0x2021), .driver_info = USB_QUIRK_RESET_RESUME },
+	/* MAYA44USB sound device */
+	{ USB_DEVICE(0x0a92, 0x0091), .driver_info = USB_QUIRK_RESET_RESUME },
 	/* Action Semiconductor flash disk */
 	{ USB_DEVICE(0x10d6, 0x2200), .driver_info =
 			USB_QUIRK_STRING_FETCH_255 },

drivers/usb/gadget/f_fs.c+2−0

@@ -2256,6 +2256,8 @@ static int ffs_func_bind(struct usb_configuration *c, · 2255 unmodified lines
2256	data->raw_descs + ret,	2256	data->raw_descs + ret,
2257	(sizeof data->raw_descs) - ret,	2257	(sizeof data->raw_descs) - ret,
2258	__ffs_func_bind_do_descs, func);	2258	__ffs_func_bind_do_descs, func);
		2259	if (unlikely(ret < 0))
		2260	goto error;
2259	}	2261	}
2260		2262
2261	/*	2263	/*

drivers/usb/gadget/pxa25x_udc.c+5−4

 /*
  *	probe - binds to the platform device
  */
-static int __init pxa25x_udc_probe(struct platform_device *pdev)
+static int pxa25x_udc_probe(struct platform_device *pdev)
 {
 	struct pxa25x_udc *dev = &memory;
 	int retval, irq;
 	pullup_off();
 }
-static int __exit pxa25x_udc_remove(struct platform_device *pdev)
+static int pxa25x_udc_remove(struct platform_device *pdev)
 {
 	struct pxa25x_udc *dev = platform_get_drvdata(pdev);
 static struct platform_driver udc_driver = {
 	.shutdown	= pxa25x_udc_shutdown,
-	.remove		= __exit_p(pxa25x_udc_remove),
+	.probe		= pxa25x_udc_probe,
+	.remove		= pxa25x_udc_remove,
 	.suspend	= pxa25x_udc_suspend,
 	.resume		= pxa25x_udc_resume,
 	.driver		= {
 	},
 };
-module_platform_driver_probe(udc_driver, pxa25x_udc_probe);
+module_platform_driver(udc_driver);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_AUTHOR("Frank Becker, Robert Schwebel, David Brownell");

drivers/usb/gadget/s3c-hsotg.c+1−1

@@ -543,7 +543,7 @@ static int s3c_hsotg_write_fifo(struct s3c_hsotg *hsotg, · 542 unmodified lines
543	* FIFO, requests of >512 cause the endpoint to get stuck with a	543	* FIFO, requests of >512 cause the endpoint to get stuck with a
544	* fragment of the end of the transfer in it.	544	* fragment of the end of the transfer in it.
545	*/	545	*/
546	if (can_write > 512)	546	if (can_write > 512 && !periodic)
547	can_write = 512;	547	can_write = 512;
548		548
549	/*	549	/*

drivers/usb/host/pci-quirks.c+2−2

@@ -799,7 +799,7 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) · 798 unmodified lines
799	* switchable ports.	799	* switchable ports.
800	*/	800	*/
801	pci_write_config_dword(xhci_pdev, USB_INTEL_USB3_PSSEN,	801	pci_write_config_dword(xhci_pdev, USB_INTEL_USB3_PSSEN,
802	cpu_to_le32(ports_available));	802	ports_available);
803		803
804	pci_read_config_dword(xhci_pdev, USB_INTEL_USB3_PSSEN,	804	pci_read_config_dword(xhci_pdev, USB_INTEL_USB3_PSSEN,
805	&ports_available);	805	&ports_available);
@@ -821,7 +821,7 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) · 15 unmodified lines
821	* host.	821	* host.
822	*/	822	*/
823	pci_write_config_dword(xhci_pdev, USB_INTEL_XUSB2PR,	823	pci_write_config_dword(xhci_pdev, USB_INTEL_XUSB2PR,
824	cpu_to_le32(ports_available));	824	ports_available);
825		825
826	pci_read_config_dword(xhci_pdev, USB_INTEL_XUSB2PR,	826	pci_read_config_dword(xhci_pdev, USB_INTEL_XUSB2PR,
827	&ports_available);	827	&ports_available);

drivers/usb/host/xhci-hub.c+0−26

@@ -1157,18 +1157,6 @@ int xhci_bus_suspend(struct usb_hcd *hcd) · 1156 unmodified lines
1157	t1 = xhci_port_state_to_neutral(t1);	1157	t1 = xhci_port_state_to_neutral(t1);
1158	if (t1 != t2)	1158	if (t1 != t2)
1159	xhci_writel(xhci, t2, port_array[port_index]);	1159	xhci_writel(xhci, t2, port_array[port_index]);
1160
1161	if (hcd->speed != HCD_USB3) {
1162	/* enable remote wake up for USB 2.0 */
1163	__le32 __iomem *addr;
1164	u32 tmp;
1165
1166	/* Get the port power control register address. */
1167	addr = port_array[port_index] + PORTPMSC;
1168	tmp = xhci_readl(xhci, addr);
1169	tmp \|= PORT_RWE;
1170	xhci_writel(xhci, tmp, addr);
1171	}
1172	}	1160	}
1173	hcd->state = HC_STATE_SUSPENDED;	1161	hcd->state = HC_STATE_SUSPENDED;
1174	bus_state->next_statechange = jiffies + msecs_to_jiffies(10);	1162	bus_state->next_statechange = jiffies + msecs_to_jiffies(10);
@@ -1247,20 +1235,6 @@ int xhci_bus_resume(struct usb_hcd *hcd) · 72 unmodified lines
1247	xhci_ring_device(xhci, slot_id);	1235	xhci_ring_device(xhci, slot_id);
1248	} else	1236	} else
1249	xhci_writel(xhci, temp, port_array[port_index]);	1237	xhci_writel(xhci, temp, port_array[port_index]);
1250
1251	if (hcd->speed != HCD_USB3) {
1252	/* disable remote wake up for USB 2.0 */
1253	__le32 __iomem *addr;
1254	u32 tmp;
1255
1256	/* Add one to the port status register address to get
1257	* the port power control register address.
1258	*/
1259	addr = port_array[port_index] + PORTPMSC;
1260	tmp = xhci_readl(xhci, addr);
1261	tmp &= ~PORT_RWE;
1262	xhci_writel(xhci, tmp, addr);
1263	}
1264	}	1238	}
1265		1239
1266	(void) xhci_readl(xhci, &xhci->op_regs->command);	1240	(void) xhci_readl(xhci, &xhci->op_regs->command);

drivers/usb/host/xhci-pci.c+25−0

@@ -35,6 +35,9 @@ · 34 unmodified lines
35	#define PCI_VENDOR_ID_ETRON 0x1b6f	35	#define PCI_VENDOR_ID_ETRON 0x1b6f
36	#define PCI_DEVICE_ID_ASROCK_P67 0x7023	36	#define PCI_DEVICE_ID_ASROCK_P67 0x7023
37		37
		38	#define PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI 0x8c31
		39	#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI 0x9c31
		40
38	static const char hcd_name[] = "xhci_hcd";	41	static const char hcd_name[] = "xhci_hcd";
39		42
40	/* called after powerup, by probe or system-pm "wakeup" */	43	/* called after powerup, by probe or system-pm "wakeup" */
@@ -69,6 +72,14 @@ static void xhci_pci_quirks(struct device dev, struct xhci_hcd xhci) · 28 unmodified lines
69	"QUIRK: Fresco Logic xHC needs configure"	72	"QUIRK: Fresco Logic xHC needs configure"
70	" endpoint cmd after reset endpoint");	73	" endpoint cmd after reset endpoint");
71	}	74	}
		75	if (pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK &&
		76	pdev->revision == 0x4) {
		77	xhci->quirks \|= XHCI_SLOW_SUSPEND;
		78	xhci_dbg_trace(xhci, trace_xhci_dbg_quirks,
		79	"QUIRK: Fresco Logic xHC revision %u"
		80	"must be suspended extra slowly",
		81	pdev->revision);
		82	}
72	/* Fresco Logic confirms: all revisions of this chip do not	83	/* Fresco Logic confirms: all revisions of this chip do not
73	* support MSI, even though some of them claim to in their PCI	84	* support MSI, even though some of them claim to in their PCI
74	* capabilities.	85	* capabilities.
@@ -110,6 +121,15 @@ static void xhci_pci_quirks(struct device dev, struct xhci_hcd xhci) · 35 unmodified lines
110	xhci->quirks \|= XHCI_SPURIOUS_REBOOT;	121	xhci->quirks \|= XHCI_SPURIOUS_REBOOT;
111	xhci->quirks \|= XHCI_AVOID_BEI;	122	xhci->quirks \|= XHCI_AVOID_BEI;
112	}	123	}
		124	if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
		125	(pdev->device == PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI \|\|
		126	pdev->device == PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI)) {
		127	/* Workaround for occasional spurious wakeups from S5 (or
		128	* any other sleep) on Haswell machines with LPT and LPT-LP
		129	* with the new Intel BIOS
		130	*/
		131	xhci->quirks \|= XHCI_SPURIOUS_WAKEUP;
		132	}
113	if (pdev->vendor == PCI_VENDOR_ID_ETRON &&	133	if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
114	pdev->device == PCI_DEVICE_ID_ASROCK_P67) {	134	pdev->device == PCI_DEVICE_ID_ASROCK_P67) {
115	xhci->quirks \|= XHCI_RESET_ON_RESUME;	135	xhci->quirks \|= XHCI_RESET_ON_RESUME;
@@ -217,6 +237,11 @@ static void xhci_pci_remove(struct pci_dev *dev) · 101 unmodified lines
217	usb_put_hcd(xhci->shared_hcd);	237	usb_put_hcd(xhci->shared_hcd);
218	}	238	}
219	usb_hcd_pci_remove(dev);	239	usb_hcd_pci_remove(dev);
		240
		241	/* Workaround for spurious wakeups at shutdown with HSW */
		242	if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)
		243	pci_set_power_state(dev, PCI_D3hot);
		244
220	kfree(xhci);	245	kfree(xhci);
221	}	246	}
222		247

drivers/usb/host/xhci.c+13−1

 	spin_lock_irq(&xhci->lock);
 	xhci_halt(xhci);
+	/* Workaround for spurious wakeups at shutdown with HSW */
+	if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)
+		xhci_reset(xhci);
 	spin_unlock_irq(&xhci->lock);
 	xhci_cleanup_msix(xhci);
 	xhci_dbg_trace(xhci, trace_xhci_dbg_init,
 			"xhci_shutdown completed - status = %x",
 			xhci_readl(xhci, &xhci->op_regs->status));
+	/* Yet another workaround for spurious wakeups at shutdown with HSW */
+	if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)
+		pci_set_power_state(to_pci_dev(hcd->self.controller), PCI_D3hot);
 }
 #ifdef CONFIG_PM
 int xhci_suspend(struct xhci_hcd *xhci)
 {
 	int			rc = 0;
+	unsigned int		delay = XHCI_MAX_HALT_USEC;
 	struct usb_hcd		*hcd = xhci_to_hcd(xhci);
 	u32			command;
 	command = xhci_readl(xhci, &xhci->op_regs->command);
 	command &= ~CMD_RUN;
 	xhci_writel(xhci, command, &xhci->op_regs->command);
+	/* Some chips from Fresco Logic need an extraordinary delay */
+	delay *= (xhci->quirks & XHCI_SLOW_SUSPEND) ? 10 : 1;
 	if (xhci_handshake(xhci, &xhci->op_regs->status,
-		      STS_HALT, STS_HALT, XHCI_MAX_HALT_USEC)) {
+		      STS_HALT, STS_HALT, delay)) {
 		xhci_warn(xhci, "WARN: xHC CMD_RUN timeout\n");
 		spin_unlock_irq(&xhci->lock);
 		return -ETIMEDOUT;

drivers/usb/host/xhci.h+2−0

 #define XHCI_COMP_MODE_QUIRK	(1 << 14)
 #define XHCI_AVOID_BEI		(1 << 15)
 #define XHCI_PLAT		(1 << 16)
+#define XHCI_SLOW_SUSPEND	(1 << 17)
+#define XHCI_SPURIOUS_WAKEUP	(1 << 18)
 	unsigned int		num_active_eps;
 	unsigned int		limit_active_eps;
 	/* There are two roothubs to keep track of bus suspend info for */

drivers/usb/misc/Kconfig+1−1

@@ -246,6 +246,6 @@ config USB_EZUSB_FX2 · 245 unmodified lines
246	config USB_HSIC_USB3503	246	config USB_HSIC_USB3503
247	tristate "USB3503 HSIC to USB20 Driver"	247	tristate "USB3503 HSIC to USB20 Driver"
248	depends on I2C	248	depends on I2C
249	select REGMAP	249	select REGMAP_I2C
250	help	250	help
251	This option enables support for SMSC USB3503 HSIC to USB 2.0 Driver.	251	This option enables support for SMSC USB3503 HSIC to USB 2.0 Driver.

drivers/usb/musb/musb_core.c+46−0

@@ -921,6 +921,52 @@ static void musb_generic_disable(struct musb *musb) · 920 unmodified lines
921		921
922	}	922	}
923		923
		924	/*
		925	* Program the HDRC to start (enable interrupts, dma, etc.).
		926	*/
		927	void musb_start(struct musb *musb)
		928	{
		929	void __iomem *regs = musb->mregs;
		930	u8 devctl = musb_readb(regs, MUSB_DEVCTL);
		931
		932	dev_dbg(musb->controller, "<== devctl %02x\n", devctl);
		933
		934	/* Set INT enable registers, enable interrupts */
		935	musb->intrtxe = musb->epmask;
		936	musb_writew(regs, MUSB_INTRTXE, musb->intrtxe);
		937	musb->intrrxe = musb->epmask & 0xfffe;
		938	musb_writew(regs, MUSB_INTRRXE, musb->intrrxe);
		939	musb_writeb(regs, MUSB_INTRUSBE, 0xf7);
		940
		941	musb_writeb(regs, MUSB_TESTMODE, 0);
		942
		943	/* put into basic highspeed mode and start session */
		944	musb_writeb(regs, MUSB_POWER, MUSB_POWER_ISOUPDATE
		945	\| MUSB_POWER_HSENAB
		946	/* ENSUSPEND wedges tusb */
		947	/* \| MUSB_POWER_ENSUSPEND */
		948	);
		949
		950	musb->is_active = 0;
		951	devctl = musb_readb(regs, MUSB_DEVCTL);
		952	devctl &= ~MUSB_DEVCTL_SESSION;
		953
		954	/* session started after:
		955	* (a) ID-grounded irq, host mode;
		956	* (b) vbus present/connect IRQ, peripheral mode;
		957	* (c) peripheral initiates, using SRP
		958	*/
		959	if (musb->port_mode != MUSB_PORT_MODE_HOST &&
		960	(devctl & MUSB_DEVCTL_VBUS) == MUSB_DEVCTL_VBUS) {
		961	musb->is_active = 1;
		962	} else {
		963	devctl \|= MUSB_DEVCTL_SESSION;
		964	}
		965
		966	musb_platform_enable(musb);
		967	musb_writeb(regs, MUSB_DEVCTL, devctl);
		968	}
		969
924	/*	970	/*
925	* Make the HDRC stop (disable interrupts, etc.);	971	* Make the HDRC stop (disable interrupts, etc.);
926	* reversible by musb_start	972	* reversible by musb_start

drivers/usb/musb/musb_core.h+1−0

@@ -503,6 +503,7 @@ static inline void musb_configure_ep0(struct musb *musb) · 502 unmodified lines
503	extern const char musb_driver_name[];	503	extern const char musb_driver_name[];
504		504
505	extern void musb_stop(struct musb *musb);	505	extern void musb_stop(struct musb *musb);
		506	extern void musb_start(struct musb *musb);
506		507
507	extern void musb_write_fifo(struct musb_hw_ep ep, u16 len, const u8 src);	508	extern void musb_write_fifo(struct musb_hw_ep ep, u16 len, const u8 src);
508	extern void musb_read_fifo(struct musb_hw_ep ep, u16 len, u8 dst);	509	extern void musb_read_fifo(struct musb_hw_ep ep, u16 len, u8 dst);

drivers/usb/musb/musb_dsps.c+3−0

@@ -535,6 +535,9 @@ static int dsps_probe(struct platform_device *pdev) · 534 unmodified lines
535	struct dsps_glue *glue;	535	struct dsps_glue *glue;
536	int ret;	536	int ret;
537		537
		538	if (!strcmp(pdev->name, "musb-hdrc"))
		539	return -ENODEV;
		540
538	match = of_match_node(musb_dsps_of_match, pdev->dev.of_node);	541	match = of_match_node(musb_dsps_of_match, pdev->dev.of_node);
539	if (!match) {	542	if (!match) {
540	dev_err(&pdev->dev, "fail to get matching of_match struct\n");	543	dev_err(&pdev->dev, "fail to get matching of_match struct\n");

drivers/usb/musb/musb_gadget.c+6−0

 	musb->g.max_speed = USB_SPEED_HIGH;
 	musb->g.speed = USB_SPEED_UNKNOWN;
+	MUSB_DEV_MODE(musb);
+	musb->xceiv->otg->default_a = 0;
+	musb->xceiv->state = OTG_STATE_B_IDLE;
 	/* this "gadget" abstracts/virtualizes the controller */
 	musb->g.name = musb_driver_name;
 	musb->g.is_otg = 1;
 	musb->xceiv->state = OTG_STATE_B_IDLE;
 	spin_unlock_irqrestore(&musb->lock, flags);
+	musb_start(musb);
 	/* REVISIT:  funcall to other code, which also
 	 * handles power budgeting ... this way also
 	 * ensures HdrcStart is indirectly called.

drivers/usb/musb/musb_virthub.c+0−46

@@ -44,52 +44,6 @@ · 43 unmodified lines
44		44
45	#include "musb_core.h"	45	#include "musb_core.h"
46		46
47	/*
48	* Program the HDRC to start (enable interrupts, dma, etc.).
49	*/
50	static void musb_start(struct musb *musb)
51	{
52	void __iomem *regs = musb->mregs;
53	u8 devctl = musb_readb(regs, MUSB_DEVCTL);
54
55	dev_dbg(musb->controller, "<== devctl %02x\n", devctl);
56
57	/* Set INT enable registers, enable interrupts */
58	musb->intrtxe = musb->epmask;
59	musb_writew(regs, MUSB_INTRTXE, musb->intrtxe);
60	musb->intrrxe = musb->epmask & 0xfffe;
61	musb_writew(regs, MUSB_INTRRXE, musb->intrrxe);
62	musb_writeb(regs, MUSB_INTRUSBE, 0xf7);
63
64	musb_writeb(regs, MUSB_TESTMODE, 0);
65
66	/* put into basic highspeed mode and start session */
67	musb_writeb(regs, MUSB_POWER, MUSB_POWER_ISOUPDATE
68	\| MUSB_POWER_HSENAB
69	/* ENSUSPEND wedges tusb */
70	/* \| MUSB_POWER_ENSUSPEND */
71	);
72
73	musb->is_active = 0;
74	devctl = musb_readb(regs, MUSB_DEVCTL);
75	devctl &= ~MUSB_DEVCTL_SESSION;
76
77	/* session started after:
78	* (a) ID-grounded irq, host mode;
79	* (b) vbus present/connect IRQ, peripheral mode;
80	* (c) peripheral initiates, using SRP
81	*/
82	if (musb->port_mode != MUSB_PORT_MODE_HOST &&
83	(devctl & MUSB_DEVCTL_VBUS) == MUSB_DEVCTL_VBUS) {
84	musb->is_active = 1;
85	} else {
86	devctl \|= MUSB_DEVCTL_SESSION;
87	}
88
89	musb_platform_enable(musb);
90	musb_writeb(regs, MUSB_DEVCTL, devctl);
91	}
92
93	static void musb_port_suspend(struct musb *musb, bool do_suspend)	47	static void musb_port_suspend(struct musb *musb, bool do_suspend)
94	{	48	{
95	struct usb_otg *otg = musb->xceiv->otg;	49	struct usb_otg *otg = musb->xceiv->otg;

drivers/usb/phy/phy-gpio-vbus-usb.c+5−6

 /* platform driver interface */
-static int __init gpio_vbus_probe(struct platform_device *pdev)
+static int gpio_vbus_probe(struct platform_device *pdev)
 {
 	struct gpio_vbus_mach_info *pdata = dev_get_platdata(&pdev->dev);
 	struct gpio_vbus_data *gpio_vbus;
 	return err;
 }
-static int __exit gpio_vbus_remove(struct platform_device *pdev)
+static int gpio_vbus_remove(struct platform_device *pdev)
 {
 	struct gpio_vbus_data *gpio_vbus = platform_get_drvdata(pdev);
 	struct gpio_vbus_mach_info *pdata = dev_get_platdata(&pdev->dev);
 };
 #endif
-/* NOTE:  the gpio-vbus device may *NOT* be hotplugged */
 MODULE_ALIAS("platform:gpio-vbus");
 static struct platform_driver gpio_vbus_driver = {
 		.pm = &gpio_vbus_dev_pm_ops,
 #endif
 	},
-	.remove  = __exit_p(gpio_vbus_remove),
+	.probe		= gpio_vbus_probe,
+	.remove		= gpio_vbus_remove,
 };
-module_platform_driver_probe(gpio_vbus_driver, gpio_vbus_probe);
+module_platform_driver(gpio_vbus_driver);
 MODULE_DESCRIPTION("simple GPIO controlled OTG transceiver driver");
 MODULE_AUTHOR("Philipp Zabel");

drivers/usb/serial/option.c+227−1

@@ -81,6 +81,7 @@ static void option_instat_callback(struct urb *urb); · 80 unmodified lines
81		81
82	#define HUAWEI_VENDOR_ID 0x12D1	82	#define HUAWEI_VENDOR_ID 0x12D1
83	#define HUAWEI_PRODUCT_E173 0x140C	83	#define HUAWEI_PRODUCT_E173 0x140C
		84	#define HUAWEI_PRODUCT_E1750 0x1406
84	#define HUAWEI_PRODUCT_K4505 0x1464	85	#define HUAWEI_PRODUCT_K4505 0x1464
85	#define HUAWEI_PRODUCT_K3765 0x1465	86	#define HUAWEI_PRODUCT_K3765 0x1465
86	#define HUAWEI_PRODUCT_K4605 0x14C6	87	#define HUAWEI_PRODUCT_K4605 0x14C6
@@ -450,6 +451,10 @@ static void option_instat_callback(struct urb *urb); · 363 unmodified lines
450	#define CHANGHONG_VENDOR_ID 0x2077	451	#define CHANGHONG_VENDOR_ID 0x2077
451	#define CHANGHONG_PRODUCT_CH690 0x7001	452	#define CHANGHONG_PRODUCT_CH690 0x7001
452		453
		454	/* Inovia */
		455	#define INOVIA_VENDOR_ID 0x20a6
		456	#define INOVIA_SEW858 0x1105
		457
453	/* some devices interfaces need special handling due to a number of reasons */	458	/* some devices interfaces need special handling due to a number of reasons */
454	enum option_blacklist_reason {	459	enum option_blacklist_reason {
455	OPTION_BLACKLIST_NONE = 0,	460	OPTION_BLACKLIST_NONE = 0,
@@ -567,6 +572,8 @@ static const struct usb_device_id option_ids[] = { · 111 unmodified lines
567	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) },	572	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) },
568	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff),	573	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff),
569	.driver_info = (kernel_ulong_t) &net_intf1_blacklist },	574	.driver_info = (kernel_ulong_t) &net_intf1_blacklist },
		575	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1750, 0xff, 0xff, 0xff),
		576	.driver_info = (kernel_ulong_t) &net_intf2_blacklist },
570	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1441, USB_CLASS_COMM, 0x02, 0xff) },	577	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1441, USB_CLASS_COMM, 0x02, 0xff) },
571	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1442, USB_CLASS_COMM, 0x02, 0xff) },	578	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1442, USB_CLASS_COMM, 0x02, 0xff) },
572	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff),	579	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff),
@@ -686,6 +693,222 @@ static const struct usb_device_id option_ids[] = { · 113 unmodified lines
686	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7A) },	693	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7A) },
687	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7B) },	694	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7B) },
688	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7C) },	695	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7C) },
		696	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x01) },
		697	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x02) },
		698	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x03) },
		699	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x04) },
		700	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x05) },
		701	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x06) },
		702	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0A) },
		703	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0B) },
		704	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0D) },
		705	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0E) },
		706	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0F) },
		707	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x10) },
		708	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x12) },
		709	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x13) },
		710	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x14) },
		711	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x15) },
		712	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x17) },
		713	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x18) },
		714	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x19) },
		715	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x1A) },
		716	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x1B) },
		717	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x1C) },
		718	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x31) },
		719	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x32) },
		720	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x33) },
		721	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x34) },
		722	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x35) },
		723	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x36) },
		724	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3A) },
		725	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3B) },
		726	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3D) },
		727	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3E) },
		728	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3F) },
		729	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x48) },
		730	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x49) },
		731	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x4A) },
		732	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x4B) },
		733	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x4C) },
		734	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x61) },
		735	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x62) },
		736	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x63) },
		737	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x64) },
		738	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x65) },
		739	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x66) },
		740	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6A) },
		741	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6B) },
		742	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6D) },
		743	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6E) },
		744	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6F) },
		745	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x78) },
		746	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x79) },
		747	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x7A) },
		748	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x7B) },
		749	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x7C) },
		750	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x01) },
		751	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x02) },
		752	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x03) },
		753	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x04) },
		754	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x05) },
		755	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x06) },
		756	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0A) },
		757	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0B) },
		758	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0D) },
		759	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0E) },
		760	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0F) },
		761	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x10) },
		762	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x12) },
		763	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x13) },
		764	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x14) },
		765	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x15) },
		766	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x17) },
		767	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x18) },
		768	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x19) },
		769	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x1A) },
		770	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x1B) },
		771	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x1C) },
		772	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x31) },
		773	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x32) },
		774	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x33) },
		775	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x34) },
		776	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x35) },
		777	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x36) },
		778	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3A) },
		779	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3B) },
		780	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3D) },
		781	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3E) },
		782	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3F) },
		783	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x48) },
		784	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x49) },
		785	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x4A) },
		786	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x4B) },
		787	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x4C) },
		788	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x61) },
		789	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x62) },
		790	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x63) },
		791	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x64) },
		792	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x65) },
		793	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x66) },
		794	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6A) },
		795	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6B) },
		796	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6D) },
		797	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6E) },
		798	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6F) },
		799	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x78) },
		800	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x79) },
		801	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x7A) },
		802	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x7B) },
		803	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x7C) },
		804	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x01) },
		805	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x02) },
		806	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x03) },
		807	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x04) },
		808	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x05) },
		809	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x06) },
		810	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0A) },
		811	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0B) },
		812	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0D) },
		813	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0E) },
		814	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0F) },
		815	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x10) },
		816	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x12) },
		817	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x13) },
		818	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x14) },
		819	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x15) },
		820	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x17) },
		821	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x18) },
		822	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x19) },
		823	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x1A) },
		824	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x1B) },
		825	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x1C) },
		826	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x31) },
		827	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x32) },
		828	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x33) },
		829	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x34) },
		830	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x35) },
		831	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x36) },
		832	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3A) },
		833	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3B) },
		834	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3D) },
		835	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3E) },
		836	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3F) },
		837	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x48) },
		838	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x49) },
		839	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x4A) },
		840	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x4B) },
		841	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x4C) },
		842	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x61) },
		843	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x62) },
		844	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x63) },
		845	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x64) },
		846	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x65) },
		847	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x66) },
		848	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6A) },
		849	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6B) },
		850	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6D) },
		851	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6E) },
		852	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6F) },
		853	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x78) },
		854	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x79) },
		855	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x7A) },
		856	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x7B) },
		857	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x7C) },
		858	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x01) },
		859	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x02) },
		860	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x03) },
		861	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x04) },
		862	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x05) },
		863	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x06) },
		864	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0A) },
		865	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0B) },
		866	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0D) },
		867	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0E) },
		868	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0F) },
		869	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x10) },
		870	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x12) },
		871	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x13) },
		872	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x14) },
		873	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x15) },
		874	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x17) },
		875	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x18) },
		876	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x19) },
		877	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x1A) },
		878	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x1B) },
		879	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x1C) },
		880	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x31) },
		881	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x32) },
		882	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x33) },
		883	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x34) },
		884	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x35) },
		885	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x36) },
		886	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3A) },
		887	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3B) },
		888	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3D) },
		889	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3E) },
		890	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3F) },
		891	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x48) },
		892	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x49) },
		893	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x4A) },
		894	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x4B) },
		895	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x4C) },
		896	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x61) },
		897	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x62) },
		898	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x63) },
		899	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x64) },
		900	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x65) },
		901	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x66) },
		902	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6A) },
		903	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6B) },
		904	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6D) },
		905	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6E) },
		906	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6F) },
		907	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x78) },
		908	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x79) },
		909	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x7A) },
		910	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x7B) },
		911	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x7C) },
689		912
690		913
691	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) },	914	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) },
@@ -1254,7 +1477,9 @@ static const struct usb_device_id option_ids[] = { · 562 unmodified lines
1254		1477
1255	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },	1478	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },
1256	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD145) },	1479	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD145) },
1257	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200) },	1480	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200),
		1481	.driver_info = (kernel_ulong_t)&net_intf6_blacklist
		1482	},
1258	{ USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */	1483	{ USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */
1259	{ USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730 LTE USB modem.*/	1484	{ USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730 LTE USB modem.*/
1260	{ USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEM600) },	1485	{ USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEM600) },
@@ -1342,6 +1567,7 @@ static const struct usb_device_id option_ids[] = { · 81 unmodified lines
1342	{ USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) },	1567	{ USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) },
1343	{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */	1568	{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */
1344	{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */	1569	{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */
		1570	{ USB_DEVICE(INOVIA_VENDOR_ID, INOVIA_SEW858) },
1345	{ } /* Terminating entry */	1571	{ } /* Terminating entry */
1346	};	1572	};
1347	MODULE_DEVICE_TABLE(usb, option_ids);	1573	MODULE_DEVICE_TABLE(usb, option_ids);

drivers/usb/serial/ti_usb_3410_5052.c+1−0

@@ -190,6 +190,7 @@ static struct usb_device_id ti_id_table_combined[] = { · 189 unmodified lines
190	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },	190	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },
191	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },	191	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },
192	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_PRODUCT_ID) },	192	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_PRODUCT_ID) },
		193	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STRIP_PORT_ID) },
193	{ USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) },	194	{ USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) },
194	{ } /* terminator */	195	{ } /* terminator */
195	};	196	};

drivers/usb/storage/scsiglue.c+4−1

 		/*
 		 * Many devices do not respond properly to READ_CAPACITY_16.
 		 * Tell the SCSI layer to try READ_CAPACITY_10 first.
+		 * However some USB 3.0 drive enclosures return capacity
+		 * modulo 2TB. Those must use READ_CAPACITY_16
 		 */
-		sdev->try_rc_10_first = 1;
+		if (!(us->fflags & US_FL_NEEDS_CAP16))
+			sdev->try_rc_10_first = 1;
 		/* assume SPC3 or latter devices support sense size > 18 */
 		if (sdev->scsi_level > SCSI_SPC_2)

drivers/usb/storage/unusual_devs.h+7−0

@@ -1925,6 +1925,13 @@ UNUSUAL_DEV( 0x1652, 0x6600, 0x0201, 0x0201, · 1924 unmodified lines
1925	USB_SC_DEVICE, USB_PR_DEVICE, NULL,	1925	USB_SC_DEVICE, USB_PR_DEVICE, NULL,
1926	US_FL_IGNORE_RESIDUE ),	1926	US_FL_IGNORE_RESIDUE ),
1927		1927
		1928	/* Reported by Oliver Neukum <oneukum@suse.com> */
		1929	UNUSUAL_DEV( 0x174c, 0x55aa, 0x0100, 0x0100,
		1930	"ASMedia",
		1931	"AS2105",
		1932	USB_SC_DEVICE, USB_PR_DEVICE, NULL,
		1933	US_FL_NEEDS_CAP16),
		1934
1928	/* Reported by Jesse Feddema <jdfeddema@gmail.com> */	1935	/* Reported by Jesse Feddema <jdfeddema@gmail.com> */
1929	UNUSUAL_DEV( 0x177f, 0x0400, 0x0000, 0x0000,	1936	UNUSUAL_DEV( 0x177f, 0x0400, 0x0000, 0x0000,
1930	"Yarvik",	1937	"Yarvik",

drivers/vfio/vfio_iommu_type1.c+21−19

@@ -545,6 +545,8 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu, · 544 unmodified lines
545	long npage;	545	long npage;
546	int ret = 0, prot = 0;	546	int ret = 0, prot = 0;
547	uint64_t mask;	547	uint64_t mask;
		548	struct vfio_dma *dma = NULL;
		549	unsigned long pfn;
548		550
549	end = map->iova + map->size;	551	end = map->iova + map->size;
550		552
@@ -587,8 +589,6 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu, · 36 unmodified lines
587	}	589	}
588		590
589	for (iova = map->iova; iova < end; iova += size, vaddr += size) {	591	for (iova = map->iova; iova < end; iova += size, vaddr += size) {
590	struct vfio_dma *dma = NULL;
591	unsigned long pfn;
592	long i;	592	long i;
593		593
594	/* Pin a contiguous chunk of memory */	594	/* Pin a contiguous chunk of memory */
@@ -597,16 +597,15 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu, · 2 unmodified lines
597	if (npage <= 0) {	597	if (npage <= 0) {
598	WARN_ON(!npage);	598	WARN_ON(!npage);
599	ret = (int)npage;	599	ret = (int)npage;
600	break;	600	goto out;
601	}	601	}
602		602
603	/* Verify pages are not already mapped */	603	/* Verify pages are not already mapped */
604	for (i = 0; i < npage; i++) {	604	for (i = 0; i < npage; i++) {
605	if (iommu_iova_to_phys(iommu->domain,	605	if (iommu_iova_to_phys(iommu->domain,
606	iova + (i << PAGE_SHIFT))) {	606	iova + (i << PAGE_SHIFT))) {
607	vfio_unpin_pages(pfn, npage, prot, true);
608	ret = -EBUSY;	607	ret = -EBUSY;
609	break;	608	goto out_unpin;
610	}	609	}
611	}	610	}
612		611
@@ -616,8 +615,7 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu, · 3 unmodified lines
616	if (ret) {	615	if (ret) {
617	if (ret != -EBUSY \|\|	616	if (ret != -EBUSY \|\|
618	map_try_harder(iommu, iova, pfn, npage, prot)) {	617	map_try_harder(iommu, iova, pfn, npage, prot)) {
619	vfio_unpin_pages(pfn, npage, prot, true);	618	goto out_unpin;
620	break;
621	}	619	}
622	}	620	}
623		621
@@ -672,9 +670,8 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu, · 48 unmodified lines
672	dma = kzalloc(sizeof(*dma), GFP_KERNEL);	670	dma = kzalloc(sizeof(*dma), GFP_KERNEL);
673	if (!dma) {	671	if (!dma) {
674	iommu_unmap(iommu->domain, iova, size);	672	iommu_unmap(iommu->domain, iova, size);
675	vfio_unpin_pages(pfn, npage, prot, true);
676	ret = -ENOMEM;	673	ret = -ENOMEM;
677	break;	674	goto out_unpin;
678	}	675	}
679		676
680	dma->size = size;	677	dma->size = size;
@@ -685,16 +682,21 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu, · 4 unmodified lines
685	}	682	}
686	}	683	}
687		684
688	if (ret) {	685	WARN_ON(ret);
689	struct vfio_dma *tmp;	686	mutex_unlock(&iommu->lock);
690	iova = map->iova;	687	return ret;
691	size = map->size;	688
692	while ((tmp = vfio_find_dma(iommu, iova, size))) {	689	out_unpin:
693	int r = vfio_remove_dma_overlap(iommu, iova,	690	vfio_unpin_pages(pfn, npage, prot, true);
694	&size, tmp);	691
695	if (WARN_ON(r \|\| !size))	692	out:
696	break;	693	iova = map->iova;
697	}	694	size = map->size;
		695	while ((dma = vfio_find_dma(iommu, iova, size))) {
		696	int r = vfio_remove_dma_overlap(iommu, iova,
		697	&size, dma);
		698	if (WARN_ON(r \|\| !size))
		699	break;
698	}	700	}
699		701
700	mutex_unlock(&iommu->lock);	702	mutex_unlock(&iommu->lock);

drivers/vhost/scsi.c+6−1

 	}
 	se_sess = tv_nexus->tvn_se_sess;
-	tag = percpu_ida_alloc(&se_sess->sess_tag_pool, GFP_KERNEL);
+	tag = percpu_ida_alloc(&se_sess->sess_tag_pool, GFP_ATOMIC);
+	if (tag < 0) {
+		pr_err("Unable to obtain tag for tcm_vhost_cmd\n");
+		return ERR_PTR(-ENOMEM);
+	}
 	cmd = &((struct tcm_vhost_cmd *)se_sess->sess_cmd_map)[tag];
 	sg = cmd->tvc_sgl;
 	pages = cmd->tvc_upages;

drivers/w1/w1.c+6−0

 	sl = dev_to_w1_slave(dev);
 	fops = sl->family->fops;
+	if (!fops)
+		return 0;
 	switch (action) {
 	case BUS_NOTIFY_ADD_DEVICE:
 		/* if the family driver needs to initialize something... */
 	atomic_set(&sl->refcnt, 0);
 	init_completion(&sl->released);
+	/* slave modules need to be loaded in a context with unlocked mutex */
+	mutex_unlock(&dev->mutex);
 	request_module("w1-family-0x%0x", rn->family);
+	mutex_lock(&dev->mutex);
 	spin_lock(&w1_flock);
 	f = w1_family_registered(rn->family);

drivers/watchdog/hpwdt.c+6−0

 		return -ENODEV;
 	}
+	/*
+	 * Ignore all auxilary iLO devices with the following PCI ID
+	 */
+	if (dev->subsystem_device == 0x1979)
+		return -ENODEV;
 	if (pci_enable_device(dev)) {
 		dev_warn(&dev->dev,
 			"Not possible to enable PCI Device: 0x%x:0x%x.\n",

drivers/watchdog/kempld_wdt.c+1−1

@@ -35,7 +35,7 @@ · 34 unmodified lines
35	#define KEMPLD_WDT_STAGE_TIMEOUT(x) (0x1b + (x) * 4)	35	#define KEMPLD_WDT_STAGE_TIMEOUT(x) (0x1b + (x) * 4)
36	#define KEMPLD_WDT_STAGE_CFG(x) (0x18 + (x))	36	#define KEMPLD_WDT_STAGE_CFG(x) (0x18 + (x))
37	#define STAGE_CFG_GET_PRESCALER(x) (((x) & 0x30) >> 4)	37	#define STAGE_CFG_GET_PRESCALER(x) (((x) & 0x30) >> 4)
38	#define STAGE_CFG_SET_PRESCALER(x) (((x) & 0x30) << 4)	38	#define STAGE_CFG_SET_PRESCALER(x) (((x) & 0x3) << 4)
39	#define STAGE_CFG_PRESCALER_MASK 0x30	39	#define STAGE_CFG_PRESCALER_MASK 0x30
40	#define STAGE_CFG_ACTION_MASK 0x7	40	#define STAGE_CFG_ACTION_MASK 0x7
41	#define STAGE_CFG_ASSERT (1 << 3)	41	#define STAGE_CFG_ASSERT (1 << 3)

drivers/watchdog/sunxi_wdt.c+2−2

@@ -146,7 +146,7 @@ static const struct watchdog_ops sunxi_wdt_ops = { · 145 unmodified lines
146	.set_timeout = sunxi_wdt_set_timeout,	146	.set_timeout = sunxi_wdt_set_timeout,
147	};	147	};
148		148
149	static int __init sunxi_wdt_probe(struct platform_device *pdev)	149	static int sunxi_wdt_probe(struct platform_device *pdev)
150	{	150	{
151	struct sunxi_wdt_dev *sunxi_wdt;	151	struct sunxi_wdt_dev *sunxi_wdt;
152	struct resource *res;	152	struct resource *res;
@@ -187,7 +187,7 @@ static int __init sunxi_wdt_probe(struct platform_device *pdev) · 34 unmodified lines
187	return 0;	187	return 0;
188	}	188	}
189		189
190	static int __exit sunxi_wdt_remove(struct platform_device *pdev)	190	static int sunxi_wdt_remove(struct platform_device *pdev)
191	{	191	{
192	struct sunxi_wdt_dev *sunxi_wdt = platform_get_drvdata(pdev);	192	struct sunxi_wdt_dev *sunxi_wdt = platform_get_drvdata(pdev);
193		193

drivers/watchdog/ts72xx_wdt.c+2−1

@@ -310,7 +310,8 @@ static long ts72xx_wdt_ioctl(struct file *file, unsigned int cmd, · 309 unmodified lines
310		310
311	case WDIOC_GETSTATUS:	311	case WDIOC_GETSTATUS:
312	case WDIOC_GETBOOTSTATUS:	312	case WDIOC_GETBOOTSTATUS:
313	return put_user(0, p);	313	error = put_user(0, p);
		314	break;
314		315
315	case WDIOC_KEEPALIVE:	316	case WDIOC_KEEPALIVE:
316	ts72xx_wdt_kick(wdt);	317	ts72xx_wdt_kick(wdt);

fs/aio.c+37−15

 }
 __initcall(aio_setup);
+static void put_aio_ring_file(struct kioctx *ctx)
+{
+	struct file *aio_ring_file = ctx->aio_ring_file;
+	if (aio_ring_file) {
+		truncate_setsize(aio_ring_file->f_inode, 0);
+		/* Prevent further access to the kioctx from migratepages */
+		spin_lock(&aio_ring_file->f_inode->i_mapping->private_lock);
+		aio_ring_file->f_inode->i_mapping->private_data = NULL;
+		ctx->aio_ring_file = NULL;
+		spin_unlock(&aio_ring_file->f_inode->i_mapping->private_lock);
+		fput(aio_ring_file);
+	}
+}
 static void aio_free_ring(struct kioctx *ctx)
 {
 	int i;
-	struct file *aio_ring_file = ctx->aio_ring_file;
 	for (i = 0; i < ctx->nr_pages; i++) {
 		pr_debug("pid(%d) [%d] page->count=%d\n", current->pid, i,
 		put_page(ctx->ring_pages[i]);
 	}
+	put_aio_ring_file(ctx);
 	if (ctx->ring_pages && ctx->ring_pages != ctx->internal_pages)
 		kfree(ctx->ring_pages);
-	if (aio_ring_file) {
-		truncate_setsize(aio_ring_file->f_inode, 0);
-		fput(aio_ring_file);
-		ctx->aio_ring_file = NULL;
-	}
 }
 static int aio_ring_mmap(struct file *file, struct vm_area_struct *vma)
 static int aio_migratepage(struct address_space *mapping, struct page *new,
 			struct page *old, enum migrate_mode mode)
 {
-	struct kioctx *ctx = mapping->private_data;
+	struct kioctx *ctx;
 	unsigned long flags;
-	unsigned idx = old->index;
 	int rc;
 	/* Writeback must be complete */
 	get_page(new);
-	spin_lock_irqsave(&ctx->completion_lock, flags);
+	/* We can potentially race against kioctx teardown here.  Use the
-	migrate_page_copy(new, old);
+	 * address_space's private data lock to protect the mapping's
-	ctx->ring_pages[idx] = new;
+	 * private_data.
-	spin_unlock_irqrestore(&ctx->completion_lock, flags);
+	 */
+	spin_lock(&mapping->private_lock);
+	ctx = mapping->private_data;
+	if (ctx) {
+		pgoff_t idx;
+		spin_lock_irqsave(&ctx->completion_lock, flags);
+		migrate_page_copy(new, old);
+		idx = old->index;
+		if (idx < (pgoff_t)ctx->nr_pages)
+			ctx->ring_pages[idx] = new;
+		spin_unlock_irqrestore(&ctx->completion_lock, flags);
+	} else
+		rc = -EBUSY;
+	spin_unlock(&mapping->private_lock);
 	return rc;
 }
 out_freeref:
 	free_percpu(ctx->users.pcpu_count);
 out_freectx:
-	if (ctx->aio_ring_file)
+	put_aio_ring_file(ctx);
-		fput(ctx->aio_ring_file);
 	kmem_cache_free(kioctx_cachep, ctx);
 	pr_debug("error allocating ioctx %d\n", err);
 	return ERR_PTR(err);

fs/btrfs/async-thread.c+19−6

 		worker->idle = 1;
 		/* the list may be empty if the worker is just starting */
-		if (!list_empty(&worker->worker_list)) {
+		if (!list_empty(&worker->worker_list) &&
+		    !worker->workers->stopping) {
 			list_move(&worker->worker_list,
 				 &worker->workers->idle_list);
 		}
 		spin_lock_irqsave(&worker->workers->lock, flags);
 		worker->idle = 0;
-		if (!list_empty(&worker->worker_list)) {
+		if (!list_empty(&worker->worker_list) &&
+		    !worker->workers->stopping) {
 			list_move_tail(&worker->worker_list,
 				      &worker->workers->worker_list);
 		}
 	int can_stop;
 	spin_lock_irq(&workers->lock);
+	workers->stopping = 1;
 	list_splice_init(&workers->idle_list, &workers->worker_list);
 	while (!list_empty(&workers->worker_list)) {
 		cur = workers->worker_list.next;
 	workers->ordered = 0;
 	workers->atomic_start_pending = 0;
 	workers->atomic_worker_start = async_helper;
+	workers->stopping = 0;
 }
 /*
 	atomic_set(&worker->num_pending, 0);
 	atomic_set(&worker->refs, 1);
 	worker->workers = workers;
-	worker->task = kthread_run(worker_loop, worker,
+	worker->task = kthread_create(worker_loop, worker,
-				   "btrfs-%s-%d", workers->name,
+				      "btrfs-%s-%d", workers->name,
-				   workers->num_workers + 1);
+				      workers->num_workers + 1);
 	if (IS_ERR(worker->task)) {
 		ret = PTR_ERR(worker->task);
-		kfree(worker);
 		goto fail;
 	}
 	spin_lock_irq(&workers->lock);
+	if (workers->stopping) {
+		spin_unlock_irq(&workers->lock);
+		goto fail_kthread;
+	}
 	list_add_tail(&worker->worker_list, &workers->idle_list);
 	worker->idle = 1;
 	workers->num_workers++;
 	WARN_ON(workers->num_workers_starting < 0);
 	spin_unlock_irq(&workers->lock);
+	wake_up_process(worker->task);
 	return 0;
+fail_kthread:
+	kthread_stop(worker->task);
 fail:
+	kfree(worker);
 	spin_lock_irq(&workers->lock);
 	workers->num_workers_starting--;
 	spin_unlock_irq(&workers->lock);

fs/btrfs/async-thread.h+2−0

@@ -107,6 +107,8 @@ struct btrfs_workers { · 106 unmodified lines
107		107
108	/* extra name for this worker, used for current->name */	108	/* extra name for this worker, used for current->name */
109	char *name;	109	char *name;
		110
		111	int stopping;
110	};	112	};
111		113
112	void btrfs_queue_worker(struct btrfs_workers workers, struct btrfs_work work);	114	void btrfs_queue_worker(struct btrfs_workers workers, struct btrfs_work work);

fs/btrfs/dev-replace.c+1−4

@@ -535,10 +535,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, · 534 unmodified lines
535	list_add(&tgt_device->dev_alloc_list, &fs_info->fs_devices->alloc_list);	535	list_add(&tgt_device->dev_alloc_list, &fs_info->fs_devices->alloc_list);
536		536
537	btrfs_rm_dev_replace_srcdev(fs_info, src_device);	537	btrfs_rm_dev_replace_srcdev(fs_info, src_device);
538	if (src_device->bdev) {	538
539	/* zero out the old super */
540	btrfs_scratch_superblock(src_device);
541	}
542	/*	539	/*
543	* this is again a consistent state where no dev_replace procedure	540	* this is again a consistent state where no dev_replace procedure
544	* is running, the target device is part of the filesystem, the	541	* is running, the target device is part of the filesystem, the

fs/btrfs/disk-io.c+5−4

 	return ret;
 }
-struct btrfs_root *btrfs_read_fs_root_no_name(struct btrfs_fs_info *fs_info,
+struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info,
-					      struct btrfs_key *location)
+				     struct btrfs_key *location,
+				     bool check_ref)
 {
 	struct btrfs_root *root;
 	int ret;
 again:
 	root = btrfs_lookup_fs_root(fs_info, location->objectid);
 	if (root) {
-		if (btrfs_root_refs(&root->root_item) == 0)
+		if (check_ref && btrfs_root_refs(&root->root_item) == 0)
 			return ERR_PTR(-ENOENT);
 		return root;
 	}
 	if (IS_ERR(root))
 		return root;
-	if (btrfs_root_refs(&root->root_item) == 0) {
+	if (check_ref && btrfs_root_refs(&root->root_item) == 0) {
 		ret = -ENOENT;
 		goto fail;
 	}

fs/btrfs/disk-io.h+11−2

@@ -68,8 +68,17 @@ struct btrfs_root btrfs_read_fs_root(struct btrfs_root tree_root, · 67 unmodified lines
68	int btrfs_init_fs_root(struct btrfs_root *root);	68	int btrfs_init_fs_root(struct btrfs_root *root);
69	int btrfs_insert_fs_root(struct btrfs_fs_info *fs_info,	69	int btrfs_insert_fs_root(struct btrfs_fs_info *fs_info,
70	struct btrfs_root *root);	70	struct btrfs_root *root);
71	struct btrfs_root btrfs_read_fs_root_no_name(struct btrfs_fs_info fs_info,	71
72	struct btrfs_key *location);	72	struct btrfs_root btrfs_get_fs_root(struct btrfs_fs_info fs_info,
		73	struct btrfs_key *key,
		74	bool check_ref);
		75	static inline struct btrfs_root *
		76	btrfs_read_fs_root_no_name(struct btrfs_fs_info *fs_info,
		77	struct btrfs_key *location)
		78	{
		79	return btrfs_get_fs_root(fs_info, location, true);
		80	}
		81
73	int btrfs_cleanup_fs_roots(struct btrfs_fs_info *fs_info);	82	int btrfs_cleanup_fs_roots(struct btrfs_fs_info *fs_info);
74	void btrfs_btree_balance_dirty(struct btrfs_root *root);	83	void btrfs_btree_balance_dirty(struct btrfs_root *root);
75	void btrfs_btree_balance_dirty_nodelay(struct btrfs_root *root);	84	void btrfs_btree_balance_dirty_nodelay(struct btrfs_root *root);

fs/btrfs/extent_io.c+13−9

 				     offsetof(struct btrfs_io_bio, bio));
 	if (!btrfs_bioset)
 		goto free_buffer_cache;
+	if (bioset_integrity_create(btrfs_bioset, BIO_POOL_SIZE))
+		goto free_bioset;
 	return 0;
+free_bioset:
+	bioset_free(btrfs_bioset);
+	btrfs_bioset = NULL;
 free_buffer_cache:
 	kmem_cache_destroy(extent_buffer_cache);
 	extent_buffer_cache = NULL;
 		cur_start = state->end + 1;
 		node = rb_next(node);
 		total_bytes += state->end - state->start + 1;
-		if (total_bytes >= max_bytes) {
+		if (total_bytes >= max_bytes)
-			*end = *start + max_bytes - 1;
 			break;
-		}
 		if (!node)
 			break;
 	}
 		*start = delalloc_start;
 		*end = delalloc_end;
 		free_extent_state(cached_state);
-		return found;
+		return 0;
 	}
 	/*
 	/*
 	 * make sure to limit the number of pages we try to lock down
-	 * if we're looping.
 	 */
-	if (delalloc_end + 1 - delalloc_start > max_bytes && loops)
+	if (delalloc_end + 1 - delalloc_start > max_bytes)
-		delalloc_end = delalloc_start + PAGE_CACHE_SIZE - 1;
+		delalloc_end = delalloc_start + max_bytes - 1;
 	/* step two, lock all the pages after the page that has start */
 	ret = lock_delalloc_pages(inode, locked_page,
 		 */
 		free_extent_state(cached_state);
 		if (!loops) {
-			unsigned long offset = (*start) & (PAGE_CACHE_SIZE - 1);
+			max_bytes = PAGE_CACHE_SIZE;
-			max_bytes = PAGE_CACHE_SIZE - offset;
 			loops = 1;
 			goto again;
 		} else {

fs/btrfs/inode.c+2−1

 	if (btrfs_extent_readonly(root, disk_bytenr))
 		goto out;
+	btrfs_release_path(path);
 	/*
 	 * look for other files referencing this extent, if we
 	/* check for collisions, even if the  name isn't there */
-	ret = btrfs_check_dir_item_collision(root, new_dir->i_ino,
+	ret = btrfs_check_dir_item_collision(dest, new_dir->i_ino,
 			     new_dentry->d_name.name,
 			     new_dentry->d_name.len);

fs/btrfs/relocation.c+1−1

@@ -588,7 +588,7 @@ static struct btrfs_root read_fs_root(struct btrfs_fs_info fs_info, · 587 unmodified lines
588	else	588	else
589	key.offset = (u64)-1;	589	key.offset = (u64)-1;
590		590
591	return btrfs_read_fs_root_no_name(fs_info, &key);	591	return btrfs_get_fs_root(fs_info, &key, false);
592	}	592	}
593		593
594	#ifdef BTRFS_COMPAT_EXTENT_TREE_V0	594	#ifdef BTRFS_COMPAT_EXTENT_TREE_V0

fs/btrfs/root-tree.c+3−5

 			continue;
 		}
-		if (btrfs_root_refs(&root->root_item) == 0) {
-			btrfs_add_dead_root(root);
-			continue;
-		}
 		err = btrfs_init_fs_root(root);
 		if (err) {
 			btrfs_free_fs_root(root);
 			btrfs_free_fs_root(root);
 			break;
 		}
+		if (btrfs_root_refs(&root->root_item) == 0)
+			btrfs_add_dead_root(root);
 	}
 	btrfs_free_path(path);

fs/btrfs/transaction.c+2−5

 	assert_qgroups_uptodate(trans);
 	update_super_roots(root);
-	if (!root->fs_info->log_root_recovering) {
+	btrfs_set_super_log_root(root->fs_info->super_copy, 0);
-		btrfs_set_super_log_root(root->fs_info->super_copy, 0);
+	btrfs_set_super_log_root_level(root->fs_info->super_copy, 0);
-		btrfs_set_super_log_root_level(root->fs_info->super_copy, 0);
-	}
 	memcpy(root->fs_info->super_for_commit, root->fs_info->super_copy,
 	       sizeof(*root->fs_info->super_copy));

fs/btrfs/volumes.c+6−1

 				 struct btrfs_device *srcdev)
 {
 	WARN_ON(!mutex_is_locked(&fs_info->fs_devices->device_list_mutex));
 	list_del_rcu(&srcdev->dev_list);
 	list_del_rcu(&srcdev->dev_alloc_list);
 	fs_info->fs_devices->num_devices--;
 	}
 	if (srcdev->can_discard)
 		fs_info->fs_devices->num_can_discard--;
-	if (srcdev->bdev)
+	if (srcdev->bdev) {
 		fs_info->fs_devices->open_devices--;
+		/* zero out the old super */
+		btrfs_scratch_superblock(srcdev);
+	}
 	call_rcu(&srcdev->rcu, free_device);
 }

fs/buffer.c+12−2

@@ -1005,9 +1005,19 @@ grow_dev_page(struct block_device *bdev, sector_t block, · 1004 unmodified lines
1005	struct buffer_head *bh;	1005	struct buffer_head *bh;
1006	sector_t end_block;	1006	sector_t end_block;
1007	int ret = 0; /* Will call free_more_memory() */	1007	int ret = 0; /* Will call free_more_memory() */
		1008	gfp_t gfp_mask;
1008		1009
1009	page = find_or_create_page(inode->i_mapping, index,	1010	gfp_mask = mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS;
1010	(mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS)\|__GFP_MOVABLE);	1011	gfp_mask \|= __GFP_MOVABLE;
		1012	/*
		1013	* XXX: __getblk_slow() can not really deal with failure and
		1014	* will endlessly loop on improvised global reclaim. Prefer
		1015	* looping in the allocator rather than here, at least that
		1016	* code knows what it's doing.
		1017	*/
		1018	gfp_mask \|= __GFP_NOFAIL;
		1019
		1020	page = find_or_create_page(inode->i_mapping, index, gfp_mask);
1011	if (!page)	1021	if (!page)
1012	return ret;	1022	return ret;
1013		1023

fs/cifs/cifsfs.c+4−2

 {
 	struct inode *inode;
 	struct cifs_sb_info *cifs_sb;
+	struct cifs_tcon *tcon;
 	int rc = 0;
 	cifs_sb = CIFS_SB(sb);
+	tcon = cifs_sb_master_tcon(cifs_sb);
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIXACL)
 		sb->s_flags |= MS_POSIXACL;
-	if (cifs_sb_master_tcon(cifs_sb)->ses->capabilities & CAP_LARGE_FILES)
+	if (tcon->ses->capabilities & tcon->ses->server->vals->cap_large_files)
 		sb->s_maxbytes = MAX_LFS_FILESIZE;
 	else
 		sb->s_maxbytes = MAX_NON_LFS;
 		goto out_no_root;
 	}
-	if (cifs_sb_master_tcon(cifs_sb)->nocase)
+	if (tcon->nocase)
 		sb->s_d_op = &cifs_ci_dentry_ops;
 	else
 		sb->s_d_op = &cifs_dentry_ops;

fs/cifs/cifsfs.h+1−1

@@ -132,5 +132,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); · 131 unmodified lines
132	extern const struct export_operations cifs_export_ops;	132	extern const struct export_operations cifs_export_ops;
133	#endif /* CONFIG_CIFS_NFSD_EXPORT */	133	#endif /* CONFIG_CIFS_NFSD_EXPORT */
134		134
135	#define CIFS_VERSION "2.01"	135	#define CIFS_VERSION "2.02"
136	#endif /* _CIFSFS_H */	136	#endif /* _CIFSFS_H */

fs/cifs/cifsglob.h+1−4

 	unsigned int max_rw;	/* maxRw specifies the maximum */
 	/* message size the server can send or receive for */
 	/* SMB_COM_WRITE_RAW or SMB_COM_READ_RAW. */
-	unsigned int max_vcs;	/* maximum number of smb sessions, at least
-				   those that can be specified uniquely with
-				   vcnumbers */
 	unsigned int capabilities; /* selective disabling of caps by smb sess */
 	int timeAdj;  /* Adjust for difference in server time zone in sec */
 	__u64 CurrentMid;         /* multiplex id - rotating counter */
 	enum statusEnum status;
 	unsigned overrideSecFlg;  /* if non-zero override global sec flags */
 	__u16 ipc_tid;		/* special tid for connection to IPC share */
-	__u16 vcnum;
 	char *serverOS;		/* name of operating system underlying server */
 	char *serverNOS;	/* name of network operating system of server */
 	char *serverDomain;	/* security realm of server */
 #define CIFS_FATTR_DELETE_PENDING	0x2
 #define CIFS_FATTR_NEED_REVAL		0x4
 #define CIFS_FATTR_INO_COLLISION	0x8
+#define CIFS_FATTR_UNKNOWN_NLINK	0x10
 struct cifs_fattr {
 	u32		cf_flags;

fs/cifs/cifspdu.h+24−28

@@ -1491,15 +1491,30 @@ struct file_notify_information { · 1490 unmodified lines
1491	__u8 FileName[0];	1491	__u8 FileName[0];
1492	} __attribute__((packed));	1492	} __attribute__((packed));
1493		1493
1494	struct reparse_data {	1494	/* For IO_REPARSE_TAG_SYMLINK */
1495	__u32 ReparseTag;	1495	struct reparse_symlink_data {
1496	__u16 ReparseDataLength;	1496	__le32 ReparseTag;
		1497	__le16 ReparseDataLength;
1497	__u16 Reserved;	1498	__u16 Reserved;
1498	__u16 SubstituteNameOffset;	1499	__le16 SubstituteNameOffset;
1499	__u16 SubstituteNameLength;	1500	__le16 SubstituteNameLength;
1500	__u16 PrintNameOffset;	1501	__le16 PrintNameOffset;
1501	__u16 PrintNameLength;	1502	__le16 PrintNameLength;
1502	__u32 Flags;	1503	__le32 Flags;
		1504	char PathBuffer[0];
		1505	} __attribute__((packed));
		1506
		1507	/* For IO_REPARSE_TAG_NFS */
		1508	#define NFS_SPECFILE_LNK 0x00000000014B4E4C
		1509	#define NFS_SPECFILE_CHR 0x0000000000524843
		1510	#define NFS_SPECFILE_BLK 0x00000000004B4C42
		1511	#define NFS_SPECFILE_FIFO 0x000000004F464946
		1512	#define NFS_SPECFILE_SOCK 0x000000004B434F53
		1513	struct reparse_posix_data {
		1514	__le32 ReparseTag;
		1515	__le16 ReparseDataLength;
		1516	__u16 Reserved;
		1517	__le64 InodeType; /* LNK, FIFO, CHR etc. */
1503	char PathBuffer[0];	1518	char PathBuffer[0];
1504	} __attribute__((packed));	1519	} __attribute__((packed));
1505		1520
@@ -2652,26 +2667,7 @@ typedef struct file_xattr_info { · 1146 unmodified lines
2652	} __attribute__((packed)) FILE_XATTR_INFO; /* extended attribute info	2667	} __attribute__((packed)) FILE_XATTR_INFO; /* extended attribute info
2653	level 0x205 */	2668	level 0x205 */
2654		2669
2655		2670	/* flags for lsattr and chflags commands removed arein uapi/linux/fs.h */
2656	/* flags for chattr command */
2657	#define EXT_SECURE_DELETE 0x00000001 /* EXT3_SECRM_FL */
2658	#define EXT_ENABLE_UNDELETE 0x00000002 /* EXT3_UNRM_FL */
2659	/* Reserved for compress file 0x4 */
2660	#define EXT_SYNCHRONOUS 0x00000008 /* EXT3_SYNC_FL */
2661	#define EXT_IMMUTABLE_FL 0x00000010 /* EXT3_IMMUTABLE_FL */
2662	#define EXT_OPEN_APPEND_ONLY 0x00000020 /* EXT3_APPEND_FL */
2663	#define EXT_DO_NOT_BACKUP 0x00000040 /* EXT3_NODUMP_FL */
2664	#define EXT_NO_UPDATE_ATIME 0x00000080 /* EXT3_NOATIME_FL */
2665	/* 0x100 through 0x800 reserved for compression flags and are GET-ONLY */
2666	#define EXT_HASH_TREE_INDEXED_DIR 0x00001000 /* GET-ONLY EXT3_INDEX_FL */
2667	/* 0x2000 reserved for IMAGIC_FL */
2668	#define EXT_JOURNAL_THIS_FILE 0x00004000 /* GET-ONLY EXT3_JOURNAL_DATA_FL */
2669	/* 0x8000 reserved for EXT3_NOTAIL_FL */
2670	#define EXT_SYNCHRONOUS_DIR 0x00010000 /* EXT3_DIRSYNC_FL */
2671	#define EXT_TOPDIR 0x00020000 /* EXT3_TOPDIR_FL */
2672
2673	#define EXT_SET_MASK 0x000300FF
2674	#define EXT_GET_MASK 0x0003DFFF
2675		2671
2676	typedef struct file_chattr_info {	2672	typedef struct file_chattr_info {
2677	__le64 mask; /* list of all possible attribute bits */	2673	__le64 mask; /* list of all possible attribute bits */

fs/cifs/cifssmb.c+34−7

 			       cifs_max_pending);
 	set_credits(server, server->maxReq);
 	server->maxBuf = le16_to_cpu(rsp->MaxBufSize);
-	server->max_vcs = le16_to_cpu(rsp->MaxNumberVcs);
 	/* even though we do not use raw we might as well set this
 	accurately, in case we ever find a need for it */
 	if ((le16_to_cpu(rsp->RawMode) & RAW_ENABLE) == RAW_ENABLE) {
 	bool is_unicode;
 	unsigned int sub_len;
 	char *sub_start;
-	struct reparse_data *reparse_buf;
+	struct reparse_symlink_data *reparse_buf;
+	struct reparse_posix_data *posix_buf;
 	__u32 data_offset, data_count;
 	char *end_of_smb;
 		goto qreparse_out;
 	}
 	end_of_smb = 2 + get_bcc(&pSMBr->hdr) + (char *)&pSMBr->ByteCount;
-	reparse_buf = (struct reparse_data *)
+	reparse_buf = (struct reparse_symlink_data *)
 				((char *)&pSMBr->hdr.Protocol + data_offset);
 	if ((char *)reparse_buf >= end_of_smb) {
 		rc = -EIO;
 		goto qreparse_out;
 	}
-	if ((reparse_buf->PathBuffer + reparse_buf->PrintNameOffset +
+	if (reparse_buf->ReparseTag == cpu_to_le32(IO_REPARSE_TAG_NFS)) {
-				reparse_buf->PrintNameLength) > end_of_smb) {
+		cifs_dbg(FYI, "NFS style reparse tag\n");
+		posix_buf =  (struct reparse_posix_data *)reparse_buf;
+		if (posix_buf->InodeType != cpu_to_le64(NFS_SPECFILE_LNK)) {
+			cifs_dbg(FYI, "unsupported file type 0x%llx\n",
+				 le64_to_cpu(posix_buf->InodeType));
+			rc = -EOPNOTSUPP;
+			goto qreparse_out;
+		}
+		is_unicode = true;
+		sub_len = le16_to_cpu(reparse_buf->ReparseDataLength);
+		if (posix_buf->PathBuffer + sub_len > end_of_smb) {
+			cifs_dbg(FYI, "reparse buf beyond SMB\n");
+			rc = -EIO;
+			goto qreparse_out;
+		}
+		*symlinkinfo = cifs_strndup_from_utf16(posix_buf->PathBuffer,
+				sub_len, is_unicode, nls_codepage);
+		goto qreparse_out;
+	} else if (reparse_buf->ReparseTag !=
+			cpu_to_le32(IO_REPARSE_TAG_SYMLINK)) {
+		rc = -EOPNOTSUPP;
+		goto qreparse_out;
+	}
+	/* Reparse tag is NTFS symlink */
+	sub_start = le16_to_cpu(reparse_buf->SubstituteNameOffset) +
+				reparse_buf->PathBuffer;
+	sub_len = le16_to_cpu(reparse_buf->SubstituteNameLength);
+	if (sub_start + sub_len > end_of_smb) {
 		cifs_dbg(FYI, "reparse buf beyond SMB\n");
 		rc = -EIO;
 		goto qreparse_out;
 	}
-	sub_start = reparse_buf->SubstituteNameOffset + reparse_buf->PathBuffer;
-	sub_len = reparse_buf->SubstituteNameLength;
 	if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE)
 		is_unicode = true;
 	else

fs/cifs/file.c+8−0

 	/*
 	 * Reads as many pages as possible from fscache. Returns -ENOBUFS
 	 * immediately if the cookie is negative
+	 *
+	 * After this point, every page in the list might have PG_fscache set,
+	 * so we will need to clean that up off of every page we don't use.
 	 */
 	rc = cifs_readpages_from_fscache(mapping->host, mapping, page_list,
 					 &num_pages);
 		kref_put(&rdata->refcount, cifs_readdata_release);
 	}
+	/* Any pages that have been shown to fscache but didn't get added to
+	 * the pagecache must be uncached before they get returned to the
+	 * allocator.
+	 */
+	cifs_fscache_readpages_cancel(mapping->host, page_list);
 	return rc;
 }

fs/cifs/fscache.c+7−0

@@ -223,6 +223,13 @@ void __cifs_readpage_to_fscache(struct inode inode, struct page page) · 222 unmodified lines
223	fscache_uncache_page(CIFS_I(inode)->fscache, page);	223	fscache_uncache_page(CIFS_I(inode)->fscache, page);
224	}	224	}
225		225
		226	void __cifs_fscache_readpages_cancel(struct inode inode, struct list_head pages)
		227	{
		228	cifs_dbg(FYI, "%s: (fsc: %p, i: %p)\n",
		229	__func__, CIFS_I(inode)->fscache, inode);
		230	fscache_readpages_cancel(CIFS_I(inode)->fscache, pages);
		231	}
		232
226	void __cifs_fscache_invalidate_page(struct page page, struct inode inode)	233	void __cifs_fscache_invalidate_page(struct page page, struct inode inode)
227	{	234	{
228	struct cifsInodeInfo *cifsi = CIFS_I(inode);	235	struct cifsInodeInfo *cifsi = CIFS_I(inode);

fs/cifs/fscache.h+13−0

 					 struct address_space *,
 					 struct list_head *,
 					 unsigned *);
+extern void __cifs_fscache_readpages_cancel(struct inode *, struct list_head *);
 extern void __cifs_readpage_to_fscache(struct inode *, struct page *);
 		__cifs_readpage_to_fscache(inode, page);
 }
+static inline void cifs_fscache_readpages_cancel(struct inode *inode,
+						 struct list_head *pages)
+{
+	if (CIFS_I(inode)->fscache)
+		return __cifs_fscache_readpages_cancel(inode, pages);
+}
 #else /* CONFIG_CIFS_FSCACHE */
 static inline int cifs_fscache_register(void) { return 0; }
 static inline void cifs_fscache_unregister(void) {}
 static inline void cifs_readpage_to_fscache(struct inode *inode,
 			struct page *page) {}
+static inline void cifs_fscache_readpages_cancel(struct inode *inode,
+						 struct list_head *pages)
+{
+}
 #endif /* CONFIG_CIFS_FSCACHE */
 #endif /* _CIFS_FSCACHE_H */

fs/cifs/inode.c+39−6

 	cifs_i->invalid_mapping = true;
 }
+/*
+ * copy nlink to the inode, unless it wasn't provided.  Provide
+ * sane values if we don't have an existing one and none was provided
+ */
+static void
+cifs_nlink_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr)
+{
+	/*
+	 * if we're in a situation where we can't trust what we
+	 * got from the server (readdir, some non-unix cases)
+	 * fake reasonable values
+	 */
+	if (fattr->cf_flags & CIFS_FATTR_UNKNOWN_NLINK) {
+		/* only provide fake values on a new inode */
+		if (inode->i_state & I_NEW) {
+			if (fattr->cf_cifsattrs & ATTR_DIRECTORY)
+				set_nlink(inode, 2);
+			else
+				set_nlink(inode, 1);
+		}
+		return;
+	}
+	/* we trust the server, so update it */
+	set_nlink(inode, fattr->cf_nlink);
+}
 /* populate an inode with info from a cifs_fattr struct */
 void
 cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr)
 	inode->i_mtime = fattr->cf_mtime;
 	inode->i_ctime = fattr->cf_ctime;
 	inode->i_rdev = fattr->cf_rdev;
-	set_nlink(inode, fattr->cf_nlink);
+	cifs_nlink_fattr_to_inode(inode, fattr);
 	inode->i_uid = fattr->cf_uid;
 	inode->i_gid = fattr->cf_gid;
 	fattr->cf_bytes = le64_to_cpu(info->AllocationSize);
 	fattr->cf_createtime = le64_to_cpu(info->CreationTime);
+	fattr->cf_nlink = le32_to_cpu(info->NumberOfLinks);
 	if (fattr->cf_cifsattrs & ATTR_DIRECTORY) {
 		fattr->cf_mode = S_IFDIR | cifs_sb->mnt_dir_mode;
 		fattr->cf_dtype = DT_DIR;
 		 * Server can return wrong NumberOfLinks value for directories
 		 * when Unix extensions are disabled - fake it.
 		 */
-		fattr->cf_nlink = 2;
+		if (!tcon->unix_ext)
+			fattr->cf_flags |= CIFS_FATTR_UNKNOWN_NLINK;
 	} else if (fattr->cf_cifsattrs & ATTR_REPARSE) {
 		fattr->cf_mode = S_IFLNK;
 		fattr->cf_dtype = DT_LNK;
 		if (fattr->cf_cifsattrs & ATTR_READONLY)
 			fattr->cf_mode &= ~(S_IWUGO);
-		fattr->cf_nlink = le32_to_cpu(info->NumberOfLinks);
+		/*
-		if (fattr->cf_nlink < 1) {
+		 * Don't accept zero nlink from non-unix servers unless
-			cifs_dbg(1, "replacing bogus file nlink value %u\n",
+		 * delete is pending.  Instead mark it as unknown.
+		 */
+		if ((fattr->cf_nlink < 1) && !tcon->unix_ext &&
+		    !info->DeletePending) {
+			cifs_dbg(1, "bogus file nlink value %u\n",
 				fattr->cf_nlink);
-			fattr->cf_nlink = 1;
+			fattr->cf_flags |= CIFS_FATTR_UNKNOWN_NLINK;
 		}
 	}

fs/cifs/netmisc.c+3−1

 	ERRDOS, ERRnoaccess, 0xc0000290}, {
 	ERRDOS, ERRbadfunc, 0xc000029c}, {
 	ERRDOS, ERRsymlink, NT_STATUS_STOPPED_ON_SYMLINK}, {
-	ERRDOS, ERRinvlevel, 0x007c0001}, };
+	ERRDOS, ERRinvlevel, 0x007c0001}, {
+	0, 0, 0 }
+};
 /*****************************************************************************
  Print an error message from the status code

fs/cifs/readdir.c+3−0

@@ -180,6 +180,9 @@ cifs_fill_common_info(struct cifs_fattr fattr, struct cifs_sb_info cifs_sb) · 179 unmodified lines
180	fattr->cf_dtype = DT_REG;	180	fattr->cf_dtype = DT_REG;
181	}	181	}
182		182
		183	/* non-unix readdir doesn't provide nlink */
		184	fattr->cf_flags \|= CIFS_FATTR_UNKNOWN_NLINK;
		185
183	if (fattr->cf_cifsattrs & ATTR_READONLY)	186	if (fattr->cf_cifsattrs & ATTR_READONLY)
184	fattr->cf_mode &= ~S_IWUGO;	187	fattr->cf_mode &= ~S_IWUGO;
185		188

fs/cifs/sess.c+3−85

@@ -32,88 +32,6 @@ · 31 unmodified lines
32	#include <linux/slab.h>	32	#include <linux/slab.h>
33	#include "cifs_spnego.h"	33	#include "cifs_spnego.h"
34		34
35	/*
36	* Checks if this is the first smb session to be reconnected after
37	* the socket has been reestablished (so we know whether to use vc 0).
38	* Called while holding the cifs_tcp_ses_lock, so do not block
39	*/
40	static bool is_first_ses_reconnect(struct cifs_ses *ses)
41	{
42	struct list_head *tmp;
43	struct cifs_ses *tmp_ses;
44
45	list_for_each(tmp, &ses->server->smb_ses_list) {
46	tmp_ses = list_entry(tmp, struct cifs_ses,
47	smb_ses_list);
48	if (tmp_ses->need_reconnect == false)
49	return false;
50	}
51	/* could not find a session that was already connected,
52	this must be the first one we are reconnecting */
53	return true;
54	}
55
56	/*
57	* vc number 0 is treated specially by some servers, and should be the
58	* first one we request. After that we can use vcnumbers up to maxvcs,
59	* one for each smb session (some Windows versions set maxvcs incorrectly
60	* so maxvc=1 can be ignored). If we have too many vcs, we can reuse
61	* any vc but zero (some servers reset the connection on vcnum zero)
62	*
63	*/
64	static __le16 get_next_vcnum(struct cifs_ses *ses)
65	{
66	__u16 vcnum = 0;
67	struct list_head *tmp;
68	struct cifs_ses *tmp_ses;
69	__u16 max_vcs = ses->server->max_vcs;
70	__u16 i;
71	int free_vc_found = 0;
72
73	/* Quoting the MS-SMB specification: "Windows-based SMB servers set this
74	field to one but do not enforce this limit, which allows an SMB client
75	to establish more virtual circuits than allowed by this value ... but
76	other server implementations can enforce this limit." */
77	if (max_vcs < 2)
78	max_vcs = 0xFFFF;
79
80	spin_lock(&cifs_tcp_ses_lock);
81	if ((ses->need_reconnect) && is_first_ses_reconnect(ses))
82	goto get_vc_num_exit; /* vcnum will be zero */
83	for (i = ses->server->srv_count - 1; i < max_vcs; i++) {
84	if (i == 0) /* this is the only connection, use vc 0 */
85	break;
86
87	free_vc_found = 1;
88
89	list_for_each(tmp, &ses->server->smb_ses_list) {
90	tmp_ses = list_entry(tmp, struct cifs_ses,
91	smb_ses_list);
92	if (tmp_ses->vcnum == i) {
93	free_vc_found = 0;
94	break; /* found duplicate, try next vcnum */
95	}
96	}
97	if (free_vc_found)
98	break; /* we found a vcnumber that will work - use it */
99	}
100
101	if (i == 0)
102	vcnum = 0; /* for most common case, ie if one smb session, use
103	vc zero. Also for case when no free vcnum, zero
104	is safest to send (some clients only send zero) */
105	else if (free_vc_found == 0)
106	vcnum = 1; /* we can not reuse vc=0 safely, since some servers
107	reset all uids on that, but 1 is ok. */
108	else
109	vcnum = i;
110	ses->vcnum = vcnum;
111	get_vc_num_exit:
112	spin_unlock(&cifs_tcp_ses_lock);
113
114	return cpu_to_le16(vcnum);
115	}
116
117	static __u32 cifs_ssetup_hdr(struct cifs_ses ses, SESSION_SETUP_ANDX pSMB)	35	static __u32 cifs_ssetup_hdr(struct cifs_ses ses, SESSION_SETUP_ANDX pSMB)
118	{	36	{
119	__u32 capabilities = 0;	37	__u32 capabilities = 0;
@@ -128,7 +46,7 @@ static __u32 cifs_ssetup_hdr(struct cifs_ses ses, SESSION_SETUP_ANDX pSMB) · 8 unmodified lines
128	CIFSMaxBufSize + MAX_CIFS_HDR_SIZE - 4,	46	CIFSMaxBufSize + MAX_CIFS_HDR_SIZE - 4,
129	USHRT_MAX));	47	USHRT_MAX));
130	pSMB->req.MaxMpxCount = cpu_to_le16(ses->server->maxReq);	48	pSMB->req.MaxMpxCount = cpu_to_le16(ses->server->maxReq);
131	pSMB->req.VcNumber = get_next_vcnum(ses);	49	pSMB->req.VcNumber = __constant_cpu_to_le16(1);
132		50
133	/* Now no need to set SMBFLG_CASELESS or obsolete CANONICAL PATH */	51	/* Now no need to set SMBFLG_CASELESS or obsolete CANONICAL PATH */
134		52
@@ -582,9 +500,9 @@ select_sectype(struct TCP_Server_Info *server, enum securityEnum requested) · 447 unmodified lines
582	return NTLMv2;	500	return NTLMv2;
583	if (global_secflags & CIFSSEC_MAY_NTLM)	501	if (global_secflags & CIFSSEC_MAY_NTLM)
584	return NTLM;	502	return NTLM;
585	/* Fallthrough */
586	default:	503	default:
587	return Unspecified;	504	/* Fallthrough to attempt LANMAN authentication next */
		505	break;
588	}	506	}
589	case CIFS_NEGFLAVOR_LANMAN:	507	case CIFS_NEGFLAVOR_LANMAN:
590	switch (requested) {	508	switch (requested) {

fs/cifs/smb2pdu.c+6−0

 	else
 		return -EIO;
+	/* no need to send SMB logoff if uid already closed due to reconnect */
+	if (ses->need_reconnect)
+		goto smb2_session_already_dead;
 	rc = small_smb2_init(SMB2_LOGOFF, NULL, (void **) &req);
 	if (rc)
 		return rc;
 	 * No tcon so can't do
 	 * cifs_stats_inc(&tcon->stats.smb2_stats.smb2_com_fail[SMB2...]);
 	 */
+smb2_session_already_dead:
 	return rc;
 }

fs/cifs/smbfsctl.h+14−0

@@ -97,9 +97,23 @@ · 96 unmodified lines
97	#define FSCTL_QUERY_NETWORK_INTERFACE_INFO 0x001401FC /* BB add struct */	97	#define FSCTL_QUERY_NETWORK_INTERFACE_INFO 0x001401FC /* BB add struct */
98	#define FSCTL_SRV_READ_HASH 0x001441BB /* BB add struct */	98	#define FSCTL_SRV_READ_HASH 0x001441BB /* BB add struct */
99		99
		100	/* See FSCC 2.1.2.5 */
100	#define IO_REPARSE_TAG_MOUNT_POINT 0xA0000003	101	#define IO_REPARSE_TAG_MOUNT_POINT 0xA0000003
101	#define IO_REPARSE_TAG_HSM 0xC0000004	102	#define IO_REPARSE_TAG_HSM 0xC0000004
102	#define IO_REPARSE_TAG_SIS 0x80000007	103	#define IO_REPARSE_TAG_SIS 0x80000007
		104	#define IO_REPARSE_TAG_HSM2 0x80000006
		105	#define IO_REPARSE_TAG_DRIVER_EXTENDER 0x80000005
		106	/* Used by the DFS filter. See MS-DFSC */
		107	#define IO_REPARSE_TAG_DFS 0x8000000A
		108	/* Used by the DFS filter See MS-DFSC */
		109	#define IO_REPARSE_TAG_DFSR 0x80000012
		110	#define IO_REPARSE_TAG_FILTER_MANAGER 0x8000000B
		111	/* See section MS-FSCC 2.1.2.4 */
		112	#define IO_REPARSE_TAG_SYMLINK 0xA000000C
		113	#define IO_REPARSE_TAG_DEDUP 0x80000013
		114	#define IO_REPARSE_APPXSTREAM 0xC0000014
		115	/* NFS symlinks, Win 8/SMB3 and later */
		116	#define IO_REPARSE_TAG_NFS 0x80000014
103		117
104	/* fsctl flags */	118	/* fsctl flags */
105	/* If Flags is set to this value, the request is an FSCTL not ioctl request */	119	/* If Flags is set to this value, the request is an FSCTL not ioctl request */

fs/cifs/transport.c+7−2

@@ -410,8 +410,13 @@ static int · 409 unmodified lines
410	wait_for_free_request(struct TCP_Server_Info *server, const int timeout,	410	wait_for_free_request(struct TCP_Server_Info *server, const int timeout,
411	const int optype)	411	const int optype)
412	{	412	{
413	return wait_for_free_credits(server, timeout,	413	int *val;
414	server->ops->get_credits_field(server, optype));	414
		415	val = server->ops->get_credits_field(server, optype);
		416	/* Since an echo is already inflight, no need to wait to send another */
		417	if (*val <= 0 && optype == CIFS_ECHO_OP)
		418	return -EAGAIN;
		419	return wait_for_free_credits(server, timeout, val);
415	}	420	}
416		421
417	static int allocate_mid(struct cifs_ses ses, struct smb_hdr in_buf,	422	static int allocate_mid(struct cifs_ses ses, struct smb_hdr in_buf,

fs/dcache.c+7−8

  * list is non-empty and continue searching.
  */
-/**
- * have_submounts - check for mounts over a dentry
- * @parent: dentry to check.
- *
- * Return true if the parent or its subdirectories contain
- * a mount point
- */
 static enum d_walk_ret check_mount(void *data, struct dentry *dentry)
 {
 	int *ret = data;
 	return D_WALK_CONTINUE;
 }
+/**
+ * have_submounts - check for mounts over a dentry
+ * @parent: dentry to check.
+ *
+ * Return true if the parent or its subdirectories contain
+ * a mount point
+ */
 int have_submounts(struct dentry *parent)
 {
 	int ret = 0;

fs/ext3/namei.c+2−3

 		d_tmpfile(dentry, inode);
 		err = ext3_orphan_add(handle, inode);
 		if (err)
-			goto err_drop_inode;
+			goto err_unlock_inode;
 		mark_inode_dirty(inode);
 		unlock_new_inode(inode);
 	}
 	if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries))
 		goto retry;
 	return err;
-err_drop_inode:
+err_unlock_inode:
 	ext3_journal_stop(handle);
 	unlock_new_inode(inode);
-	iput(inode);
 	return err;
 }

fs/ext4/inode.c+1−1

@@ -2563,7 +2563,7 @@ retry: · 2562 unmodified lines
2563	break;	2563	break;
2564	}	2564	}
2565	blk_finish_plug(&plug);	2565	blk_finish_plug(&plug);
2566	if (!ret && !cycled) {	2566	if (!ret && !cycled && wbc->nr_to_write > 0) {
2567	cycled = 1;	2567	cycled = 1;
2568	mpd.last_page = writeback_index - 1;	2568	mpd.last_page = writeback_index - 1;
2569	mpd.first_page = 0;	2569	mpd.first_page = 0;

fs/ext4/namei.c+2−3

 		d_tmpfile(dentry, inode);
 		err = ext4_orphan_add(handle, inode);
 		if (err)
-			goto err_drop_inode;
+			goto err_unlock_inode;
 		mark_inode_dirty(inode);
 		unlock_new_inode(inode);
 	}
 	if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries))
 		goto retry;
 	return err;
-err_drop_inode:
+err_unlock_inode:
 	ext4_journal_stop(handle);
 	unlock_new_inode(inode);
-	iput(inode);
 	return err;
 }

fs/ext4/xattr.c+2−0

 				    s_min_extra_isize) {
 					tried_min_extra_isize++;
 					new_extra_isize = s_min_extra_isize;
+					kfree(is); is = NULL;
+					kfree(bs); bs = NULL;
 					goto retry;
 				}
 				error = -1;

fs/fuse/dir.c+13−7

@@ -182,6 +182,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags) · 181 unmodified lines
182	struct inode *inode;	182	struct inode *inode;
183	struct dentry *parent;	183	struct dentry *parent;
184	struct fuse_conn *fc;	184	struct fuse_conn *fc;
		185	struct fuse_inode *fi;
185	int ret;	186	int ret;
186		187
187	inode = ACCESS_ONCE(entry->d_inode);	188	inode = ACCESS_ONCE(entry->d_inode);
@@ -228,7 +229,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags) · 40 unmodified lines
228	if (!err && !outarg.nodeid)	229	if (!err && !outarg.nodeid)
229	err = -ENOENT;	230	err = -ENOENT;
230	if (!err) {	231	if (!err) {
231	struct fuse_inode *fi = get_fuse_inode(inode);	232	fi = get_fuse_inode(inode);
232	if (outarg.nodeid != get_node_id(inode)) {	233	if (outarg.nodeid != get_node_id(inode)) {
233	fuse_queue_forget(fc, forget, outarg.nodeid, 1);	234	fuse_queue_forget(fc, forget, outarg.nodeid, 1);
234	goto invalid;	235	goto invalid;
@@ -246,8 +247,11 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags) · 11 unmodified lines
246	attr_version);	247	attr_version);
247	fuse_change_entry_timeout(entry, &outarg);	248	fuse_change_entry_timeout(entry, &outarg);
248	} else if (inode) {	249	} else if (inode) {
249	fc = get_fuse_conn(inode);	250	fi = get_fuse_inode(inode);
250	if (fc->readdirplus_auto) {	251	if (flags & LOOKUP_RCU) {
		252	if (test_bit(FUSE_I_INIT_RDPLUS, &fi->state))
		253	return -ECHILD;
		254	} else if (test_and_clear_bit(FUSE_I_INIT_RDPLUS, &fi->state)) {
251	parent = dget_parent(entry);	255	parent = dget_parent(entry);
252	fuse_advise_use_readdirplus(parent->d_inode);	256	fuse_advise_use_readdirplus(parent->d_inode);
253	dput(parent);	257	dput(parent);
@@ -259,7 +263,8 @@ out: · 5 unmodified lines
259		263
260	invalid:	264	invalid:
261	ret = 0;	265	ret = 0;
262	if (check_submounts_and_drop(entry) != 0)	266
		267	if (!(flags & LOOKUP_RCU) && check_submounts_and_drop(entry) != 0)
263	ret = 1;	268	ret = 1;
264	goto out;	269	goto out;
265	}	270	}
@@ -1063,6 +1068,8 @@ static int fuse_access(struct inode *inode, int mask) · 797 unmodified lines
1063	struct fuse_access_in inarg;	1068	struct fuse_access_in inarg;
1064	int err;	1069	int err;
1065		1070
		1071	BUG_ON(mask & MAY_NOT_BLOCK);
		1072
1066	if (fc->no_access)	1073	if (fc->no_access)
1067	return 0;	1074	return 0;
1068		1075
@@ -1150,9 +1157,6 @@ static int fuse_permission(struct inode *inode, int mask) · 81 unmodified lines
1150	noticed immediately, only after the attribute	1157	noticed immediately, only after the attribute
1151	timeout has expired */	1158	timeout has expired */
1152	} else if (mask & (MAY_ACCESS \| MAY_CHDIR)) {	1159	} else if (mask & (MAY_ACCESS \| MAY_CHDIR)) {
1153	if (mask & MAY_NOT_BLOCK)
1154	return -ECHILD;
1155
1156	err = fuse_access(inode, mask);	1160	err = fuse_access(inode, mask);
1157	} else if ((mask & MAY_EXEC) && S_ISREG(inode->i_mode)) {	1161	} else if ((mask & MAY_EXEC) && S_ISREG(inode->i_mode)) {
1158	if (!(inode->i_mode & S_IXUGO)) {	1162	if (!(inode->i_mode & S_IXUGO)) {
@@ -1291,6 +1295,8 @@ static int fuse_direntplus_link(struct file *file, · 132 unmodified lines
1291	}	1295	}
1292		1296
1293	found:	1297	found:
		1298	if (fc->readdirplus_auto)
		1299	set_bit(FUSE_I_INIT_RDPLUS, &get_fuse_inode(inode)->state);
1294	fuse_change_entry_timeout(dentry, o);	1300	fuse_change_entry_timeout(dentry, o);
1295		1301
1296	err = 0;	1302	err = 0;

fs/fuse/file.c+17−6

@@ -2467,6 +2467,7 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset, · 2466 unmodified lines
2467	{	2467	{
2468	struct fuse_file *ff = file->private_data;	2468	struct fuse_file *ff = file->private_data;
2469	struct inode *inode = file->f_inode;	2469	struct inode *inode = file->f_inode;
		2470	struct fuse_inode *fi = get_fuse_inode(inode);
2470	struct fuse_conn *fc = ff->fc;	2471	struct fuse_conn *fc = ff->fc;
2471	struct fuse_req *req;	2472	struct fuse_req *req;
2472	struct fuse_fallocate_in inarg = {	2473	struct fuse_fallocate_in inarg = {
@@ -2484,10 +2485,20 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset, · 11 unmodified lines
2484		2485
2485	if (lock_inode) {	2486	if (lock_inode) {
2486	mutex_lock(&inode->i_mutex);	2487	mutex_lock(&inode->i_mutex);
2487	if (mode & FALLOC_FL_PUNCH_HOLE)	2488	if (mode & FALLOC_FL_PUNCH_HOLE) {
2488	fuse_set_nowrite(inode);	2489	loff_t endbyte = offset + length - 1;
		2490	err = filemap_write_and_wait_range(inode->i_mapping,
		2491	offset, endbyte);
		2492	if (err)
		2493	goto out;
		2494
		2495	fuse_sync_writes(inode);
		2496	}
2489	}	2497	}
2490		2498
		2499	if (!(mode & FALLOC_FL_KEEP_SIZE))
		2500	set_bit(FUSE_I_SIZE_UNSTABLE, &fi->state);
		2501
2491	req = fuse_get_req_nopages(fc);	2502	req = fuse_get_req_nopages(fc);
2492	if (IS_ERR(req)) {	2503	if (IS_ERR(req)) {
2493	err = PTR_ERR(req);	2504	err = PTR_ERR(req);
@@ -2520,11 +2531,11 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset, · 26 unmodified lines
2520	fuse_invalidate_attr(inode);	2531	fuse_invalidate_attr(inode);
2521		2532
2522	out:	2533	out:
2523	if (lock_inode) {	2534	if (!(mode & FALLOC_FL_KEEP_SIZE))
2524	if (mode & FALLOC_FL_PUNCH_HOLE)	2535	clear_bit(FUSE_I_SIZE_UNSTABLE, &fi->state);
2525	fuse_release_nowrite(inode);	2536
		2537	if (lock_inode)
2526	mutex_unlock(&inode->i_mutex);	2538	mutex_unlock(&inode->i_mutex);
2527	}
2528		2539
2529	return err;	2540	return err;
2530	}	2541	}

fs/fuse/fuse_i.h+2−0

 enum {
 	/** Advise readdirplus  */
 	FUSE_I_ADVISE_RDPLUS,
+	/** Initialized with readdirplus */
+	FUSE_I_INIT_RDPLUS,
 	/** An operation changing file size is in progress  */
 	FUSE_I_SIZE_UNSTABLE,
 };

fs/jfs/jfs_inode.c+1−2

 	if (insert_inode_locked(inode) < 0) {
 		rc = -EINVAL;
-		goto fail_unlock;
+		goto fail_put;
 	}
 	inode_init_owner(inode, parent, mode);
 fail_drop:
 	dquot_drop(inode);
 	inode->i_flags |= S_NOQUOTA;
-fail_unlock:
 	clear_nlink(inode);
 	unlock_new_inode(inode);
 fail_put:

fs/namei.c+2−1

  * path_mountpoint - look up a path to be umounted
  * @dfd:	directory file descriptor to start walk from
  * @name:	full pathname to walk
+ * @path:	pointer to container for result
  * @flags:	lookup flags
  *
  * Look up the given name, but don't attempt to revalidate the last component.
- * Returns 0 and "path" will be valid on success; Retuns error otherwise.
+ * Returns 0 and "path" will be valid on success; Returns error otherwise.
  */
 static int
 path_mountpoint(int dfd, const char *name, struct path *path, unsigned int flags)

fs/proc/inode.c+7−3

 static unsigned long proc_reg_get_unmapped_area(struct file *file, unsigned long orig_addr, unsigned long len, unsigned long pgoff, unsigned long flags)
 {
 	struct proc_dir_entry *pde = PDE(file_inode(file));
-	int rv = -EIO;
+	unsigned long rv = -EIO;
-	unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
+	unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) = NULL;
 	if (use_pde(pde)) {
-		get_unmapped_area = pde->proc_fops->get_unmapped_area;
+#ifdef CONFIG_MMU
+		get_unmapped_area = current->mm->get_unmapped_area;
+#endif
+		if (pde->proc_fops->get_unmapped_area)
+			get_unmapped_area = pde->proc_fops->get_unmapped_area;
 		if (get_unmapped_area)
 			rv = get_unmapped_area(file, orig_addr, len, pgoff, flags);
 		unuse_pde(pde);

fs/proc/task_mmu.c+3−1

 		frame = pte_pfn(pte);
 		flags = PM_PRESENT;
 		page = vm_normal_page(vma, addr, pte);
+		if (pte_soft_dirty(pte))
+			flags2 |= __PM_SOFT_DIRTY;
 	} else if (is_swap_pte(pte)) {
 		swp_entry_t entry;
 		if (pte_swp_soft_dirty(pte))
 	if (page && !PageAnon(page))
 		flags |= PM_FILE;
-	if ((vma->vm_flags & VM_SOFTDIRTY) || pte_soft_dirty(pte))
+	if ((vma->vm_flags & VM_SOFTDIRTY))
 		flags2 |= __PM_SOFT_DIRTY;
 	*pme = make_pme(PM_PFRAME(frame) | PM_STATUS2(pm->v2, flags2) | flags);

fs/statfs.c+1−1

@@ -94,7 +94,7 @@ retry: · 93 unmodified lines
94		94
95	int fd_statfs(int fd, struct kstatfs *st)	95	int fd_statfs(int fd, struct kstatfs *st)
96	{	96	{
97	struct fd f = fdget(fd);	97	struct fd f = fdget_raw(fd);
98	int error = -EBADF;	98	int error = -EBADF;
99	if (f.file) {	99	if (f.file) {
100	error = vfs_statfs(&f.file->f_path, st);	100	error = vfs_statfs(&f.file->f_path, st);

fs/xfs/xfs_dir2_block.c+3−3

@@ -1158,7 +1158,7 @@ xfs_dir2_sf_to_block( · 1157 unmodified lines
1158	/*	1158	/*
1159	* Create entry for .	1159	* Create entry for .
1160	*/	1160	*/
1161	dep = xfs_dir3_data_dot_entry_p(hdr);	1161	dep = xfs_dir3_data_dot_entry_p(mp, hdr);
1162	dep->inumber = cpu_to_be64(dp->i_ino);	1162	dep->inumber = cpu_to_be64(dp->i_ino);
1163	dep->namelen = 1;	1163	dep->namelen = 1;
1164	dep->name[0] = '.';	1164	dep->name[0] = '.';
@@ -1172,7 +1172,7 @@ xfs_dir2_sf_to_block( · 7 unmodified lines
1172	/*	1172	/*
1173	* Create entry for ..	1173	* Create entry for ..
1174	*/	1174	*/
1175	dep = xfs_dir3_data_dotdot_entry_p(hdr);	1175	dep = xfs_dir3_data_dotdot_entry_p(mp, hdr);
1176	dep->inumber = cpu_to_be64(xfs_dir2_sf_get_parent_ino(sfp));	1176	dep->inumber = cpu_to_be64(xfs_dir2_sf_get_parent_ino(sfp));
1177	dep->namelen = 2;	1177	dep->namelen = 2;
1178	dep->name[0] = dep->name[1] = '.';	1178	dep->name[0] = dep->name[1] = '.';
@@ -1183,7 +1183,7 @@ xfs_dir2_sf_to_block( · 4 unmodified lines
1183	blp[1].hashval = cpu_to_be32(xfs_dir_hash_dotdot);	1183	blp[1].hashval = cpu_to_be32(xfs_dir_hash_dotdot);
1184	blp[1].address = cpu_to_be32(xfs_dir2_byte_to_dataptr(mp,	1184	blp[1].address = cpu_to_be32(xfs_dir2_byte_to_dataptr(mp,
1185	(char )dep - (char )hdr));	1185	(char )dep - (char )hdr));
1186	offset = xfs_dir3_data_first_offset(hdr);	1186	offset = xfs_dir3_data_first_offset(mp);
1187	/*	1187	/*
1188	* Loop over existing entries, stuff them in.	1188	* Loop over existing entries, stuff them in.
1189	*/	1189	*/

fs/xfs/xfs_dir2_format.h+20−31

 /*
  * Offsets of . and .. in data space (always block 0)
  *
- * The macros are used for shortform directories as they have no headers to read
- * the magic number out of. Shortform directories need to know the size of the
- * data block header because the sfe embeds the block offset of the entry into
- * it so that it doesn't change when format conversion occurs. Bad Things Happen
- * if we don't follow this rule.
- *
  * XXX: there is scope for significant optimisation of the logic here. Right
  * now we are checking for "dir3 format" over and over again. Ideally we should
  * only do it once for each operation.
  */
-#define	XFS_DIR3_DATA_DOT_OFFSET(mp)	\
-	xfs_dir3_data_hdr_size(xfs_sb_version_hascrc(&(mp)->m_sb))
-#define	XFS_DIR3_DATA_DOTDOT_OFFSET(mp)	\
-	(XFS_DIR3_DATA_DOT_OFFSET(mp) + xfs_dir3_data_entsize(mp, 1))
-#define	XFS_DIR3_DATA_FIRST_OFFSET(mp)		\
-	(XFS_DIR3_DATA_DOTDOT_OFFSET(mp) + xfs_dir3_data_entsize(mp, 2))
 static inline xfs_dir2_data_aoff_t
-xfs_dir3_data_dot_offset(struct xfs_dir2_data_hdr *hdr)
+xfs_dir3_data_dot_offset(struct xfs_mount *mp)
 {
-	return xfs_dir3_data_entry_offset(hdr);
+	return xfs_dir3_data_hdr_size(xfs_sb_version_hascrc(&mp->m_sb));
 }
 static inline xfs_dir2_data_aoff_t
-xfs_dir3_data_dotdot_offset(struct xfs_dir2_data_hdr *hdr)
+xfs_dir3_data_dotdot_offset(struct xfs_mount *mp)
 {
-	bool dir3 = hdr->magic == cpu_to_be32(XFS_DIR3_DATA_MAGIC) ||
+	return xfs_dir3_data_dot_offset(mp) +
-		    hdr->magic == cpu_to_be32(XFS_DIR3_BLOCK_MAGIC);
+		xfs_dir3_data_entsize(mp, 1);
-	return xfs_dir3_data_dot_offset(hdr) +
-		__xfs_dir3_data_entsize(dir3, 1);
 }
 static inline xfs_dir2_data_aoff_t
-xfs_dir3_data_first_offset(struct xfs_dir2_data_hdr *hdr)
+xfs_dir3_data_first_offset(struct xfs_mount *mp)
 {
-	bool dir3 = hdr->magic == cpu_to_be32(XFS_DIR3_DATA_MAGIC) ||
+	return xfs_dir3_data_dotdot_offset(mp) +
-		    hdr->magic == cpu_to_be32(XFS_DIR3_BLOCK_MAGIC);
+		xfs_dir3_data_entsize(mp, 2);
-	return xfs_dir3_data_dotdot_offset(hdr) +
-		__xfs_dir3_data_entsize(dir3, 2);
 }
 /*
  * location of . and .. in data space (always block 0)
  */
 static inline struct xfs_dir2_data_entry *
-xfs_dir3_data_dot_entry_p(struct xfs_dir2_data_hdr *hdr)
+xfs_dir3_data_dot_entry_p(
+	struct xfs_mount	*mp,
+	struct xfs_dir2_data_hdr *hdr)
 {
 	return (struct xfs_dir2_data_entry *)
-		((char *)hdr + xfs_dir3_data_dot_offset(hdr));
+		((char *)hdr + xfs_dir3_data_dot_offset(mp));
 }
 static inline struct xfs_dir2_data_entry *
-xfs_dir3_data_dotdot_entry_p(struct xfs_dir2_data_hdr *hdr)
+xfs_dir3_data_dotdot_entry_p(
+	struct xfs_mount	*mp,
+	struct xfs_dir2_data_hdr *hdr)
 {
 	return (struct xfs_dir2_data_entry *)
-		((char *)hdr + xfs_dir3_data_dotdot_offset(hdr));
+		((char *)hdr + xfs_dir3_data_dotdot_offset(mp));
 }
 static inline struct xfs_dir2_data_entry *
-xfs_dir3_data_first_entry_p(struct xfs_dir2_data_hdr *hdr)
+xfs_dir3_data_first_entry_p(
+	struct xfs_mount	*mp,
+	struct xfs_dir2_data_hdr *hdr)
 {
 	return (struct xfs_dir2_data_entry *)
-		((char *)hdr + xfs_dir3_data_first_offset(hdr));
+		((char *)hdr + xfs_dir3_data_first_offset(mp));
 }
 /*

fs/xfs/xfs_dir2_readdir.c+2−2

@@ -119,9 +119,9 @@ xfs_dir2_sf_getdents( · 118 unmodified lines
119	* mp->m_dirdatablk.	119	* mp->m_dirdatablk.
120	*/	120	*/
121	dot_offset = xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk,	121	dot_offset = xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk,
122	XFS_DIR3_DATA_DOT_OFFSET(mp));	122	xfs_dir3_data_dot_offset(mp));
123	dotdot_offset = xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk,	123	dotdot_offset = xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk,
124	XFS_DIR3_DATA_DOTDOT_OFFSET(mp));	124	xfs_dir3_data_dotdot_offset(mp));
125		125
126	/*	126	/*
127	* Put . entry unless we're starting past it.	127	* Put . entry unless we're starting past it.

fs/xfs/xfs_dir2_sf.c+3−3

@@ -557,7 +557,7 @@ xfs_dir2_sf_addname_hard( · 556 unmodified lines
557	* to insert the new entry.	557	* to insert the new entry.
558	* If it's going to end up at the end then oldsfep will point there.	558	* If it's going to end up at the end then oldsfep will point there.
559	*/	559	*/
560	for (offset = XFS_DIR3_DATA_FIRST_OFFSET(mp),	560	for (offset = xfs_dir3_data_first_offset(mp),
561	oldsfep = xfs_dir2_sf_firstentry(oldsfp),	561	oldsfep = xfs_dir2_sf_firstentry(oldsfp),
562	add_datasize = xfs_dir3_data_entsize(mp, args->namelen),	562	add_datasize = xfs_dir3_data_entsize(mp, args->namelen),
563	eof = (char *)oldsfep == &buf[old_isize];	563	eof = (char *)oldsfep == &buf[old_isize];
@@ -640,7 +640,7 @@ xfs_dir2_sf_addname_pick( · 76 unmodified lines
640		640
641	sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data;	641	sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data;
642	size = xfs_dir3_data_entsize(mp, args->namelen);	642	size = xfs_dir3_data_entsize(mp, args->namelen);
643	offset = XFS_DIR3_DATA_FIRST_OFFSET(mp);	643	offset = xfs_dir3_data_first_offset(mp);
644	sfep = xfs_dir2_sf_firstentry(sfp);	644	sfep = xfs_dir2_sf_firstentry(sfp);
645	holefit = 0;	645	holefit = 0;
646	/*	646	/*
@@ -713,7 +713,7 @@ xfs_dir2_sf_check( · 66 unmodified lines
713	mp = dp->i_mount;	713	mp = dp->i_mount;
714		714
715	sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data;	715	sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data;
716	offset = XFS_DIR3_DATA_FIRST_OFFSET(mp);	716	offset = xfs_dir3_data_first_offset(mp);
717	ino = xfs_dir2_sf_get_parent_ino(sfp);	717	ino = xfs_dir2_sf_get_parent_ino(sfp);
718	i8count = ino > XFS_DIR2_MAX_SHORT_INUM;	718	i8count = ino > XFS_DIR2_MAX_SHORT_INUM;
719		719

fs/xfs/xfs_dquot.c+16−3

 struct kmem_zone		*xfs_qm_dqtrxzone;
 static struct kmem_zone		*xfs_qm_dqzone;
-static struct lock_class_key xfs_dquot_other_class;
+static struct lock_class_key xfs_dquot_group_class;
+static struct lock_class_key xfs_dquot_project_class;
 /*
  * This is called to free all the memory associated with a dquot
 	 * Make sure group quotas have a different lock class than user
 	 * quotas.
 	 */
-	if (!(type & XFS_DQ_USER))
+	switch (type) {
-		lockdep_set_class(&dqp->q_qlock, &xfs_dquot_other_class);
+	case XFS_DQ_USER:
+		/* uses the default lock class */
+		break;
+	case XFS_DQ_GROUP:
+		lockdep_set_class(&dqp->q_qlock, &xfs_dquot_group_class);
+		break;
+	case XFS_DQ_PROJ:
+		lockdep_set_class(&dqp->q_qlock, &xfs_dquot_project_class);
+		break;
+	default:
+		ASSERT(0);
+		break;
+	}
 	XFS_STATS_INC(xs_qm_dquot);

fs/xfs/xfs_log_recover.c+1−0

@@ -1585,6 +1585,7 @@ xlog_recover_add_to_trans( · 1584 unmodified lines
1585	"bad number of regions (%d) in inode log format",	1585	"bad number of regions (%d) in inode log format",
1586	in_f->ilf_size);	1586	in_f->ilf_size);
1587	ASSERT(0);	1587	ASSERT(0);
		1588	kmem_free(ptr);
1588	return XFS_ERROR(EIO);	1589	return XFS_ERROR(EIO);
1589	}	1590	}
1590		1591

include/acpi/acpi_bus.h+0−7

 	unsigned int physical_node_count;
 	struct list_head physical_node_list;
 	struct mutex physical_node_lock;
-	struct list_head power_dependent;
 	void (*remove)(struct acpi_device *);
 };
 acpi_status acpi_remove_pm_notifier(struct acpi_device *adev,
 				    acpi_notify_handler handler);
 int acpi_pm_device_sleep_state(struct device *, int *, int);
-void acpi_dev_pm_add_dependent(acpi_handle handle, struct device *depdev);
-void acpi_dev_pm_remove_dependent(acpi_handle handle, struct device *depdev);
 #else
 static inline acpi_status acpi_add_pm_notifier(struct acpi_device *adev,
 					       acpi_notify_handler handler,
 	return (m >= ACPI_STATE_D0 && m <= ACPI_STATE_D3_COLD) ?
 		m : ACPI_STATE_D0;
 }
-static inline void acpi_dev_pm_add_dependent(acpi_handle handle,
-					     struct device *depdev) {}
-static inline void acpi_dev_pm_remove_dependent(acpi_handle handle,
-						struct device *depdev) {}
 #endif
 #ifdef CONFIG_PM_RUNTIME

include/asm-generic/hugetlb.h+2−2

@@ -6,12 +6,12 @@ static inline pte_t mk_huge_pte(struct page *page, pgprot_t pgprot) · 5 unmodified lines
6	return mk_pte(page, pgprot);	6	return mk_pte(page, pgprot);
7	}	7	}
8		8
9	static inline int huge_pte_write(pte_t pte)	9	static inline unsigned long huge_pte_write(pte_t pte)
10	{	10	{
11	return pte_write(pte);	11	return pte_write(pte);
12	}	12	}
13		13
14	static inline int huge_pte_dirty(pte_t pte)	14	static inline unsigned long huge_pte_dirty(pte_t pte)
15	{	15	{
16	return pte_dirty(pte);	16	return pte_dirty(pte);
17	}	17	}

include/dt-bindings/pinctrl/omap.h+1−3

 #define PULL_UP			(1 << 4)
 #define ALTELECTRICALSEL	(1 << 5)
-/* 34xx specific mux bit defines */
+/* omap3/4/5 specific mux bit defines */
 #define INPUT_EN		(1 << 8)
 #define OFF_EN			(1 << 9)
 #define OFFOUT_EN		(1 << 10)
 #define OFF_PULL_EN		(1 << 12)
 #define OFF_PULL_UP		(1 << 13)
 #define WAKEUP_EN		(1 << 14)
-/* 44xx specific mux bit defines */
 #define WAKEUP_EVENT		(1 << 15)
 /* Active pin states */

include/linux/compiler-gcc4.h+15−0

@@ -65,6 +65,21 @@ · 64 unmodified lines
65	#define __visible __attribute__((externally_visible))	65	#define __visible __attribute__((externally_visible))
66	#endif	66	#endif
67		67
		68	/*
		69	* GCC 'asm goto' miscompiles certain code sequences:
		70	*
		71	* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
		72	*
		73	* Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
		74	* Fixed in GCC 4.8.2 and later versions.
		75	*
		76	* (asm goto is automatically volatile - the naming reflects this.)
		77	*/
		78	#if GCC_VERSION <= 40801
		79	# define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)
		80	#else
		81	# define asm_volatile_goto(x...) do { asm goto(x); } while (0)
		82	#endif
68		83
69	#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP	84	#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
70	#if GCC_VERSION >= 40400	85	#if GCC_VERSION >= 40400

include/linux/intel-iommu.h+1−1

@@ -55,7 +55,7 @@ · 54 unmodified lines
55	#define DMAR_IQT_REG 0x88 /* Invalidation queue tail register */	55	#define DMAR_IQT_REG 0x88 /* Invalidation queue tail register */
56	#define DMAR_IQ_SHIFT 4 /* Invalidation queue head/tail shift */	56	#define DMAR_IQ_SHIFT 4 /* Invalidation queue head/tail shift */
57	#define DMAR_IQA_REG 0x90 /* Invalidation queue addr register */	57	#define DMAR_IQA_REG 0x90 /* Invalidation queue addr register */
58	#define DMAR_ICS_REG 0x98 /* Invalidation complete status register */	58	#define DMAR_ICS_REG 0x9c /* Invalidation complete status register */
59	#define DMAR_IRTA_REG 0xb8 /* Interrupt remapping table addr register */	59	#define DMAR_IRTA_REG 0xb8 /* Interrupt remapping table addr register */
60		60
61	#define OFFSET_STRIDE (9)	61	#define OFFSET_STRIDE (9)

include/linux/memcontrol.h+11−39

@@ -137,47 +137,24 @@ extern void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, · 136 unmodified lines
137	extern void mem_cgroup_replace_page_cache(struct page *oldpage,	137	extern void mem_cgroup_replace_page_cache(struct page *oldpage,
138	struct page *newpage);	138	struct page *newpage);
139		139
140	/**	140	static inline void mem_cgroup_oom_enable(void)
141	* mem_cgroup_toggle_oom - toggle the memcg OOM killer for the current task
142	* @new: true to enable, false to disable
143	*
144	* Toggle whether a failed memcg charge should invoke the OOM killer
145	* or just return -ENOMEM. Returns the previous toggle state.
146	*
147	* NOTE: Any path that enables the OOM killer before charging must
148	* call mem_cgroup_oom_synchronize() afterward to finalize the
149	* OOM handling and clean up.
150	*/
151	static inline bool mem_cgroup_toggle_oom(bool new)
152	{	141	{
153	bool old;	142	WARN_ON(current->memcg_oom.may_oom);
154		143	current->memcg_oom.may_oom = 1;
155	old = current->memcg_oom.may_oom;
156	current->memcg_oom.may_oom = new;
157
158	return old;
159	}	144	}
160		145
161	static inline void mem_cgroup_enable_oom(void)	146	static inline void mem_cgroup_oom_disable(void)
162	{	147	{
163	bool old = mem_cgroup_toggle_oom(true);	148	WARN_ON(!current->memcg_oom.may_oom);
164		149	current->memcg_oom.may_oom = 0;
165	WARN_ON(old == true);
166	}
167
168	static inline void mem_cgroup_disable_oom(void)
169	{
170	bool old = mem_cgroup_toggle_oom(false);
171
172	WARN_ON(old == false);
173	}	150	}
174		151
175	static inline bool task_in_memcg_oom(struct task_struct *p)	152	static inline bool task_in_memcg_oom(struct task_struct *p)
176	{	153	{
177	return p->memcg_oom.in_memcg_oom;	154	return p->memcg_oom.memcg;
178	}	155	}
179		156
180	bool mem_cgroup_oom_synchronize(void);	157	bool mem_cgroup_oom_synchronize(bool wait);
181		158
182	#ifdef CONFIG_MEMCG_SWAP	159	#ifdef CONFIG_MEMCG_SWAP
183	extern int do_swap_account;	160	extern int do_swap_account;
@@ -402,16 +379,11 @@ static inline void mem_cgroup_end_update_page_stat(struct page *page, · 218 unmodified lines
402	{	379	{
403	}	380	}
404		381
405	static inline bool mem_cgroup_toggle_oom(bool new)	382	static inline void mem_cgroup_oom_enable(void)
406	{
407	return false;
408	}
409
410	static inline void mem_cgroup_enable_oom(void)
411	{	383	{
412	}	384	}
413		385
414	static inline void mem_cgroup_disable_oom(void)	386	static inline void mem_cgroup_oom_disable(void)
415	{	387	{
416	}	388	}
417		389
@@ -420,7 +392,7 @@ static inline bool task_in_memcg_oom(struct task_struct *p) · 2 unmodified lines
420	return false;	392	return false;
421	}	393	}
422		394
423	static inline bool mem_cgroup_oom_synchronize(void)	395	static inline bool mem_cgroup_oom_synchronize(bool wait)
424	{	396	{
425	return false;	397	return false;
426	}	398	}

include/linux/miscdevice.h+1−0

@@ -45,6 +45,7 @@ · 44 unmodified lines
45	#define MAPPER_CTRL_MINOR 236	45	#define MAPPER_CTRL_MINOR 236
46	#define LOOP_CTRL_MINOR 237	46	#define LOOP_CTRL_MINOR 237
47	#define VHOST_NET_MINOR 238	47	#define VHOST_NET_MINOR 238
		48	#define UHID_MINOR 239
48	#define MISC_DYNAMIC_MINOR 255	49	#define MISC_DYNAMIC_MINOR 255
49		50
50	struct device;	51	struct device;

include/linux/mlx5/device.h+2−2

@@ -181,7 +181,7 @@ enum { · 180 unmodified lines
181	MLX5_DEV_CAP_FLAG_TLP_HINTS = 1LL << 39,	181	MLX5_DEV_CAP_FLAG_TLP_HINTS = 1LL << 39,
182	MLX5_DEV_CAP_FLAG_SIG_HAND_OVER = 1LL << 40,	182	MLX5_DEV_CAP_FLAG_SIG_HAND_OVER = 1LL << 40,
183	MLX5_DEV_CAP_FLAG_DCT = 1LL << 41,	183	MLX5_DEV_CAP_FLAG_DCT = 1LL << 41,
184	MLX5_DEV_CAP_FLAG_CMDIF_CSUM = 1LL << 46,	184	MLX5_DEV_CAP_FLAG_CMDIF_CSUM = 3LL << 46,
185	};	185	};
186		186
187	enum {	187	enum {
@@ -417,7 +417,7 @@ struct mlx5_init_seg { · 229 unmodified lines
417	struct health_buffer health;	417	struct health_buffer health;
418	__be32 rsvd2[884];	418	__be32 rsvd2[884];
419	__be32 health_counter;	419	__be32 health_counter;
420	__be32 rsvd3[1023];	420	__be32 rsvd3[1019];
421	__be64 ieee1588_clk;	421	__be64 ieee1588_clk;
422	__be32 ieee1588_clk_type;	422	__be32 ieee1588_clk_type;
423	__be32 clr_intx;	423	__be32 clr_intx;

include/linux/mlx5/driver.h+2−4

 };
 enum {
-	MLX5_MAX_EQ_NAME	= 20
+	MLX5_MAX_EQ_NAME	= 32
 };
 enum {
 enum {
 	MLX5_PROF_MASK_QP_SIZE		= (u64)1 << 0,
-	MLX5_PROF_MASK_CMDIF_CSUM	= (u64)1 << 1,
+	MLX5_PROF_MASK_MR_CACHE		= (u64)1 << 1,
-	MLX5_PROF_MASK_MR_CACHE		= (u64)1 << 2,
 };
 enum {
 struct mlx5_profile {
 	u64	mask;
 	u32	log_max_qp;
-	int	cmdif_csum;
 	struct {
 		int	size;
 		int	limit;

include/linux/of_reserved_mem.h+0−14

@@ -1,14 +0,0 @@
1	#ifndef __OF_RESERVED_MEM_H
2	#define __OF_RESERVED_MEM_H
3
4	#ifdef CONFIG_OF_RESERVED_MEM
5	void of_reserved_mem_device_init(struct device *dev);
6	void of_reserved_mem_device_release(struct device *dev);
7	void early_init_dt_scan_reserved_mem(void);
8	#else
9	static inline void of_reserved_mem_device_init(struct device *dev) { }
10	static inline void of_reserved_mem_device_release(struct device *dev) { }
11	static inline void early_init_dt_scan_reserved_mem(void) { }
12	#endif
13
14	#endif /* __OF_RESERVED_MEM_H */

include/linux/perf_event.h+23−1

@@ -294,9 +294,31 @@ struct ring_buffer; · 293 unmodified lines
294	*/	294	*/
295	struct perf_event {	295	struct perf_event {
296	#ifdef CONFIG_PERF_EVENTS	296	#ifdef CONFIG_PERF_EVENTS
297	struct list_head group_entry;	297	/*
		298	* entry onto perf_event_context::event_list;
		299	* modifications require ctx->lock
		300	* RCU safe iterations.
		301	*/
298	struct list_head event_entry;	302	struct list_head event_entry;
		303
		304	/*
		305	* XXX: group_entry and sibling_list should be mutually exclusive;
		306	* either you're a sibling on a group, or you're the group leader.
		307	* Rework the code to always use the same list element.
		308	*
		309	* Locked for modification by both ctx->mutex and ctx->lock; holding
		310	* either sufficies for read.
		311	*/
		312	struct list_head group_entry;
299	struct list_head sibling_list;	313	struct list_head sibling_list;
		314
		315	/*
		316	* We need storage to track the entries in perf_pmu_migrate_context; we
		317	* cannot use the event_entry because of RCU and we want to keep the
		318	* group in tact which avoids us using the other two entries.
		319	*/
		320	struct list_head migrate_entry;
		321
300	struct hlist_node hlist_entry;	322	struct hlist_node hlist_entry;
301	int nr_siblings;	323	int nr_siblings;
302	int group_flags;	324	int group_flags;

include/linux/random.h+1−0

@@ -17,6 +17,7 @@ extern void add_interrupt_randomness(int irq, int irq_flags); · 16 unmodified lines
17	extern void get_random_bytes(void *buf, int nbytes);	17	extern void get_random_bytes(void *buf, int nbytes);
18	extern void get_random_bytes_arch(void *buf, int nbytes);	18	extern void get_random_bytes_arch(void *buf, int nbytes);
19	void generate_random_uuid(unsigned char uuid_out[16]);	19	void generate_random_uuid(unsigned char uuid_out[16]);
		20	extern int random_int_secret_init(void);
20		21
21	#ifndef MODULE	22	#ifndef MODULE
22	extern const struct file_operations random_fops, urandom_fops;	23	extern const struct file_operations random_fops, urandom_fops;

include/linux/sched.h+3−4

 	} memcg_batch;
 	unsigned int memcg_kmem_skip_account;
 	struct memcg_oom_info {
+		struct mem_cgroup *memcg;
+		gfp_t gfp_mask;
+		int order;
 		unsigned int may_oom:1;
-		unsigned int in_memcg_oom:1;
-		unsigned int oom_locked:1;
-		int wakeups;
-		struct mem_cgroup *wait_on_memcg;
 	} memcg_oom;
 #endif
 #ifdef CONFIG_UPROBES

include/linux/timex.h+14−0

@@ -64,6 +64,20 @@ · 63 unmodified lines
64		64
65	#include <asm/timex.h>	65	#include <asm/timex.h>
66		66
		67	#ifndef random_get_entropy
		68	/*
		69	* The random_get_entropy() function is used by the /dev/random driver
		70	* in order to extract entropy via the relative unpredictability of
		71	* when an interrupt takes places versus a high speed, fine-grained
		72	* timing source or cycle counter. Since it will be occurred on every
		73	* single interrupt, it must have a very low cost/overhead.
		74	*
		75	* By default we use get_cycles() for this purpose, but individual
		76	* architectures may override this in their asm/timex.h header file.
		77	*/
		78	#define random_get_entropy() get_cycles()
		79	#endif
		80
67	/*	81	/*
68	* SHIFT_PLL is used as a dampening factor to define how much we	82	* SHIFT_PLL is used as a dampening factor to define how much we
69	* adjust the frequency correction for a given offset in PLL mode.	83	* adjust the frequency correction for a given offset in PLL mode.

include/linux/usb/usb_phy_gen_xceiv.h+1−1

@@ -12,7 +12,7 @@ struct usb_phy_gen_xceiv_platform_data { · 11 unmodified lines
12	unsigned int needs_reset:1;	12	unsigned int needs_reset:1;
13	};	13	};
14		14
15	#if IS_ENABLED(CONFIG_NOP_USB_XCEIV)	15	#if defined(CONFIG_NOP_USB_XCEIV) \|\| (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))
16	/* sometimes transceivers are accessed only through e.g. ULPI */	16	/* sometimes transceivers are accessed only through e.g. ULPI */
17	extern void usb_nop_xceiv_register(void);	17	extern void usb_nop_xceiv_register(void);
18	extern void usb_nop_xceiv_unregister(void);	18	extern void usb_nop_xceiv_unregister(void);

include/linux/usb_usual.h+3−1

 	US_FLAG(INITIAL_READ10,	0x00100000)			\
 		/* Initial READ(10) (and others) must be retried */	\
 	US_FLAG(WRITE_CACHE,	0x00200000)			\
-		/* Write Cache status is not available */
+		/* Write Cache status is not available */	\
+	US_FLAG(NEEDS_CAP16,	0x00400000)
+		/* cannot handle READ_CAPACITY_10 */
 #define US_FLAG(name, value)	US_FL_##name = value ,
 enum { US_DO_ALL_FLAGS };

include/linux/vgaarb.h+0−7

  *     out of the arbitration process (and can be safe to take
  *     interrupts at any time.
  */
-#if defined(CONFIG_VGA_ARB)
 extern void vga_set_legacy_decoding(struct pci_dev *pdev,
 				    unsigned int decodes);
-#else
-static inline void vga_set_legacy_decoding(struct pci_dev *pdev,
-					   unsigned int decodes)
-{
-}
-#endif
 /**
  *     vga_get         - acquire & locks VGA resources

include/linux/yam.h+1−1

@@ -77,6 +77,6 @@ struct yamdrv_ioctl_cfg { · 76 unmodified lines
77		77
78	struct yamdrv_ioctl_mcs {	78	struct yamdrv_ioctl_mcs {
79	int cmd;	79	int cmd;
80	int bitrate;	80	unsigned int bitrate;
81	unsigned char bits[YAM_FPGA_SIZE];	81	unsigned char bits[YAM_FPGA_SIZE];
82	};	82	};

include/net/cipso_ipv4.h+4−2

 	unsigned char err_offset = 0;
 	u8 opt_len = opt[1];
 	u8 opt_iter;
+	u8 tag_len;
 	if (opt_len < 8) {
 		err_offset = 1;
 	}
 	for (opt_iter = 6; opt_iter < opt_len;) {
-		if (opt[opt_iter + 1] > (opt_len - opt_iter)) {
+		tag_len = opt[opt_iter + 1];
+		if ((tag_len == 0) || (opt[opt_iter + 1] > (opt_len - opt_iter))) {
 			err_offset = opt_iter + 1;
 			goto out;
 		}
-		opt_iter += opt[opt_iter + 1];
+		opt_iter += tag_len;
 	}
 out:

include/net/dst.h+12−0

@@ -478,10 +478,22 @@ static inline struct dst_entry xfrm_lookup(struct net net, · 477 unmodified lines
478	{	478	{
479	return dst_orig;	479	return dst_orig;
480	}	480	}
		481
		482	static inline struct xfrm_state dst_xfrm(const struct dst_entry dst)
		483	{
		484	return NULL;
		485	}
		486
481	#else	487	#else
482	struct dst_entry xfrm_lookup(struct net net, struct dst_entry *dst_orig,	488	struct dst_entry xfrm_lookup(struct net net, struct dst_entry *dst_orig,
483	const struct flowi fl, struct sock sk,	489	const struct flowi fl, struct sock sk,
484	int flags);	490	int flags);
		491
		492	/* skb attached with this dst needs transformation if dst->xfrm is valid */
		493	static inline struct xfrm_state dst_xfrm(const struct dst_entry dst)
		494	{
		495	return dst->xfrm;
		496	}
485	#endif	497	#endif
486		498
487	#endif /* _NET_DST_H */	499	#endif /* _NET_DST_H */

include/net/ip6_route.h+2−4

 	       skb_dst(skb)->dev->mtu : dst_mtu(skb_dst(skb));
 }
-static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt, struct in6_addr *dest)
+static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt)
 {
-	if (rt->rt6i_flags & RTF_GATEWAY)
+	return &rt->rt6i_gateway;
-		return &rt->rt6i_gateway;
-	return dest;
 }
 #endif

include/net/mac802154.h+1−1

@@ -133,7 +133,7 @@ struct ieee802154_ops { · 132 unmodified lines
133		133
134	/* Basic interface to register ieee802154 device */	134	/* Basic interface to register ieee802154 device */
135	struct ieee802154_dev *	135	struct ieee802154_dev *
136	ieee802154_alloc_device(size_t priv_data_lex, struct ieee802154_ops *ops);	136	ieee802154_alloc_device(size_t priv_data_len, struct ieee802154_ops *ops);
137	void ieee802154_free_device(struct ieee802154_dev *dev);	137	void ieee802154_free_device(struct ieee802154_dev *dev);
138	int ieee802154_register_device(struct ieee802154_dev *dev);	138	int ieee802154_register_device(struct ieee802154_dev *dev);
139	void ieee802154_unregister_device(struct ieee802154_dev *dev);	139	void ieee802154_unregister_device(struct ieee802154_dev *dev);

include/sound/rcar_snd.h+1−0

@@ -68,6 +68,7 @@ struct rsnd_scu_platform_info { · 67 unmodified lines
68	*	68	*
69	* A : generation	69	* A : generation
70	*/	70	*/
		71	#define RSND_GEN_MASK (0xF << 0)
71	#define RSND_GEN1 (1 << 0) /* fixme */	72	#define RSND_GEN1 (1 << 0) /* fixme */
72	#define RSND_GEN2 (2 << 0) /* fixme */	73	#define RSND_GEN2 (2 << 0) /* fixme */
73		74

include/uapi/drm/drm_mode.h+2−0

@@ -223,6 +223,8 @@ struct drm_mode_get_connector { · 222 unmodified lines
223	__u32 connection;	223	__u32 connection;
224	__u32 mm_width, mm_height; /*< HxW in millimeters /	224	__u32 mm_width, mm_height; /*< HxW in millimeters /
225	__u32 subpixel;	225	__u32 subpixel;
		226
		227	__u32 pad;
226	};	228	};
227		229
228	#define DRM_MODE_PROP_PENDING (1<<0)	230	#define DRM_MODE_PROP_PENDING (1<<0)

include/uapi/rdma/ib_user_verbs.h+6−0

 	IB_USER_VERBS_CMD_CLOSE_XRCD,
 	IB_USER_VERBS_CMD_CREATE_XSRQ,
 	IB_USER_VERBS_CMD_OPEN_QP,
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
 	IB_USER_VERBS_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD,
 	IB_USER_VERBS_CMD_DESTROY_FLOW
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 };
 /*
 	__u16 out_words;
 };
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
 struct ib_uverbs_cmd_hdr_ex {
 	__u32 command;
 	__u16 in_words;
 	__u16 provider_out_words;
 	__u32 cmd_hdr_reserved;
 };
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 struct ib_uverbs_get_context {
 	__u64 response;
 	__u64 driver_data[0];
 };
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
 struct ib_kern_eth_filter {
 	__u8  dst_mac[6];
 	__u8  src_mac[6];
 	__u32 comp_mask;
 	__u32 flow_handle;
 };
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 struct ib_uverbs_create_srq {
 	__u64 response;

init/main.c+2−0

 #include <linux/elevator.h>
 #include <linux/sched_clock.h>
 #include <linux/context_tracking.h>
+#include <linux/random.h>
 #include <asm/io.h>
 #include <asm/bugs.h>
 	do_ctors();
 	usermodehelper_enable();
 	do_initcalls();
+	random_int_secret_init();
 }
 static void __init do_pre_smp_initcalls(void)

ipc/sem.c+29−13

 	sem_lock(sma, NULL, -1);
+	if (sma->sem_perm.deleted) {
+		sem_unlock(sma, -1);
+		rcu_read_unlock();
+		return -EIDRM;
+	}
 	curr = &sma->sem_base[semnum];
 	ipc_assert_locked_object(&sma->sem_perm);
 		int i;
 		sem_lock(sma, NULL, -1);
+		if (sma->sem_perm.deleted) {
+			err = -EIDRM;
+			goto out_unlock;
+		}
 		if(nsems > SEMMSL_FAST) {
 			if (!ipc_rcu_getref(sma)) {
-				sem_unlock(sma, -1);
-				rcu_read_unlock();
 				err = -EIDRM;
-				goto out_free;
+				goto out_unlock;
 			}
 			sem_unlock(sma, -1);
 			rcu_read_unlock();
 			rcu_read_lock();
 			sem_lock_and_putref(sma);
 			if (sma->sem_perm.deleted) {
-				sem_unlock(sma, -1);
-				rcu_read_unlock();
 				err = -EIDRM;
-				goto out_free;
+				goto out_unlock;
 			}
 		}
 		for (i = 0; i < sma->sem_nsems; i++)
 		struct sem_undo *un;
 		if (!ipc_rcu_getref(sma)) {
-			rcu_read_unlock();
+			err = -EIDRM;
-			return -EIDRM;
+			goto out_rcu_wakeup;
 		}
 		rcu_read_unlock();
 		rcu_read_lock();
 		sem_lock_and_putref(sma);
 		if (sma->sem_perm.deleted) {
-			sem_unlock(sma, -1);
-			rcu_read_unlock();
 			err = -EIDRM;
-			goto out_free;
+			goto out_unlock;
 		}
 		for (i = 0; i < nsems; i++)
 		goto out_rcu_wakeup;
 	sem_lock(sma, NULL, -1);
+	if (sma->sem_perm.deleted) {
+		err = -EIDRM;
+		goto out_unlock;
+	}
 	curr = &sma->sem_base[semnum];
 	switch (cmd) {
 	if (error)
 		goto out_rcu_wakeup;
+	error = -EIDRM;
+	locknum = sem_lock(sma, sops, nsops);
+	if (sma->sem_perm.deleted)
+		goto out_unlock_free;
 	/*
 	 * semid identifiers are not unique - find_alloc_undo may have
 	 * allocated an undo structure, it was invalidated by an RMID
 	 * This case can be detected checking un->semid. The existence of
 	 * "un" itself is guaranteed by rcu.
 	 */
-	error = -EIDRM;
-	locknum = sem_lock(sma, sops, nsops);
 	if (un && un->semid == -1)
 		goto out_unlock_free;
 		}
 		sem_lock(sma, NULL, -1);
+		/* exit_sem raced with IPC_RMID, nothing to do */
+		if (sma->sem_perm.deleted) {
+			sem_unlock(sma, -1);
+			rcu_read_unlock();
+			continue;
+		}
 		un = __lookup_undo(ulp, semid);
 		if (un == NULL) {
 			/* exit_sem raced with IPC_RMID+semget() that created

ipc/util.c+21−6

@@ -17,12 +17,27 @@ · 16 unmodified lines
17	* Pavel Emelianov <xemul@openvz.org>	17	* Pavel Emelianov <xemul@openvz.org>
18	*	18	*
19	* General sysv ipc locking scheme:	19	* General sysv ipc locking scheme:
20	* when doing ipc id lookups, take the ids->rwsem	20	* rcu_read_lock()
21	* rcu_read_lock()	21	* obtain the ipc object (kern_ipc_perm) by looking up the id in an idr
22	* obtain the ipc object (kern_ipc_perm)	22	* tree.
23	* perform security, capabilities, auditing and permission checks, etc.	23	* - perform initial checks (capabilities, auditing and permission,
24	* acquire the ipc lock (kern_ipc_perm.lock) throught ipc_lock_object()	24	* etc).
25	* perform data updates (ie: SET, RMID, LOCK/UNLOCK commands)	25	* - perform read-only operations, such as STAT, INFO commands.
		26	* acquire the ipc lock (kern_ipc_perm.lock) through
		27	* ipc_lock_object()
		28	* - perform data updates, such as SET, RMID commands and
		29	* mechanism-specific operations (semop/semtimedop,
		30	* msgsnd/msgrcv, shmat/shmdt).
		31	* drop the ipc lock, through ipc_unlock_object().
		32	* rcu_read_unlock()
		33	*
		34	* The ids->rwsem must be taken when:
		35	* - creating, removing and iterating the existing entries in ipc
		36	* identifier sets.
		37	* - iterating through files under /proc/sysvipc/
		38	*
		39	* Note that sems have a special fast path that avoids kern_ipc_perm.lock -
		40	* see sem_lock().
26	*/	41	*/
27		42
28	#include <linux/mm.h>	43	#include <linux/mm.h>

kernel/cgroup.c+6−8

@@ -2039,7 +2039,7 @@ static int cgroup_attach_task(struct cgroup cgrp, struct task_struct tsk, · 2038 unmodified lines
2039		2039
2040	/* @tsk either already exited or can't exit until the end */	2040	/* @tsk either already exited or can't exit until the end */
2041	if (tsk->flags & PF_EXITING)	2041	if (tsk->flags & PF_EXITING)
2042	continue;	2042	goto next;
2043		2043
2044	/* as per above, nr_threads may decrease, but not increase. */	2044	/* as per above, nr_threads may decrease, but not increase. */
2045	BUG_ON(i >= group_size);	2045	BUG_ON(i >= group_size);
@@ -2047,7 +2047,7 @@ static int cgroup_attach_task(struct cgroup cgrp, struct task_struct tsk, · 1 unmodified line
2047	ent.cgrp = task_cgroup_from_root(tsk, root);	2047	ent.cgrp = task_cgroup_from_root(tsk, root);
2048	/* nothing to do if this task is already in the cgroup */	2048	/* nothing to do if this task is already in the cgroup */
2049	if (ent.cgrp == cgrp)	2049	if (ent.cgrp == cgrp)
2050	continue;	2050	goto next;
2051	/*	2051	/*
2052	* saying GFP_ATOMIC has no effect here because we did prealloc	2052	* saying GFP_ATOMIC has no effect here because we did prealloc
2053	* earlier, but it's good form to communicate our expectations.	2053	* earlier, but it's good form to communicate our expectations.
@@ -2055,7 +2055,7 @@ static int cgroup_attach_task(struct cgroup cgrp, struct task_struct tsk, · 1 unmodified line
2055	retval = flex_array_put(group, i, &ent, GFP_ATOMIC);	2055	retval = flex_array_put(group, i, &ent, GFP_ATOMIC);
2056	BUG_ON(retval != 0);	2056	BUG_ON(retval != 0);
2057	i++;	2057	i++;
2058		2058	next:
2059	if (!threadgroup)	2059	if (!threadgroup)
2060	break;	2060	break;
2061	} while_each_thread(leader, tsk);	2061	} while_each_thread(leader, tsk);
@@ -3188,11 +3188,9 @@ css_next_descendant_post(struct cgroup_subsys_state *pos, · 1126 unmodified lines
3188		3188
3189	WARN_ON_ONCE(!rcu_read_lock_held());	3189	WARN_ON_ONCE(!rcu_read_lock_held());
3190		3190
3191	/* if first iteration, visit the leftmost descendant */	3191	/* if first iteration, visit leftmost descendant which may be @root */
3192	if (!pos) {	3192	if (!pos)
3193	next = css_leftmost_descendant(root);	3193	return css_leftmost_descendant(root);
3194	return next != root ? next : NULL;
3195	}
3196		3194
3197	/* if we visited @root, we're done */	3195	/* if we visited @root, we're done */
3198	if (pos == root)	3196	if (pos == root)

kernel/events/core.c+3−3

@@ -7234,15 +7234,15 @@ void perf_pmu_migrate_context(struct pmu *pmu, int src_cpu, int dst_cpu) · 7233 unmodified lines
7234	perf_remove_from_context(event);	7234	perf_remove_from_context(event);
7235	unaccount_event_cpu(event, src_cpu);	7235	unaccount_event_cpu(event, src_cpu);
7236	put_ctx(src_ctx);	7236	put_ctx(src_ctx);
7237	list_add(&event->event_entry, &events);	7237	list_add(&event->migrate_entry, &events);
7238	}	7238	}
7239	mutex_unlock(&src_ctx->mutex);	7239	mutex_unlock(&src_ctx->mutex);
7240		7240
7241	synchronize_rcu();	7241	synchronize_rcu();
7242		7242
7243	mutex_lock(&dst_ctx->mutex);	7243	mutex_lock(&dst_ctx->mutex);
7244	list_for_each_entry_safe(event, tmp, &events, event_entry) {	7244	list_for_each_entry_safe(event, tmp, &events, migrate_entry) {
7245	list_del(&event->event_entry);	7245	list_del(&event->migrate_entry);
7246	if (event->state >= PERF_EVENT_STATE_OFF)	7246	if (event->state >= PERF_EVENT_STATE_OFF)
7247	event->state = PERF_EVENT_STATE_INACTIVE;	7247	event->state = PERF_EVENT_STATE_INACTIVE;
7248	account_event_cpu(event, dst_cpu);	7248	account_event_cpu(event, dst_cpu);

kernel/power/snapshot.c+4−1

 	struct memory_bitmap *bm1, *bm2;
 	int error = 0;
-	BUG_ON(forbidden_pages_map || free_pages_map);
+	if (forbidden_pages_map && free_pages_map)
+		return 0;
+	else
+		BUG_ON(forbidden_pages_map || free_pages_map);
 	bm1 = kzalloc(sizeof(struct memory_bitmap), GFP_KERNEL);
 	if (!bm1)

kernel/power/user.c+8−0

 	char frozen;
 	char ready;
 	char platform_support;
+	bool free_bitmaps;
 } snapshot_state;
 atomic_t snapshot_device_available = ATOMIC_INIT(1);
 		data->swap = -1;
 		data->mode = O_WRONLY;
 		error = pm_notifier_call_chain(PM_RESTORE_PREPARE);
+		if (!error) {
+			error = create_basic_memory_bitmaps();
+			data->free_bitmaps = !error;
+		}
 		if (error)
 			pm_notifier_call_chain(PM_POST_RESTORE);
 	}
 		pm_restore_gfp_mask();
 		free_basic_memory_bitmaps();
 		thaw_processes();
+	} else if (data->free_bitmaps) {
+		free_basic_memory_bitmaps();
 	}
 	pm_notifier_call_chain(data->mode == O_RDONLY ?
 			PM_POST_HIBERNATION : PM_POST_RESTORE);
 			break;
 		pm_restore_gfp_mask();
 		free_basic_memory_bitmaps();
+		data->free_bitmaps = false;
 		thaw_processes();
 		data->frozen = 0;
 		break;

kernel/softirq.c+12−3

 static inline void invoke_softirq(void)
 {
-	if (!force_irqthreads)
+	if (!force_irqthreads) {
-		__do_softirq();
+		/*
-	else
+		 * We can safely execute softirq on the current stack if
+		 * it is the irq stack, because it should be near empty
+		 * at this stage. But we have no way to know if the arch
+		 * calls irq_exit() on the irq stack. So call softirq
+		 * in its own stack to prevent from any overrun on top
+		 * of a potentially deep task stack.
+		 */
+		do_softirq();
+	} else {
 		wakeup_softirqd();
+	}
 }
 static inline void tick_irq_exit(void)

lib/kobject.c+1−1

@@ -592,7 +592,7 @@ static void kobject_release(struct kref *kref) · 591 unmodified lines
592	{	592	{
593	struct kobject *kobj = container_of(kref, struct kobject, kref);	593	struct kobject *kobj = container_of(kref, struct kobject, kref);
594	#ifdef CONFIG_DEBUG_KOBJECT_RELEASE	594	#ifdef CONFIG_DEBUG_KOBJECT_RELEASE
595	pr_debug("kobject: '%s' (%p): %s, parent %p (delayed)\n",	595	pr_info("kobject: '%s' (%p): %s, parent %p (delayed)\n",
596	kobject_name(kobj), kobj, __func__, kobj->parent);	596	kobject_name(kobj), kobj, __func__, kobj->parent);
597	INIT_DELAYED_WORK(&kobj->release, kobject_delayed_cleanup);	597	INIT_DELAYED_WORK(&kobj->release, kobject_delayed_cleanup);
598	schedule_delayed_work(&kobj->release, HZ);	598	schedule_delayed_work(&kobj->release, HZ);

lib/percpu-refcount.c+3−0

 	ref->release = release;
 	return 0;
 }
+EXPORT_SYMBOL_GPL(percpu_ref_init);
 /**
  * percpu_ref_cancel_init - cancel percpu_ref_init()
 		free_percpu(ref->pcpu_count);
 	}
 }
+EXPORT_SYMBOL_GPL(percpu_ref_cancel_init);
 static void percpu_ref_kill_rcu(struct rcu_head *rcu)
 {
 	call_rcu_sched(&ref->rcu, percpu_ref_kill_rcu);
 }
+EXPORT_SYMBOL_GPL(percpu_ref_kill_and_confirm);

mm/Kconfig+1−1

@@ -183,7 +183,7 @@ config MEMORY_HOTPLUG_SPARSE · 182 unmodified lines
183	config MEMORY_HOTREMOVE	183	config MEMORY_HOTREMOVE
184	bool "Allow for memory hot remove"	184	bool "Allow for memory hot remove"
185	select MEMORY_ISOLATION	185	select MEMORY_ISOLATION
186	select HAVE_BOOTMEM_INFO_NODE if X86_64	186	select HAVE_BOOTMEM_INFO_NODE if (X86_64 \|\| PPC64)
187	depends on MEMORY_HOTPLUG && ARCH_ENABLE_MEMORY_HOTREMOVE	187	depends on MEMORY_HOTPLUG && ARCH_ENABLE_MEMORY_HOTREMOVE
188	depends on MIGRATION	188	depends on MIGRATION
189		189

mm/filemap.c+1−10

 	struct inode *inode = mapping->host;
 	pgoff_t offset = vmf->pgoff;
 	struct page *page;
-	bool memcg_oom;
 	pgoff_t size;
 	int ret = 0;
 		return VM_FAULT_SIGBUS;
 	/*
-	 * Do we have something in the page cache already?  Either
+	 * Do we have something in the page cache already?
-	 * way, try readahead, but disable the memcg OOM killer for it
-	 * as readahead is optional and no errors are propagated up
-	 * the fault stack.  The OOM killer is enabled while trying to
-	 * instantiate the faulting page individually below.
 	 */
 	page = find_get_page(mapping, offset);
 	if (likely(page) && !(vmf->flags & FAULT_FLAG_TRIED)) {
 		 * We found the page, so try async readahead before
 		 * waiting for the lock.
 		 */
-		memcg_oom = mem_cgroup_toggle_oom(false);
 		do_async_mmap_readahead(vma, ra, file, page, offset);
-		mem_cgroup_toggle_oom(memcg_oom);
 	} else if (!page) {
 		/* No page in the page cache at all */
-		memcg_oom = mem_cgroup_toggle_oom(false);
 		do_sync_mmap_readahead(vma, ra, file, offset);
-		mem_cgroup_toggle_oom(memcg_oom);
 		count_vm_event(PGMAJFAULT);
 		mem_cgroup_count_vm_event(vma->vm_mm, PGMAJFAULT);
 		ret = VM_FAULT_MAJOR;

mm/huge_memory.c+9−1

@@ -2697,6 +2697,7 @@ void __split_huge_page_pmd(struct vm_area_struct *vma, unsigned long address, · 2696 unmodified lines
2697		2697
2698	mmun_start = haddr;	2698	mmun_start = haddr;
2699	mmun_end = haddr + HPAGE_PMD_SIZE;	2699	mmun_end = haddr + HPAGE_PMD_SIZE;
		2700	again:
2700	mmu_notifier_invalidate_range_start(mm, mmun_start, mmun_end);	2701	mmu_notifier_invalidate_range_start(mm, mmun_start, mmun_end);
2701	spin_lock(&mm->page_table_lock);	2702	spin_lock(&mm->page_table_lock);
2702	if (unlikely(!pmd_trans_huge(*pmd))) {	2703	if (unlikely(!pmd_trans_huge(*pmd))) {
@@ -2719,7 +2720,14 @@ void __split_huge_page_pmd(struct vm_area_struct *vma, unsigned long address, · 16 unmodified lines
2719	split_huge_page(page);	2720	split_huge_page(page);
2720		2721
2721	put_page(page);	2722	put_page(page);
2722	BUG_ON(pmd_trans_huge(*pmd));	2723
		2724	/*
		2725	* We don't always have down_write of mmap_sem here: a racing
		2726	* do_huge_pmd_wp_page() might have copied-on-write to another
		2727	* huge page before our split_huge_page() got the anon_vma lock.
		2728	*/
		2729	if (unlikely(pmd_trans_huge(*pmd)))
		2730	goto again;
2723	}	2731	}
2724		2732
2725	void split_huge_page_pmd_mm(struct mm_struct *mm, unsigned long address,	2733	void split_huge_page_pmd_mm(struct mm_struct *mm, unsigned long address,

mm/hugetlb.c+16−1

 	BUG_ON(page_count(page));
 	BUG_ON(page_mapcount(page));
 	restore_reserve = PagePrivate(page);
+	ClearPagePrivate(page);
 	spin_lock(&hugetlb_lock);
 	hugetlb_cgroup_uncharge_page(hstate_index(h),
 	/* we rely on prep_new_huge_page to set the destructor */
 	set_compound_order(page, order);
 	__SetPageHead(page);
+	__ClearPageReserved(page);
 	for (i = 1; i < nr_pages; i++, p = mem_map_next(p, page, i)) {
 		__SetPageTail(p);
+		/*
+		 * For gigantic hugepages allocated through bootmem at
+		 * boot, it's safer to be consistent with the not-gigantic
+		 * hugepages and clear the PG_reserved bit from all tail pages
+		 * too.  Otherwse drivers using get_user_pages() to access tail
+		 * pages may get the reference counting wrong if they see
+		 * PG_reserved set on a tail page (despite the head page not
+		 * having PG_reserved set).  Enforcing this consistency between
+		 * head and tail pages allows drivers to optimize away a check
+		 * on the head page when they need know if put_page() is needed
+		 * after get_user_pages().
+		 */
+		__ClearPageReserved(p);
 		set_page_count(p, 0);
 		p->first_page = page;
 	}
 #else
 		page = virt_to_page(m);
 #endif
-		__ClearPageReserved(page);
 		WARN_ON(page_count(page) != 1);
 		prep_compound_huge_page(page, h->order);
+		WARN_ON(PageReserved(page));
 		prep_new_huge_page(h, page, page_to_nid(page));
 		/*
 		 * If we had gigantic hugepages allocated at boot time, we need

mm/memcontrol.c+55−88

@@ -866,6 +866,7 @@ static unsigned long mem_cgroup_read_events(struct mem_cgroup *memcg, · 865 unmodified lines
866	unsigned long val = 0;	866	unsigned long val = 0;
867	int cpu;	867	int cpu;
868		868
		869	get_online_cpus();
869	for_each_online_cpu(cpu)	870	for_each_online_cpu(cpu)
870	val += per_cpu(memcg->stat->events[idx], cpu);	871	val += per_cpu(memcg->stat->events[idx], cpu);
871	#ifdef CONFIG_HOTPLUG_CPU	872	#ifdef CONFIG_HOTPLUG_CPU
@@ -873,6 +874,7 @@ static unsigned long mem_cgroup_read_events(struct mem_cgroup *memcg, · 1 unmodified line
873	val += memcg->nocpu_base.events[idx];	874	val += memcg->nocpu_base.events[idx];
874	spin_unlock(&memcg->pcp_counter_lock);	875	spin_unlock(&memcg->pcp_counter_lock);
875	#endif	876	#endif
		877	put_online_cpus();
876	return val;	878	return val;
877	}	879	}
878		880
@@ -2159,110 +2161,59 @@ static void memcg_oom_recover(struct mem_cgroup *memcg) · 1280 unmodified lines
2159	memcg_wakeup_oom(memcg);	2161	memcg_wakeup_oom(memcg);
2160	}	2162	}
2161		2163
2162	/*
2163	* try to call OOM killer
2164	*/
2165	static void mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order)	2164	static void mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order)
2166	{	2165	{
2167	bool locked;
2168	int wakeups;
2169
2170	if (!current->memcg_oom.may_oom)	2166	if (!current->memcg_oom.may_oom)
2171	return;	2167	return;
2172
2173	current->memcg_oom.in_memcg_oom = 1;
2174
2175	/*	2168	/*
2176	* As with any blocking lock, a contender needs to start	2169	* We are in the middle of the charge context here, so we
2177	* listening for wakeups before attempting the trylock,	2170	* don't want to block when potentially sitting on a callstack
2178	* otherwise it can miss the wakeup from the unlock and sleep	2171	* that holds all kinds of filesystem and mm locks.
2179	* indefinitely. This is just open-coded because our locking	2172	*
2180	* is so particular to memcg hierarchies.	2173	* Also, the caller may handle a failed allocation gracefully
		2174	* (like optional page cache readahead) and so an OOM killer
		2175	* invocation might not even be necessary.
		2176	*
		2177	* That's why we don't do anything here except remember the
		2178	* OOM context and then deal with it at the end of the page
		2179	* fault when the stack is unwound, the locks are released,
		2180	* and when we know whether the fault was overall successful.
2181	*/	2181	*/
2182	wakeups = atomic_read(&memcg->oom_wakeups);	2182	css_get(&memcg->css);
2183	mem_cgroup_mark_under_oom(memcg);	2183	current->memcg_oom.memcg = memcg;
2184		2184	current->memcg_oom.gfp_mask = mask;
2185	locked = mem_cgroup_oom_trylock(memcg);	2185	current->memcg_oom.order = order;
2186
2187	if (locked)
2188	mem_cgroup_oom_notify(memcg);
2189
2190	if (locked && !memcg->oom_kill_disable) {
2191	mem_cgroup_unmark_under_oom(memcg);
2192	mem_cgroup_out_of_memory(memcg, mask, order);
2193	mem_cgroup_oom_unlock(memcg);
2194	/*
2195	* There is no guarantee that an OOM-lock contender
2196	* sees the wakeups triggered by the OOM kill
2197	* uncharges. Wake any sleepers explicitely.
2198	*/
2199	memcg_oom_recover(memcg);
2200	} else {
2201	/*
2202	* A system call can just return -ENOMEM, but if this
2203	* is a page fault and somebody else is handling the
2204	* OOM already, we need to sleep on the OOM waitqueue
2205	* for this memcg until the situation is resolved.
2206	* Which can take some time because it might be
2207	* handled by a userspace task.
2208	*
2209	* However, this is the charge context, which means
2210	* that we may sit on a large call stack and hold
2211	* various filesystem locks, the mmap_sem etc. and we
2212	* don't want the OOM handler to deadlock on them
2213	* while we sit here and wait. Store the current OOM
2214	* context in the task_struct, then return -ENOMEM.
2215	* At the end of the page fault handler, with the
2216	* stack unwound, pagefault_out_of_memory() will check
2217	* back with us by calling
2218	* mem_cgroup_oom_synchronize(), possibly putting the
2219	* task to sleep.
2220	*/
2221	current->memcg_oom.oom_locked = locked;
2222	current->memcg_oom.wakeups = wakeups;
2223	css_get(&memcg->css);
2224	current->memcg_oom.wait_on_memcg = memcg;
2225	}
2226	}	2186	}
2227		2187
2228	/**	2188	/**
2229	* mem_cgroup_oom_synchronize - complete memcg OOM handling	2189	* mem_cgroup_oom_synchronize - complete memcg OOM handling
		2190	* @handle: actually kill/wait or just clean up the OOM state
2230	*	2191	*
2231	* This has to be called at the end of a page fault if the the memcg	2192	* This has to be called at the end of a page fault if the memcg OOM
2232	* OOM handler was enabled and the fault is returning %VM_FAULT_OOM.	2193	* handler was enabled.
2233	*	2194	*
2234	* Memcg supports userspace OOM handling, so failed allocations must	2195	* Memcg supports userspace OOM handling where failed allocations must
2235	* sleep on a waitqueue until the userspace task resolves the	2196	* sleep on a waitqueue until the userspace task resolves the
2236	* situation. Sleeping directly in the charge context with all kinds	2197	* situation. Sleeping directly in the charge context with all kinds
2237	* of locks held is not a good idea, instead we remember an OOM state	2198	* of locks held is not a good idea, instead we remember an OOM state
2238	* in the task and mem_cgroup_oom_synchronize() has to be called at	2199	* in the task and mem_cgroup_oom_synchronize() has to be called at
2239	* the end of the page fault to put the task to sleep and clean up the	2200	* the end of the page fault to complete the OOM handling.
2240	* OOM state.
2241	*	2201	*
2242	* Returns %true if an ongoing memcg OOM situation was detected and	2202	* Returns %true if an ongoing memcg OOM situation was detected and
2243	* finalized, %false otherwise.	2203	* completed, %false otherwise.
2244	*/	2204	*/
2245	bool mem_cgroup_oom_synchronize(void)	2205	bool mem_cgroup_oom_synchronize(bool handle)
2246	{	2206	{
		2207	struct mem_cgroup *memcg = current->memcg_oom.memcg;
2247	struct oom_wait_info owait;	2208	struct oom_wait_info owait;
2248	struct mem_cgroup *memcg;	2209	bool locked;
2249		2210
2250	/* OOM is global, do not handle */	2211	/* OOM is global, do not handle */
2251	if (!current->memcg_oom.in_memcg_oom)
2252	return false;
2253
2254	/*
2255	* We invoked the OOM killer but there is a chance that a kill
2256	* did not free up any charges. Everybody else might already
2257	* be sleeping, so restart the fault and keep the rampage
2258	* going until some charges are released.
2259	*/
2260	memcg = current->memcg_oom.wait_on_memcg;
2261	if (!memcg)	2212	if (!memcg)
2262	goto out;	2213	return false;
2263		2214
2264	if (test_thread_flag(TIF_MEMDIE) \|\| fatal_signal_pending(current))	2215	if (!handle)
2265	goto out_memcg;	2216	goto cleanup;
2266		2217
2267	owait.memcg = memcg;	2218	owait.memcg = memcg;
2268	owait.wait.flags = 0;	2219	owait.wait.flags = 0;
@@ -2271,13 +2222,25 @@ bool mem_cgroup_oom_synchronize(void) · 2 unmodified lines
2271	INIT_LIST_HEAD(&owait.wait.task_list);	2222	INIT_LIST_HEAD(&owait.wait.task_list);
2272		2223
2273	prepare_to_wait(&memcg_oom_waitq, &owait.wait, TASK_KILLABLE);	2224	prepare_to_wait(&memcg_oom_waitq, &owait.wait, TASK_KILLABLE);
2274	/* Only sleep if we didn't miss any wakeups since OOM */	2225	mem_cgroup_mark_under_oom(memcg);
2275	if (atomic_read(&memcg->oom_wakeups) == current->memcg_oom.wakeups)	2226
		2227	locked = mem_cgroup_oom_trylock(memcg);
		2228
		2229	if (locked)
		2230	mem_cgroup_oom_notify(memcg);
		2231
		2232	if (locked && !memcg->oom_kill_disable) {
		2233	mem_cgroup_unmark_under_oom(memcg);
		2234	finish_wait(&memcg_oom_waitq, &owait.wait);
		2235	mem_cgroup_out_of_memory(memcg, current->memcg_oom.gfp_mask,
		2236	current->memcg_oom.order);
		2237	} else {
2276	schedule();	2238	schedule();
2277	finish_wait(&memcg_oom_waitq, &owait.wait);	2239	mem_cgroup_unmark_under_oom(memcg);
2278	out_memcg:	2240	finish_wait(&memcg_oom_waitq, &owait.wait);
2279	mem_cgroup_unmark_under_oom(memcg);	2241	}
2280	if (current->memcg_oom.oom_locked) {	2242
		2243	if (locked) {
2281	mem_cgroup_oom_unlock(memcg);	2244	mem_cgroup_oom_unlock(memcg);
2282	/*	2245	/*
2283	* There is no guarantee that an OOM-lock contender	2246	* There is no guarantee that an OOM-lock contender
@@ -2286,10 +2249,9 @@ out_memcg: · 2 unmodified lines
2286	*/	2249	*/
2287	memcg_oom_recover(memcg);	2250	memcg_oom_recover(memcg);
2288	}	2251	}
		2252	cleanup:
		2253	current->memcg_oom.memcg = NULL;
2289	css_put(&memcg->css);	2254	css_put(&memcg->css);
2290	current->memcg_oom.wait_on_memcg = NULL;
2291	out:
2292	current->memcg_oom.in_memcg_oom = 0;
2293	return true;	2255	return true;
2294	}	2256	}
2295		2257
@@ -2703,6 +2665,9 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm, · 407 unmodified lines
2703	\|\| fatal_signal_pending(current)))	2665	\|\| fatal_signal_pending(current)))
2704	goto bypass;	2666	goto bypass;
2705		2667
		2668	if (unlikely(task_in_memcg_oom(current)))
		2669	goto bypass;
		2670
2706	/*	2671	/*
2707	* We always charge the cgroup the mm_struct belongs to.	2672	* We always charge the cgroup the mm_struct belongs to.
2708	* The mm_struct's mem_cgroup changes on task migration if the	2673	* The mm_struct's mem_cgroup changes on task migration if the
@@ -2801,6 +2766,8 @@ done: · 92 unmodified lines
2801	return 0;	2766	return 0;
2802	nomem:	2767	nomem:
2803	*ptr = NULL;	2768	*ptr = NULL;
		2769	if (gfp_mask & __GFP_NOFAIL)
		2770	return 0;
2804	return -ENOMEM;	2771	return -ENOMEM;
2805	bypass:	2772	bypass:
2806	*ptr = root_mem_cgroup;	2773	*ptr = root_mem_cgroup;

mm/memory.c+14−6

@@ -837,6 +837,8 @@ copy_one_pte(struct mm_struct dst_mm, struct mm_struct src_mm, · 836 unmodified lines
837	*/	837	*/
838	make_migration_entry_read(&entry);	838	make_migration_entry_read(&entry);
839	pte = swp_entry_to_pte(entry);	839	pte = swp_entry_to_pte(entry);
		840	if (pte_swp_soft_dirty(*src_pte))
		841	pte = pte_swp_mksoft_dirty(pte);
840	set_pte_at(src_mm, addr, src_pte, pte);	842	set_pte_at(src_mm, addr, src_pte, pte);
841	}	843	}
842	}	844	}
@@ -3863,15 +3865,21 @@ int handle_mm_fault(struct mm_struct mm, struct vm_area_struct vma, · 3020 unmodified lines
3863	* space. Kernel faults are handled more gracefully.	3865	* space. Kernel faults are handled more gracefully.
3864	*/	3866	*/
3865	if (flags & FAULT_FLAG_USER)	3867	if (flags & FAULT_FLAG_USER)
3866	mem_cgroup_enable_oom();	3868	mem_cgroup_oom_enable();
3867		3869
3868	ret = __handle_mm_fault(mm, vma, address, flags);	3870	ret = __handle_mm_fault(mm, vma, address, flags);
3869		3871
3870	if (flags & FAULT_FLAG_USER)	3872	if (flags & FAULT_FLAG_USER) {
3871	mem_cgroup_disable_oom();	3873	mem_cgroup_oom_disable();
3872		3874	/*
3873	if (WARN_ON(task_in_memcg_oom(current) && !(ret & VM_FAULT_OOM)))	3875	* The task may have entered a memcg OOM situation but
3874	mem_cgroup_oom_synchronize();	3876	* if the allocation error was handled gracefully (no
		3877	* VM_FAULT_OOM), there is no need to kill anything.
		3878	* Just clean up the OOM state peacefully.
		3879	*/
		3880	if (task_in_memcg_oom(current) && !(ret & VM_FAULT_OOM))
		3881	mem_cgroup_oom_synchronize(false);
		3882	}
3875		3883
3876	return ret;	3884	return ret;
3877	}	3885	}

mm/migrate.c+2−0

@@ -161,6 +161,8 @@ static int remove_migration_pte(struct page new, struct vm_area_struct vma, · 160 unmodified lines
161		161
162	get_page(new);	162	get_page(new);
163	pte = pte_mkold(mk_pte(new, vma->vm_page_prot));	163	pte = pte_mkold(mk_pte(new, vma->vm_page_prot));
		164	if (pte_swp_soft_dirty(*ptep))
		165	pte = pte_mksoft_dirty(pte);
164	if (is_write_migration_entry(entry))	166	if (is_write_migration_entry(entry))
165	pte = pte_mkwrite(pte);	167	pte = pte_mkwrite(pte);
166	#ifdef CONFIG_HUGETLB_PAGE	168	#ifdef CONFIG_HUGETLB_PAGE

mm/mprotect.c+5−2

 			swp_entry_t entry = pte_to_swp_entry(oldpte);
 			if (is_write_migration_entry(entry)) {
+				pte_t newpte;
 				/*
 				 * A protection check is difficult so
 				 * just be safe and disable write
 				 */
 				make_migration_entry_read(&entry);
-				set_pte_at(mm, addr, pte,
+				newpte = swp_entry_to_pte(entry);
-					swp_entry_to_pte(entry));
+				if (pte_swp_soft_dirty(oldpte))
+					newpte = pte_swp_mksoft_dirty(newpte);
+				set_pte_at(mm, addr, pte, newpte);
 			}
 			pages++;
 		}

mm/mremap.c+1−4

 #include <asm/uaccess.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
-#include <asm/pgalloc.h>
 #include "internal.h"
 		return NULL;
 	pmd = pmd_alloc(mm, pud, addr);
-	if (!pmd) {
+	if (!pmd)
-		pud_free(mm, pud);
 		return NULL;
-	}
 	VM_BUG_ON(pmd_trans_huge(*pmd));

mm/oom_kill.c+1−1

@@ -680,7 +680,7 @@ void pagefault_out_of_memory(void) · 679 unmodified lines
680	{	680	{
681	struct zonelist *zonelist;	681	struct zonelist *zonelist;
682		682
683	if (mem_cgroup_oom_synchronize())	683	if (mem_cgroup_oom_synchronize(true))
684	return;	684	return;
685		685
686	zonelist = node_zonelist(first_online_node, GFP_KERNEL);	686	zonelist = node_zonelist(first_online_node, GFP_KERNEL);

mm/page-writeback.c+5−5

@@ -1210,11 +1210,11 @@ static unsigned long dirty_poll_interval(unsigned long dirty, · 1209 unmodified lines
1210	return 1;	1210	return 1;
1211	}	1211	}
1212		1212
1213	static long bdi_max_pause(struct backing_dev_info *bdi,	1213	static unsigned long bdi_max_pause(struct backing_dev_info *bdi,
1214	unsigned long bdi_dirty)	1214	unsigned long bdi_dirty)
1215	{	1215	{
1216	long bw = bdi->avg_write_bandwidth;	1216	unsigned long bw = bdi->avg_write_bandwidth;
1217	long t;	1217	unsigned long t;
1218		1218
1219	/*	1219	/*
1220	* Limit pause time for small memory systems. If sleeping for too long	1220	* Limit pause time for small memory systems. If sleeping for too long
@@ -1226,7 +1226,7 @@ static long bdi_max_pause(struct backing_dev_info *bdi, · 5 unmodified lines
1226	t = bdi_dirty / (1 + bw / roundup_pow_of_two(1 + HZ / 8));	1226	t = bdi_dirty / (1 + bw / roundup_pow_of_two(1 + HZ / 8));
1227	t++;	1227	t++;
1228		1228
1229	return min_t(long, t, MAX_PAUSE);	1229	return min_t(unsigned long, t, MAX_PAUSE);
1230	}	1230	}
1231		1231
1232	static long bdi_min_pause(struct backing_dev_info *bdi,	1232	static long bdi_min_pause(struct backing_dev_info *bdi,

mm/slab_common.c+2−0

 			continue;
 		}
+#if !defined(CONFIG_SLUB) || !defined(CONFIG_SLUB_DEBUG_ON)
 		/*
 		 * For simplicity, we won't check this in the list of memcg
 		 * caches. We have control over memcg naming, and if there
 			s = NULL;
 			return -EINVAL;
 		}
+#endif
 	}
 	WARN_ON(strchr(name, ' '));	/* It confuses parsers */

mm/swapfile.c+3−1

 	struct filename *pathname;
 	int i, type, prev;
 	int err;
+	unsigned int old_block_size;
 	if (!capable(CAP_SYS_ADMIN))
 		return -EPERM;
 	}
 	swap_file = p->swap_file;
+	old_block_size = p->old_block_size;
 	p->swap_file = NULL;
 	p->max = 0;
 	swap_map = p->swap_map;
 	inode = mapping->host;
 	if (S_ISBLK(inode->i_mode)) {
 		struct block_device *bdev = I_BDEV(inode);
-		set_blocksize(bdev, p->old_block_size);
+		set_blocksize(bdev, old_block_size);
 		blkdev_put(bdev, FMODE_READ | FMODE_WRITE | FMODE_EXCL);
 	} else {
 		mutex_lock(&inode->i_mutex);

mm/vmscan.c+1−0

@@ -211,6 +211,7 @@ void unregister_shrinker(struct shrinker *shrinker) · 210 unmodified lines
211	down_write(&shrinker_rwsem);	211	down_write(&shrinker_rwsem);
212	list_del(&shrinker->list);	212	list_del(&shrinker->list);
213	up_write(&shrinker_rwsem);	213	up_write(&shrinker_rwsem);
		214	kfree(shrinker->nr_deferred);
214	}	215	}
215	EXPORT_SYMBOL(unregister_shrinker);	216	EXPORT_SYMBOL(unregister_shrinker);
216		217

mm/zswap.c+4−0

 	}
 	tree->rbroot = RB_ROOT;
 	spin_unlock(&tree->lock);
+	zbud_destroy_pool(tree->pool);
+	kfree(tree);
+	zswap_trees[type] = NULL;
 }
 static struct zbud_ops zswap_zbud_ops = {

net/bridge/br_fdb.c+2−2

@@ -700,7 +700,7 @@ int br_fdb_add(struct ndmsg ndm, struct nlattr tb[], · 699 unmodified lines
700		700
701	vid = nla_get_u16(tb[NDA_VLAN]);	701	vid = nla_get_u16(tb[NDA_VLAN]);
702		702
703	if (vid >= VLAN_N_VID) {	703	if (!vid \|\| vid >= VLAN_VID_MASK) {
704	pr_info("bridge: RTM_NEWNEIGH with invalid vlan id %d\n",	704	pr_info("bridge: RTM_NEWNEIGH with invalid vlan id %d\n",
705	vid);	705	vid);
706	return -EINVAL;	706	return -EINVAL;
@@ -794,7 +794,7 @@ int br_fdb_delete(struct ndmsg ndm, struct nlattr tb[], · 87 unmodified lines
794		794
795	vid = nla_get_u16(tb[NDA_VLAN]);	795	vid = nla_get_u16(tb[NDA_VLAN]);
796		796
797	if (vid >= VLAN_N_VID) {	797	if (!vid \|\| vid >= VLAN_VID_MASK) {
798	pr_info("bridge: RTM_NEWNEIGH with invalid vlan id %d\n",	798	pr_info("bridge: RTM_NEWNEIGH with invalid vlan id %d\n",
799	vid);	799	vid);
800	return -EINVAL;	800	return -EINVAL;

net/bridge/br_mdb.c+1−1

@@ -453,7 +453,7 @@ static int __br_mdb_del(struct net_bridge br, struct br_mdb_entry entry) · 452 unmodified lines
453	call_rcu_bh(&p->rcu, br_multicast_free_pg);	453	call_rcu_bh(&p->rcu, br_multicast_free_pg);
454	err = 0;	454	err = 0;
455		455
456	if (!mp->ports && !mp->mglist && mp->timer_armed &&	456	if (!mp->ports && !mp->mglist &&
457	netif_running(br->dev))	457	netif_running(br->dev))
458	mod_timer(&mp->timer, jiffies);	458	mod_timer(&mp->timer, jiffies);
459	break;	459	break;

net/bridge/br_multicast.c+26−12

 		del_timer(&p->timer);
 		call_rcu_bh(&p->rcu, br_multicast_free_pg);
-		if (!mp->ports && !mp->mglist && mp->timer_armed &&
+		if (!mp->ports && !mp->mglist &&
 		    netif_running(br->dev))
 			mod_timer(&mp->timer, jiffies);
 	mp->br = br;
 	mp->addr = *group;
 	setup_timer(&mp->timer, br_multicast_group_expired,
 		    (unsigned long)mp);
 	struct net_bridge_mdb_entry *mp;
 	struct net_bridge_port_group *p;
 	struct net_bridge_port_group __rcu **pp;
+	unsigned long now = jiffies;
 	int err;
 	spin_lock(&br->multicast_lock);
 	if (!port) {
 		mp->mglist = true;
+		mod_timer(&mp->timer, now + br->multicast_membership_interval);
 		goto out;
 	}
 	     (p = mlock_dereference(*pp, br)) != NULL;
 	     pp = &p->next) {
 		if (p->port == port)
-			goto out;
+			goto found;
 		if ((unsigned long)p->port < (unsigned long)port)
 			break;
 	}
 	rcu_assign_pointer(*pp, p);
 	br_mdb_notify(br->dev, port, group, RTM_NEWMDB);
+found:
+	mod_timer(&p->timer, now + br->multicast_membership_interval);
 out:
 	err = 0;
 	if (!mp)
 		goto out;
-	mod_timer(&mp->timer, now + br->multicast_membership_interval);
-	mp->timer_armed = true;
 	max_delay *= br->multicast_last_member_count;
 	if (mp->mglist &&
 	if (!mp)
 		goto out;
-	mod_timer(&mp->timer, now + br->multicast_membership_interval);
-	mp->timer_armed = true;
 	max_delay *= br->multicast_last_member_count;
 	if (mp->mglist &&
 	    (timer_pending(&mp->timer) ?
 			call_rcu_bh(&p->rcu, br_multicast_free_pg);
 			br_mdb_notify(br->dev, port, group, RTM_DELMDB);
-			if (!mp->ports && !mp->mglist && mp->timer_armed &&
+			if (!mp->ports && !mp->mglist &&
 			    netif_running(br->dev))
 				mod_timer(&mp->timer, jiffies);
 		}
 		     br->multicast_last_member_interval;
 	if (!port) {
-		if (mp->mglist && mp->timer_armed &&
+		if (mp->mglist &&
 		    (timer_pending(&mp->timer) ?
 		     time_after(mp->timer.expires, time) :
 		     try_to_del_timer_sync(&mp->timer) >= 0)) {
 			mod_timer(&mp->timer, time);
 		}
+		goto out;
+	}
+	for (p = mlock_dereference(mp->ports, br);
+	     p != NULL;
+	     p = mlock_dereference(p->next, br)) {
+		if (p->port != port)
+			continue;
+		if (!hlist_unhashed(&p->mglist) &&
+		    (timer_pending(&p->timer) ?
+		     time_after(p->timer.expires, time) :
+		     try_to_del_timer_sync(&p->timer) >= 0)) {
+			mod_timer(&p->timer, time);
+		}
+		break;
 	}
 out:
 	spin_unlock(&br->multicast_lock);
 		hlist_for_each_entry_safe(mp, n, &mdb->mhash[i],
 					  hlist[ver]) {
 			del_timer(&mp->timer);
-			mp->timer_armed = false;
 			call_rcu_bh(&mp->rcu, br_multicast_free_group);
 		}
 	}

net/bridge/br_netlink.c+1−1

@@ -243,7 +243,7 @@ static int br_afspec(struct net_bridge *br, · 242 unmodified lines
243		243
244	vinfo = nla_data(tb[IFLA_BRIDGE_VLAN_INFO]);	244	vinfo = nla_data(tb[IFLA_BRIDGE_VLAN_INFO]);
245		245
246	if (vinfo->vid >= VLAN_N_VID)	246	if (!vinfo->vid \|\| vinfo->vid >= VLAN_VID_MASK)
247	return -EINVAL;	247	return -EINVAL;
248		248
249	switch (cmd) {	249	switch (cmd) {

net/bridge/br_private.h+1−4

 	struct timer_list		timer;
 	struct br_ip			addr;
 	bool				mglist;
-	bool				timer_armed;
 };
 struct net_bridge_mdb_htable
 	 * vid wasn't set
 	 */
 	smp_rmb();
-	return (v->pvid & VLAN_TAG_PRESENT) ?
+	return v->pvid ?: VLAN_N_VID;
-			(v->pvid & ~VLAN_TAG_PRESENT) :
-			VLAN_N_VID;
 }
 #else

net/bridge/br_stp_if.c+1−1

@@ -134,7 +134,7 @@ static void br_stp_start(struct net_bridge *br) · 133 unmodified lines
134		134
135	if (br->bridge_forward_delay < BR_MIN_FORWARD_DELAY)	135	if (br->bridge_forward_delay < BR_MIN_FORWARD_DELAY)
136	__br_set_forward_delay(br, BR_MIN_FORWARD_DELAY);	136	__br_set_forward_delay(br, BR_MIN_FORWARD_DELAY);
137	else if (br->bridge_forward_delay < BR_MAX_FORWARD_DELAY)	137	else if (br->bridge_forward_delay > BR_MAX_FORWARD_DELAY)
138	__br_set_forward_delay(br, BR_MAX_FORWARD_DELAY);	138	__br_set_forward_delay(br, BR_MAX_FORWARD_DELAY);
139		139
140	if (r == 0) {	140	if (r == 0) {

net/bridge/br_vlan.c+67−58

@@ -45,37 +45,34 @@ static int __vlan_add(struct net_port_vlans *v, u16 vid, u16 flags) · 44 unmodified lines
45	return 0;	45	return 0;
46	}	46	}
47		47
48	if (vid) {	48	if (v->port_idx) {
49	if (v->port_idx) {	49	p = v->parent.port;
50	p = v->parent.port;	50	br = p->br;
51	br = p->br;	51	dev = p->dev;
52	dev = p->dev;	52	} else {
53	} else {	53	br = v->parent.br;
54	br = v->parent.br;	54	dev = br->dev;
55	dev = br->dev;	55	}
56	}	56	ops = dev->netdev_ops;
57	ops = dev->netdev_ops;	57
58		58	if (p && (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)) {
59	if (p && (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)) {	59	/* Add VLAN to the device filter if it is supported.
60	/* Add VLAN to the device filter if it is supported.	60	* Stricly speaking, this is not necessary now, since
61	* Stricly speaking, this is not necessary now, since	61	* devices are made promiscuous by the bridge, but if
62	* devices are made promiscuous by the bridge, but if	62	* that ever changes this code will allow tagged
63	* that ever changes this code will allow tagged	63	* traffic to enter the bridge.
64	* traffic to enter the bridge.	64	*/
65	*/	65	err = ops->ndo_vlan_rx_add_vid(dev, htons(ETH_P_8021Q),
66	err = ops->ndo_vlan_rx_add_vid(dev, htons(ETH_P_8021Q),	66	vid);
67	vid);	67	if (err)
68	if (err)	68	return err;
69	return err;	69	}
70	}
71
72	err = br_fdb_insert(br, p, dev->dev_addr, vid);
73	if (err) {
74	br_err(br, "failed insert local address into bridge "
75	"forwarding table\n");
76	goto out_filt;
77	}
78		70
		71	err = br_fdb_insert(br, p, dev->dev_addr, vid);
		72	if (err) {
		73	br_err(br, "failed insert local address into bridge "
		74	"forwarding table\n");
		75	goto out_filt;
79	}	76	}
80		77
81	set_bit(vid, v->vlan_bitmap);	78	set_bit(vid, v->vlan_bitmap);
@@ -98,7 +95,7 @@ static int __vlan_del(struct net_port_vlans *v, u16 vid) · 16 unmodified lines
98	__vlan_delete_pvid(v, vid);	95	__vlan_delete_pvid(v, vid);
99	clear_bit(vid, v->untagged_bitmap);	96	clear_bit(vid, v->untagged_bitmap);
100		97
101	if (v->port_idx && vid) {	98	if (v->port_idx) {
102	struct net_device *dev = v->parent.port->dev;	99	struct net_device *dev = v->parent.port->dev;
103	const struct net_device_ops *ops = dev->netdev_ops;	100	const struct net_device_ops *ops = dev->netdev_ops;
104		101
@@ -192,6 +189,8 @@ out: · 87 unmodified lines
192	bool br_allowed_ingress(struct net_bridge br, struct net_port_vlans v,	189	bool br_allowed_ingress(struct net_bridge br, struct net_port_vlans v,
193	struct sk_buff skb, u16 vid)	190	struct sk_buff skb, u16 vid)
194	{	191	{
		192	int err;
		193
195	/* If VLAN filtering is disabled on the bridge, all packets are	194	/* If VLAN filtering is disabled on the bridge, all packets are
196	* permitted.	195	* permitted.
197	*/	196	*/
@@ -204,20 +203,32 @@ bool br_allowed_ingress(struct net_bridge br, struct net_port_vlans v, · 6 unmodified lines
204	if (!v)	203	if (!v)
205	return false;	204	return false;
206		205
207	if (br_vlan_get_tag(skb, vid)) {	206	err = br_vlan_get_tag(skb, vid);
		207	if (!*vid) {
208	u16 pvid = br_get_pvid(v);	208	u16 pvid = br_get_pvid(v);
209		209
210	/* Frame did not have a tag. See if pvid is set	210	/* Frame had a tag with VID 0 or did not have a tag.
211	* on this port. That tells us which vlan untagged	211	* See if pvid is set on this port. That tells us which
212	* traffic belongs to.	212	* vlan untagged or priority-tagged traffic belongs to.
213	*/	213	*/
214	if (pvid == VLAN_N_VID)	214	if (pvid == VLAN_N_VID)
215	return false;	215	return false;
216		216
217	/* PVID is set on this port. Any untagged ingress	217	/* PVID is set on this port. Any untagged or priority-tagged
218	* frame is considered to belong to this vlan.	218	* ingress frame is considered to belong to this vlan.
219	*/	219	*/
220	__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), pvid);	220	*vid = pvid;
		221	if (likely(err))
		222	/* Untagged Frame. */
		223	__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), pvid);
		224	else
		225	/* Priority-tagged Frame.
		226	* At this point, We know that skb->vlan_tci had
		227	* VLAN_TAG_PRESENT bit and its VID field was 0x000.
		228	* We update only VID field and preserve PCP field.
		229	*/
		230	skb->vlan_tci \|= pvid;
		231
221	return true;	232	return true;
222	}	233	}
223		234
@@ -248,7 +259,9 @@ bool br_allowed_egress(struct net_bridge *br, · 24 unmodified lines
248	return false;	259	return false;
249	}	260	}
250		261
251	/* Must be protected by RTNL */	262	/* Must be protected by RTNL.
		263	* Must be called with vid in range from 1 to 4094 inclusive.
		264	*/
252	int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags)	265	int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags)
253	{	266	{
254	struct net_port_vlans *pv = NULL;	267	struct net_port_vlans *pv = NULL;
@@ -278,7 +291,9 @@ out: · 23 unmodified lines
278	return err;	291	return err;
279	}	292	}
280		293
281	/* Must be protected by RTNL */	294	/* Must be protected by RTNL.
		295	* Must be called with vid in range from 1 to 4094 inclusive.
		296	*/
282	int br_vlan_delete(struct net_bridge *br, u16 vid)	297	int br_vlan_delete(struct net_bridge *br, u16 vid)
283	{	298	{
284	struct net_port_vlans *pv;	299	struct net_port_vlans *pv;
@@ -289,14 +304,9 @@ int br_vlan_delete(struct net_bridge *br, u16 vid) · 4 unmodified lines
289	if (!pv)	304	if (!pv)
290	return -EINVAL;	305	return -EINVAL;
291		306
292	if (vid) {	307	spin_lock_bh(&br->hash_lock);
293	/* If the VID !=0 remove fdb for this vid. VID 0 is special	308	fdb_delete_by_addr(br, br->dev->dev_addr, vid);
294	* in that it's the default and is always there in the fdb.	309	spin_unlock_bh(&br->hash_lock);
295	*/
296	spin_lock_bh(&br->hash_lock);
297	fdb_delete_by_addr(br, br->dev->dev_addr, vid);
298	spin_unlock_bh(&br->hash_lock);
299	}
300		310
301	__vlan_del(pv, vid);	311	__vlan_del(pv, vid);
302	return 0;	312	return 0;
@@ -329,7 +339,9 @@ unlock: · 26 unmodified lines
329	return 0;	339	return 0;
330	}	340	}
331		341
332	/* Must be protected by RTNL */	342	/* Must be protected by RTNL.
		343	* Must be called with vid in range from 1 to 4094 inclusive.
		344	*/
333	int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags)	345	int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags)
334	{	346	{
335	struct net_port_vlans *pv = NULL;	347	struct net_port_vlans *pv = NULL;
@@ -363,7 +375,9 @@ clean_up: · 27 unmodified lines
363	return err;	375	return err;
364	}	376	}
365		377
366	/* Must be protected by RTNL */	378	/* Must be protected by RTNL.
		379	* Must be called with vid in range from 1 to 4094 inclusive.
		380	*/
367	int nbp_vlan_delete(struct net_bridge_port *port, u16 vid)	381	int nbp_vlan_delete(struct net_bridge_port *port, u16 vid)
368	{	382	{
369	struct net_port_vlans *pv;	383	struct net_port_vlans *pv;
@@ -374,14 +388,9 @@ int nbp_vlan_delete(struct net_bridge_port *port, u16 vid) · 4 unmodified lines
374	if (!pv)	388	if (!pv)
375	return -EINVAL;	389	return -EINVAL;
376		390
377	if (vid) {	391	spin_lock_bh(&port->br->hash_lock);
378	/* If the VID !=0 remove fdb for this vid. VID 0 is special	392	fdb_delete_by_addr(port->br, port->dev->dev_addr, vid);
379	* in that it's the default and is always there in the fdb.	393	spin_unlock_bh(&port->br->hash_lock);
380	*/
381	spin_lock_bh(&port->br->hash_lock);
382	fdb_delete_by_addr(port->br, port->dev->dev_addr, vid);
383	spin_unlock_bh(&port->br->hash_lock);
384	}
385		394
386	return __vlan_del(pv, vid);	395	return __vlan_del(pv, vid);
387	}	396	}

net/core/secure_seq.c+2−0

 #include <net/secure_seq.h>
+#if IS_ENABLED(CONFIG_IPV6) || IS_ENABLED(CONFIG_INET)
 #define NET_SECRET_SIZE (MD5_MESSAGE_BYTES / 4)
 static u32 net_secret[NET_SECRET_SIZE] ____cacheline_aligned;
 {
 	net_get_random_once(net_secret, sizeof(net_secret));
 }
+#endif
 #ifdef CONFIG_INET
 static u32 seq_scale(u32 seq)

net/ipv4/ip_output.c+9−4

@@ -772,15 +772,20 @@ static inline int ip_ufo_append_data(struct sock *sk, · 771 unmodified lines
772	/* initialize protocol header pointer */	772	/* initialize protocol header pointer */
773	skb->transport_header = skb->network_header + fragheaderlen;	773	skb->transport_header = skb->network_header + fragheaderlen;
774		774
775	skb->ip_summed = CHECKSUM_PARTIAL;
776	skb->csum = 0;	775	skb->csum = 0;
777		776
778	/* specify the length of each IP datagram fragment */	777
779	skb_shinfo(skb)->gso_size = maxfraglen - fragheaderlen;
780	skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
781	__skb_queue_tail(queue, skb);	778	__skb_queue_tail(queue, skb);
		779	} else if (skb_is_gso(skb)) {
		780	goto append;
782	}	781	}
783		782
		783	skb->ip_summed = CHECKSUM_PARTIAL;
		784	/* specify the length of each IP datagram fragment */
		785	skb_shinfo(skb)->gso_size = maxfraglen - fragheaderlen;
		786	skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
		787
		788	append:
784	return skb_append_datato_frags(sk, skb, getfrag, from,	789	return skb_append_datato_frags(sk, skb, getfrag, from,
785	(length - transhdrlen));	790	(length - transhdrlen));
786	}	791	}

net/ipv4/ip_vti.c+11−3

@@ -61,8 +61,17 @@ static int vti_rcv(struct sk_buff *skb) · 60 unmodified lines
61	iph->saddr, iph->daddr, 0);	61	iph->saddr, iph->daddr, 0);
62	if (tunnel != NULL) {	62	if (tunnel != NULL) {
63	struct pcpu_tstats *tstats;	63	struct pcpu_tstats *tstats;
		64	u32 oldmark = skb->mark;
		65	int ret;
64		66
65	if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb))	67
		68	/* temporarily mark the skb with the tunnel o_key, to
		69	* only match policies with this mark.
		70	*/
		71	skb->mark = be32_to_cpu(tunnel->parms.o_key);
		72	ret = xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb);
		73	skb->mark = oldmark;
		74	if (!ret)
66	return -1;	75	return -1;
67		76
68	tstats = this_cpu_ptr(tunnel->dev->tstats);	77	tstats = this_cpu_ptr(tunnel->dev->tstats);
@@ -71,7 +80,6 @@ static int vti_rcv(struct sk_buff *skb) · 2 unmodified lines
71	tstats->rx_bytes += skb->len;	80	tstats->rx_bytes += skb->len;
72	u64_stats_update_end(&tstats->syncp);	81	u64_stats_update_end(&tstats->syncp);
73		82
74	skb->mark = 0;
75	secpath_reset(skb);	83	secpath_reset(skb);
76	skb->dev = tunnel->dev;	84	skb->dev = tunnel->dev;
77	return 1;	85	return 1;
@@ -103,7 +111,7 @@ static netdev_tx_t vti_tunnel_xmit(struct sk_buff skb, struct net_device dev) · 25 unmodified lines
103		111
104	memset(&fl4, 0, sizeof(fl4));	112	memset(&fl4, 0, sizeof(fl4));
105	flowi4_init_output(&fl4, tunnel->parms.link,	113	flowi4_init_output(&fl4, tunnel->parms.link,
106	be32_to_cpu(tunnel->parms.i_key), RT_TOS(tos),	114	be32_to_cpu(tunnel->parms.o_key), RT_TOS(tos),
107	RT_SCOPE_UNIVERSE,	115	RT_SCOPE_UNIVERSE,
108	IPPROTO_IPIP, 0,	116	IPPROTO_IPIP, 0,
109	dst, tiph->saddr, 0, 0);	117	dst, tiph->saddr, 0, 0);

net/ipv4/tcp_input.c+3−1

 			tcp_init_cwnd_reduction(sk, true);
 			tcp_set_ca_state(sk, TCP_CA_CWR);
 			tcp_end_cwnd_reduction(sk);
-			tcp_set_ca_state(sk, TCP_CA_Open);
+			tcp_try_keep_open(sk);
 			NET_INC_STATS_BH(sock_net(sk),
 					 LINUX_MIB_TCPLOSSPROBERECOVERY);
 		}
 		} else
 			tcp_init_metrics(sk);
+		tcp_update_pacing_rate(sk);
 		/* Prevent spurious tcp_cwnd_restart() on first data packet */
 		tp->lsndtime = tcp_time_stamp;

net/ipv4/tcp_output.c+7−5

 static void tcp_set_skb_tso_segs(const struct sock *sk, struct sk_buff *skb,
 				 unsigned int mss_now)
 {
-	if (skb->len <= mss_now || !sk_can_gso(sk) ||
+	/* Make sure we own this skb before messing gso_size/gso_segs */
-	    skb->ip_summed == CHECKSUM_NONE) {
+	WARN_ON_ONCE(skb_cloned(skb));
+	if (skb->len <= mss_now || skb->ip_summed == CHECKSUM_NONE) {
 		/* Avoid the costly divide in the normal
 		 * non-TSO case.
 		 */
 	if (nsize < 0)
 		nsize = 0;
-	if (skb_cloned(skb) &&
+	if (skb_unclone(skb, GFP_ATOMIC))
-	    skb_is_nonlinear(skb) &&
-	    pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
 		return -ENOMEM;
 	/* Get a new skb... force flag on. */
 		int oldpcount = tcp_skb_pcount(skb);
 		if (unlikely(oldpcount > 1)) {
+			if (skb_unclone(skb, GFP_ATOMIC))
+				return -ENOMEM;
 			tcp_init_tso_segs(sk, skb, cur_mss);
 			tcp_adjust_pcount(sk, skb, oldpcount - tcp_skb_pcount(skb));
 		}

net/ipv4/xfrm4_policy.c+1−0

@@ -107,6 +107,7 @@ _decode_session4(struct sk_buff skb, struct flowi fl, int reverse) · 106 unmodified lines
107		107
108	memset(fl4, 0, sizeof(struct flowi4));	108	memset(fl4, 0, sizeof(struct flowi4));
109	fl4->flowi4_mark = skb->mark;	109	fl4->flowi4_mark = skb->mark;
		110	fl4->flowi4_oif = skb_dst(skb)->dev->ifindex;
110		111
111	if (!ip_is_fragment(iph)) {	112	if (!ip_is_fragment(iph)) {
112	switch (iph->protocol) {	113	switch (iph->protocol) {

net/ipv6/ah6.c+1−2

@@ -618,8 +618,7 @@ static void ah6_err(struct sk_buff skb, struct inet6_skb_parm opt, · 617 unmodified lines
618	struct ip_auth_hdr ah = (struct ip_auth_hdr)(skb->data+offset);	618	struct ip_auth_hdr ah = (struct ip_auth_hdr)(skb->data+offset);
619	struct xfrm_state *x;	619	struct xfrm_state *x;
620		620
621	if (type != ICMPV6_DEST_UNREACH &&	621	if (type != ICMPV6_PKT_TOOBIG &&
622	type != ICMPV6_PKT_TOOBIG &&
623	type != NDISC_REDIRECT)	622	type != NDISC_REDIRECT)
624	return;	623	return;
625		624

net/ipv6/esp6.c+1−2

@@ -436,8 +436,7 @@ static void esp6_err(struct sk_buff skb, struct inet6_skb_parm opt, · 435 unmodified lines
436	struct ip_esp_hdr esph = (struct ip_esp_hdr )(skb->data + offset);	436	struct ip_esp_hdr esph = (struct ip_esp_hdr )(skb->data + offset);
437	struct xfrm_state *x;	437	struct xfrm_state *x;
438		438
439	if (type != ICMPV6_DEST_UNREACH &&	439	if (type != ICMPV6_PKT_TOOBIG &&
440	type != ICMPV6_PKT_TOOBIG &&
441	type != NDISC_REDIRECT)	440	type != NDISC_REDIRECT)
442	return;	441	return;
443		442

net/ipv6/ip6_gre.c+1−2

 		if (t->parms.o_flags&GRE_SEQ)
 			addend += 4;
 	}
+	t->hlen = addend;
 	if (p->flags & IP6_TNL_F_CAP_XMIT) {
 		int strict = (ipv6_addr_type(&p->raddr) &
 		}
 		ip6_rt_put(rt);
 	}
-	t->hlen = addend;
 }
 static int ip6gre_tnl_change(struct ip6_tnl *t,

net/ipv6/ip6_output.c+16−13

 	}
 	rcu_read_lock_bh();
-	nexthop = rt6_nexthop((struct rt6_info *)dst, &ipv6_hdr(skb)->daddr);
+	nexthop = rt6_nexthop((struct rt6_info *)dst);
 	neigh = __ipv6_neigh_lookup_noref(dst->dev, nexthop);
 	if (unlikely(!neigh))
 		neigh = __neigh_create(&nd_tbl, nexthop, dst->dev, false);
 	 */
 	rt = (struct rt6_info *) *dst;
 	rcu_read_lock_bh();
-	n = __ipv6_neigh_lookup_noref(rt->dst.dev, rt6_nexthop(rt, &fl6->daddr));
+	n = __ipv6_neigh_lookup_noref(rt->dst.dev, rt6_nexthop(rt));
 	err = n && !(n->nud_state & NUD_VALID) ? -EINVAL : 0;
 	rcu_read_unlock_bh();
 {
 	struct sk_buff *skb;
+	struct frag_hdr fhdr;
 	int err;
 	/* There is support for UDP large send offload by network
 	 * udp datagram
 	 */
 	if ((skb = skb_peek_tail(&sk->sk_write_queue)) == NULL) {
-		struct frag_hdr fhdr;
 		skb = sock_alloc_send_skb(sk,
 			hh_len + fragheaderlen + transhdrlen + 20,
 			(flags & MSG_DONTWAIT), &err);
 		skb->transport_header = skb->network_header + fragheaderlen;
 		skb->protocol = htons(ETH_P_IPV6);
-		skb->ip_summed = CHECKSUM_PARTIAL;
 		skb->csum = 0;
-		/* Specify the length of each IPv6 datagram fragment.
-		 * It has to be a multiple of 8.
-		 */
-		skb_shinfo(skb)->gso_size = (mtu - fragheaderlen -
-					     sizeof(struct frag_hdr)) & ~7;
-		skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
-		ipv6_select_ident(&fhdr, rt);
-		skb_shinfo(skb)->ip6_frag_id = fhdr.identification;
 		__skb_queue_tail(&sk->sk_write_queue, skb);
+	} else if (skb_is_gso(skb)) {
+		goto append;
 	}
+	skb->ip_summed = CHECKSUM_PARTIAL;
+	/* Specify the length of each IPv6 datagram fragment.
+	 * It has to be a multiple of 8.
+	 */
+	skb_shinfo(skb)->gso_size = (mtu - fragheaderlen -
+				     sizeof(struct frag_hdr)) & ~7;
+	skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
+	ipv6_select_ident(&fhdr, rt);
+	skb_shinfo(skb)->ip6_frag_id = fhdr.identification;
+append:
 	return skb_append_datato_frags(sk, skb, getfrag, from,
 				       (length - transhdrlen));
 }

net/ipv6/ipcomp6.c+1−2

@@ -64,8 +64,7 @@ static void ipcomp6_err(struct sk_buff skb, struct inet6_skb_parm opt, · 63 unmodified lines
64	(struct ip_comp_hdr *)(skb->data + offset);	64	(struct ip_comp_hdr *)(skb->data + offset);
65	struct xfrm_state *x;	65	struct xfrm_state *x;
66		66
67	if (type != ICMPV6_DEST_UNREACH &&	67	if (type != ICMPV6_PKT_TOOBIG &&
68	type != ICMPV6_PKT_TOOBIG &&
69	type != NDISC_REDIRECT)	68	type != NDISC_REDIRECT)
70	return;	69	return;
71		70

net/ipv6/route.c+37−9

 }
 #ifdef CONFIG_IPV6_ROUTER_PREF
+struct __rt6_probe_work {
+	struct work_struct work;
+	struct in6_addr target;
+	struct net_device *dev;
+};
+static void rt6_probe_deferred(struct work_struct *w)
+{
+	struct in6_addr mcaddr;
+	struct __rt6_probe_work *work =
+		container_of(w, struct __rt6_probe_work, work);
+	addrconf_addr_solict_mult(&work->target, &mcaddr);
+	ndisc_send_ns(work->dev, NULL, &work->target, &mcaddr, NULL);
+	dev_put(work->dev);
+	kfree(w);
+}
 static void rt6_probe(struct rt6_info *rt)
 {
 	struct neighbour *neigh;
 	if (!neigh ||
 	    time_after(jiffies, neigh->updated + rt->rt6i_idev->cnf.rtr_probe_interval)) {
-		struct in6_addr mcaddr;
+		struct __rt6_probe_work *work;
-		struct in6_addr *target;
-		if (neigh) {
+		work = kmalloc(sizeof(*work), GFP_ATOMIC);
+		if (neigh && work)
 			neigh->updated = jiffies;
+		if (neigh)
 			write_unlock(&neigh->lock);
-		}
-		target = (struct in6_addr *)&rt->rt6i_gateway;
+		if (work) {
-		addrconf_addr_solict_mult(target, &mcaddr);
+			INIT_WORK(&work->work, rt6_probe_deferred);
-		ndisc_send_ns(rt->dst.dev, NULL, target, &mcaddr, NULL);
+			work->target = rt->rt6i_gateway;
+			dev_hold(rt->dst.dev);
+			work->dev = rt->dst.dev;
+			schedule_work(&work->work);
+		}
 	} else {
 out:
 		write_unlock(&neigh->lock);
 			if (ort->rt6i_dst.plen != 128 &&
 			    ipv6_addr_equal(&ort->rt6i_dst.addr, daddr))
 				rt->rt6i_flags |= RTF_ANYCAST;
-			rt->rt6i_gateway = *daddr;
 		}
 		rt->rt6i_flags |= RTF_CACHE;
 	rt->dst.flags |= DST_HOST;
 	rt->dst.output  = ip6_output;
 	atomic_set(&rt->dst.__refcnt, 1);
+	rt->rt6i_gateway  = fl6->daddr;
 	rt->rt6i_dst.addr = fl6->daddr;
 	rt->rt6i_dst.plen = 128;
 	rt->rt6i_idev     = idev;
 			in6_dev_hold(rt->rt6i_idev);
 		rt->dst.lastuse = jiffies;
-		rt->rt6i_gateway = ort->rt6i_gateway;
+		if (ort->rt6i_flags & RTF_GATEWAY)
+			rt->rt6i_gateway = ort->rt6i_gateway;
+		else
+			rt->rt6i_gateway = *dest;
 		rt->rt6i_flags = ort->rt6i_flags;
 		if ((ort->rt6i_flags & (RTF_DEFAULT | RTF_ADDRCONF)) ==
 		    (RTF_DEFAULT | RTF_ADDRCONF))
 	else
 		rt->rt6i_flags |= RTF_LOCAL;
+	rt->rt6i_gateway  = *addr;
 	rt->rt6i_dst.addr = *addr;
 	rt->rt6i_dst.plen = 128;
 	rt->rt6i_table = fib6_get_table(net, RT6_TABLE_LOCAL);

net/ipv6/udp.c+2−3

 	if (tclass < 0)
 		tclass = np->tclass;
-	if (dontfrag < 0)
-		dontfrag = np->dontfrag;
 	if (msg->msg_flags&MSG_CONFIRM)
 		goto do_confirm;
 back_from_confirm:
 	up->pending = AF_INET6;
 do_append_data:
+	if (dontfrag < 0)
+		dontfrag = np->dontfrag;
 	up->len += ulen;
 	getfrag  =  is_udplite ?  udplite_getfrag : ip_generic_getfrag;
 	err = ip6_append_data(sk, getfrag, msg->msg_iov, ulen,

net/ipv6/xfrm6_policy.c+1−0

@@ -138,6 +138,7 @@ _decode_session6(struct sk_buff skb, struct flowi fl, int reverse) · 137 unmodified lines
138		138
139	memset(fl6, 0, sizeof(struct flowi6));	139	memset(fl6, 0, sizeof(struct flowi6));
140	fl6->flowi6_mark = skb->mark;	140	fl6->flowi6_mark = skb->mark;
		141	fl6->flowi6_oif = skb_dst(skb)->dev->ifindex;
141		142
142	fl6->daddr = reverse ? hdr->saddr : hdr->daddr;	143	fl6->daddr = reverse ? hdr->saddr : hdr->daddr;
143	fl6->saddr = reverse ? hdr->daddr : hdr->saddr;	144	fl6->saddr = reverse ? hdr->daddr : hdr->saddr;

net/key/af_key.c+2−1

@@ -1098,7 +1098,8 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net, · 1097 unmodified lines
1098		1098
1099	x->id.proto = proto;	1099	x->id.proto = proto;
1100	x->id.spi = sa->sadb_sa_spi;	1100	x->id.spi = sa->sadb_sa_spi;
1101	x->props.replay_window = sa->sadb_sa_replay;	1101	x->props.replay_window = min_t(unsigned int, sa->sadb_sa_replay,
		1102	(sizeof(x->replay.bitmap) * 8));
1102	if (sa->sadb_sa_flags & SADB_SAFLAGS_NOECN)	1103	if (sa->sadb_sa_flags & SADB_SAFLAGS_NOECN)
1103	x->props.flags \|= XFRM_STATE_NOECN;	1104	x->props.flags \|= XFRM_STATE_NOECN;
1104	if (sa->sadb_sa_flags & SADB_SAFLAGS_DECAP_DSCP)	1105	if (sa->sadb_sa_flags & SADB_SAFLAGS_DECAP_DSCP)

net/l2tp/l2tp_ppp.c+4−0

 		goto error_put_sess_tun;
 	}
+	local_bh_disable();
 	l2tp_xmit_skb(session, skb, session->hdr_len);
+	local_bh_enable();
 	sock_put(ps->tunnel_sock);
 	sock_put(sk);
 	skb->data[0] = ppph[0];
 	skb->data[1] = ppph[1];
+	local_bh_disable();
 	l2tp_xmit_skb(session, skb, session->hdr_len);
+	local_bh_enable();
 	sock_put(sk_tun);
 	sock_put(sk);

net/mac80211/cfg.c+1−1

@@ -3564,7 +3564,7 @@ static int ieee80211_probe_client(struct wiphy wiphy, struct net_device dev, · 3563 unmodified lines
3564	return -EINVAL;	3564	return -EINVAL;
3565	}	3565	}
3566	band = chanctx_conf->def.chan->band;	3566	band = chanctx_conf->def.chan->band;
3567	sta = sta_info_get(sdata, peer);	3567	sta = sta_info_get_bss(sdata, peer);
3568	if (sta) {	3568	if (sta) {
3569	qos = test_sta_flag(sta, WLAN_STA_WME);	3569	qos = test_sta_flag(sta, WLAN_STA_WME);
3570	} else {	3570	} else {

net/mac80211/ieee80211_i.h+3−0

  *	that the scan completed.
  * @SCAN_ABORTED: Set for our scan work function when the driver reported
  *	a scan complete for an aborted scan.
+ * @SCAN_HW_CANCELLED: Set for our scan work function when the scan is being
+ *	cancelled.
  */
 enum {
 	SCAN_SW_SCANNING,
 	SCAN_ONCHANNEL_SCANNING,
 	SCAN_COMPLETED,
 	SCAN_ABORTED,
+	SCAN_HW_CANCELLED,
 };
 /**

net/mac80211/offchannel.c+2−0

@@ -394,6 +394,8 @@ void ieee80211_sw_roc_work(struct work_struct *work) · 393 unmodified lines
394		394
395	if (started)	395	if (started)
396	ieee80211_start_next_roc(local);	396	ieee80211_start_next_roc(local);
		397	else if (list_empty(&local->roc_list))
		398	ieee80211_run_deferred_scan(local);
397	}	399	}
398		400
399	out_unlock:	401	out_unlock:

net/mac80211/scan.c+19−0

@@ -238,6 +238,9 @@ static bool ieee80211_prep_hw_scan(struct ieee80211_local *local) · 237 unmodified lines
238	enum ieee80211_band band;	238	enum ieee80211_band band;
239	int i, ielen, n_chans;	239	int i, ielen, n_chans;
240		240
		241	if (test_bit(SCAN_HW_CANCELLED, &local->scanning))
		242	return false;
		243
241	do {	244	do {
242	if (local->hw_scan_band == IEEE80211_NUM_BANDS)	245	if (local->hw_scan_band == IEEE80211_NUM_BANDS)
243	return false;	246	return false;
@@ -939,7 +942,23 @@ void ieee80211_scan_cancel(struct ieee80211_local *local) · 695 unmodified lines
939	if (!local->scan_req)	942	if (!local->scan_req)
940	goto out;	943	goto out;
941		944
		945	/*
		946	* We have a scan running and the driver already reported completion,
		947	* but the worker hasn't run yet or is stuck on the mutex - mark it as
		948	* cancelled.
		949	*/
		950	if (test_bit(SCAN_HW_SCANNING, &local->scanning) &&
		951	test_bit(SCAN_COMPLETED, &local->scanning)) {
		952	set_bit(SCAN_HW_CANCELLED, &local->scanning);
		953	goto out;
		954	}
		955
942	if (test_bit(SCAN_HW_SCANNING, &local->scanning)) {	956	if (test_bit(SCAN_HW_SCANNING, &local->scanning)) {
		957	/*
		958	* Make sure that __ieee80211_scan_completed doesn't trigger a
		959	* scan on another band.
		960	*/
		961	set_bit(SCAN_HW_CANCELLED, &local->scanning);
943	if (local->ops->cancel_hw_scan)	962	if (local->ops->cancel_hw_scan)
944	drv_cancel_hw_scan(local,	963	drv_cancel_hw_scan(local,
945	rcu_dereference_protected(local->scan_sdata,	964	rcu_dereference_protected(local->scan_sdata,

net/mac80211/status.c+3−0

@@ -180,6 +180,9 @@ static void ieee80211_frame_acked(struct sta_info sta, struct sk_buff skb) · 179 unmodified lines
180	struct ieee80211_local *local = sta->local;	180	struct ieee80211_local *local = sta->local;
181	struct ieee80211_sub_if_data *sdata = sta->sdata;	181	struct ieee80211_sub_if_data *sdata = sta->sdata;
182		182
		183	if (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)
		184	sta->last_rx = jiffies;
		185
183	if (ieee80211_is_data_qos(mgmt->frame_control)) {	186	if (ieee80211_is_data_qos(mgmt->frame_control)) {
184	struct ieee80211_hdr hdr = (void ) skb->data;	187	struct ieee80211_hdr hdr = (void ) skb->data;
185	u8 *qc = ieee80211_get_qos_ctl(hdr);	188	u8 *qc = ieee80211_get_qos_ctl(hdr);

net/mac80211/tx.c+2−1

 		tx->sta = rcu_dereference(sdata->u.vlan.sta);
 		if (!tx->sta && sdata->dev->ieee80211_ptr->use_4addr)
 			return TX_DROP;
-	} else if (info->flags & IEEE80211_TX_CTL_INJECTED ||
+	} else if (info->flags & (IEEE80211_TX_CTL_INJECTED |
+				  IEEE80211_TX_INTFL_NL80211_FRAME_TX) ||
 		   tx->sdata->control_port_protocol == tx->skb->protocol) {
 		tx->sta = sta_info_get_bss(sdata, hdr->addr1);
 	}

net/mac80211/util.c+4−0

 	}
 	rate = cfg80211_calculate_bitrate(&ri);
+	if (WARN_ONCE(!rate,
+		      "Invalid bitrate: flags=0x%x, idx=%d, vht_nss=%d\n",
+		      status->flag, status->rate_idx, status->vht_nss))
+		return 0;
 	/* rewind from end of MPDU */
 	if (status->flag & RX_FLAG_MACTIME_END)

net/netfilter/nf_conntrack_h323_main.c+2−2

@@ -778,8 +778,8 @@ static int callforward_do_filter(const union nf_inet_addr *src, · 777 unmodified lines
778	flowi6_to_flowi(&fl1), false)) {	778	flowi6_to_flowi(&fl1), false)) {
779	if (!afinfo->route(&init_net, (struct dst_entry **)&rt2,	779	if (!afinfo->route(&init_net, (struct dst_entry **)&rt2,
780	flowi6_to_flowi(&fl2), false)) {	780	flowi6_to_flowi(&fl2), false)) {
781	if (!memcmp(&rt1->rt6i_gateway, &rt2->rt6i_gateway,	781	if (ipv6_addr_equal(rt6_nexthop(rt1),
782	sizeof(rt1->rt6i_gateway)) &&	782	rt6_nexthop(rt2)) &&
783	rt1->dst.dev == rt2->dst.dev)	783	rt1->dst.dev == rt2->dst.dev)
784	ret = 1;	784	ret = 1;
785	dst_release(&rt2->dst);	785	dst_release(&rt2->dst);

net/sched/sch_netem.c+17−0

 	return PSCHED_NS2TICKS(ticks);
 }
+static void tfifo_reset(struct Qdisc *sch)
+{
+	struct netem_sched_data *q = qdisc_priv(sch);
+	struct rb_node *p;
+	while ((p = rb_first(&q->t_root))) {
+		struct sk_buff *skb = netem_rb_to_skb(p);
+		rb_erase(p, &q->t_root);
+		skb->next = NULL;
+		skb->prev = NULL;
+		kfree_skb(skb);
+	}
+}
 static void tfifo_enqueue(struct sk_buff *nskb, struct Qdisc *sch)
 {
 	struct netem_sched_data *q = qdisc_priv(sch);
 			skb->next = NULL;
 			skb->prev = NULL;
 			len = qdisc_pkt_len(skb);
+			sch->qstats.backlog -= len;
 			kfree_skb(skb);
 		}
 	}
 	struct netem_sched_data *q = qdisc_priv(sch);
 	qdisc_reset_queue(sch);
+	tfifo_reset(sch);
 	if (q->qdisc)
 		qdisc_reset(q->qdisc);
 	qdisc_watchdog_cancel(&q->watchdog);

net/sctp/output.c+2−1

@@ -536,7 +536,8 @@ int sctp_packet_transmit(struct sctp_packet *packet) · 535 unmodified lines
536	* by CRC32-C as described in <draft-ietf-tsvwg-sctpcsum-02.txt>.	536	* by CRC32-C as described in <draft-ietf-tsvwg-sctpcsum-02.txt>.
537	*/	537	*/
538	if (!sctp_checksum_disable) {	538	if (!sctp_checksum_disable) {
539	if (!(dst->dev->features & NETIF_F_SCTP_CSUM)) {	539	if (!(dst->dev->features & NETIF_F_SCTP_CSUM) \|\|
		540	(dst_xfrm(dst) != NULL) \|\| packet->ipfragok) {
540	__u32 crc32 = sctp_start_cksum((__u8 *)sh, cksum_buf_len);	541	__u32 crc32 = sctp_start_cksum((__u8 *)sh, cksum_buf_len);
541		542
542	/* 3) Put the resultant value into the checksum field in the	543	/* 3) Put the resultant value into the checksum field in the

net/unix/af_unix.c+10−0

 	return 0;
 }
+static void unix_sock_inherit_flags(const struct socket *old,
+				    struct socket *new)
+{
+	if (test_bit(SOCK_PASSCRED, &old->flags))
+		set_bit(SOCK_PASSCRED, &new->flags);
+	if (test_bit(SOCK_PASSSEC, &old->flags))
+		set_bit(SOCK_PASSSEC, &new->flags);
+}
 static int unix_accept(struct socket *sock, struct socket *newsock, int flags)
 {
 	struct sock *sk = sock->sk;
 	/* attach accepted sock to socket */
 	unix_state_lock(tsk);
 	newsock->state = SS_CONNECTED;
+	unix_sock_inherit_flags(sock, newsock);
 	sock_graft(tsk, newsock);
 	unix_state_unlock(tsk);
 	return 0;

net/wireless/core.c+0−2

 	case NETDEV_PRE_UP:
 		if (!(wdev->wiphy->interface_modes & BIT(wdev->iftype)))
 			return notifier_from_errno(-EOPNOTSUPP);
-		if (rfkill_blocked(rdev->rfkill))
-			return notifier_from_errno(-ERFKILL);
 		ret = cfg80211_can_add_interface(rdev, wdev->iftype);
 		if (ret)
 			return notifier_from_errno(ret);

net/wireless/core.h+3−0

@@ -402,6 +402,9 @@ static inline int · 401 unmodified lines
402	cfg80211_can_add_interface(struct cfg80211_registered_device *rdev,	402	cfg80211_can_add_interface(struct cfg80211_registered_device *rdev,
403	enum nl80211_iftype iftype)	403	enum nl80211_iftype iftype)
404	{	404	{
		405	if (rfkill_blocked(rdev->rfkill))
		406	return -ERFKILL;
		407
405	return cfg80211_can_change_interface(rdev, NULL, iftype);	408	return cfg80211_can_change_interface(rdev, NULL, iftype);
406	}	409	}
407		410

net/wireless/radiotap.c+6−1

 	struct ieee80211_radiotap_header *radiotap_header,
 	int max_length, const struct ieee80211_radiotap_vendor_namespaces *vns)
 {
+	/* check the radiotap header can actually be present */
+	if (max_length < sizeof(struct ieee80211_radiotap_header))
+		return -EINVAL;
 	/* Linux only supports version 0 radiotap format */
 	if (radiotap_header->it_version)
 		return -EINVAL;
 			 */
 			if ((unsigned long)iterator->_arg -
-			    (unsigned long)iterator->_rtheader >
+			    (unsigned long)iterator->_rtheader +
+			    sizeof(uint32_t) >
 			    (unsigned long)iterator->_max_length)
 				return -EINVAL;
 		}

net/xfrm/xfrm_policy.c+21−7

 	atomic_inc(&policy->genid);
-	del_timer(&policy->polq.hold_timer);
+	if (del_timer(&policy->polq.hold_timer))
+		xfrm_pol_put(policy);
 	xfrm_queue_purge(&policy->polq.hold_queue);
 	if (del_timer(&policy->timer))
 	spin_lock_bh(&pq->hold_queue.lock);
 	skb_queue_splice_init(&pq->hold_queue, &list);
-	del_timer(&pq->hold_timer);
+	if (del_timer(&pq->hold_timer))
+		xfrm_pol_put(old);
 	spin_unlock_bh(&pq->hold_queue.lock);
 	if (skb_queue_empty(&list))
 	spin_lock_bh(&pq->hold_queue.lock);
 	skb_queue_splice(&list, &pq->hold_queue);
 	pq->timeout = XFRM_QUEUE_TMO_MIN;
-	mod_timer(&pq->hold_timer, jiffies);
+	if (!mod_timer(&pq->hold_timer, jiffies))
+		xfrm_pol_hold(new);
 	spin_unlock_bh(&pq->hold_queue.lock);
 }
 	spin_lock(&pq->hold_queue.lock);
 	skb = skb_peek(&pq->hold_queue);
+	if (!skb) {
+		spin_unlock(&pq->hold_queue.lock);
+		goto out;
+	}
 	dst = skb_dst(skb);
 	sk = skb->sk;
 	xfrm_decode_session(skb, &fl, dst->ops->family);
 			goto purge_queue;
 		pq->timeout = pq->timeout << 1;
-		mod_timer(&pq->hold_timer, jiffies + pq->timeout);
+		if (!mod_timer(&pq->hold_timer, jiffies + pq->timeout))
-		return;
+			xfrm_pol_hold(pol);
+	goto out;
 	}
 	dst_release(dst);
 		err = dst_output(skb);
 	}
+out:
+	xfrm_pol_put(pol);
 	return;
 purge_queue:
 	pq->timeout = 0;
 	xfrm_queue_purge(&pq->hold_queue);
+	xfrm_pol_put(pol);
 }
 static int xdst_queue_output(struct sk_buff *skb)
 	unsigned long sched_next;
 	struct dst_entry *dst = skb_dst(skb);
 	struct xfrm_dst *xdst = (struct xfrm_dst *) dst;
-	struct xfrm_policy_queue *pq = &xdst->pols[0]->polq;
+	struct xfrm_policy *pol = xdst->pols[0];
+	struct xfrm_policy_queue *pq = &pol->polq;
 	if (pq->hold_queue.qlen > XFRM_MAX_QUEUE_LEN) {
 		kfree_skb(skb);
 	if (del_timer(&pq->hold_timer)) {
 		if (time_before(pq->hold_timer.expires, sched_next))
 			sched_next = pq->hold_timer.expires;
+		xfrm_pol_put(pol);
 	}
 	__skb_queue_tail(&pq->hold_queue, skb);
-	mod_timer(&pq->hold_timer, sched_next);
+	if (!mod_timer(&pq->hold_timer, sched_next))
+		xfrm_pol_hold(pol);
 	spin_unlock_bh(&pq->hold_queue.lock);

net/xfrm/xfrm_replay.c+28−26

@@ -61,9 +61,9 @@ static void xfrm_replay_notify(struct xfrm_state *x, int event) · 60 unmodified lines
61		61
62	switch (event) {	62	switch (event) {
63	case XFRM_REPLAY_UPDATE:	63	case XFRM_REPLAY_UPDATE:
64	if (x->replay_maxdiff &&	64	if (!x->replay_maxdiff \|\|
65	(x->replay.seq - x->preplay.seq < x->replay_maxdiff) &&	65	((x->replay.seq - x->preplay.seq < x->replay_maxdiff) &&
66	(x->replay.oseq - x->preplay.oseq < x->replay_maxdiff)) {	66	(x->replay.oseq - x->preplay.oseq < x->replay_maxdiff))) {
67	if (x->xflags & XFRM_TIME_DEFER)	67	if (x->xflags & XFRM_TIME_DEFER)
68	event = XFRM_REPLAY_TIMEOUT;	68	event = XFRM_REPLAY_TIMEOUT;
69	else	69	else
@@ -129,8 +129,7 @@ static int xfrm_replay_check(struct xfrm_state *x, · 59 unmodified lines
129	return 0;	129	return 0;
130		130
131	diff = x->replay.seq - seq;	131	diff = x->replay.seq - seq;
132	if (diff >= min_t(unsigned int, x->props.replay_window,	132	if (diff >= x->props.replay_window) {
133	sizeof(x->replay.bitmap) * 8)) {
134	x->stats.replay_window++;	133	x->stats.replay_window++;
135	goto err;	134	goto err;
136	}	135	}
@@ -302,9 +301,10 @@ static void xfrm_replay_notify_bmp(struct xfrm_state *x, int event) · 165 unmodified lines
302		301
303	switch (event) {	302	switch (event) {
304	case XFRM_REPLAY_UPDATE:	303	case XFRM_REPLAY_UPDATE:
305	if (x->replay_maxdiff &&	304	if (!x->replay_maxdiff \|\|
306	(replay_esn->seq - preplay_esn->seq < x->replay_maxdiff) &&	305	((replay_esn->seq - preplay_esn->seq < x->replay_maxdiff) &&
307	(replay_esn->oseq - preplay_esn->oseq < x->replay_maxdiff)) {	306	(replay_esn->oseq - preplay_esn->oseq
		307	< x->replay_maxdiff))) {
308	if (x->xflags & XFRM_TIME_DEFER)	308	if (x->xflags & XFRM_TIME_DEFER)
309	event = XFRM_REPLAY_TIMEOUT;	309	event = XFRM_REPLAY_TIMEOUT;
310	else	310	else
@@ -353,28 +353,30 @@ static void xfrm_replay_notify_esn(struct xfrm_state *x, int event) · 42 unmodified lines
353		353
354	switch (event) {	354	switch (event) {
355	case XFRM_REPLAY_UPDATE:	355	case XFRM_REPLAY_UPDATE:
356	if (!x->replay_maxdiff)	356	if (x->replay_maxdiff) {
357	break;	357	if (replay_esn->seq_hi == preplay_esn->seq_hi)
358		358	seq_diff = replay_esn->seq - preplay_esn->seq;
359	if (replay_esn->seq_hi == preplay_esn->seq_hi)	359	else
360	seq_diff = replay_esn->seq - preplay_esn->seq;	360	seq_diff = ~preplay_esn->seq + replay_esn->seq
361	else	361	+ 1;
362	seq_diff = ~preplay_esn->seq + replay_esn->seq + 1;
363
364	if (replay_esn->oseq_hi == preplay_esn->oseq_hi)
365	oseq_diff = replay_esn->oseq - preplay_esn->oseq;
366	else
367	oseq_diff = ~preplay_esn->oseq + replay_esn->oseq + 1;
368
369	if (seq_diff < x->replay_maxdiff &&
370	oseq_diff < x->replay_maxdiff) {
371		362
372	if (x->xflags & XFRM_TIME_DEFER)	363	if (replay_esn->oseq_hi == preplay_esn->oseq_hi)
373	event = XFRM_REPLAY_TIMEOUT;	364	oseq_diff = replay_esn->oseq
		365	- preplay_esn->oseq;
374	else	366	else
375	return;	367	oseq_diff = ~preplay_esn->oseq
		368	+ replay_esn->oseq + 1;
		369
		370	if (seq_diff >= x->replay_maxdiff \|\|
		371	oseq_diff >= x->replay_maxdiff)
		372	break;
376	}	373	}
377		374
		375	if (x->xflags & XFRM_TIME_DEFER)
		376	event = XFRM_REPLAY_TIMEOUT;
		377	else
		378	return;
		379
378	break;	380	break;
379		381
380	case XFRM_REPLAY_TIMEOUT:	382	case XFRM_REPLAY_TIMEOUT:

net/xfrm/xfrm_user.c+3−2

 	memcpy(&x->sel, &p->sel, sizeof(x->sel));
 	memcpy(&x->lft, &p->lft, sizeof(x->lft));
 	x->props.mode = p->mode;
-	x->props.replay_window = p->replay_window;
+	x->props.replay_window = min_t(unsigned int, p->replay_window,
+					sizeof(x->replay.bitmap) * 8);
 	x->props.reqid = p->reqid;
 	x->props.family = p->family;
 	memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr));
 	if (x->km.state != XFRM_STATE_VALID)
 		goto out;
-	err = xfrm_replay_verify_len(x->replay_esn, rp);
+	err = xfrm_replay_verify_len(x->replay_esn, re);
 	if (err)
 		goto out;

security/apparmor/apparmorfs.c+1−3

 	/* check if the next ns is a sibling, parent, gp, .. */
 	parent = ns->parent;
-	while (parent) {
+	while (ns != root) {
 		mutex_unlock(&ns->lock);
 		next = list_entry_next(ns, base.list);
 		if (!list_entry_is_head(next, &parent->sub_ns, base.list)) {
 			mutex_lock(&next->lock);
 			return next;
 		}
-		if (parent == root)
-			return NULL;
 		ns = parent;
 		parent = parent->parent;
 	}

security/apparmor/policy.c+1−0

@@ -610,6 +610,7 @@ void aa_free_profile(struct aa_profile *profile) · 609 unmodified lines
610	aa_put_dfa(profile->policy.dfa);	610	aa_put_dfa(profile->policy.dfa);
611	aa_put_replacedby(profile->replacedby);	611	aa_put_replacedby(profile->replacedby);
612		612
		613	kzfree(profile->hash);
613	kzfree(profile);	614	kzfree(profile);
614	}	615	}
615		616

security/selinux/avc.c+3−6

  * @tclass: target security class
  * @requested: requested permissions, interpreted based on @tclass
  * @auditdata: auxiliary audit data
- * @flags: VFS walk flags
  *
  * Check the AVC to determine whether the @requested permissions are granted
  * for the SID pair (@ssid, @tsid), interpreting the permissions
  * permissions are granted, -%EACCES if any permissions are denied, or
  * another -errno upon other errors.
  */
-int avc_has_perm_flags(u32 ssid, u32 tsid, u16 tclass,
+int avc_has_perm(u32 ssid, u32 tsid, u16 tclass,
-		       u32 requested, struct common_audit_data *auditdata,
+		 u32 requested, struct common_audit_data *auditdata)
-		       unsigned flags)
 {
 	struct av_decision avd;
 	int rc, rc2;
 	rc = avc_has_perm_noaudit(ssid, tsid, tclass, requested, 0, &avd);
-	rc2 = avc_audit(ssid, tsid, tclass, requested, &avd, rc, auditdata,
+	rc2 = avc_audit(ssid, tsid, tclass, requested, &avd, rc, auditdata);
-			flags);
 	if (rc2)
 		return rc2;
 	return rc;

security/selinux/hooks.c+7−8

 	rc = avc_has_perm_noaudit(sid, sid, sclass, av, 0, &avd);
 	if (audit == SECURITY_CAP_AUDIT) {
-		int rc2 = avc_audit(sid, sid, sclass, av, &avd, rc, &ad, 0);
+		int rc2 = avc_audit(sid, sid, sclass, av, &avd, rc, &ad);
 		if (rc2)
 			return rc2;
 	}
 static int inode_has_perm(const struct cred *cred,
 			  struct inode *inode,
 			  u32 perms,
-			  struct common_audit_data *adp,
+			  struct common_audit_data *adp)
-			  unsigned flags)
 {
 	struct inode_security_struct *isec;
 	u32 sid;
 	sid = cred_sid(cred);
 	isec = inode->i_security;
-	return avc_has_perm_flags(sid, isec->sid, isec->sclass, perms, adp, flags);
+	return avc_has_perm(sid, isec->sid, isec->sclass, perms, adp);
 }
 /* Same as inode_has_perm, but pass explicit audit data containing
 	ad.type = LSM_AUDIT_DATA_DENTRY;
 	ad.u.dentry = dentry;
-	return inode_has_perm(cred, inode, av, &ad, 0);
+	return inode_has_perm(cred, inode, av, &ad);
 }
 /* Same as inode_has_perm, but pass explicit audit data containing
 	ad.type = LSM_AUDIT_DATA_PATH;
 	ad.u.path = *path;
-	return inode_has_perm(cred, inode, av, &ad, 0);
+	return inode_has_perm(cred, inode, av, &ad);
 }
 /* Same as path_has_perm, but uses the inode from the file struct. */
 	ad.type = LSM_AUDIT_DATA_PATH;
 	ad.u.path = file->f_path;
-	return inode_has_perm(cred, file_inode(file), av, &ad, 0);
+	return inode_has_perm(cred, file_inode(file), av, &ad);
 }
 /* Check whether a task can use an open file descriptor to
 	/* av is zero if only checking access to the descriptor. */
 	rc = 0;
 	if (av)
-		rc = inode_has_perm(cred, inode, av, &ad, 0);
+		rc = inode_has_perm(cred, inode, av, &ad);
 out:
 	return rc;

security/selinux/include/avc.h+5−13

 			    u16 tclass, u32 requested,
 			    struct av_decision *avd,
 			    int result,
-			    struct common_audit_data *a, unsigned flags)
+			    struct common_audit_data *a)
 {
 	u32 audited, denied;
 	audited = avc_audit_required(requested, avd, result, 0, &denied);
 		return 0;
 	return slow_avc_audit(ssid, tsid, tclass,
 			      requested, audited, denied,
-			      a, flags);
+			      a, 0);
 }
 #define AVC_STRICT 1 /* Ignore permissive mode. */
 			 unsigned flags,
 			 struct av_decision *avd);
-int avc_has_perm_flags(u32 ssid, u32 tsid,
+int avc_has_perm(u32 ssid, u32 tsid,
-		       u16 tclass, u32 requested,
+		 u16 tclass, u32 requested,
-		       struct common_audit_data *auditdata,
+		 struct common_audit_data *auditdata);
-		       unsigned);
-static inline int avc_has_perm(u32 ssid, u32 tsid,
-			       u16 tclass, u32 requested,
-			       struct common_audit_data *auditdata)
-{
-	return avc_has_perm_flags(ssid, tsid, tclass, requested, auditdata, 0);
-}
 u32 avc_policy_seqno(void);

sound/pci/ac97/ac97_codec.c+1−0

@@ -175,6 +175,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = { · 174 unmodified lines
175	{ 0x54524106, 0xffffffff, "TR28026", NULL, NULL },	175	{ 0x54524106, 0xffffffff, "TR28026", NULL, NULL },
176	{ 0x54524108, 0xffffffff, "TR28028", patch_tritech_tr28028, NULL }, // added by xin jin [07/09/99]	176	{ 0x54524108, 0xffffffff, "TR28028", patch_tritech_tr28028, NULL }, // added by xin jin [07/09/99]
177	{ 0x54524123, 0xffffffff, "TR28602", NULL, NULL }, // only guess --jk [TR28023 = eMicro EM28023 (new CT1297)]	177	{ 0x54524123, 0xffffffff, "TR28602", NULL, NULL }, // only guess --jk [TR28023 = eMicro EM28023 (new CT1297)]
		178	{ 0x54584e03, 0xffffffff, "TLV320AIC27", NULL, NULL },
178	{ 0x54584e20, 0xffffffff, "TLC320AD9xC", NULL, NULL },	179	{ 0x54584e20, 0xffffffff, "TLC320AD9xC", NULL, NULL },
179	{ 0x56494161, 0xffffffff, "VIA1612A", NULL, NULL }, // modified ICE1232 with S/PDIF	180	{ 0x56494161, 0xffffffff, "VIA1612A", NULL, NULL }, // modified ICE1232 with S/PDIF
180	{ 0x56494170, 0xffffffff, "VIA1617A", patch_vt1617a, NULL }, // modified VT1616 with S/PDIF	181	{ 0x56494170, 0xffffffff, "VIA1617A", patch_vt1617a, NULL }, // modified VT1616 with S/PDIF

sound/pci/hda/hda_generic.c+1−1

@@ -3531,7 +3531,7 @@ static int create_capture_mixers(struct hda_codec *codec) · 3530 unmodified lines
3531	if (!multi)	3531	if (!multi)
3532	err = create_single_cap_vol_ctl(codec, n, vol, sw,	3532	err = create_single_cap_vol_ctl(codec, n, vol, sw,
3533	inv_dmic);	3533	inv_dmic);
3534	else if (!multi_cap_vol)	3534	else if (!multi_cap_vol && !inv_dmic)
3535	err = create_bind_cap_vol_ctl(codec, n, vol, sw);	3535	err = create_bind_cap_vol_ctl(codec, n, vol, sw);
3536	else	3536	else
3537	err = create_multi_cap_vol_ctl(codec);	3537	err = create_multi_cap_vol_ctl(codec);

sound/pci/hda/patch_conexant.c+11−0

 	CXT_FIXUP_INC_MIC_BOOST,
 	CXT_FIXUP_HEADPHONE_MIC_PIN,
 	CXT_FIXUP_HEADPHONE_MIC,
+	CXT_FIXUP_GPIO1,
 };
 static void cxt_fixup_stereo_dmic(struct hda_codec *codec,
 		.type = HDA_FIXUP_FUNC,
 		.v.func = cxt_fixup_headphone_mic,
 	},
+	[CXT_FIXUP_GPIO1] = {
+		.type = HDA_FIXUP_VERBS,
+		.v.verbs = (const struct hda_verb[]) {
+			{ 0x01, AC_VERB_SET_GPIO_MASK, 0x01 },
+			{ 0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01 },
+			{ 0x01, AC_VERB_SET_GPIO_DATA, 0x01 },
+			{ }
+		},
+	},
 };
 static const struct snd_pci_quirk cxt5051_fixups[] = {
 static const struct snd_pci_quirk cxt5066_fixups[] = {
 	SND_PCI_QUIRK(0x1025, 0x0543, "Acer Aspire One 522", CXT_FIXUP_STEREO_DMIC),
+	SND_PCI_QUIRK(0x1025, 0x054c, "Acer Aspire 3830TG", CXT_FIXUP_GPIO1),
 	SND_PCI_QUIRK(0x1043, 0x138d, "Asus", CXT_FIXUP_HEADPHONE_MIC_PIN),
 	SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400", CXT_PINCFG_LENOVO_TP410),
 	SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo T410", CXT_PINCFG_LENOVO_TP410),

sound/pci/hda/patch_hdmi.c+8−10

 		return;
 	}
+	/*
+	 * always configure channel mapping, it may have been changed by the
+	 * user in the meantime
+	 */
+	hdmi_setup_channel_mapping(codec, pin_nid, non_pcm, ca,
+				   channels, per_pin->chmap,
+				   per_pin->chmap_set);
 	/*
 	 * sizeof(ai) is used instead of sizeof(*hdmi_ai) or
 	 * sizeof(*dp_ai) to avoid partial match/update problems when
 			    "pin=%d channels=%d\n",
 			    pin_nid,
 			    channels);
-		hdmi_setup_channel_mapping(codec, pin_nid, non_pcm, ca,
-					   channels, per_pin->chmap,
-					   per_pin->chmap_set);
 		hdmi_stop_infoframe_trans(codec, pin_nid);
 		hdmi_fill_audio_infoframe(codec, pin_nid,
 					    ai.bytes, sizeof(ai));
 		hdmi_start_infoframe_trans(codec, pin_nid);
-	} else {
-		/* For non-pcm audio switch, setup new channel mapping
-		 * accordingly */
-		if (per_pin->non_pcm != non_pcm)
-			hdmi_setup_channel_mapping(codec, pin_nid, non_pcm, ca,
-						   channels, per_pin->chmap,
-						   per_pin->chmap_set);
 	}
 	per_pin->non_pcm = non_pcm;

sound/pci/hda/patch_realtek.c+54−0

 	alc_write_coef_idx(codec, 0x1e, coef | 0x80);
 }
+static void alc269_fixup_headset_mic(struct hda_codec *codec,
+				       const struct hda_fixup *fix, int action)
+{
+	struct alc_spec *spec = codec->spec;
+	if (action == HDA_FIXUP_ACT_PRE_PROBE)
+		spec->parse_flags |= HDA_PINCFG_HEADSET_MIC;
+}
 static void alc271_fixup_dmic(struct hda_codec *codec,
 			      const struct hda_fixup *fix, int action)
 {
 	}
 }
+static void alc290_fixup_mono_speakers(struct hda_codec *codec,
+				       const struct hda_fixup *fix, int action)
+{
+	if (action == HDA_FIXUP_ACT_PRE_PROBE)
+		/* Remove DAC node 0x03, as it seems to be
+		   giving mono output */
+		snd_hda_override_wcaps(codec, 0x03, 0);
+}
 enum {
 	ALC269_FIXUP_SONY_VAIO,
 	ALC275_FIXUP_SONY_VAIO_GPIO2,
 	ALC271_FIXUP_DMIC,
 	ALC269_FIXUP_PCM_44K,
 	ALC269_FIXUP_STEREO_DMIC,
+	ALC269_FIXUP_HEADSET_MIC,
 	ALC269_FIXUP_QUANTA_MUTE,
 	ALC269_FIXUP_LIFEBOOK,
 	ALC269_FIXUP_AMIC,
 	ALC269_FIXUP_HP_GPIO_LED,
 	ALC269_FIXUP_INV_DMIC,
 	ALC269_FIXUP_LENOVO_DOCK,
+	ALC286_FIXUP_SONY_MIC_NO_PRESENCE,
 	ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT,
 	ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
 	ALC269_FIXUP_DELL2_MIC_NO_PRESENCE,
+	ALC269_FIXUP_DELL3_MIC_NO_PRESENCE,
 	ALC269_FIXUP_HEADSET_MODE,
 	ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC,
 	ALC269_FIXUP_ASUS_X101_FUNC,
 	ALC283_FIXUP_CHROME_BOOK,
 	ALC282_FIXUP_ASUS_TX300,
 	ALC283_FIXUP_INT_MIC,
+	ALC290_FIXUP_MONO_SPEAKERS,
 };
 static const struct hda_fixup alc269_fixups[] = {
 		.type = HDA_FIXUP_FUNC,
 		.v.func = alc269_fixup_stereo_dmic,
 	},
+	[ALC269_FIXUP_HEADSET_MIC] = {
+		.type = HDA_FIXUP_FUNC,
+		.v.func = alc269_fixup_headset_mic,
+	},
 	[ALC269_FIXUP_QUANTA_MUTE] = {
 		.type = HDA_FIXUP_FUNC,
 		.v.func = alc269_fixup_quanta_mute,
 		.chained = true,
 		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC
 	},
+	[ALC269_FIXUP_DELL3_MIC_NO_PRESENCE] = {
+		.type = HDA_FIXUP_PINS,
+		.v.pins = (const struct hda_pintbl[]) {
+			{ 0x1a, 0x01a1913c }, /* use as headset mic, without its own jack detect */
+			{ }
+		},
+		.chained = true,
+		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC
+	},
 	[ALC269_FIXUP_HEADSET_MODE] = {
 		.type = HDA_FIXUP_FUNC,
 		.v.func = alc_fixup_headset_mode,
 		.type = HDA_FIXUP_FUNC,
 		.v.func = alc_fixup_headset_mode_no_hp_mic,
 	},
+	[ALC286_FIXUP_SONY_MIC_NO_PRESENCE] = {
+		.type = HDA_FIXUP_PINS,
+		.v.pins = (const struct hda_pintbl[]) {
+			{ 0x18, 0x01a1913c }, /* use as headset mic, without its own jack detect */
+			{ }
+		},
+		.chained = true,
+		.chain_id = ALC269_FIXUP_HEADSET_MIC
+	},
 	[ALC269_FIXUP_ASUS_X101_FUNC] = {
 		.type = HDA_FIXUP_FUNC,
 		.v.func = alc269_fixup_x101_headset_mic,
 		.chained = true,
 		.chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST
 	},
+	[ALC290_FIXUP_MONO_SPEAKERS] = {
+		.type = HDA_FIXUP_FUNC,
+		.v.func = alc290_fixup_mono_speakers,
+		.chained = true,
+		.chain_id = ALC269_FIXUP_DELL3_MIC_NO_PRESENCE,
+	},
 };
 static const struct snd_pci_quirk alc269_fixup_tbl[] = {
 	SND_PCI_QUIRK(0x1028, 0x0608, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1028, 0x0609, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1028, 0x0613, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
+	SND_PCI_QUIRK(0x1028, 0x0616, "Dell Vostro 5470", ALC290_FIXUP_MONO_SPEAKERS),
 	SND_PCI_QUIRK(0x1028, 0x15cc, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1028, 0x15cd, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),
 	SND_PCI_QUIRK(0x1043, 0x8398, "ASUS P1005", ALC269_FIXUP_STEREO_DMIC),
 	SND_PCI_QUIRK(0x1043, 0x83ce, "ASUS P1005", ALC269_FIXUP_STEREO_DMIC),
 	SND_PCI_QUIRK(0x1043, 0x8516, "ASUS X101CH", ALC269_FIXUP_ASUS_X101),
+	SND_PCI_QUIRK(0x104d, 0x90b6, "Sony VAIO Pro 13", ALC286_FIXUP_SONY_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x104d, 0x9073, "Sony VAIO", ALC275_FIXUP_SONY_VAIO_GPIO2),
 	SND_PCI_QUIRK(0x104d, 0x907b, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
 	SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
 	{.id = ALC269_FIXUP_STEREO_DMIC, .name = "alc269-dmic"},
 	{.id = ALC271_FIXUP_DMIC, .name = "alc271-dmic"},
 	{.id = ALC269_FIXUP_INV_DMIC, .name = "inv-dmic"},
+	{.id = ALC269_FIXUP_HEADSET_MIC, .name = "headset-mic"},
 	{.id = ALC269_FIXUP_LENOVO_DOCK, .name = "lenovo-dock"},
 	{.id = ALC269_FIXUP_HP_GPIO_LED, .name = "hp-gpio-led"},
 	{.id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "dell-headset-multi"},
 	SND_PCI_QUIRK(0x1028, 0x05d8, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1028, 0x05db, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800),
+	SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_ASUS_MODE4),
 	SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT),
 	SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2),
 	SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD),

sound/pci/rme9652/hdsp.c+1−0

@@ -4845,6 +4845,7 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep hw, struct file file, unsigne · 4844 unmodified lines
4845	if ((err = hdsp_get_iobox_version(hdsp)) < 0)	4845	if ((err = hdsp_get_iobox_version(hdsp)) < 0)
4846	return err;	4846	return err;
4847	}	4847	}
		4848	memset(&hdsp_version, 0, sizeof(hdsp_version));
4848	hdsp_version.io_type = hdsp->io_type;	4849	hdsp_version.io_type = hdsp->io_type;
4849	hdsp_version.firmware_rev = hdsp->firmware_rev;	4850	hdsp_version.firmware_rev = hdsp->firmware_rev;
4850	if ((err = copy_to_user(argp, &hdsp_version, sizeof(hdsp_version))))	4851	if ((err = copy_to_user(argp, &hdsp_version, sizeof(hdsp_version))))

sound/soc/blackfin/bf6xx-i2s.c+1−0

@@ -88,6 +88,7 @@ static int bfin_i2s_hw_params(struct snd_pcm_substream *substream, · 87 unmodified lines
88	case SNDRV_PCM_FORMAT_S8:	88	case SNDRV_PCM_FORMAT_S8:
89	param.spctl \|= 0x70;	89	param.spctl \|= 0x70;
90	sport->wdsize = 1;	90	sport->wdsize = 1;
		91	break;
91	case SNDRV_PCM_FORMAT_S16_LE:	92	case SNDRV_PCM_FORMAT_S16_LE:
92	param.spctl \|= 0xf0;	93	param.spctl \|= 0xf0;
93	sport->wdsize = 2;	94	sport->wdsize = 2;

sound/soc/codecs/88pm860x-codec.c+3−0

@@ -349,6 +349,9 @@ static int snd_soc_put_volsw_2r_st(struct snd_kcontrol *kcontrol, · 348 unmodified lines
349	val = ucontrol->value.integer.value[0];	349	val = ucontrol->value.integer.value[0];
350	val2 = ucontrol->value.integer.value[1];	350	val2 = ucontrol->value.integer.value[1];
351		351
		352	if (val >= ARRAY_SIZE(st_table) \|\| val2 >= ARRAY_SIZE(st_table))
		353	return -EINVAL;
		354
352	err = snd_soc_update_bits(codec, reg, 0x3f, st_table[val].m);	355	err = snd_soc_update_bits(codec, reg, 0x3f, st_table[val].m);
353	if (err < 0)	356	if (err < 0)
354	return err;	357	return err;

sound/soc/codecs/ab8500-codec.c+6−1

 	struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev);
 	struct device *dev = codec->dev;
 	bool apply_fir, apply_iir;
-	int req, status;
+	unsigned int req;
+	int status;
 	dev_dbg(dev, "%s: Enter.\n", __func__);
 	mutex_lock(&drvdata->anc_lock);
 	req = ucontrol->value.integer.value[0];
+	if (req >= ARRAY_SIZE(enum_anc_state)) {
+		status = -EINVAL;
+		goto cleanup;
+	}
 	if (req != ANC_APPLY_FIR_IIR && req != ANC_APPLY_FIR &&
 		req != ANC_APPLY_IIR) {
 		dev_err(dev, "%s: ERROR: Unsupported status to set '%s'!\n",

sound/soc/codecs/max98095.c+2−2

@@ -1863,7 +1863,7 @@ static int max98095_put_eq_enum(struct snd_kcontrol *kcontrol, · 1862 unmodified lines
1863	struct max98095_pdata *pdata = max98095->pdata;	1863	struct max98095_pdata *pdata = max98095->pdata;
1864	int channel = max98095_get_eq_channel(kcontrol->id.name);	1864	int channel = max98095_get_eq_channel(kcontrol->id.name);
1865	struct max98095_cdata *cdata;	1865	struct max98095_cdata *cdata;
1866	int sel = ucontrol->value.integer.value[0];	1866	unsigned int sel = ucontrol->value.integer.value[0];
1867	struct max98095_eq_cfg *coef_set;	1867	struct max98095_eq_cfg *coef_set;
1868	int fs, best, best_val, i;	1868	int fs, best, best_val, i;
1869	int regmask, regsave;	1869	int regmask, regsave;
@@ -2016,7 +2016,7 @@ static int max98095_put_bq_enum(struct snd_kcontrol *kcontrol, · 146 unmodified lines
2016	struct max98095_pdata *pdata = max98095->pdata;	2016	struct max98095_pdata *pdata = max98095->pdata;
2017	int channel = max98095_get_bq_channel(codec, kcontrol->id.name);	2017	int channel = max98095_get_bq_channel(codec, kcontrol->id.name);
2018	struct max98095_cdata *cdata;	2018	struct max98095_cdata *cdata;
2019	int sel = ucontrol->value.integer.value[0];	2019	unsigned int sel = ucontrol->value.integer.value[0];
2020	struct max98095_biquad_cfg *coef_set;	2020	struct max98095_biquad_cfg *coef_set;
2021	int fs, best, best_val, i;	2021	int fs, best, best_val, i;
2022	int regmask, regsave;	2022	int regmask, regsave;

sound/soc/codecs/pcm1681.c+1−1

@@ -270,7 +270,7 @@ MODULE_DEVICE_TABLE(of, pcm1681_dt_ids); · 269 unmodified lines
270	static const struct regmap_config pcm1681_regmap = {	270	static const struct regmap_config pcm1681_regmap = {
271	.reg_bits = 8,	271	.reg_bits = 8,
272	.val_bits = 8,	272	.val_bits = 8,
273	.max_register = ARRAY_SIZE(pcm1681_reg_defaults) + 1,	273	.max_register = 0x13,
274	.reg_defaults = pcm1681_reg_defaults,	274	.reg_defaults = pcm1681_reg_defaults,
275	.num_reg_defaults = ARRAY_SIZE(pcm1681_reg_defaults),	275	.num_reg_defaults = ARRAY_SIZE(pcm1681_reg_defaults),
276	.writeable_reg = pcm1681_writeable_reg,	276	.writeable_reg = pcm1681_writeable_reg,

sound/soc/codecs/pcm1792a.c+1−1

@@ -188,7 +188,7 @@ MODULE_DEVICE_TABLE(of, pcm1792a_of_match); · 187 unmodified lines
188	static const struct regmap_config pcm1792a_regmap = {	188	static const struct regmap_config pcm1792a_regmap = {
189	.reg_bits = 8,	189	.reg_bits = 8,
190	.val_bits = 8,	190	.val_bits = 8,
191	.max_register = 24,	191	.max_register = 23,
192	.reg_defaults = pcm1792a_reg_defaults,	192	.reg_defaults = pcm1792a_reg_defaults,
193	.num_reg_defaults = ARRAY_SIZE(pcm1792a_reg_defaults),	193	.num_reg_defaults = ARRAY_SIZE(pcm1792a_reg_defaults),
194	.writeable_reg = pcm1792a_writeable_reg,	194	.writeable_reg = pcm1792a_writeable_reg,

sound/soc/codecs/tlv320aic3x.c+4−0

 	/* Left Input */
 	{"Left Line1L Mux", "single-ended", "LINE1L"},
 	{"Left Line1L Mux", "differential", "LINE1L"},
+	{"Left Line1R Mux", "single-ended", "LINE1R"},
+	{"Left Line1R Mux", "differential", "LINE1R"},
 	{"Left Line2L Mux", "single-ended", "LINE2L"},
 	{"Left Line2L Mux", "differential", "LINE2L"},
 	/* Right Input */
 	{"Right Line1R Mux", "single-ended", "LINE1R"},
 	{"Right Line1R Mux", "differential", "LINE1R"},
+	{"Right Line1L Mux", "single-ended", "LINE1L"},
+	{"Right Line1L Mux", "differential", "LINE1L"},
 	{"Right Line2R Mux", "single-ended", "LINE2R"},
 	{"Right Line2R Mux", "differential", "LINE2R"},

sound/soc/fsl/fsl_ssi.c+1−1

@@ -936,7 +936,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) · 935 unmodified lines
936	ssi_private->ssi_phys = res.start;	936	ssi_private->ssi_phys = res.start;
937		937
938	ssi_private->irq = irq_of_parse_and_map(np, 0);	938	ssi_private->irq = irq_of_parse_and_map(np, 0);
939	if (ssi_private->irq == NO_IRQ) {	939	if (ssi_private->irq == 0) {
940	dev_err(&pdev->dev, "no irq for node %s\n", np->full_name);	940	dev_err(&pdev->dev, "no irq for node %s\n", np->full_name);
941	return -ENXIO;	941	return -ENXIO;
942	}	942	}

sound/soc/fsl/imx-mc13783.c+1−1

@@ -112,7 +112,7 @@ static int imx_mc13783_probe(struct platform_device *pdev) · 111 unmodified lines
112	return ret;	112	return ret;
113	}	113	}
114		114
115	if (machine_is_mx31_3ds()) {	115	if (machine_is_mx31_3ds() \|\| machine_is_mx31moboard()) {
116	imx_audmux_v2_configure_port(MX31_AUDMUX_PORT4_SSI_PINS_4,	116	imx_audmux_v2_configure_port(MX31_AUDMUX_PORT4_SSI_PINS_4,
117	IMX_AUDMUX_V2_PTCR_SYN,	117	IMX_AUDMUX_V2_PTCR_SYN,
118	IMX_AUDMUX_V2_PDCR_RXDSEL(MX31_AUDMUX_PORT1_SSI0) \|	118	IMX_AUDMUX_V2_PDCR_RXDSEL(MX31_AUDMUX_PORT1_SSI0) \|

sound/soc/fsl/imx-sgtl5000.c+5−2

 	struct device_node *ssi_np, *codec_np;
 	struct platform_device *ssi_pdev;
 	struct i2c_client *codec_dev;
-	struct imx_sgtl5000_data *data;
+	struct imx_sgtl5000_data *data = NULL;
 	int int_port, ext_port;
 	int ret;
 		goto fail;
 	}
-	data->codec_clk = devm_clk_get(&codec_dev->dev, NULL);
+	data->codec_clk = clk_get(&codec_dev->dev, NULL);
 	if (IS_ERR(data->codec_clk)) {
 		ret = PTR_ERR(data->codec_clk);
 		goto fail;
 	return 0;
 fail:
+	if (data && !IS_ERR(data->codec_clk))
+		clk_put(data->codec_clk);
 	if (ssi_np)
 		of_node_put(ssi_np);
 	if (codec_np)
 	struct imx_sgtl5000_data *data = platform_get_drvdata(pdev);
 	snd_soc_unregister_card(&data->card);
+	clk_put(data->codec_clk);
 	return 0;
 }

sound/soc/fsl/imx-ssi.c+12−11

 	ssi->fiq_params.dma_params_rx = &ssi->dma_params_rx;
 	ssi->fiq_params.dma_params_tx = &ssi->dma_params_tx;
-	ret = imx_pcm_fiq_init(pdev, &ssi->fiq_params);
+	ssi->fiq_init = imx_pcm_fiq_init(pdev, &ssi->fiq_params);
-	if (ret)
+	ssi->dma_init = imx_pcm_dma_init(pdev);
-		goto failed_pcm_fiq;
-	ret = imx_pcm_dma_init(pdev);
+	if (ssi->fiq_init && ssi->dma_init) {
-	if (ret)
+		ret = ssi->fiq_init;
-		goto failed_pcm_dma;
+		goto failed_pcm;
+	}
 	return 0;
-failed_pcm_dma:
+failed_pcm:
-	imx_pcm_fiq_exit(pdev);
-failed_pcm_fiq:
 	snd_soc_unregister_component(&pdev->dev);
 failed_register:
 	release_mem_region(res->start, resource_size(res));
 	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	struct imx_ssi *ssi = platform_get_drvdata(pdev);
-	imx_pcm_dma_exit(pdev);
+	if (!ssi->dma_init)
-	imx_pcm_fiq_exit(pdev);
+		imx_pcm_dma_exit(pdev);
+	if (!ssi->fiq_init)
+		imx_pcm_fiq_exit(pdev);
 	snd_soc_unregister_component(&pdev->dev);

sound/soc/fsl/imx-ssi.h+2−0

@@ -211,6 +211,8 @@ struct imx_ssi { · 210 unmodified lines
211	struct imx_dma_data filter_data_rx;	211	struct imx_dma_data filter_data_rx;
212	struct imx_pcm_fiq_params fiq_params;	212	struct imx_pcm_fiq_params fiq_params;
213		213
		214	int fiq_init;
		215	int dma_init;
214	int enabled;	216	int enabled;
215	};	217	};
216		218

sound/soc/omap/Kconfig+2−2

@@ -1,6 +1,6 @@
1	config SND_OMAP_SOC	1	config SND_OMAP_SOC
2	tristate "SoC Audio for the Texas Instruments OMAP chips"	2	tristate "SoC Audio for the Texas Instruments OMAP chips"
3	depends on (ARCH_OMAP && DMA_OMAP) \|\| (ARCH_ARM && COMPILE_TEST)	3	depends on (ARCH_OMAP && DMA_OMAP) \|\| (ARM && COMPILE_TEST)
4	select SND_DMAENGINE_PCM	4	select SND_DMAENGINE_PCM
5		5
6	config SND_OMAP_SOC_DMIC	6	config SND_OMAP_SOC_DMIC
@@ -26,7 +26,7 @@ config SND_OMAP_SOC_N810 · 19 unmodified lines
26		26
27	config SND_OMAP_SOC_RX51	27	config SND_OMAP_SOC_RX51
28	tristate "SoC Audio support for Nokia RX-51"	28	tristate "SoC Audio support for Nokia RX-51"
29	depends on SND_OMAP_SOC && ARCH_ARM && (MACH_NOKIA_RX51 \|\| COMPILE_TEST)	29	depends on SND_OMAP_SOC && ARM && (MACH_NOKIA_RX51 \|\| COMPILE_TEST)
30	select SND_OMAP_SOC_MCBSP	30	select SND_OMAP_SOC_MCBSP
31	select SND_SOC_TLV320AIC3X	31	select SND_SOC_TLV320AIC3X
32	select SND_SOC_TPA6130A2	32	select SND_SOC_TPA6130A2

sound/soc/sh/rcar/rsnd.h+2−2

@@ -220,8 +220,8 @@ int rsnd_gen_path_exit(struct rsnd_priv *priv, · 219 unmodified lines
220	void __iomem rsnd_gen_reg_get(struct rsnd_priv priv,	220	void __iomem rsnd_gen_reg_get(struct rsnd_priv priv,
221	struct rsnd_mod *mod,	221	struct rsnd_mod *mod,
222	enum rsnd_reg reg);	222	enum rsnd_reg reg);
223	#define rsnd_is_gen1(s) ((s)->info->flags & RSND_GEN1)	223	#define rsnd_is_gen1(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN1)
224	#define rsnd_is_gen2(s) ((s)->info->flags & RSND_GEN2)	224	#define rsnd_is_gen2(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN2)
225		225
226	/*	226	/*
227	* R-Car ADG	227	* R-Car ADG

sound/soc/soc-core.c+0−1

@@ -1380,7 +1380,6 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order) · 1379 unmodified lines
1380	return -ENODEV;	1380	return -ENODEV;
1381		1381
1382	list_add(&cpu_dai->dapm.list, &card->dapm_list);	1382	list_add(&cpu_dai->dapm.list, &card->dapm_list);
1383	snd_soc_dapm_new_dai_widgets(&cpu_dai->dapm, cpu_dai);
1384	}	1383	}
1385		1384
1386	if (cpu_dai->driver->probe) {	1385	if (cpu_dai->driver->probe) {

sound/usb/usx2y/us122l.c+3−1

 	}
 	area->vm_ops = &usb_stream_hwdep_vm_ops;
-	area->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
+	area->vm_flags |= VM_DONTDUMP;
+	if (!read)
+		area->vm_flags |= VM_DONTEXPAND;
 	area->vm_private_data = us122l;
 	atomic_inc(&us122l->mmap_count);
 out:

sound/usb/usx2y/usbusx2yaudio.c+3−19

@@ -299,19 +299,6 @@ static void usX2Y_error_urb_status(struct usX2Ydev *usX2Y, · 298 unmodified lines
299	usX2Y_clients_stop(usX2Y);	299	usX2Y_clients_stop(usX2Y);
300	}	300	}
301		301
302	static void usX2Y_error_sequence(struct usX2Ydev *usX2Y,
303	struct snd_usX2Y_substream subs, struct urb urb)
304	{
305	snd_printk(KERN_ERR
306	"Sequence Error!(hcd_frame=%i ep=%i%s;wait=%i,frame=%i).\n"
307	"Most probably some urb of usb-frame %i is still missing.\n"
308	"Cause could be too long delays in usb-hcd interrupt handling.\n",
309	usb_get_current_frame_number(usX2Y->dev),
310	subs->endpoint, usb_pipein(urb->pipe) ? "in" : "out",
311	usX2Y->wait_iso_frame, urb->start_frame, usX2Y->wait_iso_frame);
312	usX2Y_clients_stop(usX2Y);
313	}
314
315	static void i_usX2Y_urb_complete(struct urb *urb)	302	static void i_usX2Y_urb_complete(struct urb *urb)
316	{	303	{
317	struct snd_usX2Y_substream *subs = urb->context;	304	struct snd_usX2Y_substream *subs = urb->context;
@@ -328,12 +315,9 @@ static void i_usX2Y_urb_complete(struct urb *urb) · 10 unmodified lines
328	usX2Y_error_urb_status(usX2Y, subs, urb);	315	usX2Y_error_urb_status(usX2Y, subs, urb);
329	return;	316	return;
330	}	317	}
331	if (likely((urb->start_frame & 0xFFFF) == (usX2Y->wait_iso_frame & 0xFFFF)))	318
332	subs->completed_urb = urb;	319	subs->completed_urb = urb;
333	else {	320
334	usX2Y_error_sequence(usX2Y, subs, urb);
335	return;
336	}
337	{	321	{
338	struct snd_usX2Y_substream *capsubs = usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE],	322	struct snd_usX2Y_substream *capsubs = usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE],
339	*playbacksubs = usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK];	323	*playbacksubs = usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK];

sound/usb/usx2y/usx2yhwdeppcm.c+1−6

 		usX2Y_error_urb_status(usX2Y, subs, urb);
 		return;
 	}
-	if (likely((urb->start_frame & 0xFFFF) == (usX2Y->wait_iso_frame & 0xFFFF)))
-		subs->completed_urb = urb;
-	else {
-		usX2Y_error_sequence(usX2Y, subs, urb);
-		return;
-	}
+	subs->completed_urb = urb;
 	capsubs = usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE];
 	capsubs2 = usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE + 2];
 	playbacksubs = usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK];

tools/perf/Makefile+1−0

@@ -770,6 +770,7 @@ check: $(OUTPUT)common-cmds.h · 769 unmodified lines
770	install-bin: all	770	install-bin: all
771	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'	771	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
772	$(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'	772	$(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'
		773	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
773	$(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'	774	$(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
774	ifndef NO_LIBPERL	775	ifndef NO_LIBPERL
775	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'	776	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'

tools/perf/builtin-stat.c+1−0

@@ -457,6 +457,7 @@ static int __run_perf_stat(int argc, const char **argv) · 456 unmodified lines
457	perror("failed to prepare workload");	457	perror("failed to prepare workload");
458	return -1;	458	return -1;
459	}	459	}
		460	child_pid = evsel_list->workload.pid;
460	}	461	}
461		462
462	if (group)	463	if (group)

tools/perf/config/feature-tests.mak+1−1

@@ -219,7 +219,7 @@ define SOURCE_LIBAUDIT · 218 unmodified lines
219		219
220	int main(void)	220	int main(void)
221	{	221	{
222	printf(\"error message: %s\n\", audit_errno_to_name(0));	222	printf(\"error message: %s\", audit_errno_to_name(0));
223	return audit_open();	223	return audit_open();
224	}	224	}
225	endef	225	endef

tools/perf/util/dwarf-aux.c+21−4

  * @die_mem: a buffer for result DIE
  *
  * Search a non-inlined function DIE which includes @addr. Stores the
- * DIE to @die_mem and returns it if found. Returns NULl if failed.
+ * DIE to @die_mem and returns it if found. Returns NULL if failed.
  */
 Dwarf_Die *die_find_realfunc(Dwarf_Die *cu_die, Dwarf_Addr addr,
 				    Dwarf_Die *die_mem)
 	return DIE_FIND_CB_CONTINUE;
 }
+/**
+ * die_find_top_inlinefunc - Search the top inlined function at given address
+ * @sp_die: a subprogram DIE which including @addr
+ * @addr: target address
+ * @die_mem: a buffer for result DIE
+ *
+ * Search an inlined function DIE which includes @addr. Stores the
+ * DIE to @die_mem and returns it if found. Returns NULL if failed.
+ * Even if several inlined functions are expanded recursively, this
+ * doesn't trace it down, and returns the topmost one.
+ */
+Dwarf_Die *die_find_top_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr,
+				   Dwarf_Die *die_mem)
+{
+	return die_find_child(sp_die, __die_find_inline_cb, &addr, die_mem);
+}
 /**
  * die_find_inlinefunc - Search an inlined function at given address
- * @cu_die: a CU DIE which including @addr
+ * @sp_die: a subprogram DIE which including @addr
  * @addr: target address
  * @die_mem: a buffer for result DIE
  *
  * Search an inlined function DIE which includes @addr. Stores the
- * DIE to @die_mem and returns it if found. Returns NULl if failed.
+ * DIE to @die_mem and returns it if found. Returns NULL if failed.
  * If several inlined functions are expanded recursively, this trace
- * it and returns deepest one.
+ * it down and returns deepest one.
  */
 Dwarf_Die *die_find_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr,
 			       Dwarf_Die *die_mem)

tools/perf/util/dwarf-aux.h+5−1

 extern Dwarf_Die *die_find_realfunc(Dwarf_Die *cu_die, Dwarf_Addr addr,
 				    Dwarf_Die *die_mem);
-/* Search an inlined function including given address */
+/* Search the top inlined function including given address */
+extern Dwarf_Die *die_find_top_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr,
+					  Dwarf_Die *die_mem);
+/* Search the deepest inlined function including given address */
 extern Dwarf_Die *die_find_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr,
 				      Dwarf_Die *die_mem);

tools/perf/util/header.c+12−0

@@ -2768,6 +2768,18 @@ int perf_session__read_header(struct perf_session *session) · 2767 unmodified lines
2768	if (perf_file_header__read(&f_header, header, fd) < 0)	2768	if (perf_file_header__read(&f_header, header, fd) < 0)
2769	return -EINVAL;	2769	return -EINVAL;
2770		2770
		2771	/*
		2772	* Sanity check that perf.data was written cleanly; data size is
		2773	* initialized to 0 and updated only if the on_exit function is run.
		2774	* If data size is still 0 then the file contains only partial
		2775	* information. Just warn user and process it as much as it can.
		2776	*/
		2777	if (f_header.data.size == 0) {
		2778	pr_warning("WARNING: The %s file's data size field is 0 which is unexpected.\n"
		2779	"Was the 'perf record' command properly terminated?\n",
		2780	session->filename);
		2781	}
		2782
2771	nr_attrs = f_header.attrs.size / f_header.attr_size;	2783	nr_attrs = f_header.attrs.size / f_header.attr_size;
2772	lseek(fd, f_header.attrs.offset, SEEK_SET);	2784	lseek(fd, f_header.attrs.offset, SEEK_SET);
2773		2785

tools/perf/util/probe-finder.c+33−16

 				struct perf_probe_point *ppt)
 {
 	Dwarf_Die cudie, spdie, indie;
-	Dwarf_Addr _addr, baseaddr;
+	Dwarf_Addr _addr = 0, baseaddr = 0;
-	const char *fname = NULL, *func = NULL, *tmp;
+	const char *fname = NULL, *func = NULL, *basefunc = NULL, *tmp;
 	int baseline = 0, lineno = 0, ret = 0;
 	/* Adjust address with bias */
 	/* Find a corresponding function (name, baseline and baseaddr) */
 	if (die_find_realfunc(&cudie, (Dwarf_Addr)addr, &spdie)) {
 		/* Get function entry information */
-		tmp = dwarf_diename(&spdie);
+		func = basefunc = dwarf_diename(&spdie);
-		if (!tmp ||
+		if (!func ||
 		    dwarf_entrypc(&spdie, &baseaddr) != 0 ||
-		    dwarf_decl_line(&spdie, &baseline) != 0)
+		    dwarf_decl_line(&spdie, &baseline) != 0) {
+			lineno = 0;
 			goto post;
-		func = tmp;
+		}
-		if (addr == (unsigned long)baseaddr)
+		if (addr == (unsigned long)baseaddr) {
 			/* Function entry - Relative line number is 0 */
 			lineno = baseline;
-		else if (die_find_inlinefunc(&spdie, (Dwarf_Addr)addr,
+			fname = dwarf_decl_file(&spdie);
-					     &indie)) {
+			goto post;
+		}
+		/* Track down the inline functions step by step */
+		while (die_find_top_inlinefunc(&spdie, (Dwarf_Addr)addr,
+						&indie)) {
+			/* There is an inline function */
 			if (dwarf_entrypc(&indie, &_addr) == 0 &&
-			    _addr == addr)
+			    _addr == addr) {
 				/*
 				 * addr is at an inline function entry.
 				 * In this case, lineno should be the call-site
-				 * line number.
+				 * line number. (overwrite lineinfo)
 				 */
 				lineno = die_get_call_lineno(&indie);
-			else {
+				fname = die_get_call_file(&indie);
+				break;
+			} else {
 				/*
 				 * addr is in an inline function body.
 				 * Since lineno points one of the lines
 				 * be the entry line of the inline function.
 				 */
 				tmp = dwarf_diename(&indie);
-				if (tmp &&
+				if (!tmp ||
-				    dwarf_decl_line(&spdie, &baseline) == 0)
+				    dwarf_decl_line(&indie, &baseline) != 0)
-					func = tmp;
+					break;
+				func = tmp;
+				spdie = indie;
 			}
 		}
+		/* Verify the lineno and baseline are in a same file */
+		tmp = dwarf_decl_file(&spdie);
+		if (!tmp || strcmp(tmp, fname) != 0)
+			lineno = 0;
 	}
 post:
 	/* Make a relative line number or an offset */
 	if (lineno)
 		ppt->line = lineno - baseline;
-	else if (func)
+	else if (basefunc) {
 		ppt->offset = addr - (unsigned long)baseaddr;
+		func = basefunc;
+	}
 	/* Duplicate strings */
 	if (func) {

tools/perf/util/session.c+3−1

 		tool->sample = process_event_sample_stub;
 	if (tool->mmap == NULL)
 		tool->mmap = process_event_stub;
+	if (tool->mmap2 == NULL)
+		tool->mmap2 = process_event_stub;
 	if (tool->comm == NULL)
 		tool->comm = process_event_stub;
 	if (tool->fork == NULL)
 	file_offset = page_offset;
 	head = data_offset - page_offset;
-	if (data_offset + data_size < file_size)
+	if (data_size && (data_offset + data_size < file_size))
 		file_size = data_offset + data_size;
 	progress_next = file_size / 16;

tools/testing/selftests/timers/posix_timers.c+1−1

@@ -151,7 +151,7 @@ static int check_timer_create(int which) · 150 unmodified lines
151	fflush(stdout);	151	fflush(stdout);
152		152
153	done = 0;	153	done = 0;
154	timer_create(which, NULL, &id);	154	err = timer_create(which, NULL, &id);
155	if (err < 0) {	155	if (err < 0) {
156	perror("Can't create timer\n");	156	perror("Can't create timer\n");
157	return -1;	157	return -1;

virt/kvm/kvm_main.c+4−2

 unsigned long gfn_to_hva_prot(struct kvm *kvm, gfn_t gfn, bool *writable)
 {
 	struct kvm_memory_slot *slot = gfn_to_memslot(kvm, gfn);
-	if (writable)
+	unsigned long hva = __gfn_to_hva_many(slot, gfn, NULL, false);
+	if (!kvm_is_error_hva(hva) && writable)
 		*writable = !memslot_is_readonly(slot);
-	return __gfn_to_hva_many(gfn_to_memslot(kvm, gfn), gfn, NULL, false);
+	return hva;
 }
 static int kvm_read_hva(void *data, void __user *hva, int len)

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code

@@ -95,24 +95,24 @@ initrd: · 94 unmodified lines
95	@test "$(INITRD)" != "" \|\| \	95	@test "$(INITRD)" != "" \|\| \
96	(echo You must specify INITRD; exit -1)	96	(echo You must specify INITRD; exit -1)
97		97
98	install: $(obj)/Image	98	install:
99	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \	99	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
100	$(obj)/Image System.map "$(INSTALL_PATH)"	100	$(obj)/Image System.map "$(INSTALL_PATH)"
101		101
102	zinstall: $(obj)/zImage	102	zinstall:
103	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \	103	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
104	$(obj)/zImage System.map "$(INSTALL_PATH)"	104	$(obj)/zImage System.map "$(INSTALL_PATH)"
105		105
106	uinstall: $(obj)/uImage	106	uinstall:
107	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \	107	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
108	$(obj)/uImage System.map "$(INSTALL_PATH)"	108	$(obj)/uImage System.map "$(INSTALL_PATH)"
109		109
110	zi:	110	zi:
111	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \	111	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
112	$(obj)/zImage System.map "$(INSTALL_PATH)"	112	$(obj)/zImage System.map "$(INSTALL_PATH)"
113		113
114	i:	114	i:
115	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \	115	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
116	$(obj)/Image System.map "$(INSTALL_PATH)"	116	$(obj)/Image System.map "$(INSTALL_PATH)"
117		117
118	subdir- := bootp compressed dts	118	subdir- := bootp compressed dts

@@ -663,18 +663,18 @@ static void exynos_pinctrl_resume(struct samsung_pinctrl_drv_data *drvdata) · 662 unmodified lines
663	/* pin banks of s5pv210 pin-controller */	663	/* pin banks of s5pv210 pin-controller */
664	static struct samsung_pin_bank s5pv210_pin_bank[] = {	664	static struct samsung_pin_bank s5pv210_pin_bank[] = {
665	EXYNOS_PIN_BANK_EINTG(8, 0x000, "gpa0", 0x00),	665	EXYNOS_PIN_BANK_EINTG(8, 0x000, "gpa0", 0x00),
666	EXYNOS_PIN_BANK_EINTG(6, 0x020, "gpa1", 0x04),	666	EXYNOS_PIN_BANK_EINTG(4, 0x020, "gpa1", 0x04),
667	EXYNOS_PIN_BANK_EINTG(8, 0x040, "gpb", 0x08),	667	EXYNOS_PIN_BANK_EINTG(8, 0x040, "gpb", 0x08),
668	EXYNOS_PIN_BANK_EINTG(5, 0x060, "gpc0", 0x0c),	668	EXYNOS_PIN_BANK_EINTG(5, 0x060, "gpc0", 0x0c),
669	EXYNOS_PIN_BANK_EINTG(5, 0x080, "gpc1", 0x10),	669	EXYNOS_PIN_BANK_EINTG(5, 0x080, "gpc1", 0x10),
670	EXYNOS_PIN_BANK_EINTG(4, 0x0a0, "gpd0", 0x14),	670	EXYNOS_PIN_BANK_EINTG(4, 0x0a0, "gpd0", 0x14),
671	EXYNOS_PIN_BANK_EINTG(4, 0x0c0, "gpd1", 0x18),	671	EXYNOS_PIN_BANK_EINTG(6, 0x0c0, "gpd1", 0x18),
672	EXYNOS_PIN_BANK_EINTG(5, 0x0e0, "gpe0", 0x1c),	672	EXYNOS_PIN_BANK_EINTG(8, 0x0e0, "gpe0", 0x1c),
673	EXYNOS_PIN_BANK_EINTG(8, 0x100, "gpe1", 0x20),	673	EXYNOS_PIN_BANK_EINTG(5, 0x100, "gpe1", 0x20),
674	EXYNOS_PIN_BANK_EINTG(6, 0x120, "gpf0", 0x24),	674	EXYNOS_PIN_BANK_EINTG(8, 0x120, "gpf0", 0x24),
675	EXYNOS_PIN_BANK_EINTG(8, 0x140, "gpf1", 0x28),	675	EXYNOS_PIN_BANK_EINTG(8, 0x140, "gpf1", 0x28),
676	EXYNOS_PIN_BANK_EINTG(8, 0x160, "gpf2", 0x2c),	676	EXYNOS_PIN_BANK_EINTG(8, 0x160, "gpf2", 0x2c),
677	EXYNOS_PIN_BANK_EINTG(8, 0x180, "gpf3", 0x30),	677	EXYNOS_PIN_BANK_EINTG(6, 0x180, "gpf3", 0x30),
678	EXYNOS_PIN_BANK_EINTG(7, 0x1a0, "gpg0", 0x34),	678	EXYNOS_PIN_BANK_EINTG(7, 0x1a0, "gpg0", 0x34),
679	EXYNOS_PIN_BANK_EINTG(7, 0x1c0, "gpg1", 0x38),	679	EXYNOS_PIN_BANK_EINTG(7, 0x1c0, "gpg1", 0x38),
680	EXYNOS_PIN_BANK_EINTG(7, 0x1e0, "gpg2", 0x3c),	680	EXYNOS_PIN_BANK_EINTG(7, 0x1e0, "gpg2", 0x3c),