lael-labs/linux

Documentation/admin-guide/pm/intel_pstate.rst+13−3

 ``intel_pstate`` exposes several global attributes (files) in ``sysfs`` to
 control its functionality at the system level.  They are located in the
-``/sys/devices/system/cpu/cpufreq/intel_pstate/`` directory and affect all
+``/sys/devices/system/cpu/intel_pstate/`` directory and affect all CPUs.
-CPUs.
 Some of them are not present if the ``intel_pstate=per_cpu_perf_limits``
 argument is passed to the kernel in the command line.
 	but it affects the maximum possible value of per-policy P-state	limits
 	(see `Interpretation of Policy Attributes`_ below for details).
+``hwp_dynamic_boost``
+	This attribute is only present if ``intel_pstate`` works in the
+	`active mode with the HWP feature enabled <Active Mode With HWP_>`_ in
+	the processor.  If set (equal to 1), it causes the minimum P-state limit
+	to be increased dynamically for a short time whenever a task previously
+	waiting on I/O is selected to run on a given logical CPU (the purpose
+	of this mechanism is to improve performance).
+	This setting has no effect on logical CPUs whose minimum P-state limit
+	is directly set to the highest non-turbo P-state or above it.
 .. _status_attr:
 ``status``
 	That only is supported in some configurations, though (for example, if
 	the `HWP feature is enabled in the processor <Active Mode With HWP_>`_,
 	the operation mode of the driver cannot be changed), and if it is not
-	supported in the current configuration, writes to this attribute with
+	supported in the current configuration, writes to this attribute will
 	fail with an appropriate error.
 Interpretation of Policy Attributes

Documentation/core-api/kernel-api.rst+1−1

@@ -284,7 +284,7 @@ Resources Management · 283 unmodified lines
284	MTRR Handling	284	MTRR Handling
285	-------------	285	-------------
286		286
287	.. kernel-doc:: arch/x86/kernel/cpu/mtrr/main.c	287	.. kernel-doc:: arch/x86/kernel/cpu/mtrr/mtrr.c
288	:export:	288	:export:
289		289
290	Security Framework	290	Security Framework

Documentation/devicetree/bindings/input/sprd,sc27xx-vibra.txt+23−0

@@ -0,0 +1,23 @@
	1	Spreadtrum SC27xx PMIC Vibrator
	2
	3	Required properties:
	4	- compatible: should be "sprd,sc2731-vibrator".
	5	- reg: address of vibrator control register.
	6
	7	Example :
	8
	9	sc2731_pmic: pmic@0 {
	10	compatible = "sprd,sc2731";
	11	reg = <0>;
	12	spi-max-frequency = <26000000>;
	13	interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
	14	interrupt-controller;
	15	#interrupt-cells = <2>;
	16	#address-cells = <1>;
	17	#size-cells = <0>;
	18
	19	vibrator@eb4 {
	20	compatible = "sprd,sc2731-vibrator";
	21	reg = <0xeb4>;
	22	};
	23	};

Documentation/driver-api/infrastructure.rst+2−2

@@ -49,10 +49,10 @@ Device Drivers Base · 48 unmodified lines
49	Device Drivers DMA Management	49	Device Drivers DMA Management
50	-----------------------------	50	-----------------------------
51		51
52	.. kernel-doc:: drivers/base/dma-coherent.c	52	.. kernel-doc:: kernel/dma/coherent.c
53	:export:	53	:export:
54		54
55	.. kernel-doc:: drivers/base/dma-mapping.c	55	.. kernel-doc:: kernel/dma/mapping.c
56	:export:	56	:export:
57		57
58	Device drivers PnP support	58	Device drivers PnP support

Documentation/filesystems/Locking+1−6

 	int (*iterate) (struct file *, struct dir_context *);
 	int (*iterate_shared) (struct file *, struct dir_context *);
 	__poll_t (*poll) (struct file *, struct poll_table_struct *);
-	struct wait_queue_head * (*get_poll_head)(struct file *, __poll_t);
-	__poll_t (*poll_mask) (struct file *, __poll_t);
 	long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
 	long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
 	int (*mmap) (struct file *, struct vm_area_struct *);
 };
 locking rules:
-	All except for ->poll_mask may block.
+	All may block.
 ->llseek() locking has moved from llseek to the individual llseek
 implementations.  If your fs is not using generic_file_llseek, you
 the lease within the individual filesystem to record the result of the
 operation
-->poll_mask can be called with or without the waitqueue lock for the waitqueue
-returned from ->get_poll_head.
 --------------------------- dquot_operations -------------------------------
 prototypes:
 	int (*write_dquot) (struct dquot *);

Documentation/filesystems/cifs/AUTHORS+4−3

 Scott Lovenberg
 Pavel Shilovsky (for great work adding SMB2 support, and various SMB3 features)
 Aurelien Aptel (for DFS SMB3 work and some key bug fixes)
-Ronnie Sahlberg (for SMB3 xattr work and bug fixes)
+Ronnie Sahlberg (for SMB3 xattr work, bug fixes, and lots of great work on compounding)
 Shirish Pargaonkar (for many ACL patches over the years)
 Sachin Prabhu (many bug fixes, including for reconnect, copy offload and security)
+Paulo Alcantara
+Long Li (some great work on RDMA, SMB Direct)
 Test case and Bug Report contributors
 bugs in error paths.  Valuable suggestions also have come from Al Viro
 and Dave Miller.
-And thanks to the IBM LTC and Power test teams and SuSE testers for
+And thanks to the IBM LTC and Power test teams and SuSE and Citrix and RedHat testers for finding multiple bugs during excellent stress test runs.
-finding multiple bugs during excellent stress test runs.

Documentation/filesystems/cifs/CHANGES+3−0

@@ -1,3 +1,6 @@
		1	See https://wiki.samba.org/index.php/LinuxCIFSKernel for
		2	more current information.
		3
1	Version 1.62	4	Version 1.62
2	------------	5	------------
3	Add sockopt=TCP_NODELAY mount option. EA (xattr) routines hardened	6	Add sockopt=TCP_NODELAY mount option. EA (xattr) routines hardened

Documentation/filesystems/cifs/TODO+9−8

@@ -9,14 +9,14 @@ is a partial list of the known problems and missing features: · 8 unmodified lines
9		9
10	a) SMB3 (and SMB3.02) missing optional features:	10	a) SMB3 (and SMB3.02) missing optional features:
11	- multichannel (started), integration with RDMA	11	- multichannel (started), integration with RDMA
12	- directory leases (improved metadata caching)	12	- directory leases (improved metadata caching), started (root dir only)
13	- T10 copy offload (copy chunk, and "Duplicate Extents" ioctl	13	- T10 copy offload ie "ODX" (copy chunk, and "Duplicate Extents" ioctl
14	currently the only two server side copy mechanisms supported)	14	currently the only two server side copy mechanisms supported)
15		15
16	b) improved sparse file support	16	b) improved sparse file support
17		17
18	c) Directory entry caching relies on a 1 second timer, rather than	18	c) Directory entry caching relies on a 1 second timer, rather than
19	using Directory Leases	19	using Directory Leases, currently only the root file handle is cached longer
20		20
21	d) quota support (needs minor kernel change since quota calls	21	d) quota support (needs minor kernel change since quota calls
22	to make it to network filesystems or deviceless filesystems)	22	to make it to network filesystems or deviceless filesystems)
@@ -42,6 +42,8 @@ mount or a per server basis to client UIDs or nobody if no mapping · 19 unmodified lines
42	exists. Also better integration with winbind for resolving SID owners	42	exists. Also better integration with winbind for resolving SID owners
43		43
44	k) Add tools to take advantage of more smb3 specific ioctls and features	44	k) Add tools to take advantage of more smb3 specific ioctls and features
		45	(passthrough ioctl/fsctl for sending various SMB3 fsctls to the server
		46	is in progress)
45		47
46	l) encrypted file support	48	l) encrypted file support
47		49
@@ -71,9 +73,8 @@ t) split cifs and smb3 support into separate modules so legacy (and less · 23 unmodified lines
71	secure) CIFS dialect can be disabled in environments that don't need it	73	secure) CIFS dialect can be disabled in environments that don't need it
72	and simplify the code.	74	and simplify the code.
73		75
74	u) Finish up SMB3.1.1 dialect support	76	v) POSIX Extensions for SMB3.1.1 (started, create and mkdir support added
75		77	so far).
76	v) POSIX Extensions for SMB3.1.1
77		78
78	KNOWN BUGS	79	KNOWN BUGS
79	====================================	80	====================================
@@ -92,8 +93,8 @@ Misc testing to do · 12 unmodified lines
92	1) check out max path names and max path name components against various server	93	1) check out max path names and max path name components against various server
93	types. Try nested symlinks (8 deep). Return max path name in stat -f information	94	types. Try nested symlinks (8 deep). Return max path name in stat -f information
94		95
95	2) Improve xfstest's cifs enablement and adapt xfstests where needed to test	96	2) Improve xfstest's cifs/smb3 enablement and adapt xfstests where needed to test
96	cifs better	97	cifs/smb3 better
97		98
98	3) Additional performance testing and optimization using iozone and similar -	99	3) Additional performance testing and optimization using iozone and similar -
99	there are some easy changes that can be done to parallelize sequential writes,	100	there are some easy changes that can be done to parallelize sequential writes,

Documentation/filesystems/vfs.txt+0−13

@@ -857,8 +857,6 @@ struct file_operations { · 856 unmodified lines
857	ssize_t (write_iter) (struct kiocb , struct iov_iter *);	857	ssize_t (write_iter) (struct kiocb , struct iov_iter *);
858	int (iterate) (struct file , struct dir_context *);	858	int (iterate) (struct file , struct dir_context *);
859	__poll_t (poll) (struct file , struct poll_table_struct *);	859	__poll_t (poll) (struct file , struct poll_table_struct *);
860	struct wait_queue_head * (get_poll_head)(struct file , __poll_t);
861	__poll_t (poll_mask) (struct file , __poll_t);
862	long (unlocked_ioctl) (struct file , unsigned int, unsigned long);	860	long (unlocked_ioctl) (struct file , unsigned int, unsigned long);
863	long (compat_ioctl) (struct file , unsigned int, unsigned long);	861	long (compat_ioctl) (struct file , unsigned int, unsigned long);
864	int (mmap) (struct file , struct vm_area_struct *);	862	int (mmap) (struct file , struct vm_area_struct *);
@@ -903,17 +901,6 @@ otherwise noted. · 38 unmodified lines
903	activity on this file and (optionally) go to sleep until there	901	activity on this file and (optionally) go to sleep until there
904	is activity. Called by the select(2) and poll(2) system calls	902	is activity. Called by the select(2) and poll(2) system calls
905		903
906	get_poll_head: Returns the struct wait_queue_head that callers can
907	wait on. Callers need to check the returned events using ->poll_mask
908	once woken. Can return NULL to indicate polling is not supported,
909	or any error code using the ERR_PTR convention to indicate that a
910	grave error occured and ->poll_mask shall not be called.
911
912	poll_mask: return the mask of EPOLL* values describing the file descriptor
913	state. Called either before going to sleep on the waitqueue returned by
914	get_poll_head, or after it has been woken. If ->get_poll_head and
915	->poll_mask are implemented ->poll does not need to be implement.
916
917	unlocked_ioctl: called by the ioctl(2) system call.	904	unlocked_ioctl: called by the ioctl(2) system call.
918		905
919	compat_ioctl: called by the ioctl(2) system call when 32 bit system calls	906	compat_ioctl: called by the ioctl(2) system call when 32 bit system calls

Documentation/kbuild/kconfig-language.txt+6−0

@@ -430,6 +430,12 @@ This sets the config program's title bar if the config program chooses · 429 unmodified lines
430	to use it. It should be placed at the top of the configuration, before any	430	to use it. It should be placed at the top of the configuration, before any
431	other statement.	431	other statement.
432		432
		433	'#' Kconfig source file comment:
		434
		435	An unquoted '#' character anywhere in a source file line indicates
		436	the beginning of a source file comment. The remainder of that line
		437	is a comment.
		438
433		439
434	Kconfig hints	440	Kconfig hints
435	-------------	441	-------------

Documentation/networking/e100.rst+57−55

@@ -1,3 +1,4 @@
		1	==============================================================
1	Linux* Base Driver for the Intel(R) PRO/100 Family of Adapters	2	Linux* Base Driver for the Intel(R) PRO/100 Family of Adapters
2	==============================================================	3	==============================================================
3		4
@@ -86,83 +87,84 @@ Event Log Message Level: The driver uses the message level flag to log events · 82 unmodified lines
86	Additional Configurations	87	Additional Configurations
87	=========================	88	=========================
88		89
89	Configuring the Driver on Different Distributions	90	Configuring the Driver on Different Distributions
90	-------------------------------------------------	91	-------------------------------------------------
91		92
92	Configuring a network driver to load properly when the system is started is	93	Configuring a network driver to load properly when the system is started
93	distribution dependent. Typically, the configuration process involves adding	94	is distribution dependent. Typically, the configuration process involves
94	an alias line to /etc/modprobe.d/*.conf as well as editing other system	95	adding an alias line to /etc/modprobe.d/*.conf as well as editing other
95	startup scripts and/or configuration files. Many popular Linux	96	system startup scripts and/or configuration files. Many popular Linux
96	distributions ship with tools to make these changes for you. To learn the	97	distributions ship with tools to make these changes for you. To learn
97	proper way to configure a network device for your system, refer to your	98	the proper way to configure a network device for your system, refer to
98	distribution documentation. If during this process you are asked for the	99	your distribution documentation. If during this process you are asked
99	driver or module name, the name for the Linux Base Driver for the Intel	100	for the driver or module name, the name for the Linux Base Driver for
100	PRO/100 Family of Adapters is e100.	101	the Intel PRO/100 Family of Adapters is e100.
101		102
102	As an example, if you install the e100 driver for two PRO/100 adapters	103	As an example, if you install the e100 driver for two PRO/100 adapters
103	(eth0 and eth1), add the following to a configuration file in /etc/modprobe.d/	104	(eth0 and eth1), add the following to a configuration file in
		105	/etc/modprobe.d/::
104		106
105	alias eth0 e100	107	alias eth0 e100
106	alias eth1 e100	108	alias eth1 e100
107		109
108	Viewing Link Messages	110	Viewing Link Messages
109	---------------------	111	---------------------
110	In order to see link messages and other Intel driver information on your
111	console, you must set the dmesg level up to six. This can be done by
112	entering the following on the command line before loading the e100 driver::
113
114	dmesg -n 6
115		112
116	If you wish to see all messages issued by the driver, including debug	113	In order to see link messages and other Intel driver information on your
117	messages, set the dmesg level to eight.	114	console, you must set the dmesg level up to six. This can be done by
		115	entering the following on the command line before loading the e100
		116	driver::
118		117
119	NOTE: This setting is not saved across reboots.	118	dmesg -n 6
120		119
		120	If you wish to see all messages issued by the driver, including debug
		121	messages, set the dmesg level to eight.
121		122
122	ethtool	123	NOTE: This setting is not saved across reboots.
123	-------
124		124
125	The driver utilizes the ethtool interface for driver configuration and	125	ethtool
126	diagnostics, as well as displaying statistical information. The ethtool	126	-------
127	version 1.6 or later is required for this functionality.
128		127
129	The latest release of ethtool can be found from	128	The driver utilizes the ethtool interface for driver configuration and
130	https://www.kernel.org/pub/software/network/ethtool/	129	diagnostics, as well as displaying statistical information. The ethtool
		130	version 1.6 or later is required for this functionality.
131		131
132	Enabling Wake on LAN* (WoL)	132	The latest release of ethtool can be found from
133	---------------------------	133	https://www.kernel.org/pub/software/network/ethtool/
134	WoL is provided through the ethtool* utility. For instructions on enabling
135	WoL with ethtool, refer to the ethtool man page.
136		134
137	WoL will be enabled on the system during the next shut down or reboot. For	135	Enabling Wake on LAN* (WoL)
138	this driver version, in order to enable WoL, the e100 driver must be	136	---------------------------
139	loaded when shutting down or rebooting the system.	137	WoL is provided through the ethtool* utility. For instructions on
		138	enabling WoL with ethtool, refer to the ethtool man page. WoL will be
		139	enabled on the system during the next shut down or reboot. For this
		140	driver version, in order to enable WoL, the e100 driver must be loaded
		141	when shutting down or rebooting the system.
140		142
141	NAPI	143	NAPI
142	----	144	----
143		145
144	NAPI (Rx polling mode) is supported in the e100 driver.	146	NAPI (Rx polling mode) is supported in the e100 driver.
145		147
146	See https://wiki.linuxfoundation.org/networking/napi for more information	148	See https://wiki.linuxfoundation.org/networking/napi for more
147	on NAPI.	149	information on NAPI.
148		150
149	Multiple Interfaces on Same Ethernet Broadcast Network	151	Multiple Interfaces on Same Ethernet Broadcast Network
150	------------------------------------------------------	152	------------------------------------------------------
151		153
152	Due to the default ARP behavior on Linux, it is not possible to have	154	Due to the default ARP behavior on Linux, it is not possible to have one
153	one system on two IP networks in the same Ethernet broadcast domain	155	system on two IP networks in the same Ethernet broadcast domain
154	(non-partitioned switch) behave as expected. All Ethernet interfaces	156	(non-partitioned switch) behave as expected. All Ethernet interfaces
155	will respond to IP traffic for any IP address assigned to the system.	157	will respond to IP traffic for any IP address assigned to the system.
156	This results in unbalanced receive traffic.	158	This results in unbalanced receive traffic.
157		159
158	If you have multiple interfaces in a server, either turn on ARP	160	If you have multiple interfaces in a server, either turn on ARP
159	filtering by	161	filtering by
160		162
161	(1) entering:: echo 1 > /proc/sys/net/ipv4/conf/all/arp_filter	163	(1) entering:: echo 1 > /proc/sys/net/ipv4/conf/all/arp_filter
162	(this only works if your kernel's version is higher than 2.4.5), or	164	(this only works if your kernel's version is higher than 2.4.5), or
163		165
164	(2) installing the interfaces in separate broadcast domains (either	166	(2) installing the interfaces in separate broadcast domains (either
165	in different switches or in a switch partitioned to VLANs).	167	in different switches or in a switch partitioned to VLANs).
166		168
167		169
168	Support	170	Support

Documentation/networking/e1000.rst+39−37

@@ -1,3 +1,4 @@
		1	===========================================================
1	Linux* Base Driver for Intel(R) Ethernet Network Connection	2	Linux* Base Driver for Intel(R) Ethernet Network Connection
2	===========================================================	3	===========================================================
3		4
@@ -354,57 +355,58 @@ previously mentioned to force the adapter to the same speed and duplex. · 350 unmodified lines
354	Additional Configurations	355	Additional Configurations
355	=========================	356	=========================
356		357
357	Jumbo Frames	358	Jumbo Frames
358	------------	359	------------
359	Jumbo Frames support is enabled by changing the MTU to a value larger than	360	Jumbo Frames support is enabled by changing the MTU to a value larger
360	the default of 1500. Use the ifconfig command to increase the MTU size.	361	than the default of 1500. Use the ifconfig command to increase the MTU
361	For example::	362	size. For example::
362		363
363	ifconfig eth<x> mtu 9000 up	364	ifconfig eth<x> mtu 9000 up
364		365
365	This setting is not saved across reboots. It can be made permanent if	366	This setting is not saved across reboots. It can be made permanent if
366	you add::	367	you add::
367		368
368	MTU=9000	369	MTU=9000
369		370
370	to the file /etc/sysconfig/network-scripts/ifcfg-eth<x>. This example	371	to the file /etc/sysconfig/network-scripts/ifcfg-eth<x>. This example
371	applies to the Red Hat distributions; other distributions may store this	372	applies to the Red Hat distributions; other distributions may store this
372	setting in a different location.	373	setting in a different location.
		374
		375	Notes: Degradation in throughput performance may be observed in some
		376	Jumbo frames environments. If this is observed, increasing the
		377	application's socket buffer size and/or increasing the
		378	/proc/sys/net/ipv4/tcp_*mem entry values may help. See the specific
		379	application manual and /usr/src/linux*/Documentation/
		380	networking/ip-sysctl.txt for more details.
373		381
374	Notes:	382	- The maximum MTU setting for Jumbo Frames is 16110. This value
375	Degradation in throughput performance may be observed in some Jumbo frames	383	coincides with the maximum Jumbo Frames size of 16128.
376	environments. If this is observed, increasing the application's socket buffer
377	size and/or increasing the /proc/sys/net/ipv4/tcp_*mem entry values may help.
378	See the specific application manual and /usr/src/linux*/Documentation/
379	networking/ip-sysctl.txt for more details.
380		384
381	- The maximum MTU setting for Jumbo Frames is 16110. This value coincides	385	- Using Jumbo frames at 10 or 100 Mbps is not supported and may result
382	with the maximum Jumbo Frames size of 16128.	386	in poor performance or loss of link.
383		387
384	- Using Jumbo frames at 10 or 100 Mbps is not supported and may result in	388	- Adapters based on the Intel(R) 82542 and 82573V/E controller do not
385	poor performance or loss of link.	389	support Jumbo Frames. These correspond to the following product names:
		390	Intel(R) PRO/1000 Gigabit Server Adapter Intel(R) PRO/1000 PM Network
		391	Connection
386		392
387	- Adapters based on the Intel(R) 82542 and 82573V/E controller do not	393	ethtool
388	support Jumbo Frames. These correspond to the following product names:	394	-------
389	Intel(R) PRO/1000 Gigabit Server Adapter	395	The driver utilizes the ethtool interface for driver configuration and
390	Intel(R) PRO/1000 PM Network Connection	396	diagnostics, as well as displaying statistical information. The ethtool
		397	version 1.6 or later is required for this functionality.
391		398
392	ethtool	399	The latest release of ethtool can be found from
393	-------	400	https://www.kernel.org/pub/software/network/ethtool/
394	The driver utilizes the ethtool interface for driver configuration and
395	diagnostics, as well as displaying statistical information. The ethtool
396	version 1.6 or later is required for this functionality.
397		401
398	The latest release of ethtool can be found from	402	Enabling Wake on LAN* (WoL)
399	https://www.kernel.org/pub/software/network/ethtool/	403	---------------------------
		404	WoL is configured through the ethtool* utility.
400		405
401	Enabling Wake on LAN* (WoL)	406	WoL will be enabled on the system during the next shut down or reboot.
402	---------------------------	407	For this driver version, in order to enable WoL, the e1000 driver must be
403	WoL is configured through the ethtool* utility.	408	loaded when shutting down or rebooting the system.
404		409
405	WoL will be enabled on the system during the next shut down or reboot.
406	For this driver version, in order to enable WoL, the e1000 driver must be
407	loaded when shutting down or rebooting the system.
408		410
409	Support	411	Support
410	=======	412	=======

Documentation/networking/strparser.txt+1−1

@@ -48,7 +48,7 @@ void strp_pause(struct strparser *strp) · 47 unmodified lines
48	Temporarily pause a stream parser. Message parsing is suspended	48	Temporarily pause a stream parser. Message parsing is suspended
49	and no new messages are delivered to the upper layer.	49	and no new messages are delivered to the upper layer.
50		50
51	void strp_pause(struct strparser *strp)	51	void strp_unpause(struct strparser *strp)
52		52
53	Unpause a paused stream parser.	53	Unpause a paused stream parser.
54		54

Documentation/trace/histogram.txt+12−11

 associated event field will be saved in a variable but won't be summed
 as a value:
-  # echo 'hist:keys=next_pid:ts1=common_timestamp ... >> event/trigger
+  # echo 'hist:keys=next_pid:ts1=common_timestamp ...' >> event/trigger
 Multiple variables can be assigned at the same time.  The below would
 result in both ts0 and b being created as variables, with both
 common_timestamp and field1 additionally being summed as values:
-  # echo 'hist:keys=pid:vals=$ts0,$b:ts0=common_timestamp,b=field1 ... >> \
+  # echo 'hist:keys=pid:vals=$ts0,$b:ts0=common_timestamp,b=field1 ...' >> \
 	event/trigger
 Note that variable assignments can appear either preceding or
 following their use.  The command below behaves identically to the
 command above:
-  # echo 'hist:keys=pid:ts0=common_timestamp,b=field1:vals=$ts0,$b ... >> \
+  # echo 'hist:keys=pid:ts0=common_timestamp,b=field1:vals=$ts0,$b ...' >> \
 	event/trigger
 Any number of variables not bound to a 'vals=' prefix can also be
 assigned by simply separating them with colons.  Below is the same
 thing but without the values being summed in the histogram:
-  # echo 'hist:keys=pid:ts0=common_timestamp:b=field1 ... >> event/trigger
+  # echo 'hist:keys=pid:ts0=common_timestamp:b=field1 ...' >> event/trigger
 Variables set as above can be referenced and used in expressions on
 another event.
 For example, here's how a latency can be calculated:
-  # echo 'hist:keys=pid,prio:ts0=common_timestamp ... >> event1/trigger
+  # echo 'hist:keys=pid,prio:ts0=common_timestamp ...' >> event1/trigger
-  # echo 'hist:keys=next_pid:wakeup_lat=common_timestamp-$ts0 ... >> event2/trigger
+  # echo 'hist:keys=next_pid:wakeup_lat=common_timestamp-$ts0 ...' >> event2/trigger
 In the first line above, the event's timetamp is saved into the
 variable ts0.  In the next line, ts0 is subtracted from the second
 makes use of the wakeup_lat variable to compute a combined latency
 using the same key and variable from yet another event:
-  # echo 'hist:key=pid:wakeupswitch_lat=$wakeup_lat+$switchtime_lat ... >> event3/trigger
+  # echo 'hist:key=pid:wakeupswitch_lat=$wakeup_lat+$switchtime_lat ...' >> event3/trigger
 2.2.2 Synthetic Events
 ----------------------
 At this point, there isn't yet an actual 'wakeup_latency' event
 instantiated in the event subsytem - for this to happen, a 'hist
 trigger action' needs to be instantiated and bound to actual fields
-and variables defined on other events (see Section 6.3.3 below).
+and variables defined on other events (see Section 2.2.3 below on
+how that is done using hist trigger 'onmatch' action). Once that is
+done, the 'wakeup_latency' synthetic event instance is created.
-Once that is done, an event instance is created, and a histogram can
+A histogram can now be defined for the new synthetic event:
-be defined using it:
   # echo 'hist:keys=pid,prio,lat.log2:sort=pid,lat' >> \
         /sys/kernel/debug/tracing/events/synthetic/wakeup_latency/trigger
     back to that pid, the timestamp difference is calculated.  If the
     resulting latency, stored in wakeup_lat, exceeds the current
     maximum latency, the values specified in the save() fields are
-    recoreded:
+    recorded:
     # echo 'hist:keys=pid:ts0=common_timestamp.usecs \
             if comm=="cyclictest"' >> \

Documentation/usb/gadget_configfs.txt+1−1

@@ -226,7 +226,7 @@ $ rm configs/<config name>.<number>/<function> · 225 unmodified lines
226	where <config name>.<number> specify the configuration and <function> is	226	where <config name>.<number> specify the configuration and <function> is
227	a symlink to a function being removed from the configuration, e.g.:	227	a symlink to a function being removed from the configuration, e.g.:
228		228
229	$ rm configfs/c.1/ncm.usb0	229	$ rm configs/c.1/ncm.usb0
230		230
231	...	231	...
232	...	232	...

Documentation/virtual/kvm/api.txt+1−1

@@ -4610,7 +4610,7 @@ This capability indicates that kvm will implement the interfaces to handle · 4609 unmodified lines
4610	reset, migration and nested KVM for branch prediction blocking. The stfle	4610	reset, migration and nested KVM for branch prediction blocking. The stfle
4611	facility 82 should not be provided to the guest without this capability.	4611	facility 82 should not be provided to the guest without this capability.
4612		4612
4613	8.14 KVM_CAP_HYPERV_TLBFLUSH	4613	8.18 KVM_CAP_HYPERV_TLBFLUSH
4614		4614
4615	Architectures: x86	4615	Architectures: x86
4616		4616

MAINTAINERS+36−14

@@ -2971,9 +2971,13 @@ N: bcm585* · 2970 unmodified lines
2971	N: bcm586*	2971	N: bcm586*
2972	N: bcm88312	2972	N: bcm88312
2973	N: hr2	2973	N: hr2
2974	F: arch/arm64/boot/dts/broadcom/ns2*	2974	N: stingray
		2975	F: arch/arm64/boot/dts/broadcom/northstar2/*
		2976	F: arch/arm64/boot/dts/broadcom/stingray/*
2975	F: drivers/clk/bcm/clk-ns*	2977	F: drivers/clk/bcm/clk-ns*
		2978	F: drivers/clk/bcm/clk-sr*
2976	F: drivers/pinctrl/bcm/pinctrl-ns*	2979	F: drivers/pinctrl/bcm/pinctrl-ns*
		2980	F: include/dt-bindings/clock/bcm-sr*
2977		2981
2978	BROADCOM KONA GPIO DRIVER	2982	BROADCOM KONA GPIO DRIVER
2979	M: Ray Jui <rjui@broadcom.com>	2983	M: Ray Jui <rjui@broadcom.com>
@@ -4360,12 +4364,7 @@ L: iommu@lists.linux-foundation.org · 1380 unmodified lines
4360	T: git git://git.infradead.org/users/hch/dma-mapping.git	4364	T: git git://git.infradead.org/users/hch/dma-mapping.git
4361	W: http://git.infradead.org/users/hch/dma-mapping.git	4365	W: http://git.infradead.org/users/hch/dma-mapping.git
4362	S: Supported	4366	S: Supported
4363	F: lib/dma-debug.c	4367	F: kernel/dma/
4364	F: lib/dma-direct.c
4365	F: lib/dma-noncoherent.c
4366	F: lib/dma-virt.c
4367	F: drivers/base/dma-mapping.c
4368	F: drivers/base/dma-coherent.c
4369	F: include/asm-generic/dma-mapping.h	4368	F: include/asm-generic/dma-mapping.h
4370	F: include/linux/dma-direct.h	4369	F: include/linux/dma-direct.h
4371	F: include/linux/dma-mapping.h	4370	F: include/linux/dma-mapping.h
@@ -5674,7 +5673,7 @@ F: drivers/crypto/caam/ · 1302 unmodified lines
5674	F: Documentation/devicetree/bindings/crypto/fsl-sec4.txt	5673	F: Documentation/devicetree/bindings/crypto/fsl-sec4.txt
5675		5674
5676	FREESCALE DIU FRAMEBUFFER DRIVER	5675	FREESCALE DIU FRAMEBUFFER DRIVER
5677	M: Timur Tabi <timur@tabi.org>	5676	M: Timur Tabi <timur@kernel.org>
5678	L: linux-fbdev@vger.kernel.org	5677	L: linux-fbdev@vger.kernel.org
5679	S: Maintained	5678	S: Maintained
5680	F: drivers/video/fbdev/fsl-diu-fb.*	5679	F: drivers/video/fbdev/fsl-diu-fb.*
@@ -5774,7 +5773,7 @@ S: Maintained · 93 unmodified lines
5774	F: drivers/net/wan/fsl_ucc_hdlc*	5773	F: drivers/net/wan/fsl_ucc_hdlc*
5775		5774
5776	FREESCALE QUICC ENGINE UCC UART DRIVER	5775	FREESCALE QUICC ENGINE UCC UART DRIVER
5777	M: Timur Tabi <timur@tabi.org>	5776	M: Timur Tabi <timur@kernel.org>
5778	L: linuxppc-dev@lists.ozlabs.org	5777	L: linuxppc-dev@lists.ozlabs.org
5779	S: Maintained	5778	S: Maintained
5780	F: drivers/tty/serial/ucc_uart.c	5779	F: drivers/tty/serial/ucc_uart.c
@@ -5798,7 +5797,7 @@ F: drivers/net/ethernet/freescale/fs_enet/ · 17 unmodified lines
5798	F: include/linux/fs_enet_pd.h	5797	F: include/linux/fs_enet_pd.h
5799		5798
5800	FREESCALE SOC SOUND DRIVERS	5799	FREESCALE SOC SOUND DRIVERS
5801	M: Timur Tabi <timur@tabi.org>	5800	M: Timur Tabi <timur@kernel.org>
5802	M: Nicolin Chen <nicoleotsuka@gmail.com>	5801	M: Nicolin Chen <nicoleotsuka@gmail.com>
5803	M: Xiubo Li <Xiubo.Lee@gmail.com>	5802	M: Xiubo Li <Xiubo.Lee@gmail.com>
5804	R: Fabio Estevam <fabio.estevam@nxp.com>	5803	R: Fabio Estevam <fabio.estevam@nxp.com>
@@ -9756,6 +9755,11 @@ L: linux-scsi@vger.kernel.org · 3951 unmodified lines
9756	S: Maintained	9755	S: Maintained
9757	F: drivers/scsi/NCR_D700.*	9756	F: drivers/scsi/NCR_D700.*
9758		9757
		9758	NCSI LIBRARY:
		9759	M: Samuel Mendoza-Jonas <sam@mendozajonas.com>
		9760	S: Maintained
		9761	F: net/ncsi/
		9762
9759	NCT6775 HARDWARE MONITOR DRIVER	9763	NCT6775 HARDWARE MONITOR DRIVER
9760	M: Guenter Roeck <linux@roeck-us.net>	9764	M: Guenter Roeck <linux@roeck-us.net>
9761	L: linux-hwmon@vger.kernel.org	9765	L: linux-hwmon@vger.kernel.org
@@ -9882,6 +9886,7 @@ M: Andrew Lunn <andrew@lunn.ch> · 120 unmodified lines
9882	M: Vivien Didelot <vivien.didelot@savoirfairelinux.com>	9886	M: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
9883	M: Florian Fainelli <f.fainelli@gmail.com>	9887	M: Florian Fainelli <f.fainelli@gmail.com>
9884	S: Maintained	9888	S: Maintained
		9889	F: Documentation/devicetree/bindings/net/dsa/
9885	F: net/dsa/	9890	F: net/dsa/
9886	F: include/net/dsa.h	9891	F: include/net/dsa.h
9887	F: include/linux/dsa/	9892	F: include/linux/dsa/
@@ -11476,6 +11481,15 @@ W: http://wireless.kernel.org/en/users/Drivers/p54 · 1588 unmodified lines
11476	S: Obsolete	11481	S: Obsolete
11477	F: drivers/net/wireless/intersil/prism54/	11482	F: drivers/net/wireless/intersil/prism54/
11478		11483
		11484	PROC FILESYSTEM
		11485	R: Alexey Dobriyan <adobriyan@gmail.com>
		11486	L: linux-kernel@vger.kernel.org
		11487	L: linux-fsdevel@vger.kernel.org
		11488	S: Maintained
		11489	F: fs/proc/
		11490	F: include/linux/proc_fs.h
		11491	F: tools/testing/selftests/proc/
		11492
11479	PROC SYSCTL	11493	PROC SYSCTL
11480	M: "Luis R. Rodriguez" <mcgrof@kernel.org>	11494	M: "Luis R. Rodriguez" <mcgrof@kernel.org>
11481	M: Kees Cook <keescook@chromium.org>	11495	M: Kees Cook <keescook@chromium.org>
@@ -11808,9 +11822,9 @@ F: Documentation/devicetree/bindings/opp/kryo-cpufreq.txt · 326 unmodified lines
11808	F: drivers/cpufreq/qcom-cpufreq-kryo.c	11822	F: drivers/cpufreq/qcom-cpufreq-kryo.c
11809		11823
11810	QUALCOMM EMAC GIGABIT ETHERNET DRIVER	11824	QUALCOMM EMAC GIGABIT ETHERNET DRIVER
11811	M: Timur Tabi <timur@codeaurora.org>	11825	M: Timur Tabi <timur@kernel.org>
11812	L: netdev@vger.kernel.org	11826	L: netdev@vger.kernel.org
11813	S: Supported	11827	S: Maintained
11814	F: drivers/net/ethernet/qualcomm/emac/	11828	F: drivers/net/ethernet/qualcomm/emac/
11815		11829
11816	QUALCOMM HEXAGON ARCHITECTURE	11830	QUALCOMM HEXAGON ARCHITECTURE
@@ -13648,7 +13662,7 @@ M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> · 1831 unmodified lines
13648	L: iommu@lists.linux-foundation.org	13662	L: iommu@lists.linux-foundation.org
13649	T: git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git	13663	T: git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
13650	S: Supported	13664	S: Supported
13651	F: lib/swiotlb.c	13665	F: kernel/dma/swiotlb.c
13652	F: arch/*/kernel/pci-swiotlb.c	13666	F: arch/*/kernel/pci-swiotlb.c
13653	F: include/linux/swiotlb.h	13667	F: include/linux/swiotlb.h
13654		13668
@@ -15572,9 +15586,17 @@ M: x86@kernel.org · 1917 unmodified lines
15572	L: linux-kernel@vger.kernel.org	15586	L: linux-kernel@vger.kernel.org
15573	T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core	15587	T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
15574	S: Maintained	15588	S: Maintained
		15589	F: Documentation/devicetree/bindings/x86/
15575	F: Documentation/x86/	15590	F: Documentation/x86/
15576	F: arch/x86/	15591	F: arch/x86/
15577		15592
		15593	X86 ENTRY CODE
		15594	M: Andy Lutomirski <luto@kernel.org>
		15595	L: linux-kernel@vger.kernel.org
		15596	T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/asm
		15597	S: Maintained
		15598	F: arch/x86/entry/
		15599
15578	X86 MCE INFRASTRUCTURE	15600	X86 MCE INFRASTRUCTURE
15579	M: Tony Luck <tony.luck@intel.com>	15601	M: Tony Luck <tony.luck@intel.com>
15580	M: Borislav Petkov <bp@alien8.de>	15602	M: Borislav Petkov <bp@alien8.de>
@@ -15597,7 +15619,7 @@ F: drivers/platform/x86/ · 16 unmodified lines
15597	F: drivers/platform/olpc/	15619	F: drivers/platform/olpc/
15598		15620
15599	X86 VDSO	15621	X86 VDSO
15600	M: Andy Lutomirski <luto@amacapital.net>	15622	M: Andy Lutomirski <luto@kernel.org>
15601	L: linux-kernel@vger.kernel.org	15623	L: linux-kernel@vger.kernel.org
15602	T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/vdso	15624	T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/vdso
15603	S: Maintained	15625	S: Maintained

Makefile+1−1

@@ -2,7 +2,7 @@ · 1 unmodified line
2	VERSION = 4	2	VERSION = 4
3	PATCHLEVEL = 18	3	PATCHLEVEL = 18
4	SUBLEVEL = 0	4	SUBLEVEL = 0
5	EXTRAVERSION = -rc1	5	EXTRAVERSION = -rc3
6	NAME = Merciless Moray	6	NAME = Merciless Moray
7		7
8	# DOCUMENTATION	8	# DOCUMENTATION

arch/alpha/Kconfig+0−5

 	  If you don't know what to do here, say N.
-config HAVE_DEC_LOCK
-	bool
-	depends on SMP
-	default y
 config NR_CPUS
 	int "Maximum number of CPUs (2-32)"
 	range 2 32

arch/alpha/lib/Makefile+0−2

@@ -35,8 +35,6 @@ lib-y = __divqu.o __remqu.o __divlu.o __remlu.o \ · 34 unmodified lines
35	callback_srm.o srm_puts.o srm_printk.o \	35	callback_srm.o srm_puts.o srm_printk.o \
36	fls.o	36	fls.o
37		37
38	lib-$(CONFIG_SMP) += dec_and_lock.o
39
40	# The division routines are built from single source, with different defines.	38	# The division routines are built from single source, with different defines.
41	AFLAGS___divqu.o = -DDIV	39	AFLAGS___divqu.o = -DDIV
42	AFLAGS___remqu.o = -DREM	40	AFLAGS___remqu.o = -DREM

arch/alpha/lib/dec_and_lock.c+0−44

@@ -1,44 +0,0 @@
1	// SPDX-License-Identifier: GPL-2.0
2	/*
3	* arch/alpha/lib/dec_and_lock.c
4	*
5	* ll/sc version of atomic_dec_and_lock()
6	*
7	*/
8
9	#include <linux/spinlock.h>
10	#include <linux/atomic.h>
11	#include <linux/export.h>
12
13	asm (".text \n\
14	.global _atomic_dec_and_lock \n\
15	.ent _atomic_dec_and_lock \n\
16	.align 4 \n\
17	_atomic_dec_and_lock: \n\
18	.prologue 0 \n\
19	1: ldl_l $1, 0($16) \n\
20	subl $1, 1, $1 \n\
21	beq $1, 2f \n\
22	stl_c $1, 0($16) \n\
23	beq $1, 4f \n\
24	mb \n\
25	clr $0 \n\
26	ret \n\
27	2: br $29, 3f \n\
28	3: ldgp $29, 0($29) \n\
29	br $atomic_dec_and_lock_1..ng \n\
30	.subsection 2 \n\
31	4: br 1b \n\
32	.previous \n\
33	.end _atomic_dec_and_lock");
34
35	static int __used atomic_dec_and_lock_1(atomic_t atomic, spinlock_t lock)
36	{
37	/* Slow path */
38	spin_lock(lock);
39	if (atomic_dec_and_test(atomic))
40	return 1;
41	spin_unlock(lock);
42	return 0;
43	}
44	EXPORT_SYMBOL(_atomic_dec_and_lock);

arch/arm/Kconfig+7−1

 	  VESA. If you have PCI, say Y, otherwise N.
 config PCI_DOMAINS
-	bool
+	bool "Support for multiple PCI domains"
 	depends on PCI
+	help
+	  Enable PCI domains kernel management. Say Y if your machine
+	  has a PCI bus hierarchy that requires more than one PCI
+	  domain (aka segment) to be correctly managed. Say N otherwise.
+	  If you don't know what to do here, say N.
 config PCI_DOMAINS_GENERIC
 	def_bool PCI_DOMAINS

arch/arm/boot/dts/armada-385-synology-ds116.dts+1−1

@@ -139,7 +139,7 @@ · 138 unmodified lines
139	3700 5	139	3700 5
140	3900 6	140	3900 6
141	4000 7>;	141	4000 7>;
142	cooling-cells = <2>;	142	#cooling-cells = <2>;
143	};	143	};
144		144
145	gpio-leds {	145	gpio-leds {

arch/arm/boot/dts/bcm-cygnus.dtsi+12−12

@@ -216,7 +216,7 @@ · 215 unmodified lines
216	reg = <0x18008000 0x100>;	216	reg = <0x18008000 0x100>;
217	#address-cells = <1>;	217	#address-cells = <1>;
218	#size-cells = <0>;	218	#size-cells = <0>;
219	interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>;	219	interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
220	clock-frequency = <100000>;	220	clock-frequency = <100000>;
221	status = "disabled";	221	status = "disabled";
222	};	222	};
@@ -245,7 +245,7 @@ · 22 unmodified lines
245	reg = <0x1800b000 0x100>;	245	reg = <0x1800b000 0x100>;
246	#address-cells = <1>;	246	#address-cells = <1>;
247	#size-cells = <0>;	247	#size-cells = <0>;
248	interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>;	248	interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
249	clock-frequency = <100000>;	249	clock-frequency = <100000>;
250	status = "disabled";	250	status = "disabled";
251	};	251	};
@@ -256,7 +256,7 @@ · 4 unmodified lines
256		256
257	#interrupt-cells = <1>;	257	#interrupt-cells = <1>;
258	interrupt-map-mask = <0 0 0 0>;	258	interrupt-map-mask = <0 0 0 0>;
259	interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_NONE>;	259	interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
260		260
261	linux,pci-domain = <0>;	261	linux,pci-domain = <0>;
262		262
@@ -278,10 +278,10 @@ · 15 unmodified lines
278	compatible = "brcm,iproc-msi";	278	compatible = "brcm,iproc-msi";
279	msi-controller;	279	msi-controller;
280	interrupt-parent = <&gic>;	280	interrupt-parent = <&gic>;
281	interrupts = <GIC_SPI 96 IRQ_TYPE_NONE>,	281	interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>,
282	<GIC_SPI 97 IRQ_TYPE_NONE>,	282	<GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,
283	<GIC_SPI 98 IRQ_TYPE_NONE>,	283	<GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,
284	<GIC_SPI 99 IRQ_TYPE_NONE>;	284	<GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
285	};	285	};
286	};	286	};
287		287
@@ -291,7 +291,7 @@ · 3 unmodified lines
291		291
292	#interrupt-cells = <1>;	292	#interrupt-cells = <1>;
293	interrupt-map-mask = <0 0 0 0>;	293	interrupt-map-mask = <0 0 0 0>;
294	interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_NONE>;	294	interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
295		295
296	linux,pci-domain = <1>;	296	linux,pci-domain = <1>;
297		297
@@ -313,10 +313,10 @@ · 15 unmodified lines
313	compatible = "brcm,iproc-msi";	313	compatible = "brcm,iproc-msi";
314	msi-controller;	314	msi-controller;
315	interrupt-parent = <&gic>;	315	interrupt-parent = <&gic>;
316	interrupts = <GIC_SPI 102 IRQ_TYPE_NONE>,	316	interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,
317	<GIC_SPI 103 IRQ_TYPE_NONE>,	317	<GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>,
318	<GIC_SPI 104 IRQ_TYPE_NONE>,	318	<GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
319	<GIC_SPI 105 IRQ_TYPE_NONE>;	319	<GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
320	};	320	};
321	};	321	};
322		322

arch/arm/boot/dts/bcm-hr2.dtsi+12−12

@@ -264,7 +264,7 @@ · 263 unmodified lines
264	reg = <0x38000 0x50>;	264	reg = <0x38000 0x50>;
265	#address-cells = <1>;	265	#address-cells = <1>;
266	#size-cells = <0>;	266	#size-cells = <0>;
267	interrupts = <GIC_SPI 95 IRQ_TYPE_NONE>;	267	interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
268	clock-frequency = <100000>;	268	clock-frequency = <100000>;
269	};	269	};
270		270
@@ -279,7 +279,7 @@ · 8 unmodified lines
279	reg = <0x3b000 0x50>;	279	reg = <0x3b000 0x50>;
280	#address-cells = <1>;	280	#address-cells = <1>;
281	#size-cells = <0>;	281	#size-cells = <0>;
282	interrupts = <GIC_SPI 96 IRQ_TYPE_NONE>;	282	interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
283	clock-frequency = <100000>;	283	clock-frequency = <100000>;
284	};	284	};
285	};	285	};
@@ -300,7 +300,7 @@ · 14 unmodified lines
300		300
301	#interrupt-cells = <1>;	301	#interrupt-cells = <1>;
302	interrupt-map-mask = <0 0 0 0>;	302	interrupt-map-mask = <0 0 0 0>;
303	interrupt-map = <0 0 0 0 &gic GIC_SPI 186 IRQ_TYPE_NONE>;	303	interrupt-map = <0 0 0 0 &gic GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
304		304
305	linux,pci-domain = <0>;	305	linux,pci-domain = <0>;
306		306
@@ -322,10 +322,10 @@ · 15 unmodified lines
322	compatible = "brcm,iproc-msi";	322	compatible = "brcm,iproc-msi";
323	msi-controller;	323	msi-controller;
324	interrupt-parent = <&gic>;	324	interrupt-parent = <&gic>;
325	interrupts = <GIC_SPI 182 IRQ_TYPE_NONE>,	325	interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>,
326	<GIC_SPI 183 IRQ_TYPE_NONE>,	326	<GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>,
327	<GIC_SPI 184 IRQ_TYPE_NONE>,	327	<GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>,
328	<GIC_SPI 185 IRQ_TYPE_NONE>;	328	<GIC_SPI 185 IRQ_TYPE_LEVEL_HIGH>;
329	brcm,pcie-msi-inten;	329	brcm,pcie-msi-inten;
330	};	330	};
331	};	331	};
@@ -336,7 +336,7 @@ · 4 unmodified lines
336		336
337	#interrupt-cells = <1>;	337	#interrupt-cells = <1>;
338	interrupt-map-mask = <0 0 0 0>;	338	interrupt-map-mask = <0 0 0 0>;
339	interrupt-map = <0 0 0 0 &gic GIC_SPI 192 IRQ_TYPE_NONE>;	339	interrupt-map = <0 0 0 0 &gic GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>;
340		340
341	linux,pci-domain = <1>;	341	linux,pci-domain = <1>;
342		342
@@ -358,10 +358,10 @@ · 15 unmodified lines
358	compatible = "brcm,iproc-msi";	358	compatible = "brcm,iproc-msi";
359	msi-controller;	359	msi-controller;
360	interrupt-parent = <&gic>;	360	interrupt-parent = <&gic>;
361	interrupts = <GIC_SPI 188 IRQ_TYPE_NONE>,	361	interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>,
362	<GIC_SPI 189 IRQ_TYPE_NONE>,	362	<GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>,
363	<GIC_SPI 190 IRQ_TYPE_NONE>,	363	<GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>,
364	<GIC_SPI 191 IRQ_TYPE_NONE>;	364	<GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;
365	brcm,pcie-msi-inten;	365	brcm,pcie-msi-inten;
366	};	366	};
367	};	367	};

arch/arm/boot/dts/bcm-nsp.dtsi+16−16

@@ -391,7 +391,7 @@ · 390 unmodified lines
391	reg = <0x38000 0x50>;	391	reg = <0x38000 0x50>;
392	#address-cells = <1>;	392	#address-cells = <1>;
393	#size-cells = <0>;	393	#size-cells = <0>;
394	interrupts = <GIC_SPI 89 IRQ_TYPE_NONE>;	394	interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
395	clock-frequency = <100000>;	395	clock-frequency = <100000>;
396	dma-coherent;	396	dma-coherent;
397	status = "disabled";	397	status = "disabled";
@@ -496,7 +496,7 @@ · 98 unmodified lines
496		496
497	#interrupt-cells = <1>;	497	#interrupt-cells = <1>;
498	interrupt-map-mask = <0 0 0 0>;	498	interrupt-map-mask = <0 0 0 0>;
499	interrupt-map = <0 0 0 0 &gic GIC_SPI 131 IRQ_TYPE_NONE>;	499	interrupt-map = <0 0 0 0 &gic GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
500		500
501	linux,pci-domain = <0>;	501	linux,pci-domain = <0>;
502		502
@@ -519,10 +519,10 @@ · 16 unmodified lines
519	compatible = "brcm,iproc-msi";	519	compatible = "brcm,iproc-msi";
520	msi-controller;	520	msi-controller;
521	interrupt-parent = <&gic>;	521	interrupt-parent = <&gic>;
522	interrupts = <GIC_SPI 127 IRQ_TYPE_NONE>,	522	interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>,
523	<GIC_SPI 128 IRQ_TYPE_NONE>,	523	<GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>,
524	<GIC_SPI 129 IRQ_TYPE_NONE>,	524	<GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>,
525	<GIC_SPI 130 IRQ_TYPE_NONE>;	525	<GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>;
526	brcm,pcie-msi-inten;	526	brcm,pcie-msi-inten;
527	};	527	};
528	};	528	};
@@ -533,7 +533,7 @@ · 4 unmodified lines
533		533
534	#interrupt-cells = <1>;	534	#interrupt-cells = <1>;
535	interrupt-map-mask = <0 0 0 0>;	535	interrupt-map-mask = <0 0 0 0>;
536	interrupt-map = <0 0 0 0 &gic GIC_SPI 137 IRQ_TYPE_NONE>;	536	interrupt-map = <0 0 0 0 &gic GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
537		537
538	linux,pci-domain = <1>;	538	linux,pci-domain = <1>;
539		539
@@ -556,10 +556,10 @@ · 16 unmodified lines
556	compatible = "brcm,iproc-msi";	556	compatible = "brcm,iproc-msi";
557	msi-controller;	557	msi-controller;
558	interrupt-parent = <&gic>;	558	interrupt-parent = <&gic>;
559	interrupts = <GIC_SPI 133 IRQ_TYPE_NONE>,	559	interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>,
560	<GIC_SPI 134 IRQ_TYPE_NONE>,	560	<GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,
561	<GIC_SPI 135 IRQ_TYPE_NONE>,	561	<GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>,
562	<GIC_SPI 136 IRQ_TYPE_NONE>;	562	<GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;
563	brcm,pcie-msi-inten;	563	brcm,pcie-msi-inten;
564	};	564	};
565	};	565	};
@@ -570,7 +570,7 @@ · 4 unmodified lines
570		570
571	#interrupt-cells = <1>;	571	#interrupt-cells = <1>;
572	interrupt-map-mask = <0 0 0 0>;	572	interrupt-map-mask = <0 0 0 0>;
573	interrupt-map = <0 0 0 0 &gic GIC_SPI 143 IRQ_TYPE_NONE>;	573	interrupt-map = <0 0 0 0 &gic GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
574		574
575	linux,pci-domain = <2>;	575	linux,pci-domain = <2>;
576		576
@@ -593,10 +593,10 @@ · 16 unmodified lines
593	compatible = "brcm,iproc-msi";	593	compatible = "brcm,iproc-msi";
594	msi-controller;	594	msi-controller;
595	interrupt-parent = <&gic>;	595	interrupt-parent = <&gic>;
596	interrupts = <GIC_SPI 139 IRQ_TYPE_NONE>,	596	interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>,
597	<GIC_SPI 140 IRQ_TYPE_NONE>,	597	<GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>,
598	<GIC_SPI 141 IRQ_TYPE_NONE>,	598	<GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>,
599	<GIC_SPI 142 IRQ_TYPE_NONE>;	599	<GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>;
600	brcm,pcie-msi-inten;	600	brcm,pcie-msi-inten;
601	};	601	};
602	};	602	};

arch/arm/boot/dts/bcm5301x.dtsi+1−1

@@ -365,7 +365,7 @@ · 364 unmodified lines
365	i2c0: i2c@18009000 {	365	i2c0: i2c@18009000 {
366	compatible = "brcm,iproc-i2c";	366	compatible = "brcm,iproc-i2c";
367	reg = <0x18009000 0x50>;	367	reg = <0x18009000 0x50>;
368	interrupts = <GIC_SPI 121 IRQ_TYPE_NONE>;	368	interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
369	#address-cells = <1>;	369	#address-cells = <1>;
370	#size-cells = <0>;	370	#size-cells = <0>;
371	clock-frequency = <100000>;	371	clock-frequency = <100000>;

arch/arm/boot/dts/da850.dtsi+1−5

 			gpio-controller;
 			#gpio-cells = <2>;
 			reg = <0x226000 0x1000>;
-			interrupts = <42 IRQ_TYPE_EDGE_BOTH
+			interrupts = <42 43 44 45 46 47 48 49 50>;
-				43 IRQ_TYPE_EDGE_BOTH 44 IRQ_TYPE_EDGE_BOTH
-				45 IRQ_TYPE_EDGE_BOTH 46 IRQ_TYPE_EDGE_BOTH
-				47 IRQ_TYPE_EDGE_BOTH 48 IRQ_TYPE_EDGE_BOTH
-				49 IRQ_TYPE_EDGE_BOTH 50 IRQ_TYPE_EDGE_BOTH>;
 			ti,ngpio = <144>;
 			ti,davinci-gpio-unbanked = <0>;
 			status = "disabled";

arch/arm/boot/dts/imx6q.dtsi+1−1

@@ -90,7 +90,7 @@ · 89 unmodified lines
90	clocks = <&clks IMX6Q_CLK_ECSPI5>,	90	clocks = <&clks IMX6Q_CLK_ECSPI5>,
91	<&clks IMX6Q_CLK_ECSPI5>;	91	<&clks IMX6Q_CLK_ECSPI5>;
92	clock-names = "ipg", "per";	92	clock-names = "ipg", "per";
93	dmas = <&sdma 11 7 1>, <&sdma 12 7 2>;	93	dmas = <&sdma 11 8 1>, <&sdma 12 8 2>;
94	dma-names = "rx", "tx";	94	dma-names = "rx", "tx";
95	status = "disabled";	95	status = "disabled";
96	};	96	};

arch/arm/boot/dts/imx6sx.dtsi+1−1

@@ -1344,7 +1344,7 @@ · 1343 unmodified lines
1344	ranges = <0x81000000 0 0 0x08f80000 0 0x00010000 /* downstream I/O */	1344	ranges = <0x81000000 0 0 0x08f80000 0 0x00010000 /* downstream I/O */
1345	0x82000000 0 0x08000000 0x08000000 0 0x00f00000>; /* non-prefetchable memory */	1345	0x82000000 0 0x08000000 0x08000000 0 0x00f00000>; /* non-prefetchable memory */
1346	num-lanes = <1>;	1346	num-lanes = <1>;
1347	interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;	1347	interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
1348	interrupt-names = "msi";	1348	interrupt-names = "msi";
1349	#interrupt-cells = <1>;	1349	#interrupt-cells = <1>;
1350	interrupt-map-mask = <0 0 0 0x7>;	1350	interrupt-map-mask = <0 0 0 0x7>;

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

@@ -748,13 +748,13 @@ · 747 unmodified lines
748	nand0: nand@ff900000 {	748	nand0: nand@ff900000 {
749	#address-cells = <0x1>;	749	#address-cells = <0x1>;
750	#size-cells = <0x1>;	750	#size-cells = <0x1>;
751	compatible = "denali,denali-nand-dt";	751	compatible = "altr,socfpga-denali-nand";
752	reg = <0xff900000 0x100000>,	752	reg = <0xff900000 0x100000>,
753	<0xffb80000 0x10000>;	753	<0xffb80000 0x10000>;
754	reg-names = "nand_data", "denali_reg";	754	reg-names = "nand_data", "denali_reg";
755	interrupts = <0x0 0x90 0x4>;	755	interrupts = <0x0 0x90 0x4>;
756	dma-mask = <0xffffffff>;	756	dma-mask = <0xffffffff>;
757	clocks = <&nand_clk>;	757	clocks = <&nand_x_clk>;
758	status = "disabled";	758	status = "disabled";
759	};	759	};
760		760

arch/arm/boot/dts/socfpga_arria10.dtsi+2−3

 			#size-cells = <0>;
 			reg = <0xffda5000 0x100>;
 			interrupts = <0 102 4>;
-			num-chipselect = <4>;
+			num-cs = <4>;
-			bus-num = <0>;
 			/*32bit_access;*/
 			tx-dma-channel = <&pdma 16>;
 			rx-dma-channel = <&pdma 17>;
 		nand: nand@ffb90000 {
 			#address-cells = <1>;
 			#size-cells = <1>;
-			compatible = "denali,denali-nand-dt", "altr,socfpga-denali-nand";
+			compatible = "altr,socfpga-denali-nand";
 			reg = <0xffb90000 0x72000>,
 			      <0xffb80000 0x10000>;
 			reg-names = "nand_data", "denali_reg";

arch/arm/common/Makefile+1−1

@@ -10,7 +10,7 @@ obj-$(CONFIG_DMABOUNCE) += dmabounce.o · 9 unmodified lines
10	obj-$(CONFIG_SHARP_LOCOMO) += locomo.o	10	obj-$(CONFIG_SHARP_LOCOMO) += locomo.o
11	obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o	11	obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o
12	obj-$(CONFIG_SHARP_SCOOP) += scoop.o	12	obj-$(CONFIG_SHARP_SCOOP) += scoop.o
13	obj-$(CONFIG_SMP) += secure_cntvoff.o	13	obj-$(CONFIG_CPU_V7) += secure_cntvoff.o
14	obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o	14	obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o
15	obj-$(CONFIG_MCPM) += mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o	15	obj-$(CONFIG_MCPM) += mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o
16	CFLAGS_REMOVE_mcpm_entry.o = -pg	16	CFLAGS_REMOVE_mcpm_entry.o = -pg

arch/arm/configs/multi_v7_defconfig+155−223

 CONFIG_SYSVIPC=y
-CONFIG_FHANDLE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_CGROUPS=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_CMDLINE_PARTITION=y
-CONFIG_ARCH_MULTI_V7=y
-# CONFIG_ARCH_MULTI_V5 is not set
-# CONFIG_ARCH_MULTI_V4 is not set
 CONFIG_ARCH_VIRT=y
 CONFIG_ARCH_ALPINE=y
 CONFIG_ARCH_ARTPEC=y
 CONFIG_MACH_ARTPEC6=y
-CONFIG_ARCH_MVEBU=y
-CONFIG_MACH_ARMADA_370=y
-CONFIG_MACH_ARMADA_375=y
-CONFIG_MACH_ARMADA_38X=y
-CONFIG_MACH_ARMADA_39X=y
-CONFIG_MACH_ARMADA_XP=y
-CONFIG_MACH_DOVE=y
 CONFIG_ARCH_AT91=y
 CONFIG_SOC_SAMA5D2=y
 CONFIG_SOC_SAMA5D3=y
 CONFIG_ARCH_BCM_CYGNUS=y
 CONFIG_ARCH_BCM_HR2=y
 CONFIG_ARCH_BCM_NSP=y
-CONFIG_ARCH_BCM_21664=y
-CONFIG_ARCH_BCM_281XX=y
 CONFIG_ARCH_BCM_5301X=y
+CONFIG_ARCH_BCM_281XX=y
+CONFIG_ARCH_BCM_21664=y
 CONFIG_ARCH_BCM2835=y
 CONFIG_ARCH_BCM_63XX=y
 CONFIG_ARCH_BRCMSTB=y
 CONFIG_MACH_BERLIN_BG2CD=y
 CONFIG_MACH_BERLIN_BG2Q=y
 CONFIG_ARCH_DIGICOLOR=y
+CONFIG_ARCH_EXYNOS=y
+CONFIG_EXYNOS5420_MCPM=y
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_HISI=y
 CONFIG_ARCH_HI3xxx=y
-CONFIG_ARCH_HIX5HD2=y
 CONFIG_ARCH_HIP01=y
 CONFIG_ARCH_HIP04=y
-CONFIG_ARCH_KEYSTONE=y
+CONFIG_ARCH_HIX5HD2=y
-CONFIG_ARCH_MESON=y
 CONFIG_ARCH_MXC=y
 CONFIG_SOC_IMX50=y
 CONFIG_SOC_IMX51=y
 CONFIG_SOC_IMX6SX=y
 CONFIG_SOC_IMX6UL=y
 CONFIG_SOC_IMX7D=y
-CONFIG_SOC_VF610=y
 CONFIG_SOC_LS1021A=y
+CONFIG_SOC_VF610=y
+CONFIG_ARCH_KEYSTONE=y
+CONFIG_ARCH_MEDIATEK=y
+CONFIG_ARCH_MESON=y
+CONFIG_ARCH_MVEBU=y
+CONFIG_MACH_ARMADA_370=y
+CONFIG_MACH_ARMADA_375=y
+CONFIG_MACH_ARMADA_38X=y
+CONFIG_MACH_ARMADA_39X=y
+CONFIG_MACH_ARMADA_XP=y
+CONFIG_MACH_DOVE=y
 CONFIG_ARCH_OMAP3=y
 CONFIG_ARCH_OMAP4=y
 CONFIG_SOC_OMAP5=y
 CONFIG_SOC_AM33XX=y
 CONFIG_SOC_AM43XX=y
 CONFIG_SOC_DRA7XX=y
+CONFIG_ARCH_SIRF=y
 CONFIG_ARCH_QCOM=y
-CONFIG_ARCH_MEDIATEK=y
 CONFIG_ARCH_MSM8X60=y
 CONFIG_ARCH_MSM8960=y
 CONFIG_ARCH_MSM8974=y
 CONFIG_ARCH_ROCKCHIP=y
-CONFIG_ARCH_SOCFPGA=y
-CONFIG_PLAT_SPEAR=y
-CONFIG_ARCH_SPEAR13XX=y
-CONFIG_MACH_SPEAR1310=y
-CONFIG_MACH_SPEAR1340=y
-CONFIG_ARCH_STI=y
-CONFIG_ARCH_STM32=y
-CONFIG_ARCH_EXYNOS=y
-CONFIG_EXYNOS5420_MCPM=y
 CONFIG_ARCH_RENESAS=y
 CONFIG_ARCH_EMEV2=y
 CONFIG_ARCH_R7S72100=y
 CONFIG_ARCH_R8A7793=y
 CONFIG_ARCH_R8A7794=y
 CONFIG_ARCH_SH73A0=y
+CONFIG_ARCH_SOCFPGA=y
+CONFIG_PLAT_SPEAR=y
+CONFIG_ARCH_SPEAR13XX=y
+CONFIG_MACH_SPEAR1310=y
+CONFIG_MACH_SPEAR1340=y
+CONFIG_ARCH_STI=y
+CONFIG_ARCH_STM32=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_ARCH_SIRF=y
 CONFIG_ARCH_TEGRA=y
-CONFIG_ARCH_TEGRA_2x_SOC=y
-CONFIG_ARCH_TEGRA_3x_SOC=y
-CONFIG_ARCH_TEGRA_114_SOC=y
-CONFIG_ARCH_TEGRA_124_SOC=y
 CONFIG_ARCH_UNIPHIER=y
 CONFIG_ARCH_U8500=y
-CONFIG_MACH_HREFV60=y
-CONFIG_MACH_SNOWBALL=y
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_VEXPRESS_TC2_PM=y
 CONFIG_ARCH_WM8850=y
 CONFIG_ARCH_ZYNQ=y
-CONFIG_TRUSTED_FOUNDATIONS=y
+CONFIG_PCIEPORTBUS=y
-CONFIG_PCI=y
-CONFIG_PCI_HOST_GENERIC=y
-CONFIG_PCI_DRA7XX=y
-CONFIG_PCI_DRA7XX_EP=y
-CONFIG_PCI_KEYSTONE=y
-CONFIG_PCI_MSI=y
 CONFIG_PCI_MVEBU=y
 CONFIG_PCI_TEGRA=y
 CONFIG_PCI_RCAR_GEN2=y
 CONFIG_PCIE_RCAR=y
-CONFIG_PCIEPORTBUS=y
+CONFIG_PCI_DRA7XX_EP=y
+CONFIG_PCI_KEYSTONE=y
 CONFIG_PCI_ENDPOINT=y
 CONFIG_PCI_ENDPOINT_CONFIGFS=y
 CONFIG_PCI_EPF_TEST=m
 CONFIG_SMP=y
 CONFIG_NR_CPUS=16
-CONFIG_HIGHPTE=y
-CONFIG_CMA=y
 CONFIG_SECCOMP=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+CONFIG_CPUFREQ_DT=y
 CONFIG_ARM_IMX6Q_CPUFREQ=y
 CONFIG_QORIQ_CPUFREQ=y
 CONFIG_CPU_IDLE=y
 CONFIG_ARM_CPUIDLE=y
-CONFIG_NEON=y
-CONFIG_KERNEL_MODE_NEON=y
 CONFIG_ARM_ZYNQ_CPUIDLE=y
 CONFIG_ARM_EXYNOS_CPUIDLE=y
+CONFIG_KERNEL_MODE_NEON=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_IPV6_TUNNEL=m
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_NET_DSA=m
-CONFIG_NET_SWITCHDEV=y
 CONFIG_CAN=y
-CONFIG_CAN_RAW=y
-CONFIG_CAN_BCM=y
-CONFIG_CAN_DEV=y
 CONFIG_CAN_AT91=m
 CONFIG_CAN_FLEXCAN=m
-CONFIG_CAN_RCAR=m
+CONFIG_CAN_SUN4I=y
 CONFIG_CAN_XILINXCAN=y
+CONFIG_CAN_RCAR=m
 CONFIG_CAN_MCP251X=y
-CONFIG_NET_DSA_BCM_SF2=m
-CONFIG_B53=m
-CONFIG_B53_SPI_DRIVER=m
-CONFIG_B53_MDIO_DRIVER=m
-CONFIG_B53_MMAP_DRIVER=m
-CONFIG_B53_SRAB_DRIVER=m
-CONFIG_CAN_SUN4I=y
 CONFIG_BT=m
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_BCM=y
 CONFIG_RFKILL_GPIO=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_DMA_CMA=y
 CONFIG_CMA_SIZE_MBYTES=64
 CONFIG_OMAP_OCP2SCP=y
 CONFIG_SIMPLE_PM_BUS=y
-CONFIG_SUNXI_RSB=y
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
 CONFIG_EEPROM_AT24=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
-CONFIG_SCSI_MULTI_LUN=y
 CONFIG_ATA=y
 CONFIG_SATA_AHCI=y
 CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_SATA_RCAR=y
 CONFIG_NETDEVICES=y
 CONFIG_VIRTIO_NET=y
-CONFIG_HIX5HD2_GMAC=y
+CONFIG_B53_SPI_DRIVER=m
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
+CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_SUN4I_EMAC=y
-CONFIG_MACB=y
 CONFIG_BCMGENET=m
 CONFIG_BGMAC_BCMA=y
 CONFIG_SYSTEMPORT=m
+CONFIG_MACB=y
 CONFIG_NET_CALXEDA_XGMAC=y
 CONFIG_GIANFAR=y
+CONFIG_HIX5HD2_GMAC=y
+CONFIG_E1000E=y
 CONFIG_IGB=y
 CONFIG_MV643XX_ETH=y
 CONFIG_MVNETA=y
 CONFIG_SH_ETH=y
 CONFIG_SMSC911X=y
 CONFIG_STMMAC_ETH=y
-CONFIG_STMMAC_PLATFORM=y
 CONFIG_DWMAC_DWC_QOS_ETH=y
 CONFIG_TI_CPSW=y
 CONFIG_XILINX_EMACLITE=y
 CONFIG_AT803X_PHY=y
-CONFIG_MARVELL_PHY=y
-CONFIG_SMSC_PHY=y
 CONFIG_BROADCOM_PHY=y
 CONFIG_ICPLUS_PHY=y
-CONFIG_REALTEK_PHY=y
+CONFIG_MARVELL_PHY=y
 CONFIG_MICREL_PHY=y
-CONFIG_FIXED_PHY=y
+CONFIG_REALTEK_PHY=y
 CONFIG_ROCKCHIP_PHY=y
+CONFIG_SMSC_PHY=y
 CONFIG_USB_PEGASUS=y
 CONFIG_USB_RTL8152=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_NET_SMSC75XX=y
 CONFIG_USB_NET_SMSC95XX=y
 CONFIG_BRCMFMAC=m
-CONFIG_RT2X00=m
-CONFIG_RT2800USB=m
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
+CONFIG_RT2X00=m
+CONFIG_RT2800USB=m
 CONFIG_INPUT_JOYDEV=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_TEGRA=y
-CONFIG_KEYBOARD_SPEAR=y
+CONFIG_KEYBOARD_SAMSUNG=m
 CONFIG_KEYBOARD_ST_KEYSCAN=y
+CONFIG_KEYBOARD_SPEAR=y
 CONFIG_KEYBOARD_CROS_EC=m
-CONFIG_KEYBOARD_SAMSUNG=m
 CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_MOUSE_CYAPA=m
 CONFIG_MOUSE_ELAN_I2C=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 CONFIG_TOUCHSCREEN_MMS114=m
+CONFIG_TOUCHSCREEN_WM97XX=m
 CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_STMPE=y
 CONFIG_TOUCHSCREEN_SUN4I=y
-CONFIG_TOUCHSCREEN_WM97XX=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_MAX77693_HAPTIC=m
 CONFIG_INPUT_MAX8997_HAPTIC=m
 CONFIG_SERIAL_8250_EM=y
 CONFIG_SERIAL_8250_MT6577=y
 CONFIG_SERIAL_8250_UNIPHIER=y
+CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_ATMEL=y
 CONFIG_SERIAL_ATMEL_CONSOLE=y
 CONFIG_SERIAL_ATMEL_TTYAT=y
-CONFIG_SERIAL_BCM63XX=y
-CONFIG_SERIAL_BCM63XX_CONSOLE=y
 CONFIG_SERIAL_MESON=y
 CONFIG_SERIAL_MESON_CONSOLE=y
 CONFIG_SERIAL_SAMSUNG=y
 CONFIG_SERIAL_IMX_CONSOLE=y
 CONFIG_SERIAL_SH_SCI=y
 CONFIG_SERIAL_SH_SCI_NR_UARTS=20
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-CONFIG_SERIAL_SH_SCI_DMA=y
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
 CONFIG_SERIAL_VT8500=y
 CONFIG_SERIAL_VT8500_CONSOLE=y
-CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
+CONFIG_SERIAL_BCM63XX=y
+CONFIG_SERIAL_BCM63XX_CONSOLE=y
 CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 CONFIG_SERIAL_FSL_LPUART=y
 CONFIG_SERIAL_STM32=y
 CONFIG_SERIAL_STM32_CONSOLE=y
 CONFIG_SERIAL_DEV_BUS=y
-CONFIG_HVC_DRIVER=y
 CONFIG_VIRTIO_CONSOLE=y
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_ST=y
 CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_DAVINCI=y
-CONFIG_I2C_MESON=y
-CONFIG_I2C_MUX=y
 CONFIG_I2C_ARB_GPIO_CHALLENGE=m
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_I2C_MUX_PINCTRL=y
 CONFIG_I2C_AT91=m
 CONFIG_I2C_BCM2835=y
 CONFIG_I2C_CADENCE=y
+CONFIG_I2C_DAVINCI=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_DIGICOLOR=m
 CONFIG_I2C_EMEV2=m
 CONFIG_I2C_GPIO=m
-CONFIG_I2C_EXYNOS5=y
 CONFIG_I2C_IMX=y
+CONFIG_I2C_MESON=y
 CONFIG_I2C_MV64XXX=y
 CONFIG_I2C_RIIC=y
 CONFIG_I2C_RK3X=y
 CONFIG_SPMI=y
 CONFIG_PINCTRL_AS3722=y
 CONFIG_PINCTRL_PALMAS=y
-CONFIG_PINCTRL_BCM2835=y
 CONFIG_PINCTRL_APQ8064=y
 CONFIG_PINCTRL_APQ8084=y
 CONFIG_PINCTRL_IPQ8064=y
 CONFIG_PINCTRL_MSM8916=y
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 CONFIG_PINCTRL_QCOM_SSBI_PMIC=y
-CONFIG_GPIO_GENERIC_PLATFORM=y
 CONFIG_GPIO_DAVINCI=y
 CONFIG_GPIO_DWAPB=y
 CONFIG_GPIO_EM=y
 CONFIG_GPIO_RCAR=y
+CONFIG_GPIO_SYSCON=y
 CONFIG_GPIO_UNIPHIER=y
 CONFIG_GPIO_XILINX=y
 CONFIG_GPIO_ZYNQ=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_PCF857X=y
-CONFIG_GPIO_TWL4030=y
 CONFIG_GPIO_PALMAS=y
-CONFIG_GPIO_SYSCON=y
 CONFIG_GPIO_TPS6586X=y
 CONFIG_GPIO_TPS65910=y
+CONFIG_GPIO_TWL4030=y
+CONFIG_POWER_AVS=y
+CONFIG_ROCKCHIP_IODOMAIN=y
+CONFIG_POWER_RESET_AS3722=y
+CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
+CONFIG_POWER_RESET_ST=y
+CONFIG_POWER_RESET_KEYSTONE=y
+CONFIG_POWER_RESET_RMOBILE=y
 CONFIG_BATTERY_ACT8945A=y
 CONFIG_BATTERY_CPCAP=m
 CONFIG_BATTERY_SBS=y
+CONFIG_AXP20X_POWER=m
 CONFIG_BATTERY_MAX17040=m
 CONFIG_BATTERY_MAX17042=m
 CONFIG_CHARGER_CPCAP=m
 CONFIG_CHARGER_MAX8997=m
 CONFIG_CHARGER_MAX8998=m
 CONFIG_CHARGER_TPS65090=y
-CONFIG_AXP20X_POWER=m
-CONFIG_POWER_RESET_AS3722=y
-CONFIG_POWER_RESET_GPIO=y
-CONFIG_POWER_RESET_GPIO_RESTART=y
-CONFIG_POWER_RESET_KEYSTONE=y
-CONFIG_POWER_RESET_RMOBILE=y
-CONFIG_POWER_RESET_ST=y
-CONFIG_POWER_AVS=y
-CONFIG_ROCKCHIP_IODOMAIN=y
 CONFIG_SENSORS_IIO_HWMON=y
 CONFIG_SENSORS_LM90=y
 CONFIG_SENSORS_LM95245=y
 CONFIG_SENSORS_PWM_FAN=m
 CONFIG_SENSORS_INA2XX=m
 CONFIG_CPU_THERMAL=y
-CONFIG_BCM2835_THERMAL=m
-CONFIG_BRCMSTB_THERMAL=m
 CONFIG_IMX_THERMAL=y
 CONFIG_ROCKCHIP_THERMAL=y
 CONFIG_RCAR_THERMAL=y
 CONFIG_ARMADA_THERMAL=y
-CONFIG_DAVINCI_WATCHDOG=m
+CONFIG_BCM2835_THERMAL=m
-CONFIG_EXYNOS_THERMAL=m
+CONFIG_BRCMSTB_THERMAL=m
 CONFIG_ST_THERMAL_MEMMAP=y
 CONFIG_WATCHDOG=y
 CONFIG_DA9063_WATCHDOG=m
 CONFIG_ARM_SP805_WATCHDOG=y
 CONFIG_AT91SAM9X_WATCHDOG=y
 CONFIG_SAMA5D4_WATCHDOG=y
+CONFIG_DW_WATCHDOG=y
+CONFIG_DAVINCI_WATCHDOG=m
 CONFIG_ORION_WATCHDOG=y
 CONFIG_RN5T618_WATCHDOG=y
-CONFIG_ST_LPC_WATCHDOG=y
 CONFIG_SUNXI_WATCHDOG=y
 CONFIG_IMX2_WDT=y
+CONFIG_ST_LPC_WATCHDOG=y
 CONFIG_TEGRA_WATCHDOG=m
 CONFIG_MESON_WATCHDOG=y
-CONFIG_DW_WATCHDOG=y
 CONFIG_DIGICOLOR_WATCHDOG=y
 CONFIG_RENESAS_WDT=m
-CONFIG_BCM2835_WDT=y
 CONFIG_BCM47XX_WDT=y
-CONFIG_BCM7038_WDT=m
+CONFIG_BCM2835_WDT=y
 CONFIG_BCM_KONA_WDT=y
+CONFIG_BCM7038_WDT=m
+CONFIG_BCMA_HOST_SOC=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
 CONFIG_MFD_ACT8945A=y
 CONFIG_MFD_AS3711=y
 CONFIG_MFD_AS3722=y
 CONFIG_MFD_ATMEL_HLCDC=m
 CONFIG_MFD_BCM590XX=y
 CONFIG_MFD_AC100=y
-CONFIG_MFD_AXP20X=y
 CONFIG_MFD_AXP20X_I2C=y
 CONFIG_MFD_AXP20X_RSB=y
 CONFIG_MFD_CROS_EC=m
 CONFIG_MFD_MAX8907=y
 CONFIG_MFD_MAX8997=y
 CONFIG_MFD_MAX8998=y
-CONFIG_MFD_RK808=y
 CONFIG_MFD_CPCAP=y
 CONFIG_MFD_PM8XXX=y
 CONFIG_MFD_QCOM_RPM=y
 CONFIG_MFD_SPMI_PMIC=y
+CONFIG_MFD_RK808=y
 CONFIG_MFD_RN5T618=y
 CONFIG_MFD_SEC_CORE=y
 CONFIG_MFD_STMPE=y
 CONFIG_MFD_TPS65218=y
 CONFIG_MFD_TPS6586X=y
 CONFIG_MFD_TPS65910=y
-CONFIG_REGULATOR_ACT8945A=y
-CONFIG_REGULATOR_AB8500=y
 CONFIG_REGULATOR_ACT8865=y
+CONFIG_REGULATOR_ACT8945A=y
 CONFIG_REGULATOR_ANATOP=y
+CONFIG_REGULATOR_AB8500=y
 CONFIG_REGULATOR_AS3711=y
 CONFIG_REGULATOR_AS3722=y
 CONFIG_REGULATOR_AXP20X=y
 CONFIG_REGULATOR_CPCAP=y
 CONFIG_REGULATOR_DA9210=y
 CONFIG_REGULATOR_FAN53555=y
-CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_GPIO=y
-CONFIG_MFD_SYSCON=y
-CONFIG_POWER_RESET_SYSCON=y
 CONFIG_REGULATOR_LP872X=y
 CONFIG_REGULATOR_MAX14577=m
 CONFIG_REGULATOR_MAX8907=y
 CONFIG_REGULATOR_PBIAS=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_QCOM_RPM=y
-CONFIG_REGULATOR_QCOM_SMD_RPM=y
+CONFIG_REGULATOR_QCOM_SMD_RPM=m
+CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_RN5T618=y
 CONFIG_REGULATOR_S2MPS11=y
 CONFIG_REGULATOR_S5M8767=y
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_USB_VIDEO_CLASS=y
+CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_GSPCA=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_SOC_CAMERA=m
 CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
-CONFIG_VIDEO_ATMEL_ISI=m
 CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m
 CONFIG_VIDEO_S5P_FIMC=m
 CONFIG_VIDEO_S5P_MIPI_CSIS=m
 CONFIG_VIDEO_EXYNOS_FIMC_LITE=m
 CONFIG_VIDEO_EXYNOS4_FIMC_IS=m
+CONFIG_VIDEO_RCAR_VIN=m
+CONFIG_VIDEO_ATMEL_ISI=m
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
 CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
 CONFIG_VIDEO_RENESAS_JPU=m
 CONFIG_VIDEO_RENESAS_VSP1=m
 CONFIG_V4L_TEST_DRIVERS=y
+CONFIG_VIDEO_VIVID=m
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
 # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
 CONFIG_VIDEO_ADV7180=m
 CONFIG_VIDEO_ML86V7667=m
 CONFIG_DRM=y
-CONFIG_DRM_I2C_ADV7511=m
-CONFIG_DRM_I2C_ADV7511_AUDIO=y
 # CONFIG_DRM_I2C_CH7006 is not set
 # CONFIG_DRM_I2C_SIL164 is not set
-CONFIG_DRM_DUMB_VGA_DAC=m
-CONFIG_DRM_NXP_PTN3460=m
-CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_EXYNOS=m
 CONFIG_DRM_EXYNOS_FIMD=y
 CONFIG_DRM_SUN4I=m
 CONFIG_DRM_FSL_DCU=m
 CONFIG_DRM_TEGRA=y
+CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
-CONFIG_DRM_PANEL_SIMPLE=y
+CONFIG_DRM_DUMB_VGA_DAC=m
+CONFIG_DRM_NXP_PTN3460=m
+CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_SII9234=m
+CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_STI=m
-CONFIG_DRM_VC4=y
+CONFIG_DRM_VC4=m
 CONFIG_DRM_ETNAVIV=m
 CONFIG_DRM_MXSFB=m
 CONFIG_FB_ARMCLCD=y
 CONFIG_FB_WM8505=y
 CONFIG_FB_SH_MOBILE_LCDC=y
 CONFIG_FB_SIMPLE=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_LCD_PLATFORM=m
 CONFIG_BACKLIGHT_PWM=y
 CONFIG_BACKLIGHT_AS3711=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_SOUND=m
 CONFIG_SND=m
-CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_HDA_TEGRA=m
 CONFIG_SND_HDA_INPUT_BEEP=y
 CONFIG_SND_HDA_PATCH_LOADER=y
 CONFIG_SND_SOC_ODROID=m
 CONFIG_SND_SOC_SH4_FSI=m
 CONFIG_SND_SOC_RCAR=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
+CONFIG_SND_SOC_STI=m
 CONFIG_SND_SUN4I_CODEC=m
 CONFIG_SND_SOC_TEGRA=m
 CONFIG_SND_SOC_TEGRA20_I2S=m
 CONFIG_SND_SOC_TEGRA_WM9712=m
 CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
 CONFIG_SND_SOC_TEGRA_ALC5632=m
-CONFIG_SND_SOC_CPCAP=m
 CONFIG_SND_SOC_TEGRA_MAX98090=m
 CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_CPCAP=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SPDIF=m
-CONFIG_SND_SOC_WM8978=m
-CONFIG_SND_SOC_STI=m
 CONFIG_SND_SOC_STI_SAS=m
-CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_USB=y
 CONFIG_USB_OTG=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_MVEBU=y
-CONFIG_USB_XHCI_RCAR=m
 CONFIG_USB_XHCI_TEGRA=m
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_MSM=m
-CONFIG_USB_EHCI_EXYNOS=y
-CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_EHCI_HCD_STI=y
-CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_USB_EHCI_TEGRA=y
-CONFIG_USB_ISP1760=y
+CONFIG_USB_EHCI_EXYNOS=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_STI=y
-CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_USB_OHCI_EXYNOS=m
 CONFIG_USB_R8A66597_HCD=m
 CONFIG_USB_RENESAS_USBHS=m
 CONFIG_USB_TUSB_OMAP_DMA=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC2=y
-CONFIG_USB_HSIC_USB3503=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_ISP1760=y
+CONFIG_USB_HSIC_USB3503=y
 CONFIG_AB8500_USB=y
-CONFIG_KEYSTONE_USB_PHY=y
+CONFIG_KEYSTONE_USB_PHY=m
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_AM335X_PHY_USB=m
 CONFIG_TWL6030_USB=m
 CONFIG_USB_GPIO_VBUS=y
 CONFIG_USB_ISP1301=y
-CONFIG_USB_MSM_OTG=m
 CONFIG_USB_MXS_PHY=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_FSL_USB2=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MMC_SDHCI_DOVE=y
 CONFIG_MMC_SDHCI_TEGRA=y
+CONFIG_MMC_SDHCI_S3C=y
 CONFIG_MMC_SDHCI_PXAV3=y
 CONFIG_MMC_SDHCI_SPEAR=y
-CONFIG_MMC_SDHCI_S3C=y
 CONFIG_MMC_SDHCI_S3C_DMA=y
 CONFIG_MMC_SDHCI_BCM_KONA=y
+CONFIG_MMC_MESON_MX_SDIO=y
 CONFIG_MMC_SDHCI_ST=y
 CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_ATMELMCI=y
 CONFIG_MMC_SDHCI_MSM=y
-CONFIG_MMC_MESON_MX_SDIO=y
 CONFIG_MMC_MVSDIO=y
 CONFIG_MMC_SDHI=y
 CONFIG_MMC_DW=y
-CONFIG_MMC_DW_PLTFM=y
 CONFIG_MMC_DW_EXYNOS=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_MMC_SH_MMCIF=y
 CONFIG_RTC_DRV_RK808=m
 CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_PALMAS=y
-CONFIG_RTC_DRV_ST_LPC=y
 CONFIG_RTC_DRV_TWL4030=y
+CONFIG_RTC_DRV_PALMAS=y
 CONFIG_RTC_DRV_TPS6586X=y
 CONFIG_RTC_DRV_TPS65910=y
 CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_EM3027=y
+CONFIG_RTC_DRV_S5M=m
 CONFIG_RTC_DRV_DA9063=m
 CONFIG_RTC_DRV_EFI=m
 CONFIG_RTC_DRV_DIGICOLOR=m
-CONFIG_RTC_DRV_S5M=m
 CONFIG_RTC_DRV_S3C=m
 CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_AT91RM9200=m
 CONFIG_RTC_DRV_AT91SAM9=m
 CONFIG_RTC_DRV_VT8500=y
-CONFIG_RTC_DRV_SUN6I=y
 CONFIG_RTC_DRV_SUNXI=y
 CONFIG_RTC_DRV_MV=y
 CONFIG_RTC_DRV_TEGRA=y
+CONFIG_RTC_DRV_ST_LPC=y
 CONFIG_RTC_DRV_CPCAP=m
 CONFIG_DMADEVICES=y
-CONFIG_DW_DMAC=y
 CONFIG_AT_HDMAC=y
 CONFIG_AT_XDMAC=y
+CONFIG_DMA_BCM2835=y
+CONFIG_DMA_SUN6I=y
 CONFIG_FSL_EDMA=y
+CONFIG_IMX_DMA=y
+CONFIG_IMX_SDMA=y
 CONFIG_MV_XOR=y
+CONFIG_MXS_DMA=y
+CONFIG_PL330_DMA=y
+CONFIG_SIRF_DMA=y
+CONFIG_STE_DMA40=y
+CONFIG_ST_FDMA=m
 CONFIG_TEGRA20_APB_DMA=y
+CONFIG_XILINX_DMA=y
+CONFIG_QCOM_BAM_DMA=y
+CONFIG_DW_DMAC=y
 CONFIG_SH_DMAE=y
 CONFIG_RCAR_DMAC=y
 CONFIG_RENESAS_USB_DMAC=m
-CONFIG_STE_DMA40=y
+CONFIG_VIRTIO_PCI=y
-CONFIG_SIRF_DMA=y
+CONFIG_VIRTIO_MMIO=y
-CONFIG_TI_EDMA=y
-CONFIG_PL330_DMA=y
-CONFIG_IMX_SDMA=y
-CONFIG_IMX_DMA=y
-CONFIG_MXS_DMA=y
-CONFIG_DMA_BCM2835=y
-CONFIG_DMA_OMAP=y
-CONFIG_QCOM_BAM_DMA=y
-CONFIG_XILINX_DMA=y
-CONFIG_DMA_SUN6I=y
-CONFIG_ST_FDMA=m
 CONFIG_STAGING=y
-CONFIG_SENSORS_ISL29018=y
-CONFIG_SENSORS_ISL29028=y
 CONFIG_MFD_NVEC=y
 CONFIG_KEYBOARD_NVEC=y
 CONFIG_SERIO_NVEC_PS2=y
 CONFIG_NVEC_POWER=y
 CONFIG_NVEC_PAZ00=y
-CONFIG_BCMA=y
-CONFIG_BCMA_HOST_SOC=y
-CONFIG_BCMA_DRIVER_GMAC_CMN=y
-CONFIG_BCMA_DRIVER_GPIO=y
-CONFIG_QCOM_GSBI=y
-CONFIG_QCOM_PM=y
-CONFIG_QCOM_SMEM=y
-CONFIG_QCOM_SMD_RPM=y
-CONFIG_QCOM_SMP2P=y
-CONFIG_QCOM_SMSM=y
-CONFIG_QCOM_WCNSS_CTRL=m
-CONFIG_ROCKCHIP_PM_DOMAINS=y
-CONFIG_COMMON_CLK_QCOM=y
-CONFIG_QCOM_CLK_RPM=y
-CONFIG_CHROME_PLATFORMS=y
 CONFIG_STAGING_BOARD=y
-CONFIG_CROS_EC_CHARDEV=m
 CONFIG_COMMON_CLK_MAX77686=y
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_S2MPS11=m
+CONFIG_COMMON_CLK_QCOM=y
+CONFIG_QCOM_CLK_RPM=y
 CONFIG_APQ_MMCC_8084=y
 CONFIG_MSM_GCC_8660=y
 CONFIG_MSM_MMCC_8960=y
 CONFIG_MSM_MMCC_8974=y
-CONFIG_HWSPINLOCK_QCOM=y
+CONFIG_BCM2835_MBOX=y
 CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_TEGRA_IOMMU_GART=y
 CONFIG_TEGRA_IOMMU_SMMU=y
 CONFIG_REMOTEPROC=m
 CONFIG_ST_REMOTEPROC=m
 CONFIG_RPMSG_VIRTIO=m
+CONFIG_RASPBERRYPI_POWER=y
+CONFIG_QCOM_GSBI=y
+CONFIG_QCOM_PM=y
+CONFIG_QCOM_SMD_RPM=m
+CONFIG_QCOM_WCNSS_CTRL=m
+CONFIG_ROCKCHIP_PM_DOMAINS=y
+CONFIG_ARCH_TEGRA_2x_SOC=y
+CONFIG_ARCH_TEGRA_3x_SOC=y
+CONFIG_ARCH_TEGRA_114_SOC=y
+CONFIG_ARCH_TEGRA_124_SOC=y
 CONFIG_PM_DEVFREQ=y
 CONFIG_ARM_TEGRA_DEVFREQ=m
-CONFIG_MEMORY=y
-CONFIG_EXTCON=y
 CONFIG_TI_AEMIF=y
 CONFIG_IIO=y
 CONFIG_IIO_SW_TRIGGER=y
 CONFIG_XILINX_XADC=y
 CONFIG_MPU3050_I2C=y
 CONFIG_CM36651=m
+CONFIG_SENSORS_ISL29018=y
+CONFIG_SENSORS_ISL29028=y
 CONFIG_AK8975=y
-CONFIG_RASPBERRYPI_POWER=y
 CONFIG_IIO_HRTIMER_TRIGGER=y
 CONFIG_PWM=y
 CONFIG_PWM_ATMEL=m
 CONFIG_PWM_ATMEL_HLCDC_PWM=m
 CONFIG_PWM_ATMEL_TCB=m
+CONFIG_PWM_BCM2835=y
+CONFIG_PWM_BRCMSTB=m
 CONFIG_PWM_FSL_FTM=m
 CONFIG_PWM_MESON=m
 CONFIG_PWM_RCAR=m
 CONFIG_PWM_RENESAS_TPU=y
 CONFIG_PWM_ROCKCHIP=m
 CONFIG_PWM_SAMSUNG=m
+CONFIG_PWM_STI=y
 CONFIG_PWM_SUN4I=y
 CONFIG_PWM_TEGRA=y
 CONFIG_PWM_VT8500=y
+CONFIG_KEYSTONE_IRQ=y
+CONFIG_PHY_SUN4I_USB=y
+CONFIG_PHY_SUN9I_USB=y
 CONFIG_PHY_HIX5HD2_SATA=y
-CONFIG_E1000E=y
+CONFIG_PHY_BERLIN_SATA=y
-CONFIG_PWM_STI=y
-CONFIG_PWM_BCM2835=y
-CONFIG_PWM_BRCMSTB=m
-CONFIG_PHY_DM816X_USB=m
-CONFIG_OMAP_USB2=y
-CONFIG_TI_PIPE3=y
-CONFIG_TWL4030_USB=m
 CONFIG_PHY_BERLIN_USB=y
 CONFIG_PHY_CPCAP_USB=m
-CONFIG_PHY_BERLIN_SATA=y
+CONFIG_PHY_QCOM_APQ8064_SATA=m
+CONFIG_PHY_RCAR_GEN2=m
 CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_PHY_ROCKCHIP_USB=y
-CONFIG_PHY_QCOM_APQ8064_SATA=m
+CONFIG_PHY_SAMSUNG_USB2=m
 CONFIG_PHY_MIPHY28LP=y
-CONFIG_PHY_RCAR_GEN2=m
 CONFIG_PHY_STIH407_USB=y
 CONFIG_PHY_STM32_USBPHYC=y
-CONFIG_PHY_SUN4I_USB=y
-CONFIG_PHY_SUN9I_USB=y
-CONFIG_PHY_SAMSUNG_USB2=m
 CONFIG_PHY_TEGRA_XUSB=y
-CONFIG_PHY_BRCM_SATA=y
+CONFIG_PHY_DM816X_USB=m
-CONFIG_NVMEM=y
+CONFIG_OMAP_USB2=y
+CONFIG_TI_PIPE3=y
+CONFIG_TWL4030_USB=m
 CONFIG_NVMEM_IMX_OCOTP=y
 CONFIG_NVMEM_SUNXI_SID=y
 CONFIG_NVMEM_VF610_OCOTP=y
-CONFIG_BCM2835_MBOX=y
 CONFIG_RASPBERRYPI_FIRMWARE=y
-CONFIG_EFI_VARS=m
-CONFIG_EFI_CAPSULE_LOADER=m
 CONFIG_BCM47XX_NVRAM=y
 CONFIG_BCM47XX_SPROM=y
+CONFIG_EFI_VARS=m
+CONFIG_EFI_CAPSULE_LOADER=m
 CONFIG_EXT4_FS=y
 CONFIG_AUTOFS4_FS=y
 CONFIG_MSDOS_FS=y
 CONFIG_NTFS_FS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_UBIFS_FS=y
-CONFIG_TMPFS=y
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=y
 CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_FS=y
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_CPUFREQ_DT=y
-CONFIG_KEYSTONE_IRQ=y
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_ST=y
 CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
 CONFIG_CRYPTO_DEV_S5P=m
+CONFIG_CRYPTO_DEV_ATMEL_AES=m
+CONFIG_CRYPTO_DEV_ATMEL_TDES=m
+CONFIG_CRYPTO_DEV_ATMEL_SHA=m
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_ARM_CRYPTO=y
-CONFIG_CRYPTO_SHA1_ARM=m
 CONFIG_CRYPTO_SHA1_ARM_NEON=m
 CONFIG_CRYPTO_SHA1_ARM_CE=m
 CONFIG_CRYPTO_SHA2_ARM_CE=m
-CONFIG_CRYPTO_SHA256_ARM=m
 CONFIG_CRYPTO_SHA512_ARM=m
 CONFIG_CRYPTO_AES_ARM=m
 CONFIG_CRYPTO_AES_ARM_BS=m
 CONFIG_CRYPTO_AES_ARM_CE=m
-CONFIG_CRYPTO_CHACHA20_NEON=m
-CONFIG_CRYPTO_CRC32_ARM_CE=m
-CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
 CONFIG_CRYPTO_GHASH_ARM_CE=m
-CONFIG_CRYPTO_DEV_ATMEL_AES=m
+CONFIG_CRYPTO_CRC32_ARM_CE=m
-CONFIG_CRYPTO_DEV_ATMEL_TDES=m
+CONFIG_CRYPTO_CHACHA20_NEON=m
-CONFIG_CRYPTO_DEV_ATMEL_SHA=m
-CONFIG_VIDEO_VIVID=m
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_MMIO=y

arch/arm/kernel/signal.c+2−2

@@ -544,7 +544,7 @@ static void handle_signal(struct ksignal ksig, struct pt_regs regs) · 543 unmodified lines
544	* Increment event counter and perform fixup for the pre-signal	544	* Increment event counter and perform fixup for the pre-signal
545	* frame.	545	* frame.
546	*/	546	*/
547	rseq_signal_deliver(regs);	547	rseq_signal_deliver(ksig, regs);
548		548
549	/*	549	/*
550	* Set up the stack frame	550	* Set up the stack frame
@@ -666,7 +666,7 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall) · 115 unmodified lines
666	} else {	666	} else {
667	clear_thread_flag(TIF_NOTIFY_RESUME);	667	clear_thread_flag(TIF_NOTIFY_RESUME);
668	tracehook_notify_resume(regs);	668	tracehook_notify_resume(regs);
669	rseq_handle_notify_resume(regs);	669	rseq_handle_notify_resume(NULL, regs);
670	}	670	}
671	}	671	}
672	local_irq_disable();	672	local_irq_disable();

arch/arm/mach-bcm/Kconfig+1−0

@@ -20,6 +20,7 @@ config ARCH_BCM_IPROC · 19 unmodified lines
20	select GPIOLIB	20	select GPIOLIB
21	select ARM_AMBA	21	select ARM_AMBA
22	select PINCTRL	22	select PINCTRL
		23	select PCI_DOMAINS if PCI
23	help	24	help
24	This enables support for systems based on Broadcom IPROC architected SoCs.	25	This enables support for systems based on Broadcom IPROC architected SoCs.
25	The IPROC complex contains one or more ARM CPUs along with common	26	The IPROC complex contains one or more ARM CPUs along with common

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

@@ -774,7 +774,7 @@ static struct gpiod_lookup_table mmc_gpios_table = { · 773 unmodified lines
774	GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_CD_PIN, "cd",	774	GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_CD_PIN, "cd",
775	GPIO_ACTIVE_LOW),	775	GPIO_ACTIVE_LOW),
776	GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_WP_PIN, "wp",	776	GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_WP_PIN, "wp",
777	GPIO_ACTIVE_LOW),	777	GPIO_ACTIVE_HIGH),
778	},	778	},
779	};	779	};
780		780

arch/arm/mach-socfpga/Kconfig+1−0

@@ -10,6 +10,7 @@ menuconfig ARCH_SOCFPGA · 9 unmodified lines
10	select HAVE_ARM_SCU	10	select HAVE_ARM_SCU
11	select HAVE_ARM_TWD if SMP	11	select HAVE_ARM_TWD if SMP
12	select MFD_SYSCON	12	select MFD_SYSCON
		13	select PCI_DOMAINS if PCI
13		14
14	if ARCH_SOCFPGA	15	if ARCH_SOCFPGA
15	config SOCFPGA_SUSPEND	16	config SOCFPGA_SUSPEND

arch/arm/xen/enlighten.c+4−3

 static __read_mostly unsigned int xen_events_irq;
+uint32_t xen_start_flags;
+EXPORT_SYMBOL(xen_start_flags);
 int xen_remap_domain_gfn_array(struct vm_area_struct *vma,
 			       unsigned long addr,
 			       xen_pfn_t *gfn, int nr,
 	xen_setup_features();
 	if (xen_feature(XENFEAT_dom0))
-		xen_start_info->flags |= SIF_INITDOMAIN|SIF_PRIVILEGED;
+		xen_start_flags |= SIF_INITDOMAIN|SIF_PRIVILEGED;
-	else
-		xen_start_info->flags &= ~(SIF_INITDOMAIN|SIF_PRIVILEGED);
 	if (!console_set_on_cmdline && !xen_initial_domain())
 		add_preferred_console("hvc", 0, NULL);

arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi+2−4

 			interrupts = <0 99 4>;
 			resets = <&rst SPIM0_RESET>;
 			reg-io-width = <4>;
-			num-chipselect = <4>;
+			num-cs = <4>;
-			bus-num = <0>;
 			status = "disabled";
 		};
 			interrupts = <0 100 4>;
 			resets = <&rst SPIM1_RESET>;
 			reg-io-width = <4>;
-			num-chipselect = <4>;
+			num-cs = <4>;
-			bus-num = <0>;
 			status = "disabled";
 		};

arch/arm64/boot/dts/amlogic/meson-axg-s400.dts+14−1

@@ -66,9 +66,22 @@ · 65 unmodified lines
66		66
67	&ethmac {	67	&ethmac {
68	status = "okay";	68	status = "okay";
69	phy-mode = "rgmii";
70	pinctrl-0 = <&eth_rgmii_y_pins>;	69	pinctrl-0 = <&eth_rgmii_y_pins>;
71	pinctrl-names = "default";	70	pinctrl-names = "default";
		71	phy-handle = <&eth_phy0>;
		72	phy-mode = "rgmii";
		73
		74	mdio {
		75	compatible = "snps,dwmac-mdio";
		76	#address-cells = <1>;
		77	#size-cells = <0>;
		78
		79	eth_phy0: ethernet-phy@0 {
		80	/* Realtek RTL8211F (0x001cc916) */
		81	reg = <0>;
		82	eee-broken-1000t;
		83	};
		84	};
72	};	85	};
73		86
74	&uart_A {	87	&uart_A {

arch/arm64/boot/dts/amlogic/meson-axg.dtsi+2−2

@@ -132,7 +132,7 @@ · 131 unmodified lines
132		132
133	sd_emmc_b: sd@5000 {	133	sd_emmc_b: sd@5000 {
134	compatible = "amlogic,meson-axg-mmc";	134	compatible = "amlogic,meson-axg-mmc";
135	reg = <0x0 0x5000 0x0 0x2000>;	135	reg = <0x0 0x5000 0x0 0x800>;
136	interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;	136	interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
137	status = "disabled";	137	status = "disabled";
138	clocks = <&clkc CLKID_SD_EMMC_B>,	138	clocks = <&clkc CLKID_SD_EMMC_B>,
@@ -144,7 +144,7 @@ · 5 unmodified lines
144		144
145	sd_emmc_c: mmc@7000 {	145	sd_emmc_c: mmc@7000 {
146	compatible = "amlogic,meson-axg-mmc";	146	compatible = "amlogic,meson-axg-mmc";
147	reg = <0x0 0x7000 0x0 0x2000>;	147	reg = <0x0 0x7000 0x0 0x800>;
148	interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;	148	interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;
149	status = "disabled";	149	status = "disabled";
150	clocks = <&clkc CLKID_SD_EMMC_C>,	150	clocks = <&clkc CLKID_SD_EMMC_C>,

arch/arm64/boot/dts/amlogic/meson-gx.dtsi+9−3

 			no-map;
 		};
+		/* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */
+		secmon_reserved_alt: secmon@5000000 {
+			reg = <0x0 0x05000000 0x0 0x300000>;
+			no-map;
+		};
 		linux,cma {
 			compatible = "shared-dma-pool";
 			reusable;
 			sd_emmc_a: mmc@70000 {
 				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
-				reg = <0x0 0x70000 0x0 0x2000>;
+				reg = <0x0 0x70000 0x0 0x800>;
 				interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>;
 				status = "disabled";
 			};
 			sd_emmc_b: mmc@72000 {
 				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
-				reg = <0x0 0x72000 0x0 0x2000>;
+				reg = <0x0 0x72000 0x0 0x800>;
 				interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
 				status = "disabled";
 			};
 			sd_emmc_c: mmc@74000 {
 				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
-				reg = <0x0 0x74000 0x0 0x2000>;
+				reg = <0x0 0x74000 0x0 0x800>;
 				interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;
 				status = "disabled";
 			};

arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi+1−1

@@ -6,7 +6,7 @@ · 5 unmodified lines
6		6
7	&apb {	7	&apb {
8	mali: gpu@c0000 {	8	mali: gpu@c0000 {
9	compatible = "amlogic,meson-gxbb-mali", "arm,mali-450";	9	compatible = "amlogic,meson-gxl-mali", "arm,mali-450";
10	reg = <0x0 0xc0000 0x0 0x40000>;	10	reg = <0x0 0xc0000 0x0 0x40000>;
11	interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,	11	interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
12	<GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>,	12	<GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>,

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts+0−3

@@ -234,9 +234,6 @@ · 233 unmodified lines
234		234
235	bus-width = <4>;	235	bus-width = <4>;
236	cap-sd-highspeed;	236	cap-sd-highspeed;
237	sd-uhs-sdr12;
238	sd-uhs-sdr25;
239	sd-uhs-sdr50;
240	max-frequency = <100000000>;	237	max-frequency = <100000000>;
241	disable-wp;	238	disable-wp;
242		239

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi+7−0

@@ -189,3 +189,10 @@ · 188 unmodified lines
189	&usb0 {	189	&usb0 {
190	status = "okay";	190	status = "okay";
191	};	191	};
		192
		193	&usb2_phy0 {
		194	/*
		195	* HDMI_5V is also used as supply for the USB VBUS.
		196	*/
		197	phy-supply = <&hdmi_5v>;
		198	};

arch/arm64/boot/dts/amlogic/meson-gxl.dtsi+0−8

@@ -13,14 +13,6 @@ · 12 unmodified lines
13	/ {	13	/ {
14	compatible = "amlogic,meson-gxl";	14	compatible = "amlogic,meson-gxl";
15		15
16	reserved-memory {
17	/* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */
18	secmon_reserved_alt: secmon@5000000 {
19	reg = <0x0 0x05000000 0x0 0x300000>;
20	no-map;
21	};
22	};
23
24	soc {	16	soc {
25	usb0: usb@c9000000 {	17	usb0: usb@c9000000 {
26	status = "disabled";	18	status = "disabled";

arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi+4−4

@@ -118,7 +118,7 @@ · 117 unmodified lines
118		118
119	#interrupt-cells = <1>;	119	#interrupt-cells = <1>;
120	interrupt-map-mask = <0 0 0 0>;	120	interrupt-map-mask = <0 0 0 0>;
121	interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 281 IRQ_TYPE_NONE>;	121	interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 281 IRQ_TYPE_LEVEL_HIGH>;
122		122
123	linux,pci-domain = <0>;	123	linux,pci-domain = <0>;
124		124
@@ -149,7 +149,7 @@ · 24 unmodified lines
149		149
150	#interrupt-cells = <1>;	150	#interrupt-cells = <1>;
151	interrupt-map-mask = <0 0 0 0>;	151	interrupt-map-mask = <0 0 0 0>;
152	interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 305 IRQ_TYPE_NONE>;	152	interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 305 IRQ_TYPE_LEVEL_HIGH>;
153		153
154	linux,pci-domain = <4>;	154	linux,pci-domain = <4>;
155		155
@@ -566,7 +566,7 @@ · 410 unmodified lines
566	reg = <0x66080000 0x100>;	566	reg = <0x66080000 0x100>;
567	#address-cells = <1>;	567	#address-cells = <1>;
568	#size-cells = <0>;	568	#size-cells = <0>;
569	interrupts = <GIC_SPI 394 IRQ_TYPE_NONE>;	569	interrupts = <GIC_SPI 394 IRQ_TYPE_LEVEL_HIGH>;
570	clock-frequency = <100000>;	570	clock-frequency = <100000>;
571	status = "disabled";	571	status = "disabled";
572	};	572	};
@@ -594,7 +594,7 @@ · 21 unmodified lines
594	reg = <0x660b0000 0x100>;	594	reg = <0x660b0000 0x100>;
595	#address-cells = <1>;	595	#address-cells = <1>;
596	#size-cells = <0>;	596	#size-cells = <0>;
597	interrupts = <GIC_SPI 395 IRQ_TYPE_NONE>;	597	interrupts = <GIC_SPI 395 IRQ_TYPE_LEVEL_HIGH>;
598	clock-frequency = <100000>;	598	clock-frequency = <100000>;
599	status = "disabled";	599	status = "disabled";
600	};	600	};

arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dts+4−0

 	enet-phy-lane-swap;
 };
+&sdio0 {
+	mmc-ddr-1_8v;
+};
 &uart2 {
 	status = "okay";
 };

arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dts+4−0

@@ -42,3 +42,7 @@ · 41 unmodified lines
42	&gphy0 {	42	&gphy0 {
43	enet-phy-lane-swap;	43	enet-phy-lane-swap;
44	};	44	};
		45
		46	&sdio0 {
		47	mmc-ddr-1_8v;
		48	};

arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi+2−2

@@ -409,7 +409,7 @@ · 408 unmodified lines
409	reg = <0x000b0000 0x100>;	409	reg = <0x000b0000 0x100>;
410	#address-cells = <1>;	410	#address-cells = <1>;
411	#size-cells = <0>;	411	#size-cells = <0>;
412	interrupts = <GIC_SPI 177 IRQ_TYPE_NONE>;	412	interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>;
413	clock-frequency = <100000>;	413	clock-frequency = <100000>;
414	status = "disabled";	414	status = "disabled";
415	};	415	};
@@ -453,7 +453,7 @@ · 37 unmodified lines
453	reg = <0x000e0000 0x100>;	453	reg = <0x000e0000 0x100>;
454	#address-cells = <1>;	454	#address-cells = <1>;
455	#size-cells = <0>;	455	#size-cells = <0>;
456	interrupts = <GIC_SPI 178 IRQ_TYPE_NONE>;	456	interrupts = <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>;
457	clock-frequency = <100000>;	457	clock-frequency = <100000>;
458	status = "disabled";	458	status = "disabled";
459	};	459	};

arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts+2−0

 	vmmc-supply = <&wlan_en>;
 	ti,non-removable;
 	non-removable;
+	cap-power-off-card;
+	keep-power-in-suspend;
 	#address-cells = <0x1>;
 	#size-cells = <0x0>;
 	status = "ok";

arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts+2−0

@@ -322,6 +322,8 @@ · 321 unmodified lines
322	dwmmc_2: dwmmc2@f723f000 {	322	dwmmc_2: dwmmc2@f723f000 {
323	bus-width = <0x4>;	323	bus-width = <0x4>;
324	non-removable;	324	non-removable;
		325	cap-power-off-card;
		326	keep-power-in-suspend;
325	vmmc-supply = <&reg_vdd_3v3>;	327	vmmc-supply = <&reg_vdd_3v3>;
326	mmc-pwrseq = <&wl1835_pwrseq>;	328	mmc-pwrseq = <&wl1835_pwrseq>;
327		329

arch/arm64/boot/dts/marvell/armada-cp110.dtsi+1−1

@@ -149,7 +149,7 @@ · 148 unmodified lines
149		149
150	CP110_LABEL(icu): interrupt-controller@1e0000 {	150	CP110_LABEL(icu): interrupt-controller@1e0000 {
151	compatible = "marvell,cp110-icu";	151	compatible = "marvell,cp110-icu";
152	reg = <0x1e0000 0x10>;	152	reg = <0x1e0000 0x440>;
153	#interrupt-cells = <3>;	153	#interrupt-cells = <3>;
154	interrupt-controller;	154	interrupt-controller;
155	msi-parent = <&gicp>;	155	msi-parent = <&gicp>;

arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi+1−1

@@ -75,7 +75,7 @@ · 74 unmodified lines
75		75
76	serial@75b1000 {	76	serial@75b1000 {
77	label = "LS-UART0";	77	label = "LS-UART0";
78	status = "okay";	78	status = "disabled";
79	pinctrl-names = "default", "sleep";	79	pinctrl-names = "default", "sleep";
80	pinctrl-0 = <&blsp2_uart2_4pins_default>;	80	pinctrl-0 = <&blsp2_uart2_4pins_default>;
81	pinctrl-1 = <&blsp2_uart2_4pins_sleep>;	81	pinctrl-1 = <&blsp2_uart2_4pins_sleep>;

arch/arm64/boot/dts/qcom/msm8916.dtsi+2−2

@@ -1191,14 +1191,14 @@ · 1190 unmodified lines
1191		1191
1192	port@0 {	1192	port@0 {
1193	reg = <0>;	1193	reg = <0>;
1194	etf_out: endpoint {	1194	etf_in: endpoint {
1195	slave-mode;	1195	slave-mode;
1196	remote-endpoint = <&funnel0_out>;	1196	remote-endpoint = <&funnel0_out>;
1197	};	1197	};
1198	};	1198	};
1199	port@1 {	1199	port@1 {
1200	reg = <0>;	1200	reg = <0>;
1201	etf_in: endpoint {	1201	etf_out: endpoint {
1202	remote-endpoint = <&replicator_in>;	1202	remote-endpoint = <&replicator_in>;
1203	};	1203	};
1204	};	1204	};

arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts+1−1

@@ -54,7 +54,7 @@ · 53 unmodified lines
54	sound {	54	sound {
55	compatible = "audio-graph-card";	55	compatible = "audio-graph-card";
56	label = "UniPhier LD11";	56	label = "UniPhier LD11";
57	widgets = "Headphone", "Headphone Jack";	57	widgets = "Headphone", "Headphones";
58	dais = <&i2s_port2	58	dais = <&i2s_port2
59	&i2s_port3	59	&i2s_port3
60	&i2s_port4	60	&i2s_port4

arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts+1−1

@@ -54,7 +54,7 @@ · 53 unmodified lines
54	sound {	54	sound {
55	compatible = "audio-graph-card";	55	compatible = "audio-graph-card";
56	label = "UniPhier LD20";	56	label = "UniPhier LD20";
57	widgets = "Headphone", "Headphone Jack";	57	widgets = "Headphone", "Headphones";
58	dais = <&i2s_port2	58	dais = <&i2s_port2
59	&i2s_port3	59	&i2s_port3
60	&i2s_port4	60	&i2s_port4

arch/arm64/configs/defconfig+39−63

 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_ARCH_SEATTLE=y
+CONFIG_ARCH_SYNQUACER=y
 CONFIG_ARCH_RENESAS=y
 CONFIG_ARCH_R8A7795=y
 CONFIG_ARCH_R8A7796=y
 CONFIG_ARCH_STRATIX10=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_SPRD=y
-CONFIG_ARCH_SYNQUACER=y
 CONFIG_ARCH_THUNDER=y
 CONFIG_ARCH_THUNDER2=y
 CONFIG_ARCH_UNIPHIER=y
 CONFIG_ARCH_ZX=y
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_PCI=y
-CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCI_IOV=y
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_PCI_LAYERSCAPE=y
-CONFIG_PCI_HISI=y
-CONFIG_PCIE_QCOM=y
-CONFIG_PCIE_KIRIN=y
-CONFIG_PCIE_ARMADA_8K=y
-CONFIG_PCIE_HISI_STB=y
 CONFIG_PCI_AARDVARK=y
 CONFIG_PCI_TEGRA=y
 CONFIG_PCIE_RCAR=y
-CONFIG_PCIE_ROCKCHIP=y
-CONFIG_PCIE_ROCKCHIP_HOST=m
 CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCI_XGENE=y
 CONFIG_PCI_HOST_THUNDER_PEM=y
 CONFIG_PCI_HOST_THUNDER_ECAM=y
+CONFIG_PCIE_ROCKCHIP_HOST=m
+CONFIG_PCI_LAYERSCAPE=y
+CONFIG_PCI_HISI=y
+CONFIG_PCIE_QCOM=y
+CONFIG_PCIE_ARMADA_8K=y
+CONFIG_PCIE_KIRIN=y
+CONFIG_PCIE_HISI_STB=y
 CONFIG_ARM64_VA_BITS_48=y
 CONFIG_SCHED_MC=y
 CONFIG_NUMA=y
 CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
 CONFIG_ARM_CPUIDLE=y
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_ATTR_SET=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_CPUFREQ_DT=y
+CONFIG_ACPI_CPPC_CPUFREQ=m
 CONFIG_ARM_ARMADA_37XX_CPUFREQ=y
 CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
 CONFIG_ARM_SCPI_CPUFREQ=y
 CONFIG_ARM_TEGRA186_CPUFREQ=y
-CONFIG_ACPI_CPPC_CPUFREQ=m
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_SNI_AVE=y
 CONFIG_SNI_NETSEC=y
 CONFIG_STMMAC_ETH=m
-CONFIG_DWMAC_IPQ806X=m
-CONFIG_DWMAC_MESON=m
-CONFIG_DWMAC_ROCKCHIP=m
-CONFIG_DWMAC_SUNXI=m
-CONFIG_DWMAC_SUN8I=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=y
 CONFIG_AT803X_PHY=m
 CONFIG_MARVELL_PHY=m
 CONFIG_WLCORE_SDIO=m
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_ADC=m
-CONFIG_KEYBOARD_CROS_EC=y
 CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_CROS_EC=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 CONFIG_INPUT_MISC=y
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
 CONFIG_SERIAL_TEGRA=y
 CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=11
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
 CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 CONFIG_SERIAL_MVEBU_UART=y
 CONFIG_SERIAL_DEV_BUS=y
-CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
 CONFIG_VIRTIO_CONSOLE=y
-CONFIG_I2C_HID=m
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_SPI=y
 CONFIG_SPI_ARMADA_3700=y
-CONFIG_SPI_MESON_SPICC=m
-CONFIG_SPI_MESON_SPIFC=m
 CONFIG_SPI_BCM2835=m
 CONFIG_SPI_BCM2835AUX=m
+CONFIG_SPI_MESON_SPICC=m
+CONFIG_SPI_MESON_SPIFC=m
 CONFIG_SPI_ORION=y
 CONFIG_SPI_PL022=y
-CONFIG_SPI_QUP=y
 CONFIG_SPI_ROCKCHIP=y
+CONFIG_SPI_QUP=y
 CONFIG_SPI_S3C64XX=y
 CONFIG_SPI_SPIDEV=m
 CONFIG_SPMI=y
-CONFIG_PINCTRL_IPQ8074=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_MAX77620=y
+CONFIG_PINCTRL_IPQ8074=y
 CONFIG_PINCTRL_MSM8916=y
 CONFIG_PINCTRL_MSM8994=y
 CONFIG_PINCTRL_MSM8996=y
-CONFIG_PINCTRL_MT7622=y
 CONFIG_PINCTRL_QDF2XXX=y
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
+CONFIG_PINCTRL_MT7622=y
 CONFIG_GPIO_DWAPB=y
 CONFIG_GPIO_MB86S7X=y
 CONFIG_GPIO_PL061=y
 CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
 CONFIG_CPU_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
+CONFIG_ROCKCHIP_THERMAL=m
+CONFIG_RCAR_GEN3_THERMAL=y
 CONFIG_ARMADA_THERMAL=y
 CONFIG_BRCMSTB_THERMAL=m
 CONFIG_EXYNOS_THERMAL=y
-CONFIG_RCAR_GEN3_THERMAL=y
-CONFIG_QCOM_TSENS=y
-CONFIG_ROCKCHIP_THERMAL=m
 CONFIG_TEGRA_BPMP_THERMAL=m
+CONFIG_QCOM_TSENS=y
 CONFIG_UNIPHIER_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_S3C2410_WATCHDOG=y
 CONFIG_MFD_SPMI_PMIC=y
 CONFIG_MFD_RK808=y
 CONFIG_MFD_SEC_CORE=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_AXP20X=y
 CONFIG_REGULATOR_FAN53555=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_GPIO=y
 CONFIG_REGULATOR_HI6421V530=y
 CONFIG_REGULATOR_HI655X=y
 CONFIG_REGULATOR_QCOM_SPMI=y
 CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_S2MPS11=y
+CONFIG_RC_CORE=m
+CONFIG_RC_DECODERS=y
+CONFIG_RC_DEVICES=y
+CONFIG_IR_MESON=m
 CONFIG_MEDIA_SUPPORT=m
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
 CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
-CONFIG_MEDIA_RC_SUPPORT=y
-CONFIG_RC_CORE=m
-CONFIG_RC_DEVICES=y
-CONFIG_RC_DECODERS=y
-CONFIG_IR_MESON=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_DVB_NET is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_DRM_RCAR_DU=m
-CONFIG_DRM_RCAR_LVDS=y
+CONFIG_DRM_RCAR_LVDS=m
-CONFIG_DRM_RCAR_VSP=y
 CONFIG_DRM_TEGRA=m
 CONFIG_DRM_PANEL_SIMPLE=m
 CONFIG_DRM_I2C_ADV7511=m
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PWM=m
 CONFIG_BACKLIGHT_LP855X=m
-CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_SND_SOC_AK4613=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
+CONFIG_I2C_HID=m
 CONFIG_USB=y
 CONFIG_USB_OTG=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ACPI=y
-CONFIG_MMC_SDHCI_F_SDH30=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_OF_ARASAN=y
 CONFIG_MMC_SDHCI_OF_ESDHC=y
 CONFIG_MMC_SDHCI_CADENCE=y
 CONFIG_MMC_SDHCI_TEGRA=y
+CONFIG_MMC_SDHCI_F_SDH30=y
 CONFIG_MMC_MESON_GX=y
 CONFIG_MMC_SDHCI_MSM=y
 CONFIG_MMC_SPI=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_PWM=y
 CONFIG_LEDS_SYSCON=y
+CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_LEDS_TRIGGER_PANIC=y
-CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_EDAC=y
 CONFIG_EDAC_GHES=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_S5M=y
 CONFIG_RTC_DRV_DS3232=y
 CONFIG_RTC_DRV_EFI=y
+CONFIG_RTC_DRV_CROS_EC=y
 CONFIG_RTC_DRV_S3C=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_SUN6I=y
 CONFIG_RTC_DRV_ARMADA38X=y
 CONFIG_RTC_DRV_TEGRA=y
 CONFIG_RTC_DRV_XGENE=y
-CONFIG_RTC_DRV_CROS_EC=y
 CONFIG_DMADEVICES=y
 CONFIG_DMA_BCM2835=m
 CONFIG_K3_DMA=y
 CONFIG_ARM_MHU=y
 CONFIG_PLATFORM_MHU=y
 CONFIG_BCM2835_MBOX=y
-CONFIG_HI6220_MBOX=y
 CONFIG_QCOM_APCS_IPC=y
 CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_TEGRA_IOMMU_SMMU=y
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_EXTCON_USBC_CROS_EC=y
 CONFIG_MEMORY=y
-CONFIG_TEGRA_MC=y
 CONFIG_IIO=y
 CONFIG_EXYNOS_ADC=y
 CONFIG_ROCKCHIP_SARADC=m
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_PWM_SAMSUNG=y
 CONFIG_PWM_TEGRA=m
+CONFIG_PHY_XGENE=y
+CONFIG_PHY_SUN4I_USB=y
+CONFIG_PHY_HI6220_USB=y
 CONFIG_PHY_HISTB_COMBPHY=y
 CONFIG_PHY_HISI_INNO_USB2=y
-CONFIG_PHY_RCAR_GEN3_USB2=y
-CONFIG_PHY_RCAR_GEN3_USB3=m
-CONFIG_PHY_HI6220_USB=y
-CONFIG_PHY_QCOM_USB_HS=y
-CONFIG_PHY_SUN4I_USB=y
 CONFIG_PHY_MVEBU_CP110_COMPHY=y
 CONFIG_PHY_QCOM_QMP=m
-CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+CONFIG_PHY_QCOM_USB_HS=y
+CONFIG_PHY_RCAR_GEN3_USB2=y
+CONFIG_PHY_RCAR_GEN3_USB3=m
 CONFIG_PHY_ROCKCHIP_EMMC=y
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
 CONFIG_PHY_ROCKCHIP_PCIE=m
 CONFIG_PHY_ROCKCHIP_TYPEC=y
-CONFIG_PHY_XGENE=y
 CONFIG_PHY_TEGRA_XUSB=y
 CONFIG_QCOM_L2_PMU=y
 CONFIG_QCOM_L3_PMU=y
-CONFIG_MESON_EFUSE=m
 CONFIG_QCOM_QFPROM=y
 CONFIG_ROCKCHIP_EFUSE=y
 CONFIG_UNIPHIER_EFUSE=y
+CONFIG_MESON_EFUSE=m
 CONFIG_TEE=y
 CONFIG_OPTEE=y
 CONFIG_ARM_SCPI_PROTOCOL=y
 CONFIG_ACPI=y
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_PCIEAER=y
 CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_APEI_EINJ=y
 CONFIG_EXT2_FS=y
 CONFIG_DEBUG_FS=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOCKUP_DETECTOR=y
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_FTRACE is not set
 CONFIG_CRYPTO_ECHAINIV=y
 CONFIG_CRYPTO_ANSI_CPRNG=y
 CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_SHA256_ARM64=m
-CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA1_ARM64_CE=y
 CONFIG_CRYPTO_SHA2_ARM64_CE=y
+CONFIG_CRYPTO_SHA512_ARM64_CE=m
+CONFIG_CRYPTO_SHA3_ARM64=m
+CONFIG_CRYPTO_SM3_ARM64_CE=m
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
 CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRC32_ARM64_CE=m
-CONFIG_CRYPTO_AES_ARM64=m
-CONFIG_CRYPTO_AES_ARM64_CE=m
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
 CONFIG_CRYPTO_CHACHA20_NEON=m
 CONFIG_CRYPTO_AES_ARM64_BS=m
-CONFIG_CRYPTO_SHA512_ARM64_CE=m
-CONFIG_CRYPTO_SHA3_ARM64=m
-CONFIG_CRYPTO_SM3_ARM64_CE=m

arch/arm64/crypto/aes-glue.c+1−1

 		kernel_neon_begin();
 		aes_ctr_encrypt(walk.dst.virt.addr, walk.src.virt.addr,
 				(u8 *)ctx->key_enc, rounds, blocks, walk.iv);
-		err = skcipher_walk_done(&walk, walk.nbytes % AES_BLOCK_SIZE);
 		kernel_neon_end();
+		err = skcipher_walk_done(&walk, walk.nbytes % AES_BLOCK_SIZE);
 	}
 	if (walk.nbytes) {
 		u8 __aligned(8) tail[AES_BLOCK_SIZE];

arch/arm64/include/asm/alternative.h+6−1

@@ -28,7 +28,12 @@ typedef void (alternative_cb_t)(struct alt_instr alt, · 27 unmodified lines
28	__le32 origptr, __le32 updptr, int nr_inst);	28	__le32 origptr, __le32 updptr, int nr_inst);
29		29
30	void __init apply_alternatives_all(void);	30	void __init apply_alternatives_all(void);
31	void apply_alternatives(void *start, size_t length);	31
		32	#ifdef CONFIG_MODULES
		33	void apply_alternatives_module(void *start, size_t length);
		34	#else
		35	static inline void apply_alternatives_module(void *start, size_t length) { }
		36	#endif
32		37
33	#define ALTINSTR_ENTRY(feature,cb) \	38	#define ALTINSTR_ENTRY(feature,cb) \
34	" .word 661b - .\n" /* label */ \	39	" .word 661b - .\n" /* label */ \

arch/arm64/include/asm/kvm_host.h+1−0

@@ -306,6 +306,7 @@ struct kvm_vcpu_arch { · 305 unmodified lines
306	#define KVM_ARM64_FP_ENABLED (1 << 1) /* guest FP regs loaded */	306	#define KVM_ARM64_FP_ENABLED (1 << 1) /* guest FP regs loaded */
307	#define KVM_ARM64_FP_HOST (1 << 2) /* host FP regs loaded */	307	#define KVM_ARM64_FP_HOST (1 << 2) /* host FP regs loaded */
308	#define KVM_ARM64_HOST_SVE_IN_USE (1 << 3) /* backup for host TIF_SVE */	308	#define KVM_ARM64_HOST_SVE_IN_USE (1 << 3) /* backup for host TIF_SVE */
		309	#define KVM_ARM64_HOST_SVE_ENABLED (1 << 4) /* SVE enabled for EL0 */
309		310
310	#define vcpu_gp_regs(v) (&(v)->arch.ctxt.gp_regs)	311	#define vcpu_gp_regs(v) (&(v)->arch.ctxt.gp_regs)
311		312

arch/arm64/include/asm/pgtable.h+1−5

 	 * Only if the new pte is valid and kernel, otherwise TLB maintenance
 	 * or update_mmu_cache() have the necessary barriers.
 	 */
-	if (pte_valid_not_user(pte)) {
+	if (pte_valid_not_user(pte))
 		dsb(ishst);
-		isb();
-	}
 }
 extern void __sync_icache_dcache(pte_t pteval);
 {
 	WRITE_ONCE(*pmdp, pmd);
 	dsb(ishst);
-	isb();
 }
 static inline void pmd_clear(pmd_t *pmdp)
 {
 	WRITE_ONCE(*pudp, pud);
 	dsb(ishst);
-	isb();
 }
 static inline void pud_clear(pud_t *pudp)

arch/arm64/include/asm/sysreg.h+11−0

@@ -728,6 +728,17 @@ asm( · 727 unmodified lines
728	asm volatile("msr_s " __stringify(r) ", %x0" : : "rZ" (__val)); \	728	asm volatile("msr_s " __stringify(r) ", %x0" : : "rZ" (__val)); \
729	} while (0)	729	} while (0)
730		730
		731	/*
		732	* Modify bits in a sysreg. Bits in the clear mask are zeroed, then bits in the
		733	* set mask are set. Other bits are left as-is.
		734	*/
		735	#define sysreg_clear_set(sysreg, clear, set) do { \
		736	u64 __scs_val = read_sysreg(sysreg); \
		737	u64 __scs_new = (__scs_val & ~(u64)(clear)) \| (set); \
		738	if (__scs_new != __scs_val) \
		739	write_sysreg(__scs_new, sysreg); \
		740	} while (0)
		741
731	static inline void config_sctlr_el1(u32 clear, u32 set)	742	static inline void config_sctlr_el1(u32 clear, u32 set)
732	{	743	{
733	u32 val;	744	u32 val;

arch/arm64/kernel/alternative.c+44−7

 	}
 }
-static void __apply_alternatives(void *alt_region, bool use_linear_alias)
+/*
+ * We provide our own, private D-cache cleaning function so that we don't
+ * accidentally call into the cache.S code, which is patched by us at
+ * runtime.
+ */
+static void clean_dcache_range_nopatch(u64 start, u64 end)
+{
+	u64 cur, d_size, ctr_el0;
+	ctr_el0 = read_sanitised_ftr_reg(SYS_CTR_EL0);
+	d_size = 4 << cpuid_feature_extract_unsigned_field(ctr_el0,
+							   CTR_DMINLINE_SHIFT);
+	cur = start & ~(d_size - 1);
+	do {
+		/*
+		 * We must clean+invalidate to the PoC in order to avoid
+		 * Cortex-A53 errata 826319, 827319, 824069 and 819472
+		 * (this corresponds to ARM64_WORKAROUND_CLEAN_CACHE)
+		 */
+		asm volatile("dc civac, %0" : : "r" (cur) : "memory");
+	} while (cur += d_size, cur < end);
+}
+static void __apply_alternatives(void *alt_region, bool is_module)
 {
 	struct alt_instr *alt;
 	struct alt_region *region = alt_region;
 		pr_info_once("patching kernel code\n");
 		origptr = ALT_ORIG_PTR(alt);
-		updptr = use_linear_alias ? lm_alias(origptr) : origptr;
+		updptr = is_module ? origptr : lm_alias(origptr);
 		nr_inst = alt->orig_len / AARCH64_INSN_SIZE;
 		if (alt->cpufeature < ARM64_CB_PATCH)
 		alt_cb(alt, origptr, updptr, nr_inst);
-		flush_icache_range((uintptr_t)origptr,
+		if (!is_module) {
-				   (uintptr_t)(origptr + nr_inst));
+			clean_dcache_range_nopatch((u64)origptr,
+						   (u64)(origptr + nr_inst));
+		}
+	}
+	/*
+	 * The core module code takes care of cache maintenance in
+	 * flush_module_icache().
+	 */
+	if (!is_module) {
+		dsb(ish);
+		__flush_icache_all();
+		isb();
 	}
 }
 		isb();
 	} else {
 		BUG_ON(alternatives_applied);
-		__apply_alternatives(&region, true);
+		__apply_alternatives(&region, false);
 		/* Barriers provided by the cache flushing */
 		WRITE_ONCE(alternatives_applied, 1);
 	}
 	stop_machine(__apply_alternatives_multi_stop, NULL, cpu_online_mask);
 }
-void apply_alternatives(void *start, size_t length)
+#ifdef CONFIG_MODULES
+void apply_alternatives_module(void *start, size_t length)
 {
 	struct alt_region region = {
 		.begin	= start,
 		.end	= start + length,
 	};
-	__apply_alternatives(&region, false);
+	__apply_alternatives(&region, true);
 }
+#endif

arch/arm64/kernel/cpufeature.c+1−1

@@ -937,7 +937,7 @@ static int __init parse_kpti(char *str) · 936 unmodified lines
937	__kpti_forced = enabled ? 1 : -1;	937	__kpti_forced = enabled ? 1 : -1;
938	return 0;	938	return 0;
939	}	939	}
940	__setup("kpti=", parse_kpti);	940	early_param("kpti", parse_kpti);
941	#endif /* CONFIG_UNMAP_KERNEL_AT_EL0 */	941	#endif /* CONFIG_UNMAP_KERNEL_AT_EL0 */
942		942
943	#ifdef CONFIG_ARM64_HW_AFDBM	943	#ifdef CONFIG_ARM64_HW_AFDBM

arch/arm64/kernel/module.c+2−3

 	const char *secstrs = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
 	for (s = sechdrs, se = sechdrs + hdr->e_shnum; s < se; s++) {
-		if (strcmp(".altinstructions", secstrs + s->sh_name) == 0) {
+		if (strcmp(".altinstructions", secstrs + s->sh_name) == 0)
-			apply_alternatives((void *)s->sh_addr, s->sh_size);
+			apply_alternatives_module((void *)s->sh_addr, s->sh_size);
-		}
 #ifdef CONFIG_ARM64_MODULE_PLTS
 		if (IS_ENABLED(CONFIG_DYNAMIC_FTRACE) &&
 		    !strcmp(".text.ftrace_trampoline", secstrs + s->sh_name))

arch/arm64/kernel/smp.c+1−1

@@ -179,7 +179,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle) · 178 unmodified lines
179	* This is the secondary CPU boot entry. We're using this CPUs	179	* This is the secondary CPU boot entry. We're using this CPUs
180	* idle thread stack, but a set of temporary page tables.	180	* idle thread stack, but a set of temporary page tables.
181	*/	181	*/
182	asmlinkage void secondary_start_kernel(void)	182	asmlinkage notrace void secondary_start_kernel(void)
183	{	183	{
184	u64 mpidr = read_cpuid_mpidr() & MPIDR_HWID_BITMASK;	184	u64 mpidr = read_cpuid_mpidr() & MPIDR_HWID_BITMASK;
185	struct mm_struct *mm = &init_mm;	185	struct mm_struct *mm = &init_mm;

arch/arm64/kvm/fpsimd.c+27−9

  * Copyright 2018 Arm Limited
  * Author: Dave Martin <Dave.Martin@arm.com>
  */
-#include <linux/bottom_half.h>
+#include <linux/irqflags.h>
 #include <linux/sched.h>
 #include <linux/thread_info.h>
 #include <linux/kvm_host.h>
 #include <asm/kvm_asm.h>
 #include <asm/kvm_host.h>
 #include <asm/kvm_mmu.h>
+#include <asm/sysreg.h>
 /*
  * Called on entry to KVM_RUN unless this vcpu previously ran at least
 {
 	BUG_ON(!current->mm);
-	vcpu->arch.flags &= ~(KVM_ARM64_FP_ENABLED | KVM_ARM64_HOST_SVE_IN_USE);
+	vcpu->arch.flags &= ~(KVM_ARM64_FP_ENABLED |
+			      KVM_ARM64_HOST_SVE_IN_USE |
+			      KVM_ARM64_HOST_SVE_ENABLED);
 	vcpu->arch.flags |= KVM_ARM64_FP_HOST;
 	if (test_thread_flag(TIF_SVE))
 		vcpu->arch.flags |= KVM_ARM64_HOST_SVE_IN_USE;
+	if (read_sysreg(cpacr_el1) & CPACR_EL1_ZEN_EL0EN)
+		vcpu->arch.flags |= KVM_ARM64_HOST_SVE_ENABLED;
 }
 /*
  */
 void kvm_arch_vcpu_put_fp(struct kvm_vcpu *vcpu)
 {
-	local_bh_disable();
+	unsigned long flags;
-	update_thread_flag(TIF_SVE,
+	local_irq_save(flags);
-			   vcpu->arch.flags & KVM_ARM64_HOST_SVE_IN_USE);
 	if (vcpu->arch.flags & KVM_ARM64_FP_ENABLED) {
 		/* Clean guest FP state to memory and invalidate cpu view */
 		fpsimd_save();
 		fpsimd_flush_cpu_state();
-	} else if (!test_thread_flag(TIF_FOREIGN_FPSTATE)) {
+	} else if (system_supports_sve()) {
-		/* Ensure user trap controls are correctly restored */
+		/*
-		fpsimd_bind_task_to_cpu();
+		 * The FPSIMD/SVE state in the CPU has not been touched, and we
+		 * have SVE (and VHE): CPACR_EL1 (alias CPTR_EL2) has been
+		 * reset to CPACR_EL1_DEFAULT by the Hyp code, disabling SVE
+		 * for EL0.  To avoid spurious traps, restore the trap state
+		 * seen by kvm_arch_vcpu_load_fp():
+		 */
+		if (vcpu->arch.flags & KVM_ARM64_HOST_SVE_ENABLED)
+			sysreg_clear_set(CPACR_EL1, 0, CPACR_EL1_ZEN_EL0EN);
+		else
+			sysreg_clear_set(CPACR_EL1, CPACR_EL1_ZEN_EL0EN, 0);
 	}
-	local_bh_enable();
+	update_thread_flag(TIF_SVE,
+			   vcpu->arch.flags & KVM_ARM64_HOST_SVE_IN_USE);
+	local_irq_restore(flags);
 }

arch/arm64/mm/dma-mapping.c+5−4

 						    size >> PAGE_SHIFT);
 			return NULL;
 		}
-		if (!coherent)
-			__dma_flush_area(page_to_virt(page), iosize);
 		addr = dma_common_contiguous_remap(page, size, VM_USERMAP,
 						   prot,
 						   __builtin_return_address(0));
-		if (!addr) {
+		if (addr) {
+			memset(addr, 0, size);
+			if (!coherent)
+				__dma_flush_area(page_to_virt(page), iosize);
+		} else {
 			iommu_dma_unmap_page(dev, *handle, iosize, 0, attrs);
 			dma_release_from_contiguous(dev, page,
 						    size >> PAGE_SHIFT);

arch/arm64/mm/proc.S+3−2

@@ -217,8 +217,9 @@ ENDPROC(idmap_cpu_replace_ttbr1) · 216 unmodified lines
217		217
218	.macro __idmap_kpti_put_pgtable_ent_ng, type	218	.macro __idmap_kpti_put_pgtable_ent_ng, type
219	orr \type, \type, #PTE_NG // Same bit for blocks and pages	219	orr \type, \type, #PTE_NG // Same bit for blocks and pages
220	str \type, [cur_\()\type\()p] // Update the entry and ensure it	220	str \type, [cur_\()\type\()p] // Update the entry and ensure
221	dc civac, cur_\()\type\()p // is visible to all CPUs.	221	dmb sy // that it is visible to all
		222	dc civac, cur_\()\type\()p // CPUs.
222	.endm	223	.endm
223		224
224	/*	225	/*

arch/microblaze/Kconfig.debug+0−7

@@ -8,11 +8,4 @@ config TRACE_IRQFLAGS_SUPPORT · 7 unmodified lines
8		8
9	source "lib/Kconfig.debug"	9	source "lib/Kconfig.debug"
10		10
11	config HEART_BEAT
12	bool "Heart beat function for kernel"
13	default n
14	help
15	This option turns on/off heart beat kernel functionality.
16	First GPIO node is taken.
17
18	endmenu	11	endmenu

arch/microblaze/include/asm/setup.h+0−5

 extern char *klimit;
-void microblaze_heartbeat(void);
-void microblaze_setup_heartbeat(void);
 #   ifdef CONFIG_MMU
 extern void mmu_reset(void);
 #   endif /* CONFIG_MMU */
-extern void of_platform_reset_gpio_probe(void);
 void time_init(void);
 void init_IRQ(void);
 void machine_early_init(const char *cmdline, unsigned int ram,

arch/microblaze/include/asm/unistd.h+1−1

@@ -38,6 +38,6 @@ · 37 unmodified lines
38		38
39	#endif /* __ASSEMBLY__ */	39	#endif /* __ASSEMBLY__ */
40		40
41	#define __NR_syscalls 399	41	#define __NR_syscalls 401
42		42
43	#endif /* _ASM_MICROBLAZE_UNISTD_H */	43	#endif /* _ASM_MICROBLAZE_UNISTD_H */

arch/microblaze/include/uapi/asm/unistd.h+2−0

@@ -415,5 +415,7 @@ · 414 unmodified lines
415	#define __NR_pkey_alloc 396	415	#define __NR_pkey_alloc 396
416	#define __NR_pkey_free 397	416	#define __NR_pkey_free 397
417	#define __NR_statx 398	417	#define __NR_statx 398
		418	#define __NR_io_pgetevents 399
		419	#define __NR_rseq 400
418		420
419	#endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */	421	#endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */

arch/microblaze/kernel/Makefile+1−3

 CFLAGS_REMOVE_timer.o = -pg
 CFLAGS_REMOVE_intc.o = -pg
 CFLAGS_REMOVE_early_printk.o = -pg
-CFLAGS_REMOVE_heartbeat.o = -pg
 CFLAGS_REMOVE_ftrace.o = -pg
 CFLAGS_REMOVE_process.o = -pg
 endif
 obj-y += dma.o exceptions.o \
 	hw_exception_handler.o irq.o \
-	platform.o process.o prom.o ptrace.o \
+	process.o prom.o ptrace.o \
 	reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o
 obj-y += cpu/
-obj-$(CONFIG_HEART_BEAT)	+= heartbeat.o
 obj-$(CONFIG_MODULES)		+= microblaze_ksyms.o module.o
 obj-$(CONFIG_MMU)		+= misc.o
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

arch/microblaze/kernel/heartbeat.c+0−72

@@ -1,72 +0,0 @@
1	/*
2	* Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu>
3	* Copyright (C) 2007-2009 PetaLogix
4	* Copyright (C) 2006 Atmark Techno, Inc.
5	*
6	* This file is subject to the terms and conditions of the GNU General Public
7	* License. See the file "COPYING" in the main directory of this archive
8	* for more details.
9	*/
10
11	#include <linux/sched.h>
12	#include <linux/sched/loadavg.h>
13	#include <linux/io.h>
14
15	#include <asm/setup.h>
16	#include <asm/page.h>
17	#include <asm/prom.h>
18
19	static unsigned int base_addr;
20
21	void microblaze_heartbeat(void)
22	{
23	static unsigned int cnt, period, dist;
24
25	if (base_addr) {
26	if (cnt == 0 \|\| cnt == dist)
27	out_be32(base_addr, 1);
28	else if (cnt == 7 \|\| cnt == dist + 7)
29	out_be32(base_addr, 0);
30
31	if (++cnt > period) {
32	cnt = 0;
33	/*
34	* The hyperbolic function below modifies the heartbeat
35	* period length in dependency of the current (5min)
36	* load. It goes through the points f(0)=126, f(1)=86,
37	* f(5)=51, f(inf)->30.
38	*/
39	period = ((672 << FSHIFT) / (5 * avenrun[0] +
40	(7 << FSHIFT))) + 30;
41	dist = period / 4;
42	}
43	}
44	}
45
46	void microblaze_setup_heartbeat(void)
47	{
48	struct device_node *gpio = NULL;
49	int *prop;
50	int j;
51	const char * const gpio_list[] = {
52	"xlnx,xps-gpio-1.00.a",
53	NULL
54	};
55
56	for (j = 0; gpio_list[j] != NULL; j++) {
57	gpio = of_find_compatible_node(NULL, NULL, gpio_list[j]);
58	if (gpio)
59	break;
60	}
61
62	if (gpio) {
63	base_addr = be32_to_cpup(of_get_property(gpio, "reg", NULL));
64	base_addr = (unsigned long) ioremap(base_addr, PAGE_SIZE);
65	pr_notice("Heartbeat GPIO at 0x%x\n", base_addr);
66
67	/* GPIO is configured as output */
68	prop = (int *) of_get_property(gpio, "xlnx,is-bidir", NULL);
69	if (prop)
70	out_be32(base_addr + 4, 0);
71	}
72	}

arch/microblaze/kernel/platform.c+0−29

@@ -1,29 +0,0 @@
1	/*
2	* Copyright 2008 Michal Simek <monstr@monstr.eu>
3	*
4	* based on virtex.c file
5	*
6	* Copyright 2007 Secret Lab Technologies Ltd.
7	*
8	* This file is licensed under the terms of the GNU General Public License
9	* version 2. This program is licensed "as is" without any warranty of any
10	* kind, whether express or implied.
11	*/
12
13	#include <linux/init.h>
14	#include <linux/of_platform.h>
15	#include <asm/setup.h>
16
17	static struct of_device_id xilinx_of_bus_ids[] __initdata = {
18	{ .compatible = "simple-bus", },
19	{ .compatible = "xlnx,compound", },
20	{}
21	};
22
23	static int __init microblaze_device_probe(void)
24	{
25	of_platform_bus_probe(NULL, xilinx_of_bus_ids, NULL);
26	of_platform_reset_gpio_probe();
27	return 0;
28	}
29	device_initcall(microblaze_device_probe);

arch/microblaze/kernel/reset.c+6−5

 static int handle; /* reset pin handle */
 static unsigned int reset_val;
-void of_platform_reset_gpio_probe(void)
+static int of_platform_reset_gpio_probe(void)
 {
 	int ret;
 	handle = of_get_named_gpio(of_find_node_by_path("/"),
 	if (!gpio_is_valid(handle)) {
 		pr_info("Skipping unavailable RESET gpio %d (%s)\n",
 				handle, "reset");
-		return;
+		return -ENODEV;
 	}
 	ret = gpio_request(handle, "reset");
 	if (ret < 0) {
 		pr_info("GPIO pin is already allocated\n");
-		return;
+		return ret;
 	}
 	/* get current setup value */
 	pr_info("RESET: Registered gpio device: %d, current val: %d\n",
 							handle, reset_val);
-	return;
+	return 0;
 err:
 	gpio_free(handle);
-	return;
+	return ret;
 }
+device_initcall(of_platform_reset_gpio_probe);
 static void gpio_system_reset(void)

arch/microblaze/kernel/syscall_table.S+2−0

@@ -400,3 +400,5 @@ ENTRY(sys_call_table) · 399 unmodified lines
400	.long sys_pkey_alloc	400	.long sys_pkey_alloc
401	.long sys_pkey_free	401	.long sys_pkey_free
402	.long sys_statx	402	.long sys_statx
		403	.long sys_io_pgetevents
		404	.long sys_rseq

arch/microblaze/kernel/timer.c+0−7

 static irqreturn_t timer_interrupt(int irq, void *dev_id)
 {
 	struct clock_event_device *evt = &clockevent_xilinx_timer;
-#ifdef CONFIG_HEART_BEAT
-	microblaze_heartbeat();
-#endif
 	timer_ack();
 	evt->event_handler(evt);
 	return IRQ_HANDLED;
 		return ret;
 	}
-#ifdef CONFIG_HEART_BEAT
-	microblaze_setup_heartbeat();
-#endif
 	ret = xilinx_clocksource_init();
 	if (ret)
 		return ret;

arch/mips/Kconfig+1−0

@@ -65,6 +65,7 @@ config MIPS · 64 unmodified lines
65	select HAVE_OPROFILE	65	select HAVE_OPROFILE
66	select HAVE_PERF_EVENTS	66	select HAVE_PERF_EVENTS
67	select HAVE_REGS_AND_STACK_ACCESS_API	67	select HAVE_REGS_AND_STACK_ACCESS_API
		68	select HAVE_RSEQ
68	select HAVE_STACKPROTECTOR	69	select HAVE_STACKPROTECTOR
69	select HAVE_SYSCALL_TRACEPOINTS	70	select HAVE_SYSCALL_TRACEPOINTS
70	select HAVE_VIRT_CPU_ACCOUNTING_GEN if 64BIT \|\| !SMP	71	select HAVE_VIRT_CPU_ACCOUNTING_GEN if 64BIT \|\| !SMP

arch/mips/ath79/mach-pb44.c+1−1

@@ -34,7 +34,7 @@ · 33 unmodified lines
34	#define PB44_KEYS_DEBOUNCE_INTERVAL (3 * PB44_KEYS_POLL_INTERVAL)	34	#define PB44_KEYS_DEBOUNCE_INTERVAL (3 * PB44_KEYS_POLL_INTERVAL)
35		35
36	static struct gpiod_lookup_table pb44_i2c_gpiod_table = {	36	static struct gpiod_lookup_table pb44_i2c_gpiod_table = {
37	.dev_id = "i2c-gpio",	37	.dev_id = "i2c-gpio.0",
38	.table = {	38	.table = {
39	GPIO_LOOKUP_IDX("ath79-gpio", PB44_GPIO_I2C_SDA,	39	GPIO_LOOKUP_IDX("ath79-gpio", PB44_GPIO_I2C_SDA,
40	NULL, 0, GPIO_ACTIVE_HIGH \| GPIO_OPEN_DRAIN),	40	NULL, 0, GPIO_ACTIVE_HIGH \| GPIO_OPEN_DRAIN),

arch/mips/bcm47xx/setup.c+6−0

 		 */
 		if (bcm47xx_bus.bcma.bus.chipinfo.id == BCMA_CHIP_ID_BCM4706)
 			cpu_wait = NULL;
+		/*
+		 * BCM47XX Erratum "R10: PCIe Transactions Periodically Fail"
+		 * Enable ExternalSync for sync instruction to take effect
+		 */
+		set_c0_config7(MIPS_CONF7_ES);
 		break;
 #endif
 	}

arch/mips/include/asm/io.h+2−0

@@ -414,6 +414,8 @@ static inline type pfx##in##bwlq##p(unsigned long port) \ · 413 unmodified lines
414	__val = *__addr; \	414	__val = *__addr; \
415	slow; \	415	slow; \
416	\	416	\
		417	/* prevent prefetching of coherent DMA data prematurely */ \
		418	rmb(); \
417	return pfx##ioswab##bwlq(__addr, __val); \	419	return pfx##ioswab##bwlq(__addr, __val); \
418	}	420	}
419		421

arch/mips/include/asm/mipsregs.h+3−0

 #define MIPS_CONF7_WII		(_ULCAST_(1) << 31)
 #define MIPS_CONF7_RPS		(_ULCAST_(1) << 2)
+/* ExternalSync */
+#define MIPS_CONF7_ES		(_ULCAST_(1) << 8)
 #define MIPS_CONF7_IAR		(_ULCAST_(1) << 10)
 #define MIPS_CONF7_AR		(_ULCAST_(1) << 16)
 __BUILD_SET_C0(cause)
 __BUILD_SET_C0(config)
 __BUILD_SET_C0(config5)
+__BUILD_SET_C0(config7)
 __BUILD_SET_C0(intcontrol)
 __BUILD_SET_C0(intctl)
 __BUILD_SET_C0(srsmap)

arch/mips/include/uapi/asm/unistd.h+12−6

 #define __NR_pkey_alloc			(__NR_Linux + 364)
 #define __NR_pkey_free			(__NR_Linux + 365)
 #define __NR_statx			(__NR_Linux + 366)
+#define __NR_rseq			(__NR_Linux + 367)
+#define __NR_io_pgetevents		(__NR_Linux + 368)
 /*
  * Offset of the last Linux o32 flavoured syscall
  */
-#define __NR_Linux_syscalls		366
+#define __NR_Linux_syscalls		368
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
 #define __NR_O32_Linux			4000
-#define __NR_O32_Linux_syscalls		366
+#define __NR_O32_Linux_syscalls		368
 #if _MIPS_SIM == _MIPS_SIM_ABI64
 #define __NR_pkey_alloc			(__NR_Linux + 324)
 #define __NR_pkey_free			(__NR_Linux + 325)
 #define __NR_statx			(__NR_Linux + 326)
+#define __NR_rseq			(__NR_Linux + 327)
+#define __NR_io_pgetevents		(__NR_Linux + 328)
 /*
  * Offset of the last Linux 64-bit flavoured syscall
  */
-#define __NR_Linux_syscalls		326
+#define __NR_Linux_syscalls		328
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
 #define __NR_64_Linux			5000
-#define __NR_64_Linux_syscalls		326
+#define __NR_64_Linux_syscalls		328
 #if _MIPS_SIM == _MIPS_SIM_NABI32
 #define __NR_pkey_alloc			(__NR_Linux + 328)
 #define __NR_pkey_free			(__NR_Linux + 329)
 #define __NR_statx			(__NR_Linux + 330)
+#define __NR_rseq			(__NR_Linux + 331)
+#define __NR_io_pgetevents		(__NR_Linux + 332)
 /*
  * Offset of the last N32 flavoured syscall
  */
-#define __NR_Linux_syscalls		330
+#define __NR_Linux_syscalls		332
 #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
 #define __NR_N32_Linux			6000
-#define __NR_N32_Linux_syscalls		330
+#define __NR_N32_Linux_syscalls		332
 #endif /* _UAPI_ASM_UNISTD_H */

arch/mips/kernel/entry.S+8−0

 	jal	schedule_tail		# a0 = struct task_struct *prev
 FEXPORT(syscall_exit)
+#ifdef CONFIG_DEBUG_RSEQ
+	move	a0, sp
+	jal	rseq_syscall
+#endif
 	local_irq_disable		# make sure need_resched and
 					# signals dont change between
 					# sampling and return
 	j	resume_userspace_check
 FEXPORT(syscall_exit_partial)
+#ifdef CONFIG_DEBUG_RSEQ
+	move	a0, sp
+	jal	rseq_syscall
+#endif
 	local_irq_disable		# make sure need_resched doesn't
 					# change between and return
 	LONG_L	a2, TI_FLAGS($28)	# current->work

arch/mips/kernel/mcount.S+12−15

 EXPORT_SYMBOL(_mcount)
 	PTR_LA	t1, ftrace_stub
 	PTR_L	t2, ftrace_trace_function /* Prepare t2 for (1) */
-	bne	t1, t2, static_trace
+	beq	t1, t2, fgraph_trace
 	 nop
+	MCOUNT_SAVE_REGS
+	move	a0, ra		/* arg1: self return address */
+	jalr	t2		/* (1) call *ftrace_trace_function */
+	 move	a1, AT		/* arg2: parent's return address */
+	MCOUNT_RESTORE_REGS
+fgraph_trace:
 #ifdef	CONFIG_FUNCTION_GRAPH_TRACER
+	PTR_LA	t1, ftrace_stub
 	PTR_L	t3, ftrace_graph_return
 	bne	t1, t3, ftrace_graph_caller
 	 nop
 	bne	t1, t3, ftrace_graph_caller
 	 nop
 #endif
-	b	ftrace_stub
-#ifdef CONFIG_32BIT
-	 addiu sp, sp, 8
-#else
-	 nop
-#endif
-static_trace:
-	MCOUNT_SAVE_REGS
-	move	a0, ra		/* arg1: self return address */
-	jalr	t2		/* (1) call *ftrace_trace_function */
-	 move	a1, AT		/* arg2: parent's return address */
-	MCOUNT_RESTORE_REGS
 #ifdef CONFIG_32BIT
 	addiu sp, sp, 8
 #endif
 	.globl ftrace_stub
 ftrace_stub:
 	RETURN_BACK

arch/mips/kernel/scall32-o32.S+2−0

@@ -590,3 +590,5 @@ EXPORT(sys_call_table) · 589 unmodified lines
590	PTR sys_pkey_alloc	590	PTR sys_pkey_alloc
591	PTR sys_pkey_free /* 4365 */	591	PTR sys_pkey_free /* 4365 */
592	PTR sys_statx	592	PTR sys_statx
		593	PTR sys_rseq
		594	PTR sys_io_pgetevents

arch/mips/kernel/scall64-64.S+2−0

@@ -439,4 +439,6 @@ EXPORT(sys_call_table) · 438 unmodified lines
439	PTR sys_pkey_alloc	439	PTR sys_pkey_alloc
440	PTR sys_pkey_free /* 5325 */	440	PTR sys_pkey_free /* 5325 */
441	PTR sys_statx	441	PTR sys_statx
		442	PTR sys_rseq
		443	PTR sys_io_pgetevents
442	.size sys_call_table,.-sys_call_table	444	.size sys_call_table,.-sys_call_table

arch/mips/kernel/scall64-n32.S+2−0

@@ -434,4 +434,6 @@ EXPORT(sysn32_call_table) · 433 unmodified lines
434	PTR sys_pkey_alloc	434	PTR sys_pkey_alloc
435	PTR sys_pkey_free	435	PTR sys_pkey_free
436	PTR sys_statx /* 6330 */	436	PTR sys_statx /* 6330 */
		437	PTR sys_rseq
		438	PTR compat_sys_io_pgetevents
437	.size sysn32_call_table,.-sysn32_call_table	439	.size sysn32_call_table,.-sysn32_call_table

arch/mips/kernel/scall64-o32.S+2−0

@@ -583,4 +583,6 @@ EXPORT(sys32_call_table) · 582 unmodified lines
583	PTR sys_pkey_alloc	583	PTR sys_pkey_alloc
584	PTR sys_pkey_free /* 4365 */	584	PTR sys_pkey_free /* 4365 */
585	PTR sys_statx	585	PTR sys_statx
		586	PTR sys_rseq
		587	PTR compat_sys_io_pgetevents
586	.size sys32_call_table,.-sys32_call_table	588	.size sys32_call_table,.-sys32_call_table

arch/mips/kernel/signal.c+3−0

 		regs->regs[0] = 0;		/* Don't deal with this again.	*/
 	}
+	rseq_signal_deliver(ksig, regs);
 	if (sig_uses_siginfo(&ksig->ka, abi))
 		ret = abi->setup_rt_frame(vdso + abi->vdso->off_rt_sigreturn,
 					  ksig, regs, oldset);
 	if (thread_info_flags & _TIF_NOTIFY_RESUME) {
 		clear_thread_flag(TIF_NOTIFY_RESUME);
 		tracehook_notify_resume(regs);
+		rseq_handle_notify_resume(NULL, regs);
 	}
 	user_enter();

arch/parisc/Kconfig+3−3

@@ -244,11 +244,11 @@ config PARISC_PAGE_SIZE_4KB · 243 unmodified lines
244		244
245	config PARISC_PAGE_SIZE_16KB	245	config PARISC_PAGE_SIZE_16KB
246	bool "16KB"	246	bool "16KB"
247	depends on PA8X00	247	depends on PA8X00 && BROKEN
248		248
249	config PARISC_PAGE_SIZE_64KB	249	config PARISC_PAGE_SIZE_64KB
250	bool "64KB"	250	bool "64KB"
251	depends on PA8X00	251	depends on PA8X00 && BROKEN
252		252
253	endchoice	253	endchoice
254		254
@@ -347,7 +347,7 @@ config NR_CPUS · 92 unmodified lines
347	int "Maximum number of CPUs (2-32)"	347	int "Maximum number of CPUs (2-32)"
348	range 2 32	348	range 2 32
349	depends on SMP	349	depends on SMP
350	default "32"	350	default "4"
351		351
352	endmenu	352	endmenu
353		353

arch/parisc/Makefile+0−4

 # kernel.
 cflags-y	+= -mdisable-fpregs
-# Without this, "ld -r" results in .text sections that are too big
-# (> 0x40000) for branches to reach stubs.
-cflags-y	+= -ffunction-sections
 # Use long jumps instead of long branches (needed if your linker fails to
 # link a too big vmlinux executable). Not enabled for building modules.
 ifdef CONFIG_MLONGCALLS

arch/parisc/include/asm/signal.h+0−8

@@ -21,14 +21,6 @@ typedef struct { · 20 unmodified lines
21	unsigned long sig[_NSIG_WORDS];	21	unsigned long sig[_NSIG_WORDS];
22	} sigset_t;	22	} sigset_t;
23		23
24	#ifndef __KERNEL__
25	struct sigaction {
26	__sighandler_t sa_handler;
27	unsigned long sa_flags;
28	sigset_t sa_mask; /* mask last for extensibility */
29	};
30	#endif
31
32	#include <asm/sigcontext.h>	24	#include <asm/sigcontext.h>
33		25
34	#endif /* !__ASSEMBLY */	26	#endif /* !__ASSEMBLY */

arch/parisc/include/uapi/asm/unistd.h+2−1

@@ -364,8 +364,9 @@ · 363 unmodified lines
364	#define __NR_preadv2 (__NR_Linux + 347)	364	#define __NR_preadv2 (__NR_Linux + 347)
365	#define __NR_pwritev2 (__NR_Linux + 348)	365	#define __NR_pwritev2 (__NR_Linux + 348)
366	#define __NR_statx (__NR_Linux + 349)	366	#define __NR_statx (__NR_Linux + 349)
		367	#define __NR_io_pgetevents (__NR_Linux + 350)
367		368
368	#define __NR_Linux_syscalls (__NR_statx + 1)	369	#define __NR_Linux_syscalls (__NR_io_pgetevents + 1)
369		370
370		371
371	#define __IGNORE_select /* newselect */	372	#define __IGNORE_select /* newselect */

arch/parisc/kernel/drivers.c+9−16

 {
 	/* FIXME: we need this because apparently the sti
 	 * driver can be registered twice */
-	if(driver->drv.name) {
+	if (driver->drv.name) {
-		printk(KERN_WARNING
+		pr_warn("BUG: skipping previously registered driver %s\n",
-		       "BUG: skipping previously registered driver %s\n",
+			driver->name);
-		       driver->name);
 		return 1;
 	}
 	if (!driver->probe) {
-		printk(KERN_WARNING
+		pr_warn("BUG: driver %s has no probe routine\n", driver->name);
-		       "BUG: driver %s has no probe routine\n",
-		       driver->name);
 		return 1;
 	}
 	dev = create_parisc_device(mod_path);
 	if (dev->id.hw_type != HPHW_FAULTY) {
-		printk(KERN_ERR "Two devices have hardware path [%s].  "
+		pr_err("Two devices have hardware path [%s].  IODC data for second device: %7phN\n"
-				"IODC data for second device: "
+		       "Rearranging GSC cards sometimes helps\n",
-				"%02x%02x%02x%02x%02x%02x\n"
+			parisc_pathname(dev), iodc_data);
-				"Rearranging GSC cards sometimes helps\n",
-			parisc_pathname(dev), iodc_data[0], iodc_data[1],
-			iodc_data[3], iodc_data[4], iodc_data[5], iodc_data[6]);
 		return NULL;
 	}
 	 * the keyboard controller
 	 */
 	if ((hpa & 0xfff) == 0 && insert_resource(&iomem_resource, &dev->hpa))
-		printk("Unable to claim HPA %lx for device %s\n",
+		pr_warn("Unable to claim HPA %lx for device %s\n", hpa, name);
-				hpa, name);
 	return dev;
 }
 	static int count;
 	print_pa_hwpath(dev, hw_path);
-	printk(KERN_INFO "%d. %s at 0x%px [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }",
+	pr_info("%d. %s at 0x%px [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }",
 		++count, dev->name, (void*) dev->hpa.start, hw_path, dev->id.hw_type,
 		dev->id.hversion_rev, dev->id.hversion, dev->id.sversion);

arch/parisc/kernel/syscall_table.S+1−0

@@ -445,6 +445,7 @@ · 444 unmodified lines
445	ENTRY_COMP(preadv2)	445	ENTRY_COMP(preadv2)
446	ENTRY_COMP(pwritev2)	446	ENTRY_COMP(pwritev2)
447	ENTRY_SAME(statx)	447	ENTRY_SAME(statx)
		448	ENTRY_COMP(io_pgetevents) /* 350 */
448		449
449		450
450	.ifne (. - 90b) - (__NR_Linux_syscalls * (91b - 90b))	451	.ifne (. - 90b) - (__NR_Linux_syscalls * (91b - 90b))

arch/parisc/kernel/unwind.c+2−2

@@ -25,7 +25,7 @@ · 24 unmodified lines
25		25
26	/* #define DEBUG 1 */	26	/* #define DEBUG 1 */
27	#ifdef DEBUG	27	#ifdef DEBUG
28	#define dbg(x...) printk(x)	28	#define dbg(x...) pr_debug(x)
29	#else	29	#else
30	#define dbg(x...)	30	#define dbg(x...)
31	#endif	31	#endif
@@ -182,7 +182,7 @@ int __init unwind_init(void) · 150 unmodified lines
182	start = (long)&__start___unwind[0];	182	start = (long)&__start___unwind[0];
183	stop = (long)&__stop___unwind[0];	183	stop = (long)&__stop___unwind[0];
184		184
185	printk("unwind_init: start = 0x%lx, end = 0x%lx, entries = %lu\n",	185	dbg("unwind_init: start = 0x%lx, end = 0x%lx, entries = %lu\n",
186	start, stop,	186	start, stop,
187	(stop - start) / sizeof(struct unwind_table_entry));	187	(stop - start) / sizeof(struct unwind_table_entry));
188		188

arch/powerpc/Makefile+1−0

@@ -244,6 +244,7 @@ cpu-as-$(CONFIG_4xx) += -Wa,-m405 · 243 unmodified lines
244	cpu-as-$(CONFIG_ALTIVEC) += $(call as-option,-Wa$(comma)-maltivec)	244	cpu-as-$(CONFIG_ALTIVEC) += $(call as-option,-Wa$(comma)-maltivec)
245	cpu-as-$(CONFIG_E200) += -Wa,-me200	245	cpu-as-$(CONFIG_E200) += -Wa,-me200
246	cpu-as-$(CONFIG_PPC_BOOK3S_64) += -Wa,-mpower4	246	cpu-as-$(CONFIG_PPC_BOOK3S_64) += -Wa,-mpower4
		247	cpu-as-$(CONFIG_PPC_E500MC) += $(call as-option,-Wa$(comma)-me500mc)
247		248
248	KBUILD_AFLAGS += $(cpu-as-y)	249	KBUILD_AFLAGS += $(cpu-as-y)
249	KBUILD_CFLAGS += $(cpu-as-y)	250	KBUILD_CFLAGS += $(cpu-as-y)

arch/powerpc/include/asm/book3s/32/pgalloc.h+1−1

 }
 #define check_pgt_cache()	do { } while (0)
+#define get_hugepd_cache_index(x)  (x)
 #ifdef CONFIG_SMP
 static inline void pgtable_free_tlb(struct mmu_gather *tlb,
 static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table,
 				  unsigned long address)
 {
-	pgtable_page_dtor(table);
 	pgtable_free_tlb(tlb, page_address(table), 0);
 }
 #endif /* _ASM_POWERPC_BOOK3S_32_PGALLOC_H */

arch/powerpc/include/asm/book3s/64/pgtable-4k.h+21−0

@@ -49,6 +49,27 @@ static inline int hugepd_ok(hugepd_t hpd) · 48 unmodified lines
49	}	49	}
50	#define is_hugepd(hpd) (hugepd_ok(hpd))	50	#define is_hugepd(hpd) (hugepd_ok(hpd))
51		51
		52	/*
		53	* 16M and 16G huge page directory tables are allocated from slab cache
		54	*
		55	*/
		56	#define H_16M_CACHE_INDEX (PAGE_SHIFT + H_PTE_INDEX_SIZE + H_PMD_INDEX_SIZE - 24)
		57	#define H_16G_CACHE_INDEX \
		58	(PAGE_SHIFT + H_PTE_INDEX_SIZE + H_PMD_INDEX_SIZE + H_PUD_INDEX_SIZE - 34)
		59
		60	static inline int get_hugepd_cache_index(int index)
		61	{
		62	switch (index) {
		63	case H_16M_CACHE_INDEX:
		64	return HTLB_16M_INDEX;
		65	case H_16G_CACHE_INDEX:
		66	return HTLB_16G_INDEX;
		67	default:
		68	BUG();
		69	}
		70	/* should not reach */
		71	}
		72
52	#else /* !CONFIG_HUGETLB_PAGE */	73	#else /* !CONFIG_HUGETLB_PAGE */
53	static inline int pmd_huge(pmd_t pmd) { return 0; }	74	static inline int pmd_huge(pmd_t pmd) { return 0; }
54	static inline int pud_huge(pud_t pud) { return 0; }	75	static inline int pud_huge(pud_t pud) { return 0; }

arch/powerpc/include/asm/book3s/64/pgtable-64k.h+9−0

@@ -45,8 +45,17 @@ static inline int hugepd_ok(hugepd_t hpd) · 44 unmodified lines
45	{	45	{
46	return 0;	46	return 0;
47	}	47	}
		48
48	#define is_hugepd(pdep) 0	49	#define is_hugepd(pdep) 0
49		50
		51	/*
		52	* This should never get called
		53	*/
		54	static inline int get_hugepd_cache_index(int index)
		55	{
		56	BUG();
		57	}
		58
50	#else /* !CONFIG_HUGETLB_PAGE */	59	#else /* !CONFIG_HUGETLB_PAGE */
51	static inline int pmd_huge(pmd_t pmd) { return 0; }	60	static inline int pmd_huge(pmd_t pmd) { return 0; }
52	static inline int pud_huge(pud_t pud) { return 0; }	61	static inline int pud_huge(pud_t pud) { return 0; }

arch/powerpc/include/asm/book3s/64/pgtable.h+5−0

 	PMD_INDEX,
 	PUD_INDEX,
 	PGD_INDEX,
+	/*
+	 * Below are used with 4k page size and hugetlb
+	 */
+	HTLB_16M_INDEX,
+	HTLB_16G_INDEX,
 };
 extern unsigned long __vmalloc_start;

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

@@ -8,7 +8,7 @@ extern void arch_touch_nmi_watchdog(void); · 7 unmodified lines
8	static inline void arch_touch_nmi_watchdog(void) {}	8	static inline void arch_touch_nmi_watchdog(void) {}
9	#endif	9	#endif
10		10
11	#if defined(CONFIG_PPC_BOOK3S_64) && defined(CONFIG_STACKTRACE)	11	#if defined(CONFIG_NMI_IPI) && defined(CONFIG_STACKTRACE)
12	extern void arch_trigger_cpumask_backtrace(const cpumask_t *mask,	12	extern void arch_trigger_cpumask_backtrace(const cpumask_t *mask,
13	bool exclude_self);	13	bool exclude_self);
14	#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace	14	#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace

arch/powerpc/include/asm/nohash/32/pgalloc.h+1−1

 }
 #define check_pgt_cache()	do { } while (0)
+#define get_hugepd_cache_index(x)	(x)
 #ifdef CONFIG_SMP
 static inline void pgtable_free_tlb(struct mmu_gather *tlb,
 				  unsigned long address)
 {
 	tlb_flush_pgtable(tlb, address);
-	pgtable_page_dtor(table);
 	pgtable_free_tlb(tlb, page_address(table), 0);
 }
 #endif /* _ASM_POWERPC_PGALLOC_32_H */

arch/powerpc/include/asm/nohash/64/pgalloc.h+1−0

@@ -141,6 +141,7 @@ static inline void pgtable_free(void *table, int shift) · 140 unmodified lines
141	}	141	}
142	}	142	}
143		143
		144	#define get_hugepd_cache_index(x) (x)
144	#ifdef CONFIG_SMP	145	#ifdef CONFIG_SMP
145	static inline void pgtable_free_tlb(struct mmu_gather tlb, void table, int shift)	146	static inline void pgtable_free_tlb(struct mmu_gather tlb, void table, int shift)
146	{	147	{

arch/powerpc/include/asm/systbl.h+1−0

@@ -393,3 +393,4 @@ SYSCALL(pkey_alloc) · 392 unmodified lines
393	SYSCALL(pkey_free)	393	SYSCALL(pkey_free)
394	SYSCALL(pkey_mprotect)	394	SYSCALL(pkey_mprotect)
395	SYSCALL(rseq)	395	SYSCALL(rseq)
		396	COMPAT_SYS(io_pgetevents)

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

@@ -12,7 +12,7 @@ · 11 unmodified lines
12	#include <uapi/asm/unistd.h>	12	#include <uapi/asm/unistd.h>
13		13
14		14
15	#define NR_syscalls 388	15	#define NR_syscalls 389
16		16
17	#define __NR__exit __NR_exit	17	#define __NR__exit __NR_exit
18		18

arch/powerpc/include/uapi/asm/unistd.h+1−0

@@ -399,5 +399,6 @@ · 398 unmodified lines
399	#define __NR_pkey_free 385	399	#define __NR_pkey_free 385
400	#define __NR_pkey_mprotect 386	400	#define __NR_pkey_mprotect 386
401	#define __NR_rseq 387	401	#define __NR_rseq 387
		402	#define __NR_io_pgetevents 388
402		403
403	#endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */	404	#endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */

arch/powerpc/kernel/dt_cpu_ftrs.c+2−1

@@ -711,7 +711,8 @@ static __init void cpufeatures_cpu_quirks(void) · 710 unmodified lines
711	cur_cpu_spec->cpu_features \|= CPU_FTR_P9_TM_HV_ASSIST;	711	cur_cpu_spec->cpu_features \|= CPU_FTR_P9_TM_HV_ASSIST;
712	cur_cpu_spec->cpu_features \|= CPU_FTR_P9_TM_XER_SO_BUG;	712	cur_cpu_spec->cpu_features \|= CPU_FTR_P9_TM_XER_SO_BUG;
713	cur_cpu_spec->cpu_features \|= CPU_FTR_POWER9_DD2_1;	713	cur_cpu_spec->cpu_features \|= CPU_FTR_POWER9_DD2_1;
714	} else /* DD2.1 and up have DD2_1 */	714	} else if ((version & 0xffff0000) == 0x004e0000)
		715	/* DD2.1 and up have DD2_1 */
715	cur_cpu_spec->cpu_features \|= CPU_FTR_POWER9_DD2_1;	716	cur_cpu_spec->cpu_features \|= CPU_FTR_POWER9_DD2_1;
716		717
717	if ((version & 0xffff0000) == 0x004e0000) {	718	if ((version & 0xffff0000) == 0x004e0000) {

arch/powerpc/kernel/pci_32.c+0−4

  * Note that the returned IO or memory base is a physical address
  */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"
-#pragma GCC diagnostic ignored "-Wattribute-alias"
 SYSCALL_DEFINE3(pciconfig_iobase, long, which,
 		unsigned long, bus, unsigned long, devfn)
 {
 	return result;
 }
-#pragma GCC diagnostic pop

arch/powerpc/kernel/pci_64.c+0−4

 #define IOBASE_ISA_IO		3
 #define IOBASE_ISA_MEM		4
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"
-#pragma GCC diagnostic ignored "-Wattribute-alias"
 SYSCALL_DEFINE3(pciconfig_iobase, long, which, unsigned long, in_bus,
 			  unsigned long, in_devfn)
 {
 	return -EOPNOTSUPP;
 }
-#pragma GCC diagnostic pop
 #ifdef CONFIG_NUMA
 int pcibus_to_node(struct pci_bus *bus)

arch/powerpc/kernel/rtas.c+0−4

 }
 /* We assume to be passed big endian arguments */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"
-#pragma GCC diagnostic ignored "-Wattribute-alias"
 SYSCALL_DEFINE1(rtas, struct rtas_args __user *, uargs)
 {
 	struct rtas_args args;
 	return 0;
 }
-#pragma GCC diagnostic pop
 /*
  * Call early during boot, before mem init, to retrieve the RTAS

arch/powerpc/kernel/setup-common.c+10−2

 static int ppc_panic_event(struct notifier_block *this,
                              unsigned long event, void *ptr)
 {
+	/*
+	 * panic does a local_irq_disable, but we really
+	 * want interrupts to be hard disabled.
+	 */
+	hard_irq_disable();
 	/*
 	 * If firmware-assisted dump has been registered then trigger
 	 * firmware-assisted dump and let firmware handle everything else.
 	 */
 	crash_fadump(NULL, ptr);
-	ppc_md.panic(ptr);  /* May not return */
+	if (ppc_md.panic)
+		ppc_md.panic(ptr);  /* May not return */
 	return NOTIFY_DONE;
 }
 void __init setup_panic(void)
 {
-	if (!ppc_md.panic)
+	/* PPC64 always does a hard irq disable in its panic handler */
+	if (!IS_ENABLED(CONFIG_PPC64) && !ppc_md.panic)
 		return;
 	atomic_notifier_chain_register(&panic_notifier_list, &ppc_panic_block);
 }

arch/powerpc/kernel/setup_64.c+8−0

@@ -387,6 +387,14 @@ void early_setup_secondary(void) · 386 unmodified lines
387		387
388	#endif /* CONFIG_SMP */	388	#endif /* CONFIG_SMP */
389		389
		390	void panic_smp_self_stop(void)
		391	{
		392	hard_irq_disable();
		393	spin_begin();
		394	while (1)
		395	spin_cpu_relax();
		396	}
		397
390	#if defined(CONFIG_SMP) \|\| defined(CONFIG_KEXEC_CORE)	398	#if defined(CONFIG_SMP) \|\| defined(CONFIG_KEXEC_CORE)
391	static bool use_spinloop(void)	399	static bool use_spinloop(void)
392	{	400	{

arch/powerpc/kernel/signal.c+2−2

@@ -134,7 +134,7 @@ static void do_signal(struct task_struct *tsk) · 133 unmodified lines
134	/* Re-enable the breakpoints for the signal stack */	134	/* Re-enable the breakpoints for the signal stack */
135	thread_change_pc(tsk, tsk->thread.regs);	135	thread_change_pc(tsk, tsk->thread.regs);
136		136
137	rseq_signal_deliver(tsk->thread.regs);	137	rseq_signal_deliver(&ksig, tsk->thread.regs);
138		138
139	if (is32) {	139	if (is32) {
140	if (ksig.ka.sa.sa_flags & SA_SIGINFO)	140	if (ksig.ka.sa.sa_flags & SA_SIGINFO)
@@ -170,7 +170,7 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags) · 29 unmodified lines
170	if (thread_info_flags & _TIF_NOTIFY_RESUME) {	170	if (thread_info_flags & _TIF_NOTIFY_RESUME) {
171	clear_thread_flag(TIF_NOTIFY_RESUME);	171	clear_thread_flag(TIF_NOTIFY_RESUME);
172	tracehook_notify_resume(regs);	172	tracehook_notify_resume(regs);
173	rseq_handle_notify_resume(regs);	173	rseq_handle_notify_resume(NULL, regs);
174	}	174	}
175		175
176	user_enter();	176	user_enter();

arch/powerpc/kernel/signal_32.c+0−8

 }
 #endif
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"
-#pragma GCC diagnostic ignored "-Wattribute-alias"
 #ifdef CONFIG_PPC64
 COMPAT_SYSCALL_DEFINE3(swapcontext, struct ucontext __user *, old_ctx,
 		       struct ucontext __user *, new_ctx, int, ctx_size)
 	set_thread_flag(TIF_RESTOREALL);
 	return 0;
 }
-#pragma GCC diagnostic pop
 #ifdef CONFIG_PPC64
 COMPAT_SYSCALL_DEFINE0(rt_sigreturn)
 	return 0;
 }
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"
-#pragma GCC diagnostic ignored "-Wattribute-alias"
 #ifdef CONFIG_PPC32
 SYSCALL_DEFINE3(debug_setcontext, struct ucontext __user *, ctx,
 			 int, ndbg, struct sig_dbg_op __user *, dbg)
 	return 0;
 }
 #endif
-#pragma GCC diagnostic pop
 /*
  * OK, we're invoking a handler

arch/powerpc/kernel/signal_64.c+0−4

 /*
  * Handle {get,set,swap}_context operations
  */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"
-#pragma GCC diagnostic ignored "-Wattribute-alias"
 SYSCALL_DEFINE3(swapcontext, struct ucontext __user *, old_ctx,
 		struct ucontext __user *, new_ctx, long, ctx_size)
 {
 	set_thread_flag(TIF_RESTOREALL);
 	return 0;
 }
-#pragma GCC diagnostic pop
 /*

arch/powerpc/kernel/smp.c+0−6

 	nmi_ipi_busy_count--;
 	nmi_ipi_unlock();
-	/* Remove this CPU */
-	set_cpu_online(smp_processor_id(), false);
 	spin_begin();
 	while (1)
 		spin_cpu_relax();
 static void stop_this_cpu(void *dummy)
 {
-	/* Remove this CPU */
-	set_cpu_online(smp_processor_id(), false);
 	hard_irq_disable();
 	spin_begin();
 	while (1)

arch/powerpc/kernel/stacktrace.c+2−2

@@ -196,7 +196,7 @@ save_stack_trace_tsk_reliable(struct task_struct *tsk, · 195 unmodified lines
196	EXPORT_SYMBOL_GPL(save_stack_trace_tsk_reliable);	196	EXPORT_SYMBOL_GPL(save_stack_trace_tsk_reliable);
197	#endif /* CONFIG_HAVE_RELIABLE_STACKTRACE */	197	#endif /* CONFIG_HAVE_RELIABLE_STACKTRACE */
198		198
199	#ifdef CONFIG_PPC_BOOK3S_64	199	#if defined(CONFIG_PPC_BOOK3S_64) && defined(CONFIG_NMI_IPI)
200	static void handle_backtrace_ipi(struct pt_regs *regs)	200	static void handle_backtrace_ipi(struct pt_regs *regs)
201	{	201	{
202	nmi_cpu_backtrace(regs);	202	nmi_cpu_backtrace(regs);
@@ -242,4 +242,4 @@ void arch_trigger_cpumask_backtrace(const cpumask_t *mask, bool exclude_self) · 39 unmodified lines
242	{	242	{
243	nmi_trigger_cpumask_backtrace(mask, exclude_self, raise_backtrace_ipi);	243	nmi_trigger_cpumask_backtrace(mask, exclude_self, raise_backtrace_ipi);
244	}	244	}
245	#endif /* CONFIG_PPC64 */	245	#endif /* defined(CONFIG_PPC_BOOK3S_64) && defined(CONFIG_NMI_IPI) */

arch/powerpc/kernel/syscalls.c+0−4

 	return ret;
 }
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"
-#pragma GCC diagnostic ignored "-Wattribute-alias"
 SYSCALL_DEFINE6(mmap2, unsigned long, addr, size_t, len,
 		unsigned long, prot, unsigned long, flags,
 		unsigned long, fd, unsigned long, pgoff)
 {
 	return do_mmap2(addr, len, prot, flags, fd, offset, PAGE_SHIFT);
 }
-#pragma GCC diagnostic pop
 #ifdef CONFIG_PPC32
 /*

arch/powerpc/mm/hugetlbpage.c+2−1

@@ -337,7 +337,8 @@ static void free_hugepd_range(struct mmu_gather tlb, hugepd_t hpdp, int pdshif · 336 unmodified lines
337	if (shift >= pdshift)	337	if (shift >= pdshift)
338	hugepd_free(tlb, hugepte);	338	hugepd_free(tlb, hugepte);
339	else	339	else
340	pgtable_free_tlb(tlb, hugepte, pdshift - shift);	340	pgtable_free_tlb(tlb, hugepte,
		341	get_hugepd_cache_index(pdshift - shift));
341	}	342	}
342		343
343	static void hugetlb_free_pmd_range(struct mmu_gather tlb, pud_t pud,	344	static void hugetlb_free_pmd_range(struct mmu_gather tlb, pud_t pud,

arch/powerpc/mm/pgtable-book3s64.c+12−0

@@ -409,6 +409,18 @@ static inline void pgtable_free(void *table, int index) · 408 unmodified lines
409	case PUD_INDEX:	409	case PUD_INDEX:
410	kmem_cache_free(PGT_CACHE(PUD_CACHE_INDEX), table);	410	kmem_cache_free(PGT_CACHE(PUD_CACHE_INDEX), table);
411	break;	411	break;
		412	#if defined(CONFIG_PPC_4K_PAGES) && defined(CONFIG_HUGETLB_PAGE)
		413	/* 16M hugepd directory at pud level */
		414	case HTLB_16M_INDEX:
		415	BUILD_BUG_ON(H_16M_CACHE_INDEX <= 0);
		416	kmem_cache_free(PGT_CACHE(H_16M_CACHE_INDEX), table);
		417	break;
		418	/* 16G hugepd directory at the pgd level */
		419	case HTLB_16G_INDEX:
		420	BUILD_BUG_ON(H_16G_CACHE_INDEX <= 0);
		421	kmem_cache_free(PGT_CACHE(H_16G_CACHE_INDEX), table);
		422	break;
		423	#endif
412	/* We don't free pgd table via RCU callback */	424	/* We don't free pgd table via RCU callback */
413	default:	425	default:
414	BUG();	426	BUG();

arch/powerpc/mm/subpage-prot.c+0−4

  * in a 2-bit field won't allow writes to a page that is otherwise
  * write-protected.
  */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"
-#pragma GCC diagnostic ignored "-Wattribute-alias"
 SYSCALL_DEFINE3(subpage_prot, unsigned long, addr,
 		unsigned long, len, u32 __user *, map)
 {
 	up_write(&mm->mmap_sem);
 	return err;
 }
-#pragma GCC diagnostic pop

arch/powerpc/mm/tlb-radix.c+77−21

 static unsigned long tlb_single_page_flush_ceiling __read_mostly = 33;
 static unsigned long tlb_local_single_page_flush_ceiling __read_mostly = POWER9_TLB_SETS_RADIX * 2;
-void radix__flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
+static inline void __radix__flush_tlb_range(struct mm_struct *mm,
-		     unsigned long end)
+					unsigned long start, unsigned long end,
+					bool flush_all_sizes)
 {
-	struct mm_struct *mm = vma->vm_mm;
 	unsigned long pid;
 	unsigned int page_shift = mmu_psize_defs[mmu_virtual_psize].shift;
 	unsigned long page_size = 1UL << page_shift;
 	unsigned long nr_pages = (end - start) >> page_shift;
 	bool local, full;
-#ifdef CONFIG_HUGETLB_PAGE
-	if (is_vm_hugetlb_page(vma))
-		return radix__flush_hugetlb_tlb_range(vma, start, end);
-#endif
 	pid = mm->context.id;
 	if (unlikely(pid == MMU_NO_CONTEXT))
 		return;
 				_tlbie_pid(pid, RIC_FLUSH_TLB);
 		}
 	} else {
-		bool hflush = false;
+		bool hflush = flush_all_sizes;
+		bool gflush = flush_all_sizes;
 		unsigned long hstart, hend;
+		unsigned long gstart, gend;
-#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+		if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE))
-		hstart = (start + HPAGE_PMD_SIZE - 1) >> HPAGE_PMD_SHIFT;
-		hend = end >> HPAGE_PMD_SHIFT;
-		if (hstart < hend) {
-			hstart <<= HPAGE_PMD_SHIFT;
-			hend <<= HPAGE_PMD_SHIFT;
 			hflush = true;
+		if (hflush) {
+			hstart = (start + PMD_SIZE - 1) & PMD_MASK;
+			hend = end & PMD_MASK;
+			if (hstart == hend)
+				hflush = false;
+		}
+		if (gflush) {
+			gstart = (start + PUD_SIZE - 1) & PUD_MASK;
+			gend = end & PUD_MASK;
+			if (gstart == gend)
+				gflush = false;
 		}
-#endif
 		asm volatile("ptesync": : :"memory");
 		if (local) {
 			__tlbiel_va_range(start, end, pid, page_size, mmu_virtual_psize);
 			if (hflush)
 				__tlbiel_va_range(hstart, hend, pid,
-						HPAGE_PMD_SIZE, MMU_PAGE_2M);
+						PMD_SIZE, MMU_PAGE_2M);
+			if (gflush)
+				__tlbiel_va_range(gstart, gend, pid,
+						PUD_SIZE, MMU_PAGE_1G);
 			asm volatile("ptesync": : :"memory");
 		} else {
 			__tlbie_va_range(start, end, pid, page_size, mmu_virtual_psize);
 			if (hflush)
 				__tlbie_va_range(hstart, hend, pid,
-						HPAGE_PMD_SIZE, MMU_PAGE_2M);
+						PMD_SIZE, MMU_PAGE_2M);
+			if (gflush)
+				__tlbie_va_range(gstart, gend, pid,
+						PUD_SIZE, MMU_PAGE_1G);
 			fixup_tlbie();
 			asm volatile("eieio; tlbsync; ptesync": : :"memory");
 		}
 	}
 	preempt_enable();
 }
+void radix__flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
+		     unsigned long end)
+{
+#ifdef CONFIG_HUGETLB_PAGE
+	if (is_vm_hugetlb_page(vma))
+		return radix__flush_hugetlb_tlb_range(vma, start, end);
+#endif
+	__radix__flush_tlb_range(vma->vm_mm, start, end, false);
+}
 EXPORT_SYMBOL(radix__flush_tlb_range);
 static int radix_get_mmu_psize(int page_size)
 	int psize = 0;
 	struct mm_struct *mm = tlb->mm;
 	int page_size = tlb->page_size;
+	unsigned long start = tlb->start;
+	unsigned long end = tlb->end;
 	/*
 	 * if page size is not something we understand, do a full mm flush
 	 */
 	if (tlb->fullmm) {
 		__flush_all_mm(mm, true);
+#if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLB_PAGE)
+	} else if (mm_tlb_flush_nested(mm)) {
+		/*
+		 * If there is a concurrent invalidation that is clearing ptes,
+		 * then it's possible this invalidation will miss one of those
+		 * cleared ptes and miss flushing the TLB. If this invalidate
+		 * returns before the other one flushes TLBs, that can result
+		 * in it returning while there are still valid TLBs inside the
+		 * range to be invalidated.
+		 *
+		 * See mm/memory.c:tlb_finish_mmu() for more details.
+		 *
+		 * The solution to this is ensure the entire range is always
+		 * flushed here. The problem for powerpc is that the flushes
+		 * are page size specific, so this "forced flush" would not
+		 * do the right thing if there are a mix of page sizes in
+		 * the range to be invalidated. So use __flush_tlb_range
+		 * which invalidates all possible page sizes in the range.
+		 *
+		 * PWC flush probably is not be required because the core code
+		 * shouldn't free page tables in this path, but accounting
+		 * for the possibility makes us a bit more robust.
+		 *
+		 * need_flush_all is an uncommon case because page table
+		 * teardown should be done with exclusive locks held (but
+		 * after locks are dropped another invalidate could come
+		 * in), it could be optimized further if necessary.
+		 */
+		if (!tlb->need_flush_all)
+			__radix__flush_tlb_range(mm, start, end, true);
+		else
+			radix__flush_all_mm(mm);
+#endif
 	} else if ( (psize = radix_get_mmu_psize(page_size)) == -1) {
 		if (!tlb->need_flush_all)
 			radix__flush_tlb_mm(mm);
 		else
 			radix__flush_all_mm(mm);
 	} else {
-		unsigned long start = tlb->start;
-		unsigned long end = tlb->end;
 		if (!tlb->need_flush_all)
 			radix__flush_tlb_range_psize(mm, start, end, psize);
 		else
 		for (; sib <= cpu_last_thread_sibling(cpu) && !flush; sib++) {
 			if (sib == cpu)
 				continue;
+			if (!cpu_possible(sib))
+				continue;
 			if (paca_ptrs[sib]->kvm_hstate.kvm_vcpu)
 				flush = true;
 		}

arch/powerpc/platforms/powermac/time.c+20−9

 #define DBG(x...)
 #endif
-/* Apparently the RTC stores seconds since 1 Jan 1904 */
+/*
+ * Offset between Unix time (1970-based) and Mac time (1904-based). Cuda and PMU
+ * times wrap in 2040. If we need to handle later times, the read_time functions
+ * need to be changed to interpret wrapped times as post-2040.
+ */
 #define RTC_OFFSET	2082844800
 /*
 	if (req.reply_len != 7)
 		printk(KERN_ERR "cuda_get_time: got %d byte reply\n",
 		       req.reply_len);
-	now = (req.reply[3] << 24) + (req.reply[4] << 16)
+	now = (u32)((req.reply[3] << 24) + (req.reply[4] << 16) +
-		+ (req.reply[5] << 8) + req.reply[6];
+		    (req.reply[5] << 8) + req.reply[6]);
+	/* it's either after year 2040, or the RTC has gone backwards */
+	WARN_ON(now < RTC_OFFSET);
 	return now - RTC_OFFSET;
 }
 static int cuda_set_rtc_time(struct rtc_time *tm)
 {
-	time64_t nowtime;
+	u32 nowtime;
 	struct adb_request req;
-	nowtime = rtc_tm_to_time64(tm) + RTC_OFFSET;
+	nowtime = lower_32_bits(rtc_tm_to_time64(tm) + RTC_OFFSET);
 	if (cuda_request(&req, NULL, 6, CUDA_PACKET, CUDA_SET_TIME,
 			 nowtime >> 24, nowtime >> 16, nowtime >> 8,
 			 nowtime) < 0)
 	if (req.reply_len != 4)
 		printk(KERN_ERR "pmu_get_time: got %d byte reply from PMU\n",
 		       req.reply_len);
-	now = (req.reply[0] << 24) + (req.reply[1] << 16)
+	now = (u32)((req.reply[0] << 24) + (req.reply[1] << 16)	+
-		+ (req.reply[2] << 8) + req.reply[3];
+		    (req.reply[2] << 8) + req.reply[3]);
+	/* it's either after year 2040, or the RTC has gone backwards */
+	WARN_ON(now < RTC_OFFSET);
 	return now - RTC_OFFSET;
 }
 static int pmu_set_rtc_time(struct rtc_time *tm)
 {
-	time64_t nowtime;
+	u32 nowtime;
 	struct adb_request req;
-	nowtime = rtc_tm_to_time64(tm) + RTC_OFFSET;
+	nowtime = lower_32_bits(rtc_tm_to_time64(tm) + RTC_OFFSET);
 	if (pmu_request(&req, NULL, 5, PMU_SET_RTC, nowtime >> 24,
 			nowtime >> 16, nowtime >> 8, nowtime) < 0)
 		return -ENXIO;

arch/s390/include/asm/css_chars.h+32−30

@@ -6,36 +6,38 @@ · 5 unmodified lines
6		6
7	struct css_general_char {	7	struct css_general_char {
8	u64 : 12;	8	u64 : 12;
9	u32 dynio : 1; /* bit 12 */	9	u64 dynio : 1; /* bit 12 */
10	u32 : 4;	10	u64 : 4;
11	u32 eadm : 1; /* bit 17 */	11	u64 eadm : 1; /* bit 17 */
12	u32 : 23;	12	u64 : 23;
13	u32 aif : 1; /* bit 41 */	13	u64 aif : 1; /* bit 41 */
14	u32 : 3;	14	u64 : 3;
15	u32 mcss : 1; /* bit 45 */	15	u64 mcss : 1; /* bit 45 */
16	u32 fcs : 1; /* bit 46 */	16	u64 fcs : 1; /* bit 46 */
17	u32 : 1;	17	u64 : 1;
18	u32 ext_mb : 1; /* bit 48 */	18	u64 ext_mb : 1; /* bit 48 */
19	u32 : 7;	19	u64 : 7;
20	u32 aif_tdd : 1; /* bit 56 */	20	u64 aif_tdd : 1; /* bit 56 */
21	u32 : 1;	21	u64 : 1;
22	u32 qebsm : 1; /* bit 58 */	22	u64 qebsm : 1; /* bit 58 */
23	u32 : 2;	23	u64 : 2;
24	u32 aiv : 1; /* bit 61 */	24	u64 aiv : 1; /* bit 61 */
25	u32 : 5;	25	u64 : 2;
26	u32 aif_osa : 1; /* bit 67 */	26
27	u32 : 12;	27	u64 : 3;
28	u32 eadm_rf : 1; /* bit 80 */	28	u64 aif_osa : 1; /* bit 67 */
29	u32 : 1;	29	u64 : 12;
30	u32 cib : 1; /* bit 82 */	30	u64 eadm_rf : 1; /* bit 80 */
31	u32 : 5;	31	u64 : 1;
32	u32 fcx : 1; /* bit 88 */	32	u64 cib : 1; /* bit 82 */
33	u32 : 19;	33	u64 : 5;
34	u32 alt_ssi : 1; /* bit 108 */	34	u64 fcx : 1; /* bit 88 */
35	u32 : 1;	35	u64 : 19;
36	u32 narf : 1; /* bit 110 */	36	u64 alt_ssi : 1; /* bit 108 */
37	u32 : 12;	37	u64 : 1;
38	u32 util_str : 1;/* bit 123 */	38	u64 narf : 1; /* bit 110 */
		39	u64 : 12;
		40	u64 util_str : 1;/* bit 123 */
39	} __packed;	41	} __packed;
40		42
41	extern struct css_general_char css_general_characteristics;	43	extern struct css_general_char css_general_characteristics;

arch/x86/Makefile+0−6

 archheaders:
 	$(Q)$(MAKE) $(build)=arch/x86/entry/syscalls all
-archprepare:
-ifeq ($(CONFIG_KEXEC_FILE),y)
-	$(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
-endif
 ###
 # Kernel objects
 	$(Q)rm -rf $(objtree)/arch/x86_64
 	$(Q)$(MAKE) $(clean)=$(boot)
 	$(Q)$(MAKE) $(clean)=arch/x86/tools
-	$(Q)$(MAKE) $(clean)=arch/x86/purgatory
 define archhelp
   echo  '* bzImage      - Compressed kernel image (arch/x86/boot/bzImage)'

arch/x86/boot/compressed/eboot.c+1−1

@@ -118,7 +118,7 @@ __setup_efi_pci(efi_pci_io_protocol_t pci, struct pci_setup_rom *__rom) · 117 unmodified lines
118	void *romimage;	118	void *romimage;
119		119
120	status = efi_call_proto(efi_pci_io_protocol, attributes, pci,	120	status = efi_call_proto(efi_pci_io_protocol, attributes, pci,
121	EfiPciIoAttributeOperationGet, 0, 0,	121	EfiPciIoAttributeOperationGet, 0ULL,
122	&attributes);	122	&attributes);
123	if (status != EFI_SUCCESS)	123	if (status != EFI_SUCCESS)
124	return status;	124	return status;

arch/x86/entry/common.c+1−1

@@ -164,7 +164,7 @@ static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags) · 163 unmodified lines
164	if (cached_flags & _TIF_NOTIFY_RESUME) {	164	if (cached_flags & _TIF_NOTIFY_RESUME) {
165	clear_thread_flag(TIF_NOTIFY_RESUME);	165	clear_thread_flag(TIF_NOTIFY_RESUME);
166	tracehook_notify_resume(regs);	166	tracehook_notify_resume(regs);
167	rseq_handle_notify_resume(regs);	167	rseq_handle_notify_resume(NULL, regs);
168	}	168	}
169		169
170	if (cached_flags & _TIF_USER_RETURN_NOTIFY)	170	if (cached_flags & _TIF_USER_RETURN_NOTIFY)

arch/x86/entry/entry_32.S+1−1

@@ -477,7 +477,7 @@ ENTRY(entry_SYSENTER_32) · 476 unmodified lines
477	* whereas POPF does not.)	477	* whereas POPF does not.)
478	*/	478	*/
479	addl $PT_EFLAGS-PT_DS, %esp /* point esp at pt_regs->flags */	479	addl $PT_EFLAGS-PT_DS, %esp /* point esp at pt_regs->flags */
480	btr $X86_EFLAGS_IF_BIT, (%esp)	480	btrl $X86_EFLAGS_IF_BIT, (%esp)
481	popfl	481	popfl
482		482
483	/*	483	/*

arch/x86/entry/entry_64_compat.S+8−8

@@ -84,13 +84,13 @@ ENTRY(entry_SYSENTER_compat) · 83 unmodified lines
84	pushq %rdx /* pt_regs->dx */	84	pushq %rdx /* pt_regs->dx */
85	pushq %rcx /* pt_regs->cx */	85	pushq %rcx /* pt_regs->cx */
86	pushq $-ENOSYS /* pt_regs->ax */	86	pushq $-ENOSYS /* pt_regs->ax */
87	pushq %r8 /* pt_regs->r8 */	87	pushq $0 /* pt_regs->r8 = 0 */
88	xorl %r8d, %r8d /* nospec r8 */	88	xorl %r8d, %r8d /* nospec r8 */
89	pushq %r9 /* pt_regs->r9 */	89	pushq $0 /* pt_regs->r9 = 0 */
90	xorl %r9d, %r9d /* nospec r9 */	90	xorl %r9d, %r9d /* nospec r9 */
91	pushq %r10 /* pt_regs->r10 */	91	pushq $0 /* pt_regs->r10 = 0 */
92	xorl %r10d, %r10d /* nospec r10 */	92	xorl %r10d, %r10d /* nospec r10 */
93	pushq %r11 /* pt_regs->r11 */	93	pushq $0 /* pt_regs->r11 = 0 */
94	xorl %r11d, %r11d /* nospec r11 */	94	xorl %r11d, %r11d /* nospec r11 */
95	pushq %rbx /* pt_regs->rbx */	95	pushq %rbx /* pt_regs->rbx */
96	xorl %ebx, %ebx /* nospec rbx */	96	xorl %ebx, %ebx /* nospec rbx */
@@ -374,13 +374,13 @@ ENTRY(entry_INT80_compat) · 277 unmodified lines
374	pushq %rcx /* pt_regs->cx */	374	pushq %rcx /* pt_regs->cx */
375	xorl %ecx, %ecx /* nospec cx */	375	xorl %ecx, %ecx /* nospec cx */
376	pushq $-ENOSYS /* pt_regs->ax */	376	pushq $-ENOSYS /* pt_regs->ax */
377	pushq $0 /* pt_regs->r8 = 0 */	377	pushq %r8 /* pt_regs->r8 */
378	xorl %r8d, %r8d /* nospec r8 */	378	xorl %r8d, %r8d /* nospec r8 */
379	pushq $0 /* pt_regs->r9 = 0 */	379	pushq %r9 /* pt_regs->r9 */
380	xorl %r9d, %r9d /* nospec r9 */	380	xorl %r9d, %r9d /* nospec r9 */
381	pushq $0 /* pt_regs->r10 = 0 */	381	pushq %r10 /* pt_regs->r10*/
382	xorl %r10d, %r10d /* nospec r10 */	382	xorl %r10d, %r10d /* nospec r10 */
383	pushq $0 /* pt_regs->r11 = 0 */	383	pushq %r11 /* pt_regs->r11 */
384	xorl %r11d, %r11d /* nospec r11 */	384	xorl %r11d, %r11d /* nospec r11 */
385	pushq %rbx /* pt_regs->rbx */	385	pushq %rbx /* pt_regs->rbx */
386	xorl %ebx, %ebx /* nospec rbx */	386	xorl %ebx, %ebx /* nospec rbx */

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

@@ -38,7 +38,7 @@ static inline unsigned long array_index_mask_nospec(unsigned long index, · 37 unmodified lines
38	{	38	{
39	unsigned long mask;	39	unsigned long mask;
40		40
41	asm ("cmp %1,%2; sbb %0,%0;"	41	asm volatile ("cmp %1,%2; sbb %0,%0;"
42	:"=r" (mask)	42	:"=r" (mask)
43	:"g"(size),"r" (index)	43	:"g"(size),"r" (index)
44	:"cc");	44	:"cc");

arch/x86/include/asm/pgalloc.h+3−0

@@ -184,6 +184,9 @@ static inline p4d_t p4d_alloc_one(struct mm_struct mm, unsigned long addr) · 183 unmodified lines
184		184
185	static inline void p4d_free(struct mm_struct mm, p4d_t p4d)	185	static inline void p4d_free(struct mm_struct mm, p4d_t p4d)
186	{	186	{
		187	if (!pgtable_l5_enabled())
		188	return;
		189
187	BUG_ON((unsigned long)p4d & (PAGE_SIZE-1));	190	BUG_ON((unsigned long)p4d & (PAGE_SIZE-1));
188	free_page((unsigned long)p4d);	191	free_page((unsigned long)p4d);
189	}	192	}

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

@@ -898,7 +898,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd) · 897 unmodified lines
898	#define pgd_page(pgd) pfn_to_page(pgd_pfn(pgd))	898	#define pgd_page(pgd) pfn_to_page(pgd_pfn(pgd))
899		899
900	/* to find an entry in a page-table-directory. */	900	/* to find an entry in a page-table-directory. */
901	static __always_inline p4d_t p4d_offset(pgd_t pgd, unsigned long address)	901	static inline p4d_t p4d_offset(pgd_t pgd, unsigned long address)
902	{	902	{
903	if (!pgtable_l5_enabled())	903	if (!pgtable_l5_enabled())
904	return (p4d_t *)pgd;	904	return (p4d_t *)pgd;

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

@@ -216,7 +216,7 @@ static inline pgd_t pti_set_user_pgd(pgd_t *pgdp, pgd_t pgd) · 215 unmodified lines
216	}	216	}
217	#endif	217	#endif
218		218
219	static __always_inline void native_set_p4d(p4d_t *p4dp, p4d_t p4d)	219	static inline void native_set_p4d(p4d_t *p4dp, p4d_t p4d)
220	{	220	{
221	pgd_t pgd;	221	pgd_t pgd;
222		222
@@ -230,7 +230,7 @@ static __always_inline void native_set_p4d(p4d_t *p4dp, p4d_t p4d) · 7 unmodified lines
230	*p4dp = native_make_p4d(native_pgd_val(pgd));	230	*p4dp = native_make_p4d(native_pgd_val(pgd));
231	}	231	}
232		232
233	static __always_inline void native_p4d_clear(p4d_t *p4d)	233	static inline void native_p4d_clear(p4d_t *p4d)
234	{	234	{
235	native_set_p4d(p4d, native_make_p4d(0));	235	native_set_p4d(p4d, native_make_p4d(0));
236	}	236	}

arch/x86/include/asm/vmx.h+3−0

 #define VMX_MISC_PREEMPTION_TIMER_RATE_MASK	0x0000001f
 #define VMX_MISC_SAVE_EFER_LMA			0x00000020
 #define VMX_MISC_ACTIVITY_HLT			0x00000040
+#define VMX_MISC_ZERO_LEN_INS			0x40000000
 /* VMFUNC functions */
 #define VMX_VMFUNC_EPTP_SWITCHING               0x00000001
 #define VECTORING_INFO_VALID_MASK       	INTR_INFO_VALID_MASK
 #define INTR_TYPE_EXT_INTR              (0 << 8) /* external interrupt */
+#define INTR_TYPE_RESERVED              (1 << 8) /* reserved */
 #define INTR_TYPE_NMI_INTR		(2 << 8) /* NMI */
 #define INTR_TYPE_HARD_EXCEPTION	(3 << 8) /* processor exception */
 #define INTR_TYPE_SOFT_INTR             (4 << 8) /* software interrupt */
 #define INTR_TYPE_PRIV_SW_EXCEPTION	(5 << 8) /* ICE breakpoint - undocumented */
 #define INTR_TYPE_SOFT_EXCEPTION	(6 << 8) /* software exception */
+#define INTR_TYPE_OTHER_EVENT           (7 << 8) /* other event */
 /* GUEST_INTERRUPTIBILITY_INFO flags. */
 #define GUEST_INTR_STATE_STI		0x00000001

arch/x86/kernel/apic/x2apic_uv_x.c+57−3

@@ -26,6 +26,7 @@ · 25 unmodified lines
26	#include <linux/delay.h>	26	#include <linux/delay.h>
27	#include <linux/crash_dump.h>	27	#include <linux/crash_dump.h>
28	#include <linux/reboot.h>	28	#include <linux/reboot.h>
		29	#include <linux/memory.h>
29		30
30	#include <asm/uv/uv_mmrs.h>	31	#include <asm/uv/uv_mmrs.h>
31	#include <asm/uv/uv_hub.h>	32	#include <asm/uv/uv_hub.h>
@@ -392,6 +393,51 @@ extern int uv_hub_info_version(void) · 360 unmodified lines
392	}	393	}
393	EXPORT_SYMBOL(uv_hub_info_version);	394	EXPORT_SYMBOL(uv_hub_info_version);
394		395
		396	/* Default UV memory block size is 2GB */
		397	static unsigned long mem_block_size = (2UL << 30);
		398
		399	/* Kernel parameter to specify UV mem block size */
		400	static int parse_mem_block_size(char *ptr)
		401	{
		402	unsigned long size = memparse(ptr, NULL);
		403
		404	/* Size will be rounded down by set_block_size() below */
		405	mem_block_size = size;
		406	return 0;
		407	}
		408	early_param("uv_memblksize", parse_mem_block_size);
		409
		410	static __init int adj_blksize(u32 lgre)
		411	{
		412	unsigned long base = (unsigned long)lgre << UV_GAM_RANGE_SHFT;
		413	unsigned long size;
		414
		415	for (size = mem_block_size; size > MIN_MEMORY_BLOCK_SIZE; size >>= 1)
		416	if (IS_ALIGNED(base, size))
		417	break;
		418
		419	if (size >= mem_block_size)
		420	return 0;
		421
		422	mem_block_size = size;
		423	return 1;
		424	}
		425
		426	static __init void set_block_size(void)
		427	{
		428	unsigned int order = ffs(mem_block_size);
		429
		430	if (order) {
		431	/* adjust for ffs return of 1..64 */
		432	set_memory_block_size_order(order - 1);
		433	pr_info("UV: mem_block_size set to 0x%lx\n", mem_block_size);
		434	} else {
		435	/* bad or zero value, default to 1UL << 31 (2GB) */
		436	pr_err("UV: mem_block_size error with 0x%lx\n", mem_block_size);
		437	set_memory_block_size_order(31);
		438	}
		439	}
		440
395	/* Build GAM range lookup table: */	441	/* Build GAM range lookup table: */
396	static __init void build_uv_gr_table(void)	442	static __init void build_uv_gr_table(void)
397	{	443	{
@@ -1180,23 +1226,30 @@ static void __init decode_gam_rng_tbl(unsigned long ptr) · 782 unmodified lines
1180	<< UV_GAM_RANGE_SHFT);	1226	<< UV_GAM_RANGE_SHFT);
1181	int order = 0;	1227	int order = 0;
1182	char suffix[] = " KMGTPE";	1228	char suffix[] = " KMGTPE";
		1229	int flag = ' ';
1183		1230
1184	while (size > 9999 && order < sizeof(suffix)) {	1231	while (size > 9999 && order < sizeof(suffix)) {
1185	size /= 1024;	1232	size /= 1024;
1186	order++;	1233	order++;
1187	}	1234	}
1188		1235
		1236	/* adjust max block size to current range start */
		1237	if (gre->type == 1 \|\| gre->type == 2)
		1238	if (adj_blksize(lgre))
		1239	flag = '*';
		1240
1189	if (!index) {	1241	if (!index) {
1190	pr_info("UV: GAM Range Table...\n");	1242	pr_info("UV: GAM Range Table...\n");
1191	pr_info("UV: # %20s %14s %5s %4s %5s %3s %2s\n", "Range", "", "Size", "Type", "NASID", "SID", "PN");	1243	pr_info("UV: # %20s %14s %6s %4s %5s %3s %2s\n", "Range", "", "Size", "Type", "NASID", "SID", "PN");
1192	}	1244	}
1193	pr_info("UV: %2d: 0x%014lx-0x%014lx %5lu%c %3d %04x %02x %02x\n",	1245	pr_info("UV: %2d: 0x%014lx-0x%014lx%c %5lu%c %3d %04x %02x %02x\n",
1194	index++,	1246	index++,
1195	(unsigned long)lgre << UV_GAM_RANGE_SHFT,	1247	(unsigned long)lgre << UV_GAM_RANGE_SHFT,
1196	(unsigned long)gre->limit << UV_GAM_RANGE_SHFT,	1248	(unsigned long)gre->limit << UV_GAM_RANGE_SHFT,
1197	size, suffix[order],	1249	flag, size, suffix[order],
1198	gre->type, gre->nasid, gre->sockid, gre->pnode);	1250	gre->type, gre->nasid, gre->sockid, gre->pnode);
1199		1251
		1252	/* update to next range start */
1200	lgre = gre->limit;	1253	lgre = gre->limit;
1201	if (sock_min > gre->sockid)	1254	if (sock_min > gre->sockid)
1202	sock_min = gre->sockid;	1255	sock_min = gre->sockid;
@@ -1427,6 +1480,7 @@ static void __init uv_system_init_hub(void) · 224 unmodified lines
1427		1480
1428	build_socket_tables();	1481	build_socket_tables();
1429	build_uv_gr_table();	1482	build_uv_gr_table();
		1483	set_block_size();
1430	uv_init_hub_info(&hub_info);	1484	uv_init_hub_info(&hub_info);
1431	uv_possible_blades = num_possible_nodes();	1485	uv_possible_blades = num_possible_nodes();
1432	if (!_node_to_pnode)	1486	if (!_node_to_pnode)

arch/x86/kernel/cpu/bugs.c+4−0

 #include <asm/pgtable.h>
 #include <asm/set_memory.h>
 #include <asm/intel-family.h>
+#include <asm/hypervisor.h>
 static void __init spectre_v2_select_mitigation(void);
 static void __init ssb_select_mitigation(void);
 		if (boot_cpu_has(X86_FEATURE_PTI))
 			return sprintf(buf, "Mitigation: PTI\n");
+		if (hypervisor_is_type(X86_HYPER_XEN_PV))
+			return sprintf(buf, "Unknown (XEN PV detected, hypervisor mitigation required)\n");
 		break;
 	case X86_BUG_SPECTRE_V1:

arch/x86/kernel/cpu/cacheinfo.c+1−1

@@ -671,7 +671,7 @@ void cacheinfo_amd_init_llc_id(struct cpuinfo_x86 *c, int cpu, u8 node_id) · 670 unmodified lines
671	num_sharing_cache = ((eax >> 14) & 0xfff) + 1;	671	num_sharing_cache = ((eax >> 14) & 0xfff) + 1;
672		672
673	if (num_sharing_cache) {	673	if (num_sharing_cache) {
674	int bits = get_count_order(num_sharing_cache) - 1;	674	int bits = get_count_order(num_sharing_cache);
675		675
676	per_cpu(cpu_llc_id, cpu) = c->apicid >> bits;	676	per_cpu(cpu_llc_id, cpu) = c->apicid >> bits;
677	}	677	}

arch/x86/kernel/cpu/common.c+3−0

@@ -1,3 +1,6 @@
		1	/* cpu_feature_enabled() cannot be used this early */
		2	#define USE_EARLY_PGTABLE_L5
		3
1	#include <linux/bootmem.h>	4	#include <linux/bootmem.h>
2	#include <linux/linkage.h>	5	#include <linux/linkage.h>
3	#include <linux/bitops.h>	6	#include <linux/bitops.h>

arch/x86/kernel/cpu/mcheck/mce-severity.c+5−0

 		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_INSTR),
 		USER
 		),
+	MCESEV(
+		PANIC, "Data load in unrecoverable area of kernel",
+		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_DATA),
+		KERNEL
+		),
 #endif
 	MCESEV(
 		PANIC, "Action required: unknown MCACOD",

arch/x86/kernel/cpu/mcheck/mce.c+28−16

@@ -772,23 +772,25 @@ EXPORT_SYMBOL_GPL(machine_check_poll); · 771 unmodified lines
772	static int mce_no_way_out(struct mce m, char msg, unsigned long validp,	772	static int mce_no_way_out(struct mce m, char msg, unsigned long validp,
773	struct pt_regs *regs)	773	struct pt_regs *regs)
774	{	774	{
775	int i, ret = 0;
776	char *tmp;	775	char *tmp;
		776	int i;
777		777
778	for (i = 0; i < mca_cfg.banks; i++) {	778	for (i = 0; i < mca_cfg.banks; i++) {
779	m->status = mce_rdmsrl(msr_ops.status(i));	779	m->status = mce_rdmsrl(msr_ops.status(i));
780	if (m->status & MCI_STATUS_VAL) {	780	if (!(m->status & MCI_STATUS_VAL))
781	__set_bit(i, validp);	781	continue;
782	if (quirk_no_way_out)	782
783	quirk_no_way_out(i, m, regs);	783	__set_bit(i, validp);
784	}	784	if (quirk_no_way_out)
		785	quirk_no_way_out(i, m, regs);
785		786
786	if (mce_severity(m, mca_cfg.tolerant, &tmp, true) >= MCE_PANIC_SEVERITY) {	787	if (mce_severity(m, mca_cfg.tolerant, &tmp, true) >= MCE_PANIC_SEVERITY) {
		788	mce_read_aux(m, i);
787	*msg = tmp;	789	*msg = tmp;
788	ret = 1;	790	return 1;
789	}	791	}
790	}	792	}
791	return ret;	793	return 0;
792	}	794	}
793		795
794	/*	796	/*
@@ -1205,13 +1207,18 @@ void do_machine_check(struct pt_regs *regs, long error_code) · 410 unmodified lines
1205	lmce = m.mcgstatus & MCG_STATUS_LMCES;	1207	lmce = m.mcgstatus & MCG_STATUS_LMCES;
1206		1208
1207	/*	1209	/*
		1210	* Local machine check may already know that we have to panic.
		1211	* Broadcast machine check begins rendezvous in mce_start()
1208	* Go through all banks in exclusion of the other CPUs. This way we	1212	* Go through all banks in exclusion of the other CPUs. This way we
1209	* don't report duplicated events on shared banks because the first one	1213	* don't report duplicated events on shared banks because the first one
1210	* to see it will clear it. If this is a Local MCE, then no need to	1214	* to see it will clear it.
1211	* perform rendezvous.
1212	*/	1215	*/
1213	if (!lmce)	1216	if (lmce) {
		1217	if (no_way_out)
		1218	mce_panic("Fatal local machine check", &m, msg);
		1219	} else {
1214	order = mce_start(&no_way_out);	1220	order = mce_start(&no_way_out);
		1221	}
1215		1222
1216	for (i = 0; i < cfg->banks; i++) {	1223	for (i = 0; i < cfg->banks; i++) {
1217	__clear_bit(i, toclear);	1224	__clear_bit(i, toclear);
@@ -1287,12 +1294,17 @@ void do_machine_check(struct pt_regs *regs, long error_code) · 69 unmodified lines
1287	no_way_out = worst >= MCE_PANIC_SEVERITY;	1294	no_way_out = worst >= MCE_PANIC_SEVERITY;
1288	} else {	1295	} else {
1289	/*	1296	/*
1290	* Local MCE skipped calling mce_reign()	1297	* If there was a fatal machine check we should have
1291	* If we found a fatal error, we need to panic here.	1298	* already called mce_panic earlier in this function.
		1299	* Since we re-read the banks, we might have found
		1300	* something new. Check again to see if we found a
		1301	* fatal error. We call "mce_severity()" again to
		1302	* make sure we have the right "msg".
1292	*/	1303	*/
1293	if (worst >= MCE_PANIC_SEVERITY && mca_cfg.tolerant < 3)	1304	if (worst >= MCE_PANIC_SEVERITY && mca_cfg.tolerant < 3) {
1294	mce_panic("Machine check from unknown source",	1305	mce_severity(&m, cfg->tolerant, &msg, true);
1295	NULL, NULL);	1306	mce_panic("Local fatal machine check!", &m, msg);
		1307	}
1296	}	1308	}
1297		1309
1298	/*	1310	/*

arch/x86/kernel/cpu/microcode/intel.c+4−1

 			p = memdup_patch(data, size);
 			if (!p)
 				pr_err("Error allocating buffer %p\n", data);
-			else
+			else {
 				list_replace(&iter->plist, &p->plist);
+				kfree(iter->data);
+				kfree(iter);
+			}
 		}
 	}

arch/x86/kernel/e820.c+12−3

@@ -1248,6 +1248,7 @@ void __init e820__memblock_setup(void) · 1247 unmodified lines
1248	{	1248	{
1249	int i;	1249	int i;
1250	u64 end;	1250	u64 end;
		1251	u64 addr = 0;
1251		1252
1252	/*	1253	/*
1253	* The bootstrap memblock region count maximum is 128 entries	1254	* The bootstrap memblock region count maximum is 128 entries
@@ -1264,13 +1265,21 @@ void __init e820__memblock_setup(void) · 10 unmodified lines
1264	struct e820_entry *entry = &e820_table->entries[i];	1265	struct e820_entry *entry = &e820_table->entries[i];
1265		1266
1266	end = entry->addr + entry->size;	1267	end = entry->addr + entry->size;
		1268	if (addr < entry->addr)
		1269	memblock_reserve(addr, entry->addr - addr);
		1270	addr = end;
1267	if (end != (resource_size_t)end)	1271	if (end != (resource_size_t)end)
1268	continue;	1272	continue;
1269		1273
		1274	/*
		1275	* all !E820_TYPE_RAM ranges (including gap ranges) are put
		1276	* into memblock.reserved to make sure that struct pages in
		1277	* such regions are not left uninitialized after bootup.
		1278	*/
1270	if (entry->type != E820_TYPE_RAM && entry->type != E820_TYPE_RESERVED_KERN)	1279	if (entry->type != E820_TYPE_RAM && entry->type != E820_TYPE_RESERVED_KERN)
1271	continue;	1280	memblock_reserve(entry->addr, entry->size);
1272		1281	else
1273	memblock_add(entry->addr, entry->size);	1282	memblock_add(entry->addr, entry->size);
1274	}	1283	}
1275		1284
1276	/* Throw away partial pages: */	1285	/* Throw away partial pages: */

arch/x86/kernel/head64.c+1−1

@@ -44,7 +44,7 @@ static unsigned int __initdata next_early_pgt; · 43 unmodified lines
44	pmdval_t early_pmd_flags = __PAGE_KERNEL_LARGE & ~(_PAGE_GLOBAL \| _PAGE_NX);	44	pmdval_t early_pmd_flags = __PAGE_KERNEL_LARGE & ~(_PAGE_GLOBAL \| _PAGE_NX);
45		45
46	#ifdef CONFIG_X86_5LEVEL	46	#ifdef CONFIG_X86_5LEVEL
47	unsigned int __pgtable_l5_enabled __initdata;	47	unsigned int __pgtable_l5_enabled __ro_after_init;
48	unsigned int pgdir_shift __ro_after_init = 39;	48	unsigned int pgdir_shift __ro_after_init = 39;
49	EXPORT_SYMBOL(pgdir_shift);	49	EXPORT_SYMBOL(pgdir_shift);
50	unsigned int ptrs_per_p4d __ro_after_init = 1;	50	unsigned int ptrs_per_p4d __ro_after_init = 1;

arch/x86/kernel/quirks.c+9−2

 /* Skylake */
 static void quirk_intel_purley_xeon_ras_cap(struct pci_dev *pdev)
 {
-	u32 capid0;
+	u32 capid0, capid5;
 	pci_read_config_dword(pdev, 0x84, &capid0);
+	pci_read_config_dword(pdev, 0x98, &capid5);
-	if ((capid0 & 0xc0) == 0xc0)
+	/*
+	 * CAPID0{7:6} indicate whether this is an advanced RAS SKU
+	 * CAPID5{8:5} indicate that various NVDIMM usage modes are
+	 * enabled, so memory machine check recovery is also enabled.
+	 */
+	if ((capid0 & 0xc0) == 0xc0 || (capid5 & 0x1e0))
 		static_branch_inc(&mcsafe_key);
 }
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x0ec3, quirk_intel_brickland_xeon_ras_cap);
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2fc0, quirk_intel_brickland_xeon_ras_cap);

arch/x86/kernel/signal.c+1−1

@@ -692,7 +692,7 @@ setup_rt_frame(struct ksignal ksig, struct pt_regs regs) · 691 unmodified lines
692	* Increment event counter and perform fixup for the pre-signal	692	* Increment event counter and perform fixup for the pre-signal
693	* frame.	693	* frame.
694	*/	694	*/
695	rseq_signal_deliver(regs);	695	rseq_signal_deliver(ksig, regs);
696		696
697	/* Set up the stack frame */	697	/* Set up the stack frame */
698	if (is_ia32_frame(ksig)) {	698	if (is_ia32_frame(ksig)) {

arch/x86/kernel/traps.c+8−6

@@ -835,16 +835,18 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr) · 834 unmodified lines
835	char *str = (trapnr == X86_TRAP_MF) ? "fpu exception" :	835	char *str = (trapnr == X86_TRAP_MF) ? "fpu exception" :
836	"simd exception";	836	"simd exception";
837		837
838	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, SIGFPE) == NOTIFY_STOP)
839	return;
840	cond_local_irq_enable(regs);	838	cond_local_irq_enable(regs);
841		839
842	if (!user_mode(regs)) {	840	if (!user_mode(regs)) {
843	if (!fixup_exception(regs, trapnr)) {	841	if (fixup_exception(regs, trapnr))
844	task->thread.error_code = error_code;	842	return;
845	task->thread.trap_nr = trapnr;	843
		844	task->thread.error_code = error_code;
		845	task->thread.trap_nr = trapnr;
		846
		847	if (notify_die(DIE_TRAP, str, regs, error_code,
		848	trapnr, SIGFPE) != NOTIFY_STOP)
846	die(str, regs, error_code);	849	die(str, regs, error_code);
847	}
848	return;	850	return;
849	}	851	}
850		852

arch/x86/kernel/uprobes.c+1−1

@@ -293,7 +293,7 @@ static int uprobe_init_insn(struct arch_uprobe auprobe, struct insn insn, bool · 292 unmodified lines
293	insn_init(insn, auprobe->insn, sizeof(auprobe->insn), x86_64);	293	insn_init(insn, auprobe->insn, sizeof(auprobe->insn), x86_64);
294	/* has the side-effect of processing the entire instruction */	294	/* has the side-effect of processing the entire instruction */
295	insn_get_length(insn);	295	insn_get_length(insn);
296	if (WARN_ON_ONCE(!insn_complete(insn)))	296	if (!insn_complete(insn))
297	return -ENOEXEC;	297	return -ENOEXEC;
298		298
299	if (is_prefix_bad(insn))	299	if (is_prefix_bad(insn))

arch/x86/kvm/vmx.c+67−0

@@ -1705,6 +1705,17 @@ static inline bool nested_cpu_has_vmwrite_any_field(struct kvm_vcpu *vcpu) · 1704 unmodified lines
1705	MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS;	1705	MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS;
1706	}	1706	}
1707		1707
		1708	static inline bool nested_cpu_has_zero_length_injection(struct kvm_vcpu *vcpu)
		1709	{
		1710	return to_vmx(vcpu)->nested.msrs.misc_low & VMX_MISC_ZERO_LEN_INS;
		1711	}
		1712
		1713	static inline bool nested_cpu_supports_monitor_trap_flag(struct kvm_vcpu *vcpu)
		1714	{
		1715	return to_vmx(vcpu)->nested.msrs.procbased_ctls_high &
		1716	CPU_BASED_MONITOR_TRAP_FLAG;
		1717	}
		1718
1708	static inline bool nested_cpu_has(struct vmcs12 *vmcs12, u32 bit)	1719	static inline bool nested_cpu_has(struct vmcs12 *vmcs12, u32 bit)
1709	{	1720	{
1710	return vmcs12->cpu_based_vm_exec_control & bit;	1721	return vmcs12->cpu_based_vm_exec_control & bit;
@@ -11620,6 +11631,62 @@ static int check_vmentry_prereqs(struct kvm_vcpu vcpu, struct vmcs12 vmcs12) · 9909 unmodified lines
11620	!nested_cr3_valid(vcpu, vmcs12->host_cr3))	11631	!nested_cr3_valid(vcpu, vmcs12->host_cr3))
11621	return VMXERR_ENTRY_INVALID_HOST_STATE_FIELD;	11632	return VMXERR_ENTRY_INVALID_HOST_STATE_FIELD;
11622		11633
		11634	/*
		11635	* From the Intel SDM, volume 3:
		11636	* Fields relevant to VM-entry event injection must be set properly.
		11637	* These fields are the VM-entry interruption-information field, the
		11638	* VM-entry exception error code, and the VM-entry instruction length.
		11639	*/
		11640	if (vmcs12->vm_entry_intr_info_field & INTR_INFO_VALID_MASK) {
		11641	u32 intr_info = vmcs12->vm_entry_intr_info_field;
		11642	u8 vector = intr_info & INTR_INFO_VECTOR_MASK;
		11643	u32 intr_type = intr_info & INTR_INFO_INTR_TYPE_MASK;
		11644	bool has_error_code = intr_info & INTR_INFO_DELIVER_CODE_MASK;
		11645	bool should_have_error_code;
		11646	bool urg = nested_cpu_has2(vmcs12,
		11647	SECONDARY_EXEC_UNRESTRICTED_GUEST);
		11648	bool prot_mode = !urg \|\| vmcs12->guest_cr0 & X86_CR0_PE;
		11649
		11650	/* VM-entry interruption-info field: interruption type */
		11651	if (intr_type == INTR_TYPE_RESERVED \|\|
		11652	(intr_type == INTR_TYPE_OTHER_EVENT &&
		11653	!nested_cpu_supports_monitor_trap_flag(vcpu)))
		11654	return VMXERR_ENTRY_INVALID_CONTROL_FIELD;
		11655
		11656	/* VM-entry interruption-info field: vector */
		11657	if ((intr_type == INTR_TYPE_NMI_INTR && vector != NMI_VECTOR) \|\|
		11658	(intr_type == INTR_TYPE_HARD_EXCEPTION && vector > 31) \|\|
		11659	(intr_type == INTR_TYPE_OTHER_EVENT && vector != 0))
		11660	return VMXERR_ENTRY_INVALID_CONTROL_FIELD;
		11661
		11662	/* VM-entry interruption-info field: deliver error code */
		11663	should_have_error_code =
		11664	intr_type == INTR_TYPE_HARD_EXCEPTION && prot_mode &&
		11665	x86_exception_has_error_code(vector);
		11666	if (has_error_code != should_have_error_code)
		11667	return VMXERR_ENTRY_INVALID_CONTROL_FIELD;
		11668
		11669	/* VM-entry exception error code */
		11670	if (has_error_code &&
		11671	vmcs12->vm_entry_exception_error_code & GENMASK(31, 15))
		11672	return VMXERR_ENTRY_INVALID_CONTROL_FIELD;
		11673
		11674	/* VM-entry interruption-info field: reserved bits */
		11675	if (intr_info & INTR_INFO_RESVD_BITS_MASK)
		11676	return VMXERR_ENTRY_INVALID_CONTROL_FIELD;
		11677
		11678	/* VM-entry instruction length */
		11679	switch (intr_type) {
		11680	case INTR_TYPE_SOFT_EXCEPTION:
		11681	case INTR_TYPE_SOFT_INTR:
		11682	case INTR_TYPE_PRIV_SW_EXCEPTION:
		11683	if ((vmcs12->vm_entry_instruction_len > 15) \|\|
		11684	(vmcs12->vm_entry_instruction_len == 0 &&
		11685	!nested_cpu_has_zero_length_injection(vcpu)))
		11686	return VMXERR_ENTRY_INVALID_CONTROL_FIELD;
		11687	}
		11688	}
		11689
11623	return 0;	11690	return 0;
11624	}	11691	}
11625		11692

arch/x86/kvm/x86.h+9−0

@@ -110,6 +110,15 @@ static inline bool is_la57_mode(struct kvm_vcpu *vcpu) · 109 unmodified lines
110	#endif	110	#endif
111	}	111	}
112		112
		113	static inline bool x86_exception_has_error_code(unsigned int vector)
		114	{
		115	static u32 exception_has_error_code = BIT(DF_VECTOR) \| BIT(TS_VECTOR) \|
		116	BIT(NP_VECTOR) \| BIT(SS_VECTOR) \| BIT(GP_VECTOR) \|
		117	BIT(PF_VECTOR) \| BIT(AC_VECTOR);
		118
		119	return (1U << vector) & exception_has_error_code;
		120	}
		121
113	static inline bool mmu_is_nested(struct kvm_vcpu *vcpu)	122	static inline bool mmu_is_nested(struct kvm_vcpu *vcpu)
114	{	123	{
115	return vcpu->arch.walk_mmu == &vcpu->arch.nested_mmu;	124	return vcpu->arch.walk_mmu == &vcpu->arch.nested_mmu;

arch/x86/mm/fault.c+7−14

 	return 0;
 }
-static const char nx_warning[] = KERN_CRIT
-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
-static const char smep_warning[] = KERN_CRIT
-"unable to execute userspace code (SMEP?) (uid: %d)\n";
 static void
 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
 		unsigned long address)
 		pte = lookup_address_in_pgd(pgd, address, &level);
 		if (pte && pte_present(*pte) && !pte_exec(*pte))
-			printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
+			pr_crit("kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n",
+				from_kuid(&init_user_ns, current_uid()));
 		if (pte && pte_present(*pte) && pte_exec(*pte) &&
 				(pgd_flags(*pgd) & _PAGE_USER) &&
 				(__read_cr4() & X86_CR4_SMEP))
-			printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
+			pr_crit("unable to execute userspace code (SMEP?) (uid: %d)\n",
+				from_kuid(&init_user_ns, current_uid()));
 	}
-	printk(KERN_ALERT "BUG: unable to handle kernel ");
+	pr_alert("BUG: unable to handle kernel %s at %px\n",
-	if (address < PAGE_SIZE)
+		 address < PAGE_SIZE ? "NULL pointer dereference" : "paging request",
-		printk(KERN_CONT "NULL pointer dereference");
+		 (void *)address);
-	else
-		printk(KERN_CONT "paging request");
-	printk(KERN_CONT " at %px\n", (void *) address);
 	dump_pagetable(address);
 }

arch/x86/mm/init_64.c+16−4

 /* Amount of ram needed to start using large blocks */
 #define MEM_SIZE_FOR_LARGE_BLOCK (64UL << 30)
+/* Adjustable memory block size */
+static unsigned long set_memory_block_size;
+int __init set_memory_block_size_order(unsigned int order)
+{
+	unsigned long size = 1UL << order;
+	if (size > MEM_SIZE_FOR_LARGE_BLOCK || size < MIN_MEMORY_BLOCK_SIZE)
+		return -EINVAL;
+	set_memory_block_size = size;
+	return 0;
+}
 static unsigned long probe_memory_block_size(void)
 {
 	unsigned long boot_mem_end = max_pfn << PAGE_SHIFT;
 	unsigned long bz;
-	/* If this is UV system, always set 2G block size */
+	/* If memory block size has been set, then use it */
-	if (is_uv_system()) {
+	bz = set_memory_block_size;
-		bz = MAX_BLOCK_SIZE;
+	if (bz)
 		goto done;
-	}
 	/* Use regular block if RAM is smaller than MEM_SIZE_FOR_LARGE_BLOCK */
 	if (boot_mem_end < MEM_SIZE_FOR_LARGE_BLOCK) {

arch/x86/platform/efi/efi_64.c+2−2

@@ -166,14 +166,14 @@ void __init efi_call_phys_epilog(pgd_t *save_pgd) · 165 unmodified lines
166	pgd = pgd_offset_k(pgd_idx * PGDIR_SIZE);	166	pgd = pgd_offset_k(pgd_idx * PGDIR_SIZE);
167	set_pgd(pgd_offset_k(pgd_idx * PGDIR_SIZE), save_pgd[pgd_idx]);	167	set_pgd(pgd_offset_k(pgd_idx * PGDIR_SIZE), save_pgd[pgd_idx]);
168		168
169	if (!(pgd_val(*pgd) & _PAGE_PRESENT))	169	if (!pgd_present(*pgd))
170	continue;	170	continue;
171		171
172	for (i = 0; i < PTRS_PER_P4D; i++) {	172	for (i = 0; i < PTRS_PER_P4D; i++) {
173	p4d = p4d_offset(pgd,	173	p4d = p4d_offset(pgd,
174	pgd_idx * PGDIR_SIZE + i * P4D_SIZE);	174	pgd_idx * PGDIR_SIZE + i * P4D_SIZE);
175		175
176	if (!(p4d_val(*p4d) & _PAGE_PRESENT))	176	if (!p4d_present(*p4d))
177	continue;	177	continue;
178		178
179	pud = (pud_t )p4d_page_vaddr(p4d);	179	pud = (pud_t )p4d_page_vaddr(p4d);

arch/x86/xen/enlighten.c+7−0

@@ -64,6 +64,13 @@ struct shared_info xen_dummy_shared_info; · 63 unmodified lines
64	__read_mostly int xen_have_vector_callback;	64	__read_mostly int xen_have_vector_callback;
65	EXPORT_SYMBOL_GPL(xen_have_vector_callback);	65	EXPORT_SYMBOL_GPL(xen_have_vector_callback);
66		66
		67	/*
		68	* NB: needs to live in .data because it's used by xen_prepare_pvh which runs
		69	* before clearing the bss.
		70	*/
		71	uint32_t xen_start_flags __attribute__((section(".data"))) = 0;
		72	EXPORT_SYMBOL(xen_start_flags);
		73
67	/*	74	/*
68	* Point at some empty memory to start with. We map the real shared_info	75	* Point at some empty memory to start with. We map the real shared_info
69	* page as soon as fixmap is up and running.	76	* page as soon as fixmap is up and running.

arch/x86/xen/enlighten_pv.c+1−0

@@ -1203,6 +1203,7 @@ asmlinkage __visible void __init xen_start_kernel(void) · 1202 unmodified lines
1203	return;	1203	return;
1204		1204
1205	xen_domain_type = XEN_PV_DOMAIN;	1205	xen_domain_type = XEN_PV_DOMAIN;
		1206	xen_start_flags = xen_start_info->flags;
1206		1207
1207	xen_setup_features();	1208	xen_setup_features();
1208		1209

arch/x86/xen/enlighten_pvh.c+1−0

@@ -97,6 +97,7 @@ void __init xen_prepare_pvh(void) · 96 unmodified lines
97	}	97	}
98		98
99	xen_pvh = 1;	99	xen_pvh = 1;
		100	xen_start_flags = pvh_start_info.flags;
100		101
101	msr = cpuid_ebx(xen_cpuid_base() + 2);	102	msr = cpuid_ebx(xen_cpuid_base() + 2);
102	pfn = __pa(hypercall_page);	103	pfn = __pa(hypercall_page);

arch/x86/xen/smp_pv.c+5−0

 #include <xen/interface/vcpu.h>
 #include <xen/interface/xenpmu.h>
+#include <asm/spec-ctrl.h>
 #include <asm/xen/interface.h>
 #include <asm/xen/hypercall.h>
 	cpu_data(cpu).x86_max_cores = 1;
 	set_cpu_sibling_map(cpu);
+	speculative_store_bypass_ht_init();
 	xen_setup_cpu_clockevents();
 	notify_cpu_starting(cpu);
 	}
 	set_cpu_sibling_map(0);
+	speculative_store_bypass_ht_init();
 	xen_pmu_init(0);
 	if (xen_smp_intr_init(0) || xen_smp_intr_init_pv(0))

block/bio.c+0−3

@@ -1807,9 +1807,6 @@ again: · 1806 unmodified lines
1807	if (!bio_integrity_endio(bio))	1807	if (!bio_integrity_endio(bio))
1808	return;	1808	return;
1809		1809
1810	if (WARN_ONCE(bio->bi_next, "driver left bi_next not NULL"))
1811	bio->bi_next = NULL;
1812
1813	/*	1810	/*
1814	* Need to have a real endio function for chained bios, otherwise	1811	* Need to have a real endio function for chained bios, otherwise
1815	* various corner cases will break (like stacking block devices that	1812	* various corner cases will break (like stacking block devices that

block/blk-core.c+5−7

 	bio_advance(bio, nbytes);
 	/* don't actually finish bio if it's part of flush sequence */
-	/*
-	 * XXX this code looks suspicious - it's not consistent with advancing
-	 * req->bio in caller
-	 */
 	if (bio->bi_iter.bi_size == 0 && !(rq->rq_flags & RQF_FLUSH_SEQ))
 		bio_endio(bio);
 }
 		struct bio *bio = req->bio;
 		unsigned bio_bytes = min(bio->bi_iter.bi_size, nr_bytes);
-		if (bio_bytes == bio->bi_iter.bi_size) {
+		if (bio_bytes == bio->bi_iter.bi_size)
 			req->bio = bio->bi_next;
-			bio->bi_next = NULL;
-		}
 		/* Completion has already been traced */
 		bio_clear_flag(bio, BIO_TRACE_COMPLETION);
 	dst->cpu = src->cpu;
 	dst->__sector = blk_rq_pos(src);
 	dst->__data_len = blk_rq_bytes(src);
+	if (src->rq_flags & RQF_SPECIAL_PAYLOAD) {
+		dst->rq_flags |= RQF_SPECIAL_PAYLOAD;
+		dst->special_vec = src->special_vec;
+	}
 	dst->nr_phys_segments = src->nr_phys_segments;
 	dst->ioprio = src->ioprio;
 	dst->extra_len = src->extra_len;

block/blk-mq-debugfs.c+1−1

@@ -356,7 +356,7 @@ static const char *const blk_mq_rq_state_name_array[] = { · 355 unmodified lines
356		356
357	static const char *blk_mq_rq_state_name(enum mq_rq_state rq_state)	357	static const char *blk_mq_rq_state_name(enum mq_rq_state rq_state)
358	{	358	{
359	if (WARN_ON_ONCE((unsigned int)rq_state >	359	if (WARN_ON_ONCE((unsigned int)rq_state >=
360	ARRAY_SIZE(blk_mq_rq_state_name_array)))	360	ARRAY_SIZE(blk_mq_rq_state_name_array)))
361	return "(?)";	361	return "(?)";
362	return blk_mq_rq_state_name_array[rq_state];	362	return blk_mq_rq_state_name_array[rq_state];

block/blk-mq.c+12−1

 		WARN_ON_ONCE(ret != BLK_EH_RESET_TIMER);
 	}
-	req->rq_flags &= ~RQF_TIMED_OUT;
 	blk_add_timer(req);
 }
 #define BLK_MQ_RESOURCE_DELAY	3		/* ms units */
+/*
+ * Returns true if we did some work AND can potentially do more.
+ */
 bool blk_mq_dispatch_rq_list(struct request_queue *q, struct list_head *list,
 			     bool got_budget)
 {
 			blk_mq_run_hw_queue(hctx, true);
 		else if (needs_restart && (ret == BLK_STS_RESOURCE))
 			blk_mq_delay_run_hw_queue(hctx, BLK_MQ_RESOURCE_DELAY);
+		return false;
 	}
+	/*
+	 * If the host/device is unable to accept more work, inform the
+	 * caller of that.
+	 */
+	if (ret == BLK_STS_RESOURCE || ret == BLK_STS_DEV_RESOURCE)
+		return false;
 	return (queued + errors) != 0;
 }

block/blk-softirq.c+1−0

@@ -144,6 +144,7 @@ do_local: · 143 unmodified lines
144		144
145	local_irq_restore(flags);	145	local_irq_restore(flags);
146	}	146	}
		147	EXPORT_SYMBOL(__blk_complete_request);
147		148
148	/**	149	/**
149	* blk_complete_request - end I/O on a request	150	* blk_complete_request - end I/O on a request

block/blk-timeout.c+1−0

@@ -210,6 +210,7 @@ void blk_add_timer(struct request *req) · 209 unmodified lines
210	if (!req->timeout)	210	if (!req->timeout)
211	req->timeout = q->rq_timeout;	211	req->timeout = q->rq_timeout;
212		212
		213	req->rq_flags &= ~RQF_TIMED_OUT;
213	blk_rq_set_deadline(req, jiffies + req->timeout);	214	blk_rq_set_deadline(req, jiffies + req->timeout);
214		215
215	/*	216	/*

block/sed-opal.c+2−2

@@ -877,7 +877,7 @@ static size_t response_get_string(const struct parsed_resp *resp, int n, · 876 unmodified lines
877	return 0;	877	return 0;
878	}	878	}
879		879
880	if (n > resp->num) {	880	if (n >= resp->num) {
881	pr_debug("Response has %d tokens. Can't access %d\n",	881	pr_debug("Response has %d tokens. Can't access %d\n",
882	resp->num, n);	882	resp->num, n);
883	return 0;	883	return 0;
@@ -916,7 +916,7 @@ static u64 response_get_u64(const struct parsed_resp *resp, int n) · 32 unmodified lines
916	return 0;	916	return 0;
917	}	917	}
918		918
919	if (n > resp->num) {	919	if (n >= resp->num) {
920	pr_debug("Response has %d tokens. Can't access %d\n",	920	pr_debug("Response has %d tokens. Can't access %d\n",
921	resp->num, n);	921	resp->num, n);
922	return 0;	922	return 0;

certs/blacklist.h+1−1

@@ -1,3 +1,3 @@
1	#include <linux/kernel.h>	1	#include <linux/kernel.h>
2		2
3	extern const char __initdata *const blacklist_hashes[];	3	extern const char __initconst *const blacklist_hashes[];

crypto/af_alg.c+10−3

 }
 EXPORT_SYMBOL_GPL(af_alg_async_cb);
-__poll_t af_alg_poll_mask(struct socket *sock, __poll_t events)
+/**
+ * af_alg_poll - poll system call handler
+ */
+__poll_t af_alg_poll(struct file *file, struct socket *sock,
+			 poll_table *wait)
 {
 	struct sock *sk = sock->sk;
 	struct alg_sock *ask = alg_sk(sk);
 	struct af_alg_ctx *ctx = ask->private;
-	__poll_t mask = 0;
+	__poll_t mask;
+	sock_poll_wait(file, sk_sleep(sk), wait);
+	mask = 0;
 	if (!ctx->more || ctx->used)
 		mask |= EPOLLIN | EPOLLRDNORM;
 	return mask;
 }
-EXPORT_SYMBOL_GPL(af_alg_poll_mask);
+EXPORT_SYMBOL_GPL(af_alg_poll);
 /**
  * af_alg_alloc_areq - allocate struct af_alg_async_req

crypto/algif_aead.c+2−2

@@ -375,7 +375,7 @@ static struct proto_ops algif_aead_ops = { · 374 unmodified lines
375	.sendmsg = aead_sendmsg,	375	.sendmsg = aead_sendmsg,
376	.sendpage = af_alg_sendpage,	376	.sendpage = af_alg_sendpage,
377	.recvmsg = aead_recvmsg,	377	.recvmsg = aead_recvmsg,
378	.poll_mask = af_alg_poll_mask,	378	.poll = af_alg_poll,
379	};	379	};
380		380
381	static int aead_check_key(struct socket *sock)	381	static int aead_check_key(struct socket *sock)
@@ -471,7 +471,7 @@ static struct proto_ops algif_aead_ops_nokey = { · 89 unmodified lines
471	.sendmsg = aead_sendmsg_nokey,	471	.sendmsg = aead_sendmsg_nokey,
472	.sendpage = aead_sendpage_nokey,	472	.sendpage = aead_sendpage_nokey,
473	.recvmsg = aead_recvmsg_nokey,	473	.recvmsg = aead_recvmsg_nokey,
474	.poll_mask = af_alg_poll_mask,	474	.poll = af_alg_poll,
475	};	475	};
476		476
477	static void aead_bind(const char name, u32 type, u32 mask)	477	static void aead_bind(const char name, u32 type, u32 mask)

crypto/algif_skcipher.c+2−2

@@ -206,7 +206,7 @@ static struct proto_ops algif_skcipher_ops = { · 205 unmodified lines
206	.sendmsg = skcipher_sendmsg,	206	.sendmsg = skcipher_sendmsg,
207	.sendpage = af_alg_sendpage,	207	.sendpage = af_alg_sendpage,
208	.recvmsg = skcipher_recvmsg,	208	.recvmsg = skcipher_recvmsg,
209	.poll_mask = af_alg_poll_mask,	209	.poll = af_alg_poll,
210	};	210	};
211		211
212	static int skcipher_check_key(struct socket *sock)	212	static int skcipher_check_key(struct socket *sock)
@@ -302,7 +302,7 @@ static struct proto_ops algif_skcipher_ops_nokey = { · 89 unmodified lines
302	.sendmsg = skcipher_sendmsg_nokey,	302	.sendmsg = skcipher_sendmsg_nokey,
303	.sendpage = skcipher_sendpage_nokey,	303	.sendpage = skcipher_sendpage_nokey,
304	.recvmsg = skcipher_recvmsg_nokey,	304	.recvmsg = skcipher_recvmsg_nokey,
305	.poll_mask = af_alg_poll_mask,	305	.poll = af_alg_poll,
306	};	306	};
307		307
308	static void skcipher_bind(const char name, u32 type, u32 mask)	308	static void skcipher_bind(const char name, u32 type, u32 mask)

crypto/asymmetric_keys/x509_cert_parser.c+9−0

@@ -249,6 +249,15 @@ int x509_note_signature(void *context, size_t hdrlen, · 248 unmodified lines
249	return -EINVAL;	249	return -EINVAL;
250	}	250	}
251		251
		252	if (strcmp(ctx->cert->sig->pkey_algo, "rsa") == 0) {
		253	/* Discard the BIT STRING metadata */
		254	if (vlen < 1 \|\| (const u8 )value != 0)
		255	return -EBADMSG;
		256
		257	value++;
		258	vlen--;
		259	}
		260
252	ctx->cert->raw_sig = value;	261	ctx->cert->raw_sig = value;
253	ctx->cert->raw_sig_size = vlen;	262	ctx->cert->raw_sig_size = vlen;
254	return 0;	263	return 0;

crypto/morus640.c+2−1

@@ -274,8 +274,9 @@ static void crypto_morus640_decrypt_chunk(struct morus640_state state, u8 dst, · 273 unmodified lines
274	union morus640_block_in tail;	274	union morus640_block_in tail;
275		275
276	memcpy(tail.bytes, src, size);	276	memcpy(tail.bytes, src, size);
		277	memset(tail.bytes + size, 0, MORUS640_BLOCK_SIZE - size);
277		278
278	crypto_morus640_load_a(&m, src);	279	crypto_morus640_load_a(&m, tail.bytes);
279	crypto_morus640_core(state, &m);	280	crypto_morus640_core(state, &m);
280	crypto_morus640_store_a(tail.bytes, &m);	281	crypto_morus640_store_a(tail.bytes, &m);
281	memset(tail.bytes + size, 0, MORUS640_BLOCK_SIZE - size);	282	memset(tail.bytes + size, 0, MORUS640_BLOCK_SIZE - size);

crypto/sha3_generic.c+1−1

@@ -152,7 +152,7 @@ static SHA3_INLINE void keccakf_round(u64 st[25]) · 151 unmodified lines
152	st[24] ^= bc[ 4];	152	st[24] ^= bc[ 4];
153	}	153	}
154		154
155	static void __optimize("O3") keccakf(u64 st[25])	155	static void keccakf(u64 st[25])
156	{	156	{
157	int round;	157	int round;
158		158

drivers/acpi/acpi_lpss.c+11−7

 #include <linux/pm_domain.h>
 #include <linux/pm_runtime.h>
 #include <linux/pwm.h>
+#include <linux/suspend.h>
 #include <linux/delay.h>
 #include "internal.h"
 	mutex_unlock(&lpss_iosf_mutex);
 }
-static int acpi_lpss_suspend(struct device *dev, bool wakeup)
+static int acpi_lpss_suspend(struct device *dev, bool runtime)
 {
 	struct lpss_private_data *pdata = acpi_driver_data(ACPI_COMPANION(dev));
+	bool wakeup = runtime || device_may_wakeup(dev);
 	int ret;
 	if (pdata->dev_desc->flags & LPSS_SAVE_CTX)
 	 * wrong status for devices being about to be powered off. See
 	 * lpss_iosf_enter_d3_state() for further information.
 	 */
-	if (lpss_quirks & LPSS_QUIRK_ALWAYS_POWER_ON && iosf_mbi_available())
+	if ((runtime || !pm_suspend_via_firmware()) &&
+	    lpss_quirks & LPSS_QUIRK_ALWAYS_POWER_ON && iosf_mbi_available())
 		lpss_iosf_enter_d3_state();
 	return ret;
 }
-static int acpi_lpss_resume(struct device *dev)
+static int acpi_lpss_resume(struct device *dev, bool runtime)
 {
 	struct lpss_private_data *pdata = acpi_driver_data(ACPI_COMPANION(dev));
 	int ret;
 	 * This call is kept first to be in symmetry with
 	 * acpi_lpss_runtime_suspend() one.
 	 */
-	if (lpss_quirks & LPSS_QUIRK_ALWAYS_POWER_ON && iosf_mbi_available())
+	if ((runtime || !pm_resume_via_firmware()) &&
+	    lpss_quirks & LPSS_QUIRK_ALWAYS_POWER_ON && iosf_mbi_available())
 		lpss_iosf_exit_d3_state();
 	ret = acpi_dev_resume(dev);
 		return 0;
 	ret = pm_generic_suspend_late(dev);
-	return ret ? ret : acpi_lpss_suspend(dev, device_may_wakeup(dev));
+	return ret ? ret : acpi_lpss_suspend(dev, false);
 }
 static int acpi_lpss_resume_early(struct device *dev)
 {
-	int ret = acpi_lpss_resume(dev);
+	int ret = acpi_lpss_resume(dev, false);
 	return ret ? ret : pm_generic_resume_early(dev);
 }
 static int acpi_lpss_runtime_resume(struct device *dev)
 {
-	int ret = acpi_lpss_resume(dev);
+	int ret = acpi_lpss_resume(dev, true);
 	return ret ? ret : pm_generic_runtime_resume(dev);
 }

drivers/acpi/ec.c+20−0

@@ -2037,6 +2037,17 @@ static inline void acpi_ec_query_exit(void) · 2036 unmodified lines
2037	}	2037	}
2038	}	2038	}
2039		2039
		2040	static const struct dmi_system_id acpi_ec_no_wakeup[] = {
		2041	{
		2042	.ident = "Thinkpad X1 Carbon 6th",
		2043	.matches = {
		2044	DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
		2045	DMI_MATCH(DMI_PRODUCT_NAME, "20KGS3JF01"),
		2046	},
		2047	},
		2048	{ },
		2049	};
		2050
2040	int __init acpi_ec_init(void)	2051	int __init acpi_ec_init(void)
2041	{	2052	{
2042	int result;	2053	int result;
@@ -2047,6 +2058,15 @@ int __init acpi_ec_init(void) · 4 unmodified lines
2047	if (result)	2058	if (result)
2048	return result;	2059	return result;
2049		2060
		2061	/*
		2062	* Disable EC wakeup on following systems to prevent periodic
		2063	* wakeup from EC GPE.
		2064	*/
		2065	if (dmi_check_system(acpi_ec_no_wakeup)) {
		2066	ec_no_wakeup = true;
		2067	pr_debug("Disabling EC wakeup on suspend-to-idle\n");
		2068	}
		2069
2050	/* Drivers must be started after acpi_ec_query_init() */	2070	/* Drivers must be started after acpi_ec_query_init() */
2051	dsdt_fail = acpi_bus_register_driver(&acpi_ec_driver);	2071	dsdt_fail = acpi_bus_register_driver(&acpi_ec_driver);
2052	/*	2072	/*

drivers/acpi/osl.c+72−0

@@ -45,6 +45,8 @@ · 44 unmodified lines
45	#include <linux/uaccess.h>	45	#include <linux/uaccess.h>
46	#include <linux/io-64-nonatomic-lo-hi.h>	46	#include <linux/io-64-nonatomic-lo-hi.h>
47		47
		48	#include "acpica/accommon.h"
		49	#include "acpica/acnamesp.h"
48	#include "internal.h"	50	#include "internal.h"
49		51
50	#define _COMPONENT ACPI_OS_SERVICES	52	#define _COMPONENT ACPI_OS_SERVICES
@@ -1490,6 +1492,76 @@ int acpi_check_region(resource_size_t start, resource_size_t n, · 1439 unmodified lines
1490	}	1492	}
1491	EXPORT_SYMBOL(acpi_check_region);	1493	EXPORT_SYMBOL(acpi_check_region);
1492		1494
		1495	static acpi_status acpi_deactivate_mem_region(acpi_handle handle, u32 level,
		1496	void _res, void *return_value)
		1497	{
		1498	struct acpi_mem_space_context **mem_ctx;
		1499	union acpi_operand_object *handler_obj;
		1500	union acpi_operand_object *region_obj2;
		1501	union acpi_operand_object *region_obj;
		1502	struct resource *res = _res;
		1503	acpi_status status;
		1504
		1505	region_obj = acpi_ns_get_attached_object(handle);
		1506	if (!region_obj)
		1507	return AE_OK;
		1508
		1509	handler_obj = region_obj->region.handler;
		1510	if (!handler_obj)
		1511	return AE_OK;
		1512
		1513	if (region_obj->region.space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)
		1514	return AE_OK;
		1515
		1516	if (!(region_obj->region.flags & AOPOBJ_SETUP_COMPLETE))
		1517	return AE_OK;
		1518
		1519	region_obj2 = acpi_ns_get_secondary_object(region_obj);
		1520	if (!region_obj2)
		1521	return AE_OK;
		1522
		1523	mem_ctx = (void *)&region_obj2->extra.region_context;
		1524
		1525	if (!(mem_ctx[0]->address >= res->start &&
		1526	mem_ctx[0]->address < res->end))
		1527	return AE_OK;
		1528
		1529	status = handler_obj->address_space.setup(region_obj,
		1530	ACPI_REGION_DEACTIVATE,
		1531	NULL, (void **)mem_ctx);
		1532	if (ACPI_SUCCESS(status))
		1533	region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE);
		1534
		1535	return status;
		1536	}
		1537
		1538	/**
		1539	* acpi_release_memory - Release any mappings done to a memory region
		1540	* @handle: Handle to namespace node
		1541	* @res: Memory resource
		1542	* @level: A level that terminates the search
		1543	*
		1544	* Walks through @handle and unmaps all SystemMemory Operation Regions that
		1545	* overlap with @res and that have already been activated (mapped).
		1546	*
		1547	* This is a helper that allows drivers to place special requirements on memory
		1548	* region that may overlap with operation regions, primarily allowing them to
		1549	* safely map the region as non-cached memory.
		1550	*
		1551	* The unmapped Operation Regions will be automatically remapped next time they
		1552	* are called, so the drivers do not need to do anything else.
		1553	*/
		1554	acpi_status acpi_release_memory(acpi_handle handle, struct resource *res,
		1555	u32 level)
		1556	{
		1557	if (!(res->flags & IORESOURCE_MEM))
		1558	return AE_TYPE;
		1559
		1560	return acpi_walk_namespace(ACPI_TYPE_REGION, handle, level,
		1561	acpi_deactivate_mem_region, NULL, res, NULL);
		1562	}
		1563	EXPORT_SYMBOL_GPL(acpi_release_memory);
		1564
1493	/*	1565	/*
1494	* Let drivers know whether the resource checks are effective	1566	* Let drivers know whether the resource checks are effective
1495	*/	1567	*/

drivers/base/Makefile+0−3

 			   topology.o container.o property.o cacheinfo.o \
 			   devcon.o
 obj-$(CONFIG_DEVTMPFS)	+= devtmpfs.o
-obj-$(CONFIG_DMA_CMA) += dma-contiguous.o
 obj-y			+= power/
-obj-$(CONFIG_HAS_DMA)	+= dma-mapping.o
-obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
 obj-$(CONFIG_ISA_BUS_API)	+= isa.o
 obj-y				+= firmware_loader/
 obj-$(CONFIG_NUMA)	+= node.o

drivers/base/core.c+11−4

 			link->rpm_active = true;
 		}
 		pm_runtime_new_link(consumer);
+		/*
+		 * If the link is being added by the consumer driver at probe
+		 * time, balance the decrementation of the supplier's runtime PM
+		 * usage counter after consumer probe in driver_probe_device().
+		 */
+		if (consumer->links.status == DL_DEV_PROBING)
+			pm_runtime_get_noresume(supplier);
 	}
 	get_device(supplier);
 	link->supplier = supplier;
 			switch (consumer->links.status) {
 			case DL_DEV_PROBING:
 				/*
-				 * Balance the decrementation of the supplier's
+				 * Some callers expect the link creation during
-				 * runtime PM usage counter after consumer probe
+				 * consumer driver probe to resume the supplier
-				 * in driver_probe_device().
+				 * even without DL_FLAG_RPM_ACTIVE.
 				 */
 				if (flags & DL_FLAG_PM_RUNTIME)
-					pm_runtime_get_sync(supplier);
+					pm_runtime_resume(supplier);
 				link->status = DL_STATE_CONSUMER_PROBE;
 				break;

drivers/base/power/domain.c+3−4

  * power domain corresponding to a DT node's "required-opps" property.
  *
  * @dev: Device for which the performance-state needs to be found.
- * @opp_node: DT node where the "required-opps" property is present. This can be
+ * @np: DT node where the "required-opps" property is present. This can be
  *	the device node itself (if it doesn't have an OPP table) or a node
  *	within the OPP table of a device (if device has an OPP table).
- * @state: Pointer to return performance state.
  *
  * Returns performance state corresponding to the "required-opps" property of
  * a DT node. This calls platform specific genpd->opp_to_performance_state()
  * Returns performance state on success and 0 on failure.
  */
 unsigned int of_genpd_opp_to_performance_state(struct device *dev,
-					       struct device_node *opp_node)
+					       struct device_node *np)
 {
 	struct generic_pm_domain *genpd;
 	struct dev_pm_opp *opp;
 	genpd_lock(genpd);
-	opp = of_dev_pm_opp_find_required_opp(&genpd->dev, opp_node);
+	opp = of_dev_pm_opp_find_required_opp(&genpd->dev, np);
 	if (IS_ERR(opp)) {
 		dev_err(dev, "Failed to find required OPP: %ld\n",
 			PTR_ERR(opp));

drivers/block/drbd/drbd_req.c+2−2

@@ -1244,8 +1244,8 @@ drbd_request_prepare(struct drbd_device device, struct bio bio, unsigned long · 1243 unmodified lines
1244	_drbd_start_io_acct(device, req);	1244	_drbd_start_io_acct(device, req);
1245		1245
1246	/* process discards always from our submitter thread */	1246	/* process discards always from our submitter thread */
1247	if ((bio_op(bio) & REQ_OP_WRITE_ZEROES) \|\|	1247	if (bio_op(bio) == REQ_OP_WRITE_ZEROES \|\|
1248	(bio_op(bio) & REQ_OP_DISCARD))	1248	bio_op(bio) == REQ_OP_DISCARD)
1249	goto queue_for_submitter_thread;	1249	goto queue_for_submitter_thread;
1250		1250
1251	if (rw == WRITE && req->private_bio && req->i.size	1251	if (rw == WRITE && req->private_bio && req->i.size

drivers/block/nbd.c+34−8

 #define NBD_HAS_CONFIG_REF		4
 #define NBD_BOUND			5
 #define NBD_DESTROY_ON_DISCONNECT	6
+#define NBD_DISCONNECT_ON_CLOSE 	7
 struct nbd_config {
 	u32 flags;
 static void nbd_connect_reply(struct genl_info *info, int index);
 static int nbd_genl_status(struct sk_buff *skb, struct genl_info *info);
 static void nbd_dead_link_work(struct work_struct *work);
+static void nbd_disconnect_and_put(struct nbd_device *nbd);
 static inline struct device *nbd_to_dev(struct nbd_device *nbd)
 {
 static void nbd_release(struct gendisk *disk, fmode_t mode)
 {
 	struct nbd_device *nbd = disk->private_data;
+	struct block_device *bdev = bdget_disk(disk, 0);
+	if (test_bit(NBD_DISCONNECT_ON_CLOSE, &nbd->config->runtime_flags) &&
+			bdev->bd_openers == 0)
+		nbd_disconnect_and_put(nbd);
 	nbd_config_put(nbd);
 	nbd_put(nbd);
 }
 				&config->runtime_flags);
 			put_dev = true;
 		}
+		if (flags & NBD_CFLAG_DISCONNECT_ON_CLOSE) {
+			set_bit(NBD_DISCONNECT_ON_CLOSE,
+				&config->runtime_flags);
+		}
 	}
 	if (info->attrs[NBD_ATTR_SOCKETS]) {
 	return ret;
 }
+static void nbd_disconnect_and_put(struct nbd_device *nbd)
+{
+	mutex_lock(&nbd->config_lock);
+	nbd_disconnect(nbd);
+	nbd_clear_sock(nbd);
+	mutex_unlock(&nbd->config_lock);
+	if (test_and_clear_bit(NBD_HAS_CONFIG_REF,
+			       &nbd->config->runtime_flags))
+		nbd_config_put(nbd);
+}
 static int nbd_genl_disconnect(struct sk_buff *skb, struct genl_info *info)
 {
 	struct nbd_device *nbd;
 		nbd_put(nbd);
 		return 0;
 	}
-	mutex_lock(&nbd->config_lock);
+	nbd_disconnect_and_put(nbd);
-	nbd_disconnect(nbd);
-	nbd_clear_sock(nbd);
-	mutex_unlock(&nbd->config_lock);
-	if (test_and_clear_bit(NBD_HAS_CONFIG_REF,
-			       &nbd->config->runtime_flags))
-		nbd_config_put(nbd);
 	nbd_config_put(nbd);
 	nbd_put(nbd);
 	return 0;
 	struct nbd_device *nbd = NULL;
 	struct nbd_config *config;
 	int index;
-	int ret = -EINVAL;
+	int ret = 0;
 	bool put_dev = false;
 	if (!netlink_capable(skb, CAP_SYS_ADMIN))
 	    !nbd->task_recv) {
 		dev_err(nbd_to_dev(nbd),
 			"not configured, cannot reconfigure\n");
+		ret = -EINVAL;
 		goto out;
 	}
 					       &config->runtime_flags))
 				refcount_inc(&nbd->refs);
 		}
+		if (flags & NBD_CFLAG_DISCONNECT_ON_CLOSE) {
+			set_bit(NBD_DISCONNECT_ON_CLOSE,
+					&config->runtime_flags);
+		} else {
+			clear_bit(NBD_DISCONNECT_ON_CLOSE,
+					&config->runtime_flags);
+		}
 	}
 	if (info->attrs[NBD_ATTR_SOCKETS]) {

drivers/block/null_blk.c+1−1

@@ -1365,7 +1365,7 @@ static blk_qc_t null_queue_bio(struct request_queue q, struct bio bio) · 1364 unmodified lines
1365	static enum blk_eh_timer_return null_rq_timed_out_fn(struct request *rq)	1365	static enum blk_eh_timer_return null_rq_timed_out_fn(struct request *rq)
1366	{	1366	{
1367	pr_info("null: rq %p timed out\n", rq);	1367	pr_info("null: rq %p timed out\n", rq);
1368	blk_mq_complete_request(rq);	1368	__blk_complete_request(rq);
1369	return BLK_EH_DONE;	1369	return BLK_EH_DONE;
1370	}	1370	}
1371		1371

drivers/bluetooth/hci_nokia.c+1−1

@@ -29,7 +29,7 @@ · 28 unmodified lines
29	#include <linux/slab.h>	29	#include <linux/slab.h>
30	#include <linux/string.h>	30	#include <linux/string.h>
31	#include <linux/types.h>	31	#include <linux/types.h>
32	#include <linux/unaligned/le_struct.h>	32	#include <asm/unaligned.h>
33	#include <net/bluetooth/bluetooth.h>	33	#include <net/bluetooth/bluetooth.h>
34	#include <net/bluetooth/hci_core.h>	34	#include <net/bluetooth/hci_core.h>
35		35

drivers/char/hw_random/core.c+9−2

 void hwrng_unregister(struct hwrng *rng)
 {
+	int err;
 	mutex_lock(&rng_mutex);
 	list_del(&rng->list);
-	if (current_rng == rng)
+	if (current_rng == rng) {
-		enable_best_rng();
+		err = enable_best_rng();
+		if (err) {
+			drop_current_rng();
+			cur_rng_set_by_user = 0;
+		}
+	}
 	if (list_empty(&rng_list)) {
 		mutex_unlock(&rng_mutex);

drivers/char/random.c+13−16

 /*
  * Static global variables
  */
-static DECLARE_WAIT_QUEUE_HEAD(random_wait);
+static DECLARE_WAIT_QUEUE_HEAD(random_read_wait);
+static DECLARE_WAIT_QUEUE_HEAD(random_write_wait);
 static struct fasync_struct *fasync;
 static DEFINE_SPINLOCK(random_ready_list_lock);
 		/* should we wake readers? */
 		if (entropy_bits >= random_read_wakeup_bits &&
-		    wq_has_sleeper(&random_wait)) {
+		    wq_has_sleeper(&random_read_wait)) {
-			wake_up_interruptible_poll(&random_wait, POLLIN);
+			wake_up_interruptible(&random_read_wait);
 			kill_fasync(&fasync, SIGIO, POLL_IN);
 		}
 		/* If the input pool is getting full, send some
 	trace_debit_entropy(r->name, 8 * ibytes);
 	if (ibytes &&
 	    (r->entropy_count >> ENTROPY_SHIFT) < random_write_wakeup_bits) {
-		wake_up_interruptible_poll(&random_wait, POLLOUT);
+		wake_up_interruptible(&random_write_wait);
 		kill_fasync(&fasync, SIGIO, POLL_OUT);
 	}
 		if (nonblock)
 			return -EAGAIN;
-		wait_event_interruptible(random_wait,
+		wait_event_interruptible(random_read_wait,
 			ENTROPY_BITS(&input_pool) >=
 			random_read_wakeup_bits);
 		if (signal_pending(current))
 	return ret;
 }
-static struct wait_queue_head *
-random_get_poll_head(struct file *file, __poll_t events)
-{
-	return &random_wait;
-}
 static __poll_t
-random_poll_mask(struct file *file, __poll_t events)
+random_poll(struct file *file, poll_table * wait)
 {
-	__poll_t mask = 0;
+	__poll_t mask;
+	poll_wait(file, &random_read_wait, wait);
+	poll_wait(file, &random_write_wait, wait);
+	mask = 0;
 	if (ENTROPY_BITS(&input_pool) >= random_read_wakeup_bits)
 		mask |= EPOLLIN | EPOLLRDNORM;
 	if (ENTROPY_BITS(&input_pool) < random_write_wakeup_bits)
 const struct file_operations random_fops = {
 	.read  = random_read,
 	.write = random_write,
-	.get_poll_head  = random_get_poll_head,
+	.poll  = random_poll,
-	.poll_mask  = random_poll_mask,
 	.unlocked_ioctl = random_ioctl,
 	.fasync = random_fasync,
 	.llseek = noop_llseek,
 	 * We'll be woken up again once below random_write_wakeup_thresh,
 	 * or when the calling thread is about to terminate.
 	 */
-	wait_event_interruptible(random_wait, kthread_should_stop() ||
+	wait_event_interruptible(random_write_wait, kthread_should_stop() ||
 			ENTROPY_BITS(&input_pool) <= random_write_wakeup_bits);
 	mix_pool_bytes(poolp, buffer, count);
 	credit_entropy_bits(poolp, entropy);

drivers/clocksource/timer-stm32.c+3−1

 	to->private_data = kzalloc(sizeof(struct stm32_timer_private),
 				   GFP_KERNEL);
-	if (!to->private_data)
+	if (!to->private_data) {
+		ret = -ENOMEM;
 		goto deinit;
+	}
 	rstc = of_reset_control_get(node, NULL);
 	if (!IS_ERR(rstc)) {

drivers/cpufreq/intel_pstate.c+22−5

@@ -294,6 +294,7 @@ struct pstate_funcs { · 293 unmodified lines
294	static struct pstate_funcs pstate_funcs __read_mostly;	294	static struct pstate_funcs pstate_funcs __read_mostly;
295		295
296	static int hwp_active __read_mostly;	296	static int hwp_active __read_mostly;
		297	static int hwp_mode_bdw __read_mostly;
297	static bool per_cpu_limits __read_mostly;	298	static bool per_cpu_limits __read_mostly;
298	static bool hwp_boost __read_mostly;	299	static bool hwp_boost __read_mostly;
299		300
@@ -1413,7 +1414,15 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu) · 1113 unmodified lines
1413	cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();	1414	cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
1414	cpu->pstate.scaling = pstate_funcs.get_scaling();	1415	cpu->pstate.scaling = pstate_funcs.get_scaling();
1415	cpu->pstate.max_freq = cpu->pstate.max_pstate * cpu->pstate.scaling;	1416	cpu->pstate.max_freq = cpu->pstate.max_pstate * cpu->pstate.scaling;
1416	cpu->pstate.turbo_freq = cpu->pstate.turbo_pstate * cpu->pstate.scaling;	1417
		1418	if (hwp_active && !hwp_mode_bdw) {
		1419	unsigned int phy_max, current_max;
		1420
		1421	intel_pstate_get_hwp_max(cpu->cpu, &phy_max, &current_max);
		1422	cpu->pstate.turbo_freq = phy_max * cpu->pstate.scaling;
		1423	} else {
		1424	cpu->pstate.turbo_freq = cpu->pstate.turbo_pstate * cpu->pstate.scaling;
		1425	}
1417		1426
1418	if (pstate_funcs.get_aperf_mperf_shift)	1427	if (pstate_funcs.get_aperf_mperf_shift)
1419	cpu->aperf_mperf_shift = pstate_funcs.get_aperf_mperf_shift();	1428	cpu->aperf_mperf_shift = pstate_funcs.get_aperf_mperf_shift();
@@ -2467,28 +2476,36 @@ static inline bool intel_pstate_has_acpi_ppc(void) { return false; } · 1047 unmodified lines
2467	static inline void intel_pstate_request_control_from_smm(void) {}	2476	static inline void intel_pstate_request_control_from_smm(void) {}
2468	#endif /* CONFIG_ACPI */	2477	#endif /* CONFIG_ACPI */
2469		2478
		2479	#define INTEL_PSTATE_HWP_BROADWELL 0x01
		2480
		2481	#define ICPU_HWP(model, hwp_mode) \
		2482	{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_HWP, hwp_mode }
		2483
2470	static const struct x86_cpu_id hwp_support_ids[] __initconst = {	2484	static const struct x86_cpu_id hwp_support_ids[] __initconst = {
2471	{ X86_VENDOR_INTEL, 6, X86_MODEL_ANY, X86_FEATURE_HWP },	2485	ICPU_HWP(INTEL_FAM6_BROADWELL_X, INTEL_PSTATE_HWP_BROADWELL),
		2486	ICPU_HWP(INTEL_FAM6_BROADWELL_XEON_D, INTEL_PSTATE_HWP_BROADWELL),
		2487	ICPU_HWP(X86_MODEL_ANY, 0),
2472	{}	2488	{}
2473	};	2489	};
2474		2490
2475	static int __init intel_pstate_init(void)	2491	static int __init intel_pstate_init(void)
2476	{	2492	{
		2493	const struct x86_cpu_id *id;
2477	int rc;	2494	int rc;
2478		2495
2479	if (no_load)	2496	if (no_load)
2480	return -ENODEV;	2497	return -ENODEV;
2481		2498
2482	if (x86_match_cpu(hwp_support_ids)) {	2499	id = x86_match_cpu(hwp_support_ids);
		2500	if (id) {
2483	copy_cpu_funcs(&core_funcs);	2501	copy_cpu_funcs(&core_funcs);
2484	if (!no_hwp) {	2502	if (!no_hwp) {
2485	hwp_active++;	2503	hwp_active++;
		2504	hwp_mode_bdw = id->driver_data;
2486	intel_pstate.attr = hwp_cpufreq_attrs;	2505	intel_pstate.attr = hwp_cpufreq_attrs;
2487	goto hwp_cpu_matched;	2506	goto hwp_cpu_matched;
2488	}	2507	}
2489	} else {	2508	} else {
2490	const struct x86_cpu_id *id;
2491
2492	id = x86_match_cpu(intel_pstate_cpu_ids);	2509	id = x86_match_cpu(intel_pstate_cpu_ids);
2493	if (!id)	2510	if (!id)
2494	return -ENODEV;	2511	return -ENODEV;

drivers/cpufreq/qcom-cpufreq-kryo.c+26−7

 	NUM_OF_MSM8996_VERSIONS,
 };
+struct platform_device *cpufreq_dt_pdev, *kryo_cpufreq_pdev;
 static enum _msm8996_version __init qcom_cpufreq_kryo_get_msm_id(void)
 {
 	size_t len;
 static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)
 {
 	struct opp_table *opp_tables[NR_CPUS] = {0};
-	struct platform_device *cpufreq_dt_pdev;
 	enum _msm8996_version msm8996_version;
 	struct nvmem_cell *speedbin_nvmem;
 	struct device_node *np;
 	int ret;
 	cpu_dev = get_cpu_device(0);
-	if (NULL == cpu_dev)
+	if (!cpu_dev)
-		ret = -ENODEV;
+		return -ENODEV;
 	msm8996_version = qcom_cpufreq_kryo_get_msm_id();
 	if (NUM_OF_MSM8996_VERSIONS == msm8996_version) {
 	}
 	np = dev_pm_opp_of_get_opp_desc_node(cpu_dev);
-	if (IS_ERR(np))
+	if (!np)
-		return PTR_ERR(np);
+		return -ENOENT;
 	ret = of_device_is_compatible(np, "operating-points-v2-kryo-cpu");
 	if (!ret) {
 	speedbin = nvmem_cell_read(speedbin_nvmem, &len);
 	nvmem_cell_put(speedbin_nvmem);
+	if (IS_ERR(speedbin))
+		return PTR_ERR(speedbin);
 	switch (msm8996_version) {
 	case MSM8996_V3:
 		BUG();
 		break;
 	}
+	kfree(speedbin);
 	for_each_possible_cpu(cpu) {
 		cpu_dev = get_cpu_device(cpu);
 	return ret;
 }
+static int qcom_cpufreq_kryo_remove(struct platform_device *pdev)
+{
+	platform_device_unregister(cpufreq_dt_pdev);
+	return 0;
+}
 static struct platform_driver qcom_cpufreq_kryo_driver = {
 	.probe = qcom_cpufreq_kryo_probe,
+	.remove = qcom_cpufreq_kryo_remove,
 	.driver = {
 		.name = "qcom-cpufreq-kryo",
 	},
 	if (unlikely(ret < 0))
 		return ret;
-	ret = PTR_ERR_OR_ZERO(platform_device_register_simple(
+	kryo_cpufreq_pdev = platform_device_register_simple(
-		"qcom-cpufreq-kryo", -1, NULL, 0));
+		"qcom-cpufreq-kryo", -1, NULL, 0);
+	ret = PTR_ERR_OR_ZERO(kryo_cpufreq_pdev);
 	if (0 == ret)
 		return 0;
 }
 module_init(qcom_cpufreq_kryo_init);
+static void __init qcom_cpufreq_kryo_exit(void)
+{
+	platform_device_unregister(kryo_cpufreq_pdev);
+	platform_driver_unregister(&qcom_cpufreq_kryo_driver);
+}
+module_exit(qcom_cpufreq_kryo_exit);
 MODULE_DESCRIPTION("Qualcomm Technologies, Inc. Kryo CPUfreq driver");
 MODULE_LICENSE("GPL v2");

drivers/crypto/chelsio/chtls/chtls_io.c+2−3

 			tp->urg_data = 0;
 		if ((avail + offset) >= skb->len) {
-			if (likely(skb))
-				chtls_free_skb(sk, skb);
-			buffers_freed++;
 			if (ULP_SKB_CB(skb)->flags & ULPCB_FLAG_TLS_HDR) {
 				tp->copied_seq += skb->len;
 				hws->rcvpld = skb->hdr_len;
 			} else {
 				tp->copied_seq += hws->rcvpld;
 			}
+			chtls_free_skb(sk, skb);
+			buffers_freed++;
 			hws->copied_seq = 0;
 			if (copied >= target &&
 			    !skb_peek(&sk->sk_receive_queue))

drivers/dax/super.c+8−0

 {
 	struct dax_device *dax_dev;
 	bool dax_enabled = false;
+	struct request_queue *q;
 	pgoff_t pgoff;
 	int err, id;
 	void *kaddr;
 		return false;
 	}
+	q = bdev_get_queue(bdev);
+	if (!q || !blk_queue_dax(q)) {
+		pr_debug("%s: error: request queue doesn't support dax\n",
+				bdevname(bdev, buf));
+		return false;
+	}
 	err = bdev_dax_pgoff(bdev, 0, PAGE_SIZE, &pgoff);
 	if (err) {
 		pr_debug("%s: error: unaligned partition for dax\n",

drivers/firmware/dmi-id.c+2−0

 DEFINE_DMI_ATTR_WITH_SHOW(product_version,	0444, DMI_PRODUCT_VERSION);
 DEFINE_DMI_ATTR_WITH_SHOW(product_serial,	0400, DMI_PRODUCT_SERIAL);
 DEFINE_DMI_ATTR_WITH_SHOW(product_uuid,		0400, DMI_PRODUCT_UUID);
+DEFINE_DMI_ATTR_WITH_SHOW(product_sku,		0444, DMI_PRODUCT_SKU);
 DEFINE_DMI_ATTR_WITH_SHOW(product_family,	0444, DMI_PRODUCT_FAMILY);
 DEFINE_DMI_ATTR_WITH_SHOW(board_vendor,		0444, DMI_BOARD_VENDOR);
 DEFINE_DMI_ATTR_WITH_SHOW(board_name,		0444, DMI_BOARD_NAME);
 	ADD_DMI_ATTR(product_serial,    DMI_PRODUCT_SERIAL);
 	ADD_DMI_ATTR(product_uuid,      DMI_PRODUCT_UUID);
 	ADD_DMI_ATTR(product_family,    DMI_PRODUCT_FAMILY);
+	ADD_DMI_ATTR(product_sku,       DMI_PRODUCT_SKU);
 	ADD_DMI_ATTR(board_vendor,      DMI_BOARD_VENDOR);
 	ADD_DMI_ATTR(board_name,        DMI_BOARD_NAME);
 	ADD_DMI_ATTR(board_version,     DMI_BOARD_VERSION);

drivers/firmware/dmi_scan.c+1−0

@@ -447,6 +447,7 @@ static void __init dmi_decode(const struct dmi_header dm, void dummy) · 446 unmodified lines
447	dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6);	447	dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6);
448	dmi_save_ident(dm, DMI_PRODUCT_SERIAL, 7);	448	dmi_save_ident(dm, DMI_PRODUCT_SERIAL, 7);
449	dmi_save_uuid(dm, DMI_PRODUCT_UUID, 8);	449	dmi_save_uuid(dm, DMI_PRODUCT_UUID, 8);
		450	dmi_save_ident(dm, DMI_PRODUCT_SKU, 25);
450	dmi_save_ident(dm, DMI_PRODUCT_FAMILY, 26);	451	dmi_save_ident(dm, DMI_PRODUCT_FAMILY, 26);
451	break;	452	break;
452	case 2: /* Base Board Information */	453	case 2: /* Base Board Information */

drivers/firmware/efi/libstub/tpm.c+1−1

@@ -64,7 +64,7 @@ static void efi_retrieve_tpm2_eventlog_1_2(efi_system_table_t *sys_table_arg) · 63 unmodified lines
64	efi_guid_t tcg2_guid = EFI_TCG2_PROTOCOL_GUID;	64	efi_guid_t tcg2_guid = EFI_TCG2_PROTOCOL_GUID;
65	efi_guid_t linux_eventlog_guid = LINUX_EFI_TPM_EVENT_LOG_GUID;	65	efi_guid_t linux_eventlog_guid = LINUX_EFI_TPM_EVENT_LOG_GUID;
66	efi_status_t status;	66	efi_status_t status;
67	efi_physical_addr_t log_location, log_last_entry;	67	efi_physical_addr_t log_location = 0, log_last_entry = 0;
68	struct linux_efi_tpm_eventlog *log_tbl = NULL;	68	struct linux_efi_tpm_eventlog *log_tbl = NULL;
69	unsigned long first_entry_addr, last_entry_addr;	69	unsigned long first_entry_addr, last_entry_addr;
70	size_t log_size, last_entry_size;	70	size_t log_size, last_entry_size;

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c+9−1

 	switch (asic_type) {
 #if defined(CONFIG_DRM_AMD_DC)
 	case CHIP_BONAIRE:
-	case CHIP_HAWAII:
 	case CHIP_KAVERI:
 	case CHIP_KABINI:
 	case CHIP_MULLINS:
+		/*
+		 * We have systems in the wild with these ASICs that require
+		 * LVDS and VGA support which is not supported with DC.
+		 *
+		 * Fallback to the non-DC driver here by default so as not to
+		 * cause regressions.
+		 */
+		return amdgpu_dc > 0;
+	case CHIP_HAWAII:
 	case CHIP_CARRIZO:
 	case CHIP_STONEY:
 	case CHIP_POLARIS10:

drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c+1−1

@@ -376,7 +376,7 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring, · 375 unmodified lines
376	struct amdgpu_device *adev = ring->adev;	376	struct amdgpu_device *adev = ring->adev;
377	uint64_t index;	377	uint64_t index;
378		378
379	if (ring != &adev->uvd.inst[ring->me].ring) {	379	if (ring->funcs->type != AMDGPU_RING_TYPE_UVD) {
380	ring->fence_drv.cpu_addr = &adev->wb.wb[ring->fence_offs];	380	ring->fence_drv.cpu_addr = &adev->wb.wb[ring->fence_offs];
381	ring->fence_drv.gpu_addr = adev->wb.gpu_addr + (ring->fence_offs * 4);	381	ring->fence_drv.gpu_addr = adev->wb.gpu_addr + (ring->fence_offs * 4);
382	} else {	382	} else {

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c+10−14

 	domain = amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type);
 	if (domain == AMDGPU_GEM_DOMAIN_VRAM) {
 		adev->vram_pin_size += amdgpu_bo_size(bo);
-		if (bo->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)
+		adev->invisible_pin_size += amdgpu_vram_mgr_bo_invisible_size(bo);
-			adev->invisible_pin_size += amdgpu_bo_size(bo);
 	} else if (domain == AMDGPU_GEM_DOMAIN_GTT) {
 		adev->gart_pin_size += amdgpu_bo_size(bo);
 	}
 	bo->pin_count--;
 	if (bo->pin_count)
 		return 0;
-	for (i = 0; i < bo->placement.num_placement; i++) {
-		bo->placements[i].lpfn = 0;
-		bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT;
-	}
-	r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
-	if (unlikely(r)) {
-		dev_err(adev->dev, "%p validate failed for unpin\n", bo);
-		goto error;
-	}
 	if (bo->tbo.mem.mem_type == TTM_PL_VRAM) {
 		adev->vram_pin_size -= amdgpu_bo_size(bo);
-		if (bo->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)
+		adev->invisible_pin_size -= amdgpu_vram_mgr_bo_invisible_size(bo);
-			adev->invisible_pin_size -= amdgpu_bo_size(bo);
 	} else if (bo->tbo.mem.mem_type == TTM_PL_TT) {
 		adev->gart_pin_size -= amdgpu_bo_size(bo);
 	}
-error:
+	for (i = 0; i < bo->placement.num_placement; i++) {
+		bo->placements[i].lpfn = 0;
+		bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT;
+	}
+	r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
+	if (unlikely(r))
+		dev_err(adev->dev, "%p validate failed for unpin\n", bo);
 	return r;
 }

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h+1−0

@@ -73,6 +73,7 @@ bool amdgpu_gtt_mgr_has_gart_addr(struct ttm_mem_reg *mem); · 72 unmodified lines
73	uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man);	73	uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man);
74	int amdgpu_gtt_mgr_recover(struct ttm_mem_type_manager *man);	74	int amdgpu_gtt_mgr_recover(struct ttm_mem_type_manager *man);
75		75
		76	u64 amdgpu_vram_mgr_bo_invisible_size(struct amdgpu_bo *bo);
76	uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man);	77	uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man);
77	uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_mem_type_manager *man);	78	uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_mem_type_manager *man);
78		79

drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c+7−7

 	unsigned family_id;
 	int i, j, r;
-	INIT_DELAYED_WORK(&adev->uvd.inst->idle_work, amdgpu_uvd_idle_work_handler);
+	INIT_DELAYED_WORK(&adev->uvd.idle_work, amdgpu_uvd_idle_work_handler);
 	switch (adev->asic_type) {
 #ifdef CONFIG_DRM_AMDGPU_CIK
 	void *ptr;
 	int i, j;
+	cancel_delayed_work_sync(&adev->uvd.idle_work);
 	for (j = 0; j < adev->uvd.num_uvd_inst; ++j) {
 		if (adev->uvd.inst[j].vcpu_bo == NULL)
 			continue;
-		cancel_delayed_work_sync(&adev->uvd.inst[j].idle_work);
 		/* only valid for physical mode */
 		if (adev->asic_type < CHIP_POLARIS10) {
 			for (i = 0; i < adev->uvd.max_handles; ++i)
 static void amdgpu_uvd_idle_work_handler(struct work_struct *work)
 {
 	struct amdgpu_device *adev =
-		container_of(work, struct amdgpu_device, uvd.inst->idle_work.work);
+		container_of(work, struct amdgpu_device, uvd.idle_work.work);
 	unsigned fences = 0, i, j;
 	for (i = 0; i < adev->uvd.num_uvd_inst; ++i) {
 							       AMD_CG_STATE_GATE);
 		}
 	} else {
-		schedule_delayed_work(&adev->uvd.inst->idle_work, UVD_IDLE_TIMEOUT);
+		schedule_delayed_work(&adev->uvd.idle_work, UVD_IDLE_TIMEOUT);
 	}
 }
 	if (amdgpu_sriov_vf(adev))
 		return;
-	set_clocks = !cancel_delayed_work_sync(&adev->uvd.inst->idle_work);
+	set_clocks = !cancel_delayed_work_sync(&adev->uvd.idle_work);
 	if (set_clocks) {
 		if (adev->pm.dpm_enabled) {
 			amdgpu_dpm_enable_uvd(adev, true);
 void amdgpu_uvd_ring_end_use(struct amdgpu_ring *ring)
 {
 	if (!amdgpu_sriov_vf(ring->adev))
-		schedule_delayed_work(&ring->adev->uvd.inst->idle_work, UVD_IDLE_TIMEOUT);
+		schedule_delayed_work(&ring->adev->uvd.idle_work, UVD_IDLE_TIMEOUT);
 }
 /**

drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h+1−1

 	void			*saved_bo;
 	atomic_t		handles[AMDGPU_MAX_UVD_HANDLES];
 	struct drm_file		*filp[AMDGPU_MAX_UVD_HANDLES];
-	struct delayed_work	idle_work;
 	struct amdgpu_ring	ring;
 	struct amdgpu_ring	ring_enc[AMDGPU_MAX_UVD_ENC_RINGS];
 	struct amdgpu_irq_src	irq;
 	bool			address_64_bit;
 	bool			use_ctx_buf;
 	struct amdgpu_uvd_inst		inst[AMDGPU_MAX_UVD_INSTANCES];
+	struct delayed_work	idle_work;
 };
 int amdgpu_uvd_sw_init(struct amdgpu_device *adev);

drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c+27−6

@@ -52,7 +52,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) · 51 unmodified lines
52	unsigned long bo_size;	52	unsigned long bo_size;
53	const char *fw_name;	53	const char *fw_name;
54	const struct common_firmware_header *hdr;	54	const struct common_firmware_header *hdr;
55	unsigned version_major, version_minor, family_id;	55	unsigned char fw_check;
56	int r;	56	int r;
57		57
58	INIT_DELAYED_WORK(&adev->vcn.idle_work, amdgpu_vcn_idle_work_handler);	58	INIT_DELAYED_WORK(&adev->vcn.idle_work, amdgpu_vcn_idle_work_handler);
@@ -83,12 +83,33 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) · 24 unmodified lines
83		83
84	hdr = (const struct common_firmware_header *)adev->vcn.fw->data;	84	hdr = (const struct common_firmware_header *)adev->vcn.fw->data;
85	adev->vcn.fw_version = le32_to_cpu(hdr->ucode_version);	85	adev->vcn.fw_version = le32_to_cpu(hdr->ucode_version);
86	family_id = le32_to_cpu(hdr->ucode_version) & 0xff;
87	version_major = (le32_to_cpu(hdr->ucode_version) >> 24) & 0xff;
88	version_minor = (le32_to_cpu(hdr->ucode_version) >> 8) & 0xff;
89	DRM_INFO("Found VCN firmware Version: %hu.%hu Family ID: %hu\n",
90	version_major, version_minor, family_id);
91		86
		87	/* Bit 20-23, it is encode major and non-zero for new naming convention.
		88	* This field is part of version minor and DRM_DISABLED_FLAG in old naming
		89	* convention. Since the l:wq!atest version minor is 0x5B and DRM_DISABLED_FLAG
		90	* is zero in old naming convention, this field is always zero so far.
		91	* These four bits are used to tell which naming convention is present.
		92	*/
		93	fw_check = (le32_to_cpu(hdr->ucode_version) >> 20) & 0xf;
		94	if (fw_check) {
		95	unsigned int dec_ver, enc_major, enc_minor, vep, fw_rev;
		96
		97	fw_rev = le32_to_cpu(hdr->ucode_version) & 0xfff;
		98	enc_minor = (le32_to_cpu(hdr->ucode_version) >> 12) & 0xff;
		99	enc_major = fw_check;
		100	dec_ver = (le32_to_cpu(hdr->ucode_version) >> 24) & 0xf;
		101	vep = (le32_to_cpu(hdr->ucode_version) >> 28) & 0xf;
		102	DRM_INFO("Found VCN firmware Version ENC: %hu.%hu DEC: %hu VEP: %hu Revision: %hu\n",
		103	enc_major, enc_minor, dec_ver, vep, fw_rev);
		104	} else {
		105	unsigned int version_major, version_minor, family_id;
		106
		107	family_id = le32_to_cpu(hdr->ucode_version) & 0xff;
		108	version_major = (le32_to_cpu(hdr->ucode_version) >> 24) & 0xff;
		109	version_minor = (le32_to_cpu(hdr->ucode_version) >> 8) & 0xff;
		110	DRM_INFO("Found VCN firmware Version: %hu.%hu Family ID: %hu\n",
		111	version_major, version_minor, family_id);
		112	}
92		113
93	bo_size = AMDGPU_GPU_PAGE_ALIGN(le32_to_cpu(hdr->ucode_size_bytes) + 8)	114	bo_size = AMDGPU_GPU_PAGE_ALIGN(le32_to_cpu(hdr->ucode_size_bytes) + 8)
94	+ AMDGPU_VCN_STACK_SIZE + AMDGPU_VCN_HEAP_SIZE	115	+ AMDGPU_VCN_STACK_SIZE + AMDGPU_VCN_HEAP_SIZE

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c+5−3

 			uint64_t count;
 			max_entries = min(max_entries, 16ull * 1024ull);
-			for (count = 1; count < max_entries; ++count) {
+			for (count = 1;
+			     count < max_entries / (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE);
+			     ++count) {
 				uint64_t idx = pfn + count;
 				if (pages_addr[idx] !=
 				dma_addr = pages_addr;
 			} else {
 				addr = pages_addr[pfn];
-				max_entries = count;
+				max_entries = count * (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE);
 			}
 		} else if (flags & AMDGPU_PTE_VALID) {
 		if (r)
 			return r;
-		pfn += last - start + 1;
+		pfn += (last - start + 1) / (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE);
 		if (nodes && nodes->size == pfn) {
 			pfn = 0;
 			++nodes;

drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c+36−3

@@ -96,6 +96,38 @@ static u64 amdgpu_vram_mgr_vis_size(struct amdgpu_device *adev, · 95 unmodified lines
96	adev->gmc.visible_vram_size : end) - start;	96	adev->gmc.visible_vram_size : end) - start;
97	}	97	}
98		98
		99	/**
		100	* amdgpu_vram_mgr_bo_invisible_size - CPU invisible BO size
		101	*
		102	* @bo: &amdgpu_bo buffer object (must be in VRAM)
		103	*
		104	* Returns:
		105	* How much of the given &amdgpu_bo buffer object lies in CPU invisible VRAM.
		106	*/
		107	u64 amdgpu_vram_mgr_bo_invisible_size(struct amdgpu_bo *bo)
		108	{
		109	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
		110	struct ttm_mem_reg *mem = &bo->tbo.mem;
		111	struct drm_mm_node *nodes = mem->mm_node;
		112	unsigned pages = mem->num_pages;
		113	u64 usage = 0;
		114
		115	if (adev->gmc.visible_vram_size == adev->gmc.real_vram_size)
		116	return 0;
		117
		118	if (mem->start >= adev->gmc.visible_vram_size >> PAGE_SHIFT)
		119	return amdgpu_bo_size(bo);
		120
		121	while (nodes && pages) {
		122	usage += nodes->size << PAGE_SHIFT;
		123	usage -= amdgpu_vram_mgr_vis_size(adev, nodes);
		124	pages -= nodes->size;
		125	++nodes;
		126	}
		127
		128	return usage;
		129	}
		130
99	/**	131	/**
100	* amdgpu_vram_mgr_new - allocate new ranges	132	* amdgpu_vram_mgr_new - allocate new ranges
101	*	133	*
@@ -135,7 +167,8 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man, · 33 unmodified lines
135	num_nodes = DIV_ROUND_UP(mem->num_pages, pages_per_node);	167	num_nodes = DIV_ROUND_UP(mem->num_pages, pages_per_node);
136	}	168	}
137		169
138	nodes = kcalloc(num_nodes, sizeof(*nodes), GFP_KERNEL);	170	nodes = kvmalloc_array(num_nodes, sizeof(*nodes),
		171	GFP_KERNEL \| __GFP_ZERO);
139	if (!nodes)	172	if (!nodes)
140	return -ENOMEM;	173	return -ENOMEM;
141		174
@@ -190,7 +223,7 @@ error: · 48 unmodified lines
190	drm_mm_remove_node(&nodes[i]);	223	drm_mm_remove_node(&nodes[i]);
191	spin_unlock(&mgr->lock);	224	spin_unlock(&mgr->lock);
192		225
193	kfree(nodes);	226	kvfree(nodes);
194	return r == -ENOSPC ? 0 : r;	227	return r == -ENOSPC ? 0 : r;
195	}	228	}
196		229
@@ -229,7 +262,7 @@ static void amdgpu_vram_mgr_del(struct ttm_mem_type_manager *man, · 32 unmodified lines
229	atomic64_sub(usage, &mgr->usage);	262	atomic64_sub(usage, &mgr->usage);
230	atomic64_sub(vis_usage, &mgr->vis_usage);	263	atomic64_sub(vis_usage, &mgr->vis_usage);
231		264
232	kfree(mem->mm_node);	265	kvfree(mem->mm_node);
233	mem->mm_node = NULL;	266	mem->mm_node = NULL;
234	}	267	}
235		268

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c+8−8

 	if (acrtc->base.state->event)
 		prepare_flip_isr(acrtc);
+	spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
 	surface_updates->surface = dc_stream_get_status(acrtc_state->stream)->plane_states[0];
 	surface_updates->flip_addr = &addr;
 	dc_commit_updates_for_stream(adev->dm.dc,
 					     surface_updates,
 					     1,
 			 __func__,
 			 addr.address.grph.addr.high_part,
 			 addr.address.grph.addr.low_part);
-	spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
 }
 /*
 	struct drm_connector *connector;
 	struct drm_connector_state *old_con_state, *new_con_state;
 	struct dm_crtc_state *dm_old_crtc_state, *dm_new_crtc_state;
+	int crtc_disable_count = 0;
 	drm_atomic_helper_update_legacy_modeset_state(dev, state);
 		struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc);
 		bool modeset_needed;
+		if (old_crtc_state->active && !new_crtc_state->active)
+			crtc_disable_count++;
 		dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);
 		dm_old_crtc_state = to_dm_crtc_state(old_crtc_state);
 		modeset_needed = modeset_required(
 	 * so we can put the GPU into runtime suspend if we're not driving any
 	 * displays anymore
 	 */
+	for (i = 0; i < crtc_disable_count; i++)
+		pm_runtime_put_autosuspend(dev->dev);
 	pm_runtime_mark_last_busy(dev->dev);
-	for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
-		if (old_crtc_state->active && !new_crtc_state->active)
-			pm_runtime_put_autosuspend(dev->dev);
-	}
 }

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c+1−1

@@ -1090,7 +1090,7 @@ static int vega10_disable_se_edc_config(struct pp_hwmgr *hwmgr) · 1089 unmodified lines
1090	static int vega10_enable_psm_gc_edc_config(struct pp_hwmgr *hwmgr)	1090	static int vega10_enable_psm_gc_edc_config(struct pp_hwmgr *hwmgr)
1091	{	1091	{
1092	struct amdgpu_device *adev = hwmgr->adev;	1092	struct amdgpu_device *adev = hwmgr->adev;
1093	int result;	1093	int result = 0;
1094	uint32_t num_se = 0;	1094	uint32_t num_se = 0;
1095	uint32_t count, data;	1095	uint32_t count, data;
1096		1096

drivers/gpu/drm/arm/malidp_drv.c+2−1

 static void malidp_fini(struct drm_device *drm)
 {
-	drm_atomic_helper_shutdown(drm);
 	drm_mode_config_cleanup(drm);
 }
 	malidp_de_irq_fini(drm);
 	drm->irq_enabled = false;
 irq_init_fail:
+	drm_atomic_helper_shutdown(drm);
 	component_unbind_all(dev, drm);
 bind_fail:
 	of_node_put(malidp->crtc.port);
 	malidp_se_irq_fini(drm);
 	malidp_de_irq_fini(drm);
 	drm->irq_enabled = false;
+	drm_atomic_helper_shutdown(drm);
 	component_unbind_all(dev, drm);
 	of_node_put(malidp->crtc.port);
 	malidp->crtc.port = NULL;

drivers/gpu/drm/arm/malidp_hw.c+2−1

 				.vsync_irq = MALIDP500_DE_IRQ_VSYNC,
 			},
 			.se_irq_map = {
-				.irq_mask = MALIDP500_SE_IRQ_CONF_MODE,
+				.irq_mask = MALIDP500_SE_IRQ_CONF_MODE |
+					    MALIDP500_SE_IRQ_GLOBAL,
 				.vsync_irq = 0,
 			},
 			.dc_irq_map = {

drivers/gpu/drm/arm/malidp_planes.c+6−3

 /* Layer specific register offsets */
 #define MALIDP_LAYER_FORMAT		0x000
+#define   LAYER_FORMAT_MASK		0x3f
 #define MALIDP_LAYER_CONTROL		0x004
 #define   LAYER_ENABLE			(1 << 0)
 #define   LAYER_FLOWCFG_MASK		7
 	if (state->rotation & MALIDP_ROTATED_MASK) {
 		int val;
-		val = mp->hwdev->hw->rotmem_required(mp->hwdev, state->crtc_h,
+		val = mp->hwdev->hw->rotmem_required(mp->hwdev, state->crtc_w,
-						     state->crtc_w,
+						     state->crtc_h,
 						     fb->format->format);
 		if (val < 0)
 			return val;
 	dest_w = plane->state->crtc_w;
 	dest_h = plane->state->crtc_h;
-	malidp_hw_write(mp->hwdev, ms->format, mp->layer->base);
+	val = malidp_hw_read(mp->hwdev, mp->layer->base);
+	val = (val & ~LAYER_FORMAT_MASK) | ms->format;
+	malidp_hw_write(mp->hwdev, val, mp->layer->base);
 	for (i = 0; i < ms->n_planes; i++) {
 		/* calculate the offset for the layer's plane registers */

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c+1−1

@@ -830,7 +830,7 @@ static int atmel_hlcdc_plane_init_properties(struct atmel_hlcdc_plane *plane) · 829 unmodified lines
830	return ret;	830	return ret;
831	}	831	}
832		832
833	if (desc->layout.xstride && desc->layout.pstride) {	833	if (desc->layout.xstride[0] && desc->layout.pstride[0]) {
834	int ret;	834	int ret;
835		835
836	ret = drm_plane_create_rotation_property(&plane->base,	836	ret = drm_plane_create_rotation_property(&plane->base,

drivers/gpu/drm/bridge/sil-sii8620.c+117−192

@@ -36,8 +36,11 @@ · 35 unmodified lines
36		36
37	#define SII8620_BURST_BUF_LEN 288	37	#define SII8620_BURST_BUF_LEN 288
38	#define VAL_RX_HDMI_CTRL2_DEFVAL VAL_RX_HDMI_CTRL2_IDLE_CNT(3)	38	#define VAL_RX_HDMI_CTRL2_DEFVAL VAL_RX_HDMI_CTRL2_IDLE_CNT(3)
39	#define MHL1_MAX_LCLK 225000	39
40	#define MHL3_MAX_LCLK 600000	40	#define MHL1_MAX_PCLK 75000
		41	#define MHL1_MAX_PCLK_PP_MODE 150000
		42	#define MHL3_MAX_PCLK 200000
		43	#define MHL3_MAX_PCLK_PP_MODE 300000
41		44
42	enum sii8620_mode {	45	enum sii8620_mode {
43	CM_DISCONNECTED,	46	CM_DISCONNECTED,
@@ -80,6 +83,9 @@ struct sii8620 { · 36 unmodified lines
80	u8 devcap[MHL_DCAP_SIZE];	83	u8 devcap[MHL_DCAP_SIZE];
81	u8 xdevcap[MHL_XDC_SIZE];	84	u8 xdevcap[MHL_XDC_SIZE];
82	u8 avif[HDMI_INFOFRAME_SIZE(AVI)];	85	u8 avif[HDMI_INFOFRAME_SIZE(AVI)];
		86	bool feature_complete;
		87	bool devcap_read;
		88	bool sink_detected;
83	struct edid *edid;	89	struct edid *edid;
84	unsigned int gen2_write_burst:1;	90	unsigned int gen2_write_burst:1;
85	enum sii8620_mt_state mt_state;	91	enum sii8620_mt_state mt_state;
@@ -476,7 +482,7 @@ static void sii8620_update_array(u8 dst, u8 src, int count) · 390 unmodified lines
476	}	482	}
477	}	483	}
478		484
479	static void sii8620_sink_detected(struct sii8620 *ctx, int ret)	485	static void sii8620_identify_sink(struct sii8620 *ctx)
480	{	486	{
481	static const char * const sink_str[] = {	487	static const char * const sink_str[] = {
482	[SINK_NONE] = "NONE",	488	[SINK_NONE] = "NONE",
@@ -487,7 +493,7 @@ static void sii8620_sink_detected(struct sii8620 *ctx, int ret) · 4 unmodified lines
487	char sink_name[20];	493	char sink_name[20];
488	struct device *dev = ctx->dev;	494	struct device *dev = ctx->dev;
489		495
490	if (ret < 0)	496	if (!ctx->sink_detected \|\| !ctx->devcap_read)
491	return;	497	return;
492		498
493	sii8620_fetch_edid(ctx);	499	sii8620_fetch_edid(ctx);
@@ -496,6 +502,7 @@ static void sii8620_sink_detected(struct sii8620 *ctx, int ret) · 2 unmodified lines
496	sii8620_mhl_disconnected(ctx);	502	sii8620_mhl_disconnected(ctx);
497	return;	503	return;
498	}	504	}
		505	sii8620_set_upstream_edid(ctx);
499		506
500	if (drm_detect_hdmi_monitor(ctx->edid))	507	if (drm_detect_hdmi_monitor(ctx->edid))
501	ctx->sink_type = SINK_HDMI;	508	ctx->sink_type = SINK_HDMI;
@@ -508,53 +515,6 @@ static void sii8620_sink_detected(struct sii8620 *ctx, int ret) · 6 unmodified lines
508	sink_str[ctx->sink_type], sink_name);	515	sink_str[ctx->sink_type], sink_name);
509	}	516	}
510		517
511	static void sii8620_hsic_init(struct sii8620 *ctx)
512	{
513	if (!sii8620_is_mhl3(ctx))
514	return;
515
516	sii8620_write(ctx, REG_FCGC,
517	BIT_FCGC_HSIC_HOSTMODE \| BIT_FCGC_HSIC_ENABLE);
518	sii8620_setbits(ctx, REG_HRXCTRL3,
519	BIT_HRXCTRL3_HRX_STAY_RESET \| BIT_HRXCTRL3_STATUS_EN, ~0);
520	sii8620_setbits(ctx, REG_TTXNUMB, MSK_TTXNUMB_TTX_NUMBPS, 4);
521	sii8620_setbits(ctx, REG_TRXCTRL, BIT_TRXCTRL_TRX_FROM_SE_COC, ~0);
522	sii8620_setbits(ctx, REG_HTXCTRL, BIT_HTXCTRL_HTX_DRVCONN1, 0);
523	sii8620_setbits(ctx, REG_KEEPER, MSK_KEEPER_MODE, VAL_KEEPER_MODE_HOST);
524	sii8620_write_seq_static(ctx,
525	REG_TDMLLCTL, 0,
526	REG_UTSRST, BIT_UTSRST_HRX_SRST \| BIT_UTSRST_HTX_SRST \|
527	BIT_UTSRST_KEEPER_SRST \| BIT_UTSRST_FC_SRST,
528	REG_UTSRST, BIT_UTSRST_HRX_SRST \| BIT_UTSRST_HTX_SRST,
529	REG_HRXINTL, 0xff,
530	REG_HRXINTH, 0xff,
531	REG_TTXINTL, 0xff,
532	REG_TTXINTH, 0xff,
533	REG_TRXINTL, 0xff,
534	REG_TRXINTH, 0xff,
535	REG_HTXINTL, 0xff,
536	REG_HTXINTH, 0xff,
537	REG_FCINTR0, 0xff,
538	REG_FCINTR1, 0xff,
539	REG_FCINTR2, 0xff,
540	REG_FCINTR3, 0xff,
541	REG_FCINTR4, 0xff,
542	REG_FCINTR5, 0xff,
543	REG_FCINTR6, 0xff,
544	REG_FCINTR7, 0xff
545	);
546	}
547
548	static void sii8620_edid_read(struct sii8620 *ctx, int ret)
549	{
550	if (ret < 0)
551	return;
552
553	sii8620_set_upstream_edid(ctx);
554	sii8620_hsic_init(ctx);
555	sii8620_enable_hpd(ctx);
556	}
557
558	static void sii8620_mr_devcap(struct sii8620 *ctx)	518	static void sii8620_mr_devcap(struct sii8620 *ctx)
559	{	519	{
560	u8 dcap[MHL_DCAP_SIZE];	520	u8 dcap[MHL_DCAP_SIZE];
@@ -570,6 +530,8 @@ static void sii8620_mr_devcap(struct sii8620 *ctx) · 9 unmodified lines
570	dcap[MHL_DCAP_ADOPTER_ID_H], dcap[MHL_DCAP_ADOPTER_ID_L],	530	dcap[MHL_DCAP_ADOPTER_ID_H], dcap[MHL_DCAP_ADOPTER_ID_L],
571	dcap[MHL_DCAP_DEVICE_ID_H], dcap[MHL_DCAP_DEVICE_ID_L]);	531	dcap[MHL_DCAP_DEVICE_ID_H], dcap[MHL_DCAP_DEVICE_ID_L]);
572	sii8620_update_array(ctx->devcap, dcap, MHL_DCAP_SIZE);	532	sii8620_update_array(ctx->devcap, dcap, MHL_DCAP_SIZE);
		533	ctx->devcap_read = true;
		534	sii8620_identify_sink(ctx);
573	}	535	}
574		536
575	static void sii8620_mr_xdevcap(struct sii8620 *ctx)	537	static void sii8620_mr_xdevcap(struct sii8620 *ctx)
@@ -807,6 +769,7 @@ static void sii8620_burst_rx_all(struct sii8620 *ctx) · 231 unmodified lines
807	static void sii8620_fetch_edid(struct sii8620 *ctx)	769	static void sii8620_fetch_edid(struct sii8620 *ctx)
808	{	770	{
809	u8 lm_ddc, ddc_cmd, int3, cbus;	771	u8 lm_ddc, ddc_cmd, int3, cbus;
		772	unsigned long timeout;
810	int fetched, i;	773	int fetched, i;
811	int edid_len = EDID_LENGTH;	774	int edid_len = EDID_LENGTH;
812	u8 *edid;	775	u8 *edid;
@@ -856,23 +819,31 @@ static void sii8620_fetch_edid(struct sii8620 *ctx) · 43 unmodified lines
856	REG_DDC_CMD, ddc_cmd \| VAL_DDC_CMD_ENH_DDC_READ_NO_ACK	819	REG_DDC_CMD, ddc_cmd \| VAL_DDC_CMD_ENH_DDC_READ_NO_ACK
857	);	820	);
858		821
859	do {	822	int3 = 0;
860	int3 = sii8620_readb(ctx, REG_INTR3);	823	timeout = jiffies + msecs_to_jiffies(200);
		824	for (;;) {
861	cbus = sii8620_readb(ctx, REG_CBUS_STATUS);	825	cbus = sii8620_readb(ctx, REG_CBUS_STATUS);
862		826	if (~cbus & BIT_CBUS_STATUS_CBUS_CONNECTED) {
863	if (int3 & BIT_DDC_CMD_DONE)	827	kfree(edid);
864	break;	828	edid = NULL;
865		829	goto end;
866	if (!(cbus & BIT_CBUS_STATUS_CBUS_CONNECTED)) {	830	}
		831	if (int3 & BIT_DDC_CMD_DONE) {
		832	if (sii8620_readb(ctx, REG_DDC_DOUT_CNT)
		833	>= FETCH_SIZE)
		834	break;
		835	} else {
		836	int3 = sii8620_readb(ctx, REG_INTR3);
		837	}
		838	if (time_is_before_jiffies(timeout)) {
		839	ctx->error = -ETIMEDOUT;
		840	dev_err(ctx->dev, "timeout during EDID read\n");
867	kfree(edid);	841	kfree(edid);
868	edid = NULL;	842	edid = NULL;
869	goto end;	843	goto end;
870	}	844	}
871	} while (1);
872
873	sii8620_readb(ctx, REG_DDC_STATUS);
874	while (sii8620_readb(ctx, REG_DDC_DOUT_CNT) < FETCH_SIZE)
875	usleep_range(10, 20);	845	usleep_range(10, 20);
		846	}
876		847
877	sii8620_read_buf(ctx, REG_DDC_DATA, edid + fetched, FETCH_SIZE);	848	sii8620_read_buf(ctx, REG_DDC_DATA, edid + fetched, FETCH_SIZE);
878	if (fetched + FETCH_SIZE == EDID_LENGTH) {	849	if (fetched + FETCH_SIZE == EDID_LENGTH) {
@@ -971,8 +942,17 @@ static int sii8620_hw_on(struct sii8620 *ctx) · 92 unmodified lines
971	ret = regulator_bulk_enable(ARRAY_SIZE(ctx->supplies), ctx->supplies);	942	ret = regulator_bulk_enable(ARRAY_SIZE(ctx->supplies), ctx->supplies);
972	if (ret)	943	if (ret)
973	return ret;	944	return ret;
		945
974	usleep_range(10000, 20000);	946	usleep_range(10000, 20000);
975	return clk_prepare_enable(ctx->clk_xtal);	947	ret = clk_prepare_enable(ctx->clk_xtal);
		948	if (ret)
		949	return ret;
		950
		951	msleep(100);
		952	gpiod_set_value(ctx->gpio_reset, 0);
		953	msleep(100);
		954
		955	return 0;
976	}	956	}
977		957
978	static int sii8620_hw_off(struct sii8620 *ctx)	958	static int sii8620_hw_off(struct sii8620 *ctx)
@@ -982,17 +962,6 @@ static int sii8620_hw_off(struct sii8620 *ctx) · 3 unmodified lines
982	return regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies);	962	return regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies);
983	}	963	}
984		964
985	static void sii8620_hw_reset(struct sii8620 *ctx)
986	{
987	usleep_range(10000, 20000);
988	gpiod_set_value(ctx->gpio_reset, 0);
989	usleep_range(5000, 20000);
990	gpiod_set_value(ctx->gpio_reset, 1);
991	usleep_range(10000, 20000);
992	gpiod_set_value(ctx->gpio_reset, 0);
993	msleep(300);
994	}
995
996	static void sii8620_cbus_reset(struct sii8620 *ctx)	965	static void sii8620_cbus_reset(struct sii8620 *ctx)
997	{	966	{
998	sii8620_write(ctx, REG_PWD_SRST, BIT_PWD_SRST_CBUS_RST	967	sii8620_write(ctx, REG_PWD_SRST, BIT_PWD_SRST_CBUS_RST
@@ -1048,20 +1017,11 @@ static void sii8620_stop_video(struct sii8620 *ctx) · 49 unmodified lines
1048		1017
1049	static void sii8620_set_format(struct sii8620 *ctx)	1018	static void sii8620_set_format(struct sii8620 *ctx)
1050	{	1019	{
1051	u8 out_fmt;
1052
1053	if (sii8620_is_mhl3(ctx)) {	1020	if (sii8620_is_mhl3(ctx)) {
1054	sii8620_setbits(ctx, REG_M3_P0CTRL,	1021	sii8620_setbits(ctx, REG_M3_P0CTRL,
1055	BIT_M3_P0CTRL_MHL3_P0_PIXEL_MODE_PACKED,	1022	BIT_M3_P0CTRL_MHL3_P0_PIXEL_MODE_PACKED,
1056	ctx->use_packed_pixel ? ~0 : 0);	1023	ctx->use_packed_pixel ? ~0 : 0);
1057	} else {	1024	} else {
1058	if (ctx->use_packed_pixel)
1059	sii8620_write_seq_static(ctx,
1060	REG_VID_MODE, BIT_VID_MODE_M1080P,
1061	REG_MHL_TOP_CTL, BIT_MHL_TOP_CTL_MHL_PP_SEL \| 1,
1062	REG_MHLTX_CTL6, 0x60
1063	);
1064	else
1065	sii8620_write_seq_static(ctx,	1025	sii8620_write_seq_static(ctx,
1066	REG_VID_MODE, 0,	1026	REG_VID_MODE, 0,
1067	REG_MHL_TOP_CTL, 1,	1027	REG_MHL_TOP_CTL, 1,
@@ -1069,15 +1029,9 @@ static void sii8620_set_format(struct sii8620 *ctx) · 1 unmodified line
1069	);	1029	);
1070	}	1030	}
1071		1031
1072	if (ctx->use_packed_pixel)
1073	out_fmt = VAL_TPI_FORMAT(YCBCR422, FULL) \|
1074	BIT_TPI_OUTPUT_CSCMODE709;
1075	else
1076	out_fmt = VAL_TPI_FORMAT(RGB, FULL);
1077
1078	sii8620_write_seq(ctx,	1032	sii8620_write_seq(ctx,
1079	REG_TPI_INPUT, VAL_TPI_FORMAT(RGB, FULL),	1033	REG_TPI_INPUT, VAL_TPI_FORMAT(RGB, FULL),
1080	REG_TPI_OUTPUT, out_fmt,	1034	REG_TPI_OUTPUT, VAL_TPI_FORMAT(RGB, FULL),
1081	);	1035	);
1082	}	1036	}
1083		1037
@@ -1216,7 +1170,7 @@ static void sii8620_start_video(struct sii8620 *ctx) · 132 unmodified lines
1216	int clk = ctx->pixel_clock * (ctx->use_packed_pixel ? 2 : 3);	1170	int clk = ctx->pixel_clock * (ctx->use_packed_pixel ? 2 : 3);
1217	int i;	1171	int i;
1218		1172
1219	for (i = 0; i < ARRAY_SIZE(clk_spec); ++i)	1173	for (i = 0; i < ARRAY_SIZE(clk_spec) - 1; ++i)
1220	if (clk < clk_spec[i].max_clk)	1174	if (clk < clk_spec[i].max_clk)
1221	break;	1175	break;
1222		1176
@@ -1534,6 +1488,16 @@ static void sii8620_set_mode(struct sii8620 *ctx, enum sii8620_mode mode) · 311 unmodified lines
1534	);	1488	);
1535	}	1489	}
1536		1490
		1491	static void sii8620_hpd_unplugged(struct sii8620 *ctx)
		1492	{
		1493	sii8620_disable_hpd(ctx);
		1494	ctx->sink_type = SINK_NONE;
		1495	ctx->sink_detected = false;
		1496	ctx->feature_complete = false;
		1497	kfree(ctx->edid);
		1498	ctx->edid = NULL;
		1499	}
		1500
1537	static void sii8620_disconnect(struct sii8620 *ctx)	1501	static void sii8620_disconnect(struct sii8620 *ctx)
1538	{	1502	{
1539	sii8620_disable_gen2_write_burst(ctx);	1503	sii8620_disable_gen2_write_burst(ctx);
@@ -1561,7 +1525,7 @@ static void sii8620_disconnect(struct sii8620 *ctx) · 21 unmodified lines
1561	REG_MHL_DP_CTL6, 0x2A,	1525	REG_MHL_DP_CTL6, 0x2A,
1562	REG_MHL_DP_CTL7, 0x03	1526	REG_MHL_DP_CTL7, 0x03
1563	);	1527	);
1564	sii8620_disable_hpd(ctx);	1528	sii8620_hpd_unplugged(ctx);
1565	sii8620_write_seq_static(ctx,	1529	sii8620_write_seq_static(ctx,
1566	REG_M3_CTRL, VAL_M3_CTRL_MHL3_VALUE,	1530	REG_M3_CTRL, VAL_M3_CTRL_MHL3_VALUE,
1567	REG_MHL_COC_CTL1, 0x07,	1531	REG_MHL_COC_CTL1, 0x07,
@@ -1609,10 +1573,8 @@ static void sii8620_disconnect(struct sii8620 *ctx) · 41 unmodified lines
1609	memset(ctx->xstat, 0, sizeof(ctx->xstat));	1573	memset(ctx->xstat, 0, sizeof(ctx->xstat));
1610	memset(ctx->devcap, 0, sizeof(ctx->devcap));	1574	memset(ctx->devcap, 0, sizeof(ctx->devcap));
1611	memset(ctx->xdevcap, 0, sizeof(ctx->xdevcap));	1575	memset(ctx->xdevcap, 0, sizeof(ctx->xdevcap));
		1576	ctx->devcap_read = false;
1612	ctx->cbus_status = 0;	1577	ctx->cbus_status = 0;
1613	ctx->sink_type = SINK_NONE;
1614	kfree(ctx->edid);
1615	ctx->edid = NULL;
1616	sii8620_mt_cleanup(ctx);	1578	sii8620_mt_cleanup(ctx);
1617	}	1579	}
1618		1580
@@ -1703,9 +1665,6 @@ static void sii8620_status_changed_path(struct sii8620 *ctx) · 84 unmodified lines
1703	sii8620_mt_write_stat(ctx, MHL_DST_REG(LINK_MODE),	1665	sii8620_mt_write_stat(ctx, MHL_DST_REG(LINK_MODE),
1704	MHL_DST_LM_CLK_MODE_NORMAL	1666	MHL_DST_LM_CLK_MODE_NORMAL
1705	\| MHL_DST_LM_PATH_ENABLED);	1667	\| MHL_DST_LM_PATH_ENABLED);
1706	if (!sii8620_is_mhl3(ctx))
1707	sii8620_mt_read_devcap(ctx, false);
1708	sii8620_mt_set_cont(ctx, sii8620_sink_detected);
1709	} else {	1668	} else {
1710	sii8620_mt_write_stat(ctx, MHL_DST_REG(LINK_MODE),	1669	sii8620_mt_write_stat(ctx, MHL_DST_REG(LINK_MODE),
1711	MHL_DST_LM_CLK_MODE_NORMAL);	1670	MHL_DST_LM_CLK_MODE_NORMAL);
@@ -1722,9 +1681,14 @@ static void sii8620_msc_mr_write_stat(struct sii8620 *ctx) · 10 unmodified lines
1722	sii8620_update_array(ctx->stat, st, MHL_DST_SIZE);	1681	sii8620_update_array(ctx->stat, st, MHL_DST_SIZE);
1723	sii8620_update_array(ctx->xstat, xst, MHL_XDS_SIZE);	1682	sii8620_update_array(ctx->xstat, xst, MHL_XDS_SIZE);
1724		1683
1725	if (ctx->stat[MHL_DST_CONNECTED_RDY] & MHL_DST_CONN_DCAP_RDY)	1684	if (ctx->stat[MHL_DST_CONNECTED_RDY] & st[MHL_DST_CONNECTED_RDY] &
		1685	MHL_DST_CONN_DCAP_RDY) {
1726	sii8620_status_dcap_ready(ctx);	1686	sii8620_status_dcap_ready(ctx);
1727		1687
		1688	if (!sii8620_is_mhl3(ctx))
		1689	sii8620_mt_read_devcap(ctx, false);
		1690	}
		1691
1728	if (st[MHL_DST_LINK_MODE] & MHL_DST_LM_PATH_ENABLED)	1692	if (st[MHL_DST_LINK_MODE] & MHL_DST_LM_PATH_ENABLED)
1729	sii8620_status_changed_path(ctx);	1693	sii8620_status_changed_path(ctx);
1730	}	1694	}
@@ -1808,8 +1772,11 @@ static void sii8620_msc_mr_set_int(struct sii8620 *ctx) · 77 unmodified lines
1808	}	1772	}
1809	if (ints[MHL_INT_RCHANGE] & MHL_INT_RC_FEAT_REQ)	1773	if (ints[MHL_INT_RCHANGE] & MHL_INT_RC_FEAT_REQ)
1810	sii8620_send_features(ctx);	1774	sii8620_send_features(ctx);
1811	if (ints[MHL_INT_RCHANGE] & MHL_INT_RC_FEAT_COMPLETE)	1775	if (ints[MHL_INT_RCHANGE] & MHL_INT_RC_FEAT_COMPLETE) {
1812	sii8620_edid_read(ctx, 0);	1776	ctx->feature_complete = true;
		1777	if (ctx->edid)
		1778	sii8620_enable_hpd(ctx);
		1779	}
1813	}	1780	}
1814		1781
1815	static struct sii8620_mt_msg sii8620_msc_msg_first(struct sii8620 ctx)	1782	static struct sii8620_mt_msg sii8620_msc_msg_first(struct sii8620 ctx)
@@ -1884,6 +1851,15 @@ static void sii8620_irq_msc(struct sii8620 *ctx) · 68 unmodified lines
1884	if (stat & BIT_CBUS_MSC_MR_WRITE_STAT)	1851	if (stat & BIT_CBUS_MSC_MR_WRITE_STAT)
1885	sii8620_msc_mr_write_stat(ctx);	1852	sii8620_msc_mr_write_stat(ctx);
1886		1853
		1854	if (stat & BIT_CBUS_HPD_CHG) {
		1855	if (ctx->cbus_status & BIT_CBUS_STATUS_CBUS_HPD) {
		1856	ctx->sink_detected = true;
		1857	sii8620_identify_sink(ctx);
		1858	} else {
		1859	sii8620_hpd_unplugged(ctx);
		1860	}
		1861	}
		1862
1887	if (stat & BIT_CBUS_MSC_MR_SET_INT)	1863	if (stat & BIT_CBUS_MSC_MR_SET_INT)
1888	sii8620_msc_mr_set_int(ctx);	1864	sii8620_msc_mr_set_int(ctx);
1889		1865
@@ -1931,14 +1907,6 @@ static void sii8620_irq_edid(struct sii8620 *ctx) · 41 unmodified lines
1931	ctx->mt_state = MT_STATE_DONE;	1907	ctx->mt_state = MT_STATE_DONE;
1932	}	1908	}
1933		1909
1934	static void sii8620_scdt_high(struct sii8620 *ctx)
1935	{
1936	sii8620_write_seq_static(ctx,
1937	REG_INTR8_MASK, BIT_CEA_NEW_AVI \| BIT_CEA_NEW_VSI,
1938	REG_TPI_SC, BIT_TPI_SC_TPI_OUTPUT_MODE_0_HDMI,
1939	);
1940	}
1941
1942	static void sii8620_irq_scdt(struct sii8620 *ctx)	1910	static void sii8620_irq_scdt(struct sii8620 *ctx)
1943	{	1911	{
1944	u8 stat = sii8620_readb(ctx, REG_INTR5);	1912	u8 stat = sii8620_readb(ctx, REG_INTR5);
@@ -1946,53 +1914,13 @@ static void sii8620_irq_scdt(struct sii8620 *ctx) · 1 unmodified line
1946	if (stat & BIT_INTR_SCDT_CHANGE) {	1914	if (stat & BIT_INTR_SCDT_CHANGE) {
1947	u8 cstat = sii8620_readb(ctx, REG_TMDS_CSTAT_P3);	1915	u8 cstat = sii8620_readb(ctx, REG_TMDS_CSTAT_P3);
1948		1916
1949	if (cstat & BIT_TMDS_CSTAT_P3_SCDT) {	1917	if (cstat & BIT_TMDS_CSTAT_P3_SCDT)
1950	if (ctx->sink_type == SINK_HDMI)	1918	sii8620_start_video(ctx);
1951	/* enable infoframe interrupt */
1952	sii8620_scdt_high(ctx);
1953	else
1954	sii8620_start_video(ctx);
1955	}
1956	}	1919	}
1957		1920
1958	sii8620_write(ctx, REG_INTR5, stat);	1921	sii8620_write(ctx, REG_INTR5, stat);
1959	}	1922	}
1960		1923
1961	static void sii8620_new_vsi(struct sii8620 *ctx)
1962	{
1963	u8 vsif[11];
1964
1965	sii8620_write(ctx, REG_RX_HDMI_CTRL2,
1966	VAL_RX_HDMI_CTRL2_DEFVAL \|
1967	BIT_RX_HDMI_CTRL2_VSI_MON_SEL_VSI);
1968	sii8620_read_buf(ctx, REG_RX_HDMI_MON_PKT_HEADER1, vsif,
1969	ARRAY_SIZE(vsif));
1970	}
1971
1972	static void sii8620_new_avi(struct sii8620 *ctx)
1973	{
1974	sii8620_write(ctx, REG_RX_HDMI_CTRL2, VAL_RX_HDMI_CTRL2_DEFVAL);
1975	sii8620_read_buf(ctx, REG_RX_HDMI_MON_PKT_HEADER1, ctx->avif,
1976	ARRAY_SIZE(ctx->avif));
1977	}
1978
1979	static void sii8620_irq_infr(struct sii8620 *ctx)
1980	{
1981	u8 stat = sii8620_readb(ctx, REG_INTR8)
1982	& (BIT_CEA_NEW_VSI \| BIT_CEA_NEW_AVI);
1983
1984	sii8620_write(ctx, REG_INTR8, stat);
1985
1986	if (stat & BIT_CEA_NEW_VSI)
1987	sii8620_new_vsi(ctx);
1988
1989	if (stat & BIT_CEA_NEW_AVI)
1990	sii8620_new_avi(ctx);
1991
1992	if (stat & (BIT_CEA_NEW_VSI \| BIT_CEA_NEW_AVI))
1993	sii8620_start_video(ctx);
1994	}
1995
1996	static void sii8620_got_xdevcap(struct sii8620 *ctx, int ret)	1924	static void sii8620_got_xdevcap(struct sii8620 *ctx, int ret)
1997	{	1925	{
1998	if (ret < 0)	1926	if (ret < 0)
@@ -2043,11 +1971,11 @@ static void sii8620_irq_ddc(struct sii8620 *ctx) · 44 unmodified lines
2043		1971
2044	if (stat & BIT_DDC_CMD_DONE) {	1972	if (stat & BIT_DDC_CMD_DONE) {
2045	sii8620_write(ctx, REG_INTR3_MASK, 0);	1973	sii8620_write(ctx, REG_INTR3_MASK, 0);
2046	if (sii8620_is_mhl3(ctx))	1974	if (sii8620_is_mhl3(ctx) && !ctx->feature_complete)
2047	sii8620_mt_set_int(ctx, MHL_INT_REG(RCHANGE),	1975	sii8620_mt_set_int(ctx, MHL_INT_REG(RCHANGE),
2048	MHL_INT_RC_FEAT_REQ);	1976	MHL_INT_RC_FEAT_REQ);
2049	else	1977	else
2050	sii8620_edid_read(ctx, 0);	1978	sii8620_enable_hpd(ctx);
2051	}	1979	}
2052	sii8620_write(ctx, REG_INTR3, stat);	1980	sii8620_write(ctx, REG_INTR3, stat);
2053	}	1981	}
@@ -2074,7 +2002,6 @@ static irqreturn_t sii8620_irq_thread(int irq, void *data) · 20 unmodified lines
2074	{ BIT_FAST_INTR_STAT_EDID, sii8620_irq_edid },	2002	{ BIT_FAST_INTR_STAT_EDID, sii8620_irq_edid },
2075	{ BIT_FAST_INTR_STAT_DDC, sii8620_irq_ddc },	2003	{ BIT_FAST_INTR_STAT_DDC, sii8620_irq_ddc },
2076	{ BIT_FAST_INTR_STAT_SCDT, sii8620_irq_scdt },	2004	{ BIT_FAST_INTR_STAT_SCDT, sii8620_irq_scdt },
2077	{ BIT_FAST_INTR_STAT_INFR, sii8620_irq_infr },
2078	};	2005	};
2079	struct sii8620 *ctx = data;	2006	struct sii8620 *ctx = data;
2080	u8 stats[LEN_FAST_INTR_STAT];	2007	u8 stats[LEN_FAST_INTR_STAT];
@@ -2112,7 +2039,6 @@ static void sii8620_cable_in(struct sii8620 *ctx) · 31 unmodified lines
2112	dev_err(dev, "Error powering on, %d.\n", ret);	2039	dev_err(dev, "Error powering on, %d.\n", ret);
2113	return;	2040	return;
2114	}	2041	}
2115	sii8620_hw_reset(ctx);
2116		2042
2117	sii8620_read_buf(ctx, REG_VND_IDL, ver, ARRAY_SIZE(ver));	2043	sii8620_read_buf(ctx, REG_VND_IDL, ver, ARRAY_SIZE(ver));
2118	ret = sii8620_clear_error(ctx);	2044	ret = sii8620_clear_error(ctx);
@@ -2268,17 +2194,43 @@ static void sii8620_detach(struct drm_bridge *bridge) · 149 unmodified lines
2268	rc_unregister_device(ctx->rc_dev);	2194	rc_unregister_device(ctx->rc_dev);
2269	}	2195	}
2270		2196
		2197	static int sii8620_is_packing_required(struct sii8620 *ctx,
		2198	const struct drm_display_mode *mode)
		2199	{
		2200	int max_pclk, max_pclk_pp_mode;
		2201
		2202	if (sii8620_is_mhl3(ctx)) {
		2203	max_pclk = MHL3_MAX_PCLK;
		2204	max_pclk_pp_mode = MHL3_MAX_PCLK_PP_MODE;
		2205	} else {
		2206	max_pclk = MHL1_MAX_PCLK;
		2207	max_pclk_pp_mode = MHL1_MAX_PCLK_PP_MODE;
		2208	}
		2209
		2210	if (mode->clock < max_pclk)
		2211	return 0;
		2212	else if (mode->clock < max_pclk_pp_mode)
		2213	return 1;
		2214	else
		2215	return -1;
		2216	}
		2217
2271	static enum drm_mode_status sii8620_mode_valid(struct drm_bridge *bridge,	2218	static enum drm_mode_status sii8620_mode_valid(struct drm_bridge *bridge,
2272	const struct drm_display_mode *mode)	2219	const struct drm_display_mode *mode)
2273	{	2220	{
2274	struct sii8620 *ctx = bridge_to_sii8620(bridge);	2221	struct sii8620 *ctx = bridge_to_sii8620(bridge);
		2222	int pack_required = sii8620_is_packing_required(ctx, mode);
2275	bool can_pack = ctx->devcap[MHL_DCAP_VID_LINK_MODE] &	2223	bool can_pack = ctx->devcap[MHL_DCAP_VID_LINK_MODE] &
2276	MHL_DCAP_VID_LINK_PPIXEL;	2224	MHL_DCAP_VID_LINK_PPIXEL;
2277	unsigned int max_pclk = sii8620_is_mhl3(ctx) ? MHL3_MAX_LCLK :
2278	MHL1_MAX_LCLK;
2279	max_pclk /= can_pack ? 2 : 3;
2280		2225
2281	return (mode->clock > max_pclk) ? MODE_CLOCK_HIGH : MODE_OK;	2226	switch (pack_required) {
		2227	case 0:
		2228	return MODE_OK;
		2229	case 1:
		2230	return (can_pack) ? MODE_OK : MODE_CLOCK_HIGH;
		2231	default:
		2232	return MODE_CLOCK_HIGH;
		2233	}
2282	}	2234	}
2283		2235
2284	static bool sii8620_mode_fixup(struct drm_bridge *bridge,	2236	static bool sii8620_mode_fixup(struct drm_bridge *bridge,
@@ -2286,43 +2238,16 @@ static bool sii8620_mode_fixup(struct drm_bridge *bridge, · 1 unmodified line
2286	struct drm_display_mode *adjusted_mode)	2238	struct drm_display_mode *adjusted_mode)
2287	{	2239	{
2288	struct sii8620 *ctx = bridge_to_sii8620(bridge);	2240	struct sii8620 *ctx = bridge_to_sii8620(bridge);
2289	int max_lclk;
2290	bool ret = true;
2291		2241
2292	mutex_lock(&ctx->lock);	2242	mutex_lock(&ctx->lock);
2293		2243
2294	max_lclk = sii8620_is_mhl3(ctx) ? MHL3_MAX_LCLK : MHL1_MAX_LCLK;	2244	ctx->use_packed_pixel = sii8620_is_packing_required(ctx, adjusted_mode);
2295	if (max_lclk > 3 * adjusted_mode->clock) {	2245	ctx->video_code = drm_match_cea_mode(adjusted_mode);
2296	ctx->use_packed_pixel = 0;	2246	ctx->pixel_clock = adjusted_mode->clock;
2297	goto end;	2247
2298	}
2299	if ((ctx->devcap[MHL_DCAP_VID_LINK_MODE] & MHL_DCAP_VID_LINK_PPIXEL) &&
2300	max_lclk > 2 * adjusted_mode->clock) {
2301	ctx->use_packed_pixel = 1;
2302	goto end;
2303	}
2304	ret = false;
2305	end:
2306	if (ret) {
2307	u8 vic = drm_match_cea_mode(adjusted_mode);
2308
2309	if (!vic) {
2310	union hdmi_infoframe frm;
2311	u8 mhl_vic[] = { 0, 95, 94, 93, 98 };
2312
2313	/* FIXME: We need the connector here */
2314	drm_hdmi_vendor_infoframe_from_display_mode(
2315	&frm.vendor.hdmi, NULL, adjusted_mode);
2316	vic = frm.vendor.hdmi.vic;
2317	if (vic >= ARRAY_SIZE(mhl_vic))
2318	vic = 0;
2319	vic = mhl_vic[vic];
2320	}
2321	ctx->video_code = vic;
2322	ctx->pixel_clock = adjusted_mode->clock;
2323	}
2324	mutex_unlock(&ctx->lock);	2248	mutex_unlock(&ctx->lock);
2325	return ret;	2249
		2250	return true;
2326	}	2251	}
2327		2252
2328	static const struct drm_bridge_funcs sii8620_bridge_funcs = {	2253	static const struct drm_bridge_funcs sii8620_bridge_funcs = {

drivers/gpu/drm/drm_drv.c+7−7

  */
 void drm_dev_unplug(struct drm_device *dev)
 {
-	drm_dev_unregister(dev);
-	mutex_lock(&drm_global_mutex);
-	if (dev->open_count == 0)
-		drm_dev_put(dev);
-	mutex_unlock(&drm_global_mutex);
 	/*
 	 * After synchronizing any critical read section is guaranteed to see
 	 * the new value of ->unplugged, and any critical section which might
 	 */
 	dev->unplugged = true;
 	synchronize_srcu(&drm_unplug_srcu);
+	drm_dev_unregister(dev);
+	mutex_lock(&drm_global_mutex);
+	if (dev->open_count == 0)
+		drm_dev_put(dev);
+	mutex_unlock(&drm_global_mutex);
 }
 EXPORT_SYMBOL(drm_dev_unplug);

drivers/gpu/drm/i915/i915_drv.h+0−3

  **/
 static inline struct scatterlist *__sg_next(struct scatterlist *sg)
 {
-#ifdef CONFIG_DEBUG_SG
-	BUG_ON(sg->sg_magic != SG_MAGIC);
-#endif
 	return sg_is_last(sg) ? NULL : ____sg_next(sg);
 }

drivers/gpu/drm/meson/meson_drv.c+8−4

 	priv->io_base = regs;
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hhi");
-	if (!res)
+	if (!res) {
-		return -EINVAL;
+		ret = -EINVAL;
+		goto free_drm;
+	}
 	/* Simply ioremap since it may be a shared register zone */
 	regs = devm_ioremap(dev, res->start, resource_size(res));
 	if (!regs) {
 	}
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dmc");
-	if (!res)
+	if (!res) {
-		return -EINVAL;
+		ret = -EINVAL;
+		goto free_drm;
+	}
 	/* Simply ioremap since it may be a shared register zone */
 	regs = devm_ioremap(dev, res->start, resource_size(res));
 	if (!regs) {

drivers/gpu/drm/nouveau/dispnv50/curs507a.c+1−1

@@ -132,7 +132,7 @@ curs507a_new_(const struct nv50_wimm_func func, struct nouveau_drm drm, · 131 unmodified lines
132		132
133	nvif_object_map(&wndw->wimm.base.user, NULL, 0);	133	nvif_object_map(&wndw->wimm.base.user, NULL, 0);
134	wndw->immd = func;	134	wndw->immd = func;
135	wndw->ctxdma.parent = &disp->core->chan.base.user;	135	wndw->ctxdma.parent = NULL;
136	return 0;	136	return 0;
137	}	137	}
138		138

drivers/gpu/drm/nouveau/dispnv50/wndw.c+8−5

 	if (ret)
 		return ret;
-	ctxdma = nv50_wndw_ctxdma_new(wndw, fb);
+	if (wndw->ctxdma.parent) {
-	if (IS_ERR(ctxdma)) {
+		ctxdma = nv50_wndw_ctxdma_new(wndw, fb);
-		nouveau_bo_unpin(fb->nvbo);
+		if (IS_ERR(ctxdma)) {
-		return PTR_ERR(ctxdma);
+			nouveau_bo_unpin(fb->nvbo);
+			return PTR_ERR(ctxdma);
+		}
+		asyw->image.handle[0] = ctxdma->object.handle;
 	}
 	asyw->state.fence = reservation_object_get_excl_rcu(fb->nvbo->bo.resv);
-	asyw->image.handle[0] = ctxdma->object.handle;
 	asyw->image.offset[0] = fb->nvbo->bo.offset;
 	if (wndw->func->prepare) {

drivers/gpu/drm/qxl/qxl_display.c+5−2

 	struct qxl_cursor_cmd *cmd;
 	struct qxl_cursor *cursor;
 	struct drm_gem_object *obj;
-	struct qxl_bo *cursor_bo = NULL, *user_bo = NULL;
+	struct qxl_bo *cursor_bo = NULL, *user_bo = NULL, *old_cursor_bo = NULL;
 	int ret;
 	void *user_ptr;
 	int size = 64*64*4;
 							   cursor_bo, 0);
 		cmd->type = QXL_CURSOR_SET;
-		qxl_bo_unref(&qcrtc->cursor_bo);
+		old_cursor_bo = qcrtc->cursor_bo;
 		qcrtc->cursor_bo = cursor_bo;
 		cursor_bo = NULL;
 	} else {
 	qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);
 	qxl_release_fence_buffer_objects(release);
+	if (old_cursor_bo)
+		qxl_bo_unref(&old_cursor_bo);
 	qxl_bo_unref(&cursor_bo);
 	return;

drivers/gpu/drm/sun4i/sun4i_tcon.c+0−25

@@ -17,7 +17,6 @@ · 16 unmodified lines
17	#include <drm/drm_encoder.h>	17	#include <drm/drm_encoder.h>
18	#include <drm/drm_modes.h>	18	#include <drm/drm_modes.h>
19	#include <drm/drm_of.h>	19	#include <drm/drm_of.h>
20	#include <drm/drm_panel.h>
21		20
22	#include <uapi/drm/drm_mode.h>	21	#include <uapi/drm/drm_mode.h>
23		22
@@ -418,9 +417,6 @@ static void sun4i_tcon0_mode_set_lvds(struct sun4i_tcon *tcon, · 394 unmodified lines
418	static void sun4i_tcon0_mode_set_rgb(struct sun4i_tcon *tcon,	417	static void sun4i_tcon0_mode_set_rgb(struct sun4i_tcon *tcon,
419	const struct drm_display_mode *mode)	418	const struct drm_display_mode *mode)
420	{	419	{
421	struct drm_panel *panel = tcon->panel;
422	struct drm_connector *connector = panel->connector;
423	struct drm_display_info display_info = connector->display_info;
424	unsigned int bp, hsync, vsync;	420	unsigned int bp, hsync, vsync;
425	u8 clk_delay;	421	u8 clk_delay;
426	u32 val = 0;	422	u32 val = 0;
@@ -478,27 +474,6 @@ static void sun4i_tcon0_mode_set_rgb(struct sun4i_tcon *tcon, · 51 unmodified lines
478	if (mode->flags & DRM_MODE_FLAG_PVSYNC)	474	if (mode->flags & DRM_MODE_FLAG_PVSYNC)
479	val \|= SUN4I_TCON0_IO_POL_VSYNC_POSITIVE;	475	val \|= SUN4I_TCON0_IO_POL_VSYNC_POSITIVE;
480		476
481	/*
482	* On A20 and similar SoCs, the only way to achieve Positive Edge
483	* (Rising Edge), is setting dclk clock phase to 2/3(240°).
484	* By default TCON works in Negative Edge(Falling Edge),
485	* this is why phase is set to 0 in that case.
486	* Unfortunately there's no way to logically invert dclk through
487	* IO_POL register.
488	* The only acceptable way to work, triple checked with scope,
489	* is using clock phase set to 0° for Negative Edge and set to 240°
490	* for Positive Edge.
491	* On A33 and similar SoCs there would be a 90° phase option,
492	* but it divides also dclk by 2.
493	* Following code is a way to avoid quirks all around TCON
494	* and DOTCLOCK drivers.
495	*/
496	if (display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_POSEDGE)
497	clk_set_phase(tcon->dclk, 240);
498
499	if (display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_NEGEDGE)
500	clk_set_phase(tcon->dclk, 0);
501
502	regmap_update_bits(tcon->regs, SUN4I_TCON0_IO_POL_REG,	477	regmap_update_bits(tcon->regs, SUN4I_TCON0_IO_POL_REG,
503	SUN4I_TCON0_IO_POL_HSYNC_POSITIVE \| SUN4I_TCON0_IO_POL_VSYNC_POSITIVE,	478	SUN4I_TCON0_IO_POL_HSYNC_POSITIVE \| SUN4I_TCON0_IO_POL_VSYNC_POSITIVE,
504	val);	479	val);

drivers/hid/hid-google-hammer.c+2−0

 		     USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_STAFF) },
 	{ HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,
 		     USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_WAND) },
+	{ HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,
+		     USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_WHISKERS) },
 	{ }
 };
 MODULE_DEVICE_TABLE(hid, hammer_devices);

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

@@ -452,6 +452,7 @@ · 451 unmodified lines
452	#define USB_DEVICE_ID_GOOGLE_TOUCH_ROSE 0x5028	452	#define USB_DEVICE_ID_GOOGLE_TOUCH_ROSE 0x5028
453	#define USB_DEVICE_ID_GOOGLE_STAFF 0x502b	453	#define USB_DEVICE_ID_GOOGLE_STAFF 0x502b
454	#define USB_DEVICE_ID_GOOGLE_WAND 0x502d	454	#define USB_DEVICE_ID_GOOGLE_WAND 0x502d
		455	#define USB_DEVICE_ID_GOOGLE_WHISKERS 0x5030
455		456
456	#define USB_VENDOR_ID_GOTOP 0x08f2	457	#define USB_VENDOR_ID_GOTOP 0x08f2
457	#define USB_DEVICE_ID_SUPER_Q2 0x007f	458	#define USB_DEVICE_ID_SUPER_Q2 0x007f

drivers/hid/hid-steam.c+5−5

@@ -573,7 +573,7 @@ static bool steam_is_valve_interface(struct hid_device *hdev) · 572 unmodified lines
573		573
574	static int steam_client_ll_parse(struct hid_device *hdev)	574	static int steam_client_ll_parse(struct hid_device *hdev)
575	{	575	{
576	struct steam_device *steam = hid_get_drvdata(hdev);	576	struct steam_device *steam = hdev->driver_data;
577		577
578	return hid_parse_report(hdev, steam->hdev->dev_rdesc,	578	return hid_parse_report(hdev, steam->hdev->dev_rdesc,
579	steam->hdev->dev_rsize);	579	steam->hdev->dev_rsize);
@@ -590,7 +590,7 @@ static void steam_client_ll_stop(struct hid_device *hdev) · 10 unmodified lines
590		590
591	static int steam_client_ll_open(struct hid_device *hdev)	591	static int steam_client_ll_open(struct hid_device *hdev)
592	{	592	{
593	struct steam_device *steam = hid_get_drvdata(hdev);	593	struct steam_device *steam = hdev->driver_data;
594	int ret;	594	int ret;
595		595
596	ret = hid_hw_open(steam->hdev);	596	ret = hid_hw_open(steam->hdev);
@@ -605,7 +605,7 @@ static int steam_client_ll_open(struct hid_device *hdev) · 8 unmodified lines
605		605
606	static void steam_client_ll_close(struct hid_device *hdev)	606	static void steam_client_ll_close(struct hid_device *hdev)
607	{	607	{
608	struct steam_device *steam = hid_get_drvdata(hdev);	608	struct steam_device *steam = hdev->driver_data;
609		609
610	mutex_lock(&steam->mutex);	610	mutex_lock(&steam->mutex);
611	steam->client_opened = false;	611	steam->client_opened = false;
@@ -623,7 +623,7 @@ static int steam_client_ll_raw_request(struct hid_device *hdev, · 11 unmodified lines
623	size_t count, unsigned char report_type,	623	size_t count, unsigned char report_type,
624	int reqtype)	624	int reqtype)
625	{	625	{
626	struct steam_device *steam = hid_get_drvdata(hdev);	626	struct steam_device *steam = hdev->driver_data;
627		627
628	return hid_hw_raw_request(steam->hdev, reportnum, buf, count,	628	return hid_hw_raw_request(steam->hdev, reportnum, buf, count,
629	report_type, reqtype);	629	report_type, reqtype);
@@ -710,7 +710,7 @@ static int steam_probe(struct hid_device *hdev, · 80 unmodified lines
710	ret = PTR_ERR(steam->client_hdev);	710	ret = PTR_ERR(steam->client_hdev);
711	goto client_hdev_fail;	711	goto client_hdev_fail;
712	}	712	}
713	hid_set_drvdata(steam->client_hdev, steam);	713	steam->client_hdev->driver_data = steam;
714		714
715	/*	715	/*
716	* With the real steam controller interface, do not connect hidraw.	716	* With the real steam controller interface, do not connect hidraw.

drivers/hid/intel-ish-hid/ipc/pci-ish.c+7−15

 	kfree(ishtp_dev);
 }
-#ifdef CONFIG_PM
+static struct device __maybe_unused *ish_resume_device;
-static struct device *ish_resume_device;
 /* 50ms to get resume response */
 #define WAIT_FOR_RESUME_ACK_MS		50
  * in that case a simple resume message is enough, others we need
  * a reset sequence.
  */
-static void ish_resume_handler(struct work_struct *work)
+static void __maybe_unused ish_resume_handler(struct work_struct *work)
 {
 	struct pci_dev *pdev = to_pci_dev(ish_resume_device);
 	struct ishtp_device *dev = pci_get_drvdata(pdev);
  *
  * Return: 0 to the pm core
  */
-static int ish_suspend(struct device *device)
+static int __maybe_unused ish_suspend(struct device *device)
 {
 	struct pci_dev *pdev = to_pci_dev(device);
 	struct ishtp_device *dev = pci_get_drvdata(pdev);
 	return 0;
 }
-static DECLARE_WORK(resume_work, ish_resume_handler);
+static __maybe_unused DECLARE_WORK(resume_work, ish_resume_handler);
 /**
  * ish_resume() - ISH resume callback
  * @device:	device pointer
  *
  * Return: 0 to the pm core
  */
-static int ish_resume(struct device *device)
+static int __maybe_unused ish_resume(struct device *device)
 {
 	struct pci_dev *pdev = to_pci_dev(device);
 	struct ishtp_device *dev = pci_get_drvdata(pdev);
 	return 0;
 }
-static const struct dev_pm_ops ish_pm_ops = {
+static SIMPLE_DEV_PM_OPS(ish_pm_ops, ish_suspend, ish_resume);
-	.suspend = ish_suspend,
-	.resume = ish_resume,
-};
-#define ISHTP_ISH_PM_OPS	(&ish_pm_ops)
-#else
-#define ISHTP_ISH_PM_OPS	NULL
-#endif /* CONFIG_PM */
 static struct pci_driver ish_driver = {
 	.name = KBUILD_MODNAME,
 	.id_table = ish_pci_tbl,
 	.probe = ish_probe,
 	.remove = ish_remove,
-	.driver.pm = ISHTP_ISH_PM_OPS,
+	.driver.pm = &ish_pm_ops,
 };
 module_pci_driver(ish_driver);

drivers/hid/wacom_sys.c+8−0

@@ -395,6 +395,14 @@ static void wacom_usage_mapping(struct hid_device *hdev, · 394 unmodified lines
395	}	395	}
396	}	396	}
397		397
		398	/* 2nd-generation Intuos Pro Large has incorrect Y maximum */
		399	if (hdev->vendor == USB_VENDOR_ID_WACOM &&
		400	hdev->product == 0x0358 &&
		401	WACOM_PEN_FIELD(field) &&
		402	wacom_equivalent_usage(usage->hid) == HID_GD_Y) {
		403	field->logical_maximum = 43200;
		404	}
		405
398	switch (usage->hid) {	406	switch (usage->hid) {
399	case HID_GD_X:	407	case HID_GD_X:
400	features->x_max = field->logical_maximum;	408	features->x_max = field->logical_maximum;

drivers/hwmon/dell-smm-hwmon.c+7−0

@@ -1074,6 +1074,13 @@ static struct dmi_system_id i8k_blacklist_fan_support_dmi_table[] __initdata = { · 1073 unmodified lines
1074	DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Vostro 3360"),	1074	DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Vostro 3360"),
1075	},	1075	},
1076	},	1076	},
		1077	{
		1078	.ident = "Dell XPS13 9333",
		1079	.matches = {
		1080	DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
		1081	DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "XPS13 9333"),
		1082	},
		1083	},
1077	{ }	1084	{ }
1078	};	1085	};
1079		1086

drivers/hwmon/nct6775.c+1−1

@@ -4175,7 +4175,7 @@ static int nct6775_probe(struct platform_device *pdev) · 4174 unmodified lines
4175	* The temperature is already monitored if the respective bit in <mask>	4175	* The temperature is already monitored if the respective bit in <mask>
4176	* is set.	4176	* is set.
4177	*/	4177	*/
4178	for (i = 0; i < 32; i++) {	4178	for (i = 0; i < 31; i++) {
4179	if (!(data->temp_mask & BIT(i + 1)))	4179	if (!(data->temp_mask & BIT(i + 1)))
4180	continue;	4180	continue;
4181	if (!reg_temp_alternate[i])	4181	if (!reg_temp_alternate[i])

drivers/i2c/algos/i2c-algo-bit.c+4−4

@@ -647,10 +647,10 @@ static int __i2c_bit_add_bus(struct i2c_adapter *adap, · 646 unmodified lines
647	if (bit_adap->getscl == NULL)	647	if (bit_adap->getscl == NULL)
648	adap->quirks = &i2c_bit_quirk_no_clk_stretch;	648	adap->quirks = &i2c_bit_quirk_no_clk_stretch;
649		649
650	/* Bring bus to a known state. Looks like STOP if bus is not free yet */	650	/*
651	setscl(bit_adap, 1);	651	* We tried forcing SCL/SDA to an initial state here. But that caused a
652	udelay(bit_adap->udelay);	652	* regression, sadly. Check Bugzilla #200045 for details.
653	setsda(bit_adap, 1);	653	*/
654		654
655	ret = add_adapter(adap);	655	ret = add_adapter(adap);
656	if (ret < 0)	656	if (ret < 0)

drivers/i2c/busses/i2c-gpio.c+2−2

@@ -279,9 +279,9 @@ static int i2c_gpio_probe(struct platform_device *pdev) · 278 unmodified lines
279	* required for an I2C bus.	279	* required for an I2C bus.
280	*/	280	*/
281	if (pdata->scl_is_open_drain)	281	if (pdata->scl_is_open_drain)
282	gflags = GPIOD_OUT_LOW;	282	gflags = GPIOD_OUT_HIGH;
283	else	283	else
284	gflags = GPIOD_OUT_LOW_OPEN_DRAIN;	284	gflags = GPIOD_OUT_HIGH_OPEN_DRAIN;
285	priv->scl = i2c_gpio_get_desc(dev, "scl", 1, gflags);	285	priv->scl = i2c_gpio_get_desc(dev, "scl", 1, gflags);
286	if (IS_ERR(priv->scl))	286	if (IS_ERR(priv->scl))
287	return PTR_ERR(priv->scl);	287	return PTR_ERR(priv->scl);

drivers/i2c/i2c-core-smbus.c+9−5

 	status = i2c_transfer(adapter, msg, num);
 	if (status < 0)
-		return status;
+		goto cleanup;
-	if (status != num)
+	if (status != num) {
-		return -EIO;
+		status = -EIO;
+		goto cleanup;
+	}
+	status = 0;
 	/* Check PEC if last message is a read */
 	if (i && (msg[num-1].flags & I2C_M_RD)) {
 		status = i2c_smbus_check_pec(partial_pec, &msg[num-1]);
 		if (status < 0)
-			return status;
+			goto cleanup;
 	}
 	if (read_write == I2C_SMBUS_READ)
 			break;
 		}
+cleanup:
 	if (msg[0].flags & I2C_M_DMA_SAFE)
 		kfree(msg[0].buf);
 	if (msg[1].flags & I2C_M_DMA_SAFE)
 		kfree(msg[1].buf);
-	return 0;
+	return status;
 }
 /**

drivers/iio/accel/mma8452.c+1−1

@@ -1053,7 +1053,7 @@ static irqreturn_t mma8452_interrupt(int irq, void *p) · 1052 unmodified lines
1053	if (src < 0)	1053	if (src < 0)
1054	return IRQ_NONE;	1054	return IRQ_NONE;
1055		1055
1056	if (!(src & data->chip_info->enabled_events))	1056	if (!(src & (data->chip_info->enabled_events \| MMA8452_INT_DRDY)))
1057	return IRQ_NONE;	1057	return IRQ_NONE;
1058		1058
1059	if (src & MMA8452_INT_DRDY) {	1059	if (src & MMA8452_INT_DRDY) {

drivers/iio/imu/inv_mpu6050/inv_mpu_core.c+2−0

@@ -959,6 +959,8 @@ int inv_mpu_core_probe(struct regmap regmap, int irq, const char name, · 958 unmodified lines
959	}	959	}
960		960
961	irq_type = irqd_get_trigger_type(desc);	961	irq_type = irqd_get_trigger_type(desc);
		962	if (!irq_type)
		963	irq_type = IRQF_TRIGGER_RISING;
962	if (irq_type == IRQF_TRIGGER_RISING)	964	if (irq_type == IRQF_TRIGGER_RISING)
963	st->irq_mask = INV_MPU6050_ACTIVE_HIGH;	965	st->irq_mask = INV_MPU6050_ACTIVE_HIGH;
964	else if (irq_type == IRQF_TRIGGER_FALLING)	966	else if (irq_type == IRQF_TRIGGER_FALLING)

drivers/iio/light/tsl2772.c+2−0

@@ -582,6 +582,8 @@ static int tsl2772_als_calibrate(struct iio_dev *indio_dev) · 581 unmodified lines
582	"%s: failed to get lux\n", __func__);	582	"%s: failed to get lux\n", __func__);
583	return lux_val;	583	return lux_val;
584	}	584	}
		585	if (lux_val == 0)
		586	return -ERANGE;
585		587
586	ret = (chip->settings.als_cal_target * chip->settings.als_gain_trim) /	588	ret = (chip->settings.als_cal_target * chip->settings.als_gain_trim) /
587	lux_val;	589	lux_val;

drivers/iio/pressure/bmp280-core.c+2−3

@@ -415,10 +415,9 @@ static int bmp280_read_humid(struct bmp280_data data, int val, int *val2) · 414 unmodified lines
415	}	415	}
416	comp_humidity = bmp280_compensate_humidity(data, adc_humidity);	416	comp_humidity = bmp280_compensate_humidity(data, adc_humidity);
417		417
418	*val = comp_humidity;	418	val = comp_humidity 1000 / 1024;
419	*val2 = 1024;
420		419
421	return IIO_VAL_FRACTIONAL;	420	return IIO_VAL_INT;
422	}	421	}
423		422
424	static int bmp280_read_raw(struct iio_dev *indio_dev,	423	static int bmp280_read_raw(struct iio_dev *indio_dev,

drivers/infiniband/core/uverbs_main.c+10−4

 	if (ret)
 		return ret;
-	if (!file->ucontext &&
-	    (command != IB_USER_VERBS_CMD_GET_CONTEXT || extended))
-		return -EINVAL;
 	if (extended) {
 		if (count < (sizeof(hdr) + sizeof(ex_hdr)))
 			return -EINVAL;
 		goto out;
 	}
+	/*
+	 * Must be after the ib_dev check, as once the RCU clears ib_dev ==
+	 * NULL means ucontext == NULL
+	 */
+	if (!file->ucontext &&
+	    (command != IB_USER_VERBS_CMD_GET_CONTEXT || extended)) {
+		ret = -EINVAL;
+		goto out;
+	}
 	if (!verify_command_mask(ib_dev, command, extended)) {
 		ret = -EOPNOTSUPP;
 		goto out;

drivers/infiniband/core/verbs.c+8−6

 /* Completion queues */
-struct ib_cq *ib_create_cq(struct ib_device *device,
+struct ib_cq *__ib_create_cq(struct ib_device *device,
-			   ib_comp_handler comp_handler,
+			     ib_comp_handler comp_handler,
-			   void (*event_handler)(struct ib_event *, void *),
+			     void (*event_handler)(struct ib_event *, void *),
-			   void *cq_context,
+			     void *cq_context,
-			   const struct ib_cq_init_attr *cq_attr)
+			     const struct ib_cq_init_attr *cq_attr,
+			     const char *caller)
 {
 	struct ib_cq *cq;
 		cq->cq_context    = cq_context;
 		atomic_set(&cq->usecnt, 0);
 		cq->res.type = RDMA_RESTRACK_CQ;
+		cq->res.kern_name = caller;
 		rdma_restrack_add(&cq->res);
 	}
 	return cq;
 }
-EXPORT_SYMBOL(ib_create_cq);
+EXPORT_SYMBOL(__ib_create_cq);
 int rdma_set_cq_moderation(struct ib_cq *cq, u16 cq_count, u16 cq_period)
 {

drivers/infiniband/hw/mlx4/mr.c+5−2

 	}
 	if (flags & IB_MR_REREG_ACCESS) {
-		if (ib_access_writable(mr_access_flags) && !mmr->umem->writable)
+		if (ib_access_writable(mr_access_flags) &&
-			return -EPERM;
+		    !mmr->umem->writable) {
+			err = -EPERM;
+			goto release_mpt_entry;
+		}
 		err = mlx4_mr_hw_change_access(dev->dev, *pmpt_entry,
 					       convert_access(mr_access_flags));

drivers/infiniband/hw/mlx5/main.c+21−15

 	if (!mcounters->hw_cntrs_hndl) {
 		mcounters->hw_cntrs_hndl = mlx5_fc_create(
 			to_mdev(ibcounters->device)->mdev, false);
-		if (!mcounters->hw_cntrs_hndl) {
+		if (IS_ERR(mcounters->hw_cntrs_hndl)) {
-			ret = -ENOMEM;
+			ret = PTR_ERR(mcounters->hw_cntrs_hndl);
 			goto free;
 		}
 		hw_hndl = true;
 			return ERR_PTR(-ENOMEM);
 		err = ib_copy_from_udata(ucmd, udata, required_ucmd_sz);
-		if (err) {
+		if (err)
-			kfree(ucmd);
+			goto free_ucmd;
-			return ERR_PTR(err);
-		}
 	}
-	if (flow_attr->priority > MLX5_IB_FLOW_LAST_PRIO)
+	if (flow_attr->priority > MLX5_IB_FLOW_LAST_PRIO) {
-		return ERR_PTR(-ENOMEM);
+		err = -ENOMEM;
+		goto free_ucmd;
+	}
 	if (domain != IB_FLOW_DOMAIN_USER ||
 	    flow_attr->port > dev->num_ports ||
 	    (flow_attr->flags & ~(IB_FLOW_ATTR_FLAGS_DONT_TRAP |
-				  IB_FLOW_ATTR_FLAGS_EGRESS)))
+				  IB_FLOW_ATTR_FLAGS_EGRESS))) {
-		return ERR_PTR(-EINVAL);
+		err = -EINVAL;
+		goto free_ucmd;
+	}
 	if (is_egress &&
 	    (flow_attr->type == IB_FLOW_ATTR_ALL_DEFAULT ||
-	     flow_attr->type == IB_FLOW_ATTR_MC_DEFAULT))
+	     flow_attr->type == IB_FLOW_ATTR_MC_DEFAULT)) {
-		return ERR_PTR(-EINVAL);
+		err = -EINVAL;
+		goto free_ucmd;
+	}
 	dst = kzalloc(sizeof(*dst), GFP_KERNEL);
-	if (!dst)
+	if (!dst) {
-		return ERR_PTR(-ENOMEM);
+		err = -ENOMEM;
+		goto free_ucmd;
+	}
 	mutex_lock(&dev->flow_db->lock);
 unlock:
 	mutex_unlock(&dev->flow_db->lock);
 	kfree(dst);
+free_ucmd:
 	kfree(ucmd);
-	kfree(handler);
 	return ERR_PTR(err);
 }

drivers/infiniband/hw/qedr/verbs.c+3−0

@@ -1957,6 +1957,9 @@ int qedr_modify_qp(struct ib_qp ibqp, struct ib_qp_attr attr, · 1956 unmodified lines
1957	}	1957	}
1958		1958
1959	if (attr_mask & (IB_QP_AV \| IB_QP_PATH_MTU)) {	1959	if (attr_mask & (IB_QP_AV \| IB_QP_PATH_MTU)) {
		1960	if (rdma_protocol_iwarp(&dev->ibdev, 1))
		1961	return -EINVAL;
		1962
1960	if (attr_mask & IB_QP_PATH_MTU) {	1963	if (attr_mask & IB_QP_PATH_MTU) {
1961	if (attr->path_mtu < IB_MTU_256 \|\|	1964	if (attr->path_mtu < IB_MTU_256 \|\|
1962	attr->path_mtu > IB_MTU_4096) {	1965	attr->path_mtu > IB_MTU_4096) {

drivers/infiniband/sw/rxe/rxe_req.c+4−1

 		} else {
 			goto exit;
 		}
+		if ((wqe->wr.send_flags & IB_SEND_SIGNALED) ||
+		    qp->sq_sig_type == IB_SIGNAL_ALL_WR)
+			rxe_run_task(&qp->comp.task, 1);
 		qp->req.wqe_index = next_index(qp->sq.queue,
 						qp->req.wqe_index);
 		goto next_wqe;
 	if (fill_packet(qp, wqe, &pkt, skb, payload)) {
 		pr_debug("qp#%d Error during fill packet\n", qp_num(qp));
+		kfree_skb(skb);
 		goto err;
 	}
 	goto next_wqe;
 err:
-	kfree_skb(skb);
 	wqe->status = IB_WC_LOC_PROT_ERR;
 	wqe->state = wqe_state_error;
 	__rxe_do_task(&qp->comp.task);

drivers/input/input-mt.c+8−4

  * inactive, or if the tool type is changed, a new tracking id is
  * assigned to the slot. The tool type is only reported if the
  * corresponding absbit field is set.
+ *
+ * Returns true if contact is active.
  */
-void input_mt_report_slot_state(struct input_dev *dev,
+bool input_mt_report_slot_state(struct input_dev *dev,
 				unsigned int tool_type, bool active)
 {
 	struct input_mt *mt = dev->mt;
 	int id;
 	if (!mt)
-		return;
+		return false;
 	slot = &mt->slots[mt->slot];
 	slot->frame = mt->frame;
 	if (!active) {
 		input_event(dev, EV_ABS, ABS_MT_TRACKING_ID, -1);
-		return;
+		return false;
 	}
 	id = input_mt_get_value(slot, ABS_MT_TRACKING_ID);
-	if (id < 0 || input_mt_get_value(slot, ABS_MT_TOOL_TYPE) != tool_type)
+	if (id < 0)
 		id = input_mt_new_trkid(mt);
 	input_event(dev, EV_ABS, ABS_MT_TRACKING_ID, id);
 	input_event(dev, EV_ABS, ABS_MT_TOOL_TYPE, tool_type);
+	return true;
 }
 EXPORT_SYMBOL(input_mt_report_slot_state);

drivers/input/joystick/xpad.c+1−1

@@ -125,7 +125,7 @@ static const struct xpad_device { · 124 unmodified lines
125	u8 mapping;	125	u8 mapping;
126	u8 xtype;	126	u8 xtype;
127	} xpad_device[] = {	127	} xpad_device[] = {
128	{ 0x0079, 0x18d4, "GPD Win 2 Controller", 0, XTYPE_XBOX360 },	128	{ 0x0079, 0x18d4, "GPD Win 2 X-Box Controller", 0, XTYPE_XBOX360 },
129	{ 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX },	129	{ 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX },
130	{ 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX },	130	{ 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX },
131	{ 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX },	131	{ 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX },

drivers/input/keyboard/goldfish_events.c+5−4

@@ -45,7 +45,7 @@ struct event_dev { · 44 unmodified lines
45	static irqreturn_t events_interrupt(int irq, void *dev_id)	45	static irqreturn_t events_interrupt(int irq, void *dev_id)
46	{	46	{
47	struct event_dev *edev = dev_id;	47	struct event_dev *edev = dev_id;
48	unsigned type, code, value;	48	unsigned int type, code, value;
49		49
50	type = __raw_readl(edev->addr + REG_READ);	50	type = __raw_readl(edev->addr + REG_READ);
51	code = __raw_readl(edev->addr + REG_READ);	51	code = __raw_readl(edev->addr + REG_READ);
@@ -57,7 +57,7 @@ static irqreturn_t events_interrupt(int irq, void *dev_id) · 5 unmodified lines
57	}	57	}
58		58
59	static void events_import_bits(struct event_dev *edev,	59	static void events_import_bits(struct event_dev *edev,
60	unsigned long bits[], unsigned type, size_t count)	60	unsigned long bits[], unsigned int type, size_t count)
61	{	61	{
62	void __iomem *addr = edev->addr;	62	void __iomem *addr = edev->addr;
63	int i, j;	63	int i, j;
@@ -99,6 +99,7 @@ static void events_import_abs_params(struct event_dev *edev) · 35 unmodified lines
99		99
100	for (j = 0; j < ARRAY_SIZE(val); j++) {	100	for (j = 0; j < ARRAY_SIZE(val); j++) {
101	int offset = (i * ARRAY_SIZE(val) + j) * sizeof(u32);	101	int offset = (i * ARRAY_SIZE(val) + j) * sizeof(u32);
		102
102	val[j] = __raw_readl(edev->addr + REG_DATA + offset);	103	val[j] = __raw_readl(edev->addr + REG_DATA + offset);
103	}	104	}
104		105
@@ -112,7 +113,7 @@ static int events_probe(struct platform_device *pdev) · 7 unmodified lines
112	struct input_dev *input_dev;	113	struct input_dev *input_dev;
113	struct event_dev *edev;	114	struct event_dev *edev;
114	struct resource *res;	115	struct resource *res;
115	unsigned keymapnamelen;	116	unsigned int keymapnamelen;
116	void __iomem *addr;	117	void __iomem *addr;
117	int irq;	118	int irq;
118	int i;	119	int i;
@@ -150,7 +151,7 @@ static int events_probe(struct platform_device *pdev) · 31 unmodified lines
150	for (i = 0; i < keymapnamelen; i++)	151	for (i = 0; i < keymapnamelen; i++)
151	edev->name[i] = __raw_readb(edev->addr + REG_DATA + i);	152	edev->name[i] = __raw_readb(edev->addr + REG_DATA + i);
152		153
153	pr_debug("events_probe() keymap=%s\n", edev->name);	154	pr_debug("%s: keymap=%s\n", __func__, edev->name);
154		155
155	input_dev->name = edev->name;	156	input_dev->name = edev->name;
156	input_dev->id.bustype = BUS_HOST;	157	input_dev->id.bustype = BUS_HOST;

drivers/input/misc/Kconfig+10−0

@@ -841,4 +841,14 @@ config INPUT_RAVE_SP_PWRBUTTON · 840 unmodified lines
841	To compile this driver as a module, choose M here: the	841	To compile this driver as a module, choose M here: the
842	module will be called rave-sp-pwrbutton.	842	module will be called rave-sp-pwrbutton.
843		843
		844	config INPUT_SC27XX_VIBRA
		845	tristate "Spreadtrum sc27xx vibrator support"
		846	depends on MFD_SC27XX_PMIC \|\| COMPILE_TEST
		847	select INPUT_FF_MEMLESS
		848	help
		849	This option enables support for Spreadtrum sc27xx vibrator driver.
		850
		851	To compile this driver as a module, choose M here. The module will
		852	be called sc27xx_vibra.
		853
844	endif	854	endif

drivers/input/misc/Makefile+1−0

@@ -66,6 +66,7 @@ obj-$(CONFIG_INPUT_RETU_PWRBUTTON) += retu-pwrbutton.o · 65 unmodified lines
66	obj-$(CONFIG_INPUT_AXP20X_PEK) += axp20x-pek.o	66	obj-$(CONFIG_INPUT_AXP20X_PEK) += axp20x-pek.o
67	obj-$(CONFIG_INPUT_GPIO_ROTARY_ENCODER) += rotary_encoder.o	67	obj-$(CONFIG_INPUT_GPIO_ROTARY_ENCODER) += rotary_encoder.o
68	obj-$(CONFIG_INPUT_RK805_PWRKEY) += rk805-pwrkey.o	68	obj-$(CONFIG_INPUT_RK805_PWRKEY) += rk805-pwrkey.o
		69	obj-$(CONFIG_INPUT_SC27XX_VIBRA) += sc27xx-vibra.o
69	obj-$(CONFIG_INPUT_SGI_BTNS) += sgi_btns.o	70	obj-$(CONFIG_INPUT_SGI_BTNS) += sgi_btns.o
70	obj-$(CONFIG_INPUT_SIRFSOC_ONKEY) += sirfsoc-onkey.o	71	obj-$(CONFIG_INPUT_SIRFSOC_ONKEY) += sirfsoc-onkey.o
71	obj-$(CONFIG_INPUT_SOC_BUTTON_ARRAY) += soc_button_array.o	72	obj-$(CONFIG_INPUT_SOC_BUTTON_ARRAY) += soc_button_array.o

drivers/input/misc/sc27xx-vibra.c+154−0

@@ -0,0 +1,154 @@
	1	// SPDX-License-Identifier: GPL-2.0
	2	/*
	3	* Copyright (C) 2018 Spreadtrum Communications Inc.
	4	*/
	5
	6	#include <linux/module.h>
	7	#include <linux/of_address.h>
	8	#include <linux/platform_device.h>
	9	#include <linux/regmap.h>
	10	#include <linux/input.h>
	11	#include <linux/workqueue.h>
	12
	13	#define CUR_DRV_CAL_SEL GENMASK(13, 12)
	14	#define SLP_LDOVIBR_PD_EN BIT(9)
	15	#define LDO_VIBR_PD BIT(8)
	16
	17	struct vibra_info {
	18	struct input_dev *input_dev;
	19	struct work_struct play_work;
	20	struct regmap *regmap;
	21	u32 base;
	22	u32 strength;
	23	bool enabled;
	24	};
	25
	26	static void sc27xx_vibra_set(struct vibra_info *info, bool on)
	27	{
	28	if (on) {
	29	regmap_update_bits(info->regmap, info->base, LDO_VIBR_PD, 0);
	30	regmap_update_bits(info->regmap, info->base,
	31	SLP_LDOVIBR_PD_EN, 0);
	32	info->enabled = true;
	33	} else {
	34	regmap_update_bits(info->regmap, info->base, LDO_VIBR_PD,
	35	LDO_VIBR_PD);
	36	regmap_update_bits(info->regmap, info->base,
	37	SLP_LDOVIBR_PD_EN, SLP_LDOVIBR_PD_EN);
	38	info->enabled = false;
	39	}
	40	}
	41
	42	static int sc27xx_vibra_hw_init(struct vibra_info *info)
	43	{
	44	return regmap_update_bits(info->regmap, info->base, CUR_DRV_CAL_SEL, 0);
	45	}
	46
	47	static void sc27xx_vibra_play_work(struct work_struct *work)
	48	{
	49	struct vibra_info *info = container_of(work, struct vibra_info,
	50	play_work);
	51
	52	if (info->strength && !info->enabled)
	53	sc27xx_vibra_set(info, true);
	54	else if (info->strength == 0 && info->enabled)
	55	sc27xx_vibra_set(info, false);
	56	}
	57
	58	static int sc27xx_vibra_play(struct input_dev input, void data,
	59	struct ff_effect *effect)
	60	{
	61	struct vibra_info *info = input_get_drvdata(input);
	62
	63	info->strength = effect->u.rumble.weak_magnitude;
	64	schedule_work(&info->play_work);
	65
	66	return 0;
	67	}
	68
	69	static void sc27xx_vibra_close(struct input_dev *input)
	70	{
	71	struct vibra_info *info = input_get_drvdata(input);
	72
	73	cancel_work_sync(&info->play_work);
	74	if (info->enabled)
	75	sc27xx_vibra_set(info, false);
	76	}
	77
	78	static int sc27xx_vibra_probe(struct platform_device *pdev)
	79	{
	80	struct vibra_info *info;
	81	int error;
	82
	83	info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
	84	if (!info)
	85	return -ENOMEM;
	86
	87	info->regmap = dev_get_regmap(pdev->dev.parent, NULL);
	88	if (!info->regmap) {
	89	dev_err(&pdev->dev, "failed to get vibrator regmap.\n");
	90	return -ENODEV;
	91	}
	92
	93	error = device_property_read_u32(&pdev->dev, "reg", &info->base);
	94	if (error) {
	95	dev_err(&pdev->dev, "failed to get vibrator base address.\n");
	96	return error;
	97	}
	98
	99	info->input_dev = devm_input_allocate_device(&pdev->dev);
	100	if (!info->input_dev) {
	101	dev_err(&pdev->dev, "failed to allocate input device.\n");
	102	return -ENOMEM;
	103	}
	104
	105	info->input_dev->name = "sc27xx:vibrator";
	106	info->input_dev->id.version = 0;
	107	info->input_dev->close = sc27xx_vibra_close;
	108
	109	input_set_drvdata(info->input_dev, info);
	110	input_set_capability(info->input_dev, EV_FF, FF_RUMBLE);
	111	INIT_WORK(&info->play_work, sc27xx_vibra_play_work);
	112	info->enabled = false;
	113
	114	error = sc27xx_vibra_hw_init(info);
	115	if (error) {
	116	dev_err(&pdev->dev, "failed to initialize the vibrator.\n");
	117	return error;
	118	}
	119
	120	error = input_ff_create_memless(info->input_dev, NULL,
	121	sc27xx_vibra_play);
	122	if (error) {
	123	dev_err(&pdev->dev, "failed to register vibrator to FF.\n");
	124	return error;
	125	}
	126
	127	error = input_register_device(info->input_dev);
	128	if (error) {
	129	dev_err(&pdev->dev, "failed to register input device.\n");
	130	return error;
	131	}
	132
	133	return 0;
	134	}
	135
	136	static const struct of_device_id sc27xx_vibra_of_match[] = {
	137	{ .compatible = "sprd,sc2731-vibrator", },
	138	{}
	139	};
	140	MODULE_DEVICE_TABLE(of, sc27xx_vibra_of_match);
	141
	142	static struct platform_driver sc27xx_vibra_driver = {
	143	.driver = {
	144	.name = "sc27xx-vibrator",
	145	.of_match_table = sc27xx_vibra_of_match,
	146	},
	147	.probe = sc27xx_vibra_probe,
	148	};
	149
	150	module_platform_driver(sc27xx_vibra_driver);
	151
	152	MODULE_DESCRIPTION("Spreadtrum SC27xx Vibrator Driver");
	153	MODULE_LICENSE("GPL v2");
	154	MODULE_AUTHOR("Xiaotong Lu <xiaotong.lu@spreadtrum.com>");

drivers/input/mouse/elan_i2c.h+2−0

@@ -27,6 +27,8 @@ · 26 unmodified lines
27	#define ETP_DISABLE_POWER 0x0001	27	#define ETP_DISABLE_POWER 0x0001
28	#define ETP_PRESSURE_OFFSET 25	28	#define ETP_PRESSURE_OFFSET 25
29		29
		30	#define ETP_CALIBRATE_MAX_LEN 3
		31
30	/* IAP Firmware handling */	32	/* IAP Firmware handling */
31	#define ETP_PRODUCT_ID_FORMAT_STRING "%d.0"	33	#define ETP_PRODUCT_ID_FORMAT_STRING "%d.0"
32	#define ETP_FW_NAME "elan_i2c_" ETP_PRODUCT_ID_FORMAT_STRING ".bin"	34	#define ETP_FW_NAME "elan_i2c_" ETP_PRODUCT_ID_FORMAT_STRING ".bin"

drivers/input/mouse/elan_i2c_core.c+2−1

 	int tries = 20;
 	int retval;
 	int error;
-	u8 val[3];
+	u8 val[ETP_CALIBRATE_MAX_LEN];
 	retval = mutex_lock_interruptible(&data->sysfs_mutex);
 	if (retval)
 	{ "ELAN060C", 0 },
 	{ "ELAN0611", 0 },
 	{ "ELAN0612", 0 },
+	{ "ELAN0618", 0 },
 	{ "ELAN1000", 0 },
 	{ }
 };

drivers/input/mouse/elan_i2c_smbus.c+8−2

 static int elan_smbus_initialize(struct i2c_client *client)
 {
 	u8 check[ETP_SMBUS_HELLOPACKET_LEN] = { 0x55, 0x55, 0x55, 0x55, 0x55 };
-	u8 values[ETP_SMBUS_HELLOPACKET_LEN] = { 0, 0, 0, 0, 0 };
+	u8 values[I2C_SMBUS_BLOCK_MAX] = {0};
 	int len, error;
 	/* Get hello packet */
 static int elan_smbus_calibrate_result(struct i2c_client *client, u8 *val)
 {
 	int error;
+	u8 buf[I2C_SMBUS_BLOCK_MAX] = {0};
+	BUILD_BUG_ON(ETP_CALIBRATE_MAX_LEN > sizeof(buf));
 	error = i2c_smbus_read_block_data(client,
-					  ETP_SMBUS_CALIBRATE_QUERY, val);
+					  ETP_SMBUS_CALIBRATE_QUERY, buf);
 	if (error < 0)
 		return error;
+	memcpy(val, buf, ETP_CALIBRATE_MAX_LEN);
 	return 0;
 }
 {
 	int len;
+	BUILD_BUG_ON(I2C_SMBUS_BLOCK_MAX > ETP_SMBUS_REPORT_LEN);
 	len = i2c_smbus_read_block_data(client,
 					ETP_SMBUS_PACKET_QUERY,
 					&report[ETP_SMBUS_REPORT_OFFSET]);

drivers/input/mouse/elantech.c+9−2

 	else if (ic_version == 7 && etd->info.samples[1] == 0x2A)
 		sanity_check = ((packet[3] & 0x1c) == 0x10);
 	else
-		sanity_check = ((packet[0] & 0x0c) == 0x04 &&
+		sanity_check = ((packet[0] & 0x08) == 0x00 &&
 				(packet[3] & 0x1c) == 0x10);
 	if (!sanity_check)
 	{ }
 };
+static const char * const middle_button_pnp_ids[] = {
+	"LEN2131", /* ThinkPad P52 w/ NFC */
+	"LEN2132", /* ThinkPad P52 */
+	NULL
+};
 /*
  * Set the appropriate event bits for the input subsystem
  */
 	__clear_bit(EV_REL, dev->evbit);
 	__set_bit(BTN_LEFT, dev->keybit);
-	if (dmi_check_system(elantech_dmi_has_middle_button))
+	if (dmi_check_system(elantech_dmi_has_middle_button) ||
+			psmouse_matches_pnp_id(psmouse, middle_button_pnp_ids))
 		__set_bit(BTN_MIDDLE, dev->keybit);
 	__set_bit(BTN_RIGHT, dev->keybit);

drivers/input/mouse/psmouse-base.c+6−6

@@ -192,8 +192,8 @@ psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse) · 191 unmodified lines
192	else	192	else
193	input_report_rel(dev, REL_WHEEL, -wheel);	193	input_report_rel(dev, REL_WHEEL, -wheel);
194		194
195	input_report_key(dev, BTN_SIDE, BIT(4));	195	input_report_key(dev, BTN_SIDE, packet[3] & BIT(4));
196	input_report_key(dev, BTN_EXTRA, BIT(5));	196	input_report_key(dev, BTN_EXTRA, packet[3] & BIT(5));
197	break;	197	break;
198	}	198	}
199	break;	199	break;
@@ -203,13 +203,13 @@ psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse) · 3 unmodified lines
203	input_report_rel(dev, REL_WHEEL, -(s8) packet[3]);	203	input_report_rel(dev, REL_WHEEL, -(s8) packet[3]);
204		204
205	/* Extra buttons on Genius NewNet 3D */	205	/* Extra buttons on Genius NewNet 3D */
206	input_report_key(dev, BTN_SIDE, BIT(6));	206	input_report_key(dev, BTN_SIDE, packet[0] & BIT(6));
207	input_report_key(dev, BTN_EXTRA, BIT(7));	207	input_report_key(dev, BTN_EXTRA, packet[0] & BIT(7));
208	break;	208	break;
209		209
210	case PSMOUSE_THINKPS:	210	case PSMOUSE_THINKPS:
211	/* Extra button on ThinkingMouse */	211	/* Extra button on ThinkingMouse */
212	input_report_key(dev, BTN_EXTRA, BIT(3));	212	input_report_key(dev, BTN_EXTRA, packet[0] & BIT(3));
213		213
214	/*	214	/*
215	* Without this bit of weirdness moving up gives wildly	215	* Without this bit of weirdness moving up gives wildly
@@ -223,7 +223,7 @@ psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse) · 7 unmodified lines
223	* Cortron PS2 Trackball reports SIDE button in the	223	* Cortron PS2 Trackball reports SIDE button in the
224	* 4th bit of the first byte.	224	* 4th bit of the first byte.
225	*/	225	*/
226	input_report_key(dev, BTN_SIDE, BIT(3));	226	input_report_key(dev, BTN_SIDE, packet[0] & BIT(3));
227	packet[0] \|= BIT(3);	227	packet[0] \|= BIT(3);
228	break;	228	break;
229		229

drivers/input/rmi4/Kconfig+1−0

@@ -3,6 +3,7 @@ · 2 unmodified lines
3	#	3	#
4	config RMI4_CORE	4	config RMI4_CORE
5	tristate "Synaptics RMI4 bus support"	5	tristate "Synaptics RMI4 bus support"
		6	select IRQ_DOMAIN
6	help	7	help
7	Say Y here if you want to support the Synaptics RMI4 bus. This is	8	Say Y here if you want to support the Synaptics RMI4 bus. This is
8	required for all RMI4 device support.	9	required for all RMI4 device support.

drivers/input/rmi4/rmi_2d_sensor.c+16−18

@@ -32,15 +32,15 @@ void rmi_2d_sensor_abs_process(struct rmi_2d_sensor *sensor, · 31 unmodified lines
32	if (obj->type == RMI_2D_OBJECT_NONE)	32	if (obj->type == RMI_2D_OBJECT_NONE)
33	return;	33	return;
34		34
35	if (axis_align->swap_axes)
36	swap(obj->x, obj->y);
37
38	if (axis_align->flip_x)	35	if (axis_align->flip_x)
39	obj->x = sensor->max_x - obj->x;	36	obj->x = sensor->max_x - obj->x;
40		37
41	if (axis_align->flip_y)	38	if (axis_align->flip_y)
42	obj->y = sensor->max_y - obj->y;	39	obj->y = sensor->max_y - obj->y;
43		40
		41	if (axis_align->swap_axes)
		42	swap(obj->x, obj->y);
		43
44	/*	44	/*
45	* Here checking if X offset or y offset are specified is	45	* Here checking if X offset or y offset are specified is
46	* redundant. We just add the offsets or clip the values.	46	* redundant. We just add the offsets or clip the values.
@@ -120,15 +120,15 @@ void rmi_2d_sensor_rel_report(struct rmi_2d_sensor *sensor, int x, int y) · 73 unmodified lines
120	x = min(RMI_2D_REL_POS_MAX, max(RMI_2D_REL_POS_MIN, (int)x));	120	x = min(RMI_2D_REL_POS_MAX, max(RMI_2D_REL_POS_MIN, (int)x));
121	y = min(RMI_2D_REL_POS_MAX, max(RMI_2D_REL_POS_MIN, (int)y));	121	y = min(RMI_2D_REL_POS_MAX, max(RMI_2D_REL_POS_MIN, (int)y));
122		122
123	if (axis_align->swap_axes)
124	swap(x, y);
125
126	if (axis_align->flip_x)	123	if (axis_align->flip_x)
127	x = min(RMI_2D_REL_POS_MAX, -x);	124	x = min(RMI_2D_REL_POS_MAX, -x);
128		125
129	if (axis_align->flip_y)	126	if (axis_align->flip_y)
130	y = min(RMI_2D_REL_POS_MAX, -y);	127	y = min(RMI_2D_REL_POS_MAX, -y);
131		128
		129	if (axis_align->swap_axes)
		130	swap(x, y);
		131
132	if (x \|\| y) {	132	if (x \|\| y) {
133	input_report_rel(sensor->input, REL_X, x);	133	input_report_rel(sensor->input, REL_X, x);
134	input_report_rel(sensor->input, REL_Y, y);	134	input_report_rel(sensor->input, REL_Y, y);
@@ -141,17 +141,10 @@ static void rmi_2d_sensor_set_input_params(struct rmi_2d_sensor *sensor) · 6 unmodified lines
141	struct input_dev *input = sensor->input;	141	struct input_dev *input = sensor->input;
142	int res_x;	142	int res_x;
143	int res_y;	143	int res_y;
		144	int max_x, max_y;
144	int input_flags = 0;	145	int input_flags = 0;
145		146
146	if (sensor->report_abs) {	147	if (sensor->report_abs) {
147	if (sensor->axis_align.swap_axes) {
148	swap(sensor->max_x, sensor->max_y);
149	swap(sensor->axis_align.clip_x_low,
150	sensor->axis_align.clip_y_low);
151	swap(sensor->axis_align.clip_x_high,
152	sensor->axis_align.clip_y_high);
153	}
154
155	sensor->min_x = sensor->axis_align.clip_x_low;	148	sensor->min_x = sensor->axis_align.clip_x_low;
156	if (sensor->axis_align.clip_x_high)	149	if (sensor->axis_align.clip_x_high)
157	sensor->max_x = min(sensor->max_x,	150	sensor->max_x = min(sensor->max_x,
@@ -163,14 +156,19 @@ static void rmi_2d_sensor_set_input_params(struct rmi_2d_sensor *sensor) · 5 unmodified lines
163	sensor->axis_align.clip_y_high);	156	sensor->axis_align.clip_y_high);
164		157
165	set_bit(EV_ABS, input->evbit);	158	set_bit(EV_ABS, input->evbit);
166	input_set_abs_params(input, ABS_MT_POSITION_X, 0, sensor->max_x,	159
167	0, 0);	160	max_x = sensor->max_x;
168	input_set_abs_params(input, ABS_MT_POSITION_Y, 0, sensor->max_y,	161	max_y = sensor->max_y;
169	0, 0);	162	if (sensor->axis_align.swap_axes)
		163	swap(max_x, max_y);
		164	input_set_abs_params(input, ABS_MT_POSITION_X, 0, max_x, 0, 0);
		165	input_set_abs_params(input, ABS_MT_POSITION_Y, 0, max_y, 0, 0);
170		166
171	if (sensor->x_mm && sensor->y_mm) {	167	if (sensor->x_mm && sensor->y_mm) {
172	res_x = (sensor->max_x - sensor->min_x) / sensor->x_mm;	168	res_x = (sensor->max_x - sensor->min_x) / sensor->x_mm;
173	res_y = (sensor->max_y - sensor->min_y) / sensor->y_mm;	169	res_y = (sensor->max_y - sensor->min_y) / sensor->y_mm;
		170	if (sensor->axis_align.swap_axes)
		171	swap(res_x, res_y);
174		172
175	input_abs_set_res(input, ABS_X, res_x);	173	input_abs_set_res(input, ABS_X, res_x);
176	input_abs_set_res(input, ABS_Y, res_y);	174	input_abs_set_res(input, ABS_Y, res_y);

drivers/input/rmi4/rmi_bus.c+49−1

@@ -9,6 +9,8 @@ · 8 unmodified lines
9		9
10	#include <linux/kernel.h>	10	#include <linux/kernel.h>
11	#include <linux/device.h>	11	#include <linux/device.h>
		12	#include <linux/irq.h>
		13	#include <linux/irqdomain.h>
12	#include <linux/list.h>	14	#include <linux/list.h>
13	#include <linux/pm.h>	15	#include <linux/pm.h>
14	#include <linux/rmi.h>	16	#include <linux/rmi.h>
@@ -167,6 +169,39 @@ static inline void rmi_function_of_probe(struct rmi_function *fn) · 152 unmodified lines
167	{}	169	{}
168	#endif	170	#endif
169		171
		172	static struct irq_chip rmi_irq_chip = {
		173	.name = "rmi4",
		174	};
		175
		176	static int rmi_create_function_irq(struct rmi_function *fn,
		177	struct rmi_function_handler *handler)
		178	{
		179	struct rmi_driver_data *drvdata = dev_get_drvdata(&fn->rmi_dev->dev);
		180	int i, error;
		181
		182	for (i = 0; i < fn->num_of_irqs; i++) {
		183	set_bit(fn->irq_pos + i, fn->irq_mask);
		184
		185	fn->irq[i] = irq_create_mapping(drvdata->irqdomain,
		186	fn->irq_pos + i);
		187
		188	irq_set_chip_data(fn->irq[i], fn);
		189	irq_set_chip_and_handler(fn->irq[i], &rmi_irq_chip,
		190	handle_simple_irq);
		191	irq_set_nested_thread(fn->irq[i], 1);
		192
		193	error = devm_request_threaded_irq(&fn->dev, fn->irq[i], NULL,
		194	handler->attention, IRQF_ONESHOT,
		195	dev_name(&fn->dev), fn);
		196	if (error) {
		197	dev_err(&fn->dev, "Error %d registering IRQ\n", error);
		198	return error;
		199	}
		200	}
		201
		202	return 0;
		203	}
		204
170	static int rmi_function_probe(struct device *dev)	205	static int rmi_function_probe(struct device *dev)
171	{	206	{
172	struct rmi_function *fn = to_rmi_function(dev);	207	struct rmi_function *fn = to_rmi_function(dev);
@@ -178,7 +213,14 @@ static int rmi_function_probe(struct device *dev) · 5 unmodified lines
178		213
179	if (handler->probe) {	214	if (handler->probe) {
180	error = handler->probe(fn);	215	error = handler->probe(fn);
181	return error;	216	if (error)
		217	return error;
		218	}
		219
		220	if (fn->num_of_irqs && handler->attention) {
		221	error = rmi_create_function_irq(fn, handler);
		222	if (error)
		223	return error;
182	}	224	}
183		225
184	return 0;	226	return 0;
@@ -230,12 +272,18 @@ err_put_device: · 45 unmodified lines
230		272
231	void rmi_unregister_function(struct rmi_function *fn)	273	void rmi_unregister_function(struct rmi_function *fn)
232	{	274	{
		275	int i;
		276
233	rmi_dbg(RMI_DEBUG_CORE, &fn->dev, "Unregistering F%02X.\n",	277	rmi_dbg(RMI_DEBUG_CORE, &fn->dev, "Unregistering F%02X.\n",
234	fn->fd.function_number);	278	fn->fd.function_number);
235		279
236	device_del(&fn->dev);	280	device_del(&fn->dev);
237	of_node_put(fn->dev.of_node);	281	of_node_put(fn->dev.of_node);
238	put_device(&fn->dev);	282	put_device(&fn->dev);
		283
		284	for (i = 0; i < fn->num_of_irqs; i++)
		285	irq_dispose_mapping(fn->irq[i]);
		286
239	}	287	}
240		288
241	/**	289	/**

drivers/input/rmi4/rmi_bus.h+9−1

 struct rmi_device;
+/*
+ * The interrupt source count in the function descriptor can represent up to
+ * 6 interrupt sources in the normal manner.
+ */
+#define RMI_FN_MAX_IRQS	6
 /**
  * struct rmi_function - represents the implementation of an RMI4
  * function for a particular device (basically, a driver for that RMI4 function)
  * @irq_pos: The position in the irq bitfield this function holds
  * @irq_mask: For convenience, can be used to mask IRQ bits off during ATTN
  * interrupt handling.
+ * @irqs: assigned virq numbers (up to num_of_irqs)
  *
  * @node: entry in device's list of functions
  */
 	struct list_head node;
 	unsigned int num_of_irqs;
+	int irq[RMI_FN_MAX_IRQS];
 	unsigned int irq_pos;
 	unsigned long irq_mask[];
 };
 	void (*remove)(struct rmi_function *fn);
 	int (*config)(struct rmi_function *fn);
 	int (*reset)(struct rmi_function *fn);
-	int (*attention)(struct rmi_function *fn, unsigned long *irq_bits);
+	irqreturn_t (*attention)(int irq, void *ctx);
 	int (*suspend)(struct rmi_function *fn);
 	int (*resume)(struct rmi_function *fn);
 };

drivers/input/rmi4/rmi_driver.c+20−32

 #include <linux/pm.h>
 #include <linux/slab.h>
 #include <linux/of.h>
+#include <linux/irqdomain.h>
 #include <uapi/linux/input.h>
 #include <linux/rmi.h>
 #include "rmi_bus.h"
 	return 0;
 }
-static void process_one_interrupt(struct rmi_driver_data *data,
-				  struct rmi_function *fn)
-{
-	struct rmi_function_handler *fh;
-	if (!fn || !fn->dev.driver)
-		return;
-	fh = to_rmi_function_handler(fn->dev.driver);
-	if (fh->attention) {
-		bitmap_and(data->fn_irq_bits, data->irq_status, fn->irq_mask,
-				data->irq_count);
-		if (!bitmap_empty(data->fn_irq_bits, data->irq_count))
-			fh->attention(fn, data->fn_irq_bits);
-	}
-}
 static int rmi_process_interrupt_requests(struct rmi_device *rmi_dev)
 {
 	struct rmi_driver_data *data = dev_get_drvdata(&rmi_dev->dev);
 	struct device *dev = &rmi_dev->dev;
-	struct rmi_function *entry;
+	int i;
 	int error;
 	if (!data)
 	 */
 	mutex_unlock(&data->irq_mutex);
-	/*
+	for_each_set_bit(i, data->irq_status, data->irq_count)
-	 * It would be nice to be able to use irq_chip to handle these
+		handle_nested_irq(irq_find_mapping(data->irqdomain, i));
-	 * nested IRQs.  Unfortunately, most of the current customers for
-	 * this driver are using older kernels (3.0.x) that don't support
-	 * the features required for that.  Once they've shifted to more
-	 * recent kernels (say, 3.3 and higher), this should be switched to
-	 * use irq_chip.
-	 */
-	list_for_each_entry(entry, &data->function_list, node)
-		process_one_interrupt(data, entry);
 	if (data->input)
 		input_sync(data->input);
 static int rmi_driver_remove(struct device *dev)
 {
 	struct rmi_device *rmi_dev = to_rmi_device(dev);
+	struct rmi_driver_data *data = dev_get_drvdata(&rmi_dev->dev);
 	rmi_disable_irq(rmi_dev, false);
+	irq_domain_remove(data->irqdomain);
+	data->irqdomain = NULL;
 	rmi_f34_remove_sysfs(rmi_dev);
 	rmi_free_function_list(rmi_dev);
 {
 	struct rmi_device *rmi_dev = data->rmi_dev;
 	struct device *dev = &rmi_dev->dev;
-	int irq_count;
+	struct fwnode_handle *fwnode = rmi_dev->xport->dev->fwnode;
+	int irq_count = 0;
 	size_t size;
 	int retval;
 	 * being accessed.
 	 */
 	rmi_dbg(RMI_DEBUG_CORE, dev, "%s: Counting IRQs.\n", __func__);
-	irq_count = 0;
 	data->bootloader_mode = false;
 	retval = rmi_scan_pdt(rmi_dev, &irq_count, rmi_count_irqs);
 	if (data->bootloader_mode)
 		dev_warn(dev, "Device in bootloader mode.\n");
+	/* Allocate and register a linear revmap irq_domain */
+	data->irqdomain = irq_domain_create_linear(fwnode, irq_count,
+						   &irq_domain_simple_ops,
+						   data);
+	if (!data->irqdomain) {
+		dev_err(&rmi_dev->dev, "Failed to create IRQ domain\n");
+		return -ENOMEM;
+	}
 	data->irq_count = irq_count;
 	data->num_of_irq_regs = (data->irq_count + 7) / 8;
 {
 	struct rmi_device *rmi_dev = data->rmi_dev;
 	struct device *dev = &rmi_dev->dev;
-	int irq_count;
+	int irq_count = 0;
 	int retval;
-	irq_count = 0;
 	rmi_dbg(RMI_DEBUG_CORE, dev, "%s: Creating functions.\n", __func__);
 	retval = rmi_scan_pdt(rmi_dev, &irq_count, rmi_create_function);
 	if (retval < 0) {

drivers/input/rmi4/rmi_f01.c+5−5

 	return 0;
 }
-static int rmi_f01_attention(struct rmi_function *fn,
+static irqreturn_t rmi_f01_attention(int irq, void *ctx)
-			     unsigned long *irq_bits)
 {
+	struct rmi_function *fn = ctx;
 	struct rmi_device *rmi_dev = fn->rmi_dev;
 	int error;
 	u8 device_status;
 	if (error) {
 		dev_err(&fn->dev,
 			"Failed to read device status: %d.\n", error);
-		return error;
+		return IRQ_RETVAL(error);
 	}
 	if (RMI_F01_STATUS_BOOTLOADER(device_status))
 		error = rmi_dev->driver->reset_handler(rmi_dev);
 		if (error) {
 			dev_err(&fn->dev, "Device reset failed: %d\n", error);
-			return error;
+			return IRQ_RETVAL(error);
 		}
 	}
-	return 0;
+	return IRQ_HANDLED;
 }
 struct rmi_function_handler rmi_f01_handler = {

drivers/input/rmi4/rmi_f03.c+5−4

 	return 0;
 }
-static int rmi_f03_attention(struct rmi_function *fn, unsigned long *irq_bits)
+static irqreturn_t rmi_f03_attention(int irq, void *ctx)
 {
+	struct rmi_function *fn = ctx;
 	struct rmi_device *rmi_dev = fn->rmi_dev;
 	struct rmi_driver_data *drvdata = dev_get_drvdata(&rmi_dev->dev);
 	struct f03_data *f03 = dev_get_drvdata(&fn->dev);
 		/* First grab the data passed by the transport device */
 		if (drvdata->attn_data.size < ob_len) {
 			dev_warn(&fn->dev, "F03 interrupted, but data is missing!\n");
-			return 0;
+			return IRQ_HANDLED;
 		}
 		memcpy(obs, drvdata->attn_data.data, ob_len);
 				"%s: Failed to read F03 output buffers: %d\n",
 				__func__, error);
 			serio_interrupt(f03->serio, 0, SERIO_TIMEOUT);
-			return error;
+			return IRQ_RETVAL(error);
 		}
 	}
 		serio_interrupt(f03->serio, ob_data, serio_flags);
 	}
-	return 0;
+	return IRQ_HANDLED;
 }
 static void rmi_f03_remove(struct rmi_function *fn)

drivers/input/rmi4/rmi_f11.c+16−26

 }
 static void rmi_f11_finger_handler(struct f11_data *f11,
-				   struct rmi_2d_sensor *sensor,
+				   struct rmi_2d_sensor *sensor, int size)
-				   unsigned long *irq_bits, int num_irq_regs,
-				   int size)
 {
 	const u8 *f_state = f11->data.f_state;
 	u8 finger_state;
 	int rel_fingers;
 	int abs_size = sensor->nbr_fingers * RMI_F11_ABS_BYTES;
-	int abs_bits = bitmap_and(f11->result_bits, irq_bits, f11->abs_mask,
+	if (sensor->report_abs) {
-				  num_irq_regs * 8);
-	int rel_bits = bitmap_and(f11->result_bits, irq_bits, f11->rel_mask,
-				  num_irq_regs * 8);
-	if (abs_bits) {
 		if (abs_size > size)
 			abs_fingers = size / RMI_F11_ABS_BYTES;
 		else
 			rmi_f11_abs_pos_process(f11, sensor, &sensor->objs[i],
 							finger_state, i);
 		}
-	}
-	if (rel_bits) {
-		if ((abs_size + sensor->nbr_fingers * RMI_F11_REL_BYTES) > size)
-			rel_fingers = (size - abs_size) / RMI_F11_REL_BYTES;
-		else
-			rel_fingers = sensor->nbr_fingers;
-		for (i = 0; i < rel_fingers; i++)
-			rmi_f11_rel_pos_report(f11, i);
-	}
-	if (abs_bits) {
 		/*
 		 * the absolute part is made in 2 parts to allow the kernel
 		 * tracking to take place.
 		}
 		input_mt_sync_frame(sensor->input);
+	} else if (sensor->report_rel) {
+		if ((abs_size + sensor->nbr_fingers * RMI_F11_REL_BYTES) > size)
+			rel_fingers = (size - abs_size) / RMI_F11_REL_BYTES;
+		else
+			rel_fingers = sensor->nbr_fingers;
+		for (i = 0; i < rel_fingers; i++)
+			rmi_f11_rel_pos_report(f11, i);
 	}
 }
 static int f11_2d_construct_data(struct f11_data *f11)
 	return 0;
 }
-static int rmi_f11_attention(struct rmi_function *fn, unsigned long *irq_bits)
+static irqreturn_t rmi_f11_attention(int irq, void *ctx)
 {
+	struct rmi_function *fn = ctx;
 	struct rmi_device *rmi_dev = fn->rmi_dev;
 	struct rmi_driver_data *drvdata = dev_get_drvdata(&rmi_dev->dev);
 	struct f11_data *f11 = dev_get_drvdata(&fn->dev);
 				data_base_addr, f11->sensor.data_pkt,
 				f11->sensor.pkt_size);
 		if (error < 0)
-			return error;
+			return IRQ_RETVAL(error);
 	}
-	rmi_f11_finger_handler(f11, &f11->sensor, irq_bits,
+	rmi_f11_finger_handler(f11, &f11->sensor, valid_bytes);
-				drvdata->num_of_irq_regs, valid_bytes);
-	return 0;
+	return IRQ_HANDLED;
 }
 static int rmi_f11_resume(struct rmi_function *fn)

drivers/input/rmi4/rmi_f12.c+4−4

 		rmi_2d_sensor_abs_report(sensor, &sensor->objs[i], i);
 }
-static int rmi_f12_attention(struct rmi_function *fn,
+static irqreturn_t rmi_f12_attention(int irq, void *ctx)
-			     unsigned long *irq_nr_regs)
 {
 	int retval;
+	struct rmi_function *fn = ctx;
 	struct rmi_device *rmi_dev = fn->rmi_dev;
 	struct rmi_driver_data *drvdata = dev_get_drvdata(&rmi_dev->dev);
 	struct f12_data *f12 = dev_get_drvdata(&fn->dev);
 		if (retval < 0) {
 			dev_err(&fn->dev, "Failed to read object data. Code: %d.\n",
 				retval);
-			return retval;
+			return IRQ_RETVAL(retval);
 		}
 	}
 	input_mt_sync_frame(sensor->input);
-	return 0;
+	return IRQ_HANDLED;
 }
 static int rmi_f12_write_control_regs(struct rmi_function *fn)

drivers/input/rmi4/rmi_f30.c+5−4

 	}
 }
-static int rmi_f30_attention(struct rmi_function *fn, unsigned long *irq_bits)
+static irqreturn_t rmi_f30_attention(int irq, void *ctx)
 {
+	struct rmi_function *fn = ctx;
 	struct f30_data *f30 = dev_get_drvdata(&fn->dev);
 	struct rmi_driver_data *drvdata = dev_get_drvdata(&fn->rmi_dev->dev);
 	int error;
 		if (drvdata->attn_data.size < f30->register_count) {
 			dev_warn(&fn->dev,
 				 "F30 interrupted, but data is missing\n");
-			return 0;
+			return IRQ_HANDLED;
 		}
 		memcpy(f30->data_regs, drvdata->attn_data.data,
 			f30->register_count);
 			dev_err(&fn->dev,
 				"%s: Failed to read F30 data registers: %d\n",
 				__func__, error);
-			return error;
+			return IRQ_RETVAL(error);
 		}
 	}
 			rmi_f03_commit_buttons(f30->f03);
 	}
-	return 0;
+	return IRQ_HANDLED;
 }
 static int rmi_f30_config(struct rmi_function *fn)

drivers/input/rmi4/rmi_f34.c+3−2

 	return 0;
 }
-static int rmi_f34_attention(struct rmi_function *fn, unsigned long *irq_bits)
+static irqreturn_t rmi_f34_attention(int irq, void *ctx)
 {
+	struct rmi_function *fn = ctx;
 	struct f34_data *f34 = dev_get_drvdata(&fn->dev);
 	int ret;
 	u8 status;
 			complete(&f34->v7.cmd_done);
 	}
-	return 0;
+	return IRQ_HANDLED;
 }
 static int rmi_f34_write_blocks(struct f34_data *f34, const void *data,

drivers/input/rmi4/rmi_f54.c+0−6

 	mutex_unlock(&f54->data_mutex);
 }
-static int rmi_f54_attention(struct rmi_function *fn, unsigned long *irqbits)
-{
-	return 0;
-}
 static int rmi_f54_config(struct rmi_function *fn)
 {
 	struct rmi_driver *drv = fn->rmi_dev->driver;
 	.func = 0x54,
 	.probe = rmi_f54_probe,
 	.config = rmi_f54_config,
-	.attention = rmi_f54_attention,
 	.remove = rmi_f54_remove,
 };

drivers/input/touchscreen/silead.c+1−0

@@ -603,6 +603,7 @@ static const struct acpi_device_id silead_ts_acpi_match[] = { · 602 unmodified lines
603	{ "GSL3692", 0 },	603	{ "GSL3692", 0 },
604	{ "MSSL1680", 0 },	604	{ "MSSL1680", 0 },
605	{ "MSSL0001", 0 },	605	{ "MSSL0001", 0 },
		606	{ "MSSL0002", 0 },
606	{ }	607	{ }
607	};	608	};
608	MODULE_DEVICE_TABLE(acpi, silead_ts_acpi_match);	609	MODULE_DEVICE_TABLE(acpi, silead_ts_acpi_match);

drivers/irqchip/irq-gic-v2m.c+1−1

@@ -199,7 +199,7 @@ static int gicv2m_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, · 198 unmodified lines
199		199
200	fail:	200	fail:
201	irq_domain_free_irqs_parent(domain, virq, nr_irqs);	201	irq_domain_free_irqs_parent(domain, virq, nr_irqs);
202	gicv2m_unalloc_msi(v2m, hwirq, get_count_order(nr_irqs));	202	gicv2m_unalloc_msi(v2m, hwirq, nr_irqs);
203	return err;	203	return err;
204	}	204	}
205		205

drivers/irqchip/irq-gic-v3-its.c+50−12

 	return its->collections + its_dev->event_map.col_map[event];
 }
+static struct its_collection *valid_col(struct its_collection *col)
+{
+	if (WARN_ON_ONCE(col->target_address & GENMASK_ULL(0, 15)))
+		return NULL;
+	return col;
+}
+static struct its_vpe *valid_vpe(struct its_node *its, struct its_vpe *vpe)
+{
+	if (valid_col(its->collections + vpe->col_idx))
+		return vpe;
+	return NULL;
+}
 /*
  * ITS command descriptors - parameters to be encoded in a command
  * block.
 	its_fixup_cmd(cmd);
-	return col;
+	return valid_col(col);
 }
 static struct its_collection *its_build_movi_cmd(struct its_node *its,
 	its_fixup_cmd(cmd);
-	return col;
+	return valid_col(col);
 }
 static struct its_collection *its_build_discard_cmd(struct its_node *its,
 	its_fixup_cmd(cmd);
-	return col;
+	return valid_col(col);
 }
 static struct its_collection *its_build_inv_cmd(struct its_node *its,
 	its_fixup_cmd(cmd);
-	return col;
+	return valid_col(col);
 }
 static struct its_collection *its_build_int_cmd(struct its_node *its,
 	its_fixup_cmd(cmd);
-	return col;
+	return valid_col(col);
 }
 static struct its_collection *its_build_clear_cmd(struct its_node *its,
 	its_fixup_cmd(cmd);
-	return col;
+	return valid_col(col);
 }
 static struct its_collection *its_build_invall_cmd(struct its_node *its,
 	its_fixup_cmd(cmd);
-	return desc->its_vinvall_cmd.vpe;
+	return valid_vpe(its, desc->its_vinvall_cmd.vpe);
 }
 static struct its_vpe *its_build_vmapp_cmd(struct its_node *its,
 	its_fixup_cmd(cmd);
-	return desc->its_vmapp_cmd.vpe;
+	return valid_vpe(its, desc->its_vmapp_cmd.vpe);
 }
 static struct its_vpe *its_build_vmapti_cmd(struct its_node *its,
 	its_fixup_cmd(cmd);
-	return desc->its_vmapti_cmd.vpe;
+	return valid_vpe(its, desc->its_vmapti_cmd.vpe);
 }
 static struct its_vpe *its_build_vmovi_cmd(struct its_node *its,
 	its_fixup_cmd(cmd);
-	return desc->its_vmovi_cmd.vpe;
+	return valid_vpe(its, desc->its_vmovi_cmd.vpe);
 }
 static struct its_vpe *its_build_vmovp_cmd(struct its_node *its,
 	its_fixup_cmd(cmd);
-	return desc->its_vmovp_cmd.vpe;
+	return valid_vpe(its, desc->its_vmovp_cmd.vpe);
 }
 static u64 its_cmd_ptr_to_offset(struct its_node *its,
 static int its_alloc_collections(struct its_node *its)
 {
+	int i;
 	its->collections = kcalloc(nr_cpu_ids, sizeof(*its->collections),
 				   GFP_KERNEL);
 	if (!its->collections)
 		return -ENOMEM;
+	for (i = 0; i < nr_cpu_ids; i++)
+		its->collections[i].target_address = ~0ULL;
 	return 0;
 }
 		cpu_mask = cpumask_of_node(its_dev->its->numa_node);
 	/* Bind the LPI to the first possible CPU */
-	cpu = cpumask_first(cpu_mask);
+	cpu = cpumask_first_and(cpu_mask, cpu_online_mask);
+	if (cpu >= nr_cpu_ids) {
+		if (its_dev->its->flags & ITS_FLAGS_WORKAROUND_CAVIUM_23144)
+			return -EINVAL;
+		cpu = cpumask_first(cpu_online_mask);
+	}
 	its_dev->event_map.col_map[event] = cpu;
 	irq_data_update_effective_affinity(d, cpumask_of(cpu));
 	u64 timeout = USEC_PER_SEC;
 	u64 val;
+	/*
+	 * If coming via a CPU hotplug event, we don't need to disable
+	 * LPIs before trying to re-enable them. They are already
+	 * configured and all is well in the world. Detect this case
+	 * by checking the allocation of the pending table for the
+	 * current CPU.
+	 */
+	if (gic_data_rdist()->pend_page)
+		return 0;
 	if (!gic_rdists_supports_plpis()) {
 		pr_info("CPU%d: LPIs not supported\n", smp_processor_id());
 		return -ENXIO;

drivers/irqchip/irq-ls-scfg-msi.c+7−3

 	msg->address_lo = lower_32_bits(msi_data->msiir_addr);
 	msg->data = data->hwirq;
-	if (msi_affinity_flag)
+	if (msi_affinity_flag) {
-		msg->data |= cpumask_first(data->common->affinity);
+		const struct cpumask *mask;
+		mask = irq_data_get_effective_affinity_mask(data);
+		msg->data |= cpumask_first(mask);
+	}
 	iommu_dma_map_msi_msg(data->irq, msg);
 }
 		return -EINVAL;
 	}
-	cpumask_copy(irq_data->common->affinity, mask);
+	irq_data_update_effective_affinity(irq_data, cpumask_of(cpu));
 	return IRQ_SET_MASK_OK;
 }

drivers/isdn/mISDN/socket.c+1−1

@@ -588,7 +588,7 @@ static const struct proto_ops data_sock_ops = { · 587 unmodified lines
588	.getname = data_sock_getname,	588	.getname = data_sock_getname,
589	.sendmsg = mISDN_sock_sendmsg,	589	.sendmsg = mISDN_sock_sendmsg,
590	.recvmsg = mISDN_sock_recvmsg,	590	.recvmsg = mISDN_sock_recvmsg,
591	.poll_mask = datagram_poll_mask,	591	.poll = datagram_poll,
592	.listen = sock_no_listen,	592	.listen = sock_no_listen,
593	.shutdown = sock_no_shutdown,	593	.shutdown = sock_no_shutdown,
594	.setsockopt = data_sock_setsockopt,	594	.setsockopt = data_sock_setsockopt,

drivers/lightnvm/Kconfig+1−1

@@ -4,7 +4,7 @@ · 3 unmodified lines
4		4
5	menuconfig NVM	5	menuconfig NVM
6	bool "Open-Channel SSD target support"	6	bool "Open-Channel SSD target support"
7	depends on BLOCK && HAS_DMA && PCI	7	depends on BLOCK && PCI
8	select BLK_DEV_NVME	8	select BLK_DEV_NVME
9	help	9	help
10	Say Y here to get to enable Open-channel SSDs.	10	Say Y here to get to enable Open-channel SSDs.

drivers/md/dm-raid.c+1−1

@@ -588,7 +588,7 @@ static const char *raid10_md_layout_to_format(int layout) · 587 unmodified lines
588	}	588	}
589		589
590	/* Return md raid10 algorithm for @name */	590	/* Return md raid10 algorithm for @name */
591	static const int raid10_name_to_format(const char *name)	591	static int raid10_name_to_format(const char *name)
592	{	592	{
593	if (!strcasecmp(name, "near"))	593	if (!strcasecmp(name, "near"))
594	return ALGORITHM_RAID10_NEAR;	594	return ALGORITHM_RAID10_NEAR;

drivers/md/dm-table.c+4−3

 static int device_supports_dax(struct dm_target *ti, struct dm_dev *dev,
 			       sector_t start, sector_t len, void *data)
 {
-	struct request_queue *q = bdev_get_queue(dev->bdev);
+	return bdev_dax_supported(dev->bdev, PAGE_SIZE);
-	return q && blk_queue_dax(q);
 }
 static bool dm_table_supports_dax(struct dm_table *t)
 	if (dm_table_supports_dax(t))
 		blk_queue_flag_set(QUEUE_FLAG_DAX, q);
+	else
+		blk_queue_flag_clear(QUEUE_FLAG_DAX, q);
 	if (dm_table_supports_dax_write_cache(t))
 		dax_write_cache(t->md->dax_dev, true);

drivers/md/dm-thin-metadata.c+0−9

 static int __commit_transaction(struct dm_pool_metadata *pmd)
 {
 	int r;
-	size_t metadata_len, data_len;
 	struct thin_disk_superblock *disk_super;
 	struct dm_block *sblock;
 	if (r < 0)
 		return r;
-	r = dm_sm_root_size(pmd->metadata_sm, &metadata_len);
-	if (r < 0)
-		return r;
-	r = dm_sm_root_size(pmd->data_sm, &data_len);
-	if (r < 0)
-		return r;
 	r = save_sm_roots(pmd);
 	if (r < 0)
 		return r;

drivers/md/dm-thin.c+9−2

 static void set_pool_mode(struct pool *pool, enum pool_mode new_mode);
+static void requeue_bios(struct pool *pool);
 static void check_for_space(struct pool *pool)
 {
 	int r;
 	if (r)
 		return;
-	if (nr_free)
+	if (nr_free) {
 		set_pool_mode(pool, PM_WRITE);
+		requeue_bios(pool);
+	}
 }
 /*
 	r = dm_pool_alloc_data_block(pool->pmd, result);
 	if (r) {
-		metadata_operation_failed(pool, "dm_pool_alloc_data_block", r);
+		if (r == -ENOSPC)
+			set_pool_mode(pool, PM_OUT_OF_DATA_SPACE);
+		else
+			metadata_operation_failed(pool, "dm_pool_alloc_data_block", r);
 		return r;
 	}

drivers/md/dm-writecache.c+5−5

@@ -259,7 +259,7 @@ static int persistent_memory_claim(struct dm_writecache *wc) · 258 unmodified lines
259	if (da != p) {	259	if (da != p) {
260	long i;	260	long i;
261	wc->memory_map = NULL;	261	wc->memory_map = NULL;
262	pages = kvmalloc(p * sizeof(struct page *), GFP_KERNEL);	262	pages = kvmalloc_array(p, sizeof(struct page *), GFP_KERNEL);
263	if (!pages) {	263	if (!pages) {
264	r = -ENOMEM;	264	r = -ENOMEM;
265	goto err2;	265	goto err2;
@@ -859,7 +859,7 @@ static int writecache_alloc_entries(struct dm_writecache *wc) · 593 unmodified lines
859		859
860	if (wc->entries)	860	if (wc->entries)
861	return 0;	861	return 0;
862	wc->entries = vmalloc(sizeof(struct wc_entry) * wc->n_blocks);	862	wc->entries = vmalloc(array_size(sizeof(struct wc_entry), wc->n_blocks));
863	if (!wc->entries)	863	if (!wc->entries)
864	return -ENOMEM;	864	return -ENOMEM;
865	for (b = 0; b < wc->n_blocks; b++) {	865	for (b = 0; b < wc->n_blocks; b++) {
@@ -1481,9 +1481,9 @@ static void __writecache_writeback_pmem(struct dm_writecache *wc, struct writeba · 615 unmodified lines
1481	wb->bio.bi_iter.bi_sector = read_original_sector(wc, e);	1481	wb->bio.bi_iter.bi_sector = read_original_sector(wc, e);
1482	wb->page_offset = PAGE_SIZE;	1482	wb->page_offset = PAGE_SIZE;
1483	if (max_pages <= WB_LIST_INLINE \|\|	1483	if (max_pages <= WB_LIST_INLINE \|\|
1484	unlikely(!(wb->wc_list = kmalloc(max_pages * sizeof(struct wc_entry *),	1484	unlikely(!(wb->wc_list = kmalloc_array(max_pages, sizeof(struct wc_entry *),
1485	GFP_NOIO \| __GFP_NORETRY \|	1485	GFP_NOIO \| __GFP_NORETRY \|
1486	__GFP_NOMEMALLOC \| __GFP_NOWARN)))) {	1486	__GFP_NOMEMALLOC \| __GFP_NOWARN)))) {
1487	wb->wc_list = wb->wc_list_inline;	1487	wb->wc_list = wb->wc_list_inline;
1488	max_pages = WB_LIST_INLINE;	1488	max_pages = WB_LIST_INLINE;
1489	}	1489	}

drivers/md/dm-zoned-target.c+1−1

@@ -787,7 +787,7 @@ static int dmz_ctr(struct dm_target ti, unsigned int argc, char *argv) · 786 unmodified lines
787		787
788	/* Chunk BIO work */	788	/* Chunk BIO work */
789	mutex_init(&dmz->chunk_lock);	789	mutex_init(&dmz->chunk_lock);
790	INIT_RADIX_TREE(&dmz->chunk_rxtree, GFP_KERNEL);	790	INIT_RADIX_TREE(&dmz->chunk_rxtree, GFP_NOIO);
791	dmz->chunk_wq = alloc_workqueue("dmz_cwq_%s", WQ_MEM_RECLAIM \| WQ_UNBOUND,	791	dmz->chunk_wq = alloc_workqueue("dmz_cwq_%s", WQ_MEM_RECLAIM \| WQ_UNBOUND,
792	0, dev->name);	792	0, dev->name);
793	if (!dmz->chunk_wq) {	793	if (!dmz->chunk_wq) {

drivers/md/dm.c+3−5

 	if (len < 1)
 		goto out;
 	nr_pages = min(len, nr_pages);
-	if (ti->type->direct_access)
+	ret = ti->type->direct_access(ti, pgoff, nr_pages, kaddr, pfn);
-		ret = ti->type->direct_access(ti, pgoff, nr_pages, kaddr, pfn);
  out:
 	dm_put_live_table(md, srcu_idx);
 				 * the usage of io->orig_bio in dm_remap_zone_report()
 				 * won't be affected by this reassignment.
 				 */
-				struct bio *b = bio_clone_bioset(bio, GFP_NOIO,
+				struct bio *b = bio_split(bio, bio_sectors(bio) - ci.sector_count,
-								 &md->queue->bio_split);
+							  GFP_NOIO, &md->queue->bio_split);
 				ci.io->orig_bio = b;
-				bio_advance(bio, (bio_sectors(bio) - ci.sector_count) << 9);
 				bio_chain(b, bio);
 				ret = generic_make_request(bio);
 				break;

drivers/mtd/chips/cfi_cmdset_0002.c+11−8

 struct ppb_lock {
 	struct flchip *chip;
-	loff_t offset;
+	unsigned long adr;
 	int locked;
 };
 	unsigned long timeo;
 	int ret;
+	adr += chip->start;
 	mutex_lock(&chip->mutex);
-	ret = get_chip(map, chip, adr + chip->start, FL_LOCKING);
+	ret = get_chip(map, chip, adr, FL_LOCKING);
 	if (ret) {
 		mutex_unlock(&chip->mutex);
 		return ret;
 	if (thunk == DO_XXLOCK_ONEBLOCK_LOCK) {
 		chip->state = FL_LOCKING;
-		map_write(map, CMD(0xA0), chip->start + adr);
+		map_write(map, CMD(0xA0), adr);
-		map_write(map, CMD(0x00), chip->start + adr);
+		map_write(map, CMD(0x00), adr);
 	} else if (thunk == DO_XXLOCK_ONEBLOCK_UNLOCK) {
 		/*
 		 * Unlocking of one specific sector is not supported, so we
 	map_write(map, CMD(0x00), chip->start);
 	chip->state = FL_READY;
-	put_chip(map, chip, adr + chip->start);
+	put_chip(map, chip, adr);
 	mutex_unlock(&chip->mutex);
 	return ret;
 		 * sectors shall be unlocked, so lets keep their locking
 		 * status at "unlocked" (locked=0) for the final re-locking.
 		 */
-		if ((adr < ofs) || (adr >= (ofs + len))) {
+		if ((offset < ofs) || (offset >= (ofs + len))) {
 			sect[sectors].chip = &cfi->chips[chipnum];
-			sect[sectors].offset = offset;
+			sect[sectors].adr = adr;
 			sect[sectors].locked = do_ppb_xxlock(
 				map, &cfi->chips[chipnum], adr, 0,
 				DO_XXLOCK_ONEBLOCK_GETLOCK);
 			i++;
 		if (adr >> cfi->chipshift) {
+			if (offset >= (ofs + len))
+				break;
 			adr = 0;
 			chipnum++;
 	 */
 	for (i = 0; i < sectors; i++) {
 		if (sect[i].locked)
-			do_ppb_xxlock(map, sect[i].chip, sect[i].offset, 0,
+			do_ppb_xxlock(map, sect[i].chip, sect[i].adr, 0,
 				      DO_XXLOCK_ONEBLOCK_LOCK);
 	}

drivers/mtd/devices/mtd_dataflash.c+2−2

@@ -733,8 +733,8 @@ static struct flash_info dataflash_data[] = { · 732 unmodified lines
733	{ "AT45DB642x", 0x1f2800, 8192, 1056, 11, SUP_POW2PS},	733	{ "AT45DB642x", 0x1f2800, 8192, 1056, 11, SUP_POW2PS},
734	{ "at45db642d", 0x1f2800, 8192, 1024, 10, SUP_POW2PS \| IS_POW2PS},	734	{ "at45db642d", 0x1f2800, 8192, 1024, 10, SUP_POW2PS \| IS_POW2PS},
735		735
736	{ "AT45DB641E", 0x1f28000100, 32768, 264, 9, SUP_EXTID \| SUP_POW2PS},	736	{ "AT45DB641E", 0x1f28000100ULL, 32768, 264, 9, SUP_EXTID \| SUP_POW2PS},
737	{ "at45db641e", 0x1f28000100, 32768, 256, 8, SUP_EXTID \| SUP_POW2PS \| IS_POW2PS},	737	{ "at45db641e", 0x1f28000100ULL, 32768, 256, 8, SUP_EXTID \| SUP_POW2PS \| IS_POW2PS},
738	};	738	};
739		739
740	static struct flash_info jedec_lookup(struct spi_device spi,	740	static struct flash_info jedec_lookup(struct spi_device spi,

drivers/mtd/nand/raw/denali_dt.c+5−1

 	if (ret)
 		return ret;
-	denali->clk_x_rate = clk_get_rate(dt->clk);
+	/*
+	 * Hardcode the clock rate for the backward compatibility.
+	 * This works for both SOCFPGA and UniPhier.
+	 */
+	denali->clk_x_rate = 200000000;
 	ret = denali_init(denali);
 	if (ret)

drivers/mtd/nand/raw/mxc_nand.c+4−1

 #define NFC_V1_V2_CONFIG		(host->regs + 0x0a)
 #define NFC_V1_V2_ECC_STATUS_RESULT	(host->regs + 0x0c)
 #define NFC_V1_V2_RSLTMAIN_AREA		(host->regs + 0x0e)
-#define NFC_V1_V2_RSLTSPARE_AREA	(host->regs + 0x10)
+#define NFC_V21_RSLTSPARE_AREA		(host->regs + 0x10)
 #define NFC_V1_V2_WRPROT		(host->regs + 0x12)
 #define NFC_V1_UNLOCKSTART_BLKADDR	(host->regs + 0x14)
 #define NFC_V1_UNLOCKEND_BLKADDR	(host->regs + 0x16)
 	writew(config1, NFC_V1_V2_CONFIG1);
 	/* preset operation */
+	/* spare area size in 16-bit half-words */
+	writew(mtd->oobsize / 2, NFC_V21_RSLTSPARE_AREA);
 	/* Unlock the internal RAM Buffer */
 	writew(0x2, NFC_V1_V2_CONFIG);

drivers/mtd/nand/raw/nand_base.c+1−1

@@ -440,7 +440,7 @@ static int nand_block_bad(struct mtd_info *mtd, loff_t ofs) · 439 unmodified lines
440		440
441	for (; page < page_end; page++) {	441	for (; page < page_end; page++) {
442	res = chip->ecc.read_oob(mtd, chip, page);	442	res = chip->ecc.read_oob(mtd, chip, page);
443	if (res)	443	if (res < 0)
444	return res;	444	return res;
445		445
446	bad = chip->oob_poi[chip->badblockpos];	446	bad = chip->oob_poi[chip->badblockpos];

drivers/mtd/nand/raw/nand_macronix.c+36−12

@@ -17,23 +17,47 @@ · 16 unmodified lines
17		17
18	#include <linux/mtd/rawnand.h>	18	#include <linux/mtd/rawnand.h>
19		19
		20	/*
		21	* Macronix AC series does not support using SET/GET_FEATURES to change
		22	* the timings unlike what is declared in the parameter page. Unflag
		23	* this feature to avoid unnecessary downturns.
		24	*/
		25	static void macronix_nand_fix_broken_get_timings(struct nand_chip *chip)
		26	{
		27	unsigned int i;
		28	static const char * const broken_get_timings[] = {
		29	"MX30LF1G18AC",
		30	"MX30LF1G28AC",
		31	"MX30LF2G18AC",
		32	"MX30LF2G28AC",
		33	"MX30LF4G18AC",
		34	"MX30LF4G28AC",
		35	"MX60LF8G18AC",
		36	};
		37
		38	if (!chip->parameters.supports_set_get_features)
		39	return;
		40
		41	for (i = 0; i < ARRAY_SIZE(broken_get_timings); i++) {
		42	if (!strcmp(broken_get_timings[i], chip->parameters.model))
		43	break;
		44	}
		45
		46	if (i == ARRAY_SIZE(broken_get_timings))
		47	return;
		48
		49	bitmap_clear(chip->parameters.get_feature_list,
		50	ONFI_FEATURE_ADDR_TIMING_MODE, 1);
		51	bitmap_clear(chip->parameters.set_feature_list,
		52	ONFI_FEATURE_ADDR_TIMING_MODE, 1);
		53	}
		54
20	static int macronix_nand_init(struct nand_chip *chip)	55	static int macronix_nand_init(struct nand_chip *chip)
21	{	56	{
22	if (nand_is_slc(chip))	57	if (nand_is_slc(chip))
23	chip->bbt_options \|= NAND_BBT_SCAN2NDPAGE;	58	chip->bbt_options \|= NAND_BBT_SCAN2NDPAGE;
24		59
25	/*	60	macronix_nand_fix_broken_get_timings(chip);
26	* MX30LF2G18AC chip does not support using SET/GET_FEATURES to change
27	* the timings unlike what is declared in the parameter page. Unflag
28	* this feature to avoid unnecessary downturns.
29	*/
30	if (chip->parameters.supports_set_get_features &&
31	!strcmp("MX30LF2G18AC", chip->parameters.model)) {
32	bitmap_clear(chip->parameters.get_feature_list,
33	ONFI_FEATURE_ADDR_TIMING_MODE, 1);
34	bitmap_clear(chip->parameters.set_feature_list,
35	ONFI_FEATURE_ADDR_TIMING_MODE, 1);
36	}
37		61
38	return 0;	62	return 0;
39	}	63	}

drivers/mtd/nand/raw/nand_micron.c+2−0

@@ -66,7 +66,9 @@ static int micron_nand_onfi_init(struct nand_chip *chip) · 65 unmodified lines
66		66
67	if (p->supports_set_get_features) {	67	if (p->supports_set_get_features) {
68	set_bit(ONFI_FEATURE_ADDR_READ_RETRY, p->set_feature_list);	68	set_bit(ONFI_FEATURE_ADDR_READ_RETRY, p->set_feature_list);
		69	set_bit(ONFI_FEATURE_ON_DIE_ECC, p->set_feature_list);
69	set_bit(ONFI_FEATURE_ADDR_READ_RETRY, p->get_feature_list);	70	set_bit(ONFI_FEATURE_ADDR_READ_RETRY, p->get_feature_list);
		71	set_bit(ONFI_FEATURE_ON_DIE_ECC, p->get_feature_list);
70	}	72	}
71		73
72	return 0;	74	return 0;

drivers/net/ethernet/amd/Kconfig+1−1

@@ -173,7 +173,7 @@ config SUNLANCE · 172 unmodified lines
173		173
174	config AMD_XGBE	174	config AMD_XGBE
175	tristate "AMD 10GbE Ethernet driver"	175	tristate "AMD 10GbE Ethernet driver"
176	depends on ((OF_NET && OF_ADDRESS) \|\| ACPI \|\| PCI) && HAS_IOMEM && HAS_DMA	176	depends on ((OF_NET && OF_ADDRESS) \|\| ACPI \|\| PCI) && HAS_IOMEM
177	depends on X86 \|\| ARM64 \|\| COMPILE_TEST	177	depends on X86 \|\| ARM64 \|\| COMPILE_TEST
178	select BITREVERSE	178	select BITREVERSE
179	select CRC32	179	select CRC32

drivers/net/ethernet/apm/xgene-v2/Kconfig+0−1

@@ -1,6 +1,5 @@
1	config NET_XGENE_V2	1	config NET_XGENE_V2
2	tristate "APM X-Gene SoC Ethernet-v2 Driver"	2	tristate "APM X-Gene SoC Ethernet-v2 Driver"
3	depends on HAS_DMA
4	depends on ARCH_XGENE \|\| COMPILE_TEST	3	depends on ARCH_XGENE \|\| COMPILE_TEST
5	help	4	help
6	This is the Ethernet driver for the on-chip ethernet interface	5	This is the Ethernet driver for the on-chip ethernet interface

drivers/net/ethernet/apm/xgene/Kconfig+0−1

@@ -1,6 +1,5 @@
1	config NET_XGENE	1	config NET_XGENE
2	tristate "APM X-Gene SoC Ethernet Driver"	2	tristate "APM X-Gene SoC Ethernet Driver"
3	depends on HAS_DMA
4	depends on ARCH_XGENE \|\| COMPILE_TEST	3	depends on ARCH_XGENE \|\| COMPILE_TEST
5	select PHYLIB	4	select PHYLIB
6	select MDIO_XGENE	5	select MDIO_XGENE

drivers/net/ethernet/arc/Kconfig+4−2

 config ARC_EMAC
 	tristate "ARC EMAC support"
 	select ARC_EMAC_CORE
-	depends on OF_IRQ && OF_NET && HAS_DMA && (ARC || COMPILE_TEST)
+	depends on OF_IRQ && OF_NET
+	depends on ARC || COMPILE_TEST
 	---help---
 	  On some legacy ARC (Synopsys) FPGA boards such as ARCAngel4/ML50x
 	  non-standard on-chip ethernet device ARC EMAC 10/100 is used.
 config EMAC_ROCKCHIP
 	tristate "Rockchip EMAC support"
 	select ARC_EMAC_CORE
-	depends on OF_IRQ && OF_NET && REGULATOR && HAS_DMA && (ARCH_ROCKCHIP || COMPILE_TEST)
+	depends on OF_IRQ && OF_NET && REGULATOR
+	depends on ARCH_ROCKCHIP || COMPILE_TEST
 	---help---
 	  Support for Rockchip RK3036/RK3066/RK3188 EMAC ethernet controllers.
 	  This selects Rockchip SoC glue layer support for the

drivers/net/ethernet/broadcom/Kconfig+0−2

 config BGMAC_BCMA
 	tristate "Broadcom iProc GBit BCMA support"
 	depends on BCMA && BCMA_HOST_SOC
-	depends on HAS_DMA
 	depends on BCM47XX || ARCH_BCM_5301X || COMPILE_TEST
 	select BGMAC
 	select PHYLIB
 config BGMAC_PLATFORM
 	tristate "Broadcom iProc GBit platform support"
-	depends on HAS_DMA
 	depends on ARCH_BCM_IPROC || COMPILE_TEST
 	depends on OF
 	select BGMAC

drivers/net/ethernet/cadence/macb_ptp.c+1−4

 	if (delta > TSU_NSEC_MAX_VAL) {
 		gem_tsu_get_time(&bp->ptp_clock_info, &now);
-		if (sign)
+		now = timespec64_add(now, then);
-			now = timespec64_sub(now, then);
-		else
-			now = timespec64_add(now, then);
 		gem_tsu_set_time(&bp->ptp_clock_info,
 				 (const struct timespec64 *)&now);

drivers/net/ethernet/calxeda/Kconfig+1−1

@@ -1,6 +1,6 @@
1	config NET_CALXEDA_XGMAC	1	config NET_CALXEDA_XGMAC
2	tristate "Calxeda 1G/10G XGMAC Ethernet driver"	2	tristate "Calxeda 1G/10G XGMAC Ethernet driver"
3	depends on HAS_IOMEM && HAS_DMA	3	depends on HAS_IOMEM
4	depends on ARCH_HIGHBANK \|\| COMPILE_TEST	4	depends on ARCH_HIGHBANK \|\| COMPILE_TEST
5	select CRC32	5	select CRC32
6	help	6	help

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c+1−1

@@ -263,7 +263,7 @@ static void dcb_tx_queue_prio_enable(struct net_device *dev, int enable) · 262 unmodified lines
263	"Can't %s DCB Priority on port %d, TX Queue %d: err=%d\n",	263	"Can't %s DCB Priority on port %d, TX Queue %d: err=%d\n",
264	enable ? "set" : "unset", pi->port_id, i, -err);	264	enable ? "set" : "unset", pi->port_id, i, -err);
265	else	265	else
266	txq->dcb_prio = value;	266	txq->dcb_prio = enable ? value : 0;
267	}	267	}
268	}	268	}
269		269

drivers/net/ethernet/cisco/enic/enic_clsf.c+1−2

 	enic->rfs_h.max = enic->config.num_arfs;
 	enic->rfs_h.free = enic->rfs_h.max;
 	enic->rfs_h.toclean = 0;
-	enic_rfs_timer_start(enic);
 }
 void enic_rfs_flw_tbl_free(struct enic *enic)
 	enic_rfs_timer_stop(enic);
 	spin_lock_bh(&enic->rfs_h.lock);
-	enic->rfs_h.free = 0;
 	for (i = 0; i < (1 << ENIC_RFS_FLW_BITSHIFT); i++) {
 		struct hlist_head *hhead;
 		struct hlist_node *tmp;
 			enic_delfltr(enic, n->fltr_id);
 			hlist_del(&n->node);
 			kfree(n);
+			enic->rfs_h.free++;
 		}
 	}
 	spin_unlock_bh(&enic->rfs_h.lock);

drivers/net/ethernet/cisco/enic/enic_main.c+6−6

 {
 	struct enic *enic = netdev_priv(netdev);
 	unsigned int i;
-	int err;
+	int err, ret;
 	err = enic_request_intr(enic);
 	if (err) {
 		vnic_intr_unmask(&enic->intr[i]);
 	enic_notify_timer_start(enic);
-	enic_rfs_flw_tbl_init(enic);
+	enic_rfs_timer_start(enic);
 	return 0;
 err_out_free_rq:
 	for (i = 0; i < enic->rq_count; i++) {
-		err = vnic_rq_disable(&enic->rq[i]);
+		ret = vnic_rq_disable(&enic->rq[i]);
-		if (err)
+		if (!ret)
-			return err;
+			vnic_rq_clean(&enic->rq[i], enic_free_rq_buf);
-		vnic_rq_clean(&enic->rq[i], enic_free_rq_buf);
 	}
 	enic_dev_notify_unset(enic);
 err_out_free_intr:
 	timer_setup(&enic->notify_timer, enic_notify_timer, 0);
+	enic_rfs_flw_tbl_init(enic);
 	enic_set_rx_coal_setting(enic);
 	INIT_WORK(&enic->reset, enic_reset);
 	INIT_WORK(&enic->tx_hang_reset, enic_tx_hang_reset);

drivers/net/ethernet/faraday/ftgmac100.c+2−2

@@ -1735,8 +1735,8 @@ static void ftgmac100_ncsi_handler(struct ncsi_dev *nd) · 1734 unmodified lines
1735	if (unlikely(nd->state != ncsi_dev_state_functional))	1735	if (unlikely(nd->state != ncsi_dev_state_functional))
1736	return;	1736	return;
1737		1737
1738	netdev_info(nd->dev, "NCSI interface %s\n",	1738	netdev_dbg(nd->dev, "NCSI interface %s\n",
1739	nd->link_up ? "up" : "down");	1739	nd->link_up ? "up" : "down");
1740	}	1740	}
1741		1741
1742	static void ftgmac100_setup_clk(struct ftgmac100 *priv)	1742	static void ftgmac100_setup_clk(struct ftgmac100 *priv)

drivers/net/ethernet/hisilicon/Kconfig+1−1

@@ -5,7 +5,7 @@ · 4 unmodified lines
5	config NET_VENDOR_HISILICON	5	config NET_VENDOR_HISILICON
6	bool "Hisilicon devices"	6	bool "Hisilicon devices"
7	default y	7	default y
8	depends on (OF \|\| ACPI) && HAS_DMA	8	depends on OF \|\| ACPI
9	depends on ARM \|\| ARM64 \|\| COMPILE_TEST	9	depends on ARM \|\| ARM64 \|\| COMPILE_TEST
10	---help---	10	---help---
11	If you have a network (Ethernet) card belonging to this class, say Y.	11	If you have a network (Ethernet) card belonging to this class, say Y.

drivers/net/ethernet/intel/i40e/i40e_txrx.c+3−4

 	unsigned int truesize = i40e_rx_pg_size(rx_ring) / 2;
 #else
 	unsigned int truesize = SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) +
-				SKB_DATA_ALIGN(I40E_SKB_PAD +
+				SKB_DATA_ALIGN(xdp->data_end -
-					       (xdp->data_end -
+					       xdp->data_hard_start);
-						xdp->data_hard_start));
 #endif
 	struct sk_buff *skb;
 		return NULL;
 	/* update pointers within the skb to store the data */
-	skb_reserve(skb, I40E_SKB_PAD + (xdp->data - xdp->data_hard_start));
+	skb_reserve(skb, xdp->data - xdp->data_hard_start);
 	__skb_put(skb, xdp->data_end - xdp->data);
 	if (metasize)
 		skb_metadata_set(skb, metasize);

drivers/net/ethernet/marvell/Kconfig+3−5

 config MV643XX_ETH
 	tristate "Marvell Discovery (643XX) and Orion ethernet support"
-	depends on (MV64X60 || PPC32 || PLAT_ORION || COMPILE_TEST) && INET
+	depends on MV64X60 || PPC32 || PLAT_ORION || COMPILE_TEST
-	depends on HAS_DMA
+	depends on INET
 	select PHYLIB
 	select MVMDIO
 	---help---
 config MVNETA
 	tristate "Marvell Armada 370/38x/XP/37xx network interface support"
 	depends on ARCH_MVEBU || COMPILE_TEST
-	depends on HAS_DMA
 	select MVMDIO
 	select PHYLINK
 	---help---
 config MVPP2
 	tristate "Marvell Armada 375/7K/8K network interface support"
 	depends on ARCH_MVEBU || COMPILE_TEST
-	depends on HAS_DMA
 	select MVMDIO
 	select PHYLINK
 	---help---
 config PXA168_ETH
 	tristate "Marvell pxa168 ethernet support"
-	depends on HAS_IOMEM && HAS_DMA
+	depends on HAS_IOMEM
 	depends on CPU_PXA168 || ARCH_BERLIN || COMPILE_TEST
 	select PHYLIB
 	---help---

drivers/net/ethernet/marvell/mvneta.c+1−1

@@ -1932,7 +1932,7 @@ static int mvneta_rx_swbm(struct mvneta_port *pp, int rx_todo, · 1931 unmodified lines
1932	rx_bytes = rx_desc->data_size - (ETH_FCS_LEN + MVNETA_MH_SIZE);	1932	rx_bytes = rx_desc->data_size - (ETH_FCS_LEN + MVNETA_MH_SIZE);
1933	index = rx_desc - rxq->descs;	1933	index = rx_desc - rxq->descs;
1934	data = rxq->buf_virt_addr[index];	1934	data = rxq->buf_virt_addr[index];
1935	phys_addr = rx_desc->buf_phys_addr;	1935	phys_addr = rx_desc->buf_phys_addr - pp->rx_offset_correction;
1936		1936
1937	if (!mvneta_rxq_desc_is_first_last(rx_status) \|\|	1937	if (!mvneta_rxq_desc_is_first_last(rx_status) \|\|
1938	(rx_status & MVNETA_RXD_ERR_SUMMARY)) {	1938	(rx_status & MVNETA_RXD_ERR_SUMMARY)) {

drivers/net/ethernet/mellanox/mlxsw/Kconfig+1−1

@@ -30,7 +30,7 @@ config MLXSW_CORE_THERMAL · 29 unmodified lines
30		30
31	config MLXSW_PCI	31	config MLXSW_PCI
32	tristate "PCI bus implementation for Mellanox Technologies Switch ASICs"	32	tristate "PCI bus implementation for Mellanox Technologies Switch ASICs"
33	depends on PCI && HAS_DMA && HAS_IOMEM && MLXSW_CORE	33	depends on PCI && HAS_IOMEM && MLXSW_CORE
34	default m	34	default m
35	---help---	35	---help---
36	This is PCI bus implementation for Mellanox Technologies Switch ASICs.	36	This is PCI bus implementation for Mellanox Technologies Switch ASICs.

drivers/net/ethernet/mscc/ocelot.c+6−5

 static int ocelot_gen_ifh(u32 *ifh, struct frame_info *info)
 {
 	ifh[0] = IFH_INJ_BYPASS;
-	ifh[1] = (0xff00 & info->port) >> 8;
+	ifh[1] = (0xf00 & info->port) >> 8;
 	ifh[2] = (0xff & info->port) << 24;
-	ifh[3] = IFH_INJ_POP_CNT_DISABLE | (info->cpuq << 20) |
+	ifh[3] = (info->tag_type << 16) | info->vid;
-		 (info->tag_type << 16) | info->vid;
 	return 0;
 }
 			 QS_INJ_CTRL_SOF, QS_INJ_CTRL, grp);
 	info.port = BIT(port->chip_port);
-	info.cpuq = 0xff;
+	info.tag_type = IFH_TAG_TYPE_C;
+	info.vid = skb_vlan_tag_get(skb);
 	ocelot_gen_ifh(ifh, &info);
 	for (i = 0; i < IFH_LEN; i++)
-		ocelot_write_rix(ocelot, ifh[i], QS_INJ_WR, grp);
+		ocelot_write_rix(ocelot, (__force u32)cpu_to_be32(ifh[i]),
+				 QS_INJ_WR, grp);
 	count = (skb->len + 3) / 4;
 	last = skb->len % 4;

drivers/net/ethernet/qlogic/qed/qed_dcbx.c+4−7

 		*type = DCBX_PROTOCOL_ROCE_V2;
 	} else {
 		*type = DCBX_MAX_PROTOCOL_TYPE;
-		DP_ERR(p_hwfn,
+		DP_ERR(p_hwfn, "No action required, App TLV entry = 0x%x\n",
-		       "No action required, App TLV id = 0x%x app_prio_bitmap = 0x%x\n",
+		       app_prio_bitmap);
-		       id, app_prio_bitmap);
 		return false;
 	}
 		*cap = 0x80;
 		break;
 	case DCB_CAP_ATTR_DCBX:
-		*cap = (DCB_CAP_DCBX_LLD_MANAGED | DCB_CAP_DCBX_VER_CEE |
+		*cap = (DCB_CAP_DCBX_VER_CEE | DCB_CAP_DCBX_VER_IEEE |
-			DCB_CAP_DCBX_VER_IEEE | DCB_CAP_DCBX_STATIC);
+			DCB_CAP_DCBX_STATIC);
 		break;
 	default:
 		*cap = false;
 	if (!dcbx_info)
 		return 0;
-	if (dcbx_info->operational.enabled)
-		mode |= DCB_CAP_DCBX_LLD_MANAGED;
 	if (dcbx_info->operational.ieee)
 		mode |= DCB_CAP_DCBX_VER_IEEE;
 	if (dcbx_info->operational.cee)

drivers/net/ethernet/qlogic/qed/qed_ll2.c+9−2

 	skb = build_skb(buffer->data, 0);
 	if (!skb) {
-		rc = -ENOMEM;
+		DP_INFO(cdev, "Failed to build SKB\n");
-		goto out_post;
+		kfree(buffer->data);
+		goto out_post1;
 	}
 	data->u.placement_offset += NET_SKB_PAD;
 		cdev->ll2->cbs->rx_cb(cdev->ll2->cb_cookie, skb,
 				      data->opaque_data_0,
 				      data->opaque_data_1);
+	} else {
+		DP_VERBOSE(p_hwfn, (NETIF_MSG_RX_STATUS | NETIF_MSG_PKTDATA |
+				    QED_MSG_LL2 | QED_MSG_STORAGE),
+			   "Dropping the packet\n");
+		kfree(buffer->data);
 	}
+out_post1:
 	/* Update Buffer information and update FW producer */
 	buffer->data = new_data;
 	buffer->phys_addr = new_phys_addr;

drivers/net/ethernet/qlogic/qed/qed_main.c+10−2

 		/* Fastpath interrupts */
 		for (j = 0; j < 64; j++) {
 			if ((0x2ULL << j) & status) {
-				hwfn->simd_proto_handler[j].func(
+				struct qed_simd_fp_handler *p_handler =
-					hwfn->simd_proto_handler[j].token);
+					&hwfn->simd_proto_handler[j];
+				if (p_handler->func)
+					p_handler->func(p_handler->token);
+				else
+					DP_NOTICE(hwfn,
+						  "Not calling fastpath handler as it is NULL [handler #%d, status 0x%llx]\n",
+						  j, status);
 				status &= ~(0x2ULL << j);
 				rc = IRQ_HANDLED;
 			}

drivers/net/ethernet/realtek/r8169.c+1−1

@@ -7148,7 +7148,7 @@ static void rtl8169_netpoll(struct net_device *dev) · 7147 unmodified lines
7148	{	7148	{
7149	struct rtl8169_private *tp = netdev_priv(dev);	7149	struct rtl8169_private *tp = netdev_priv(dev);
7150		7150
7151	rtl8169_interrupt(pci_irq_vector(tp->pci_dev, 0), dev);	7151	rtl8169_interrupt(pci_irq_vector(tp->pci_dev, 0), tp);
7152	}	7152	}
7153	#endif	7153	#endif
7154		7154

drivers/net/ethernet/renesas/Kconfig+0−2

 config SH_ETH
 	tristate "Renesas SuperH Ethernet support"
-	depends on HAS_DMA
 	depends on ARCH_RENESAS || SUPERH || COMPILE_TEST
 	select CRC32
 	select MII
 config RAVB
 	tristate "Renesas Ethernet AVB support"
-	depends on HAS_DMA
 	depends on ARCH_RENESAS || COMPILE_TEST
 	select CRC32
 	select MII

drivers/net/ethernet/sfc/efx.c+1−0

@@ -3180,6 +3180,7 @@ bool efx_rps_check_rule(struct efx_arfs_rule *rule, unsigned int filter_idx, · 3179 unmodified lines
3180	return true;	3180	return true;
3181	}	3181	}
3182		3182
		3183	static
3183	struct hlist_head efx_rps_hash_bucket(struct efx_nic efx,	3184	struct hlist_head efx_rps_hash_bucket(struct efx_nic efx,
3184	const struct efx_filter_spec *spec)	3185	const struct efx_filter_spec *spec)
3185	{	3186	{

drivers/net/ethernet/stmicro/stmmac/Kconfig+1−1

@@ -111,7 +111,7 @@ config DWMAC_ROCKCHIP · 110 unmodified lines
111	config DWMAC_SOCFPGA	111	config DWMAC_SOCFPGA
112	tristate "SOCFPGA dwmac support"	112	tristate "SOCFPGA dwmac support"
113	default ARCH_SOCFPGA	113	default ARCH_SOCFPGA
114	depends on OF && (ARCH_SOCFPGA \|\| COMPILE_TEST)	114	depends on OF && (ARCH_SOCFPGA \|\| ARCH_STRATIX10 \|\| COMPILE_TEST)
115	select MFD_SYSCON	115	select MFD_SYSCON
116	help	116	help
117	Support for ethernet controller on Altera SOCFPGA	117	Support for ethernet controller on Altera SOCFPGA

drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c+14−4

 	struct	device *dev;
 	struct regmap *sys_mgr_base_addr;
 	struct reset_control *stmmac_rst;
+	struct reset_control *stmmac_ocp_rst;
 	void __iomem *splitter_base;
 	bool f2h_ptp_ref_clk;
 	struct tse_pcs pcs;
 		val = SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_GMII_MII;
 	/* Assert reset to the enet controller before changing the phy mode */
-	if (dwmac->stmmac_rst)
+	reset_control_assert(dwmac->stmmac_ocp_rst);
-		reset_control_assert(dwmac->stmmac_rst);
+	reset_control_assert(dwmac->stmmac_rst);
 	regmap_read(sys_mgr_base_addr, reg_offset, &ctrl);
 	ctrl &= ~(SYSMGR_EMACGRP_CTRL_PHYSEL_MASK << reg_shift);
 	/* Deassert reset for the phy configuration to be sampled by
 	 * the enet controller, and operation to start in requested mode
 	 */
-	if (dwmac->stmmac_rst)
+	reset_control_deassert(dwmac->stmmac_ocp_rst);
-		reset_control_deassert(dwmac->stmmac_rst);
+	reset_control_deassert(dwmac->stmmac_rst);
 	if (phymode == PHY_INTERFACE_MODE_SGMII) {
 		if (tse_pcs_init(dwmac->pcs.tse_pcs_base, &dwmac->pcs) != 0) {
 			dev_err(dwmac->dev, "Unable to initialize TSE PCS");
 		goto err_remove_config_dt;
 	}
+	dwmac->stmmac_ocp_rst = devm_reset_control_get_optional(dev, "stmmaceth-ocp");
+	if (IS_ERR(dwmac->stmmac_ocp_rst)) {
+		ret = PTR_ERR(dwmac->stmmac_ocp_rst);
+		dev_err(dev, "error getting reset control of ocp %d\n", ret);
+		goto err_remove_config_dt;
+	}
+	reset_control_deassert(dwmac->stmmac_ocp_rst);
 	ret = socfpga_dwmac_parse_data(dwmac, dev);
 	if (ret) {
 		dev_err(dev, "Unable to parse OF data\n");

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c+10−0

 static int stmmac_init_phy(struct net_device *dev)
 {
 	struct stmmac_priv *priv = netdev_priv(dev);
+	u32 tx_cnt = priv->plat->tx_queues_to_use;
 	struct phy_device *phydev;
 	char phy_id_fmt[MII_BUS_ID_SIZE + 3];
 	char bus_id[MII_BUS_ID_SIZE];
 		phydev->advertising &= ~(SUPPORTED_1000baseT_Half |
 					 SUPPORTED_1000baseT_Full);
+	/*
+	 * Half-duplex mode not supported with multiqueue
+	 * half-duplex can only works with single queue
+	 */
+	if (tx_cnt > 1)
+		phydev->supported &= ~(SUPPORTED_1000baseT_Half |
+				       SUPPORTED_100baseT_Half |
+				       SUPPORTED_10baseT_Half);
 	/*
 	 * Broken HW is sometimes missing the pull-up resistor on the
 	 * MDIO line, which results in reads to non-existent devices returning

drivers/net/ethernet/sun/sungem.c+12−10

@@ -60,8 +60,7 @@ · 59 unmodified lines
60	#include <linux/sungem_phy.h>	60	#include <linux/sungem_phy.h>
61	#include "sungem.h"	61	#include "sungem.h"
62		62
63	/* Stripping FCS is causing problems, disabled for now */	63	#define STRIP_FCS
64	#undef STRIP_FCS
65		64
66	#define DEFAULT_MSG (NETIF_MSG_DRV \| \	65	#define DEFAULT_MSG (NETIF_MSG_DRV \| \
67	NETIF_MSG_PROBE \| \	66	NETIF_MSG_PROBE \| \
@@ -435,7 +434,7 @@ static int gem_rxmac_reset(struct gem *gp) · 367 unmodified lines
435	writel(desc_dma & 0xffffffff, gp->regs + RXDMA_DBLOW);	434	writel(desc_dma & 0xffffffff, gp->regs + RXDMA_DBLOW);
436	writel(RX_RING_SIZE - 4, gp->regs + RXDMA_KICK);	435	writel(RX_RING_SIZE - 4, gp->regs + RXDMA_KICK);
437	val = (RXDMA_CFG_BASE \| (RX_OFFSET << 10) \|	436	val = (RXDMA_CFG_BASE \| (RX_OFFSET << 10) \|
438	((14 / 2) << 13) \| RXDMA_CFG_FTHRESH_128);	437	(ETH_HLEN << 13) \| RXDMA_CFG_FTHRESH_128);
439	writel(val, gp->regs + RXDMA_CFG);	438	writel(val, gp->regs + RXDMA_CFG);
440	if (readl(gp->regs + GREG_BIFCFG) & GREG_BIFCFG_M66EN)	439	if (readl(gp->regs + GREG_BIFCFG) & GREG_BIFCFG_M66EN)
441	writel(((5 & RXDMA_BLANK_IPKTS) \|	440	writel(((5 & RXDMA_BLANK_IPKTS) \|
@@ -760,7 +759,6 @@ static int gem_rx(struct gem *gp, int work_to_do) · 318 unmodified lines
760	struct net_device *dev = gp->dev;	759	struct net_device *dev = gp->dev;
761	int entry, drops, work_done = 0;	760	int entry, drops, work_done = 0;
762	u32 done;	761	u32 done;
763	__sum16 csum;
764		762
765	if (netif_msg_rx_status(gp))	763	if (netif_msg_rx_status(gp))
766	printk(KERN_DEBUG "%s: rx interrupt, done: %d, rx_new: %d\n",	764	printk(KERN_DEBUG "%s: rx interrupt, done: %d, rx_new: %d\n",
@@ -855,9 +853,13 @@ static int gem_rx(struct gem *gp, int work_to_do) · 88 unmodified lines
855	skb = copy_skb;	853	skb = copy_skb;
856	}	854	}
857		855
858	csum = (__force __sum16)htons((status & RXDCTRL_TCPCSUM) ^ 0xffff);	856	if (likely(dev->features & NETIF_F_RXCSUM)) {
859	skb->csum = csum_unfold(csum);	857	__sum16 csum;
860	skb->ip_summed = CHECKSUM_COMPLETE;	858
		859	csum = (__force __sum16)htons((status & RXDCTRL_TCPCSUM) ^ 0xffff);
		860	skb->csum = csum_unfold(csum);
		861	skb->ip_summed = CHECKSUM_COMPLETE;
		862	}
861	skb->protocol = eth_type_trans(skb, gp->dev);	863	skb->protocol = eth_type_trans(skb, gp->dev);
862		864
863	napi_gro_receive(&gp->napi, skb);	865	napi_gro_receive(&gp->napi, skb);
@@ -1761,7 +1763,7 @@ static void gem_init_dma(struct gem *gp) · 897 unmodified lines
1761	writel(0, gp->regs + TXDMA_KICK);	1763	writel(0, gp->regs + TXDMA_KICK);
1762		1764
1763	val = (RXDMA_CFG_BASE \| (RX_OFFSET << 10) \|	1765	val = (RXDMA_CFG_BASE \| (RX_OFFSET << 10) \|
1764	((14 / 2) << 13) \| RXDMA_CFG_FTHRESH_128);	1766	(ETH_HLEN << 13) \| RXDMA_CFG_FTHRESH_128);
1765	writel(val, gp->regs + RXDMA_CFG);	1767	writel(val, gp->regs + RXDMA_CFG);
1766		1768
1767	writel(desc_dma >> 32, gp->regs + RXDMA_DBHI);	1769	writel(desc_dma >> 32, gp->regs + RXDMA_DBHI);
@@ -2985,8 +2987,8 @@ static int gem_init_one(struct pci_dev pdev, const struct pci_device_id ent) · 1217 unmodified lines
2985	pci_set_drvdata(pdev, dev);	2987	pci_set_drvdata(pdev, dev);
2986		2988
2987	/* We can do scatter/gather and HW checksum */	2989	/* We can do scatter/gather and HW checksum */
2988	dev->hw_features = NETIF_F_SG \| NETIF_F_HW_CSUM;	2990	dev->hw_features = NETIF_F_SG \| NETIF_F_HW_CSUM \| NETIF_F_RXCSUM;
2989	dev->features \|= dev->hw_features \| NETIF_F_RXCSUM;	2991	dev->features = dev->hw_features;
2990	if (pci_using_dac)	2992	if (pci_using_dac)
2991	dev->features \|= NETIF_F_HIGHDMA;	2993	dev->features \|= NETIF_F_HIGHDMA;
2992		2994

drivers/net/ethernet/ti/davinci_cpdma.c+1−1

@@ -205,7 +205,7 @@ static void cpdma_desc_pool_destroy(struct cpdma_ctlr *ctlr) · 204 unmodified lines
205	* devices (e.g. cpsw switches) use plain old memory. Descriptor pools	205	* devices (e.g. cpsw switches) use plain old memory. Descriptor pools
206	* abstract out these details	206	* abstract out these details
207	*/	207	*/
208	int cpdma_desc_pool_create(struct cpdma_ctlr *ctlr)	208	static int cpdma_desc_pool_create(struct cpdma_ctlr *ctlr)
209	{	209	{
210	struct cpdma_params *cpdma_params = &ctlr->params;	210	struct cpdma_params *cpdma_params = &ctlr->params;
211	struct cpdma_desc_pool *pool;	211	struct cpdma_desc_pool *pool;

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

@@ -1385,6 +1385,15 @@ static int emac_devioctl(struct net_device ndev, struct ifreq ifrq, int cmd) · 1384 unmodified lines
1385	return -EOPNOTSUPP;	1385	return -EOPNOTSUPP;
1386	}	1386	}
1387		1387
		1388	static int match_first_device(struct device dev, void data)
		1389	{
		1390	if (dev->parent && dev->parent->of_node)
		1391	return of_device_is_compatible(dev->parent->of_node,
		1392	"ti,davinci_mdio");
		1393
		1394	return !strncmp(dev_name(dev), "davinci_mdio", 12);
		1395	}
		1396
1388	/**	1397	/**
1389	* emac_dev_open - EMAC device open	1398	* emac_dev_open - EMAC device open
1390	* @ndev: The DaVinci EMAC network adapter	1399	* @ndev: The DaVinci EMAC network adapter
@@ -1484,8 +1493,14 @@ static int emac_dev_open(struct net_device *ndev) · 93 unmodified lines
1484		1493
1485	/* use the first phy on the bus if pdata did not give us a phy id */	1494	/* use the first phy on the bus if pdata did not give us a phy id */
1486	if (!phydev && !priv->phy_id) {	1495	if (!phydev && !priv->phy_id) {
1487	phy = bus_find_device_by_name(&mdio_bus_type, NULL,	1496	/* NOTE: we can't use bus_find_device_by_name() here because
1488	"davinci_mdio");	1497	* the device name is not guaranteed to be 'davinci_mdio'. On
		1498	* some systems it can be 'davinci_mdio.0' so we need to use
		1499	* strncmp() against the first part of the string to correctly
		1500	* match it.
		1501	*/
		1502	phy = bus_find_device(&mdio_bus_type, NULL, NULL,
		1503	match_first_device);
1489	if (phy) {	1504	if (phy) {
1490	priv->phy_id = dev_name(phy);	1505	priv->phy_id = dev_name(phy);
1491	if (!priv->phy_id \|\| !*priv->phy_id)	1506	if (!priv->phy_id \|\| !*priv->phy_id)

drivers/net/hamradio/bpqether.c+2−6

 static const char banner[] __initconst = KERN_INFO \
 	"AX.25: bpqether driver version 004\n";
-static char bcast_addr[6]={0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
-static char bpq_eth_addr[6];
 static int bpq_rcv(struct sk_buff *, struct net_device *, struct packet_type *, struct net_device *);
 static int bpq_device_event(struct notifier_block *, unsigned long, void *);
 	bpq->ethdev = edev;
 	bpq->axdev = ndev;
-	memcpy(bpq->dest_addr, bcast_addr, sizeof(bpq_eth_addr));
+	eth_broadcast_addr(bpq->dest_addr);
-	memcpy(bpq->acpt_addr, bcast_addr, sizeof(bpq_eth_addr));
+	eth_broadcast_addr(bpq->acpt_addr);
 	err = register_netdevice(ndev);
 	if (err)

drivers/net/ipvlan/ipvlan_main.c+3−1

 	ipvlan->phy_dev = phy_dev;
 	ipvlan->dev = dev;
 	ipvlan->sfeatures = IPVLAN_FEATURES;
-	ipvlan_adjust_mtu(ipvlan, phy_dev);
+	if (!tb[IFLA_MTU])
+		ipvlan_adjust_mtu(ipvlan, phy_dev);
 	INIT_LIST_HEAD(&ipvlan->addrs);
 	spin_lock_init(&ipvlan->addrs_lock);
 {
 	ether_setup(dev);
+	dev->max_mtu = ETH_MAX_MTU;
 	dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING);
 	dev->priv_flags |= IFF_UNICAST_FLT | IFF_NO_QUEUE;
 	dev->netdev_ops = &ipvlan_netdev_ops;

drivers/net/net_failover.c+1−1

@@ -527,7 +527,7 @@ static int net_failover_slave_register(struct net_device *slave_dev, · 526 unmodified lines
527		527
528	netif_addr_lock_bh(failover_dev);	528	netif_addr_lock_bh(failover_dev);
529	dev_uc_sync_multiple(slave_dev, failover_dev);	529	dev_uc_sync_multiple(slave_dev, failover_dev);
530	dev_uc_sync_multiple(slave_dev, failover_dev);	530	dev_mc_sync_multiple(slave_dev, failover_dev);
531	netif_addr_unlock_bh(failover_dev);	531	netif_addr_unlock_bh(failover_dev);
532		532
533	err = vlan_vids_add_by_dev(slave_dev, failover_dev);	533	err = vlan_vids_add_by_dev(slave_dev, failover_dev);

drivers/net/ppp/pppoe.c+1−1

@@ -1107,7 +1107,7 @@ static const struct proto_ops pppoe_ops = { · 1106 unmodified lines
1107	.socketpair = sock_no_socketpair,	1107	.socketpair = sock_no_socketpair,
1108	.accept = sock_no_accept,	1108	.accept = sock_no_accept,
1109	.getname = pppoe_getname,	1109	.getname = pppoe_getname,
1110	.poll_mask = datagram_poll_mask,	1110	.poll = datagram_poll,
1111	.listen = sock_no_listen,	1111	.listen = sock_no_listen,
1112	.shutdown = sock_no_shutdown,	1112	.shutdown = sock_no_shutdown,
1113	.setsockopt = sock_no_setsockopt,	1113	.setsockopt = sock_no_setsockopt,

drivers/net/usb/cdc_ncm.c+1−2

@@ -967,8 +967,7 @@ void cdc_ncm_unbind(struct usbnet dev, struct usb_interface intf) · 966 unmodified lines
967		967
968	atomic_set(&ctx->stop, 1);	968	atomic_set(&ctx->stop, 1);
969		969
970	if (hrtimer_active(&ctx->tx_timer))	970	hrtimer_cancel(&ctx->tx_timer);
971	hrtimer_cancel(&ctx->tx_timer);
972		971
973	tasklet_kill(&ctx->bh);	972	tasklet_kill(&ctx->bh);
974		973

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

@@ -1246,6 +1246,7 @@ static const struct usb_device_id products[] = { · 1245 unmodified lines
1246	{QMI_FIXED_INTF(0x413c, 0x81b3, 8)}, /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card (rev3) */	1246	{QMI_FIXED_INTF(0x413c, 0x81b3, 8)}, /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card (rev3) */
1247	{QMI_FIXED_INTF(0x413c, 0x81b6, 8)}, /* Dell Wireless 5811e */	1247	{QMI_FIXED_INTF(0x413c, 0x81b6, 8)}, /* Dell Wireless 5811e */
1248	{QMI_FIXED_INTF(0x413c, 0x81b6, 10)}, /* Dell Wireless 5811e */	1248	{QMI_FIXED_INTF(0x413c, 0x81b6, 10)}, /* Dell Wireless 5811e */
		1249	{QMI_FIXED_INTF(0x413c, 0x81d7, 1)}, /* Dell Wireless 5821e */
1249	{QMI_FIXED_INTF(0x03f0, 0x4e1d, 8)}, /* HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module */	1250	{QMI_FIXED_INTF(0x03f0, 0x4e1d, 8)}, /* HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module */
1250	{QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */	1251	{QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */
1251	{QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */	1252	{QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */

drivers/net/wireless/broadcom/brcm80211/Kconfig+0−1

@@ -60,7 +60,6 @@ config BRCMFMAC_PCIE · 59 unmodified lines
60	bool "PCIE bus interface support for FullMAC driver"	60	bool "PCIE bus interface support for FullMAC driver"
61	depends on BRCMFMAC	61	depends on BRCMFMAC
62	depends on PCI	62	depends on PCI
63	depends on HAS_DMA
64	select BRCMFMAC_PROTO_MSGBUF	63	select BRCMFMAC_PROTO_MSGBUF
65	select FW_LOADER	64	select FW_LOADER
66	---help---	65	---help---

drivers/net/wireless/quantenna/qtnfmac/Kconfig+1−1

@@ -7,7 +7,7 @@ config QTNFMAC · 6 unmodified lines
7	config QTNFMAC_PEARL_PCIE	7	config QTNFMAC_PEARL_PCIE
8	tristate "Quantenna QSR10g PCIe support"	8	tristate "Quantenna QSR10g PCIe support"
9	default n	9	default n
10	depends on HAS_DMA && PCI && CFG80211	10	depends on PCI && CFG80211
11	select QTNFMAC	11	select QTNFMAC
12	select FW_LOADER	12	select FW_LOADER
13	select CRC32	13	select CRC32

drivers/net/xen-netfront.c+6−5

 	err = xen_net_read_mac(dev, info->netdev->dev_addr);
 	if (err) {
 		xenbus_dev_fatal(dev, err, "parsing %s/mac", dev->nodename);
-		goto out;
+		goto out_unlocked;
 	}
 	rtnl_lock();
 	xennet_destroy_queues(info);
  out:
 	rtnl_unlock();
+out_unlocked:
 	device_unregister(&dev->dev);
 	return err;
 }
 	/* talk_to_netback() sets the correct number of queues */
 	num_queues = dev->real_num_tx_queues;
-	rtnl_lock();
-	netdev_update_features(dev);
-	rtnl_unlock();
 	if (dev->reg_state == NETREG_UNINITIALIZED) {
 		err = register_netdev(dev);
 		if (err) {
 		}
 	}
+	rtnl_lock();
+	netdev_update_features(dev);
+	rtnl_unlock();
 	/*
 	 * All public and private state should now be sane.  Get
 	 * ready to start sending and receiving packets and give the driver

drivers/nfc/pn533/usb.c+2−2

@@ -74,7 +74,7 @@ static void pn533_recv_response(struct urb *urb) · 73 unmodified lines
74	struct sk_buff *skb = NULL;	74	struct sk_buff *skb = NULL;
75		75
76	if (!urb->status) {	76	if (!urb->status) {
77	skb = alloc_skb(urb->actual_length, GFP_KERNEL);	77	skb = alloc_skb(urb->actual_length, GFP_ATOMIC);
78	if (!skb) {	78	if (!skb) {
79	nfc_err(&phy->udev->dev, "failed to alloc memory\n");	79	nfc_err(&phy->udev->dev, "failed to alloc memory\n");
80	} else {	80	} else {
@@ -186,7 +186,7 @@ static int pn533_usb_send_frame(struct pn533 *dev, · 105 unmodified lines
186		186
187	if (dev->protocol_type == PN533_PROTO_REQ_RESP) {	187	if (dev->protocol_type == PN533_PROTO_REQ_RESP) {
188	/* request for response for sent packet directly */	188	/* request for response for sent packet directly */
189	rc = pn533_submit_urb_for_response(phy, GFP_ATOMIC);	189	rc = pn533_submit_urb_for_response(phy, GFP_KERNEL);
190	if (rc)	190	if (rc)
191	goto error;	191	goto error;
192	} else if (dev->protocol_type == PN533_PROTO_REQ_ACK_RESP) {	192	} else if (dev->protocol_type == PN533_PROTO_REQ_ACK_RESP) {

drivers/nvdimm/pmem.c+2−1

@@ -414,7 +414,8 @@ static int pmem_attach_disk(struct device *dev, · 413 unmodified lines
414	blk_queue_logical_block_size(q, pmem_sector_size(ndns));	414	blk_queue_logical_block_size(q, pmem_sector_size(ndns));
415	blk_queue_max_hw_sectors(q, UINT_MAX);	415	blk_queue_max_hw_sectors(q, UINT_MAX);
416	blk_queue_flag_set(QUEUE_FLAG_NONROT, q);	416	blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
417	blk_queue_flag_set(QUEUE_FLAG_DAX, q);	417	if (pmem->pfn_flags & PFN_MAP)
		418	blk_queue_flag_set(QUEUE_FLAG_DAX, q);
418	q->queuedata = pmem;	419	q->queuedata = pmem;
419		420
420	disk = alloc_disk_node(0, nid);	421	disk = alloc_disk_node(0, nid);

drivers/nvme/host/core.c+1−0

@@ -1808,6 +1808,7 @@ static void nvme_set_queue_limits(struct nvme_ctrl *ctrl, · 1807 unmodified lines
1808	u32 max_segments =	1808	u32 max_segments =
1809	(ctrl->max_hw_sectors / (ctrl->page_size >> 9)) + 1;	1809	(ctrl->max_hw_sectors / (ctrl->page_size >> 9)) + 1;
1810		1810
		1811	max_segments = min_not_zero(max_segments, ctrl->max_segments);
1811	blk_queue_max_hw_sectors(q, ctrl->max_hw_sectors);	1812	blk_queue_max_hw_sectors(q, ctrl->max_hw_sectors);
1812	blk_queue_max_segments(q, min_t(u32, max_segments, USHRT_MAX));	1813	blk_queue_max_segments(q, min_t(u32, max_segments, USHRT_MAX));
1813	}	1814	}

drivers/nvme/host/fc.c+3−3

 	/* re-enable the admin_q so anything new can fast fail */
 	blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);
+	/* resume the io queues so that things will fast fail */
+	nvme_start_queues(&ctrl->ctrl);
 	nvme_fc_ctlr_inactive_on_rport(ctrl);
 }
 	 * waiting for io to terminate
 	 */
 	nvme_fc_delete_association(ctrl);
-	/* resume the io queues so that things will fast fail */
-	nvme_start_queues(nctrl);
 }
 static void

drivers/nvme/host/nvme.h+1−0

@@ -170,6 +170,7 @@ struct nvme_ctrl { · 169 unmodified lines
170	u64 cap;	170	u64 cap;
171	u32 page_size;	171	u32 page_size;
172	u32 max_hw_sectors;	172	u32 max_hw_sectors;
		173	u32 max_segments;
173	u16 oncs;	174	u16 oncs;
174	u16 oacs;	175	u16 oacs;
175	u16 nssa;	176	u16 nssa;

drivers/nvme/host/pci.c+38−6

 #define SGES_PER_PAGE	(PAGE_SIZE / sizeof(struct nvme_sgl_desc))
+/*
+ * These can be higher, but we need to ensure that any command doesn't
+ * require an sg allocation that needs more than a page of data.
+ */
+#define NVME_MAX_KB_SZ	4096
+#define NVME_MAX_SEGS	127
 static int use_threaded_interrupts;
 module_param(use_threaded_interrupts, int, 0);
 	struct nvme_ctrl ctrl;
 	struct completion ioq_wait;
+	mempool_t *iod_mempool;
 	/* shadow doorbell buffer support: */
 	u32 *dbbuf_dbs;
 	dma_addr_t dbbuf_dbs_dma_addr;
 	iod->use_sgl = nvme_pci_use_sgls(dev, rq);
 	if (nseg > NVME_INT_PAGES || size > NVME_INT_BYTES(dev)) {
-		size_t alloc_size = nvme_pci_iod_alloc_size(dev, size, nseg,
+		iod->sg = mempool_alloc(dev->iod_mempool, GFP_ATOMIC);
-				iod->use_sgl);
-		iod->sg = kmalloc(alloc_size, GFP_ATOMIC);
 		if (!iod->sg)
 			return BLK_STS_RESOURCE;
 	} else {
 	}
 	if (iod->sg != iod->inline_sg)
-		kfree(iod->sg);
+		mempool_free(iod->sg, dev->iod_mempool);
 }
 #ifdef CONFIG_BLK_DEV_INTEGRITY
 		blk_put_queue(dev->ctrl.admin_q);
 	kfree(dev->queues);
 	free_opal_dev(dev->ctrl.opal_dev);
+	mempool_destroy(dev->iod_mempool);
 	kfree(dev);
 }
 	nvme_get_ctrl(&dev->ctrl);
 	nvme_dev_disable(dev, false);
+	nvme_kill_queues(&dev->ctrl);
 	if (!queue_work(nvme_wq, &dev->remove_work))
 		nvme_put_ctrl(&dev->ctrl);
 }
 	if (result)
 		goto out;
+	/*
+	 * Limit the max command size to prevent iod->sg allocations going
+	 * over a single page.
+	 */
+	dev->ctrl.max_hw_sectors = NVME_MAX_KB_SZ << 1;
+	dev->ctrl.max_segments = NVME_MAX_SEGS;
 	result = nvme_init_identify(&dev->ctrl);
 	if (result)
 		goto out;
 	struct nvme_dev *dev = container_of(work, struct nvme_dev, remove_work);
 	struct pci_dev *pdev = to_pci_dev(dev->dev);
-	nvme_kill_queues(&dev->ctrl);
 	if (pci_get_drvdata(pdev))
 		device_release_driver(&pdev->dev);
 	nvme_put_ctrl(&dev->ctrl);
 	int node, result = -ENOMEM;
 	struct nvme_dev *dev;
 	unsigned long quirks = id->driver_data;
+	size_t alloc_size;
 	node = dev_to_node(&pdev->dev);
 	if (node == NUMA_NO_NODE)
 	if (result)
 		goto release_pools;
+	/*
+	 * Double check that our mempool alloc size will cover the biggest
+	 * command we support.
+	 */
+	alloc_size = nvme_pci_iod_alloc_size(dev, NVME_MAX_KB_SZ,
+						NVME_MAX_SEGS, true);
+	WARN_ON_ONCE(alloc_size > PAGE_SIZE);
+	dev->iod_mempool = mempool_create_node(1, mempool_kmalloc,
+						mempool_kfree,
+						(void *) alloc_size,
+						GFP_KERNEL, node);
+	if (!dev->iod_mempool) {
+		result = -ENOMEM;
+		goto release_pools;
+	}
 	dev_info(dev->ctrl.device, "pci function %s\n", dev_name(&pdev->dev));
 	nvme_get_ctrl(&dev->ctrl);

drivers/nvme/host/rdma.c+40−36

 	if (!test_and_clear_bit(NVME_RDMA_Q_ALLOCATED, &queue->flags))
 		return;
-	if (nvme_rdma_queue_idx(queue) == 0) {
-		nvme_rdma_free_qe(queue->device->dev,
-			&queue->ctrl->async_event_sqe,
-			sizeof(struct nvme_command), DMA_TO_DEVICE);
-	}
 	nvme_rdma_destroy_queue_ib(queue);
 	rdma_destroy_id(queue->cm_id);
 }
 		set = &ctrl->tag_set;
 		memset(set, 0, sizeof(*set));
 		set->ops = &nvme_rdma_mq_ops;
-		set->queue_depth = nctrl->opts->queue_size;
+		set->queue_depth = nctrl->sqsize + 1;
 		set->reserved_tags = 1; /* fabric connect */
 		set->numa_node = NUMA_NO_NODE;
 		set->flags = BLK_MQ_F_SHOULD_MERGE;
 static void nvme_rdma_destroy_admin_queue(struct nvme_rdma_ctrl *ctrl,
 		bool remove)
 {
-	nvme_rdma_stop_queue(&ctrl->queues[0]);
 	if (remove) {
 		blk_cleanup_queue(ctrl->ctrl.admin_q);
 		nvme_rdma_free_tagset(&ctrl->ctrl, ctrl->ctrl.admin_tagset);
 	}
+	if (ctrl->async_event_sqe.data) {
+		nvme_rdma_free_qe(ctrl->device->dev, &ctrl->async_event_sqe,
+				sizeof(struct nvme_command), DMA_TO_DEVICE);
+		ctrl->async_event_sqe.data = NULL;
+	}
 	nvme_rdma_free_queue(&ctrl->queues[0]);
 }
 	ctrl->max_fr_pages = nvme_rdma_get_max_fr_pages(ctrl->device->dev);
+	error = nvme_rdma_alloc_qe(ctrl->device->dev, &ctrl->async_event_sqe,
+			sizeof(struct nvme_command), DMA_TO_DEVICE);
+	if (error)
+		goto out_free_queue;
 	if (new) {
 		ctrl->ctrl.admin_tagset = nvme_rdma_alloc_tagset(&ctrl->ctrl, true);
 		if (IS_ERR(ctrl->ctrl.admin_tagset)) {
 			error = PTR_ERR(ctrl->ctrl.admin_tagset);
-			goto out_free_queue;
+			goto out_free_async_qe;
 		}
 		ctrl->ctrl.admin_q = blk_mq_init_queue(&ctrl->admin_tag_set);
 	if (error)
 		goto out_stop_queue;
-	error = nvme_rdma_alloc_qe(ctrl->queues[0].device->dev,
-			&ctrl->async_event_sqe, sizeof(struct nvme_command),
-			DMA_TO_DEVICE);
-	if (error)
-		goto out_stop_queue;
 	return 0;
 out_stop_queue:
 out_free_tagset:
 	if (new)
 		nvme_rdma_free_tagset(&ctrl->ctrl, ctrl->ctrl.admin_tagset);
+out_free_async_qe:
+	nvme_rdma_free_qe(ctrl->device->dev, &ctrl->async_event_sqe,
+		sizeof(struct nvme_command), DMA_TO_DEVICE);
 out_free_queue:
 	nvme_rdma_free_queue(&ctrl->queues[0]);
 	return error;
 static void nvme_rdma_destroy_io_queues(struct nvme_rdma_ctrl *ctrl,
 		bool remove)
 {
-	nvme_rdma_stop_io_queues(ctrl);
 	if (remove) {
 		blk_cleanup_queue(ctrl->ctrl.connect_q);
 		nvme_rdma_free_tagset(&ctrl->ctrl, ctrl->ctrl.tagset);
 	list_del(&ctrl->list);
 	mutex_unlock(&nvme_rdma_ctrl_mutex);
-	kfree(ctrl->queues);
 	nvmf_free_options(nctrl->opts);
 free_ctrl:
+	kfree(ctrl->queues);
 	kfree(ctrl);
 }
 	return;
 destroy_admin:
+	nvme_rdma_stop_queue(&ctrl->queues[0]);
 	nvme_rdma_destroy_admin_queue(ctrl, false);
 requeue:
 	dev_info(ctrl->ctrl.device, "Failed reconnect attempt %d\n",
 	if (ctrl->ctrl.queue_count > 1) {
 		nvme_stop_queues(&ctrl->ctrl);
+		nvme_rdma_stop_io_queues(ctrl);
 		blk_mq_tagset_busy_iter(&ctrl->tag_set,
 					nvme_cancel_request, &ctrl->ctrl);
 		nvme_rdma_destroy_io_queues(ctrl, false);
 	}
 	blk_mq_quiesce_queue(ctrl->ctrl.admin_q);
+	nvme_rdma_stop_queue(&ctrl->queues[0]);
 	blk_mq_tagset_busy_iter(&ctrl->admin_tag_set,
 				nvme_cancel_request, &ctrl->ctrl);
 	nvme_rdma_destroy_admin_queue(ctrl, false);
 {
 	if (ctrl->ctrl.queue_count > 1) {
 		nvme_stop_queues(&ctrl->ctrl);
+		nvme_rdma_stop_io_queues(ctrl);
 		blk_mq_tagset_busy_iter(&ctrl->tag_set,
 					nvme_cancel_request, &ctrl->ctrl);
 		nvme_rdma_destroy_io_queues(ctrl, shutdown);
 		nvme_disable_ctrl(&ctrl->ctrl, ctrl->ctrl.cap);
 	blk_mq_quiesce_queue(ctrl->ctrl.admin_q);
+	nvme_rdma_stop_queue(&ctrl->queues[0]);
 	blk_mq_tagset_busy_iter(&ctrl->admin_tag_set,
 				nvme_cancel_request, &ctrl->ctrl);
 	blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);
 		goto out_free_ctrl;
 	}
-	ret = nvme_init_ctrl(&ctrl->ctrl, dev, &nvme_rdma_ctrl_ops,
-				0 /* no quirks, we're perfect! */);
-	if (ret)
-		goto out_free_ctrl;
 	INIT_DELAYED_WORK(&ctrl->reconnect_work,
 			nvme_rdma_reconnect_ctrl_work);
 	INIT_WORK(&ctrl->err_work, nvme_rdma_error_recovery_work);
 	ctrl->queues = kcalloc(ctrl->ctrl.queue_count, sizeof(*ctrl->queues),
 				GFP_KERNEL);
 	if (!ctrl->queues)
-		goto out_uninit_ctrl;
+		goto out_free_ctrl;
+	ret = nvme_init_ctrl(&ctrl->ctrl, dev, &nvme_rdma_ctrl_ops,
+				0 /* no quirks, we're perfect! */);
+	if (ret)
+		goto out_kfree_queues;
 	changed = nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_CONNECTING);
 	WARN_ON_ONCE(!changed);
 	ret = nvme_rdma_configure_admin_queue(ctrl, true);
 	if (ret)
-		goto out_kfree_queues;
+		goto out_uninit_ctrl;
 	/* sanity check icdoff */
 	if (ctrl->ctrl.icdoff) {
 		goto out_remove_admin_queue;
 	}
-	if (opts->queue_size > ctrl->ctrl.maxcmd) {
+	/* only warn if argument is too large here, will clamp later */
-		/* warn if maxcmd is lower than queue_size */
-		dev_warn(ctrl->ctrl.device,
-			"queue_size %zu > ctrl maxcmd %u, clamping down\n",
-			opts->queue_size, ctrl->ctrl.maxcmd);
-		opts->queue_size = ctrl->ctrl.maxcmd;
-	}
 	if (opts->queue_size > ctrl->ctrl.sqsize + 1) {
-		/* warn if sqsize is lower than queue_size */
 		dev_warn(ctrl->ctrl.device,
 			"queue_size %zu > ctrl sqsize %u, clamping down\n",
 			opts->queue_size, ctrl->ctrl.sqsize + 1);
-		opts->queue_size = ctrl->ctrl.sqsize + 1;
+	}
+	/* warn if maxcmd is lower than sqsize+1 */
+	if (ctrl->ctrl.sqsize + 1 > ctrl->ctrl.maxcmd) {
+		dev_warn(ctrl->ctrl.device,
+			"sqsize %u > ctrl maxcmd %u, clamping down\n",
+			ctrl->ctrl.sqsize + 1, ctrl->ctrl.maxcmd);
+		ctrl->ctrl.sqsize = ctrl->ctrl.maxcmd - 1;
 	}
 	if (opts->nr_io_queues) {
 	return &ctrl->ctrl;
 out_remove_admin_queue:
+	nvme_rdma_stop_queue(&ctrl->queues[0]);
 	nvme_rdma_destroy_admin_queue(ctrl, true);
-out_kfree_queues:
-	kfree(ctrl->queues);
 out_uninit_ctrl:
 	nvme_uninit_ctrl(&ctrl->ctrl);
 	nvme_put_ctrl(&ctrl->ctrl);
 	if (ret > 0)
 		ret = -EIO;
 	return ERR_PTR(ret);
+out_kfree_queues:
+	kfree(ctrl->queues);
 out_free_ctrl:
 	kfree(ctrl);
 	return ERR_PTR(ret);

drivers/nvme/target/core.c+8−0

@@ -686,6 +686,14 @@ static void nvmet_start_ctrl(struct nvmet_ctrl *ctrl) · 685 unmodified lines
686	}	686	}
687		687
688	ctrl->csts = NVME_CSTS_RDY;	688	ctrl->csts = NVME_CSTS_RDY;
		689
		690	/*
		691	* Controllers that are not yet enabled should not really enforce the
		692	* keep alive timeout, but we still want to track a timeout and cleanup
		693	* in case a host died before it enabled the controller. Hence, simply
		694	* reset the keep alive timer when the controller is enabled.
		695	*/
		696	mod_delayed_work(system_wq, &ctrl->ka_work, ctrl->kato * HZ);
689	}	697	}
690		698
691	static void nvmet_clear_ctrl(struct nvmet_ctrl *ctrl)	699	static void nvmet_clear_ctrl(struct nvmet_ctrl *ctrl)

drivers/opp/core.c+1−1

@@ -598,7 +598,7 @@ static int _generic_set_opp_regulator(const struct opp_table *opp_table, · 597 unmodified lines
598	}	598	}
599		599
600	/* Scaling up? Scale voltage before frequency */	600	/* Scaling up? Scale voltage before frequency */
601	if (freq > old_freq) {	601	if (freq >= old_freq) {
602	ret = _set_opp_voltage(dev, reg, new_supply);	602	ret = _set_opp_voltage(dev, reg, new_supply);
603	if (ret)	603	if (ret)
604	goto restore_voltage;	604	goto restore_voltage;

drivers/pci/Makefile+3−3

 obj-$(CONFIG_PCI_ECAM)		+= ecam.o
 obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o
-obj-y				+= controller/
-obj-y				+= switch/
 # Endpoint library must be initialized before its users
 obj-$(CONFIG_PCI_ENDPOINT)	+= endpoint/
+obj-y				+= controller/
+obj-y				+= switch/
 ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG

drivers/pci/controller/Kconfig+0−3

 	depends on OF
 	select PCI_HOST_COMMON
 	select IRQ_DOMAIN
-	select PCI_DOMAINS
 	help
 	  Say Y here if you want to support a simple generic PCI host
 	  controller, such as the one emulated by kvmtool.
 config PCIE_IPROC
 	tristate
-	select PCI_DOMAINS
 	help
 	  This enables the iProc PCIe core controller support for Broadcom's
 	  iProc family of SoCs. An appropriate bus interface driver needs
 config PCIE_ALTERA
 	bool "Altera PCIe controller"
 	depends on ARM || NIOS2 || COMPILE_TEST
-	select PCI_DOMAINS
 	help
 	  Say Y here if you want to enable PCIe controller support on Altera
 	  FPGA.

drivers/pci/hotplug/acpi_pcihp.c+9−1

  * All rights reserved.
  *
  * Send feedback to <kristen.c.accardi@intel.com>
- *
  */
 #include <linux/module.h>
 		return 0;
 	/* If _OSC exists, we should not evaluate OSHP */
+	/*
+	 * If there's no ACPI host bridge (i.e., ACPI support is compiled
+	 * into the kernel but the hardware platform doesn't support ACPI),
+	 * there's nothing to do here.
+	 */
 	host = pci_find_host_bridge(pdev->bus);
 	root = acpi_pci_find_root(ACPI_HANDLE(&host->dev));
+	if (!root)
+		return 0;
 	if (root->osc_support_set)
 		goto no_control;

drivers/perf/xgene_pmu.c+1−1

@@ -1463,7 +1463,7 @@ static char xgene_pmu_dev_name(struct device dev, u32 type, int id) · 1462 unmodified lines
1463	case PMU_TYPE_IOB:	1463	case PMU_TYPE_IOB:
1464	return devm_kasprintf(dev, GFP_KERNEL, "iob%d", id);	1464	return devm_kasprintf(dev, GFP_KERNEL, "iob%d", id);
1465	case PMU_TYPE_IOB_SLOW:	1465	case PMU_TYPE_IOB_SLOW:
1466	return devm_kasprintf(dev, GFP_KERNEL, "iob-slow%d", id);	1466	return devm_kasprintf(dev, GFP_KERNEL, "iob_slow%d", id);
1467	case PMU_TYPE_MCB:	1467	case PMU_TYPE_MCB:
1468	return devm_kasprintf(dev, GFP_KERNEL, "mcb%d", id);	1468	return devm_kasprintf(dev, GFP_KERNEL, "mcb%d", id);
1469	case PMU_TYPE_MC:	1469	case PMU_TYPE_MC:

drivers/pinctrl/actions/pinctrl-owl.c+1−1

@@ -333,7 +333,7 @@ static int owl_pin_config_set(struct pinctrl_dev *pctrldev, · 332 unmodified lines
333	unsigned long flags;	333	unsigned long flags;
334	unsigned int param;	334	unsigned int param;
335	u32 reg, bit, width, arg;	335	u32 reg, bit, width, arg;
336	int ret, i;	336	int ret = 0, i;
337		337
338	info = &pctrl->soc->padinfo[pin];	338	info = &pctrl->soc->padinfo[pin];
339		339

drivers/pinctrl/devicetree.c+5−2

 }
 static int dt_to_map_one_config(struct pinctrl *p,
-				struct pinctrl_dev *pctldev,
+				struct pinctrl_dev *hog_pctldev,
 				const char *statename,
 				struct device_node *np_config)
 {
+	struct pinctrl_dev *pctldev = NULL;
 	struct device_node *np_pctldev;
 	const struct pinctrl_ops *ops;
 	int ret;
 			return -EPROBE_DEFER;
 		}
 		/* If we're creating a hog we can use the passed pctldev */
-		if (pctldev && (np_pctldev == p->dev->of_node))
+		if (hog_pctldev && (np_pctldev == p->dev->of_node)) {
+			pctldev = hog_pctldev;
 			break;
+		}
 		pctldev = get_pinctrl_dev_from_of_node(np_pctldev);
 		if (pctldev)
 			break;

drivers/pinctrl/mediatek/pinctrl-mt7622.c+5−1

 	struct mtk_pinctrl *hw = gpiochip_get_data(chip);
 	unsigned long eint_n;
+	if (!hw->eint)
+		return -ENOTSUPP;
 	eint_n = offset;
 	return mtk_eint_find_irq(hw->eint, eint_n);
 	unsigned long eint_n;
 	u32 debounce;
-	if (pinconf_to_config_param(config) != PIN_CONFIG_INPUT_DEBOUNCE)
+	if (!hw->eint ||
+	    pinconf_to_config_param(config) != PIN_CONFIG_INPUT_DEBOUNCE)
 		return -ENOTSUPP;
 	debounce = pinconf_to_config_argument(config);

drivers/pinctrl/mediatek/pinctrl-mtk-common.c+0−5

 		return -ENOMEM;
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!res) {
-		dev_err(&pdev->dev, "Unable to get eint resource\n");
-		return -ENODEV;
-	}
 	pctl->eint->base = devm_ioremap_resource(&pdev->dev, res);
 	if (IS_ERR(pctl->eint->base))
 		return PTR_ERR(pctl->eint->base);

drivers/pinctrl/pinctrl-single.c+11−3

 	mux_bytes = pcs->width / BITS_PER_BYTE;
-	if (!pcs->saved_vals)
+	if (!pcs->saved_vals) {
 		pcs->saved_vals = devm_kzalloc(pcs->dev, pcs->size, GFP_ATOMIC);
+		if (!pcs->saved_vals)
+			return -ENOMEM;
+	}
 	switch (pcs->width) {
 	case 64:
 	if (!pcs)
 		return -EINVAL;
-	if (pcs->flags & PCS_CONTEXT_LOSS_OFF)
+	if (pcs->flags & PCS_CONTEXT_LOSS_OFF) {
-		pcs_save_context(pcs);
+		int ret;
+		ret = pcs_save_context(pcs);
+		if (ret < 0)
+			return ret;
+	}
 	return pinctrl_force_sleep(pcs->pctl);
 }

drivers/ptp/ptp_chardev.c+2−2

@@ -221,7 +221,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) · 220 unmodified lines
221	}	221	}
222	pct = &sysoff->ts[0];	222	pct = &sysoff->ts[0];
223	for (i = 0; i < sysoff->n_samples; i++) {	223	for (i = 0; i < sysoff->n_samples; i++) {
224	getnstimeofday64(&ts);	224	ktime_get_real_ts64(&ts);
225	pct->sec = ts.tv_sec;	225	pct->sec = ts.tv_sec;
226	pct->nsec = ts.tv_nsec;	226	pct->nsec = ts.tv_nsec;
227	pct++;	227	pct++;
@@ -230,7 +230,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) · 2 unmodified lines
230	pct->nsec = ts.tv_nsec;	230	pct->nsec = ts.tv_nsec;
231	pct++;	231	pct++;
232	}	232	}
233	getnstimeofday64(&ts);	233	ktime_get_real_ts64(&ts);
234	pct->sec = ts.tv_sec;	234	pct->sec = ts.tv_sec;
235	pct->nsec = ts.tv_nsec;	235	pct->nsec = ts.tv_nsec;
236	if (copy_to_user((void __user )arg, sysoff, sizeof(sysoff)))	236	if (copy_to_user((void __user )arg, sysoff, sizeof(sysoff)))

drivers/ptp/ptp_qoriq.c+1−1

@@ -374,7 +374,7 @@ static int qoriq_ptp_probe(struct platform_device *dev) · 373 unmodified lines
374	pr_err("ioremap ptp registers failed\n");	374	pr_err("ioremap ptp registers failed\n");
375	goto no_ioremap;	375	goto no_ioremap;
376	}	376	}
377	getnstimeofday64(&now);	377	ktime_get_real_ts64(&now);
378	ptp_qoriq_settime(&qoriq_ptp->caps, &now);	378	ptp_qoriq_settime(&qoriq_ptp->caps, &now);
379		379
380	tmr_ctrl =	380	tmr_ctrl =

drivers/s390/block/dasd.c+56−115

 		device->hosts_dentry = pde;
 }
-/*
+struct dasd_ccw_req *dasd_smalloc_request(int magic, int cplength, int datasize,
- * Allocate memory for a channel program with 'cplength' channel
+					  struct dasd_device *device,
- * command words and 'datasize' additional space. There are two
+					  struct dasd_ccw_req *cqr)
- * variantes: 1) dasd_kmalloc_request uses kmalloc to get the needed
- * memory and 2) dasd_smalloc_request uses the static ccw memory
- * that gets allocated for each device.
- */
-struct dasd_ccw_req *dasd_kmalloc_request(int magic, int cplength,
-					  int datasize,
-					  struct dasd_device *device)
-{
-	struct dasd_ccw_req *cqr;
-	/* Sanity checks */
-	BUG_ON(datasize > PAGE_SIZE ||
-	     (cplength*sizeof(struct ccw1)) > PAGE_SIZE);
-	cqr = kzalloc(sizeof(struct dasd_ccw_req), GFP_ATOMIC);
-	if (cqr == NULL)
-		return ERR_PTR(-ENOMEM);
-	cqr->cpaddr = NULL;
-	if (cplength > 0) {
-		cqr->cpaddr = kcalloc(cplength, sizeof(struct ccw1),
-				      GFP_ATOMIC | GFP_DMA);
-		if (cqr->cpaddr == NULL) {
-			kfree(cqr);
-			return ERR_PTR(-ENOMEM);
-		}
-	}
-	cqr->data = NULL;
-	if (datasize > 0) {
-		cqr->data = kzalloc(datasize, GFP_ATOMIC | GFP_DMA);
-		if (cqr->data == NULL) {
-			kfree(cqr->cpaddr);
-			kfree(cqr);
-			return ERR_PTR(-ENOMEM);
-		}
-	}
-	cqr->magic =  magic;
-	set_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
-	dasd_get_device(device);
-	return cqr;
-}
-EXPORT_SYMBOL(dasd_kmalloc_request);
-struct dasd_ccw_req *dasd_smalloc_request(int magic, int cplength,
-					  int datasize,
-					  struct dasd_device *device)
 {
 	unsigned long flags;
-	struct dasd_ccw_req *cqr;
+	char *data, *chunk;
-	char *data;
+	int size = 0;
-	int size;
-	size = (sizeof(struct dasd_ccw_req) + 7L) & -8L;
 	if (cplength > 0)
 		size += cplength * sizeof(struct ccw1);
 	if (datasize > 0)
 		size += datasize;
+	if (!cqr)
+		size += (sizeof(*cqr) + 7L) & -8L;
 	spin_lock_irqsave(&device->mem_lock, flags);
-	cqr = (struct dasd_ccw_req *)
+	data = chunk = dasd_alloc_chunk(&device->ccw_chunks, size);
-		dasd_alloc_chunk(&device->ccw_chunks, size);
 	spin_unlock_irqrestore(&device->mem_lock, flags);
-	if (cqr == NULL)
+	if (!chunk)
 		return ERR_PTR(-ENOMEM);
-	memset(cqr, 0, sizeof(struct dasd_ccw_req));
+	if (!cqr) {
-	data = (char *) cqr + ((sizeof(struct dasd_ccw_req) + 7L) & -8L);
+		cqr = (void *) data;
-	cqr->cpaddr = NULL;
+		data += (sizeof(*cqr) + 7L) & -8L;
+	}
+	memset(cqr, 0, sizeof(*cqr));
+	cqr->mem_chunk = chunk;
 	if (cplength > 0) {
-		cqr->cpaddr = (struct ccw1 *) data;
+		cqr->cpaddr = data;
-		data += cplength*sizeof(struct ccw1);
+		data += cplength * sizeof(struct ccw1);
-		memset(cqr->cpaddr, 0, cplength*sizeof(struct ccw1));
+		memset(cqr->cpaddr, 0, cplength * sizeof(struct ccw1));
 	}
-	cqr->data = NULL;
 	if (datasize > 0) {
 		cqr->data = data;
  		memset(cqr->data, 0, datasize);
 }
 EXPORT_SYMBOL(dasd_smalloc_request);
-/*
- * Free memory of a channel program. This function needs to free all the
- * idal lists that might have been created by dasd_set_cda and the
- * struct dasd_ccw_req itself.
- */
-void dasd_kfree_request(struct dasd_ccw_req *cqr, struct dasd_device *device)
-{
-	struct ccw1 *ccw;
-	/* Clear any idals used for the request. */
-	ccw = cqr->cpaddr;
-	do {
-		clear_normalized_cda(ccw);
-	} while (ccw++->flags & (CCW_FLAG_CC | CCW_FLAG_DC));
-	kfree(cqr->cpaddr);
-	kfree(cqr->data);
-	kfree(cqr);
-	dasd_put_device(device);
-}
-EXPORT_SYMBOL(dasd_kfree_request);
 void dasd_sfree_request(struct dasd_ccw_req *cqr, struct dasd_device *device)
 {
 	unsigned long flags;
 	spin_lock_irqsave(&device->mem_lock, flags);
-	dasd_free_chunk(&device->ccw_chunks, cqr);
+	dasd_free_chunk(&device->ccw_chunks, cqr->mem_chunk);
 	spin_unlock_irqrestore(&device->mem_lock, flags);
 	dasd_put_device(device);
 }
 	}
 }
+static void __dasd_process_cqr(struct dasd_device *device,
+			       struct dasd_ccw_req *cqr)
+{
+	char errorstring[ERRORLENGTH];
+	switch (cqr->status) {
+	case DASD_CQR_SUCCESS:
+		cqr->status = DASD_CQR_DONE;
+		break;
+	case DASD_CQR_ERROR:
+		cqr->status = DASD_CQR_NEED_ERP;
+		break;
+	case DASD_CQR_CLEARED:
+		cqr->status = DASD_CQR_TERMINATED;
+		break;
+	default:
+		/* internal error 12 - wrong cqr status*/
+		snprintf(errorstring, ERRORLENGTH, "12 %p %x02", cqr, cqr->status);
+		dev_err(&device->cdev->dev,
+			"An error occurred in the DASD device driver, "
+			"reason=%s\n", errorstring);
+		BUG();
+	}
+	if (cqr->callback)
+		cqr->callback(cqr, cqr->callback_data);
+}
 /*
  * the cqrs from the final queue are returned to the upper layer
  * by setting a dasd_block state and calling the callback function
 	struct list_head *l, *n;
 	struct dasd_ccw_req *cqr;
 	struct dasd_block *block;
-	void (*callback)(struct dasd_ccw_req *, void *data);
-	void *callback_data;
-	char errorstring[ERRORLENGTH];
 	list_for_each_safe(l, n, final_queue) {
 		cqr = list_entry(l, struct dasd_ccw_req, devlist);
 		list_del_init(&cqr->devlist);
 		block = cqr->block;
-		callback = cqr->callback;
+		if (!block) {
-		callback_data = cqr->callback_data;
+			__dasd_process_cqr(device, cqr);
-		if (block)
+		} else {
 			spin_lock_bh(&block->queue_lock);
-		switch (cqr->status) {
+			__dasd_process_cqr(device, cqr);
-		case DASD_CQR_SUCCESS:
-			cqr->status = DASD_CQR_DONE;
-			break;
-		case DASD_CQR_ERROR:
-			cqr->status = DASD_CQR_NEED_ERP;
-			break;
-		case DASD_CQR_CLEARED:
-			cqr->status = DASD_CQR_TERMINATED;
-			break;
-		default:
-			/* internal error 12 - wrong cqr status*/
-			snprintf(errorstring, ERRORLENGTH, "12 %p %x02", cqr, cqr->status);
-			dev_err(&device->cdev->dev,
-				"An error occurred in the DASD device driver, "
-				"reason=%s\n", errorstring);
-			BUG();
-		}
-		if (cqr->callback != NULL)
-			(callback)(cqr, callback_data);
-		if (block)
 			spin_unlock_bh(&block->queue_lock);
+		}
 	}
 }
 	cqr->callback_data = req;
 	cqr->status = DASD_CQR_FILLED;
 	cqr->dq = dq;
-	*((struct dasd_ccw_req **) blk_mq_rq_to_pdu(req)) = cqr;
 	blk_mq_start_request(req);
 	spin_lock(&block->queue_lock);
 	unsigned long flags;
 	int rc = 0;
-	cqr = *((struct dasd_ccw_req **) blk_mq_rq_to_pdu(req));
+	cqr = blk_mq_rq_to_pdu(req);
 	if (!cqr)
 		return BLK_EH_DONE;
 	int rc;
 	block->tag_set.ops = &dasd_mq_ops;
-	block->tag_set.cmd_size = sizeof(struct dasd_ccw_req *);
+	block->tag_set.cmd_size = sizeof(struct dasd_ccw_req);
 	block->tag_set.nr_hw_queues = DASD_NR_HW_QUEUES;
 	block->tag_set.queue_depth = DASD_MAX_LCU_DEV * DASD_REQ_PER_DEV;
 	block->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;
 	struct ccw1 *ccw;
 	unsigned long *idaw;
-	cqr = dasd_smalloc_request(magic, 1 /* RDC */, rdc_buffer_size, device);
+	cqr = dasd_smalloc_request(magic, 1 /* RDC */, rdc_buffer_size, device,
+				   NULL);
 	if (IS_ERR(cqr)) {
 		/* internal error 13 - Allocating the RDC request failed*/

drivers/s390/block/dasd_alias.c+3−3

@@ -407,9 +407,9 @@ static int read_unit_address_configuration(struct dasd_device *device, · 406 unmodified lines
407	int rc;	407	int rc;
408	unsigned long flags;	408	unsigned long flags;
409		409
410	cqr = dasd_kmalloc_request(DASD_ECKD_MAGIC, 1 /* PSF / + 1 / RSSD */,	410	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF / + 1 / RSSD */,
411	(sizeof(struct dasd_psf_prssd_data)),	411	(sizeof(struct dasd_psf_prssd_data)),
412	device);	412	device, NULL);
413	if (IS_ERR(cqr))	413	if (IS_ERR(cqr))
414	return PTR_ERR(cqr);	414	return PTR_ERR(cqr);
415	cqr->startdev = device;	415	cqr->startdev = device;
@@ -457,7 +457,7 @@ static int read_unit_address_configuration(struct dasd_device *device, · 41 unmodified lines
457	lcu->flags \|= NEED_UAC_UPDATE;	457	lcu->flags \|= NEED_UAC_UPDATE;
458	spin_unlock_irqrestore(&lcu->lock, flags);	458	spin_unlock_irqrestore(&lcu->lock, flags);
459	}	459	}
460	dasd_kfree_request(cqr, cqr->memdev);	460	dasd_sfree_request(cqr, cqr->memdev);
461	return rc;	461	return rc;
462	}	462	}
463		463

drivers/s390/block/dasd_diag.c+2−1

@@ -536,7 +536,8 @@ static struct dasd_ccw_req dasd_diag_build_cp(struct dasd_device memdev, · 535 unmodified lines
536	/* Build the request */	536	/* Build the request */
537	datasize = sizeof(struct dasd_diag_req) +	537	datasize = sizeof(struct dasd_diag_req) +
538	count*sizeof(struct dasd_diag_bio);	538	count*sizeof(struct dasd_diag_bio);
539	cqr = dasd_smalloc_request(DASD_DIAG_MAGIC, 0, datasize, memdev);	539	cqr = dasd_smalloc_request(DASD_DIAG_MAGIC, 0, datasize, memdev,
		540	blk_mq_rq_to_pdu(req));
540	if (IS_ERR(cqr))	541	if (IS_ERR(cqr))
541	return cqr;	542	return cqr;
542		543

drivers/s390/block/dasd_eckd.c+25−21

 	}
 	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* RCD */,
 				   0, /* use rcd_buf as data ara */
-				   device);
+				   device, NULL);
 	if (IS_ERR(cqr)) {
 		DBF_DEV_EVENT(DBF_WARNING, device, "%s",
 			      "Could not allocate RCD request");
 	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */	+ 1 /* RSSD */,
 				   (sizeof(struct dasd_psf_prssd_data) +
 				    sizeof(struct dasd_rssd_features)),
-				   device);
+				   device, NULL);
 	if (IS_ERR(cqr)) {
 		DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s", "Could not "
 				"allocate initialization request");
 	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */ ,
 				  sizeof(struct dasd_psf_ssc_data),
-				  device);
+				   device, NULL);
 	if (IS_ERR(cqr)) {
 		DBF_DEV_EVENT(DBF_WARNING, device, "%s",
 	cplength = 8;
 	datasize = sizeof(struct DE_eckd_data) + 2*sizeof(struct LO_eckd_data);
-	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize, device);
+	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize, device,
+				   NULL);
 	if (IS_ERR(cqr))
 		return cqr;
 	ccw = cqr->cpaddr;
 	 */
 	itcw_size = itcw_calc_size(0, count, 0);
-	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 0, itcw_size, startdev);
+	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 0, itcw_size, startdev,
+				   NULL);
 	if (IS_ERR(cqr))
 		return cqr;
 	cplength += count;
 	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize,
-				  startdev);
+				   startdev, NULL);
 	if (IS_ERR(cqr))
 		return cqr;
 	}
 	/* Allocate the format ccw request. */
 	fcp = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength,
-				   datasize, startdev);
+				   datasize, startdev, NULL);
 	if (IS_ERR(fcp))
 		return fcp;
 	}
 	/* Allocate the ccw request. */
 	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize,
-				   startdev);
+				   startdev, blk_mq_rq_to_pdu(req));
 	if (IS_ERR(cqr))
 		return cqr;
 	ccw = cqr->cpaddr;
 	/* Allocate the ccw request. */
 	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize,
-				   startdev);
+				   startdev, blk_mq_rq_to_pdu(req));
 	if (IS_ERR(cqr))
 		return cqr;
 	ccw = cqr->cpaddr;
 	/* Allocate the ccw request. */
 	itcw_size = itcw_calc_size(0, ctidaw, 0);
-	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 0, itcw_size, startdev);
+	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 0, itcw_size, startdev,
+				   blk_mq_rq_to_pdu(req));
 	if (IS_ERR(cqr))
 		return cqr;
 	/* Allocate the ccw request. */
 	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength,
-				   datasize, startdev);
+				   datasize, startdev, blk_mq_rq_to_pdu(req));
 	if (IS_ERR(cqr))
 		return cqr;
 		return -EACCES;
 	useglobal = 0;
-	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1, 32, device);
+	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1, 32, device, NULL);
 	if (IS_ERR(cqr)) {
 		mutex_lock(&dasd_reserve_mutex);
 		useglobal = 1;
 		return -EACCES;
 	useglobal = 0;
-	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1, 32, device);
+	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1, 32, device, NULL);
 	if (IS_ERR(cqr)) {
 		mutex_lock(&dasd_reserve_mutex);
 		useglobal = 1;
 		return -EACCES;
 	useglobal = 0;
-	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1, 32, device);
+	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1, 32, device, NULL);
 	if (IS_ERR(cqr)) {
 		mutex_lock(&dasd_reserve_mutex);
 		useglobal = 1;
 	useglobal = 0;
 	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1,
-				   sizeof(struct dasd_snid_data), device);
+				   sizeof(struct dasd_snid_data), device,
+				   NULL);
 	if (IS_ERR(cqr)) {
 		mutex_lock(&dasd_reserve_mutex);
 		useglobal = 1;
 	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */  + 1 /* RSSD */,
 				   (sizeof(struct dasd_psf_prssd_data) +
 				    sizeof(struct dasd_rssd_perf_stats_t)),
-				   device);
+				   device, NULL);
 	if (IS_ERR(cqr)) {
 		DBF_DEV_EVENT(DBF_WARNING, device, "%s",
 			    "Could not allocate initialization request");
 	psf1 = psf_data[1];
 	/* setup CCWs for PSF + RSSD */
-	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 2 , 0, device);
+	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 2, 0, device, NULL);
 	if (IS_ERR(cqr)) {
 		DBF_DEV_EVENT(DBF_WARNING, device, "%s",
 			"Could not allocate initialization request");
 	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */	+ 1 /* RSSD */,
 				   (sizeof(struct dasd_psf_prssd_data) +
 				    sizeof(struct dasd_rssd_messages)),
-				   device);
+				   device, NULL);
 	if (IS_ERR(cqr)) {
 		DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s",
 				"Could not allocate read message buffer request");
 	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */	+ 1 /* RSSD */,
 				   sizeof(struct dasd_psf_prssd_data) + 1,
-				   device);
+				   device, NULL);
 	if (IS_ERR(cqr)) {
 		DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s",
 				"Could not allocate read message buffer request");
 	int rc;
 	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */ ,
-				  sizeof(struct dasd_psf_cuir_response),
+				   sizeof(struct dasd_psf_cuir_response),
-				  device);
+				   device, NULL);
 	if (IS_ERR(cqr)) {
 		DBF_DEV_EVENT(DBF_WARNING, device, "%s",

drivers/s390/block/dasd_eer.c+5−5

@@ -447,7 +447,7 @@ static void dasd_eer_snss_cb(struct dasd_ccw_req cqr, void data) · 446 unmodified lines
447	* is a new ccw in device->eer_cqr. Free the "old"	447	* is a new ccw in device->eer_cqr. Free the "old"
448	* snss request now.	448	* snss request now.
449	*/	449	*/
450	dasd_kfree_request(cqr, device);	450	dasd_sfree_request(cqr, device);
451	}	451	}
452		452
453	/*	453	/*
@@ -472,8 +472,8 @@ int dasd_eer_enable(struct dasd_device *device) · 18 unmodified lines
472	if (rc)	472	if (rc)
473	goto out;	473	goto out;
474		474
475	cqr = dasd_kmalloc_request(DASD_ECKD_MAGIC, 1 /* SNSS */,	475	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* SNSS */,
476	SNSS_DATA_SIZE, device);	476	SNSS_DATA_SIZE, device, NULL);
477	if (IS_ERR(cqr)) {	477	if (IS_ERR(cqr)) {
478	rc = -ENOMEM;	478	rc = -ENOMEM;
479	cqr = NULL;	479	cqr = NULL;
@@ -505,7 +505,7 @@ out: · 25 unmodified lines
505	spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);	505	spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
506		506
507	if (cqr)	507	if (cqr)
508	dasd_kfree_request(cqr, device);	508	dasd_sfree_request(cqr, device);
509		509
510	return rc;	510	return rc;
511	}	511	}
@@ -528,7 +528,7 @@ void dasd_eer_disable(struct dasd_device *device) · 16 unmodified lines
528	in_use = test_and_clear_bit(DASD_FLAG_EER_IN_USE, &device->flags);	528	in_use = test_and_clear_bit(DASD_FLAG_EER_IN_USE, &device->flags);
529	spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);	529	spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
530	if (cqr && !in_use)	530	if (cqr && !in_use)
531	dasd_kfree_request(cqr, device);	531	dasd_sfree_request(cqr, device);
532	}	532	}
533		533
534	/*	534	/*

drivers/s390/block/dasd_fba.c+4−2

 	datasize = sizeof(struct DE_fba_data) +
 		nr_ccws * (sizeof(struct LO_fba_data) + sizeof(struct ccw1));
-	cqr = dasd_smalloc_request(DASD_FBA_MAGIC, cplength, datasize, memdev);
+	cqr = dasd_smalloc_request(DASD_FBA_MAGIC, cplength, datasize, memdev,
+				   blk_mq_rq_to_pdu(req));
 	if (IS_ERR(cqr))
 		return cqr;
 		datasize += (count - 1)*sizeof(struct LO_fba_data);
 	}
 	/* Allocate the ccw request. */
-	cqr = dasd_smalloc_request(DASD_FBA_MAGIC, cplength, datasize, memdev);
+	cqr = dasd_smalloc_request(DASD_FBA_MAGIC, cplength, datasize, memdev,
+				   blk_mq_rq_to_pdu(req));
 	if (IS_ERR(cqr))
 		return cqr;
 	ccw = cqr->cpaddr;

drivers/s390/block/dasd_int.h+5−21

 struct dasd_ccw_req {
 	unsigned int magic;		/* Eye catcher */
+	int intrc;			/* internal error, e.g. from start_IO */
 	struct list_head devlist;	/* for dasd_device request queue */
 	struct list_head blocklist;	/* for dasd_block request queue */
-	/* Where to execute what... */
 	struct dasd_block *block;	/* the originating block device */
 	struct dasd_device *memdev;	/* the device used to allocate this */
 	struct dasd_device *startdev;	/* device the request is started on */
 	struct dasd_device *basedev;	/* base device if no block->base */
 	void *cpaddr;			/* address of ccw or tcw */
+	short retries;			/* A retry counter */
 	unsigned char cpmode;		/* 0 = cmd mode, 1 = itcw */
 	char status;			/* status of this request */
-	short retries;			/* A retry counter */
+	char lpm;			/* logical path mask */
 	unsigned long flags;        	/* flags of this request */
 	struct dasd_queue *dq;
-	/* ... and how */
 	unsigned long starttime;	/* jiffies time of request start */
 	unsigned long expires;		/* expiration period in jiffies */
-	char lpm;			/* logical path mask */
 	void *data;			/* pointer to data area */
-	/* these are important for recovering erroneous requests          */
-	int intrc;			/* internal error, e.g. from start_IO */
 	struct irb irb;			/* device status in case of an error */
 	struct dasd_ccw_req *refers;	/* ERP-chain queueing. */
 	void *function; 		/* originating ERP action */
+	void *mem_chunk;
-	/* these are for statistics only */
 	unsigned long buildclk;		/* TOD-clock of request generation */
 	unsigned long startclk;		/* TOD-clock of request start */
 	unsigned long stopclk;		/* TOD-clock of request interrupt */
 	unsigned long endclk;		/* TOD-clock of request termination */
-        /* Callback that is called after reaching final status. */
 	void (*callback)(struct dasd_ccw_req *, void *data);
 	void *callback_data;
 };
 extern struct kmem_cache *dasd_page_cache;
 struct dasd_ccw_req *
-dasd_kmalloc_request(int , int, int, struct dasd_device *);
+dasd_smalloc_request(int, int, int, struct dasd_device *, struct dasd_ccw_req *);
-struct dasd_ccw_req *
-dasd_smalloc_request(int , int, int, struct dasd_device *);
-void dasd_kfree_request(struct dasd_ccw_req *, struct dasd_device *);
 void dasd_sfree_request(struct dasd_ccw_req *, struct dasd_device *);
 void dasd_wakeup_cb(struct dasd_ccw_req *, void *);
-static inline int
-dasd_kmalloc_set_cda(struct ccw1 *ccw, void *cda, struct dasd_device *device)
-{
-	return set_normalized_cda(ccw, cda);
-}
 struct dasd_device *dasd_alloc_device(void);
 void dasd_free_device(struct dasd_device *);

drivers/s390/cio/Makefile+1−0

@@ -5,6 +5,7 @@ · 4 unmodified lines
5		5
6	# The following is required for define_trace.h to find ./trace.h	6	# The following is required for define_trace.h to find ./trace.h
7	CFLAGS_trace.o := -I$(src)	7	CFLAGS_trace.o := -I$(src)
		8	CFLAGS_vfio_ccw_fsm.o := -I$(src)
8		9
9	obj-y += airq.o blacklist.o chsc.o cio.o css.o chp.o idset.o isc.o \	10	obj-y += airq.o blacklist.o chsc.o cio.o css.o chp.o idset.o isc.o \
10	fcx.o itcw.o crw.o ccwreq.o trace.o ioasm.o	11	fcx.o itcw.o crw.o ccwreq.o trace.o ioasm.o

drivers/s390/cio/vfio_ccw_cp.c+75−65

@@ -23,9 +23,13 @@ · 22 unmodified lines
23	#define CCWCHAIN_LEN_MAX 256	23	#define CCWCHAIN_LEN_MAX 256
24		24
25	struct pfn_array {	25	struct pfn_array {
		26	/* Starting guest physical I/O address. */
26	unsigned long pa_iova;	27	unsigned long pa_iova;
		28	/* Array that stores PFNs of the pages need to pin. */
27	unsigned long *pa_iova_pfn;	29	unsigned long *pa_iova_pfn;
		30	/* Array that receives PFNs of the pages pinned. */
28	unsigned long *pa_pfn;	31	unsigned long *pa_pfn;
		32	/* Number of pages pinned from @pa_iova. */
29	int pa_nr;	33	int pa_nr;
30	};	34	};
31		35
@@ -46,70 +50,33 @@ struct ccwchain { · 14 unmodified lines
46	};	50	};
47		51
48	/*	52	/*
49	* pfn_array_pin() - pin user pages in memory	53	* pfn_array_alloc_pin() - alloc memory for PFNs, then pin user pages in memory
50	* @pa: pfn_array on which to perform the operation	54	* @pa: pfn_array on which to perform the operation
51	* @mdev: the mediated device to perform pin/unpin operations	55	* @mdev: the mediated device to perform pin/unpin operations
		56	* @iova: target guest physical address
		57	* @len: number of bytes that should be pinned from @iova
52	*	58	*
53	* Attempt to pin user pages in memory.	59	* Attempt to allocate memory for PFNs, and pin user pages in memory.
54	*	60	*
55	* Usage of pfn_array:	61	* Usage of pfn_array:
56	* @pa->pa_iova starting guest physical I/O address. Assigned by caller.	62	* We expect (pa_nr == 0) and (pa_iova_pfn == NULL), any field in
57	* @pa->pa_iova_pfn array that stores PFNs of the pages need to pin. Allocated	63	* this structure will be filled in by this function.
58	* by caller.
59	* @pa->pa_pfn array that receives PFNs of the pages pinned. Allocated by
60	* caller.
61	* @pa->pa_nr number of pages from @pa->pa_iova to pin. Assigned by
62	* caller.
63	* number of pages pinned. Assigned by callee.
64	*	64	*
65	* Returns:	65	* Returns:
66	* Number of pages pinned on success.	66	* Number of pages pinned on success.
67	* If @pa->pa_nr is 0 or negative, returns 0.	67	* If @pa->pa_nr is not 0, or @pa->pa_iova_pfn is not NULL initially,
		68	* returns -EINVAL.
68	* If no pages were pinned, returns -errno.	69	* If no pages were pinned, returns -errno.
69	*/	70	*/
70	static int pfn_array_pin(struct pfn_array pa, struct device mdev)
71	{
72	int i, ret;
73
74	if (pa->pa_nr <= 0) {
75	pa->pa_nr = 0;
76	return 0;
77	}
78
79	pa->pa_iova_pfn[0] = pa->pa_iova >> PAGE_SHIFT;
80	for (i = 1; i < pa->pa_nr; i++)
81	pa->pa_iova_pfn[i] = pa->pa_iova_pfn[i - 1] + 1;
82
83	ret = vfio_pin_pages(mdev, pa->pa_iova_pfn, pa->pa_nr,
84	IOMMU_READ \| IOMMU_WRITE, pa->pa_pfn);
85
86	if (ret > 0 && ret != pa->pa_nr) {
87	vfio_unpin_pages(mdev, pa->pa_iova_pfn, ret);
88	pa->pa_nr = 0;
89	return 0;
90	}
91
92	return ret;
93	}
94
95	/* Unpin the pages before releasing the memory. */
96	static void pfn_array_unpin_free(struct pfn_array pa, struct device mdev)
97	{
98	vfio_unpin_pages(mdev, pa->pa_iova_pfn, pa->pa_nr);
99	pa->pa_nr = 0;
100	kfree(pa->pa_iova_pfn);
101	}
102
103	/* Alloc memory for PFNs, then pin pages with them. */
104	static int pfn_array_alloc_pin(struct pfn_array pa, struct device mdev,	71	static int pfn_array_alloc_pin(struct pfn_array pa, struct device mdev,
105	u64 iova, unsigned int len)	72	u64 iova, unsigned int len)
106	{	73	{
107	int ret = 0;	74	int i, ret = 0;
108		75
109	if (!len)	76	if (!len)
110	return 0;	77	return 0;
111		78
112	if (pa->pa_nr)	79	if (pa->pa_nr \|\| pa->pa_iova_pfn)
113	return -EINVAL;	80	return -EINVAL;
114		81
115	pa->pa_iova = iova;	82	pa->pa_iova = iova;
@@ -126,18 +93,39 @@ static int pfn_array_alloc_pin(struct pfn_array pa, struct device mdev, · 10 unmodified lines
126	return -ENOMEM;	93	return -ENOMEM;
127	pa->pa_pfn = pa->pa_iova_pfn + pa->pa_nr;	94	pa->pa_pfn = pa->pa_iova_pfn + pa->pa_nr;
128		95
129	ret = pfn_array_pin(pa, mdev);	96	pa->pa_iova_pfn[0] = pa->pa_iova >> PAGE_SHIFT;
		97	for (i = 1; i < pa->pa_nr; i++)
		98	pa->pa_iova_pfn[i] = pa->pa_iova_pfn[i - 1] + 1;
130		99
131	if (ret > 0)	100	ret = vfio_pin_pages(mdev, pa->pa_iova_pfn, pa->pa_nr,
132	return ret;	101	IOMMU_READ \| IOMMU_WRITE, pa->pa_pfn);
133	else if (!ret)	102
		103	if (ret < 0) {
		104	goto err_out;
		105	} else if (ret > 0 && ret != pa->pa_nr) {
		106	vfio_unpin_pages(mdev, pa->pa_iova_pfn, ret);
134	ret = -EINVAL;	107	ret = -EINVAL;
		108	goto err_out;
		109	}
135		110
		111	return ret;
		112
		113	err_out:
		114	pa->pa_nr = 0;
136	kfree(pa->pa_iova_pfn);	115	kfree(pa->pa_iova_pfn);
		116	pa->pa_iova_pfn = NULL;
137		117
138	return ret;	118	return ret;
139	}	119	}
140		120
		121	/* Unpin the pages before releasing the memory. */
		122	static void pfn_array_unpin_free(struct pfn_array pa, struct device mdev)
		123	{
		124	vfio_unpin_pages(mdev, pa->pa_iova_pfn, pa->pa_nr);
		125	pa->pa_nr = 0;
		126	kfree(pa->pa_iova_pfn);
		127	}
		128
141	static int pfn_array_table_init(struct pfn_array_table *pat, int nr)	129	static int pfn_array_table_init(struct pfn_array_table *pat, int nr)
142	{	130	{
143	pat->pat_pa = kcalloc(nr, sizeof(*pat->pat_pa), GFP_KERNEL);	131	pat->pat_pa = kcalloc(nr, sizeof(*pat->pat_pa), GFP_KERNEL);
@@ -365,6 +353,9 @@ static void cp_unpin_free(struct channel_program *cp) · 221 unmodified lines
365	* This is the chain length not considering any TICs.	353	* This is the chain length not considering any TICs.
366	* You need to do a new round for each TIC target.	354	* You need to do a new round for each TIC target.
367	*	355	*
		356	* The program is also validated for absence of not yet supported
		357	* indirect data addressing scenarios.
		358	*
368	* Returns: the length of the ccw chain or -errno.	359	* Returns: the length of the ccw chain or -errno.
369	*/	360	*/
370	static int ccwchain_calc_length(u64 iova, struct channel_program *cp)	361	static int ccwchain_calc_length(u64 iova, struct channel_program *cp)
@@ -391,6 +382,14 @@ static int ccwchain_calc_length(u64 iova, struct channel_program *cp) · 20 unmodified lines
391	do {	382	do {
392	cnt++;	383	cnt++;
393		384
		385	/*
		386	* As we don't want to fail direct addressing even if the
		387	* orb specified one of the unsupported formats, we defer
		388	* checking for IDAWs in unsupported formats to here.
		389	*/
		390	if ((!cp->orb.cmd.c64 \|\| cp->orb.cmd.i2k) && ccw_is_idal(ccw))
		391	return -EOPNOTSUPP;
		392
394	if ((!ccw_is_chain(ccw)) && (!ccw_is_tic(ccw)))	393	if ((!ccw_is_chain(ccw)) && (!ccw_is_tic(ccw)))
395	break;	394	break;
396		395
@@ -503,7 +502,7 @@ static int ccwchain_fetch_direct(struct ccwchain *chain, · 106 unmodified lines
503	struct ccw1 *ccw;	502	struct ccw1 *ccw;
504	struct pfn_array_table *pat;	503	struct pfn_array_table *pat;
505	unsigned long *idaws;	504	unsigned long *idaws;
506	int idaw_nr;	505	int ret;
507		506
508	ccw = chain->ch_ccw + idx;	507	ccw = chain->ch_ccw + idx;
509		508
@@ -523,18 +522,19 @@ static int ccwchain_fetch_direct(struct ccwchain *chain, · 13 unmodified lines
523	* needed when translating a direct ccw to a idal ccw.	522	* needed when translating a direct ccw to a idal ccw.
524	*/	523	*/
525	pat = chain->ch_pat + idx;	524	pat = chain->ch_pat + idx;
526	if (pfn_array_table_init(pat, 1))	525	ret = pfn_array_table_init(pat, 1);
527	return -ENOMEM;	526	if (ret)
528	idaw_nr = pfn_array_alloc_pin(pat->pat_pa, cp->mdev,	527	goto out_init;
529	ccw->cda, ccw->count);	528
530	if (idaw_nr < 0)	529	ret = pfn_array_alloc_pin(pat->pat_pa, cp->mdev, ccw->cda, ccw->count);
531	return idaw_nr;	530	if (ret < 0)
		531	goto out_init;
532		532
533	/* Translate this direct ccw to a idal ccw. */	533	/* Translate this direct ccw to a idal ccw. */
534	idaws = kcalloc(idaw_nr, sizeof(*idaws), GFP_DMA \| GFP_KERNEL);	534	idaws = kcalloc(ret, sizeof(*idaws), GFP_DMA \| GFP_KERNEL);
535	if (!idaws) {	535	if (!idaws) {
536	pfn_array_table_unpin_free(pat, cp->mdev);	536	ret = -ENOMEM;
537	return -ENOMEM;	537	goto out_unpin;
538	}	538	}
539	ccw->cda = (__u32) virt_to_phys(idaws);	539	ccw->cda = (__u32) virt_to_phys(idaws);
540	ccw->flags \|= CCW_FLAG_IDA;	540	ccw->flags \|= CCW_FLAG_IDA;
@@ -542,6 +542,12 @@ static int ccwchain_fetch_direct(struct ccwchain *chain, · 1 unmodified line
542	pfn_array_table_idal_create_words(pat, idaws);	542	pfn_array_table_idal_create_words(pat, idaws);
543		543
544	return 0;	544	return 0;
		545
		546	out_unpin:
		547	pfn_array_table_unpin_free(pat, cp->mdev);
		548	out_init:
		549	ccw->cda = 0;
		550	return ret;
545	}	551	}
546		552
547	static int ccwchain_fetch_idal(struct ccwchain *chain,	553	static int ccwchain_fetch_idal(struct ccwchain *chain,
@@ -571,7 +577,7 @@ static int ccwchain_fetch_idal(struct ccwchain *chain, · 23 unmodified lines
571	pat = chain->ch_pat + idx;	577	pat = chain->ch_pat + idx;
572	ret = pfn_array_table_init(pat, idaw_nr);	578	ret = pfn_array_table_init(pat, idaw_nr);
573	if (ret)	579	if (ret)
574	return ret;	580	goto out_init;
575		581
576	/* Translate idal ccw to use new allocated idaws. */	582	/* Translate idal ccw to use new allocated idaws. */
577	idaws = kzalloc(idaw_len, GFP_DMA \| GFP_KERNEL);	583	idaws = kzalloc(idaw_len, GFP_DMA \| GFP_KERNEL);
@@ -603,6 +609,8 @@ out_free_idaws: · 25 unmodified lines
603	kfree(idaws);	609	kfree(idaws);
604	out_unpin:	610	out_unpin:
605	pfn_array_table_unpin_free(pat, cp->mdev);	611	pfn_array_table_unpin_free(pat, cp->mdev);
		612	out_init:
		613	ccw->cda = 0;
606	return ret;	614	return ret;
607	}	615	}
608		616
@@ -656,10 +664,8 @@ int cp_init(struct channel_program cp, struct device mdev, union orb *orb) · 47 unmodified lines
656	/*	664	/*
657	* XXX:	665	* XXX:
658	* Only support prefetch enable mode now.	666	* Only support prefetch enable mode now.
659	* Only support 64bit addressing idal.
660	* Only support 4k IDAW.
661	*/	667	*/
662	if (!orb->cmd.pfch \|\| !orb->cmd.c64 \|\| orb->cmd.i2k)	668	if (!orb->cmd.pfch)
663	return -EOPNOTSUPP;	669	return -EOPNOTSUPP;
664		670
665	INIT_LIST_HEAD(&cp->ccwchain_list);	671	INIT_LIST_HEAD(&cp->ccwchain_list);
@@ -688,6 +694,10 @@ int cp_init(struct channel_program cp, struct device mdev, union orb *orb) · 22 unmodified lines
688	ret = ccwchain_loop_tic(chain, cp);	694	ret = ccwchain_loop_tic(chain, cp);
689	if (ret)	695	if (ret)
690	cp_unpin_free(cp);	696	cp_unpin_free(cp);
		697	/* It is safe to force: if not set but idals used
		698	* ccwchain_calc_length returns an error.
		699	*/
		700	cp->orb.cmd.c64 = 1;
691		701
692	return ret;	702	return ret;
693	}	703	}

drivers/s390/cio/vfio_ccw_drv.c+4−1

 {
 	struct vfio_ccw_private *private = dev_get_drvdata(&sch->dev);
 	unsigned long flags;
+	int rc = -EAGAIN;
 	spin_lock_irqsave(sch->lock, flags);
 	if (!device_is_registered(&sch->dev))
 	if (cio_update_schib(sch)) {
 		vfio_ccw_fsm_event(private, VFIO_CCW_EVENT_NOT_OPER);
+		rc = 0;
 		goto out_unlock;
 	}
 		private->state = private->mdev ? VFIO_CCW_STATE_IDLE :
 				 VFIO_CCW_STATE_STANDBY;
 	}
+	rc = 0;
 out_unlock:
 	spin_unlock_irqrestore(sch->lock, flags);
-	return 0;
+	return rc;
 }
 static struct css_device_id vfio_ccw_sch_ids[] = {

drivers/s390/cio/vfio_ccw_fsm.c+16−1

 #include "ioasm.h"
 #include "vfio_ccw_private.h"
+#define CREATE_TRACE_POINTS
+#include "vfio_ccw_trace.h"
 static int fsm_io_helper(struct vfio_ccw_private *private)
 {
 	struct subchannel *sch;
 	 */
 	cio_disable_subchannel(sch);
 }
+inline struct subchannel_id get_schid(struct vfio_ccw_private *p)
+{
+	return p->sch->schid;
+}
 /*
  * Deal with the ccw command request from the userspace.
 	union scsw *scsw = &private->scsw;
 	struct ccw_io_region *io_region = &private->io_region;
 	struct mdev_device *mdev = private->mdev;
+	char *errstr = "request";
 	private->state = VFIO_CCW_STATE_BOXED;
 		/* Don't try to build a cp if transport mode is specified. */
 		if (orb->tm.b) {
 			io_region->ret_code = -EOPNOTSUPP;
+			errstr = "transport mode";
 			goto err_out;
 		}
 		io_region->ret_code = cp_init(&private->cp, mdev_dev(mdev),
 					      orb);
-		if (io_region->ret_code)
+		if (io_region->ret_code) {
+			errstr = "cp init";
 			goto err_out;
+		}
 		io_region->ret_code = cp_prefetch(&private->cp);
 		if (io_region->ret_code) {
+			errstr = "cp prefetch";
 			cp_free(&private->cp);
 			goto err_out;
 		}
 		/* Start channel program and wait for I/O interrupt. */
 		io_region->ret_code = fsm_io_helper(private);
 		if (io_region->ret_code) {
+			errstr = "cp fsm_io_helper";
 			cp_free(&private->cp);
 			goto err_out;
 		}
 err_out:
 	private->state = VFIO_CCW_STATE_IDLE;
+	trace_vfio_ccw_io_fctl(scsw->cmd.fctl, get_schid(private),
+			       io_region->ret_code, errstr);
 }
 /*

drivers/s390/cio/vfio_ccw_trace.h+54−0

@@ -0,0 +1,54 @@
	1	/* SPDX-License-Identifier: GPL-2.0
	2	* Tracepoints for vfio_ccw driver
	3	*
	4	* Copyright IBM Corp. 2018
	5	*
	6	* Author(s): Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
	7	* Halil Pasic <pasic@linux.vnet.ibm.com>
	8	*/
	9
	10	#undef TRACE_SYSTEM
	11	#define TRACE_SYSTEM vfio_ccw
	12
	13	#if !defined(_VFIO_CCW_TRACE_) \|\| defined(TRACE_HEADER_MULTI_READ)
	14	#define _VFIO_CCW_TRACE_
	15
	16	#include <linux/tracepoint.h>
	17
	18	TRACE_EVENT(vfio_ccw_io_fctl,
	19	TP_PROTO(int fctl, struct subchannel_id schid, int errno, char *errstr),
	20	TP_ARGS(fctl, schid, errno, errstr),
	21
	22	TP_STRUCT__entry(
	23	__field(int, fctl)
	24	__field_struct(struct subchannel_id, schid)
	25	__field(int, errno)
	26	__field(char*, errstr)
	27	),
	28
	29	TP_fast_assign(
	30	__entry->fctl = fctl;
	31	__entry->schid = schid;
	32	__entry->errno = errno;
	33	__entry->errstr = errstr;
	34	),
	35
	36	TP_printk("schid=%x.%x.%04x fctl=%x errno=%d info=%s",
	37	__entry->schid.cssid,
	38	__entry->schid.ssid,
	39	__entry->schid.sch_no,
	40	__entry->fctl,
	41	__entry->errno,
	42	__entry->errstr)
	43	);
	44
	45	#endif /* _VFIO_CCW_TRACE_ */
	46
	47	/* This part must be outside protection */
	48
	49	#undef TRACE_INCLUDE_PATH
	50	#define TRACE_INCLUDE_PATH .
	51	#undef TRACE_INCLUDE_FILE
	52	#define TRACE_INCLUDE_FILE vfio_ccw_trace
	53
	54	#include <trace/define_trace.h>

drivers/scsi/ipr.c+0−2

 		ioa_cfg->hrrq[i].allow_interrupts = 0;
 		spin_unlock(&ioa_cfg->hrrq[i]._lock);
 	}
-	wmb();
 	/* Set interrupt mask to stop all new interrupts */
 	if (ioa_cfg->sis64)
 		ioa_cfg->hrrq[i].allow_interrupts = 1;
 		spin_unlock(&ioa_cfg->hrrq[i]._lock);
 	}
-	wmb();
 	if (ioa_cfg->sis64) {
 		/* Set the adapter to the correct endian mode. */
 		writel(IPR_ENDIAN_SWAP_KEY, ioa_cfg->regs.endian_swap_reg);

drivers/scsi/qla2xxx/qla_target.c+3−4

 void qlt_schedule_sess_for_deletion(struct fc_port *sess)
 {
 	struct qla_tgt *tgt = sess->tgt;
-	struct qla_hw_data *ha = sess->vha->hw;
 	unsigned long flags;
 	if (sess->disc_state == DSC_DELETE_PEND)
 			return;
 	}
-	spin_lock_irqsave(&ha->tgt.sess_lock, flags);
 	if (sess->deleted == QLA_SESS_DELETED)
 		sess->logout_on_delete = 0;
+	spin_lock_irqsave(&sess->vha->work_lock, flags);
 	if (sess->deleted == QLA_SESS_DELETION_IN_PROGRESS) {
-		spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
+		spin_unlock_irqrestore(&sess->vha->work_lock, flags);
 		return;
 	}
 	sess->deleted = QLA_SESS_DELETION_IN_PROGRESS;
-	spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
+	spin_unlock_irqrestore(&sess->vha->work_lock, flags);
 	sess->disc_state = DSC_DELETE_PEND;

drivers/scsi/scsi_debug.c+1−1

 	int k = sdebug_add_host;
 	stop_all_queued();
-	free_all_queued();
 	for (; k; k--)
 		sdebug_remove_adapter();
+	free_all_queued();
 	driver_unregister(&sdebug_driverfs_driver);
 	bus_unregister(&pseudo_lld_bus);
 	root_device_unregister(pseudo_primary);

drivers/scsi/scsi_transport_fc.c+1−1

@@ -3592,7 +3592,7 @@ fc_bsg_job_timeout(struct request *req) · 3591 unmodified lines
3592		3592
3593	/* the blk_end_sync_io() doesn't check the error */	3593	/* the blk_end_sync_io() doesn't check the error */
3594	if (inflight)	3594	if (inflight)
3595	blk_mq_complete_request(req);	3595	__blk_complete_request(req);
3596	return BLK_EH_DONE;	3596	return BLK_EH_DONE;
3597	}	3597	}
3598		3598

drivers/scsi/xen-scsifront.c+26−7

 static int scsifront_sdev_configure(struct scsi_device *sdev)
 {
 	struct vscsifrnt_info *info = shost_priv(sdev->host);
+	int err;
-	if (info && current == info->curr)
+	if (info && current == info->curr) {
-		xenbus_printf(XBT_NIL, info->dev->nodename,
+		err = xenbus_printf(XBT_NIL, info->dev->nodename,
 			      info->dev_state_path, "%d", XenbusStateConnected);
+		if (err) {
+			xenbus_dev_error(info->dev, err,
+				"%s: writing dev_state_path", __func__);
+			return err;
+		}
+	}
 	return 0;
 }
 static void scsifront_sdev_destroy(struct scsi_device *sdev)
 {
 	struct vscsifrnt_info *info = shost_priv(sdev->host);
+	int err;
-	if (info && current == info->curr)
+	if (info && current == info->curr) {
-		xenbus_printf(XBT_NIL, info->dev->nodename,
+		err = xenbus_printf(XBT_NIL, info->dev->nodename,
 			      info->dev_state_path, "%d", XenbusStateClosed);
+		if (err)
+			xenbus_dev_error(info->dev, err,
+				"%s: writing dev_state_path", __func__);
+	}
 }
 static struct scsi_host_template scsifront_sht = {
 			if (scsi_add_device(info->host, chn, tgt, lun)) {
 				dev_err(&dev->dev, "scsi_add_device\n");
-				xenbus_printf(XBT_NIL, dev->nodename,
+				err = xenbus_printf(XBT_NIL, dev->nodename,
 					      info->dev_state_path,
 					      "%d", XenbusStateClosed);
+				if (err)
+					xenbus_dev_error(dev, err,
+						"%s: writing dev_state_path", __func__);
 			}
 			break;
 		case VSCSIFRONT_OP_DEL_LUN:
 			}
 			break;
 		case VSCSIFRONT_OP_READD_LUN:
-			if (device_state == XenbusStateConnected)
+			if (device_state == XenbusStateConnected) {
-				xenbus_printf(XBT_NIL, dev->nodename,
+				err = xenbus_printf(XBT_NIL, dev->nodename,
 					      info->dev_state_path,
 					      "%d", XenbusStateConnected);
+				if (err)
+					xenbus_dev_error(dev, err,
+						"%s: writing dev_state_path", __func__);
+			}
 			break;
 		default:
 			break;

drivers/soc/imx/gpcv2.c+9−4

@@ -39,10 +39,15 @@ · 38 unmodified lines
39		39
40	#define GPC_M4_PU_PDN_FLG 0x1bc	40	#define GPC_M4_PU_PDN_FLG 0x1bc
41		41
42		42	/*
43	#define PGC_MIPI 4	43	* The PGC offset values in Reference Manual
44	#define PGC_PCIE 5	44	* (Rev. 1, 01/2018 and the older ones) GPC chapter's
45	#define PGC_USB_HSIC 8	45	* GPC_PGC memory map are incorrect, below offset
		46	* values are from design RTL.
		47	*/
		48	#define PGC_MIPI 16
		49	#define PGC_PCIE 17
		50	#define PGC_USB_HSIC 20
46	#define GPC_PGC_CTRL(n) (0x800 + (n) * 0x40)	51	#define GPC_PGC_CTRL(n) (0x800 + (n) * 0x40)
47	#define GPC_PGC_SR(n) (GPC_PGC_CTRL(n) + 0xc)	52	#define GPC_PGC_SR(n) (GPC_PGC_CTRL(n) + 0xc)
48		53

drivers/soc/qcom/Kconfig+2−1

@@ -5,7 +5,8 @@ menu "Qualcomm SoC drivers" · 4 unmodified lines
5		5
6	config QCOM_COMMAND_DB	6	config QCOM_COMMAND_DB
7	bool "Qualcomm Command DB"	7	bool "Qualcomm Command DB"
8	depends on (ARCH_QCOM && OF) \|\| COMPILE_TEST	8	depends on ARCH_QCOM \|\| COMPILE_TEST
		9	depends on OF_RESERVED_MEM
9	help	10	help
10	Command DB queries shared memory by key string for shared system	11	Command DB queries shared memory by key string for shared system
11	resources. Platform drivers that require to set state of a shared	12	resources. Platform drivers that require to set state of a shared

drivers/soc/renesas/rcar-sysc.c+29−6

 static bool has_cpg_mstp;
-static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
+static int __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
 {
 	struct generic_pm_domain *genpd = &pd->genpd;
 	const char *name = pd->genpd.name;
 	struct dev_power_governor *gov = &simple_qos_governor;
+	int error;
 	if (pd->flags & PD_CPU) {
 		/*
 	rcar_sysc_power_up(&pd->ch);
 finalize:
-	pm_genpd_init(genpd, gov, false);
+	error = pm_genpd_init(genpd, gov, false);
+	if (error)
+		pr_err("Failed to init PM domain %s: %d\n", name, error);
+	return error;
 }
 static const struct of_device_id rcar_sysc_matches[] __initconst = {
 	pr_debug("%pOF: syscier = 0x%08x\n", np, syscier);
 	iowrite32(syscier, base + SYSCIER);
+	/*
+	 * First, create all PM domains
+	 */
 	for (i = 0; i < info->num_areas; i++) {
 		const struct rcar_sysc_area *area = &info->areas[i];
 		struct rcar_sysc_pd *pd;
 		pd->ch.isr_bit = area->isr_bit;
 		pd->flags = area->flags;
-		rcar_sysc_pd_setup(pd);
+		error = rcar_sysc_pd_setup(pd);
-		if (area->parent >= 0)
+		if (error)
-			pm_genpd_add_subdomain(domains->domains[area->parent],
+			goto out_put;
-					       &pd->genpd);
 		domains->domains[area->isr_bit] = &pd->genpd;
 	}
+	/*
+	 * Second, link all PM domains to their parents
+	 */
+	for (i = 0; i < info->num_areas; i++) {
+		const struct rcar_sysc_area *area = &info->areas[i];
+		if (!area->name || area->parent < 0)
+			continue;
+		error = pm_genpd_add_subdomain(domains->domains[area->parent],
+					       domains->domains[area->isr_bit]);
+		if (error)
+			pr_warn("Failed to add PM subdomain %s to parent %u\n",
+				area->name, area->parent);
+	}
 	error = of_genpd_add_provider_onecell(np, &domains->onecell_data);
 out_put:

drivers/staging/android/ion/ion_heap.c+1−1

@@ -30,7 +30,7 @@ void ion_heap_map_kernel(struct ion_heap heap, · 29 unmodified lines
30	struct page **tmp = pages;	30	struct page **tmp = pages;
31		31
32	if (!pages)	32	if (!pages)
33	return NULL;	33	return ERR_PTR(-ENOMEM);
34		34
35	if (buffer->flags & ION_FLAG_CACHED)	35	if (buffer->flags & ION_FLAG_CACHED)
36	pgprot = PAGE_KERNEL;	36	pgprot = PAGE_KERNEL;

drivers/staging/comedi/drivers/quatech_daqp_cs.c+1−1

@@ -642,7 +642,7 @@ static int daqp_ao_insn_write(struct comedi_device *dev, · 641 unmodified lines
642	/* Make sure D/A update mode is direct update */	642	/* Make sure D/A update mode is direct update */
643	outb(0, dev->iobase + DAQP_AUX_REG);	643	outb(0, dev->iobase + DAQP_AUX_REG);
644		644
645	for (i = 0; i > insn->n; i++) {	645	for (i = 0; i < insn->n; i++) {
646	unsigned int val = data[i];	646	unsigned int val = data[i];
647	int ret;	647	int ret;
648		648

drivers/staging/typec/Kconfig+1−0

@@ -11,6 +11,7 @@ config TYPEC_TCPCI · 10 unmodified lines
11		11
12	config TYPEC_RT1711H	12	config TYPEC_RT1711H
13	tristate "Richtek RT1711H Type-C chip driver"	13	tristate "Richtek RT1711H Type-C chip driver"
		14	depends on I2C
14	select TYPEC_TCPCI	15	select TYPEC_TCPCI
15	help	16	help
16	Richtek RT1711H Type-C chip driver that works with	17	Richtek RT1711H Type-C chip driver that works with

drivers/target/target_core_user.c+36−8

 }
 static void gather_data_area(struct tcmu_dev *udev, struct tcmu_cmd *cmd,
-			     bool bidi)
+			     bool bidi, uint32_t read_len)
 {
 	struct se_cmd *se_cmd = cmd->se_cmd;
 	int i, dbi;
 	for_each_sg(data_sg, sg, data_nents, i) {
 		int sg_remaining = sg->length;
 		to = kmap_atomic(sg_page(sg)) + sg->offset;
-		while (sg_remaining > 0) {
+		while (sg_remaining > 0 && read_len > 0) {
 			if (block_remaining == 0) {
 				if (from)
 					kunmap_atomic(from);
 			}
 			copy_bytes = min_t(size_t, sg_remaining,
 					block_remaining);
+			if (read_len < copy_bytes)
+				copy_bytes = read_len;
 			offset = DATA_BLOCK_SIZE - block_remaining;
 			tcmu_flush_dcache_range(from, copy_bytes);
 			memcpy(to + sg->length - sg_remaining, from + offset,
 			sg_remaining -= copy_bytes;
 			block_remaining -= copy_bytes;
+			read_len -= copy_bytes;
 		}
 		kunmap_atomic(to - sg->offset);
+		if (read_len == 0)
+			break;
 	}
 	if (from)
 		kunmap_atomic(from);
 {
 	struct se_cmd *se_cmd = cmd->se_cmd;
 	struct tcmu_dev *udev = cmd->tcmu_dev;
+	bool read_len_valid = false;
+	uint32_t read_len = se_cmd->data_length;
 	/*
 	 * cmd has been completed already from timeout, just reclaim
 		pr_warn("TCMU: Userspace set UNKNOWN_OP flag on se_cmd %p\n",
 			cmd->se_cmd);
 		entry->rsp.scsi_status = SAM_STAT_CHECK_CONDITION;
-	} else if (entry->rsp.scsi_status == SAM_STAT_CHECK_CONDITION) {
+		goto done;
+	}
+	if (se_cmd->data_direction == DMA_FROM_DEVICE &&
+	    (entry->hdr.uflags & TCMU_UFLAG_READ_LEN) && entry->rsp.read_len) {
+		read_len_valid = true;
+		if (entry->rsp.read_len < read_len)
+			read_len = entry->rsp.read_len;
+	}
+	if (entry->rsp.scsi_status == SAM_STAT_CHECK_CONDITION) {
 		transport_copy_sense_to_cmd(se_cmd, entry->rsp.sense_buffer);
-	} else if (se_cmd->se_cmd_flags & SCF_BIDI) {
+		if (!read_len_valid )
+			goto done;
+		else
+			se_cmd->se_cmd_flags |= SCF_TREAT_READ_AS_NORMAL;
+	}
+	if (se_cmd->se_cmd_flags & SCF_BIDI) {
 		/* Get Data-In buffer before clean up */
-		gather_data_area(udev, cmd, true);
+		gather_data_area(udev, cmd, true, read_len);
 	} else if (se_cmd->data_direction == DMA_FROM_DEVICE) {
-		gather_data_area(udev, cmd, false);
+		gather_data_area(udev, cmd, false, read_len);
 	} else if (se_cmd->data_direction == DMA_TO_DEVICE) {
 		/* TODO: */
 	} else if (se_cmd->data_direction != DMA_NONE) {
 			se_cmd->data_direction);
 	}
-	target_complete_cmd(cmd->se_cmd, entry->rsp.scsi_status);
+done:
+	if (read_len_valid) {
+		pr_debug("read_len = %d\n", read_len);
+		target_complete_cmd_with_length(cmd->se_cmd,
+					entry->rsp.scsi_status, read_len);
+	} else
+		target_complete_cmd(cmd->se_cmd, entry->rsp.scsi_status);
 out:
 	cmd->se_cmd = NULL;
 	/* Initialise the mailbox of the ring buffer */
 	mb = udev->mb_addr;
 	mb->version = TCMU_MAILBOX_VERSION;
-	mb->flags = TCMU_MAILBOX_FLAG_CAP_OOOC;
+	mb->flags = TCMU_MAILBOX_FLAG_CAP_OOOC | TCMU_MAILBOX_FLAG_CAP_READ_LEN;
 	mb->cmdr_off = CMDR_OFF;
 	mb->cmdr_size = udev->cmdr_size;

drivers/tty/n_tty.c+32−23

 	struct mutex output_lock;
 };
+#define MASK(x) ((x) & (N_TTY_BUF_SIZE - 1))
 static inline size_t read_cnt(struct n_tty_data *ldata)
 {
 	return ldata->read_head - ldata->read_tail;
 static inline unsigned char echo_buf(struct n_tty_data *ldata, size_t i)
 {
+	smp_rmb(); /* Matches smp_wmb() in add_echo_byte(). */
 	return ldata->echo_buf[i & (N_TTY_BUF_SIZE - 1)];
 }
 static void reset_buffer_flags(struct n_tty_data *ldata)
 {
 	ldata->read_head = ldata->canon_head = ldata->read_tail = 0;
-	ldata->echo_head = ldata->echo_tail = ldata->echo_commit = 0;
 	ldata->commit_head = 0;
-	ldata->echo_mark = 0;
 	ldata->line_start = 0;
 	ldata->erasing = 0;
 	old_space = space = tty_write_room(tty);
 	tail = ldata->echo_tail;
-	while (ldata->echo_commit != tail) {
+	while (MASK(ldata->echo_commit) != MASK(tail)) {
 		c = echo_buf(ldata, tail);
 		if (c == ECHO_OP_START) {
 			unsigned char op;
 			int no_space_left = 0;
+			/*
+			 * Since add_echo_byte() is called without holding
+			 * output_lock, we might see only portion of multi-byte
+			 * operation.
+			 */
+			if (MASK(ldata->echo_commit) == MASK(tail + 1))
+				goto not_yet_stored;
 			/*
 			 * If the buffer byte is the start of a multi-byte
 			 * operation, get the next byte, which is either the
 				unsigned int num_chars, num_bs;
 			case ECHO_OP_ERASE_TAB:
+				if (MASK(ldata->echo_commit) == MASK(tail + 2))
+					goto not_yet_stored;
 				num_chars = echo_buf(ldata, tail + 2);
 				/*
 	/* If the echo buffer is nearly full (so that the possibility exists
 	 * of echo overrun before the next commit), then discard enough
 	 * data at the tail to prevent a subsequent overrun */
-	while (ldata->echo_commit - tail >= ECHO_DISCARD_WATERMARK) {
+	while (ldata->echo_commit > tail &&
+	       ldata->echo_commit - tail >= ECHO_DISCARD_WATERMARK) {
 		if (echo_buf(ldata, tail) == ECHO_OP_START) {
 			if (echo_buf(ldata, tail + 1) == ECHO_OP_ERASE_TAB)
 				tail += 3;
 			tail++;
 	}
+ not_yet_stored:
 	ldata->echo_tail = tail;
 	return old_space - space;
 }
 	size_t nr, old, echoed;
 	size_t head;
+	mutex_lock(&ldata->output_lock);
 	head = ldata->echo_head;
 	ldata->echo_mark = head;
 	old = ldata->echo_commit - ldata->echo_tail;
 	 * is over the threshold (and try again each time another
 	 * block is accumulated) */
 	nr = head - ldata->echo_tail;
-	if (nr < ECHO_COMMIT_WATERMARK || (nr % ECHO_BLOCK > old % ECHO_BLOCK))
+	if (nr < ECHO_COMMIT_WATERMARK ||
+	    (nr % ECHO_BLOCK > old % ECHO_BLOCK)) {
+		mutex_unlock(&ldata->output_lock);
 		return;
+	}
-	mutex_lock(&ldata->output_lock);
 	ldata->echo_commit = head;
 	echoed = __process_echoes(tty);
 	mutex_unlock(&ldata->output_lock);
 static inline void add_echo_byte(unsigned char c, struct n_tty_data *ldata)
 {
-	*echo_buf_addr(ldata, ldata->echo_head++) = c;
+	*echo_buf_addr(ldata, ldata->echo_head) = c;
+	smp_wmb(); /* Matches smp_rmb() in echo_buf(). */
+	ldata->echo_head++;
 }
 /**
 	}
 	seen_alnums = 0;
-	while (ldata->read_head != ldata->canon_head) {
+	while (MASK(ldata->read_head) != MASK(ldata->canon_head)) {
 		head = ldata->read_head;
 		/* erase a single possibly multibyte character */
 		do {
 			head--;
 			c = read_buf(ldata, head);
-		} while (is_continuation(c, tty) && head != ldata->canon_head);
+		} while (is_continuation(c, tty) &&
+			 MASK(head) != MASK(ldata->canon_head));
 		/* do not partially erase */
 		if (is_continuation(c, tty))
 				 * This info is used to go back the correct
 				 * number of columns.
 				 */
-				while (tail != ldata->canon_head) {
+				while (MASK(tail) != MASK(ldata->canon_head)) {
 					tail--;
 					c = read_buf(ldata, tail);
 					if (c == '\t') {
 			finish_erasing(ldata);
 			echo_char(c, tty);
 			echo_char_raw('\n', ldata);
-			while (tail != ldata->read_head) {
+			while (MASK(tail) != MASK(ldata->read_head)) {
 				echo_char(read_buf(ldata, tail), tty);
 				tail++;
 			}
 	struct n_tty_data *ldata;
 	/* Currently a malloc failure here can panic */
-	ldata = vmalloc(sizeof(*ldata));
+	ldata = vzalloc(sizeof(*ldata));
 	if (!ldata)
-		goto err;
+		return -ENOMEM;
 	ldata->overrun_time = jiffies;
 	mutex_init(&ldata->atomic_read_lock);
 	mutex_init(&ldata->output_lock);
 	tty->disc_data = ldata;
-	reset_buffer_flags(tty->disc_data);
-	ldata->column = 0;
-	ldata->canon_column = 0;
-	ldata->num_overrun = 0;
-	ldata->no_room = 0;
-	ldata->lnext = 0;
 	tty->closing = 0;
 	/* indicate buffer work may resume */
 	clear_bit(TTY_LDISC_HALTED, &tty->flags);
 	n_tty_set_termios(tty, NULL);
 	tty_unthrottle(tty);
 	return 0;
-err:
-	return -ENOMEM;
 }
 static inline int input_available_p(struct tty_struct *tty, int poll)
 	tail = ldata->read_tail;
 	nr = head - tail;
 	/* Skip EOF-chars.. */
-	while (head != tail) {
+	while (MASK(head) != MASK(tail)) {
 		if (test_bit(tail & (N_TTY_BUF_SIZE - 1), ldata->read_flags) &&
 		    read_buf(ldata, tail) == __DISABLED_CHAR)
 			nr--;

drivers/tty/serdev/core.c+1−0

@@ -617,6 +617,7 @@ EXPORT_SYMBOL_GPL(__serdev_device_driver_register); · 616 unmodified lines
617	static void __exit serdev_exit(void)	617	static void __exit serdev_exit(void)
618	{	618	{
619	bus_unregister(&serdev_bus_type);	619	bus_unregister(&serdev_bus_type);
		620	ida_destroy(&ctrl_ida);
620	}	621	}
621	module_exit(serdev_exit);	622	module_exit(serdev_exit);
622		623

drivers/tty/serial/8250/8250_pci.c+0−2

 	/* multi-io cards handled by parport_serial */
 	{ PCI_DEVICE(0x4348, 0x7053), }, /* WCH CH353 2S1P */
 	{ PCI_DEVICE(0x4348, 0x5053), }, /* WCH CH353 1S1P */
-	{ PCI_DEVICE(0x4348, 0x7173), }, /* WCH CH355 4S */
 	{ PCI_DEVICE(0x1c00, 0x3250), }, /* WCH CH382 2S1P */
-	{ PCI_DEVICE(0x1c00, 0x3470), }, /* WCH CH384 4S */
 	/* Moxa Smartio MUE boards handled by 8250_moxa */
 	{ PCI_VDEVICE(MOXA, 0x1024), },

drivers/tty/vt/vt.c+2−2

@@ -784,7 +784,7 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */ · 783 unmodified lines
784	if (!*vc->vc_uni_pagedir_loc)	784	if (!*vc->vc_uni_pagedir_loc)
785	con_set_default_unimap(vc);	785	con_set_default_unimap(vc);
786		786
787	vc->vc_screenbuf = kmalloc(vc->vc_screenbuf_size, GFP_KERNEL);	787	vc->vc_screenbuf = kzalloc(vc->vc_screenbuf_size, GFP_KERNEL);
788	if (!vc->vc_screenbuf)	788	if (!vc->vc_screenbuf)
789	goto err_free;	789	goto err_free;
790		790
@@ -871,7 +871,7 @@ static int vc_do_resize(struct tty_struct tty, struct vc_data vc, · 80 unmodified lines
871		871
872	if (new_screen_size > (4 << 20))	872	if (new_screen_size > (4 << 20))
873	return -EINVAL;	873	return -EINVAL;
874	newscreen = kmalloc(new_screen_size, GFP_USER);	874	newscreen = kzalloc(new_screen_size, GFP_USER);
875	if (!newscreen)	875	if (!newscreen)
876	return -ENOMEM;	876	return -ENOMEM;
877		877

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

 	hcd->power_budget = ci->platdata->power_budget;
 	hcd->tpl_support = ci->platdata->tpl_support;
-	if (ci->phy || ci->usb_phy)
+	if (ci->phy || ci->usb_phy) {
 		hcd->skip_phy_initialization = 1;
+		if (ci->usb_phy)
+			hcd->usb_phy = ci->usb_phy;
+	}
 	ehci = hcd_to_ehci(hcd);
 	ehci->caps = ci->hw_bank.cap;

drivers/usb/class/cdc-acm.c+3−0

 	{ USB_DEVICE(0x11ca, 0x0201), /* VeriFone Mx870 Gadget Serial */
 	.driver_info = SINGLE_RX_URB,
 	},
+	{ USB_DEVICE(0x1965, 0x0018), /* Uniden UBC125XLT */
+	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */
+	},
 	{ USB_DEVICE(0x22b8, 0x7000), /* Motorola Q Phone */
 	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */
 	},

drivers/usb/dwc2/core.h+3−0

  * @frame_list_sz:      Frame list size
  * @desc_gen_cache:     Kmem cache for generic descriptors
  * @desc_hsisoc_cache:  Kmem cache for hs isochronous descriptors
+ * @unaligned_cache:    Kmem cache for DMA mode to handle non-aligned buf
  *
  * These are for peripheral mode:
  *
 	u32 frame_list_sz;
 	struct kmem_cache *desc_gen_cache;
 	struct kmem_cache *desc_hsisoc_cache;
+	struct kmem_cache *unaligned_cache;
+#define DWC2_KMEM_UNALIGNED_BUF_SIZE 1024
 #endif /* CONFIG_USB_DWC2_HOST || CONFIG_USB_DWC2_DUAL_ROLE */

drivers/usb/dwc2/gadget.c+12−8

@@ -812,6 +812,7 @@ static int dwc2_gadget_fill_isoc_desc(struct dwc2_hsotg_ep *hs_ep, · 811 unmodified lines
812	u32 index;	812	u32 index;
813	u32 maxsize = 0;	813	u32 maxsize = 0;
814	u32 mask = 0;	814	u32 mask = 0;
		815	u8 pid = 0;
815		816
816	maxsize = dwc2_gadget_get_desc_params(hs_ep, &mask);	817	maxsize = dwc2_gadget_get_desc_params(hs_ep, &mask);
817		818
@@ -840,7 +841,11 @@ static int dwc2_gadget_fill_isoc_desc(struct dwc2_hsotg_ep *hs_ep, · 22 unmodified lines
840	((len << DEV_DMA_NBYTES_SHIFT) & mask));	841	((len << DEV_DMA_NBYTES_SHIFT) & mask));
841		842
842	if (hs_ep->dir_in) {	843	if (hs_ep->dir_in) {
843	desc->status \|= ((hs_ep->mc << DEV_DMA_ISOC_PID_SHIFT) &	844	if (len)
		845	pid = DIV_ROUND_UP(len, hs_ep->ep.maxpacket);
		846	else
		847	pid = 1;
		848	desc->status \|= ((pid << DEV_DMA_ISOC_PID_SHIFT) &
844	DEV_DMA_ISOC_PID_MASK) \|	849	DEV_DMA_ISOC_PID_MASK) \|
845	((len % hs_ep->ep.maxpacket) ?	850	((len % hs_ep->ep.maxpacket) ?
846	DEV_DMA_SHORT : 0) \|	851	DEV_DMA_SHORT : 0) \|
@@ -884,6 +889,7 @@ static void dwc2_gadget_start_isoc_ddma(struct dwc2_hsotg_ep *hs_ep) · 37 unmodified lines
884	struct dwc2_dma_desc *desc;	889	struct dwc2_dma_desc *desc;
885		890
886	if (list_empty(&hs_ep->queue)) {	891	if (list_empty(&hs_ep->queue)) {
		892	hs_ep->target_frame = TARGET_FRAME_INITIAL;
887	dev_dbg(hsotg->dev, "%s: No requests in queue\n", __func__);	893	dev_dbg(hsotg->dev, "%s: No requests in queue\n", __func__);
888	return;	894	return;
889	}	895	}
@@ -2755,8 +2761,6 @@ static void dwc2_gadget_handle_out_token_ep_disabled(struct dwc2_hsotg_ep *ep) · 1865 unmodified lines
2755	*/	2761	*/
2756	tmp = dwc2_hsotg_read_frameno(hsotg);	2762	tmp = dwc2_hsotg_read_frameno(hsotg);
2757		2763
2758	dwc2_hsotg_complete_request(hsotg, ep, get_ep_head(ep), 0);
2759
2760	if (using_desc_dma(hsotg)) {	2764	if (using_desc_dma(hsotg)) {
2761	if (ep->target_frame == TARGET_FRAME_INITIAL) {	2765	if (ep->target_frame == TARGET_FRAME_INITIAL) {
2762	/* Start first ISO Out */	2766	/* Start first ISO Out */
@@ -2817,9 +2821,6 @@ static void dwc2_gadget_handle_nak(struct dwc2_hsotg_ep *hs_ep) · 54 unmodified lines
2817		2821
2818	tmp = dwc2_hsotg_read_frameno(hsotg);	2822	tmp = dwc2_hsotg_read_frameno(hsotg);
2819	if (using_desc_dma(hsotg)) {	2823	if (using_desc_dma(hsotg)) {
2820	dwc2_hsotg_complete_request(hsotg, hs_ep,
2821	get_ep_head(hs_ep), 0);
2822
2823	hs_ep->target_frame = tmp;	2824	hs_ep->target_frame = tmp;
2824	dwc2_gadget_incr_frame_num(hs_ep);	2825	dwc2_gadget_incr_frame_num(hs_ep);
2825	dwc2_gadget_start_isoc_ddma(hs_ep);	2826	dwc2_gadget_start_isoc_ddma(hs_ep);
@@ -4739,9 +4740,11 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg) · 1913 unmodified lines
4739	}	4740	}
4740		4741
4741	ret = usb_add_gadget_udc(dev, &hsotg->gadget);	4742	ret = usb_add_gadget_udc(dev, &hsotg->gadget);
4742	if (ret)	4743	if (ret) {
		4744	dwc2_hsotg_ep_free_request(&hsotg->eps_out[0]->ep,
		4745	hsotg->ctrl_req);
4743	return ret;	4746	return ret;
4744		4747	}
4745	dwc2_hsotg_dump(hsotg);	4748	dwc2_hsotg_dump(hsotg);
4746		4749
4747	return 0;	4750	return 0;
@@ -4755,6 +4758,7 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg) · 7 unmodified lines
4755	int dwc2_hsotg_remove(struct dwc2_hsotg *hsotg)	4758	int dwc2_hsotg_remove(struct dwc2_hsotg *hsotg)
4756	{	4759	{
4757	usb_del_gadget_udc(&hsotg->gadget);	4760	usb_del_gadget_udc(&hsotg->gadget);
		4761	dwc2_hsotg_ep_free_request(&hsotg->eps_out[0]->ep, hsotg->ctrl_req);
4758		4762
4759	return 0;	4763	return 0;
4760	}	4764	}

drivers/usb/dwc2/hcd.c+87−6

@@ -1567,11 +1567,20 @@ static void dwc2_hc_start_transfer(struct dwc2_hsotg *hsotg, · 1566 unmodified lines
1567	}	1567	}
1568		1568
1569	if (hsotg->params.host_dma) {	1569	if (hsotg->params.host_dma) {
1570	dwc2_writel((u32)chan->xfer_dma,	1570	dma_addr_t dma_addr;
1571	hsotg->regs + HCDMA(chan->hc_num));	1571
		1572	if (chan->align_buf) {
		1573	if (dbg_hc(chan))
		1574	dev_vdbg(hsotg->dev, "align_buf\n");
		1575	dma_addr = chan->align_buf;
		1576	} else {
		1577	dma_addr = chan->xfer_dma;
		1578	}
		1579	dwc2_writel((u32)dma_addr, hsotg->regs + HCDMA(chan->hc_num));
		1580
1572	if (dbg_hc(chan))	1581	if (dbg_hc(chan))
1573	dev_vdbg(hsotg->dev, "Wrote %08lx to HCDMA(%d)\n",	1582	dev_vdbg(hsotg->dev, "Wrote %08lx to HCDMA(%d)\n",
1574	(unsigned long)chan->xfer_dma, chan->hc_num);	1583	(unsigned long)dma_addr, chan->hc_num);
1575	}	1584	}
1576		1585
1577	/* Start the split */	1586	/* Start the split */
@@ -2625,6 +2634,35 @@ static void dwc2_hc_init_xfer(struct dwc2_hsotg *hsotg, · 1047 unmodified lines
2625	}	2634	}
2626	}	2635	}
2627		2636
		2637	static int dwc2_alloc_split_dma_aligned_buf(struct dwc2_hsotg *hsotg,
		2638	struct dwc2_qh *qh,
		2639	struct dwc2_host_chan *chan)
		2640	{
		2641	if (!hsotg->unaligned_cache \|\|
		2642	chan->max_packet > DWC2_KMEM_UNALIGNED_BUF_SIZE)
		2643	return -ENOMEM;
		2644
		2645	if (!qh->dw_align_buf) {
		2646	qh->dw_align_buf = kmem_cache_alloc(hsotg->unaligned_cache,
		2647	GFP_ATOMIC \| GFP_DMA);
		2648	if (!qh->dw_align_buf)
		2649	return -ENOMEM;
		2650	}
		2651
		2652	qh->dw_align_buf_dma = dma_map_single(hsotg->dev, qh->dw_align_buf,
		2653	DWC2_KMEM_UNALIGNED_BUF_SIZE,
		2654	DMA_FROM_DEVICE);
		2655
		2656	if (dma_mapping_error(hsotg->dev, qh->dw_align_buf_dma)) {
		2657	dev_err(hsotg->dev, "can't map align_buf\n");
		2658	chan->align_buf = 0;
		2659	return -EINVAL;
		2660	}
		2661
		2662	chan->align_buf = qh->dw_align_buf_dma;
		2663	return 0;
		2664	}
		2665
2628	#define DWC2_USB_DMA_ALIGN 4	2666	#define DWC2_USB_DMA_ALIGN 4
2629		2667
2630	struct dma_aligned_buffer {	2668	struct dma_aligned_buffer {
@@ -2802,6 +2840,32 @@ static int dwc2_assign_and_init_hc(struct dwc2_hsotg hsotg, struct dwc2_qh qh) · 171 unmodified lines
2802	/* Set the transfer attributes */	2840	/* Set the transfer attributes */
2803	dwc2_hc_init_xfer(hsotg, chan, qtd);	2841	dwc2_hc_init_xfer(hsotg, chan, qtd);
2804		2842
		2843	/* For non-dword aligned buffers */
		2844	if (hsotg->params.host_dma && qh->do_split &&
		2845	chan->ep_is_in && (chan->xfer_dma & 0x3)) {
		2846	dev_vdbg(hsotg->dev, "Non-aligned buffer\n");
		2847	if (dwc2_alloc_split_dma_aligned_buf(hsotg, qh, chan)) {
		2848	dev_err(hsotg->dev,
		2849	"Failed to allocate memory to handle non-aligned buffer\n");
		2850	/* Add channel back to free list */
		2851	chan->align_buf = 0;
		2852	chan->multi_count = 0;
		2853	list_add_tail(&chan->hc_list_entry,
		2854	&hsotg->free_hc_list);
		2855	qtd->in_process = 0;
		2856	qh->channel = NULL;
		2857	return -ENOMEM;
		2858	}
		2859	} else {
		2860	/*
		2861	* We assume that DMA is always aligned in non-split
		2862	* case or split out case. Warn if not.
		2863	*/
		2864	WARN_ON_ONCE(hsotg->params.host_dma &&
		2865	(chan->xfer_dma & 0x3));
		2866	chan->align_buf = 0;
		2867	}
		2868
2805	if (chan->ep_type == USB_ENDPOINT_XFER_INT \|\|	2869	if (chan->ep_type == USB_ENDPOINT_XFER_INT \|\|
2806	chan->ep_type == USB_ENDPOINT_XFER_ISOC)	2870	chan->ep_type == USB_ENDPOINT_XFER_ISOC)
2807	/*	2871	/*
@@ -5246,6 +5310,19 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg) · 2438 unmodified lines
5246	}	5310	}
5247	}	5311	}
5248		5312
		5313	if (hsotg->params.host_dma) {
		5314	/*
		5315	* Create kmem caches to handle non-aligned buffer
		5316	* in Buffer DMA mode.
		5317	*/
		5318	hsotg->unaligned_cache = kmem_cache_create("dwc2-unaligned-dma",
		5319	DWC2_KMEM_UNALIGNED_BUF_SIZE, 4,
		5320	SLAB_CACHE_DMA, NULL);
		5321	if (!hsotg->unaligned_cache)
		5322	dev_err(hsotg->dev,
		5323	"unable to create dwc2 unaligned cache\n");
		5324	}
		5325
5249	hsotg->otg_port = 1;	5326	hsotg->otg_port = 1;
5250	hsotg->frame_list = NULL;	5327	hsotg->frame_list = NULL;
5251	hsotg->frame_list_dma = 0;	5328	hsotg->frame_list_dma = 0;
@@ -5280,8 +5357,9 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg) · 28 unmodified lines
5280	return 0;	5357	return 0;
5281		5358
5282	error4:	5359	error4:
5283	kmem_cache_destroy(hsotg->desc_gen_cache);	5360	kmem_cache_destroy(hsotg->unaligned_cache);
5284	kmem_cache_destroy(hsotg->desc_hsisoc_cache);	5361	kmem_cache_destroy(hsotg->desc_hsisoc_cache);
		5362	kmem_cache_destroy(hsotg->desc_gen_cache);
5285	error3:	5363	error3:
5286	dwc2_hcd_release(hsotg);	5364	dwc2_hcd_release(hsotg);
5287	error2:	5365	error2:
@@ -5322,8 +5400,9 @@ void dwc2_hcd_remove(struct dwc2_hsotg *hsotg) · 34 unmodified lines
5322	usb_remove_hcd(hcd);	5400	usb_remove_hcd(hcd);
5323	hsotg->priv = NULL;	5401	hsotg->priv = NULL;
5324		5402
5325	kmem_cache_destroy(hsotg->desc_gen_cache);	5403	kmem_cache_destroy(hsotg->unaligned_cache);
5326	kmem_cache_destroy(hsotg->desc_hsisoc_cache);	5404	kmem_cache_destroy(hsotg->desc_hsisoc_cache);
		5405	kmem_cache_destroy(hsotg->desc_gen_cache);
5327		5406
5328	dwc2_hcd_release(hsotg);	5407	dwc2_hcd_release(hsotg);
5329	usb_put_hcd(hcd);	5408	usb_put_hcd(hcd);
@@ -5435,7 +5514,7 @@ int dwc2_host_enter_hibernation(struct dwc2_hsotg *hsotg) · 105 unmodified lines
5435	dwc2_writel(hprt0, hsotg->regs + HPRT0);	5514	dwc2_writel(hprt0, hsotg->regs + HPRT0);
5436		5515
5437	/* Wait for the HPRT0.PrtSusp register field to be set */	5516	/* Wait for the HPRT0.PrtSusp register field to be set */
5438	if (dwc2_hsotg_wait_bit_set(hsotg, HPRT0, HPRT0_SUSP, 300))	5517	if (dwc2_hsotg_wait_bit_set(hsotg, HPRT0, HPRT0_SUSP, 3000))
5439	dev_warn(hsotg->dev, "Suspend wasn't generated\n");	5518	dev_warn(hsotg->dev, "Suspend wasn't generated\n");
5440		5519
5441	/*	5520	/*
@@ -5616,6 +5695,8 @@ int dwc2_host_exit_hibernation(struct dwc2_hsotg *hsotg, int rem_wakeup, · 174 unmodified lines
5616	return ret;	5695	return ret;
5617	}	5696	}
5618		5697
		5698	dwc2_hcd_rem_wakeup(hsotg);
		5699
5619	hsotg->hibernated = 0;	5700	hsotg->hibernated = 0;
5620	hsotg->bus_suspended = 0;	5701	hsotg->bus_suspended = 0;
5621	hsotg->lx_state = DWC2_L0;	5702	hsotg->lx_state = DWC2_L0;

drivers/usb/dwc2/hcd.h+8−0

  *                      (micro)frame
  * @xfer_buf:           Pointer to current transfer buffer position
  * @xfer_dma:           DMA address of xfer_buf
+ * @align_buf:          In Buffer DMA mode this will be used if xfer_buf is not
+ *                      DWORD aligned
  * @xfer_len:           Total number of bytes to transfer
  * @xfer_count:         Number of bytes transferred so far
  * @start_pkt_count:    Packet count at start of transfer
 	u8 *xfer_buf;
 	dma_addr_t xfer_dma;
+	dma_addr_t align_buf;
 	u32 xfer_len;
 	u32 xfer_count;
 	u16 start_pkt_count;
  *                           speed.  Note that this is in "schedule slice" which
  *                           is tightly packed.
  * @ntd:                Actual number of transfer descriptors in a list
+ * @dw_align_buf:       Used instead of original buffer if its physical address
+ *                      is not dword-aligned
+ * @dw_align_buf_dma:   DMA address for dw_align_buf
  * @qtd_list:           List of QTDs for this QH
  * @channel:            Host channel currently processing transfers for this QH
  * @qh_list_entry:      Entry for QH in either the periodic or non-periodic
 	struct dwc2_hs_transfer_time hs_transfers[DWC2_HS_SCHEDULE_UFRAMES];
 	u32 ls_start_schedule_slice;
 	u16 ntd;
+	u8 *dw_align_buf;
+	dma_addr_t dw_align_buf_dma;
 	struct list_head qtd_list;
 	struct dwc2_host_chan *channel;
 	struct list_head qh_list_entry;

drivers/usb/dwc2/hcd_intr.c+9−2

 	frame_desc = &qtd->urb->iso_descs[qtd->isoc_frame_index];
 	len = dwc2_get_actual_xfer_length(hsotg, chan, chnum, qtd,
 					  DWC2_HC_XFER_COMPLETE, NULL);
-	if (!len) {
+	if (!len && !qtd->isoc_split_offset) {
 		qtd->complete_split = 0;
-		qtd->isoc_split_offset = 0;
 		return 0;
 	}
 	frame_desc->actual_length += len;
+	if (chan->align_buf) {
+		dev_vdbg(hsotg->dev, "non-aligned buffer\n");
+		dma_unmap_single(hsotg->dev, chan->qh->dw_align_buf_dma,
+				 DWC2_KMEM_UNALIGNED_BUF_SIZE, DMA_FROM_DEVICE);
+		memcpy(qtd->urb->buf + (chan->xfer_dma - qtd->urb->dma),
+		       chan->qh->dw_align_buf, len);
+	}
 	qtd->isoc_split_offset += len;
 	hctsiz = dwc2_readl(hsotg->regs + HCTSIZ(chnum));

drivers/usb/dwc2/hcd_queue.c+4−1

 	/* Get the map and adjust if this is a multi_tt hub */
 	map = qh->dwc_tt->periodic_bitmaps;
 	if (qh->dwc_tt->usb_tt->multi)
-		map += DWC2_ELEMENTS_PER_LS_BITMAP * qh->ttport;
+		map += DWC2_ELEMENTS_PER_LS_BITMAP * (qh->ttport - 1);
 	return map;
 }
 	if (qh->desc_list)
 		dwc2_hcd_qh_free_ddma(hsotg, qh);
+	else if (hsotg->unaligned_cache && qh->dw_align_buf)
+		kmem_cache_free(hsotg->unaligned_cache, qh->dw_align_buf);
 	kfree(qh);
 }

drivers/usb/dwc3/core.c+13−10

@@ -1272,7 +1272,6 @@ static int dwc3_probe(struct platform_device *pdev) · 1271 unmodified lines
1272	if (!dwc->clks)	1272	if (!dwc->clks)
1273	return -ENOMEM;	1273	return -ENOMEM;
1274		1274
1275	dwc->num_clks = ARRAY_SIZE(dwc3_core_clks);
1276	dwc->dev = dev;	1275	dwc->dev = dev;
1277		1276
1278	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);	1277	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -1307,15 +1306,19 @@ static int dwc3_probe(struct platform_device *pdev) · 28 unmodified lines
1307	if (IS_ERR(dwc->reset))	1306	if (IS_ERR(dwc->reset))
1308	return PTR_ERR(dwc->reset);	1307	return PTR_ERR(dwc->reset);
1309		1308
1310	ret = clk_bulk_get(dev, dwc->num_clks, dwc->clks);	1309	if (dev->of_node) {
1311	if (ret == -EPROBE_DEFER)	1310	dwc->num_clks = ARRAY_SIZE(dwc3_core_clks);
1312	return ret;	1311
1313	/*	1312	ret = clk_bulk_get(dev, dwc->num_clks, dwc->clks);
1314	* Clocks are optional, but new DT platforms should support all clocks	1313	if (ret == -EPROBE_DEFER)
1315	* as required by the DT-binding.	1314	return ret;
1316	*/	1315	/*
1317	if (ret)	1316	* Clocks are optional, but new DT platforms should support all
1318	dwc->num_clks = 0;	1317	* clocks as required by the DT-binding.
		1318	*/
		1319	if (ret)
		1320	dwc->num_clks = 0;
		1321	}
1319		1322
1320	ret = reset_control_deassert(dwc->reset);	1323	ret = reset_control_deassert(dwc->reset);
1321	if (ret)	1324	if (ret)

drivers/usb/dwc3/dwc3-of-simple.c+2−1

@@ -165,8 +165,9 @@ static int dwc3_of_simple_remove(struct platform_device *pdev) · 164 unmodified lines
165		165
166	reset_control_put(simple->resets);	166	reset_control_put(simple->resets);
167		167
168	pm_runtime_put_sync(dev);
169	pm_runtime_disable(dev);	168	pm_runtime_disable(dev);
		169	pm_runtime_put_noidle(dev);
		170	pm_runtime_set_suspended(dev);
170		171
171	return 0;	172	return 0;
172	}	173	}

drivers/usb/dwc3/dwc3-pci.c+2−0

 #define PCI_DEVICE_ID_INTEL_GLK			0x31aa
 #define PCI_DEVICE_ID_INTEL_CNPLP		0x9dee
 #define PCI_DEVICE_ID_INTEL_CNPH		0xa36e
+#define PCI_DEVICE_ID_INTEL_ICLLP		0x34ee
 #define PCI_INTEL_BXT_DSM_GUID		"732b85d5-b7a7-4a1b-9ba0-4bbd00ffd511"
 #define PCI_INTEL_BXT_FUNC_PMU_PWR	4
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_GLK), },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CNPLP), },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CNPH), },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICLLP), },
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_NL_USB), },
 	{  }	/* Terminating Entry */
 };

drivers/usb/dwc3/dwc3-qcom.c+5−8

 	qcom->dwc3 = of_find_device_by_node(dwc3_np);
 	if (!qcom->dwc3) {
 		dev_err(&pdev->dev, "failed to get dwc3 platform device\n");
+		ret = -ENODEV;
 		goto depopulate;
 	}
 	return 0;
 }
-#ifdef CONFIG_PM_SLEEP
+static int __maybe_unused dwc3_qcom_pm_suspend(struct device *dev)
-static int dwc3_qcom_pm_suspend(struct device *dev)
 {
 	struct dwc3_qcom *qcom = dev_get_drvdata(dev);
 	int ret = 0;
 	return ret;
 }
-static int dwc3_qcom_pm_resume(struct device *dev)
+static int __maybe_unused dwc3_qcom_pm_resume(struct device *dev)
 {
 	struct dwc3_qcom *qcom = dev_get_drvdata(dev);
 	int ret;
 	return ret;
 }
-#endif
-#ifdef CONFIG_PM
+static int __maybe_unused dwc3_qcom_runtime_suspend(struct device *dev)
-static int dwc3_qcom_runtime_suspend(struct device *dev)
 {
 	struct dwc3_qcom *qcom = dev_get_drvdata(dev);
 	return dwc3_qcom_suspend(qcom);
 }
-static int dwc3_qcom_runtime_resume(struct device *dev)
+static int __maybe_unused dwc3_qcom_runtime_resume(struct device *dev)
 {
 	struct dwc3_qcom *qcom = dev_get_drvdata(dev);
 	return dwc3_qcom_resume(qcom);
 }
-#endif
 static const struct dev_pm_ops dwc3_qcom_dev_pm_ops = {
 	SET_SYSTEM_SLEEP_PM_OPS(dwc3_qcom_pm_suspend, dwc3_qcom_pm_resume)

drivers/usb/gadget/composite.c+3−0

 		 */
 		if (w_value && !f->get_alt)
 			break;
+		spin_lock(&cdev->lock);
 		value = f->set_alt(f, w_index, w_value);
 		if (value == USB_GADGET_DELAYED_STATUS) {
 			DBG(cdev,
 			DBG(cdev, "delayed_status count %d\n",
 					cdev->delayed_status);
 		}
+		spin_unlock(&cdev->lock);
 		break;
 	case USB_REQ_GET_INTERFACE:
 		if (ctrl->bRequestType != (USB_DIR_IN|USB_RECIP_INTERFACE))

drivers/usb/gadget/function/f_fs.c+18−8

@@ -215,6 +215,7 @@ struct ffs_io_data { · 214 unmodified lines
215		215
216	struct mm_struct *mm;	216	struct mm_struct *mm;
217	struct work_struct work;	217	struct work_struct work;
		218	struct work_struct cancellation_work;
218		219
219	struct usb_ep *ep;	220	struct usb_ep *ep;
220	struct usb_request *req;	221	struct usb_request *req;
@@ -1072,22 +1073,31 @@ ffs_epfile_open(struct inode inode, struct file file) · 851 unmodified lines
1072	return 0;	1073	return 0;
1073	}	1074	}
1074		1075
		1076	static void ffs_aio_cancel_worker(struct work_struct *work)
		1077	{
		1078	struct ffs_io_data *io_data = container_of(work, struct ffs_io_data,
		1079	cancellation_work);
		1080
		1081	ENTER();
		1082
		1083	usb_ep_dequeue(io_data->ep, io_data->req);
		1084	}
		1085
1075	static int ffs_aio_cancel(struct kiocb *kiocb)	1086	static int ffs_aio_cancel(struct kiocb *kiocb)
1076	{	1087	{
1077	struct ffs_io_data *io_data = kiocb->private;	1088	struct ffs_io_data *io_data = kiocb->private;
1078	struct ffs_epfile *epfile = kiocb->ki_filp->private_data;	1089	struct ffs_data *ffs = io_data->ffs;
1079	int value;	1090	int value;
1080		1091
1081	ENTER();	1092	ENTER();
1082		1093
1083	spin_lock_irq(&epfile->ffs->eps_lock);	1094	if (likely(io_data && io_data->ep && io_data->req)) {
1084		1095	INIT_WORK(&io_data->cancellation_work, ffs_aio_cancel_worker);
1085	if (likely(io_data && io_data->ep && io_data->req))	1096	queue_work(ffs->io_completion_wq, &io_data->cancellation_work);
1086	value = usb_ep_dequeue(io_data->ep, io_data->req);	1097	value = -EINPROGRESS;
1087	else	1098	} else {
1088	value = -EINVAL;	1099	value = -EINVAL;
1089		1100	}
1090	spin_unlock_irq(&epfile->ffs->eps_lock);
1091		1101
1092	return value;	1102	return value;
1093	}	1103	}

drivers/usb/host/xhci-mem.c+2−2

 	dev = xhci->devs[slot_id];
-	trace_xhci_free_virt_device(dev);
 	xhci->dcbaa->dev_context_ptrs[slot_id] = 0;
 	if (!dev)
 		return;
+	trace_xhci_free_virt_device(dev);
 	if (dev->tt_info)
 		old_active_eps = dev->tt_info->active_eps;

drivers/usb/host/xhci-tegra.c+3−3

@@ -481,7 +481,7 @@ static void tegra_xusb_mbox_handle(struct tegra_xusb *tegra, · 480 unmodified lines
481	unsigned long mask;	481	unsigned long mask;
482	unsigned int port;	482	unsigned int port;
483	bool idle, enable;	483	bool idle, enable;
484	int err;	484	int err = 0;
485		485
486	memset(&rsp, 0, sizeof(rsp));	486	memset(&rsp, 0, sizeof(rsp));
487		487
@@ -1223,10 +1223,10 @@ disable_rpm: · 735 unmodified lines
1223	pm_runtime_disable(&pdev->dev);	1223	pm_runtime_disable(&pdev->dev);
1224	usb_put_hcd(tegra->hcd);	1224	usb_put_hcd(tegra->hcd);
1225	disable_xusbc:	1225	disable_xusbc:
1226	if (!&pdev->dev.pm_domain)	1226	if (!pdev->dev.pm_domain)
1227	tegra_powergate_power_off(TEGRA_POWERGATE_XUSBC);	1227	tegra_powergate_power_off(TEGRA_POWERGATE_XUSBC);
1228	disable_xusba:	1228	disable_xusba:
1229	if (!&pdev->dev.pm_domain)	1229	if (!pdev->dev.pm_domain)
1230	tegra_powergate_power_off(TEGRA_POWERGATE_XUSBA);	1230	tegra_powergate_power_off(TEGRA_POWERGATE_XUSBA);
1231	put_padctl:	1231	put_padctl:
1232	tegra_xusb_padctl_put(tegra->padctl);	1232	tegra_xusb_padctl_put(tegra->padctl);

drivers/usb/host/xhci-trace.h+31−5

@@ -171,6 +171,37 @@ DEFINE_EVENT(xhci_log_trb, xhci_dbc_gadget_ep_queue, · 170 unmodified lines
171	TP_ARGS(ring, trb)	171	TP_ARGS(ring, trb)
172	);	172	);
173		173
		174	DECLARE_EVENT_CLASS(xhci_log_free_virt_dev,
		175	TP_PROTO(struct xhci_virt_device *vdev),
		176	TP_ARGS(vdev),
		177	TP_STRUCT__entry(
		178	__field(void *, vdev)
		179	__field(unsigned long long, out_ctx)
		180	__field(unsigned long long, in_ctx)
		181	__field(u8, fake_port)
		182	__field(u8, real_port)
		183	__field(u16, current_mel)
		184
		185	),
		186	TP_fast_assign(
		187	__entry->vdev = vdev;
		188	__entry->in_ctx = (unsigned long long) vdev->in_ctx->dma;
		189	__entry->out_ctx = (unsigned long long) vdev->out_ctx->dma;
		190	__entry->fake_port = (u8) vdev->fake_port;
		191	__entry->real_port = (u8) vdev->real_port;
		192	__entry->current_mel = (u16) vdev->current_mel;
		193	),
		194	TP_printk("vdev %p ctx %llx \| %llx fake_port %d real_port %d current_mel %d",
		195	__entry->vdev, __entry->in_ctx, __entry->out_ctx,
		196	__entry->fake_port, __entry->real_port, __entry->current_mel
		197	)
		198	);
		199
		200	DEFINE_EVENT(xhci_log_free_virt_dev, xhci_free_virt_device,
		201	TP_PROTO(struct xhci_virt_device *vdev),
		202	TP_ARGS(vdev)
		203	);
		204
174	DECLARE_EVENT_CLASS(xhci_log_virt_dev,	205	DECLARE_EVENT_CLASS(xhci_log_virt_dev,
175	TP_PROTO(struct xhci_virt_device *vdev),	206	TP_PROTO(struct xhci_virt_device *vdev),
176	TP_ARGS(vdev),	207	TP_ARGS(vdev),
@@ -208,11 +239,6 @@ DEFINE_EVENT(xhci_log_virt_dev, xhci_alloc_virt_device, · 31 unmodified lines
208	TP_ARGS(vdev)	239	TP_ARGS(vdev)
209	);	240	);
210		241
211	DEFINE_EVENT(xhci_log_virt_dev, xhci_free_virt_device,
212	TP_PROTO(struct xhci_virt_device *vdev),
213	TP_ARGS(vdev)
214	);
215
216	DEFINE_EVENT(xhci_log_virt_dev, xhci_setup_device,	242	DEFINE_EVENT(xhci_log_virt_dev, xhci_setup_device,
217	TP_PROTO(struct xhci_virt_device *vdev),	243	TP_PROTO(struct xhci_virt_device *vdev),
218	TP_ARGS(vdev)	244	TP_ARGS(vdev)

drivers/usb/host/xhci.c+43−4

@@ -908,6 +908,41 @@ static void xhci_disable_port_wake_on_bits(struct xhci_hcd *xhci) · 907 unmodified lines
908	spin_unlock_irqrestore(&xhci->lock, flags);	908	spin_unlock_irqrestore(&xhci->lock, flags);
909	}	909	}
910		910
		911	static bool xhci_pending_portevent(struct xhci_hcd *xhci)
		912	{
		913	struct xhci_port **ports;
		914	int port_index;
		915	u32 status;
		916	u32 portsc;
		917
		918	status = readl(&xhci->op_regs->status);
		919	if (status & STS_EINT)
		920	return true;
		921	/*
		922	* Checking STS_EINT is not enough as there is a lag between a change
		923	* bit being set and the Port Status Change Event that it generated
		924	* being written to the Event Ring. See note in xhci 1.1 section 4.19.2.
		925	*/
		926
		927	port_index = xhci->usb2_rhub.num_ports;
		928	ports = xhci->usb2_rhub.ports;
		929	while (port_index--) {
		930	portsc = readl(ports[port_index]->addr);
		931	if (portsc & PORT_CHANGE_MASK \|\|
		932	(portsc & PORT_PLS_MASK) == XDEV_RESUME)
		933	return true;
		934	}
		935	port_index = xhci->usb3_rhub.num_ports;
		936	ports = xhci->usb3_rhub.ports;
		937	while (port_index--) {
		938	portsc = readl(ports[port_index]->addr);
		939	if (portsc & PORT_CHANGE_MASK \|\|
		940	(portsc & PORT_PLS_MASK) == XDEV_RESUME)
		941	return true;
		942	}
		943	return false;
		944	}
		945
911	/*	946	/*
912	* Stop HC (not bus-specific)	947	* Stop HC (not bus-specific)
913	*	948	*
@@ -1009,7 +1044,7 @@ EXPORT_SYMBOL_GPL(xhci_suspend); · 95 unmodified lines
1009	*/	1044	*/
1010	int xhci_resume(struct xhci_hcd *xhci, bool hibernated)	1045	int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
1011	{	1046	{
1012	u32 command, temp = 0, status;	1047	u32 command, temp = 0;
1013	struct usb_hcd *hcd = xhci_to_hcd(xhci);	1048	struct usb_hcd *hcd = xhci_to_hcd(xhci);
1014	struct usb_hcd *secondary_hcd;	1049	struct usb_hcd *secondary_hcd;
1015	int retval = 0;	1050	int retval = 0;
@@ -1043,8 +1078,13 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) · 27 unmodified lines
1043	command = readl(&xhci->op_regs->command);	1078	command = readl(&xhci->op_regs->command);
1044	command \|= CMD_CRS;	1079	command \|= CMD_CRS;
1045	writel(command, &xhci->op_regs->command);	1080	writel(command, &xhci->op_regs->command);
		1081	/*
		1082	* Some controllers take up to 55+ ms to complete the controller
		1083	* restore so setting the timeout to 100ms. Xhci specification
		1084	* doesn't mention any timeout value.
		1085	*/
1046	if (xhci_handshake(&xhci->op_regs->status,	1086	if (xhci_handshake(&xhci->op_regs->status,
1047	STS_RESTORE, 0, 10 * 1000)) {	1087	STS_RESTORE, 0, 100 * 1000)) {
1048	xhci_warn(xhci, "WARN: xHC restore state timeout\n");	1088	xhci_warn(xhci, "WARN: xHC restore state timeout\n");
1049	spin_unlock_irq(&xhci->lock);	1089	spin_unlock_irq(&xhci->lock);
1050	return -ETIMEDOUT;	1090	return -ETIMEDOUT;
@@ -1134,8 +1174,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) · 83 unmodified lines
1134	done:	1174	done:
1135	if (retval == 0) {	1175	if (retval == 0) {
1136	/* Resume root hubs only when have pending events. */	1176	/* Resume root hubs only when have pending events. */
1137	status = readl(&xhci->op_regs->status);	1177	if (xhci_pending_portevent(xhci)) {
1138	if (status & STS_EINT) {
1139	usb_hcd_resume_root_hub(xhci->shared_hcd);	1178	usb_hcd_resume_root_hub(xhci->shared_hcd);
1140	usb_hcd_resume_root_hub(hcd);	1179	usb_hcd_resume_root_hub(hcd);
1141	}	1180	}

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

 #define PORT_PLC	(1 << 22)
 /* port configure error change - port failed to configure its link partner */
 #define PORT_CEC	(1 << 23)
+#define PORT_CHANGE_MASK	(PORT_CSC | PORT_PEC | PORT_WRC | PORT_OCC | \
+				 PORT_RC | PORT_PLC | PORT_CEC)
 /* Cold Attach Status - xHC can set this bit to report device attached during
  * Sx state. Warm port reset should be perfomed to clear this bit and move port
  * to connected state.

drivers/usb/serial/cp210x.c+14−0

 	{ USB_DEVICE(0x10C4, 0x8156) }, /* B&G H3000 link cable */
 	{ USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */
 	{ USB_DEVICE(0x10C4, 0x815F) }, /* Timewave HamLinkUSB */
+	{ USB_DEVICE(0x10C4, 0x817C) }, /* CESINEL MEDCAL N Power Quality Monitor */
+	{ USB_DEVICE(0x10C4, 0x817D) }, /* CESINEL MEDCAL NT Power Quality Monitor */
+	{ USB_DEVICE(0x10C4, 0x817E) }, /* CESINEL MEDCAL S Power Quality Monitor */
 	{ USB_DEVICE(0x10C4, 0x818B) }, /* AVIT Research USB to TTL */
 	{ USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */
 	{ USB_DEVICE(0x10C4, 0x81A6) }, /* ThinkOptics WavIt */
 	{ USB_DEVICE(0x10C4, 0x826B) }, /* Cygnal Integrated Products, Inc., Fasttrax GPS demonstration module */
 	{ USB_DEVICE(0x10C4, 0x8281) }, /* Nanotec Plug & Drive */
 	{ USB_DEVICE(0x10C4, 0x8293) }, /* Telegesis ETRX2USB */
+	{ USB_DEVICE(0x10C4, 0x82EF) }, /* CESINEL FALCO 6105 AC Power Supply */
+	{ USB_DEVICE(0x10C4, 0x82F1) }, /* CESINEL MEDCAL EFD Earth Fault Detector */
+	{ USB_DEVICE(0x10C4, 0x82F2) }, /* CESINEL MEDCAL ST Network Analyzer */
 	{ USB_DEVICE(0x10C4, 0x82F4) }, /* Starizona MicroTouch */
 	{ USB_DEVICE(0x10C4, 0x82F9) }, /* Procyon AVS */
 	{ USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */
 	{ USB_DEVICE(0x10C4, 0x8470) }, /* Juniper Networks BX Series System Console */
 	{ USB_DEVICE(0x10C4, 0x8477) }, /* Balluff RFID */
 	{ USB_DEVICE(0x10C4, 0x84B6) }, /* Starizona Hyperion */
+	{ USB_DEVICE(0x10C4, 0x851E) }, /* CESINEL MEDCAL PT Network Analyzer */
 	{ USB_DEVICE(0x10C4, 0x85A7) }, /* LifeScan OneTouch Verio IQ */
+	{ USB_DEVICE(0x10C4, 0x85B8) }, /* CESINEL ReCon T Energy Logger */
 	{ USB_DEVICE(0x10C4, 0x85EA) }, /* AC-Services IBUS-IF */
 	{ USB_DEVICE(0x10C4, 0x85EB) }, /* AC-Services CIS-IBUS */
 	{ USB_DEVICE(0x10C4, 0x85F8) }, /* Virtenio Preon32 */
 	{ USB_DEVICE(0x10C4, 0x8857) },	/* CEL EM357 ZigBee USB Stick */
 	{ USB_DEVICE(0x10C4, 0x88A4) }, /* MMB Networks ZigBee USB Device */
 	{ USB_DEVICE(0x10C4, 0x88A5) }, /* Planet Innovation Ingeni ZigBee USB Device */
+	{ USB_DEVICE(0x10C4, 0x88FB) }, /* CESINEL MEDCAL STII Network Analyzer */
+	{ USB_DEVICE(0x10C4, 0x8938) }, /* CESINEL MEDCAL S II Network Analyzer */
 	{ USB_DEVICE(0x10C4, 0x8946) }, /* Ketra N1 Wireless Interface */
 	{ USB_DEVICE(0x10C4, 0x8962) }, /* Brim Brothers charging dock */
 	{ USB_DEVICE(0x10C4, 0x8977) },	/* CEL MeshWorks DevKit Device */
 	{ USB_DEVICE(0x10C4, 0x8998) }, /* KCF Technologies PRN */
+	{ USB_DEVICE(0x10C4, 0x89A4) }, /* CESINEL FTBC Flexible Thyristor Bridge Controller */
 	{ USB_DEVICE(0x10C4, 0x8A2A) }, /* HubZ dual ZigBee and Z-Wave dongle */
 	{ USB_DEVICE(0x10C4, 0x8A5E) }, /* CEL EM3588 ZigBee USB Stick Long Range */
 	{ USB_DEVICE(0x10C4, 0x8B34) }, /* Qivicon ZigBee USB Radio Stick */
 	{ USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
 	{ USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
+	{ USB_DEVICE(0x10C4, 0xEA63) }, /* Silicon Labs Windows Update (CP2101-4/CP2102N) */
 	{ USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */
 	{ USB_DEVICE(0x10C4, 0xEA71) }, /* Infinity GPS-MIC-1 Radio Monophone */
+	{ USB_DEVICE(0x10C4, 0xEA7A) }, /* Silicon Labs Windows Update (CP2105) */
+	{ USB_DEVICE(0x10C4, 0xEA7B) }, /* Silicon Labs Windows Update (CP2108) */
 	{ USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */
 	{ USB_DEVICE(0x10C4, 0xF002) }, /* Elan Digital Systems USBwave12 */
 	{ USB_DEVICE(0x10C4, 0xF003) }, /* Elan Digital Systems USBpulse100 */

drivers/usb/typec/tcpm.c+6−4

 	u64 ts_nsec = local_clock();
 	unsigned long rem_nsec;
+	mutex_lock(&port->logbuffer_lock);
 	if (!port->logbuffer[port->logbuffer_head]) {
 		port->logbuffer[port->logbuffer_head] =
 				kzalloc(LOG_BUFFER_ENTRY_SIZE, GFP_KERNEL);
-		if (!port->logbuffer[port->logbuffer_head])
+		if (!port->logbuffer[port->logbuffer_head]) {
+			mutex_unlock(&port->logbuffer_lock);
 			return;
+		}
 	}
 	vsnprintf(tmpbuffer, sizeof(tmpbuffer), fmt, args);
-	mutex_lock(&port->logbuffer_lock);
 	if (tcpm_log_full(port)) {
 		port->logbuffer_head = max(port->logbuffer_head - 1, 0);
 		strcpy(tmpbuffer, "overflow");
 		    tcpm_port_is_sink(port) &&
 		    time_is_after_jiffies(port->delayed_runtime)) {
 			tcpm_set_state(port, SNK_DISCOVERY,
-				       port->delayed_runtime - jiffies);
+				       jiffies_to_msecs(port->delayed_runtime -
+							jiffies));
 			break;
 		}
 		tcpm_set_state(port, unattached_state(port), 0);

drivers/usb/typec/ucsi/ucsi.c+13−0

@@ -350,6 +350,19 @@ static void ucsi_connector_change(struct work_struct *work) · 349 unmodified lines
350	}	350	}
351		351
352	if (con->status.change & UCSI_CONSTAT_CONNECT_CHANGE) {	352	if (con->status.change & UCSI_CONSTAT_CONNECT_CHANGE) {
		353	typec_set_pwr_role(con->port, con->status.pwr_dir);
		354
		355	switch (con->status.partner_type) {
		356	case UCSI_CONSTAT_PARTNER_TYPE_UFP:
		357	typec_set_data_role(con->port, TYPEC_HOST);
		358	break;
		359	case UCSI_CONSTAT_PARTNER_TYPE_DFP:
		360	typec_set_data_role(con->port, TYPEC_DEVICE);
		361	break;
		362	default:
		363	break;
		364	}
		365
353	if (con->status.connected)	366	if (con->status.connected)
354	ucsi_register_partner(con);	367	ucsi_register_partner(con);
355	else	368	else

drivers/usb/typec/ucsi/ucsi_acpi.c+5−0

 		return -ENODEV;
 	}
+	/* This will make sure we can use ioremap_nocache() */
+	status = acpi_release_memory(ACPI_HANDLE(&pdev->dev), res, 1);
+	if (ACPI_FAILURE(status))
+		return -ENOMEM;
 	/*
 	 * NOTE: The memory region for the data structures is used also in an
 	 * operation region, which means ACPI has already reserved it. Therefore

drivers/vhost/net.c+2−1

 	if (ubufs)
 		vhost_net_ubuf_put_wait_and_free(ubufs);
 err_ubufs:
-	sockfd_put(sock);
+	if (sock)
+		sockfd_put(sock);
 err_vq:
 	mutex_unlock(&vq->mutex);
 err:

drivers/xen/Makefile+1−1

@@ -41,4 +41,4 @@ obj-$(CONFIG_XEN_PVCALLS_FRONTEND) += pvcalls-front.o · 40 unmodified lines
41	xen-evtchn-y := evtchn.o	41	xen-evtchn-y := evtchn.o
42	xen-gntdev-y := gntdev.o	42	xen-gntdev-y := gntdev.o
43	xen-gntalloc-y := gntalloc.o	43	xen-gntalloc-y := gntalloc.o
44	xen-privcmd-y := privcmd.o	44	xen-privcmd-y := privcmd.o privcmd-buf.o

drivers/xen/events/events_base.c+0−2

@@ -628,8 +628,6 @@ static void __unbind_from_irq(unsigned int irq) · 627 unmodified lines
628	xen_irq_info_cleanup(info);	628	xen_irq_info_cleanup(info);
629	}	629	}
630		630
631	BUG_ON(info_for_irq(irq)->type == IRQT_UNBOUND);
632
633	xen_free_irq(irq);	631	xen_free_irq(irq);
634	}	632	}
635		633

drivers/xen/grant-table.c+2−2

@@ -799,7 +799,7 @@ int gnttab_alloc_pages(int nr_pages, struct page **pages) · 798 unmodified lines
799		799
800	return 0;	800	return 0;
801	}	801	}
802	EXPORT_SYMBOL(gnttab_alloc_pages);	802	EXPORT_SYMBOL_GPL(gnttab_alloc_pages);
803		803
804	/**	804	/**
805	* gnttab_free_pages - free pages allocated by gnttab_alloc_pages()	805	* gnttab_free_pages - free pages allocated by gnttab_alloc_pages()
@@ -820,7 +820,7 @@ void gnttab_free_pages(int nr_pages, struct page **pages) · 14 unmodified lines
820	}	820	}
821	free_xenballooned_pages(nr_pages, pages);	821	free_xenballooned_pages(nr_pages, pages);
822	}	822	}
823	EXPORT_SYMBOL(gnttab_free_pages);	823	EXPORT_SYMBOL_GPL(gnttab_free_pages);
824		824
825	/* Handling of paged out grant targets (GNTST_eagain) */	825	/* Handling of paged out grant targets (GNTST_eagain) */
826	#define MAX_DELAY 256	826	#define MAX_DELAY 256

drivers/xen/manage.c+15−3

 		return;
 	}
-	if (sysrq_key != '\0')
+	if (sysrq_key != '\0') {
-		xenbus_printf(xbt, "control", "sysrq", "%c", '\0');
+		err = xenbus_printf(xbt, "control", "sysrq", "%c", '\0');
+		if (err) {
+			pr_err("%s: Error %d writing sysrq in control/sysrq\n",
+			       __func__, err);
+			xenbus_transaction_end(xbt, 1);
+			return;
+		}
+	}
 	err = xenbus_transaction_end(xbt, 0);
 	if (err == -EAGAIN)
 			continue;
 		snprintf(node, FEATURE_PATH_SIZE, "feature-%s",
 			 shutdown_handlers[idx].command);
-		xenbus_printf(XBT_NIL, "control", node, "%u", 1);
+		err = xenbus_printf(XBT_NIL, "control", node, "%u", 1);
+		if (err) {
+			pr_err("%s: Error %d writing %s\n", __func__,
+				err, node);
+			return err;
+		}
 	}
 	return 0;

drivers/xen/privcmd-buf.c+210−0

@@ -0,0 +1,210 @@
	1	// SPDX-License-Identifier: GPL-2.0 OR MIT
	2
	3	/******************************************************************************
	4	* privcmd-buf.c
	5	*
	6	* Mmap of hypercall buffers.
	7	*
	8	* Copyright (c) 2018 Juergen Gross
	9	*/
	10
	11	#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
	12
	13	#include <linux/kernel.h>
	14	#include <linux/module.h>
	15	#include <linux/list.h>
	16	#include <linux/miscdevice.h>
	17	#include <linux/mm.h>
	18	#include <linux/slab.h>
	19
	20	#include "privcmd.h"
	21
	22	MODULE_LICENSE("GPL");
	23
	24	static unsigned int limit = 64;
	25	module_param(limit, uint, 0644);
	26	MODULE_PARM_DESC(limit, "Maximum number of pages that may be allocated by "
	27	"the privcmd-buf device per open file");
	28
	29	struct privcmd_buf_private {
	30	struct mutex lock;
	31	struct list_head list;
	32	unsigned int allocated;
	33	};
	34
	35	struct privcmd_buf_vma_private {
	36	struct privcmd_buf_private *file_priv;
	37	struct list_head list;
	38	unsigned int users;
	39	unsigned int n_pages;
	40	struct page *pages[];
	41	};
	42
	43	static int privcmd_buf_open(struct inode ino, struct file file)
	44	{
	45	struct privcmd_buf_private *file_priv;
	46
	47	file_priv = kzalloc(sizeof(*file_priv), GFP_KERNEL);
	48	if (!file_priv)
	49	return -ENOMEM;
	50
	51	mutex_init(&file_priv->lock);
	52	INIT_LIST_HEAD(&file_priv->list);
	53
	54	file->private_data = file_priv;
	55
	56	return 0;
	57	}
	58
	59	static void privcmd_buf_vmapriv_free(struct privcmd_buf_vma_private *vma_priv)
	60	{
	61	unsigned int i;
	62
	63	vma_priv->file_priv->allocated -= vma_priv->n_pages;
	64
	65	list_del(&vma_priv->list);
	66
	67	for (i = 0; i < vma_priv->n_pages; i++)
	68	if (vma_priv->pages[i])
	69	__free_page(vma_priv->pages[i]);
	70
	71	kfree(vma_priv);
	72	}
	73
	74	static int privcmd_buf_release(struct inode ino, struct file file)
	75	{
	76	struct privcmd_buf_private *file_priv = file->private_data;
	77	struct privcmd_buf_vma_private *vma_priv;
	78
	79	mutex_lock(&file_priv->lock);
	80
	81	while (!list_empty(&file_priv->list)) {
	82	vma_priv = list_first_entry(&file_priv->list,
	83	struct privcmd_buf_vma_private,
	84	list);
	85	privcmd_buf_vmapriv_free(vma_priv);
	86	}
	87
	88	mutex_unlock(&file_priv->lock);
	89
	90	kfree(file_priv);
	91
	92	return 0;
	93	}
	94
	95	static void privcmd_buf_vma_open(struct vm_area_struct *vma)
	96	{
	97	struct privcmd_buf_vma_private *vma_priv = vma->vm_private_data;
	98
	99	if (!vma_priv)
	100	return;
	101
	102	mutex_lock(&vma_priv->file_priv->lock);
	103	vma_priv->users++;
	104	mutex_unlock(&vma_priv->file_priv->lock);
	105	}
	106
	107	static void privcmd_buf_vma_close(struct vm_area_struct *vma)
	108	{
	109	struct privcmd_buf_vma_private *vma_priv = vma->vm_private_data;
	110	struct privcmd_buf_private *file_priv;
	111
	112	if (!vma_priv)
	113	return;
	114
	115	file_priv = vma_priv->file_priv;
	116
	117	mutex_lock(&file_priv->lock);
	118
	119	vma_priv->users--;
	120	if (!vma_priv->users)
	121	privcmd_buf_vmapriv_free(vma_priv);
	122
	123	mutex_unlock(&file_priv->lock);
	124	}
	125
	126	static vm_fault_t privcmd_buf_vma_fault(struct vm_fault *vmf)
	127	{
	128	pr_debug("fault: vma=%p %lx-%lx, pgoff=%lx, uv=%p\n",
	129	vmf->vma, vmf->vma->vm_start, vmf->vma->vm_end,
	130	vmf->pgoff, (void *)vmf->address);
	131
	132	return VM_FAULT_SIGBUS;
	133	}
	134
	135	static const struct vm_operations_struct privcmd_buf_vm_ops = {
	136	.open = privcmd_buf_vma_open,
	137	.close = privcmd_buf_vma_close,
	138	.fault = privcmd_buf_vma_fault,
	139	};
	140
	141	static int privcmd_buf_mmap(struct file file, struct vm_area_struct vma)
	142	{
	143	struct privcmd_buf_private *file_priv = file->private_data;
	144	struct privcmd_buf_vma_private *vma_priv;
	145	unsigned long count = vma_pages(vma);
	146	unsigned int i;
	147	int ret = 0;
	148
	149	if (!(vma->vm_flags & VM_SHARED) \|\| count > limit \|\|
	150	file_priv->allocated + count > limit)
	151	return -EINVAL;
	152
	153	vma_priv = kzalloc(sizeof(vma_priv) + count sizeof(void *),
	154	GFP_KERNEL);
	155	if (!vma_priv)
	156	return -ENOMEM;
	157
	158	vma_priv->n_pages = count;
	159	count = 0;
	160	for (i = 0; i < vma_priv->n_pages; i++) {
	161	vma_priv->pages[i] = alloc_page(GFP_KERNEL \| __GFP_ZERO);
	162	if (!vma_priv->pages[i])
	163	break;
	164	count++;
	165	}
	166
	167	mutex_lock(&file_priv->lock);
	168
	169	file_priv->allocated += count;
	170
	171	vma_priv->file_priv = file_priv;
	172	vma_priv->users = 1;
	173
	174	vma->vm_flags \|= VM_IO \| VM_DONTEXPAND;
	175	vma->vm_ops = &privcmd_buf_vm_ops;
	176	vma->vm_private_data = vma_priv;
	177
	178	list_add(&vma_priv->list, &file_priv->list);
	179
	180	if (vma_priv->n_pages != count)
	181	ret = -ENOMEM;
	182	else
	183	for (i = 0; i < vma_priv->n_pages; i++) {
	184	ret = vm_insert_page(vma, vma->vm_start + i * PAGE_SIZE,
	185	vma_priv->pages[i]);
	186	if (ret)
	187	break;
	188	}
	189
	190	if (ret)
	191	privcmd_buf_vmapriv_free(vma_priv);
	192
	193	mutex_unlock(&file_priv->lock);
	194
	195	return ret;
	196	}
	197
	198	const struct file_operations xen_privcmdbuf_fops = {
	199	.owner = THIS_MODULE,
	200	.open = privcmd_buf_open,
	201	.release = privcmd_buf_release,
	202	.mmap = privcmd_buf_mmap,
	203	};
	204	EXPORT_SYMBOL_GPL(xen_privcmdbuf_fops);
	205
	206	struct miscdevice xen_privcmdbuf_dev = {
	207	.minor = MISC_DYNAMIC_MINOR,
	208	.name = "xen/hypercall",
	209	.fops = &xen_privcmdbuf_fops,
	210	};

drivers/xen/privcmd.c+9−0

 		pr_err("Could not register Xen privcmd device\n");
 		return err;
 	}
+	err = misc_register(&xen_privcmdbuf_dev);
+	if (err != 0) {
+		pr_err("Could not register Xen hypercall-buf device\n");
+		misc_deregister(&privcmd_dev);
+		return err;
+	}
 	return 0;
 }
 static void __exit privcmd_exit(void)
 {
 	misc_deregister(&privcmd_dev);
+	misc_deregister(&xen_privcmdbuf_dev);
 }
 module_init(privcmd_init);

drivers/xen/privcmd.h+3−0

@@ -1,3 +1,6 @@
1	#include <linux/fs.h>	1	#include <linux/fs.h>
2		2
3	extern const struct file_operations xen_privcmd_fops;	3	extern const struct file_operations xen_privcmd_fops;
		4	extern const struct file_operations xen_privcmdbuf_fops;
		5
		6	extern struct miscdevice xen_privcmdbuf_dev;

drivers/xen/xen-scsiback.c+13−3

 {
 	struct v2p_entry *entry;
 	unsigned long flags;
+	int err;
 	if (try) {
 		spin_lock_irqsave(&info->v2p_lock, flags);
 			scsiback_del_translation_entry(info, vir);
 		}
 	} else if (!try) {
-		xenbus_printf(XBT_NIL, info->dev->nodename, state,
+		err = xenbus_printf(XBT_NIL, info->dev->nodename, state,
 			      "%d", XenbusStateClosed);
+		if (err)
+			xenbus_dev_error(info->dev, err,
+				"%s: writing %s", __func__, state);
 	}
 }
 	snprintf(str, sizeof(str), "vscsi-devs/%s/p-dev", ent);
 	val = xenbus_read(XBT_NIL, dev->nodename, str, NULL);
 	if (IS_ERR(val)) {
-		xenbus_printf(XBT_NIL, dev->nodename, state,
+		err = xenbus_printf(XBT_NIL, dev->nodename, state,
 			      "%d", XenbusStateClosed);
+		if (err)
+			xenbus_dev_error(info->dev, err,
+				"%s: writing %s", __func__, state);
 		return;
 	}
 	strlcpy(phy, val, VSCSI_NAMELEN);
 	err = xenbus_scanf(XBT_NIL, dev->nodename, str, "%u:%u:%u:%u",
 			   &vir.hst, &vir.chn, &vir.tgt, &vir.lun);
 	if (XENBUS_EXIST_ERR(err)) {
-		xenbus_printf(XBT_NIL, dev->nodename, state,
+		err = xenbus_printf(XBT_NIL, dev->nodename, state,
 			      "%d", XenbusStateClosed);
+		if (err)
+			xenbus_dev_error(info->dev, err,
+				"%s: writing %s", __func__, state);
 		return;
 	}

fs/aio.c+1−147

@@ -5,7 +5,6 @@ · 4 unmodified lines
5	* Implements an efficient asynchronous io interface.	5	* Implements an efficient asynchronous io interface.
6	*	6	*
7	* Copyright 2000, 2001, 2002 Red Hat, Inc. All Rights Reserved.	7	* Copyright 2000, 2001, 2002 Red Hat, Inc. All Rights Reserved.
8	* Copyright 2018 Christoph Hellwig.
9	*	8	*
10	* See ../COPYING for licensing terms.	9	* See ../COPYING for licensing terms.
11	*/	10	*/
@@ -165,22 +164,10 @@ struct fsync_iocb { · 153 unmodified lines
165	bool datasync;	164	bool datasync;
166	};	165	};
167		166
168	struct poll_iocb {
169	struct file *file;
170	__poll_t events;
171	struct wait_queue_head *head;
172
173	union {
174	struct wait_queue_entry wait;
175	struct work_struct work;
176	};
177	};
178
179	struct aio_kiocb {	167	struct aio_kiocb {
180	union {	168	union {
181	struct kiocb rw;	169	struct kiocb rw;
182	struct fsync_iocb fsync;	170	struct fsync_iocb fsync;
183	struct poll_iocb poll;
184	};	171	};
185		172
186	struct kioctx *ki_ctx;	173	struct kioctx *ki_ctx;
@@ -1590,6 +1577,7 @@ static int aio_fsync(struct fsync_iocb req, struct iocb iocb, bool datasync) · 1403 unmodified lines
1590	if (unlikely(iocb->aio_buf \|\| iocb->aio_offset \|\| iocb->aio_nbytes \|\|	1577	if (unlikely(iocb->aio_buf \|\| iocb->aio_offset \|\| iocb->aio_nbytes \|\|
1591	iocb->aio_rw_flags))	1578	iocb->aio_rw_flags))
1592	return -EINVAL;	1579	return -EINVAL;
		1580
1593	req->file = fget(iocb->aio_fildes);	1581	req->file = fget(iocb->aio_fildes);
1594	if (unlikely(!req->file))	1582	if (unlikely(!req->file))
1595	return -EBADF;	1583	return -EBADF;
@@ -1604,137 +1592,6 @@ static int aio_fsync(struct fsync_iocb req, struct iocb iocb, bool datasync) · 8 unmodified lines
1604	return 0;	1592	return 0;
1605	}	1593	}
1606		1594
1607	/* need to use list_del_init so we can check if item was present */
1608	static inline bool __aio_poll_remove(struct poll_iocb *req)
1609	{
1610	if (list_empty(&req->wait.entry))
1611	return false;
1612	list_del_init(&req->wait.entry);
1613	return true;
1614	}
1615
1616	static inline void __aio_poll_complete(struct aio_kiocb *iocb, __poll_t mask)
1617	{
1618	fput(iocb->poll.file);
1619	aio_complete(iocb, mangle_poll(mask), 0);
1620	}
1621
1622	static void aio_poll_work(struct work_struct *work)
1623	{
1624	struct aio_kiocb *iocb = container_of(work, struct aio_kiocb, poll.work);
1625
1626	if (!list_empty_careful(&iocb->ki_list))
1627	aio_remove_iocb(iocb);
1628	__aio_poll_complete(iocb, iocb->poll.events);
1629	}
1630
1631	static int aio_poll_cancel(struct kiocb *iocb)
1632	{
1633	struct aio_kiocb *aiocb = container_of(iocb, struct aio_kiocb, rw);
1634	struct poll_iocb *req = &aiocb->poll;
1635	struct wait_queue_head *head = req->head;
1636	bool found = false;
1637
1638	spin_lock(&head->lock);
1639	found = __aio_poll_remove(req);
1640	spin_unlock(&head->lock);
1641
1642	if (found) {
1643	req->events = 0;
1644	INIT_WORK(&req->work, aio_poll_work);
1645	schedule_work(&req->work);
1646	}
1647	return 0;
1648	}
1649
1650	static int aio_poll_wake(struct wait_queue_entry *wait, unsigned mode, int sync,
1651	void *key)
1652	{
1653	struct poll_iocb *req = container_of(wait, struct poll_iocb, wait);
1654	struct aio_kiocb *iocb = container_of(req, struct aio_kiocb, poll);
1655	struct file *file = req->file;
1656	__poll_t mask = key_to_poll(key);
1657
1658	assert_spin_locked(&req->head->lock);
1659
1660	/* for instances that support it check for an event match first: */
1661	if (mask && !(mask & req->events))
1662	return 0;
1663
1664	mask = file->f_op->poll_mask(file, req->events) & req->events;
1665	if (!mask)
1666	return 0;
1667
1668	__aio_poll_remove(req);
1669
1670	/*
1671	* Try completing without a context switch if we can acquire ctx_lock
1672	* without spinning. Otherwise we need to defer to a workqueue to
1673	* avoid a deadlock due to the lock order.
1674	*/
1675	if (spin_trylock(&iocb->ki_ctx->ctx_lock)) {
1676	list_del_init(&iocb->ki_list);
1677	spin_unlock(&iocb->ki_ctx->ctx_lock);
1678
1679	__aio_poll_complete(iocb, mask);
1680	} else {
1681	req->events = mask;
1682	INIT_WORK(&req->work, aio_poll_work);
1683	schedule_work(&req->work);
1684	}
1685
1686	return 1;
1687	}
1688
1689	static ssize_t aio_poll(struct aio_kiocb aiocb, struct iocb iocb)
1690	{
1691	struct kioctx *ctx = aiocb->ki_ctx;
1692	struct poll_iocb *req = &aiocb->poll;
1693	__poll_t mask;
1694
1695	/* reject any unknown events outside the normal event mask. */
1696	if ((u16)iocb->aio_buf != iocb->aio_buf)
1697	return -EINVAL;
1698	/* reject fields that are not defined for poll */
1699	if (iocb->aio_offset \|\| iocb->aio_nbytes \|\| iocb->aio_rw_flags)
1700	return -EINVAL;
1701
1702	req->events = demangle_poll(iocb->aio_buf) \| EPOLLERR \| EPOLLHUP;
1703	req->file = fget(iocb->aio_fildes);
1704	if (unlikely(!req->file))
1705	return -EBADF;
1706	if (!file_has_poll_mask(req->file))
1707	goto out_fail;
1708
1709	req->head = req->file->f_op->get_poll_head(req->file, req->events);
1710	if (!req->head)
1711	goto out_fail;
1712	if (IS_ERR(req->head)) {
1713	mask = EPOLLERR;
1714	goto done;
1715	}
1716
1717	init_waitqueue_func_entry(&req->wait, aio_poll_wake);
1718	aiocb->ki_cancel = aio_poll_cancel;
1719
1720	spin_lock_irq(&ctx->ctx_lock);
1721	spin_lock(&req->head->lock);
1722	mask = req->file->f_op->poll_mask(req->file, req->events) & req->events;
1723	if (!mask) {
1724	__add_wait_queue(req->head, &req->wait);
1725	list_add_tail(&aiocb->ki_list, &ctx->active_reqs);
1726	}
1727	spin_unlock(&req->head->lock);
1728	spin_unlock_irq(&ctx->ctx_lock);
1729	done:
1730	if (mask)
1731	__aio_poll_complete(aiocb, mask);
1732	return 0;
1733	out_fail:
1734	fput(req->file);
1735	return -EINVAL; /* same as no support for IOCB_CMD_POLL */
1736	}
1737
1738	static int io_submit_one(struct kioctx ctx, struct iocb __user user_iocb,	1595	static int io_submit_one(struct kioctx ctx, struct iocb __user user_iocb,
1739	bool compat)	1596	bool compat)
1740	{	1597	{
@@ -1808,9 +1665,6 @@ static int io_submit_one(struct kioctx ctx, struct iocb __user user_iocb, · 67 unmodified lines
1808	case IOCB_CMD_FDSYNC:	1665	case IOCB_CMD_FDSYNC:
1809	ret = aio_fsync(&req->fsync, &iocb, true);	1666	ret = aio_fsync(&req->fsync, &iocb, true);
1810	break;	1667	break;
1811	case IOCB_CMD_POLL:
1812	ret = aio_poll(req, &iocb);
1813	break;
1814	default:	1668	default:
1815	pr_debug("invalid aio operation %d\n", iocb.aio_lio_opcode);	1669	pr_debug("invalid aio operation %d\n", iocb.aio_lio_opcode);
1816	ret = -EINVAL;	1670	ret = -EINVAL;

fs/btrfs/extent_io.c+4−1

 			offset_in_extent = em_start - em->start;
 		em_end = extent_map_end(em);
 		em_len = em_end - em_start;
-		disko = em->block_start + offset_in_extent;
 		flags = 0;
+		if (em->block_start < EXTENT_MAP_LAST_BYTE)
+			disko = em->block_start + offset_in_extent;
+		else
+			disko = 0;
 		/*
 		 * bump off for our next call to get_extent

fs/btrfs/inode.c+5−2

 	unlock_extent_cached(io_tree, page_start, page_end, &cached_state);
-out_unlock:
 	if (!ret2) {
 		btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE, true);
 		sb_end_pagefault(inode->i_sb);
 		extent_changeset_free(data_reserved);
 		return VM_FAULT_LOCKED;
 	}
+out_unlock:
 	unlock_page(page);
 out:
 	btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE, (ret != 0));
 	u64 new_idx = 0;
 	u64 root_objectid;
 	int ret;
+	int ret2;
 	bool root_log_pinned = false;
 	bool dest_log_pinned = false;
 			dest_log_pinned = false;
 		}
 	}
-	ret = btrfs_end_transaction(trans);
+	ret2 = btrfs_end_transaction(trans);
+	ret = ret ? ret : ret2;
 out_notrans:
 	if (new_ino == BTRFS_FIRST_FREE_OBJECTID)
 		up_read(&fs_info->subvol_sem);

fs/btrfs/ioctl.c+5−5

 		ret = btrfs_extent_same_range(src, loff, BTRFS_MAX_DEDUPE_LEN,
 					      dst, dst_loff, &cmp);
 		if (ret)
-			goto out_unlock;
+			goto out_free;
 		loff += BTRFS_MAX_DEDUPE_LEN;
 		dst_loff += BTRFS_MAX_DEDUPE_LEN;
 		ret = btrfs_extent_same_range(src, loff, tail_len, dst,
 					      dst_loff, &cmp);
+out_free:
+	kvfree(cmp.src_pages);
+	kvfree(cmp.dst_pages);
 out_unlock:
 	if (same_inode)
 		inode_unlock(src);
 	else
 		btrfs_double_inode_unlock(src, dst);
-out_free:
-	kvfree(cmp.src_pages);
-	kvfree(cmp.dst_pages);
 	return ret;
 }

fs/btrfs/qgroup.c+13−4

 		free_extent_buffer(scratch_leaf);
 	}
-	if (done && !ret)
+	if (done && !ret) {
 		ret = 1;
+		fs_info->qgroup_rescan_progress.objectid = (u64)-1;
+	}
 	return ret;
 }
 	if (!init_flags) {
 		/* we're resuming qgroup rescan at mount time */
-		if (!(fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_RESCAN))
+		if (!(fs_info->qgroup_flags &
+		      BTRFS_QGROUP_STATUS_FLAG_RESCAN)) {
 			btrfs_warn(fs_info,
 			"qgroup rescan init failed, qgroup is not enabled");
-		else if (!(fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_ON))
+			ret = -EINVAL;
+		} else if (!(fs_info->qgroup_flags &
+			     BTRFS_QGROUP_STATUS_FLAG_ON)) {
 			btrfs_warn(fs_info,
 			"qgroup rescan init failed, qgroup rescan is not queued");
-		return -EINVAL;
+			ret = -EINVAL;
+		}
+		if (ret)
+			return ret;
 	}
 	mutex_lock(&fs_info->qgroup_rescan_lock);

fs/ceph/inode.c+1−0

@@ -1135,6 +1135,7 @@ static struct dentry splice_dentry(struct dentry dn, struct inode *in) · 1134 unmodified lines
1135	if (IS_ERR(realdn)) {	1135	if (IS_ERR(realdn)) {
1136	pr_err("splice_dentry error %ld %p inode %p ino %llx.%llx\n",	1136	pr_err("splice_dentry error %ld %p inode %p ino %llx.%llx\n",
1137	PTR_ERR(realdn), dn, in, ceph_vinop(in));	1137	PTR_ERR(realdn), dn, in, ceph_vinop(in));
		1138	dput(dn);
1138	dn = realdn; /* note realdn contains the error */	1139	dn = realdn; /* note realdn contains the error */
1139	goto out;	1140	goto out;
1140	} else if (realdn) {	1141	} else if (realdn) {

fs/cifs/cifs_debug.c+29−0

@@ -126,6 +126,25 @@ static void cifs_debug_tcon(struct seq_file m, struct cifs_tcon tcon) · 125 unmodified lines
126	seq_putc(m, '\n');	126	seq_putc(m, '\n');
127	}	127	}
128		128
		129	static void
		130	cifs_dump_iface(struct seq_file m, struct cifs_server_iface iface)
		131	{
		132	struct sockaddr_in ipv4 = (struct sockaddr_in )&iface->sockaddr;
		133	struct sockaddr_in6 ipv6 = (struct sockaddr_in6 )&iface->sockaddr;
		134
		135	seq_printf(m, "\t\tSpeed: %zu bps\n", iface->speed);
		136	seq_puts(m, "\t\tCapabilities: ");
		137	if (iface->rdma_capable)
		138	seq_puts(m, "rdma ");
		139	if (iface->rss_capable)
		140	seq_puts(m, "rss ");
		141	seq_putc(m, '\n');
		142	if (iface->sockaddr.ss_family == AF_INET)
		143	seq_printf(m, "\t\tIPv4: %pI4\n", &ipv4->sin_addr);
		144	else if (iface->sockaddr.ss_family == AF_INET6)
		145	seq_printf(m, "\t\tIPv6: %pI6\n", &ipv6->sin6_addr);
		146	}
		147
129	static int cifs_debug_data_proc_show(struct seq_file m, void v)	148	static int cifs_debug_data_proc_show(struct seq_file m, void v)
130	{	149	{
131	struct list_head tmp1, tmp2, *tmp3;	150	struct list_head tmp1, tmp2, *tmp3;
@@ -312,6 +331,16 @@ skip_rdma: · 180 unmodified lines
312	mid_entry->mid);	331	mid_entry->mid);
313	}	332	}
314	spin_unlock(&GlobalMid_Lock);	333	spin_unlock(&GlobalMid_Lock);
		334
		335	spin_lock(&ses->iface_lock);
		336	if (ses->iface_count)
		337	seq_printf(m, "\n\tServer interfaces: %zu\n",
		338	ses->iface_count);
		339	for (j = 0; j < ses->iface_count; j++) {
		340	seq_printf(m, "\t%d)\n", j);
		341	cifs_dump_iface(m, &ses->iface_list[j]);
		342	}
		343	spin_unlock(&ses->iface_lock);
315	}	344	}
316	}	345	}
317	spin_unlock(&cifs_tcp_ses_lock);	346	spin_unlock(&cifs_tcp_ses_lock);

fs/cifs/cifsencrypt.c+15−5

@@ -37,7 +37,6 @@ · 36 unmodified lines
37	#include <crypto/aead.h>	37	#include <crypto/aead.h>
38		38
39	int __cifs_calc_signature(struct smb_rqst *rqst,	39	int __cifs_calc_signature(struct smb_rqst *rqst,
40	int start,
41	struct TCP_Server_Info server, char signature,	40	struct TCP_Server_Info server, char signature,
42	struct shash_desc *shash)	41	struct shash_desc *shash)
43	{	42	{
@@ -45,16 +44,27 @@ int __cifs_calc_signature(struct smb_rqst *rqst, · 1 unmodified line
45	int rc;	44	int rc;
46	struct kvec *iov = rqst->rq_iov;	45	struct kvec *iov = rqst->rq_iov;
47	int n_vec = rqst->rq_nvec;	46	int n_vec = rqst->rq_nvec;
		47	int is_smb2 = server->vals->header_preamble_size == 0;
48		48
49	for (i = start; i < n_vec; i++) {	49	/* iov[0] is actual data and not the rfc1002 length for SMB2+ */
		50	if (is_smb2) {
		51	if (iov[0].iov_len <= 4)
		52	return -EIO;
		53	i = 0;
		54	} else {
		55	if (n_vec < 2 \|\| iov[0].iov_len != 4)
		56	return -EIO;
		57	i = 1; /* skip rfc1002 length */
		58	}
		59
		60	for (; i < n_vec; i++) {
50	if (iov[i].iov_len == 0)	61	if (iov[i].iov_len == 0)
51	continue;	62	continue;
52	if (iov[i].iov_base == NULL) {	63	if (iov[i].iov_base == NULL) {
53	cifs_dbg(VFS, "null iovec entry\n");	64	cifs_dbg(VFS, "null iovec entry\n");
54	return -EIO;	65	return -EIO;
55	}	66	}
56	if (i == 1 && iov[1].iov_len <= 4)	67
57	break; /* nothing to sign or corrupt header */
58	rc = crypto_shash_update(shash,	68	rc = crypto_shash_update(shash,
59	iov[i].iov_base, iov[i].iov_len);	69	iov[i].iov_base, iov[i].iov_len);
60	if (rc) {	70	if (rc) {
@@ -118,7 +128,7 @@ static int cifs_calc_signature(struct smb_rqst *rqst, · 57 unmodified lines
118	return rc;	128	return rc;
119	}	129	}
120		130
121	return __cifs_calc_signature(rqst, 1, server, signature,	131	return __cifs_calc_signature(rqst, server, signature,
122	&server->secmech.sdescmd5->shash);	132	&server->secmech.sdescmd5->shash);
123	}	133	}
124		134

fs/cifs/cifsglob.h+37−3

 #define CIFS_MAGIC_NUMBER 0xFF534D42      /* the first four bytes of SMB PDUs */
+#define CIFS_PORT 445
+#define RFC1001_PORT 139
 /*
  * The sizes of various internal tables and strings
  */
 	/* send echo request */
 	int (*echo)(struct TCP_Server_Info *);
 	/* create directory */
+	int (*posix_mkdir)(const unsigned int xid, struct inode *inode,
+			umode_t mode, struct cifs_tcon *tcon,
+			const char *full_path,
+			struct cifs_sb_info *cifs_sb);
 	int (*mkdir)(const unsigned int, struct cifs_tcon *, const char *,
 		     struct cifs_sb_info *);
 	/* set info on created directory */
 #endif
+struct cifs_server_iface {
+	size_t speed;
+	unsigned int rdma_capable : 1;
+	unsigned int rss_capable : 1;
+	struct sockaddr_storage sockaddr;
+};
 /*
  * Session structure.  One of these for each uid session with a particular host
  */
 #ifdef CONFIG_CIFS_SMB311
 	__u8 preauth_sha_hash[SMB2_PREAUTH_HASH_SIZE];
 #endif /* 3.1.1 */
+	/*
+	 * Network interfaces available on the server this session is
+	 * connected to.
+	 *
+	 * Other channels can be opened by connecting and binding this
+	 * session to interfaces from this list.
+	 *
+	 * iface_lock should be taken when accessing any of these fields
+	 */
+	spinlock_t iface_lock;
+	struct cifs_server_iface *iface_list;
+	size_t iface_count;
+	unsigned long iface_last_update; /* jiffies */
 };
 static inline bool
 	return ses->server->vals->cap_unix & ses->capabilities;
 }
+struct cached_fid {
+	bool is_valid:1;	/* Do we have a useable root fid */
+	struct cifs_fid *fid;
+	struct mutex fid_mutex;
+	struct cifs_tcon *tcon;
+	struct work_struct lease_break;
+};
 /*
  * there is one of these for each connection to a resource on a particular
  * session
 	struct fscache_cookie *fscache;	/* cookie for share */
 #endif
 	struct list_head pending_opens;	/* list of incomplete opens */
-	bool valid_root_fid:1;	/* Do we have a useable root fid */
+	struct cached_fid crfid; /* Cached root fid */
-	struct mutex prfid_mutex; /* prevents reopen race after dead ses*/
-	struct cifs_fid *prfid;	/* handle to the directory at top of share */
 	/* BB add field for back pointer to sb struct(s)? */
 };

fs/cifs/cifsproto.h+2−5

 			struct kvec *, int /* nvec to send */,
 			int * /* type of buf returned */, const int flags,
 			struct kvec * /* resp vec */);
-extern int smb2_send_recv(const unsigned int xid, struct cifs_ses *pses,
-			  struct kvec *pkvec, int nvec_to_send,
-			  int *pbuftype, const int flags,
-			  struct kvec *presp);
 extern int SendReceiveBlockingLock(const unsigned int xid,
 			struct cifs_tcon *ptcon,
 			struct smb_hdr *in_buf ,
 			   struct cifs_sb_info *cifs_sb,
 			   const unsigned char *path, char *pbuf,
 			   unsigned int *pbytes_written);
-int __cifs_calc_signature(struct smb_rqst *rqst, int start,
+int __cifs_calc_signature(struct smb_rqst *rqst,
 			struct TCP_Server_Info *server, char *signature,
 			struct shash_desc *shash);
 enum securityEnum cifs_select_sectype(struct TCP_Server_Info *,
 struct cifs_aio_ctx *cifs_aio_ctx_alloc(void);
 void cifs_aio_ctx_release(struct kref *refcount);
 int setup_aio_ctx_iter(struct cifs_aio_ctx *ctx, struct iov_iter *iter, int rw);
+void smb2_cached_lease_break(struct work_struct *work);
 int cifs_alloc_hash(const char *name, struct crypto_shash **shash,
 		    struct sdesc **sdesc);

fs/cifs/cifssmb.c+4−4

@@ -107,10 +107,10 @@ cifs_mark_open_files_invalid(struct cifs_tcon *tcon) · 106 unmodified lines
107	}	107	}
108	spin_unlock(&tcon->open_file_lock);	108	spin_unlock(&tcon->open_file_lock);
109		109
110	mutex_lock(&tcon->prfid_mutex);	110	mutex_lock(&tcon->crfid.fid_mutex);
111	tcon->valid_root_fid = false;	111	tcon->crfid.is_valid = false;
112	memset(tcon->prfid, 0, sizeof(struct cifs_fid));	112	memset(tcon->crfid.fid, 0, sizeof(struct cifs_fid));
113	mutex_unlock(&tcon->prfid_mutex);	113	mutex_unlock(&tcon->crfid.fid_mutex);
114		114
115	/*	115	/*
116	* BB Add call to invalidate_inodes(sb) for all superblocks mounted	116	* BB Add call to invalidate_inodes(sb) for all superblocks mounted

fs/cifs/connect.c+4−4

 #include "smb2proto.h"
 #include "smbdirect.h"
-#define CIFS_PORT 445
-#define RFC1001_PORT 139
 extern mempool_t *cifs_req_poolp;
 extern bool disable_legacy_dialects;
 #ifdef CONFIG_CIFS_SMB311
 	if ((volume_info->linux_ext) && (ses->server->posix_ext_supported)) {
-		if (ses->server->vals->protocol_id == SMB311_PROT_ID)
+		if (ses->server->vals->protocol_id == SMB311_PROT_ID) {
 			tcon->posix_extensions = true;
+			printk_once(KERN_WARNING
+				"SMB3.11 POSIX Extensions are experimental\n");
+		}
 	}
 #endif /* 311 */

fs/cifs/inode.c+11−2

 		goto mkdir_out;
 	}
+	server = tcon->ses->server;
+#ifdef CONFIG_CIFS_SMB311
+	if ((server->ops->posix_mkdir) && (tcon->posix_extensions)) {
+		rc = server->ops->posix_mkdir(xid, inode, mode, tcon, full_path,
+					      cifs_sb);
+		d_drop(direntry); /* for time being always refresh inode info */
+		goto mkdir_out;
+	}
+#endif /* SMB311 */
 	if (cap_unix(tcon->ses) && (CIFS_UNIX_POSIX_PATH_OPS_CAP &
 				le64_to_cpu(tcon->fsUnixInfo.Capability))) {
 		rc = cifs_posix_mkdir(inode, direntry, mode, full_path, cifs_sb,
 			goto mkdir_out;
 	}
-	server = tcon->ses->server;
 	if (!server->ops->mkdir) {
 		rc = -ENOSYS;
 		goto mkdir_out;

fs/cifs/misc.c+6−3

 		INIT_LIST_HEAD(&ret_buf->smb_ses_list);
 		INIT_LIST_HEAD(&ret_buf->tcon_list);
 		mutex_init(&ret_buf->session_mutex);
+		spin_lock_init(&ret_buf->iface_lock);
 	}
 	return ret_buf;
 }
 	kfree(buf_to_free->user_name);
 	kfree(buf_to_free->domainName);
 	kzfree(buf_to_free->auth_key.response);
+	kfree(buf_to_free->iface_list);
 	kzfree(buf_to_free);
 }
 		INIT_LIST_HEAD(&ret_buf->openFileList);
 		INIT_LIST_HEAD(&ret_buf->tcon_list);
 		spin_lock_init(&ret_buf->open_file_lock);
-		mutex_init(&ret_buf->prfid_mutex);
+		mutex_init(&ret_buf->crfid.fid_mutex);
-		ret_buf->prfid = kzalloc(sizeof(struct cifs_fid), GFP_KERNEL);
+		ret_buf->crfid.fid = kzalloc(sizeof(struct cifs_fid),
+					     GFP_KERNEL);
 #ifdef CONFIG_CIFS_STATS
 		spin_lock_init(&ret_buf->stat_lock);
 #endif
 	atomic_dec(&tconInfoAllocCount);
 	kfree(buf_to_free->nativeFileSystem);
 	kzfree(buf_to_free->password);
-	kfree(buf_to_free->prfid);
+	kfree(buf_to_free->crfid.fid);
 	kfree(buf_to_free);
 }

fs/cifs/smb2misc.c+17−2

 #ifdef CONFIG_CIFS_SMB311
 	/* SMB311 POSIX extensions paths do not include leading slash */
 	else if (cifs_sb_master_tlink(cifs_sb) &&
-		 cifs_sb_master_tcon(cifs_sb)->posix_extensions) {
+		 cifs_sb_master_tcon(cifs_sb)->posix_extensions &&
+		 (from[0] == '/')) {
 		start_of_path = from + 1;
 	}
 #endif /* 311 */
 {
 	struct smb2_lease_break_work *lw = container_of(work,
 				struct smb2_lease_break_work, lease_break);
-	int rc;
+	int rc = 0;
 	rc = SMB2_lease_break(0, tlink_tcon(lw->tlink), lw->lease_key,
 			      lw->lease_state);
 	cifs_dbg(FYI, "Lease release rc %d\n", rc);
 	cifs_put_tlink(lw->tlink);
 	kfree(lw);
 		open->oplock = lease_state;
 	}
 	return found;
 }
 					return true;
 				}
 				spin_unlock(&tcon->open_file_lock);
+				if (tcon->crfid.is_valid &&
+				    !memcmp(rsp->LeaseKey,
+					    tcon->crfid.fid->lease_key,
+					    SMB2_LEASE_KEY_SIZE)) {
+					INIT_WORK(&tcon->crfid.lease_break,
+						  smb2_cached_lease_break);
+					queue_work(cifsiod_wq,
+						   &tcon->crfid.lease_break);
+					spin_unlock(&cifs_tcp_ses_lock);
+					return true;
+				}
 			}
 		}
 	}

fs/cifs/smb2ops.c+210−67

@@ -294,34 +294,191 @@ smb2_negotiate_rsize(struct cifs_tcon tcon, struct smb_vol volume_info) · 293 unmodified lines
294	return rsize;	294	return rsize;
295	}	295	}
296		296
297	#ifdef CONFIG_CIFS_STATS2	297
		298	static int
		299	parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf,
		300	size_t buf_len,
		301	struct cifs_server_iface **iface_list,
		302	size_t *iface_count)
		303	{
		304	struct network_interface_info_ioctl_rsp *p;
		305	struct sockaddr_in *addr4;
		306	struct sockaddr_in6 *addr6;
		307	struct iface_info_ipv4 *p4;
		308	struct iface_info_ipv6 *p6;
		309	struct cifs_server_iface *info;
		310	ssize_t bytes_left;
		311	size_t next = 0;
		312	int nb_iface = 0;
		313	int rc = 0;
		314
		315	*iface_list = NULL;
		316	*iface_count = 0;
		317
		318	/*
		319	* Fist pass: count and sanity check
		320	*/
		321
		322	bytes_left = buf_len;
		323	p = buf;
		324	while (bytes_left >= sizeof(*p)) {
		325	nb_iface++;
		326	next = le32_to_cpu(p->Next);
		327	if (!next) {
		328	bytes_left -= sizeof(*p);
		329	break;
		330	}
		331	p = (struct network_interface_info_ioctl_rsp )((u8 )p+next);
		332	bytes_left -= next;
		333	}
		334
		335	if (!nb_iface) {
		336	cifs_dbg(VFS, "%s: malformed interface info\n", __func__);
		337	rc = -EINVAL;
		338	goto out;
		339	}
		340
		341	if (bytes_left \|\| p->Next)
		342	cifs_dbg(VFS, "%s: incomplete interface info\n", __func__);
		343
		344
		345	/*
		346	* Second pass: extract info to internal structure
		347	*/
		348
		349	iface_list = kcalloc(nb_iface, sizeof(*iface_list), GFP_KERNEL);
		350	if (!*iface_list) {
		351	rc = -ENOMEM;
		352	goto out;
		353	}
		354
		355	info = *iface_list;
		356	bytes_left = buf_len;
		357	p = buf;
		358	while (bytes_left >= sizeof(*p)) {
		359	info->speed = le64_to_cpu(p->LinkSpeed);
		360	info->rdma_capable = le32_to_cpu(p->Capability & RDMA_CAPABLE);
		361	info->rss_capable = le32_to_cpu(p->Capability & RSS_CAPABLE);
		362
		363	cifs_dbg(FYI, "%s: adding iface %zu\n", __func__, *iface_count);
		364	cifs_dbg(FYI, "%s: speed %zu bps\n", __func__, info->speed);
		365	cifs_dbg(FYI, "%s: capabilities 0x%08x\n", __func__,
		366	le32_to_cpu(p->Capability));
		367
		368	switch (p->Family) {
		369	/*
		370	* The kernel and wire socket structures have the same
		371	* layout and use network byte order but make the
		372	* conversion explicit in case either one changes.
		373	*/
		374	case INTERNETWORK:
		375	addr4 = (struct sockaddr_in *)&info->sockaddr;
		376	p4 = (struct iface_info_ipv4 *)p->Buffer;
		377	addr4->sin_family = AF_INET;
		378	memcpy(&addr4->sin_addr, &p4->IPv4Address, 4);
		379
		380	/* [MS-SMB2] 2.2.32.5.1.1 Clients MUST ignore these */
		381	addr4->sin_port = cpu_to_be16(CIFS_PORT);
		382
		383	cifs_dbg(FYI, "%s: ipv4 %pI4\n", __func__,
		384	&addr4->sin_addr);
		385	break;
		386	case INTERNETWORKV6:
		387	addr6 = (struct sockaddr_in6 *)&info->sockaddr;
		388	p6 = (struct iface_info_ipv6 *)p->Buffer;
		389	addr6->sin6_family = AF_INET6;
		390	memcpy(&addr6->sin6_addr, &p6->IPv6Address, 16);
		391
		392	/* [MS-SMB2] 2.2.32.5.1.2 Clients MUST ignore these */
		393	addr6->sin6_flowinfo = 0;
		394	addr6->sin6_scope_id = 0;
		395	addr6->sin6_port = cpu_to_be16(CIFS_PORT);
		396
		397	cifs_dbg(FYI, "%s: ipv6 %pI6\n", __func__,
		398	&addr6->sin6_addr);
		399	break;
		400	default:
		401	cifs_dbg(VFS,
		402	"%s: skipping unsupported socket family\n",
		403	__func__);
		404	goto next_iface;
		405	}
		406
		407	(*iface_count)++;
		408	info++;
		409	next_iface:
		410	next = le32_to_cpu(p->Next);
		411	if (!next)
		412	break;
		413	p = (struct network_interface_info_ioctl_rsp )((u8 )p+next);
		414	bytes_left -= next;
		415	}
		416
		417	if (!*iface_count) {
		418	rc = -EINVAL;
		419	goto out;
		420	}
		421
		422	out:
		423	if (rc) {
		424	kfree(*iface_list);
		425	*iface_count = 0;
		426	*iface_list = NULL;
		427	}
		428	return rc;
		429	}
		430
		431
298	static int	432	static int
299	SMB3_request_interfaces(const unsigned int xid, struct cifs_tcon *tcon)	433	SMB3_request_interfaces(const unsigned int xid, struct cifs_tcon *tcon)
300	{	434	{
301	int rc;	435	int rc;
302	unsigned int ret_data_len = 0;	436	unsigned int ret_data_len = 0;
303	struct network_interface_info_ioctl_rsp *out_buf;	437	struct network_interface_info_ioctl_rsp *out_buf = NULL;
		438	struct cifs_server_iface *iface_list;
		439	size_t iface_count;
		440	struct cifs_ses *ses = tcon->ses;
304		441
305	rc = SMB2_ioctl(xid, tcon, NO_FILE_ID, NO_FILE_ID,	442	rc = SMB2_ioctl(xid, tcon, NO_FILE_ID, NO_FILE_ID,
306	FSCTL_QUERY_NETWORK_INTERFACE_INFO, true /* is_fsctl */,	443	FSCTL_QUERY_NETWORK_INTERFACE_INFO, true /* is_fsctl */,
307	NULL /* no data input /, 0 / no data input */,	444	NULL /* no data input /, 0 / no data input */,
308	(char **)&out_buf, &ret_data_len);	445	(char **)&out_buf, &ret_data_len);
309	if (rc != 0)	446	if (rc != 0) {
310	cifs_dbg(VFS, "error %d on ioctl to get interface list\n", rc);	447	cifs_dbg(VFS, "error %d on ioctl to get interface list\n", rc);
311	else if (ret_data_len < sizeof(struct network_interface_info_ioctl_rsp)) {	448	goto out;
312	cifs_dbg(VFS, "server returned bad net interface info buf\n");
313	rc = -EINVAL;
314	} else {
315	/* Dump info on first interface */
316	cifs_dbg(FYI, "Adapter Capability 0x%x\t",
317	le32_to_cpu(out_buf->Capability));
318	cifs_dbg(FYI, "Link Speed %lld\n",
319	le64_to_cpu(out_buf->LinkSpeed));
320	}	449	}
		450
		451	rc = parse_server_interfaces(out_buf, ret_data_len,
		452	&iface_list, &iface_count);
		453	if (rc)
		454	goto out;
		455
		456	spin_lock(&ses->iface_lock);
		457	kfree(ses->iface_list);
		458	ses->iface_list = iface_list;
		459	ses->iface_count = iface_count;
		460	ses->iface_last_update = jiffies;
		461	spin_unlock(&ses->iface_lock);
		462
		463	out:
321	kfree(out_buf);	464	kfree(out_buf);
322	return rc;	465	return rc;
323	}	466	}
324	#endif /* STATS2 */	467
		468	void
		469	smb2_cached_lease_break(struct work_struct *work)
		470	{
		471	struct cached_fid *cfid = container_of(work,
		472	struct cached_fid, lease_break);
		473	mutex_lock(&cfid->fid_mutex);
		474	if (cfid->is_valid) {
		475	cifs_dbg(FYI, "clear cached root file handle\n");
		476	SMB2_close(0, cfid->tcon, cfid->fid->persistent_fid,
		477	cfid->fid->volatile_fid);
		478	cfid->is_valid = false;
		479	}
		480	mutex_unlock(&cfid->fid_mutex);
		481	}
325		482
326	/*	483	/*
327	* Open the directory at the root of a share	484	* Open the directory at the root of a share
@@ -331,13 +488,13 @@ int open_shroot(unsigned int xid, struct cifs_tcon tcon, struct cifs_fid pfid) · 3 unmodified lines
331	struct cifs_open_parms oparams;	488	struct cifs_open_parms oparams;
332	int rc;	489	int rc;
333	__le16 srch_path = 0; /* Null - since an open of top of share */	490	__le16 srch_path = 0; /* Null - since an open of top of share */
334	u8 oplock = SMB2_OPLOCK_LEVEL_NONE;	491	u8 oplock = SMB2_OPLOCK_LEVEL_II;
335		492
336	mutex_lock(&tcon->prfid_mutex);	493	mutex_lock(&tcon->crfid.fid_mutex);
337	if (tcon->valid_root_fid) {	494	if (tcon->crfid.is_valid) {
338	cifs_dbg(FYI, "found a cached root file handle\n");	495	cifs_dbg(FYI, "found a cached root file handle\n");
339	memcpy(pfid, tcon->prfid, sizeof(struct cifs_fid));	496	memcpy(pfid, tcon->crfid.fid, sizeof(struct cifs_fid));
340	mutex_unlock(&tcon->prfid_mutex);	497	mutex_unlock(&tcon->crfid.fid_mutex);
341	return 0;	498	return 0;
342	}	499	}
343		500
@@ -350,10 +507,11 @@ int open_shroot(unsigned int xid, struct cifs_tcon tcon, struct cifs_fid pfid) · 6 unmodified lines
350		507
351	rc = SMB2_open(xid, &oparams, &srch_path, &oplock, NULL, NULL, NULL);	508	rc = SMB2_open(xid, &oparams, &srch_path, &oplock, NULL, NULL, NULL);
352	if (rc == 0) {	509	if (rc == 0) {
353	memcpy(tcon->prfid, pfid, sizeof(struct cifs_fid));	510	memcpy(tcon->crfid.fid, pfid, sizeof(struct cifs_fid));
354	tcon->valid_root_fid = true;	511	tcon->crfid.tcon = tcon;
		512	tcon->crfid.is_valid = true;
355	}	513	}
356	mutex_unlock(&tcon->prfid_mutex);	514	mutex_unlock(&tcon->crfid.fid_mutex);
357	return rc;	515	return rc;
358	}	516	}
359		517
@@ -383,9 +541,7 @@ smb3_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon) · 23 unmodified lines
383	if (rc)	541	if (rc)
384	return;	542	return;
385		543
386	#ifdef CONFIG_CIFS_STATS2
387	SMB3_request_interfaces(xid, tcon);	544	SMB3_request_interfaces(xid, tcon);
388	#endif /* STATS2 */
389		545
390	SMB2_QFS_attr(xid, tcon, fid.persistent_fid, fid.volatile_fid,	546	SMB2_QFS_attr(xid, tcon, fid.persistent_fid, fid.volatile_fid,
391	FS_ATTRIBUTE_INFORMATION);	547	FS_ATTRIBUTE_INFORMATION);
@@ -436,7 +592,7 @@ smb2_is_path_accessible(const unsigned int xid, struct cifs_tcon *tcon, · 44 unmodified lines
436	struct cifs_open_parms oparms;	592	struct cifs_open_parms oparms;
437	struct cifs_fid fid;	593	struct cifs_fid fid;
438		594
439	if ((*full_path == 0) && tcon->valid_root_fid)	595	if ((*full_path == 0) && tcon->crfid.is_valid)
440	return 0;	596	return 0;
441		597
442	utf16_path = cifs_convert_path_to_utf16(full_path, cifs_sb);	598	utf16_path = cifs_convert_path_to_utf16(full_path, cifs_sb);
@@ -2151,7 +2307,7 @@ fill_transform_hdr(struct smb2_transform_hdr *tr_hdr, unsigned int orig_len, · 1708 unmodified lines
2151	struct smb_rqst *old_rq)	2307	struct smb_rqst *old_rq)
2152	{	2308	{
2153	struct smb2_sync_hdr *shdr =	2309	struct smb2_sync_hdr *shdr =
2154	(struct smb2_sync_hdr *)old_rq->rq_iov[1].iov_base;	2310	(struct smb2_sync_hdr *)old_rq->rq_iov[0].iov_base;
2155		2311
2156	memset(tr_hdr, 0, sizeof(struct smb2_transform_hdr));	2312	memset(tr_hdr, 0, sizeof(struct smb2_transform_hdr));
2157	tr_hdr->ProtocolId = SMB2_TRANSFORM_PROTO_NUM;	2313	tr_hdr->ProtocolId = SMB2_TRANSFORM_PROTO_NUM;
@@ -2171,14 +2327,13 @@ static inline void smb2_sg_set_buf(struct scatterlist sg, const void buf, · 13 unmodified lines
2171	}	2327	}
2172		2328
2173	/* Assumes:	2329	/* Assumes:
2174	* rqst->rq_iov[0] is rfc1002 length	2330	* rqst->rq_iov[0] is transform header
2175	* rqst->rq_iov[1] is tranform header	2331	* rqst->rq_iov[1+] data to be encrypted/decrypted
2176	* rqst->rq_iov[2+] data to be encrypted/decrypted
2177	*/	2332	*/
2178	static struct scatterlist *	2333	static struct scatterlist *
2179	init_sg(struct smb_rqst rqst, u8 sign)	2334	init_sg(struct smb_rqst rqst, u8 sign)
2180	{	2335	{
2181	unsigned int sg_len = rqst->rq_nvec + rqst->rq_npages;	2336	unsigned int sg_len = rqst->rq_nvec + rqst->rq_npages + 1;
2182	unsigned int assoc_data_len = sizeof(struct smb2_transform_hdr) - 20;	2337	unsigned int assoc_data_len = sizeof(struct smb2_transform_hdr) - 20;
2183	struct scatterlist *sg;	2338	struct scatterlist *sg;
2184	unsigned int i;	2339	unsigned int i;
@@ -2189,10 +2344,10 @@ init_sg(struct smb_rqst rqst, u8 sign) · 4 unmodified lines
2189	return NULL;	2344	return NULL;
2190		2345
2191	sg_init_table(sg, sg_len);	2346	sg_init_table(sg, sg_len);
2192	smb2_sg_set_buf(&sg[0], rqst->rq_iov[1].iov_base + 20, assoc_data_len);	2347	smb2_sg_set_buf(&sg[0], rqst->rq_iov[0].iov_base + 20, assoc_data_len);
2193	for (i = 1; i < rqst->rq_nvec - 1; i++)	2348	for (i = 1; i < rqst->rq_nvec; i++)
2194	smb2_sg_set_buf(&sg[i], rqst->rq_iov[i+1].iov_base,	2349	smb2_sg_set_buf(&sg[i], rqst->rq_iov[i].iov_base,
2195	rqst->rq_iov[i+1].iov_len);	2350	rqst->rq_iov[i].iov_len);
2196	for (j = 0; i < sg_len - 1; i++, j++) {	2351	for (j = 0; i < sg_len - 1; i++, j++) {
2197	unsigned int len, offset;	2352	unsigned int len, offset;
2198		2353
@@ -2224,18 +2379,17 @@ smb2_get_enc_key(struct TCP_Server_Info server, __u64 ses_id, int enc, u8 key) · 25 unmodified lines
2224	return 1;	2379	return 1;
2225	}	2380	}
2226	/*	2381	/*
2227	* Encrypt or decrypt @rqst message. @rqst has the following format:	2382	* Encrypt or decrypt @rqst message. @rqst[0] has the following format:
2228	* iov[0] - rfc1002 length	2383	* iov[0] - transform header (associate data),
2229	* iov[1] - transform header (associate data),	2384	* iov[1-N] - SMB2 header and pages - data to encrypt.
2230	* iov[2-N] and pages - data to encrypt.	2385	* On success return encrypted data in iov[1-N] and pages, leave iov[0]
2231	* On success return encrypted data in iov[2-N] and pages, leave iov[0-1]
2232	* untouched.	2386	* untouched.
2233	*/	2387	*/
2234	static int	2388	static int
2235	crypt_message(struct TCP_Server_Info server, struct smb_rqst rqst, int enc)	2389	crypt_message(struct TCP_Server_Info server, struct smb_rqst rqst, int enc)
2236	{	2390	{
2237	struct smb2_transform_hdr *tr_hdr =	2391	struct smb2_transform_hdr *tr_hdr =
2238	(struct smb2_transform_hdr *)rqst->rq_iov[1].iov_base;	2392	(struct smb2_transform_hdr *)rqst->rq_iov[0].iov_base;
2239	unsigned int assoc_data_len = sizeof(struct smb2_transform_hdr) - 20;	2393	unsigned int assoc_data_len = sizeof(struct smb2_transform_hdr) - 20;
2240	int rc = 0;	2394	int rc = 0;
2241	struct scatterlist *sg;	2395	struct scatterlist *sg;
@@ -2323,10 +2477,6 @@ free_req: · 81 unmodified lines
2323	return rc;	2477	return rc;
2324	}	2478	}
2325		2479
2326	/*
2327	* This is called from smb_send_rqst. At this point we have the rfc1002
2328	* header as the first element in the vector.
2329	*/
2330	static int	2480	static int
2331	smb3_init_transform_rq(struct TCP_Server_Info server, struct smb_rqst new_rq,	2481	smb3_init_transform_rq(struct TCP_Server_Info server, struct smb_rqst new_rq,
2332	struct smb_rqst *old_rq)	2482	struct smb_rqst *old_rq)
@@ -2335,7 +2485,7 @@ smb3_init_transform_rq(struct TCP_Server_Info server, struct smb_rqst new_rq, · 2 unmodified lines
2335	struct page **pages;	2485	struct page **pages;
2336	struct smb2_transform_hdr *tr_hdr;	2486	struct smb2_transform_hdr *tr_hdr;
2337	unsigned int npages = old_rq->rq_npages;	2487	unsigned int npages = old_rq->rq_npages;
2338	unsigned int orig_len = get_rfc1002_length(old_rq->rq_iov[0].iov_base);	2488	unsigned int orig_len;
2339	int i;	2489	int i;
2340	int rc = -ENOMEM;	2490	int rc = -ENOMEM;
2341		2491
@@ -2355,18 +2505,14 @@ smb3_init_transform_rq(struct TCP_Server_Info server, struct smb_rqst new_rq, · 13 unmodified lines
2355	goto err_free_pages;	2505	goto err_free_pages;
2356	}	2506	}
2357		2507
2358	/* Make space for one extra iov to hold the transform header */
2359	iov = kmalloc_array(old_rq->rq_nvec + 1, sizeof(struct kvec),	2508	iov = kmalloc_array(old_rq->rq_nvec + 1, sizeof(struct kvec),
2360	GFP_KERNEL);	2509	GFP_KERNEL);
2361	if (!iov)	2510	if (!iov)
2362	goto err_free_pages;	2511	goto err_free_pages;
2363		2512
2364	/* copy all iovs from the old except the 1st one (rfc1002 length) */	2513	/* copy all iovs from the old */
2365	memcpy(&iov[2], &old_rq->rq_iov[1],	2514	memcpy(&iov[1], &old_rq->rq_iov[0],
2366	sizeof(struct kvec) * (old_rq->rq_nvec - 1));	2515	sizeof(struct kvec) * old_rq->rq_nvec);
2367	/* copy the rfc1002 iov */
2368	iov[0].iov_base = old_rq->rq_iov[0].iov_base;
2369	iov[0].iov_len = old_rq->rq_iov[0].iov_len;
2370		2516
2371	new_rq->rq_iov = iov;	2517	new_rq->rq_iov = iov;
2372	new_rq->rq_nvec = old_rq->rq_nvec + 1;	2518	new_rq->rq_nvec = old_rq->rq_nvec + 1;
@@ -2375,14 +2521,12 @@ smb3_init_transform_rq(struct TCP_Server_Info server, struct smb_rqst new_rq, · 2 unmodified lines
2375	if (!tr_hdr)	2521	if (!tr_hdr)
2376	goto err_free_iov;	2522	goto err_free_iov;
2377		2523
		2524	orig_len = smb2_rqst_len(old_rq, false);
		2525
2378	/* fill the 2nd iov with a transform header */	2526	/* fill the 2nd iov with a transform header */
2379	fill_transform_hdr(tr_hdr, orig_len, old_rq);	2527	fill_transform_hdr(tr_hdr, orig_len, old_rq);
2380	new_rq->rq_iov[1].iov_base = tr_hdr;	2528	new_rq->rq_iov[0].iov_base = tr_hdr;
2381	new_rq->rq_iov[1].iov_len = sizeof(struct smb2_transform_hdr);	2529	new_rq->rq_iov[0].iov_len = sizeof(struct smb2_transform_hdr);
2382
2383	/* Update rfc1002 header */
2384	inc_rfc1001_len(new_rq->rq_iov[0].iov_base,
2385	sizeof(struct smb2_transform_hdr));
2386		2530
2387	/* copy pages form the old */	2531	/* copy pages form the old */
2388	for (i = 0; i < npages; i++) {	2532	for (i = 0; i < npages; i++) {
@@ -2426,7 +2570,7 @@ smb3_free_transform_rq(struct smb_rqst *rqst) · 37 unmodified lines
2426	put_page(rqst->rq_pages[i]);	2570	put_page(rqst->rq_pages[i]);
2427	kfree(rqst->rq_pages);	2571	kfree(rqst->rq_pages);
2428	/* free transform header */	2572	/* free transform header */
2429	kfree(rqst->rq_iov[1].iov_base);	2573	kfree(rqst->rq_iov[0].iov_base);
2430	kfree(rqst->rq_iov);	2574	kfree(rqst->rq_iov);
2431	}	2575	}
2432		2576
@@ -2443,19 +2587,17 @@ decrypt_raw_data(struct TCP_Server_Info server, char buf, · 10 unmodified lines
2443	unsigned int buf_data_size, struct page **pages,	2587	unsigned int buf_data_size, struct page **pages,
2444	unsigned int npages, unsigned int page_data_size)	2588	unsigned int npages, unsigned int page_data_size)
2445	{	2589	{
2446	struct kvec iov[3];	2590	struct kvec iov[2];
2447	struct smb_rqst rqst = {NULL};	2591	struct smb_rqst rqst = {NULL};
2448	int rc;	2592	int rc;
2449		2593
2450	iov[0].iov_base = NULL;	2594	iov[0].iov_base = buf;
2451	iov[0].iov_len = 0;	2595	iov[0].iov_len = sizeof(struct smb2_transform_hdr);
2452	iov[1].iov_base = buf;	2596	iov[1].iov_base = buf + sizeof(struct smb2_transform_hdr);
2453	iov[1].iov_len = sizeof(struct smb2_transform_hdr);	2597	iov[1].iov_len = buf_data_size;
2454	iov[2].iov_base = buf + sizeof(struct smb2_transform_hdr);
2455	iov[2].iov_len = buf_data_size;
2456		2598
2457	rqst.rq_iov = iov;	2599	rqst.rq_iov = iov;
2458	rqst.rq_nvec = 3;	2600	rqst.rq_nvec = 2;
2459	rqst.rq_pages = pages;	2601	rqst.rq_pages = pages;
2460	rqst.rq_npages = npages;	2602	rqst.rq_npages = npages;
2461	rqst.rq_pagesz = PAGE_SIZE;	2603	rqst.rq_pagesz = PAGE_SIZE;
@@ -2467,7 +2609,7 @@ decrypt_raw_data(struct TCP_Server_Info server, char buf, · 5 unmodified lines
2467	if (rc)	2609	if (rc)
2468	return rc;	2610	return rc;
2469		2611
2470	memmove(buf, iov[2].iov_base, buf_data_size);	2612	memmove(buf, iov[1].iov_base, buf_data_size);
2471		2613
2472	server->total_read = buf_data_size + page_data_size;	2614	server->total_read = buf_data_size + page_data_size;
2473		2615
@@ -3170,6 +3312,7 @@ struct smb_version_operations smb311_operations = { · 696 unmodified lines
3170	.set_compression = smb2_set_compression,	3312	.set_compression = smb2_set_compression,
3171	.mkdir = smb2_mkdir,	3313	.mkdir = smb2_mkdir,
3172	.mkdir_setinfo = smb2_mkdir_setinfo,	3314	.mkdir_setinfo = smb2_mkdir_setinfo,
		3315	.posix_mkdir = smb311_posix_mkdir,
3173	.rmdir = smb2_rmdir,	3316	.rmdir = smb2_rmdir,
3174	.unlink = smb2_unlink,	3317	.unlink = smb2_unlink,
3175	.rename = smb2_rename_path,	3318	.rename = smb2_rename_path,

fs/cifs/smb2pdu.c+284−49

@@ -602,6 +602,7 @@ static void assemble_neg_contexts(struct smb2_negotiate_req *req, · 601 unmodified lines
602	int	602	int
603	SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses)	603	SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses)
604	{	604	{
		605	struct smb_rqst rqst;
605	struct smb2_negotiate_req *req;	606	struct smb2_negotiate_req *req;
606	struct smb2_negotiate_rsp *rsp;	607	struct smb2_negotiate_rsp *rsp;
607	struct kvec iov[1];	608	struct kvec iov[1];
@@ -673,7 +674,11 @@ SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses) · 65 unmodified lines
673	iov[0].iov_base = (char *)req;	674	iov[0].iov_base = (char *)req;
674	iov[0].iov_len = total_len;	675	iov[0].iov_len = total_len;
675		676
676	rc = smb2_send_recv(xid, ses, iov, 1, &resp_buftype, flags, &rsp_iov);	677	memset(&rqst, 0, sizeof(struct smb_rqst));
		678	rqst.rq_iov = iov;
		679	rqst.rq_nvec = 1;
		680
		681	rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags, &rsp_iov);
677	cifs_small_buf_release(req);	682	cifs_small_buf_release(req);
678	rsp = (struct smb2_negotiate_rsp *)rsp_iov.iov_base;	683	rsp = (struct smb2_negotiate_rsp *)rsp_iov.iov_base;
679	/*	684	/*
@@ -990,8 +995,9 @@ SMB2_sess_alloc_buffer(struct SMB2_sess_data *sess_data) · 310 unmodified lines
990	req->PreviousSessionId = sess_data->previous_session;	995	req->PreviousSessionId = sess_data->previous_session;
991		996
992	req->Flags = 0; /* MBZ */	997	req->Flags = 0; /* MBZ */
993	/* to enable echos and oplocks */	998
994	req->sync_hdr.CreditRequest = cpu_to_le16(3);	999	/* enough to enable echos and oplocks and one max size write */
		1000	req->sync_hdr.CreditRequest = cpu_to_le16(130);
995		1001
996	/* only one of SMB2 signing flags may be set in SMB2 request */	1002	/* only one of SMB2 signing flags may be set in SMB2 request */
997	if (server->sign)	1003	if (server->sign)
@@ -1027,6 +1033,7 @@ static int · 29 unmodified lines
1027	SMB2_sess_sendreceive(struct SMB2_sess_data *sess_data)	1033	SMB2_sess_sendreceive(struct SMB2_sess_data *sess_data)
1028	{	1034	{
1029	int rc;	1035	int rc;
		1036	struct smb_rqst rqst;
1030	struct smb2_sess_setup_req *req = sess_data->iov[0].iov_base;	1037	struct smb2_sess_setup_req *req = sess_data->iov[0].iov_base;
1031	struct kvec rsp_iov = { NULL, 0 };	1038	struct kvec rsp_iov = { NULL, 0 };
1032		1039
@@ -1035,10 +1042,13 @@ SMB2_sess_sendreceive(struct SMB2_sess_data *sess_data) · 2 unmodified lines
1035	cpu_to_le16(sizeof(struct smb2_sess_setup_req) - 1 /* pad */);	1042	cpu_to_le16(sizeof(struct smb2_sess_setup_req) - 1 /* pad */);
1036	req->SecurityBufferLength = cpu_to_le16(sess_data->iov[1].iov_len);	1043	req->SecurityBufferLength = cpu_to_le16(sess_data->iov[1].iov_len);
1037		1044
1038	/* BB add code to build os and lm fields */	1045	memset(&rqst, 0, sizeof(struct smb_rqst));
		1046	rqst.rq_iov = sess_data->iov;
		1047	rqst.rq_nvec = 2;
1039		1048
1040	rc = smb2_send_recv(sess_data->xid, sess_data->ses,	1049	/* BB add code to build os and lm fields */
1041	sess_data->iov, 2,	1050	rc = cifs_send_recv(sess_data->xid, sess_data->ses,
		1051	&rqst,
1042	&sess_data->buf0_type,	1052	&sess_data->buf0_type,
1043	CIFS_LOG_ERROR \| CIFS_NEG_OP, &rsp_iov);	1053	CIFS_LOG_ERROR \| CIFS_NEG_OP, &rsp_iov);
1044	cifs_small_buf_release(sess_data->iov[0].iov_base);	1054	cifs_small_buf_release(sess_data->iov[0].iov_base);
@@ -1376,6 +1386,7 @@ out: · 331 unmodified lines
1376	int	1386	int
1377	SMB2_logoff(const unsigned int xid, struct cifs_ses *ses)	1387	SMB2_logoff(const unsigned int xid, struct cifs_ses *ses)
1378	{	1388	{
		1389	struct smb_rqst rqst;
1379	struct smb2_logoff_req req; / response is also trivial struct */	1390	struct smb2_logoff_req req; / response is also trivial struct */
1380	int rc = 0;	1391	int rc = 0;
1381	struct TCP_Server_Info *server;	1392	struct TCP_Server_Info *server;
@@ -1413,7 +1424,11 @@ SMB2_logoff(const unsigned int xid, struct cifs_ses *ses) · 31 unmodified lines
1413	iov[0].iov_base = (char *)req;	1424	iov[0].iov_base = (char *)req;
1414	iov[0].iov_len = total_len;	1425	iov[0].iov_len = total_len;
1415		1426
1416	rc = smb2_send_recv(xid, ses, iov, 1, &resp_buf_type, flags, &rsp_iov);	1427	memset(&rqst, 0, sizeof(struct smb_rqst));
		1428	rqst.rq_iov = iov;
		1429	rqst.rq_nvec = 1;
		1430
		1431	rc = cifs_send_recv(xid, ses, &rqst, &resp_buf_type, flags, &rsp_iov);
1417	cifs_small_buf_release(req);	1432	cifs_small_buf_release(req);
1418	/*	1433	/*
1419	* No tcon so can't do	1434	* No tcon so can't do
@@ -1443,6 +1458,7 @@ int · 23 unmodified lines
1443	SMB2_tcon(const unsigned int xid, struct cifs_ses ses, const char tree,	1458	SMB2_tcon(const unsigned int xid, struct cifs_ses ses, const char tree,
1444	struct cifs_tcon tcon, const struct nls_table cp)	1459	struct cifs_tcon tcon, const struct nls_table cp)
1445	{	1460	{
		1461	struct smb_rqst rqst;
1446	struct smb2_tree_connect_req *req;	1462	struct smb2_tree_connect_req *req;
1447	struct smb2_tree_connect_rsp *rsp = NULL;	1463	struct smb2_tree_connect_rsp *rsp = NULL;
1448	struct kvec iov[2];	1464	struct kvec iov[2];
@@ -1499,7 +1515,11 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses ses, const char tree, · 50 unmodified lines
1499	!smb3_encryption_required(tcon))	1515	!smb3_encryption_required(tcon))
1500	req->sync_hdr.Flags \|= SMB2_FLAGS_SIGNED;	1516	req->sync_hdr.Flags \|= SMB2_FLAGS_SIGNED;
1501		1517
1502	rc = smb2_send_recv(xid, ses, iov, 2, &resp_buftype, flags, &rsp_iov);	1518	memset(&rqst, 0, sizeof(struct smb_rqst));
		1519	rqst.rq_iov = iov;
		1520	rqst.rq_nvec = 2;
		1521
		1522	rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags, &rsp_iov);
1503	cifs_small_buf_release(req);	1523	cifs_small_buf_release(req);
1504	rsp = (struct smb2_tree_connect_rsp *)rsp_iov.iov_base;	1524	rsp = (struct smb2_tree_connect_rsp *)rsp_iov.iov_base;
1505		1525
@@ -1563,6 +1583,7 @@ tcon_error_exit: · 57 unmodified lines
1563	int	1583	int
1564	SMB2_tdis(const unsigned int xid, struct cifs_tcon *tcon)	1584	SMB2_tdis(const unsigned int xid, struct cifs_tcon *tcon)
1565	{	1585	{
		1586	struct smb_rqst rqst;
1566	struct smb2_tree_disconnect_req req; / response is trivial */	1587	struct smb2_tree_disconnect_req req; / response is trivial */
1567	int rc = 0;	1588	int rc = 0;
1568	struct cifs_ses *ses = tcon->ses;	1589	struct cifs_ses *ses = tcon->ses;
@@ -1593,7 +1614,11 @@ SMB2_tdis(const unsigned int xid, struct cifs_tcon *tcon) · 24 unmodified lines
1593	iov[0].iov_base = (char *)req;	1614	iov[0].iov_base = (char *)req;
1594	iov[0].iov_len = total_len;	1615	iov[0].iov_len = total_len;
1595		1616
1596	rc = smb2_send_recv(xid, ses, iov, 1, &resp_buf_type, flags, &rsp_iov);	1617	memset(&rqst, 0, sizeof(struct smb_rqst));
		1618	rqst.rq_iov = iov;
		1619	rqst.rq_nvec = 1;
		1620
		1621	rc = cifs_send_recv(xid, ses, &rqst, &resp_buf_type, flags, &rsp_iov);
1597	cifs_small_buf_release(req);	1622	cifs_small_buf_release(req);
1598	if (rc)	1623	if (rc)
1599	cifs_stats_fail_inc(tcon, SMB2_TREE_DISCONNECT_HE);	1624	cifs_stats_fail_inc(tcon, SMB2_TREE_DISCONNECT_HE);
@@ -1886,11 +1911,165 @@ alloc_path_with_tree_prefix(__le16 *out_path, int out_size, int *out_len, · 286 unmodified lines
1886	return 0;	1911	return 0;
1887	}	1912	}
1888		1913
		1914	#ifdef CONFIG_CIFS_SMB311
		1915	int smb311_posix_mkdir(const unsigned int xid, struct inode *inode,
		1916	umode_t mode, struct cifs_tcon *tcon,
		1917	const char *full_path,
		1918	struct cifs_sb_info *cifs_sb)
		1919	{
		1920	struct smb_rqst rqst;
		1921	struct smb2_create_req *req;
		1922	struct smb2_create_rsp *rsp;
		1923	struct TCP_Server_Info *server;
		1924	struct cifs_ses *ses = tcon->ses;
		1925	struct kvec iov[3]; /* make sure at least one for each open context */
		1926	struct kvec rsp_iov = {NULL, 0};
		1927	int resp_buftype;
		1928	int uni_path_len;
		1929	__le16 *copy_path = NULL;
		1930	int copy_size;
		1931	int rc = 0;
		1932	unsigned int n_iov = 2;
		1933	__u32 file_attributes = 0;
		1934	char *pc_buf = NULL;
		1935	int flags = 0;
		1936	unsigned int total_len;
		1937	__le16 *path = cifs_convert_path_to_utf16(full_path, cifs_sb);
		1938
		1939	if (!path)
		1940	return -ENOMEM;
		1941
		1942	cifs_dbg(FYI, "mkdir\n");
		1943
		1944	if (ses && (ses->server))
		1945	server = ses->server;
		1946	else
		1947	return -EIO;
		1948
		1949	rc = smb2_plain_req_init(SMB2_CREATE, tcon, (void **) &req, &total_len);
		1950
		1951	if (rc)
		1952	return rc;
		1953
		1954	if (smb3_encryption_required(tcon))
		1955	flags \|= CIFS_TRANSFORM_REQ;
		1956
		1957
		1958	req->ImpersonationLevel = IL_IMPERSONATION;
		1959	req->DesiredAccess = cpu_to_le32(FILE_WRITE_ATTRIBUTES);
		1960	/* File attributes ignored on open (used in create though) */
		1961	req->FileAttributes = cpu_to_le32(file_attributes);
		1962	req->ShareAccess = FILE_SHARE_ALL_LE;
		1963	req->CreateDisposition = cpu_to_le32(FILE_CREATE);
		1964	req->CreateOptions = cpu_to_le32(CREATE_NOT_FILE);
		1965
		1966	iov[0].iov_base = (char *)req;
		1967	/* -1 since last byte is buf[0] which is sent below (path) */
		1968	iov[0].iov_len = total_len - 1;
		1969
		1970	req->NameOffset = cpu_to_le16(sizeof(struct smb2_create_req));
		1971
		1972	/* [MS-SMB2] 2.2.13 NameOffset:
		1973	* If SMB2_FLAGS_DFS_OPERATIONS is set in the Flags field of
		1974	* the SMB2 header, the file name includes a prefix that will
		1975	* be processed during DFS name normalization as specified in
		1976	* section 3.3.5.9. Otherwise, the file name is relative to
		1977	* the share that is identified by the TreeId in the SMB2
		1978	* header.
		1979	*/
		1980	if (tcon->share_flags & SHI1005_FLAGS_DFS) {
		1981	int name_len;
		1982
		1983	req->sync_hdr.Flags \|= SMB2_FLAGS_DFS_OPERATIONS;
		1984	rc = alloc_path_with_tree_prefix(&copy_path, &copy_size,
		1985	&name_len,
		1986	tcon->treeName, path);
		1987	if (rc) {
		1988	cifs_small_buf_release(req);
		1989	return rc;
		1990	}
		1991	req->NameLength = cpu_to_le16(name_len * 2);
		1992	uni_path_len = copy_size;
		1993	path = copy_path;
		1994	} else {
		1995	uni_path_len = (2 * UniStrnlen((wchar_t *)path, PATH_MAX)) + 2;
		1996	/* MUST set path len (NameLength) to 0 opening root of share */
		1997	req->NameLength = cpu_to_le16(uni_path_len - 2);
		1998	if (uni_path_len % 8 != 0) {
		1999	copy_size = roundup(uni_path_len, 8);
		2000	copy_path = kzalloc(copy_size, GFP_KERNEL);
		2001	if (!copy_path) {
		2002	cifs_small_buf_release(req);
		2003	return -ENOMEM;
		2004	}
		2005	memcpy((char )copy_path, (const char )path,
		2006	uni_path_len);
		2007	uni_path_len = copy_size;
		2008	path = copy_path;
		2009	}
		2010	}
		2011
		2012	iov[1].iov_len = uni_path_len;
		2013	iov[1].iov_base = path;
		2014	req->RequestedOplockLevel = SMB2_OPLOCK_LEVEL_NONE;
		2015
		2016	if (tcon->posix_extensions) {
		2017	if (n_iov > 2) {
		2018	struct create_context *ccontext =
		2019	(struct create_context *)iov[n_iov-1].iov_base;
		2020	ccontext->Next =
		2021	cpu_to_le32(iov[n_iov-1].iov_len);
		2022	}
		2023
		2024	rc = add_posix_context(iov, &n_iov, mode);
		2025	if (rc) {
		2026	cifs_small_buf_release(req);
		2027	kfree(copy_path);
		2028	return rc;
		2029	}
		2030	pc_buf = iov[n_iov-1].iov_base;
		2031	}
		2032
		2033
		2034	memset(&rqst, 0, sizeof(struct smb_rqst));
		2035	rqst.rq_iov = iov;
		2036	rqst.rq_nvec = n_iov;
		2037
		2038	rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags,
		2039	&rsp_iov);
		2040
		2041	cifs_small_buf_release(req);
		2042	rsp = (struct smb2_create_rsp *)rsp_iov.iov_base;
		2043
		2044	if (rc != 0) {
		2045	cifs_stats_fail_inc(tcon, SMB2_CREATE_HE);
		2046	trace_smb3_posix_mkdir_err(xid, tcon->tid, ses->Suid,
		2047	CREATE_NOT_FILE, FILE_WRITE_ATTRIBUTES, rc);
		2048	goto smb311_mkdir_exit;
		2049	} else
		2050	trace_smb3_posix_mkdir_done(xid, rsp->PersistentFileId, tcon->tid,
		2051	ses->Suid, CREATE_NOT_FILE,
		2052	FILE_WRITE_ATTRIBUTES);
		2053
		2054	SMB2_close(xid, tcon, rsp->PersistentFileId, rsp->VolatileFileId);
		2055
		2056	/* Eventually save off posix specific response info and timestaps */
		2057
		2058	smb311_mkdir_exit:
		2059	kfree(copy_path);
		2060	kfree(pc_buf);
		2061	free_rsp_buf(resp_buftype, rsp);
		2062	return rc;
		2063
		2064	}
		2065	#endif /* SMB311 */
		2066
1889	int	2067	int
1890	SMB2_open(const unsigned int xid, struct cifs_open_parms oparms, __le16 path,	2068	SMB2_open(const unsigned int xid, struct cifs_open_parms oparms, __le16 path,
1891	__u8 oplock, struct smb2_file_all_info buf,	2069	__u8 oplock, struct smb2_file_all_info buf,
1892	struct kvec err_iov, int buftype)	2070	struct kvec err_iov, int buftype)
1893	{	2071	{
		2072	struct smb_rqst rqst;
1894	struct smb2_create_req *req;	2073	struct smb2_create_req *req;
1895	struct smb2_create_rsp *rsp;	2074	struct smb2_create_rsp *rsp;
1896	struct TCP_Server_Info *server;	2075	struct TCP_Server_Info *server;
@@ -2043,7 +2222,11 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms oparms, __le16 path, · 146 unmodified lines
2043	}	2222	}
2044	#endif /* SMB311 */	2223	#endif /* SMB311 */
2045		2224
2046	rc = smb2_send_recv(xid, ses, iov, n_iov, &resp_buftype, flags,	2225	memset(&rqst, 0, sizeof(struct smb_rqst));
		2226	rqst.rq_iov = iov;
		2227	rqst.rq_nvec = n_iov;
		2228
		2229	rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags,
2047	&rsp_iov);	2230	&rsp_iov);
2048	cifs_small_buf_release(req);	2231	cifs_small_buf_release(req);
2049	rsp = (struct smb2_create_rsp *)rsp_iov.iov_base;	2232	rsp = (struct smb2_create_rsp *)rsp_iov.iov_base;
@@ -2099,6 +2282,7 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, · 49 unmodified lines
2099	char *in_data, u32 indatalen,	2282	char *in_data, u32 indatalen,
2100	char *out_data, u32 plen /* returned data len */)	2283	char *out_data, u32 plen /* returned data len */)
2101	{	2284	{
		2285	struct smb_rqst rqst;
2102	struct smb2_ioctl_req *req;	2286	struct smb2_ioctl_req *req;
2103	struct smb2_ioctl_rsp *rsp;	2287	struct smb2_ioctl_rsp *rsp;
2104	struct cifs_ses *ses;	2288	struct cifs_ses *ses;
@@ -2189,7 +2373,11 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, · 84 unmodified lines
2189	if (opcode == FSCTL_VALIDATE_NEGOTIATE_INFO)	2373	if (opcode == FSCTL_VALIDATE_NEGOTIATE_INFO)
2190	req->sync_hdr.Flags \|= SMB2_FLAGS_SIGNED;	2374	req->sync_hdr.Flags \|= SMB2_FLAGS_SIGNED;
2191		2375
2192	rc = smb2_send_recv(xid, ses, iov, n_iov, &resp_buftype, flags,	2376	memset(&rqst, 0, sizeof(struct smb_rqst));
		2377	rqst.rq_iov = iov;
		2378	rqst.rq_nvec = n_iov;
		2379
		2380	rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags,
2193	&rsp_iov);	2381	&rsp_iov);
2194	cifs_small_buf_release(req);	2382	cifs_small_buf_release(req);
2195	rsp = (struct smb2_ioctl_rsp *)rsp_iov.iov_base;	2383	rsp = (struct smb2_ioctl_rsp *)rsp_iov.iov_base;
@@ -2274,6 +2462,7 @@ int · 78 unmodified lines
2274	SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon,	2462	SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon,
2275	u64 persistent_fid, u64 volatile_fid, int flags)	2463	u64 persistent_fid, u64 volatile_fid, int flags)
2276	{	2464	{
		2465	struct smb_rqst rqst;
2277	struct smb2_close_req *req;	2466	struct smb2_close_req *req;
2278	struct smb2_close_rsp *rsp;	2467	struct smb2_close_rsp *rsp;
2279	struct cifs_ses *ses = tcon->ses;	2468	struct cifs_ses *ses = tcon->ses;
@@ -2301,7 +2490,11 @@ SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon, · 21 unmodified lines
2301	iov[0].iov_base = (char *)req;	2490	iov[0].iov_base = (char *)req;
2302	iov[0].iov_len = total_len;	2491	iov[0].iov_len = total_len;
2303		2492
2304	rc = smb2_send_recv(xid, ses, iov, 1, &resp_buftype, flags, &rsp_iov);	2493	memset(&rqst, 0, sizeof(struct smb_rqst));
		2494	rqst.rq_iov = iov;
		2495	rqst.rq_nvec = 1;
		2496
		2497	rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags, &rsp_iov);
2305	cifs_small_buf_release(req);	2498	cifs_small_buf_release(req);
2306	rsp = (struct smb2_close_rsp *)rsp_iov.iov_base;	2499	rsp = (struct smb2_close_rsp *)rsp_iov.iov_base;
2307		2500
@@ -2387,6 +2580,7 @@ query_info(const unsigned int xid, struct cifs_tcon *tcon, · 79 unmodified lines
2387	u32 additional_info, size_t output_len, size_t min_len, void **data,	2580	u32 additional_info, size_t output_len, size_t min_len, void **data,
2388	u32 *dlen)	2581	u32 *dlen)
2389	{	2582	{
		2583	struct smb_rqst rqst;
2390	struct smb2_query_info_req *req;	2584	struct smb2_query_info_req *req;
2391	struct smb2_query_info_rsp *rsp = NULL;	2585	struct smb2_query_info_rsp *rsp = NULL;
2392	struct kvec iov[2];	2586	struct kvec iov[2];
@@ -2427,7 +2621,11 @@ query_info(const unsigned int xid, struct cifs_tcon *tcon, · 34 unmodified lines
2427	/* 1 for Buffer */	2621	/* 1 for Buffer */
2428	iov[0].iov_len = total_len - 1;	2622	iov[0].iov_len = total_len - 1;
2429		2623
2430	rc = smb2_send_recv(xid, ses, iov, 1, &resp_buftype, flags, &rsp_iov);	2624	memset(&rqst, 0, sizeof(struct smb_rqst));
		2625	rqst.rq_iov = iov;
		2626	rqst.rq_nvec = 1;
		2627
		2628	rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags, &rsp_iov);
2431	cifs_small_buf_release(req);	2629	cifs_small_buf_release(req);
2432	rsp = (struct smb2_query_info_rsp *)rsp_iov.iov_base;	2630	rsp = (struct smb2_query_info_rsp *)rsp_iov.iov_base;
2433		2631
@@ -2594,11 +2792,10 @@ SMB2_echo(struct TCP_Server_Info *server) · 160 unmodified lines
2594	{	2792	{
2595	struct smb2_echo_req *req;	2793	struct smb2_echo_req *req;
2596	int rc = 0;	2794	int rc = 0;
2597	struct kvec iov[2];	2795	struct kvec iov[1];
2598	struct smb_rqst rqst = { .rq_iov = iov,	2796	struct smb_rqst rqst = { .rq_iov = iov,
2599	.rq_nvec = 2 };	2797	.rq_nvec = 1 };
2600	unsigned int total_len;	2798	unsigned int total_len;
2601	__be32 rfc1002_marker;
2602		2799
2603	cifs_dbg(FYI, "In echo request\n");	2800	cifs_dbg(FYI, "In echo request\n");
2604		2801
@@ -2614,11 +2811,8 @@ SMB2_echo(struct TCP_Server_Info *server) · 9 unmodified lines
2614		2811
2615	req->sync_hdr.CreditRequest = cpu_to_le16(1);	2812	req->sync_hdr.CreditRequest = cpu_to_le16(1);
2616		2813
2617	iov[0].iov_len = 4;	2814	iov[0].iov_len = total_len;
2618	rfc1002_marker = cpu_to_be32(total_len);	2815	iov[0].iov_base = (char *)req;
2619	iov[0].iov_base = &rfc1002_marker;
2620	iov[1].iov_len = total_len;
2621	iov[1].iov_base = (char *)req;
2622		2816
2623	rc = cifs_call_async(server, &rqst, NULL, smb2_echo_callback, NULL,	2817	rc = cifs_call_async(server, &rqst, NULL, smb2_echo_callback, NULL,
2624	server, CIFS_ECHO_OP);	2818	server, CIFS_ECHO_OP);
@@ -2633,6 +2827,7 @@ int · 8 unmodified lines
2633	SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,	2827	SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
2634	u64 volatile_fid)	2828	u64 volatile_fid)
2635	{	2829	{
		2830	struct smb_rqst rqst;
2636	struct smb2_flush_req *req;	2831	struct smb2_flush_req *req;
2637	struct cifs_ses *ses = tcon->ses;	2832	struct cifs_ses *ses = tcon->ses;
2638	struct kvec iov[1];	2833	struct kvec iov[1];
@@ -2660,7 +2855,11 @@ SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, · 21 unmodified lines
2660	iov[0].iov_base = (char *)req;	2855	iov[0].iov_base = (char *)req;
2661	iov[0].iov_len = total_len;	2856	iov[0].iov_len = total_len;
2662		2857
2663	rc = smb2_send_recv(xid, ses, iov, 1, &resp_buftype, flags, &rsp_iov);	2858	memset(&rqst, 0, sizeof(struct smb_rqst));
		2859	rqst.rq_iov = iov;
		2860	rqst.rq_nvec = 1;
		2861
		2862	rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags, &rsp_iov);
2664	cifs_small_buf_release(req);	2863	cifs_small_buf_release(req);
2665		2864
2666	if (rc != 0) {	2865	if (rc != 0) {
@@ -2848,10 +3047,9 @@ smb2_async_readv(struct cifs_readdata *rdata) · 181 unmodified lines
2848	struct smb2_sync_hdr *shdr;	3047	struct smb2_sync_hdr *shdr;
2849	struct cifs_io_parms io_parms;	3048	struct cifs_io_parms io_parms;
2850	struct smb_rqst rqst = { .rq_iov = rdata->iov,	3049	struct smb_rqst rqst = { .rq_iov = rdata->iov,
2851	.rq_nvec = 2 };	3050	.rq_nvec = 1 };
2852	struct TCP_Server_Info *server;	3051	struct TCP_Server_Info *server;
2853	unsigned int total_len;	3052	unsigned int total_len;
2854	__be32 req_len;
2855		3053
2856	cifs_dbg(FYI, "%s: offset=%llu bytes=%u\n",	3054	cifs_dbg(FYI, "%s: offset=%llu bytes=%u\n",
2857	__func__, rdata->offset, rdata->bytes);	3055	__func__, rdata->offset, rdata->bytes);
@@ -2882,12 +3080,8 @@ smb2_async_readv(struct cifs_readdata *rdata) · 24 unmodified lines
2882	if (smb3_encryption_required(io_parms.tcon))	3080	if (smb3_encryption_required(io_parms.tcon))
2883	flags \|= CIFS_TRANSFORM_REQ;	3081	flags \|= CIFS_TRANSFORM_REQ;
2884		3082
2885	req_len = cpu_to_be32(total_len);	3083	rdata->iov[0].iov_base = buf;
2886		3084	rdata->iov[0].iov_len = total_len;
2887	rdata->iov[0].iov_base = &req_len;
2888	rdata->iov[0].iov_len = sizeof(__be32);
2889	rdata->iov[1].iov_base = buf;
2890	rdata->iov[1].iov_len = total_len;
2891		3085
2892	shdr = (struct smb2_sync_hdr *)buf;	3086	shdr = (struct smb2_sync_hdr *)buf;
2893		3087
@@ -2926,6 +3120,7 @@ int · 32 unmodified lines
2926	SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms,	3120	SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms,
2927	unsigned int nbytes, char buf, int buf_type)	3121	unsigned int nbytes, char buf, int buf_type)
2928	{	3122	{
		3123	struct smb_rqst rqst;
2929	int resp_buftype, rc = -EACCES;	3124	int resp_buftype, rc = -EACCES;
2930	struct smb2_read_plain_req *req = NULL;	3125	struct smb2_read_plain_req *req = NULL;
2931	struct smb2_read_rsp *rsp = NULL;	3126	struct smb2_read_rsp *rsp = NULL;
@@ -2946,7 +3141,11 @@ SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms, · 14 unmodified lines
2946	iov[0].iov_base = (char *)req;	3141	iov[0].iov_base = (char *)req;
2947	iov[0].iov_len = total_len;	3142	iov[0].iov_len = total_len;
2948		3143
2949	rc = smb2_send_recv(xid, ses, iov, 1, &resp_buftype, flags, &rsp_iov);	3144	memset(&rqst, 0, sizeof(struct smb_rqst));
		3145	rqst.rq_iov = iov;
		3146	rqst.rq_nvec = 1;
		3147
		3148	rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags, &rsp_iov);
2950	cifs_small_buf_release(req);	3149	cifs_small_buf_release(req);
2951		3150
2952	rsp = (struct smb2_read_rsp *)rsp_iov.iov_base;	3151	rsp = (struct smb2_read_rsp *)rsp_iov.iov_base;
@@ -3062,10 +3261,9 @@ smb2_async_writev(struct cifs_writedata *wdata, · 109 unmodified lines
3062	struct smb2_sync_hdr *shdr;	3261	struct smb2_sync_hdr *shdr;
3063	struct cifs_tcon *tcon = tlink_tcon(wdata->cfile->tlink);	3262	struct cifs_tcon *tcon = tlink_tcon(wdata->cfile->tlink);
3064	struct TCP_Server_Info *server = tcon->ses->server;	3263	struct TCP_Server_Info *server = tcon->ses->server;
3065	struct kvec iov[2];	3264	struct kvec iov[1];
3066	struct smb_rqst rqst = { };	3265	struct smb_rqst rqst = { };
3067	unsigned int total_len;	3266	unsigned int total_len;
3068	__be32 rfc1002_marker;
3069		3267
3070	rc = smb2_plain_req_init(SMB2_WRITE, tcon, (void **) &req, &total_len);	3268	rc = smb2_plain_req_init(SMB2_WRITE, tcon, (void **) &req, &total_len);
3071	if (rc) {	3269	if (rc) {
@@ -3137,15 +3335,11 @@ smb2_async_writev(struct cifs_writedata *wdata, · 65 unmodified lines
3137	v1->length = cpu_to_le32(wdata->mr->mr->length);	3335	v1->length = cpu_to_le32(wdata->mr->mr->length);
3138	}	3336	}
3139	#endif	3337	#endif
3140	/* 4 for rfc1002 length field and 1 for Buffer */	3338	iov[0].iov_len = total_len - 1;
3141	iov[0].iov_len = 4;	3339	iov[0].iov_base = (char *)req;
3142	rfc1002_marker = cpu_to_be32(total_len - 1 + wdata->bytes);
3143	iov[0].iov_base = &rfc1002_marker;
3144	iov[1].iov_len = total_len - 1;
3145	iov[1].iov_base = (char *)req;
3146		3340
3147	rqst.rq_iov = iov;	3341	rqst.rq_iov = iov;
3148	rqst.rq_nvec = 2;	3342	rqst.rq_nvec = 1;
3149	rqst.rq_pages = wdata->pages;	3343	rqst.rq_pages = wdata->pages;
3150	rqst.rq_offset = wdata->page_offset;	3344	rqst.rq_offset = wdata->page_offset;
3151	rqst.rq_npages = wdata->nr_pages;	3345	rqst.rq_npages = wdata->nr_pages;
@@ -3153,7 +3347,7 @@ smb2_async_writev(struct cifs_writedata *wdata, · 1 unmodified line
3153	rqst.rq_tailsz = wdata->tailsz;	3347	rqst.rq_tailsz = wdata->tailsz;
3154	#ifdef CONFIG_CIFS_SMB_DIRECT	3348	#ifdef CONFIG_CIFS_SMB_DIRECT
3155	if (wdata->mr) {	3349	if (wdata->mr) {
3156	iov[1].iov_len += sizeof(struct smbd_buffer_descriptor_v1);	3350	iov[0].iov_len += sizeof(struct smbd_buffer_descriptor_v1);
3157	rqst.rq_npages = 0;	3351	rqst.rq_npages = 0;
3158	}	3352	}
3159	#endif	3353	#endif
@@ -3210,6 +3404,7 @@ int · 50 unmodified lines
3210	SMB2_write(const unsigned int xid, struct cifs_io_parms *io_parms,	3404	SMB2_write(const unsigned int xid, struct cifs_io_parms *io_parms,
3211	unsigned int nbytes, struct kvec iov, int n_vec)	3405	unsigned int nbytes, struct kvec iov, int n_vec)
3212	{	3406	{
		3407	struct smb_rqst rqst;
3213	int rc = 0;	3408	int rc = 0;
3214	struct smb2_write_req *req = NULL;	3409	struct smb2_write_req *req = NULL;
3215	struct smb2_write_rsp *rsp = NULL;	3410	struct smb2_write_rsp *rsp = NULL;
@@ -3251,7 +3446,11 @@ SMB2_write(const unsigned int xid, struct cifs_io_parms *io_parms, · 35 unmodified lines
3251	/* 1 for Buffer */	3446	/* 1 for Buffer */
3252	iov[0].iov_len = total_len - 1;	3447	iov[0].iov_len = total_len - 1;
3253		3448
3254	rc = smb2_send_recv(xid, io_parms->tcon->ses, iov, n_vec + 1,	3449	memset(&rqst, 0, sizeof(struct smb_rqst));
		3450	rqst.rq_iov = iov;
		3451	rqst.rq_nvec = n_vec + 1;
		3452
		3453	rc = cifs_send_recv(xid, io_parms->tcon->ses, &rqst,
3255	&resp_buftype, flags, &rsp_iov);	3454	&resp_buftype, flags, &rsp_iov);
3256	cifs_small_buf_release(req);	3455	cifs_small_buf_release(req);
3257	rsp = (struct smb2_write_rsp *)rsp_iov.iov_base;	3456	rsp = (struct smb2_write_rsp *)rsp_iov.iov_base;
@@ -3323,6 +3522,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon, · 65 unmodified lines
3323	u64 persistent_fid, u64 volatile_fid, int index,	3522	u64 persistent_fid, u64 volatile_fid, int index,
3324	struct cifs_search_info *srch_inf)	3523	struct cifs_search_info *srch_inf)
3325	{	3524	{
		3525	struct smb_rqst rqst;
3326	struct smb2_query_directory_req *req;	3526	struct smb2_query_directory_req *req;
3327	struct smb2_query_directory_rsp *rsp = NULL;	3527	struct smb2_query_directory_rsp *rsp = NULL;
3328	struct kvec iov[2];	3528	struct kvec iov[2];
@@ -3395,7 +3595,11 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon, · 66 unmodified lines
3395	iov[1].iov_base = (char *)(req->Buffer);	3595	iov[1].iov_base = (char *)(req->Buffer);
3396	iov[1].iov_len = len;	3596	iov[1].iov_len = len;
3397		3597
3398	rc = smb2_send_recv(xid, ses, iov, 2, &resp_buftype, flags, &rsp_iov);	3598	memset(&rqst, 0, sizeof(struct smb_rqst));
		3599	rqst.rq_iov = iov;
		3600	rqst.rq_nvec = 2;
		3601
		3602	rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags, &rsp_iov);
3399	cifs_small_buf_release(req);	3603	cifs_small_buf_release(req);
3400	rsp = (struct smb2_query_directory_rsp *)rsp_iov.iov_base;	3604	rsp = (struct smb2_query_directory_rsp *)rsp_iov.iov_base;
3401		3605
@@ -3454,6 +3658,7 @@ send_set_info(const unsigned int xid, struct cifs_tcon *tcon, · 52 unmodified lines
3454	u8 info_type, u32 additional_info, unsigned int num,	3658	u8 info_type, u32 additional_info, unsigned int num,
3455	void *data, unsigned int size)	3659	void *data, unsigned int size)
3456	{	3660	{
		3661	struct smb_rqst rqst;
3457	struct smb2_set_info_req *req;	3662	struct smb2_set_info_req *req;
3458	struct smb2_set_info_rsp *rsp = NULL;	3663	struct smb2_set_info_rsp *rsp = NULL;
3459	struct kvec *iov;	3664	struct kvec *iov;
@@ -3509,7 +3714,11 @@ send_set_info(const unsigned int xid, struct cifs_tcon *tcon, · 49 unmodified lines
3509	iov[i].iov_len = size[i];	3714	iov[i].iov_len = size[i];
3510	}	3715	}
3511		3716
3512	rc = smb2_send_recv(xid, ses, iov, num, &resp_buftype, flags,	3717	memset(&rqst, 0, sizeof(struct smb_rqst));
		3718	rqst.rq_iov = iov;
		3719	rqst.rq_nvec = num;
		3720
		3721	rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags,
3513	&rsp_iov);	3722	&rsp_iov);
3514	cifs_small_buf_release(req);	3723	cifs_small_buf_release(req);
3515	rsp = (struct smb2_set_info_rsp *)rsp_iov.iov_base;	3724	rsp = (struct smb2_set_info_rsp *)rsp_iov.iov_base;
@@ -3664,6 +3873,7 @@ SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon, · 148 unmodified lines
3664	const u64 persistent_fid, const u64 volatile_fid,	3873	const u64 persistent_fid, const u64 volatile_fid,
3665	__u8 oplock_level)	3874	__u8 oplock_level)
3666	{	3875	{
		3876	struct smb_rqst rqst;
3667	int rc;	3877	int rc;
3668	struct smb2_oplock_break *req = NULL;	3878	struct smb2_oplock_break *req = NULL;
3669	struct cifs_ses *ses = tcon->ses;	3879	struct cifs_ses *ses = tcon->ses;
@@ -3692,7 +3902,11 @@ SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon, · 22 unmodified lines
3692	iov[0].iov_base = (char *)req;	3902	iov[0].iov_base = (char *)req;
3693	iov[0].iov_len = total_len;	3903	iov[0].iov_len = total_len;
3694		3904
3695	rc = smb2_send_recv(xid, ses, iov, 1, &resp_buf_type, flags, &rsp_iov);	3905	memset(&rqst, 0, sizeof(struct smb_rqst));
		3906	rqst.rq_iov = iov;
		3907	rqst.rq_nvec = 1;
		3908
		3909	rc = cifs_send_recv(xid, ses, &rqst, &resp_buf_type, flags, &rsp_iov);
3696	cifs_small_buf_release(req);	3910	cifs_small_buf_release(req);
3697		3911
3698	if (rc) {	3912	if (rc) {
@@ -3755,6 +3969,7 @@ int · 56 unmodified lines
3755	SMB2_QFS_info(const unsigned int xid, struct cifs_tcon *tcon,	3969	SMB2_QFS_info(const unsigned int xid, struct cifs_tcon *tcon,
3756	u64 persistent_fid, u64 volatile_fid, struct kstatfs *fsdata)	3970	u64 persistent_fid, u64 volatile_fid, struct kstatfs *fsdata)
3757	{	3971	{
		3972	struct smb_rqst rqst;
3758	struct smb2_query_info_rsp *rsp = NULL;	3973	struct smb2_query_info_rsp *rsp = NULL;
3759	struct kvec iov;	3974	struct kvec iov;
3760	struct kvec rsp_iov;	3975	struct kvec rsp_iov;
@@ -3773,7 +3988,11 @@ SMB2_QFS_info(const unsigned int xid, struct cifs_tcon *tcon, · 12 unmodified lines
3773	if (smb3_encryption_required(tcon))	3988	if (smb3_encryption_required(tcon))
3774	flags \|= CIFS_TRANSFORM_REQ;	3989	flags \|= CIFS_TRANSFORM_REQ;
3775		3990
3776	rc = smb2_send_recv(xid, ses, &iov, 1, &resp_buftype, flags, &rsp_iov);	3991	memset(&rqst, 0, sizeof(struct smb_rqst));
		3992	rqst.rq_iov = &iov;
		3993	rqst.rq_nvec = 1;
		3994
		3995	rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags, &rsp_iov);
3777	cifs_small_buf_release(iov.iov_base);	3996	cifs_small_buf_release(iov.iov_base);
3778	if (rc) {	3997	if (rc) {
3779	cifs_stats_fail_inc(tcon, SMB2_QUERY_INFO_HE);	3998	cifs_stats_fail_inc(tcon, SMB2_QUERY_INFO_HE);
@@ -3798,6 +4017,7 @@ int · 18 unmodified lines
3798	SMB2_QFS_attr(const unsigned int xid, struct cifs_tcon *tcon,	4017	SMB2_QFS_attr(const unsigned int xid, struct cifs_tcon *tcon,
3799	u64 persistent_fid, u64 volatile_fid, int level)	4018	u64 persistent_fid, u64 volatile_fid, int level)
3800	{	4019	{
		4020	struct smb_rqst rqst;
3801	struct smb2_query_info_rsp *rsp = NULL;	4021	struct smb2_query_info_rsp *rsp = NULL;
3802	struct kvec iov;	4022	struct kvec iov;
3803	struct kvec rsp_iov;	4023	struct kvec rsp_iov;
@@ -3829,7 +4049,11 @@ SMB2_QFS_attr(const unsigned int xid, struct cifs_tcon *tcon, · 25 unmodified lines
3829	if (smb3_encryption_required(tcon))	4049	if (smb3_encryption_required(tcon))
3830	flags \|= CIFS_TRANSFORM_REQ;	4050	flags \|= CIFS_TRANSFORM_REQ;
3831		4051
3832	rc = smb2_send_recv(xid, ses, &iov, 1, &resp_buftype, flags, &rsp_iov);	4052	memset(&rqst, 0, sizeof(struct smb_rqst));
		4053	rqst.rq_iov = &iov;
		4054	rqst.rq_nvec = 1;
		4055
		4056	rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags, &rsp_iov);
3833	cifs_small_buf_release(iov.iov_base);	4057	cifs_small_buf_release(iov.iov_base);
3834	if (rc) {	4058	if (rc) {
3835	cifs_stats_fail_inc(tcon, SMB2_QUERY_INFO_HE);	4059	cifs_stats_fail_inc(tcon, SMB2_QUERY_INFO_HE);
@@ -3868,6 +4092,7 @@ smb2_lockv(const unsigned int xid, struct cifs_tcon *tcon, · 32 unmodified lines
3868	const __u64 persist_fid, const __u64 volatile_fid, const __u32 pid,	4092	const __u64 persist_fid, const __u64 volatile_fid, const __u32 pid,
3869	const __u32 num_lock, struct smb2_lock_element *buf)	4093	const __u32 num_lock, struct smb2_lock_element *buf)
3870	{	4094	{
		4095	struct smb_rqst rqst;
3871	int rc = 0;	4096	int rc = 0;
3872	struct smb2_lock_req *req = NULL;	4097	struct smb2_lock_req *req = NULL;
3873	struct kvec iov[2];	4098	struct kvec iov[2];
@@ -3900,7 +4125,12 @@ smb2_lockv(const unsigned int xid, struct cifs_tcon *tcon, · 26 unmodified lines
3900	iov[1].iov_len = count;	4125	iov[1].iov_len = count;
3901		4126
3902	cifs_stats_inc(&tcon->stats.cifs_stats.num_locks);	4127	cifs_stats_inc(&tcon->stats.cifs_stats.num_locks);
3903	rc = smb2_send_recv(xid, tcon->ses, iov, 2, &resp_buf_type, flags,	4128
		4129	memset(&rqst, 0, sizeof(struct smb_rqst));
		4130	rqst.rq_iov = iov;
		4131	rqst.rq_nvec = 2;
		4132
		4133	rc = cifs_send_recv(xid, tcon->ses, &rqst, &resp_buf_type, flags,
3904	&rsp_iov);	4134	&rsp_iov);
3905	cifs_small_buf_release(req);	4135	cifs_small_buf_release(req);
3906	if (rc) {	4136	if (rc) {
@@ -3934,6 +4164,7 @@ int · 27 unmodified lines
3934	SMB2_lease_break(const unsigned int xid, struct cifs_tcon *tcon,	4164	SMB2_lease_break(const unsigned int xid, struct cifs_tcon *tcon,
3935	__u8 *lease_key, const __le32 lease_state)	4165	__u8 *lease_key, const __le32 lease_state)
3936	{	4166	{
		4167	struct smb_rqst rqst;
3937	int rc;	4168	int rc;
3938	struct smb2_lease_ack *req = NULL;	4169	struct smb2_lease_ack *req = NULL;
3939	struct cifs_ses *ses = tcon->ses;	4170	struct cifs_ses *ses = tcon->ses;
@@ -3964,7 +4195,11 @@ SMB2_lease_break(const unsigned int xid, struct cifs_tcon *tcon, · 24 unmodified lines
3964	iov[0].iov_base = (char *)req;	4195	iov[0].iov_base = (char *)req;
3965	iov[0].iov_len = total_len;	4196	iov[0].iov_len = total_len;
3966		4197
3967	rc = smb2_send_recv(xid, ses, iov, 1, &resp_buf_type, flags, &rsp_iov);	4198	memset(&rqst, 0, sizeof(struct smb_rqst));
		4199	rqst.rq_iov = iov;
		4200	rqst.rq_nvec = 1;
		4201
		4202	rc = cifs_send_recv(xid, ses, &rqst, &resp_buf_type, flags, &rsp_iov);
3968	cifs_small_buf_release(req);	4203	cifs_small_buf_release(req);
3969		4204
3970	if (rc) {	4205	if (rc) {

fs/cifs/smb2pdu.h+20−3

@@ -851,8 +851,11 @@ struct validate_negotiate_info_rsp { · 850 unmodified lines
851	__le16 Dialect; /* Dialect in use for the connection */	851	__le16 Dialect; /* Dialect in use for the connection */
852	} __packed;	852	} __packed;
853		853
854	#define RSS_CAPABLE 0x00000001	854	#define RSS_CAPABLE cpu_to_le32(0x00000001)
855	#define RDMA_CAPABLE 0x00000002	855	#define RDMA_CAPABLE cpu_to_le32(0x00000002)
		856
		857	#define INTERNETWORK cpu_to_le16(0x0002)
		858	#define INTERNETWORKV6 cpu_to_le16(0x0017)
856		859
857	struct network_interface_info_ioctl_rsp {	860	struct network_interface_info_ioctl_rsp {
858	__le32 Next; /* next interface. zero if this is last one */	861	__le32 Next; /* next interface. zero if this is last one */
@@ -860,7 +863,21 @@ struct network_interface_info_ioctl_rsp { · 1 unmodified line
860	__le32 Capability; /* RSS or RDMA Capable */	863	__le32 Capability; /* RSS or RDMA Capable */
861	__le32 Reserved;	864	__le32 Reserved;
862	__le64 LinkSpeed;	865	__le64 LinkSpeed;
863	char SockAddr_Storage[128];	866	__le16 Family;
		867	__u8 Buffer[126];
		868	} __packed;
		869
		870	struct iface_info_ipv4 {
		871	__be16 Port;
		872	__be32 IPv4Address;
		873	__be64 Reserved;
		874	} __packed;
		875
		876	struct iface_info_ipv6 {
		877	__be16 Port;
		878	__be32 FlowInfo;
		879	__u8 IPv6Address[16];
		880	__be32 ScopeId;
864	} __packed;	881	} __packed;
865		882
866	#define NO_FILE_ID 0xFFFFFFFFFFFFFFFFULL /* general ioctls to srv not to file */	883	#define NO_FILE_ID 0xFFFFFFFFFFFFFFFFULL /* general ioctls to srv not to file */

fs/cifs/smb2proto.h+6−0

 			      struct cifs_sb_info *cifs_sb, bool set_alloc);
 extern int smb2_set_file_info(struct inode *inode, const char *full_path,
 			      FILE_BASIC_INFO *buf, const unsigned int xid);
+extern int smb311_posix_mkdir(const unsigned int xid, struct inode *inode,
+			       umode_t mode, struct cifs_tcon *tcon,
+			       const char *full_path,
+			       struct cifs_sb_info *cifs_sb);
 extern int smb2_mkdir(const unsigned int xid, struct cifs_tcon *tcon,
 		      const char *name, struct cifs_sb_info *cifs_sb);
 extern void smb2_mkdir_setinfo(struct inode *inode, const char *full_path,
 extern int smb2_push_mandatory_locks(struct cifsFileInfo *cfile);
 extern void smb2_reconnect_server(struct work_struct *work);
 extern int smb3_crypto_aead_allocate(struct TCP_Server_Info *server);
+extern unsigned long
+smb2_rqst_len(struct smb_rqst *rqst, bool skip_rfc1002_marker);
 /*
  * SMB2 Worker functions - most of protocol specific implementation details

fs/cifs/smb2transport.c+7−11

 	unsigned char smb2_signature[SMB2_HMACSHA256_SIZE];
 	unsigned char *sigptr = smb2_signature;
 	struct kvec *iov = rqst->rq_iov;
-	int iov_hdr_index = rqst->rq_nvec > 1 ? 1 : 0;
+	struct smb2_sync_hdr *shdr = (struct smb2_sync_hdr *)iov[0].iov_base;
-	struct smb2_sync_hdr *shdr =
-		(struct smb2_sync_hdr *)iov[iov_hdr_index].iov_base;
 	struct cifs_ses *ses;
 	ses = smb2_find_smb_ses(server, shdr->SessionId);
 		return rc;
 	}
-	rc = __cifs_calc_signature(rqst, iov_hdr_index,  server, sigptr,
+	rc = __cifs_calc_signature(rqst, server, sigptr,
 		&server->secmech.sdeschmacsha256->shash);
 	if (!rc)
 	unsigned char smb3_signature[SMB2_CMACAES_SIZE];
 	unsigned char *sigptr = smb3_signature;
 	struct kvec *iov = rqst->rq_iov;
-	int iov_hdr_index = rqst->rq_nvec > 1 ? 1 : 0;
+	struct smb2_sync_hdr *shdr = (struct smb2_sync_hdr *)iov[0].iov_base;
-	struct smb2_sync_hdr *shdr =
-		(struct smb2_sync_hdr *)iov[iov_hdr_index].iov_base;
 	struct cifs_ses *ses;
 	ses = smb2_find_smb_ses(server, shdr->SessionId);
 		return rc;
 	}
-	rc = __cifs_calc_signature(rqst, iov_hdr_index, server, sigptr,
+	rc = __cifs_calc_signature(rqst, server, sigptr,
 				   &server->secmech.sdesccmacaes->shash);
 	if (!rc)
 {
 	int rc = 0;
 	struct smb2_sync_hdr *shdr =
-			(struct smb2_sync_hdr *)rqst->rq_iov[1].iov_base;
+			(struct smb2_sync_hdr *)rqst->rq_iov[0].iov_base;
 	if (!(shdr->Flags & SMB2_FLAGS_SIGNED) ||
 	    server->tcpStatus == CifsNeedNegotiate)
 {
 	int rc;
 	struct smb2_sync_hdr *shdr =
-			(struct smb2_sync_hdr *)rqst->rq_iov[1].iov_base;
+			(struct smb2_sync_hdr *)rqst->rq_iov[0].iov_base;
 	struct mid_q_entry *mid;
 	smb2_seq_num_into_buf(ses->server, shdr);
 {
 	int rc;
 	struct smb2_sync_hdr *shdr =
-			(struct smb2_sync_hdr *)rqst->rq_iov[1].iov_base;
+			(struct smb2_sync_hdr *)rqst->rq_iov[0].iov_base;
 	struct mid_q_entry *mid;
 	smb2_seq_num_into_buf(server, shdr);

fs/cifs/smbdirect.c+5−14

 #include "smbdirect.h"
 #include "cifs_debug.h"
 #include "cifsproto.h"
+#include "smb2proto.h"
 static struct smbd_response *get_empty_queue_buffer(
 		struct smbd_connection *info);
 	struct kvec vec;
 	int nvecs;
 	int size;
-	unsigned int buflen = 0, remaining_data_length;
+	unsigned int buflen, remaining_data_length;
 	int start, i, j;
 	int max_iov_size =
 		info->max_send_size - sizeof(struct smbd_data_transfer);
 		log_write(ERR, "expected the pdu length in 1st iov, but got %zu\n", rqst->rq_iov[0].iov_len);
 		return -EINVAL;
 	}
-	iov = &rqst->rq_iov[1];
-	/* total up iov array first */
-	for (i = 0; i < rqst->rq_nvec-1; i++) {
-		buflen += iov[i].iov_len;
-	}
 	/*
 	 * Add in the page array if there is one. The caller needs to set
 	 * rq_tailsz to PAGE_SIZE when the buffer has multiple pages and
 	 * ends at page boundary
 	 */
-	if (rqst->rq_npages) {
+	buflen = smb2_rqst_len(rqst, true);
-		if (rqst->rq_npages == 1)
-			buflen += rqst->rq_tailsz;
-		else
-			buflen += rqst->rq_pagesz * (rqst->rq_npages - 1) -
-					rqst->rq_offset + rqst->rq_tailsz;
-	}
 	if (buflen + sizeof(struct smbd_data_transfer) >
 		info->max_fragmented_send_size) {
 		goto done;
 	}
+	iov = &rqst->rq_iov[1];
 	cifs_dbg(FYI, "Sending smb (RDMA): smb_len=%u\n", buflen);
 	for (i = 0; i < rqst->rq_nvec-1; i++)
 		dump_smb(iov[i].iov_base, iov[i].iov_len);

fs/cifs/trace.h+2−1

@@ -378,7 +378,7 @@ DEFINE_EVENT(smb3_open_err_class, smb3_##name, \ · 377 unmodified lines
378	TP_ARGS(xid, tid, sesid, create_options, desired_access, rc))	378	TP_ARGS(xid, tid, sesid, create_options, desired_access, rc))
379		379
380	DEFINE_SMB3_OPEN_ERR_EVENT(open_err);	380	DEFINE_SMB3_OPEN_ERR_EVENT(open_err);
381		381	DEFINE_SMB3_OPEN_ERR_EVENT(posix_mkdir_err);
382		382
383	DECLARE_EVENT_CLASS(smb3_open_done_class,	383	DECLARE_EVENT_CLASS(smb3_open_done_class,
384	TP_PROTO(unsigned int xid,	384	TP_PROTO(unsigned int xid,
@@ -420,6 +420,7 @@ DEFINE_EVENT(smb3_open_done_class, smb3_##name, \ · 35 unmodified lines
420	TP_ARGS(xid, fid, tid, sesid, create_options, desired_access))	420	TP_ARGS(xid, fid, tid, sesid, create_options, desired_access))
421		421
422	DEFINE_SMB3_OPEN_DONE_EVENT(open_done);	422	DEFINE_SMB3_OPEN_DONE_EVENT(open_done);
		423	DEFINE_SMB3_OPEN_DONE_EVENT(posix_mkdir_done);
423		424
424	#endif /* _CIFS_TRACE_H */	425	#endif /* _CIFS_TRACE_H */
425		426

fs/cifs/transport.c+78−95

 	return 0;
 }
-static unsigned long
+unsigned long
-rqst_len(struct smb_rqst *rqst)
+smb2_rqst_len(struct smb_rqst *rqst, bool skip_rfc1002_marker)
 {
 	unsigned int i;
-	struct kvec *iov = rqst->rq_iov;
+	struct kvec *iov;
+	int nvec;
 	unsigned long buflen = 0;
+	if (skip_rfc1002_marker && rqst->rq_iov[0].iov_len == 4) {
+		iov = &rqst->rq_iov[1];
+		nvec = rqst->rq_nvec - 1;
+	} else {
+		iov = rqst->rq_iov;
+		nvec = rqst->rq_nvec;
+	}
 	/* total up iov array first */
-	for (i = 0; i < rqst->rq_nvec; i++)
+	for (i = 0; i < nvec; i++)
 		buflen += iov[i].iov_len;
 	/*
 }
 static int
-__smb_send_rqst(struct TCP_Server_Info *server, struct smb_rqst *rqst)
+__smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,
+		struct smb_rqst *rqst)
 {
-	int rc;
+	int rc = 0;
-	struct kvec *iov = rqst->rq_iov;
+	struct kvec *iov;
-	int n_vec = rqst->rq_nvec;
+	int n_vec;
-	unsigned int smb_buf_length = get_rfc1002_length(iov[0].iov_base);
+	unsigned int send_length = 0;
-	unsigned long send_length;
+	unsigned int i, j;
-	unsigned int i;
 	size_t total_len = 0, sent, size;
 	struct socket *ssocket = server->ssocket;
 	struct msghdr smb_msg;
 	int val = 1;
+	__be32 rfc1002_marker;
 	if (cifs_rdma_enabled(server) && server->smbd_conn) {
 		rc = smbd_send(server->smbd_conn, rqst);
 		goto smbd_done;
 	if (ssocket == NULL)
 		return -ENOTSOCK;
-	/* sanity check send length */
-	send_length = rqst_len(rqst);
-	if (send_length != smb_buf_length + 4) {
-		WARN(1, "Send length mismatch(send_length=%lu smb_buf_length=%u)\n",
-			send_length, smb_buf_length);
-		return -EIO;
-	}
-	if (n_vec < 2)
-		return -EIO;
-	cifs_dbg(FYI, "Sending smb: smb_len=%u\n", smb_buf_length);
-	dump_smb(iov[0].iov_base, iov[0].iov_len);
-	dump_smb(iov[1].iov_base, iov[1].iov_len);
 	/* cork the socket */
 	kernel_setsockopt(ssocket, SOL_TCP, TCP_CORK,
 				(char *)&val, sizeof(val));
-	size = 0;
+	for (j = 0; j < num_rqst; j++)
-	for (i = 0; i < n_vec; i++)
+		send_length += smb2_rqst_len(&rqst[j], true);
-		size += iov[i].iov_len;
+	rfc1002_marker = cpu_to_be32(send_length);
-	iov_iter_kvec(&smb_msg.msg_iter, WRITE | ITER_KVEC, iov, n_vec, size);
+	/* Generate a rfc1002 marker for SMB2+ */
+	if (server->vals->header_preamble_size == 0) {
+		struct kvec hiov = {
+			.iov_base = &rfc1002_marker,
+			.iov_len  = 4
+		};
+		iov_iter_kvec(&smb_msg.msg_iter, WRITE | ITER_KVEC, &hiov,
+			      1, 4);
+		rc = smb_send_kvec(server, &smb_msg, &sent);
+		if (rc < 0)
+			goto uncork;
-	rc = smb_send_kvec(server, &smb_msg, &sent);
+		total_len += sent;
-	if (rc < 0)
+		send_length += 4;
-		goto uncork;
+	}
-	total_len += sent;
+	cifs_dbg(FYI, "Sending smb: smb_len=%u\n", send_length);
-	/* now walk the page array and send each page in it */
+	for (j = 0; j < num_rqst; j++) {
-	for (i = 0; i < rqst->rq_npages; i++) {
+		iov = rqst[j].rq_iov;
-		struct bio_vec bvec;
+		n_vec = rqst[j].rq_nvec;
-		bvec.bv_page = rqst->rq_pages[i];
+		size = 0;
-		rqst_page_get_length(rqst, i, &bvec.bv_len, &bvec.bv_offset);
+		for (i = 0; i < n_vec; i++) {
+			dump_smb(iov[i].iov_base, iov[i].iov_len);
+			size += iov[i].iov_len;
+		}
+		iov_iter_kvec(&smb_msg.msg_iter, WRITE | ITER_KVEC,
+			      iov, n_vec, size);
-		iov_iter_bvec(&smb_msg.msg_iter, WRITE | ITER_BVEC,
-			      &bvec, 1, bvec.bv_len);
 		rc = smb_send_kvec(server, &smb_msg, &sent);
 		if (rc < 0)
-			break;
+			goto uncork;
 		total_len += sent;
+		/* now walk the page array and send each page in it */
+		for (i = 0; i < rqst[j].rq_npages; i++) {
+			struct bio_vec bvec;
+			bvec.bv_page = rqst[j].rq_pages[i];
+			rqst_page_get_length(&rqst[j], i, &bvec.bv_len,
+					     &bvec.bv_offset);
+			iov_iter_bvec(&smb_msg.msg_iter, WRITE | ITER_BVEC,
+				      &bvec, 1, bvec.bv_len);
+			rc = smb_send_kvec(server, &smb_msg, &sent);
+			if (rc < 0)
+				break;
+			total_len += sent;
+		}
 	}
 uncork:
 	kernel_setsockopt(ssocket, SOL_TCP, TCP_CORK,
 				(char *)&val, sizeof(val));
-	if ((total_len > 0) && (total_len != smb_buf_length + 4)) {
+	if ((total_len > 0) && (total_len != send_length)) {
 		cifs_dbg(FYI, "partial send (wanted=%u sent=%zu): terminating session\n",
-			 smb_buf_length + 4, total_len);
+			 send_length, total_len);
 		/*
 		 * If we have only sent part of an SMB then the next SMB could
 		 * be taken as the remainder of this one. We need to kill the
 	int rc;
 	if (!(flags & CIFS_TRANSFORM_REQ))
-		return __smb_send_rqst(server, rqst);
+		return __smb_send_rqst(server, 1, rqst);
 	if (!server->ops->init_transform_rq ||
 	    !server->ops->free_transform_rq) {
 	if (rc)
 		return rc;
-	rc = __smb_send_rqst(server, &cur_rqst);
+	rc = __smb_send_rqst(server, 1, &cur_rqst);
 	server->ops->free_transform_rq(&cur_rqst);
 	return rc;
 }
 	iov[1].iov_base = (char *)smb_buffer + 4;
 	iov[1].iov_len = smb_buf_length;
-	return __smb_send_rqst(server, &rqst);
+	return __smb_send_rqst(server, 1, &rqst);
 }
 static int
 	 * to the same server. We may make this configurable later or
 	 * use ses->maxReq.
 	 */
 	rc = wait_for_free_request(ses->server, timeout, optype);
 	if (rc)
 		return rc;
 #ifdef CONFIG_CIFS_SMB311
 	if ((ses->status == CifsNew) || (optype & CIFS_NEG_OP))
-		smb311_update_preauth_hash(ses, rqst->rq_iov+1,
+		smb311_update_preauth_hash(ses, rqst->rq_iov,
-					   rqst->rq_nvec-1);
+					   rqst->rq_nvec);
 #endif
 	if (timeout == CIFS_ASYNC_OP)
 #ifdef CONFIG_CIFS_SMB311
 	if ((ses->status == CifsNew) || (optype & CIFS_NEG_OP)) {
 		struct kvec iov = {
-			.iov_base = buf,
+			.iov_base = resp_iov->iov_base,
-			.iov_len = midQ->resp_buf_size
+			.iov_len = resp_iov->iov_len
 		};
 		smb311_update_preauth_hash(ses, &iov, 1);
 	}
 	return rc;
 }
-/* Like SendReceive2 but iov[0] does not contain an rfc1002 header */
-int
-smb2_send_recv(const unsigned int xid, struct cifs_ses *ses,
-	       struct kvec *iov, int n_vec, int *resp_buf_type /* ret */,
-	       const int flags, struct kvec *resp_iov)
-{
-	struct smb_rqst rqst;
-	struct kvec s_iov[CIFS_MAX_IOV_SIZE], *new_iov;
-	int rc;
-	int i;
-	__u32 count;
-	__be32 rfc1002_marker;
-	if (n_vec + 1 > CIFS_MAX_IOV_SIZE) {
-		new_iov = kmalloc_array(n_vec + 1, sizeof(struct kvec),
-					GFP_KERNEL);
-		if (!new_iov)
-			return -ENOMEM;
-	} else
-		new_iov = s_iov;
-	/* 1st iov is an RFC1002 Session Message length */
-	memcpy(new_iov + 1, iov, (sizeof(struct kvec) * n_vec));
-	count = 0;
-	for (i = 1; i < n_vec + 1; i++)
-		count += new_iov[i].iov_len;
-	rfc1002_marker = cpu_to_be32(count);
-	new_iov[0].iov_base = &rfc1002_marker;
-	new_iov[0].iov_len = 4;
-	memset(&rqst, 0, sizeof(struct smb_rqst));
-	rqst.rq_iov = new_iov;
-	rqst.rq_nvec = n_vec + 1;
-	rc = cifs_send_recv(xid, ses, &rqst, resp_buf_type, flags, resp_iov);
-	if (n_vec + 1 > CIFS_MAX_IOV_SIZE)
-		kfree(new_iov);
-	return rc;
-}
 int
 SendReceive(const unsigned int xid, struct cifs_ses *ses,
 	    struct smb_hdr *in_buf, struct smb_hdr *out_buf,

fs/eventfd.c+6−13

 	return 0;
 }
-static struct wait_queue_head *
+static __poll_t eventfd_poll(struct file *file, poll_table *wait)
-eventfd_get_poll_head(struct file *file, __poll_t events)
-{
-	struct eventfd_ctx *ctx = file->private_data;
-	return &ctx->wqh;
-}
-static __poll_t eventfd_poll_mask(struct file *file, __poll_t eventmask)
 {
 	struct eventfd_ctx *ctx = file->private_data;
 	__poll_t events = 0;
 	u64 count;
+	poll_wait(file, &ctx->wqh, wait);
 	/*
 	 * All writes to ctx->count occur within ctx->wqh.lock.  This read
 	 * can be done outside ctx->wqh.lock because we know that poll_wait
 	count = READ_ONCE(ctx->count);
 	if (count > 0)
-		events |= (EPOLLIN & eventmask);
+		events |= EPOLLIN;
 	if (count == ULLONG_MAX)
 		events |= EPOLLERR;
 	if (ULLONG_MAX - 1 > count)
-		events |= (EPOLLOUT & eventmask);
+		events |= EPOLLOUT;
 	return events;
 }
 	.show_fdinfo	= eventfd_show_fdinfo,
 #endif
 	.release	= eventfd_release,
-	.get_poll_head	= eventfd_get_poll_head,
+	.poll		= eventfd_poll,
-	.poll_mask	= eventfd_poll_mask,
 	.read		= eventfd_read,
 	.write		= eventfd_write,
 	.llseek		= noop_llseek,

fs/eventpoll.c+5−10

 	return 0;
 }
-static struct wait_queue_head *ep_eventpoll_get_poll_head(struct file *file,
+static __poll_t ep_eventpoll_poll(struct file *file, poll_table *wait)
-		__poll_t eventmask)
-{
-	struct eventpoll *ep = file->private_data;
-	return &ep->poll_wait;
-}
-static __poll_t ep_eventpoll_poll_mask(struct file *file, __poll_t eventmask)
 {
 	struct eventpoll *ep = file->private_data;
 	int depth = 0;
+	/* Insert inside our poll wait queue */
+	poll_wait(file, &ep->poll_wait, wait);
 	/*
 	 * Proceed to find out if wanted events are really available inside
 	 * the ready list.
 	.show_fdinfo	= ep_show_fdinfo,
 #endif
 	.release	= ep_eventpoll_release,
-	.get_poll_head	= ep_eventpoll_get_poll_head,
+	.poll		= ep_eventpoll_poll,
-	.poll_mask	= ep_eventpoll_poll_mask,
 	.llseek		= noop_llseek,
 };

fs/ext2/ext2.h+0−2

 			      unsigned long);
 extern unsigned long ext2_count_free_blocks (struct super_block *);
 extern unsigned long ext2_count_dirs (struct super_block *);
-extern void ext2_check_blocks_bitmap (struct super_block *);
 extern struct ext2_group_desc * ext2_get_group_desc(struct super_block * sb,
 						    unsigned int block_group,
 						    struct buffer_head ** bh);
 extern struct inode * ext2_new_inode (struct inode *, umode_t, const struct qstr *);
 extern void ext2_free_inode (struct inode *);
 extern unsigned long ext2_count_free_inodes (struct super_block *);
-extern void ext2_check_inodes_bitmap (struct super_block *);
 extern unsigned long ext2_count_free (struct buffer_head *, unsigned);
 /* inode.c */

fs/ext2/super.c+3−3

 			set_opt (opts->s_mount_opt, NO_UID32);
 			break;
 		case Opt_nocheck:
+			ext2_msg(sb, KERN_WARNING,
+				"Option nocheck/check=none is deprecated and"
+				" will be removed in June 2020.");
 			clear_opt (opts->s_mount_opt, CHECK);
 			break;
 		case Opt_debug:
 	new_opts.s_resgid = sbi->s_resgid;
 	spin_unlock(&sbi->s_lock);
-	/*
-	 * Allow the "check" option to be passed as a remount option.
-	 */
 	if (!parse_options(data, sb, &new_opts))
 		return -EINVAL;

fs/jfs/xattr.c+6−4

 	if (size > PSIZE) {
 		/*
 		 * To keep the rest of the code simple.  Allocate a
-		 * contiguous buffer to work with
+		 * contiguous buffer to work with. Make the buffer large
+		 * enough to make use of the whole extent.
 		 */
-		ea_buf->xattr = kmalloc(size, GFP_KERNEL);
+		ea_buf->max_size = (size + sb->s_blocksize - 1) &
+		    ~(sb->s_blocksize - 1);
+		ea_buf->xattr = kmalloc(ea_buf->max_size, GFP_KERNEL);
 		if (ea_buf->xattr == NULL)
 			return -ENOMEM;
 		ea_buf->flag = EA_MALLOC;
-		ea_buf->max_size = (size + sb->s_blocksize - 1) &
-		    ~(sb->s_blocksize - 1);
 		if (ea_size == 0)
 			return 0;

fs/nfs/delegation.c+3−1

 	rcu_read_lock();
 	list_for_each_entry_rcu(server, &clp->cl_superblocks, client_link) {
 		res = nfs_delegation_find_inode_server(server, fhandle);
-		if (res != ERR_PTR(-ENOENT))
+		if (res != ERR_PTR(-ENOENT)) {
+			rcu_read_unlock();
 			return res;
+		}
 	}
 	rcu_read_unlock();
 	return ERR_PTR(-ENOENT);

fs/nfs/flexfilelayout/flexfilelayout.c+16−5

 					   hdr->ds_clp, hdr->lseg,
 					   hdr->pgio_mirror_idx);
+	clear_bit(NFS_IOHDR_RESEND_PNFS, &hdr->flags);
+	clear_bit(NFS_IOHDR_RESEND_MDS, &hdr->flags);
 	switch (err) {
 	case -NFS4ERR_RESET_TO_PNFS:
 		if (ff_layout_choose_best_ds_for_read(hdr->lseg,
 					hdr->pgio_mirror_idx + 1,
 					&hdr->pgio_mirror_idx))
 			goto out_eagain;
-		ff_layout_read_record_layoutstats_done(task, hdr);
+		set_bit(NFS_IOHDR_RESEND_PNFS, &hdr->flags);
-		pnfs_read_resend_pnfs(hdr);
 		return task->tk_status;
 	case -NFS4ERR_RESET_TO_MDS:
-		ff_layout_reset_read(hdr);
+		set_bit(NFS_IOHDR_RESEND_MDS, &hdr->flags);
 		return task->tk_status;
 	case -EAGAIN:
 		goto out_eagain;
 	struct nfs_pgio_header *hdr = data;
 	ff_layout_read_record_layoutstats_done(&hdr->task, hdr);
+	if (test_bit(NFS_IOHDR_RESEND_PNFS, &hdr->flags))
+		pnfs_read_resend_pnfs(hdr);
+	else if (test_bit(NFS_IOHDR_RESEND_MDS, &hdr->flags))
+		ff_layout_reset_read(hdr);
 	pnfs_generic_rw_release(data);
 }
 					   hdr->ds_clp, hdr->lseg,
 					   hdr->pgio_mirror_idx);
+	clear_bit(NFS_IOHDR_RESEND_PNFS, &hdr->flags);
+	clear_bit(NFS_IOHDR_RESEND_MDS, &hdr->flags);
 	switch (err) {
 	case -NFS4ERR_RESET_TO_PNFS:
-		ff_layout_reset_write(hdr, true);
+		set_bit(NFS_IOHDR_RESEND_PNFS, &hdr->flags);
 		return task->tk_status;
 	case -NFS4ERR_RESET_TO_MDS:
-		ff_layout_reset_write(hdr, false);
+		set_bit(NFS_IOHDR_RESEND_MDS, &hdr->flags);
 		return task->tk_status;
 	case -EAGAIN:
 		return -EAGAIN;
 	struct nfs_pgio_header *hdr = data;
 	ff_layout_write_record_layoutstats_done(&hdr->task, hdr);
+	if (test_bit(NFS_IOHDR_RESEND_PNFS, &hdr->flags))
+		ff_layout_reset_write(hdr, true);
+	else if (test_bit(NFS_IOHDR_RESEND_MDS, &hdr->flags))
+		ff_layout_reset_write(hdr, false);
 	pnfs_generic_rw_release(data);
 }

fs/nfs/nfs4proc.c+26−7

@@ -3294,6 +3294,7 @@ static void nfs4_close_prepare(struct rpc_task task, void data) · 3293 unmodified lines
3294	struct nfs4_closedata *calldata = data;	3294	struct nfs4_closedata *calldata = data;
3295	struct nfs4_state *state = calldata->state;	3295	struct nfs4_state *state = calldata->state;
3296	struct inode *inode = calldata->inode;	3296	struct inode *inode = calldata->inode;
		3297	struct pnfs_layout_hdr *lo;
3297	bool is_rdonly, is_wronly, is_rdwr;	3298	bool is_rdonly, is_wronly, is_rdwr;
3298	int call_close = 0;	3299	int call_close = 0;
3299		3300
@@ -3337,6 +3338,12 @@ static void nfs4_close_prepare(struct rpc_task task, void data) · 37 unmodified lines
3337	goto out_wait;	3338	goto out_wait;
3338	}	3339	}
3339		3340
		3341	lo = calldata->arg.lr_args ? calldata->arg.lr_args->layout : NULL;
		3342	if (lo && !pnfs_layout_is_valid(lo)) {
		3343	calldata->arg.lr_args = NULL;
		3344	calldata->res.lr_res = NULL;
		3345	}
		3346
3340	if (calldata->arg.fmode == 0)	3347	if (calldata->arg.fmode == 0)
3341	task->tk_msg.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_CLOSE];	3348	task->tk_msg.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_CLOSE];
3342		3349
@@ -5972,12 +5979,19 @@ static void nfs4_delegreturn_release(void *calldata) · 2629 unmodified lines
5972	static void nfs4_delegreturn_prepare(struct rpc_task task, void data)	5979	static void nfs4_delegreturn_prepare(struct rpc_task task, void data)
5973	{	5980	{
5974	struct nfs4_delegreturndata *d_data;	5981	struct nfs4_delegreturndata *d_data;
		5982	struct pnfs_layout_hdr *lo;
5975		5983
5976	d_data = (struct nfs4_delegreturndata *)data;	5984	d_data = (struct nfs4_delegreturndata *)data;
5977		5985
5978	if (!d_data->lr.roc && nfs4_wait_on_layoutreturn(d_data->inode, task))	5986	if (!d_data->lr.roc && nfs4_wait_on_layoutreturn(d_data->inode, task))
5979	return;	5987	return;
5980		5988
		5989	lo = d_data->args.lr_args ? d_data->args.lr_args->layout : NULL;
		5990	if (lo && !pnfs_layout_is_valid(lo)) {
		5991	d_data->args.lr_args = NULL;
		5992	d_data->res.lr_res = NULL;
		5993	}
		5994
5981	nfs4_setup_sequence(d_data->res.server->nfs_client,	5995	nfs4_setup_sequence(d_data->res.server->nfs_client,
5982	&d_data->args.seq_args,	5996	&d_data->args.seq_args,
5983	&d_data->res.seq_res,	5997	&d_data->res.seq_res,
@@ -8650,6 +8664,8 @@ nfs4_layoutget_handle_exception(struct rpc_task *task, · 2666 unmodified lines
8650		8664
8651	dprintk("--> %s tk_status => %d\n", __func__, -task->tk_status);	8665	dprintk("--> %s tk_status => %d\n", __func__, -task->tk_status);
8652		8666
		8667	nfs4_sequence_free_slot(&lgp->res.seq_res);
		8668
8653	switch (nfs4err) {	8669	switch (nfs4err) {
8654	case 0:	8670	case 0:
8655	goto out;	8671	goto out;
@@ -8714,7 +8730,6 @@ nfs4_layoutget_handle_exception(struct rpc_task *task, · 58 unmodified lines
8714	goto out;	8730	goto out;
8715	}	8731	}
8716		8732
8717	nfs4_sequence_free_slot(&lgp->res.seq_res);
8718	err = nfs4_handle_exception(server, nfs4err, exception);	8733	err = nfs4_handle_exception(server, nfs4err, exception);
8719	if (!status) {	8734	if (!status) {
8720	if (exception->retry)	8735	if (exception->retry)
@@ -8786,20 +8801,22 @@ nfs4_proc_layoutget(struct nfs4_layoutget lgp, long timeout) · 65 unmodified lines
8786	if (IS_ERR(task))	8801	if (IS_ERR(task))
8787	return ERR_CAST(task);	8802	return ERR_CAST(task);
8788	status = rpc_wait_for_completion_task(task);	8803	status = rpc_wait_for_completion_task(task);
8789	if (status == 0) {	8804	if (status != 0)
		8805	goto out;
		8806
		8807	/* if layoutp->len is 0, nfs4_layoutget_prepare called rpc_exit */
		8808	if (task->tk_status < 0 \|\| lgp->res.layoutp->len == 0) {
8790	status = nfs4_layoutget_handle_exception(task, lgp, &exception);	8809	status = nfs4_layoutget_handle_exception(task, lgp, &exception);
8791	*timeout = exception.timeout;	8810	*timeout = exception.timeout;
8792	}	8811	} else
8793		8812	lseg = pnfs_layout_process(lgp);
		8813	out:
8794	trace_nfs4_layoutget(lgp->args.ctx,	8814	trace_nfs4_layoutget(lgp->args.ctx,
8795	&lgp->args.range,	8815	&lgp->args.range,
8796	&lgp->res.range,	8816	&lgp->res.range,
8797	&lgp->res.stateid,	8817	&lgp->res.stateid,
8798	status);	8818	status);
8799		8819
8800	/* if layoutp->len is 0, nfs4_layoutget_prepare called rpc_exit */
8801	if (status == 0 && lgp->res.layoutp->len)
8802	lseg = pnfs_layout_process(lgp);
8803	rpc_put_task(task);	8820	rpc_put_task(task);
8804	dprintk("<-- %s status=%d\n", __func__, status);	8821	dprintk("<-- %s status=%d\n", __func__, status);
8805	if (status)	8822	if (status)
@@ -8817,6 +8834,8 @@ nfs4_layoutreturn_prepare(struct rpc_task task, void calldata) · 11 unmodified lines
8817	&lrp->args.seq_args,	8834	&lrp->args.seq_args,
8818	&lrp->res.seq_res,	8835	&lrp->res.seq_res,
8819	task);	8836	task);
		8837	if (!pnfs_layout_is_valid(lrp->args.layout))
		8838	rpc_exit(task, 0);
8820	}	8839	}
8821		8840
8822	static void nfs4_layoutreturn_done(struct rpc_task task, void calldata)	8841	static void nfs4_layoutreturn_done(struct rpc_task task, void calldata)

fs/nfs/pnfs.h+5−0

 {
 }
+static inline bool pnfs_layout_is_valid(const struct pnfs_layout_hdr *lo)
+{
+	return false;
+}
 #endif /* CONFIG_NFS_V4_1 */
 #if IS_ENABLED(CONFIG_NFS_V4_2)

fs/pipe.c+9−13

@@ -509,22 +509,19 @@ static long pipe_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) · 508 unmodified lines
509	}	509	}
510	}	510	}
511		511
512	static struct wait_queue_head *
513	pipe_get_poll_head(struct file *filp, __poll_t events)
514	{
515	struct pipe_inode_info *pipe = filp->private_data;
516
517	return &pipe->wait;
518	}
519
520	/* No kernel lock held - fine */	512	/* No kernel lock held - fine */
521	static __poll_t pipe_poll_mask(struct file *filp, __poll_t events)	513	static __poll_t
		514	pipe_poll(struct file filp, poll_table wait)
522	{	515	{
		516	__poll_t mask;
523	struct pipe_inode_info *pipe = filp->private_data;	517	struct pipe_inode_info *pipe = filp->private_data;
524	int nrbufs = pipe->nrbufs;	518	int nrbufs;
525	__poll_t mask = 0;	519
		520	poll_wait(filp, &pipe->wait, wait);
526		521
527	/* Reading only -- no need for acquiring the semaphore. */	522	/* Reading only -- no need for acquiring the semaphore. */
		523	nrbufs = pipe->nrbufs;
		524	mask = 0;
528	if (filp->f_mode & FMODE_READ) {	525	if (filp->f_mode & FMODE_READ) {
529	mask = (nrbufs > 0) ? EPOLLIN \| EPOLLRDNORM : 0;	526	mask = (nrbufs > 0) ? EPOLLIN \| EPOLLRDNORM : 0;
530	if (!pipe->writers && filp->f_version != pipe->w_counter)	527	if (!pipe->writers && filp->f_version != pipe->w_counter)
@@ -1023,8 +1020,7 @@ const struct file_operations pipefifo_fops = { · 492 unmodified lines
1023	.llseek = no_llseek,	1020	.llseek = no_llseek,
1024	.read_iter = pipe_read,	1021	.read_iter = pipe_read,
1025	.write_iter = pipe_write,	1022	.write_iter = pipe_write,
1026	.get_poll_head = pipe_get_poll_head,	1023	.poll = pipe_poll,
1027	.poll_mask = pipe_poll_mask,
1028	.unlocked_ioctl = pipe_ioctl,	1024	.unlocked_ioctl = pipe_ioctl,
1029	.release = pipe_release,	1025	.release = pipe_release,
1030	.fasync = pipe_fasync,	1026	.fasync = pipe_fasync,

fs/proc/base.c+23−5

 	if (env_start != arg_end || env_start >= env_end)
 		env_start = env_end = arg_end;
+	/* .. and limit it to a maximum of one page of slop */
+	if (env_end >= arg_end + PAGE_SIZE)
+		env_end = arg_end + PAGE_SIZE - 1;
 	/* We're not going to care if "*ppos" has high bits set */
 	pos = arg_start + *ppos;
 	while (count) {
 		int got;
 		size_t size = min_t(size_t, PAGE_SIZE, count);
+		long offset;
-		got = access_remote_vm(mm, pos, page, size, FOLL_ANON);
+		/*
-		if (got <= 0)
+		 * Are we already starting past the official end?
+		 * We always include the last byte that is *supposed*
+		 * to be NUL
+		 */
+		offset = (pos >= arg_end) ? pos - arg_end + 1 : 0;
+		got = access_remote_vm(mm, pos - offset, page, size + offset, FOLL_ANON);
+		if (got <= offset)
 			break;
+		got -= offset;
 		/* Don't walk past a NUL character once you hit arg_end */
 		if (pos + got >= arg_end) {
 				n = arg_end - pos - 1;
 			/* Cut off at first NUL after 'n' */
-			got = n + strnlen(page+n, got-n);
+			got = n + strnlen(page+n, offset+got-n);
-			if (!got)
+			if (got < offset)
 				break;
+			got -= offset;
+			/* Include the NUL if it existed */
+			if (got < size)
+				got++;
 		}
-		got -= copy_to_user(buf, page, got);
+		got -= copy_to_user(buf, page+offset, got);
 		if (unlikely(!got)) {
 			if (!len)
 				len = -EFAULT;

fs/proc/generic.c+10−1

 	return seq_open(file, de->seq_ops);
 }
+static int proc_seq_release(struct inode *inode, struct file *file)
+{
+	struct proc_dir_entry *de = PDE(inode);
+	if (de->state_size)
+		return seq_release_private(inode, file);
+	return seq_release(inode, file);
+}
 static const struct file_operations proc_seq_fops = {
 	.open		= proc_seq_open,
 	.read		= seq_read,
 	.llseek		= seq_lseek,
-	.release	= seq_release,
+	.release	= proc_seq_release,
 };
 struct proc_dir_entry *proc_create_seq_private(const char *name, umode_t mode,

fs/quota/dquot.c+2−5

 static unsigned long
 dqcache_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
 {
-	struct list_head *head;
 	struct dquot *dquot;
 	unsigned long freed = 0;
 	spin_lock(&dq_list_lock);
-	head = free_dquots.prev;
+	while (!list_empty(&free_dquots) && sc->nr_to_scan) {
-	while (head != &free_dquots && sc->nr_to_scan) {
+		dquot = list_first_entry(&free_dquots, struct dquot, dq_free);
-		dquot = list_entry(head, struct dquot, dq_free);
 		remove_dquot_hash(dquot);
 		remove_free_dquot(dquot);
 		remove_inuse(dquot);
 		do_destroy_dquot(dquot);
 		sc->nr_to_scan--;
 		freed++;
-		head = free_dquots.prev;
 	}
 	spin_unlock(&dq_list_lock);
 	return freed;

fs/select.c+0−23

@@ -34,29 +34,6 @@ · 33 unmodified lines
34		34
35	#include <linux/uaccess.h>	35	#include <linux/uaccess.h>
36		36
37	__poll_t vfs_poll(struct file file, struct poll_table_struct pt)
38	{
39	if (file->f_op->poll) {
40	return file->f_op->poll(file, pt);
41	} else if (file_has_poll_mask(file)) {
42	unsigned int events = poll_requested_events(pt);
43	struct wait_queue_head *head;
44
45	if (pt && pt->_qproc) {
46	head = file->f_op->get_poll_head(file, events);
47	if (!head)
48	return DEFAULT_POLLMASK;
49	if (IS_ERR(head))
50	return EPOLLERR;
51	pt->_qproc(file, head, pt);
52	}
53
54	return file->f_op->poll_mask(file, events);
55	} else {
56	return DEFAULT_POLLMASK;
57	}
58	}
59	EXPORT_SYMBOL_GPL(vfs_poll);
60		37
61	/*	38	/*
62	* Estimate expected accuracy in ns from a timeval.	39	* Estimate expected accuracy in ns from a timeval.

fs/timerfd.c+11−11

 	kfree_rcu(ctx, rcu);
 	return 0;
 }
-static struct wait_queue_head *timerfd_get_poll_head(struct file *file,
+static __poll_t timerfd_poll(struct file *file, poll_table *wait)
-		__poll_t eventmask)
 {
 	struct timerfd_ctx *ctx = file->private_data;
+	__poll_t events = 0;
+	unsigned long flags;
-	return &ctx->wqh;
+	poll_wait(file, &ctx->wqh, wait);
-}
-static __poll_t timerfd_poll_mask(struct file *file, __poll_t eventmask)
+	spin_lock_irqsave(&ctx->wqh.lock, flags);
-{
+	if (ctx->ticks)
-	struct timerfd_ctx *ctx = file->private_data;
+		events |= EPOLLIN;
+	spin_unlock_irqrestore(&ctx->wqh.lock, flags);
-	return ctx->ticks ? EPOLLIN : 0;
+	return events;
 }
 static ssize_t timerfd_read(struct file *file, char __user *buf, size_t count,
 static const struct file_operations timerfd_fops = {
 	.release	= timerfd_release,
-	.get_poll_head	= timerfd_get_poll_head,
+	.poll		= timerfd_poll,
-	.poll_mask	= timerfd_poll_mask,
 	.read		= timerfd_read,
 	.llseek		= noop_llseek,
 	.show_fdinfo	= timerfd_show,

fs/udf/balloc.c+2−3

 			udf_write_aext(table, &epos, &eloc,
 					(etype << 30) | elen, 1);
 		} else
-			udf_delete_aext(table, epos, eloc,
+			udf_delete_aext(table, epos);
-					(etype << 30) | elen);
 	} else {
 		alloc_count = 0;
 	}
 	if (goal_elen)
 		udf_write_aext(table, &goal_epos, &goal_eloc, goal_elen, 1);
 	else
-		udf_delete_aext(table, goal_epos, goal_eloc, goal_elen);
+		udf_delete_aext(table, goal_epos);
 	brelse(goal_epos.bh);
 	udf_add_free_space(sb, partition, -1);

fs/udf/directory.c+4−4

 			       fibh->ebh->b_data,
 			       sizeof(struct fileIdentDesc) + fibh->soffset);
-			fi_len = (sizeof(struct fileIdentDesc) +
+			fi_len = udf_dir_entry_len(cfi);
-				  cfi->lengthFileIdent +
-				  le16_to_cpu(cfi->lengthOfImpUse) + 3) & ~3;
 			*nf_pos += fi_len - (fibh->eoffset - fibh->soffset);
 			fibh->eoffset = fibh->soffset + fi_len;
 		} else {
 			       sizeof(struct fileIdentDesc));
 		}
 	}
+	/* Got last entry outside of dir size - fs is corrupted! */
+	if (*nf_pos > dir->i_size)
+		return NULL;
 	return fi;
 }

fs/udf/inode.c+4−4

 	if (startnum > endnum) {
 		for (i = 0; i < (startnum - endnum); i++)
-			udf_delete_aext(inode, *epos, laarr[i].extLocation,
+			udf_delete_aext(inode, *epos);
-					laarr[i].extLength);
 	} else if (startnum < endnum) {
 		for (i = 0; i < (endnum - startnum); i++) {
 			udf_insert_aext(inode, *epos, laarr[i].extLocation,
 	return (nelen >> 30);
 }
-int8_t udf_delete_aext(struct inode *inode, struct extent_position epos,
+int8_t udf_delete_aext(struct inode *inode, struct extent_position epos)
-		       struct kernel_lb_addr eloc, uint32_t elen)
 {
 	struct extent_position oepos;
 	int adsize;
 	int8_t etype;
 	struct allocExtDesc *aed;
 	struct udf_inode_info *iinfo;
+	struct kernel_lb_addr eloc;
+	uint32_t elen;
 	if (epos.bh) {
 		get_bh(epos.bh);

fs/udf/namei.c+3−11

 	loff_t f_pos;
 	loff_t size = udf_ext0_offset(dir) + dir->i_size;
 	int nfidlen;
-	uint8_t lfi;
-	uint16_t liu;
 	udf_pblk_t block;
 	struct kernel_lb_addr eloc;
 	uint32_t elen = 0;
 		namelen = 0;
 	}
-	nfidlen = (sizeof(struct fileIdentDesc) + namelen + 3) & ~3;
+	nfidlen = ALIGN(sizeof(struct fileIdentDesc) + namelen, UDF_NAME_PAD);
 	f_pos = udf_ext0_offset(dir);
 			goto out_err;
 		}
-		liu = le16_to_cpu(cfi->lengthOfImpUse);
-		lfi = cfi->lengthFileIdent;
 		if ((cfi->fileCharacteristics & FID_FILE_CHAR_DELETED) != 0) {
-			if (((sizeof(struct fileIdentDesc) +
+			if (udf_dir_entry_len(cfi) == nfidlen) {
-					liu + lfi + 3) & ~3) == nfidlen) {
 				cfi->descTag.tagSerialNum = cpu_to_le16(1);
 				cfi->fileVersionNum = cpu_to_le16(1);
 				cfi->fileCharacteristics = 0;
 	if (dir_fi) {
 		dir_fi->icb.extLocation = cpu_to_lelb(UDF_I(new_dir)->i_location);
-		udf_update_tag((char *)dir_fi,
+		udf_update_tag((char *)dir_fi, udf_dir_entry_len(dir_fi));
-				(sizeof(struct fileIdentDesc) +
-				le16_to_cpu(dir_fi->lengthOfImpUse) + 3) & ~3);
 		if (old_iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB)
 			mark_inode_dirty(old_inode);
 		else

fs/udf/udfdecl.h+7−2

 extern int udf_write_fi(struct inode *inode, struct fileIdentDesc *,
 			struct fileIdentDesc *, struct udf_fileident_bh *,
 			uint8_t *, uint8_t *);
+static inline unsigned int udf_dir_entry_len(struct fileIdentDesc *cfi)
+{
+	return ALIGN(sizeof(struct fileIdentDesc) +
+		le16_to_cpu(cfi->lengthOfImpUse) + cfi->lengthFileIdent,
+		UDF_NAME_PAD);
+}
 /* file.c */
 extern long udf_ioctl(struct file *, unsigned int, unsigned long);
 			struct kernel_lb_addr *, uint32_t, int);
 extern void udf_write_aext(struct inode *, struct extent_position *,
 			   struct kernel_lb_addr *, uint32_t, int);
-extern int8_t udf_delete_aext(struct inode *, struct extent_position,
+extern int8_t udf_delete_aext(struct inode *, struct extent_position);
-			      struct kernel_lb_addr, uint32_t);
 extern int8_t udf_next_aext(struct inode *, struct extent_position *,
 			    struct kernel_lb_addr *, uint32_t *, int);
 extern int8_t udf_current_aext(struct inode *, struct extent_position *,

fs/xfs/libxfs/xfs_ag_resv.c+27−4

 	error = xfs_mod_fdblocks(pag->pag_mount, oldresv, true);
 	resv->ar_reserved = 0;
 	resv->ar_asked = 0;
+	resv->ar_orig_reserved = 0;
 	if (error)
 		trace_xfs_ag_resv_free_error(pag->pag_mount, pag->pag_agno,
 	struct xfs_mount		*mp = pag->pag_mount;
 	struct xfs_ag_resv		*resv;
 	int				error;
-	xfs_extlen_t			reserved;
+	xfs_extlen_t			hidden_space;
 	if (used > ask)
 		ask = used;
-	reserved = ask - used;
-	error = xfs_mod_fdblocks(mp, -(int64_t)reserved, true);
+	switch (type) {
+	case XFS_AG_RESV_RMAPBT:
+		/*
+		 * Space taken by the rmapbt is not subtracted from fdblocks
+		 * because the rmapbt lives in the free space.  Here we must
+		 * subtract the entire reservation from fdblocks so that we
+		 * always have blocks available for rmapbt expansion.
+		 */
+		hidden_space = ask;
+		break;
+	case XFS_AG_RESV_METADATA:
+		/*
+		 * Space taken by all other metadata btrees are accounted
+		 * on-disk as used space.  We therefore only hide the space
+		 * that is reserved but not used by the trees.
+		 */
+		hidden_space = ask - used;
+		break;
+	default:
+		ASSERT(0);
+		return -EINVAL;
+	}
+	error = xfs_mod_fdblocks(mp, -(int64_t)hidden_space, true);
 	if (error) {
 		trace_xfs_ag_resv_init_error(pag->pag_mount, pag->pag_agno,
 				error, _RET_IP_);
 	resv = xfs_perag_resv(pag, type);
 	resv->ar_asked = ask;
-	resv->ar_reserved = resv->ar_orig_reserved = reserved;
+	resv->ar_orig_reserved = hidden_space;
+	resv->ar_reserved = ask - used;
 	trace_xfs_ag_resv_init(pag, type, ask);
 	return 0;

fs/xfs/libxfs/xfs_bmap.c+26−0

@@ -5780,6 +5780,32 @@ del_cursor: · 5779 unmodified lines
5780	return error;	5780	return error;
5781	}	5781	}
5782		5782
		5783	/* Make sure we won't be right-shifting an extent past the maximum bound. */
		5784	int
		5785	xfs_bmap_can_insert_extents(
		5786	struct xfs_inode *ip,
		5787	xfs_fileoff_t off,
		5788	xfs_fileoff_t shift)
		5789	{
		5790	struct xfs_bmbt_irec got;
		5791	int is_empty;
		5792	int error = 0;
		5793
		5794	ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL));
		5795
		5796	if (XFS_FORCED_SHUTDOWN(ip->i_mount))
		5797	return -EIO;
		5798
		5799	xfs_ilock(ip, XFS_ILOCK_EXCL);
		5800	error = xfs_bmap_last_extent(NULL, ip, XFS_DATA_FORK, &got, &is_empty);
		5801	if (!error && !is_empty && got.br_startoff >= off &&
		5802	((got.br_startoff + shift) & BMBT_STARTOFF_MASK) < got.br_startoff)
		5803	error = -EINVAL;
		5804	xfs_iunlock(ip, XFS_ILOCK_EXCL);
		5805
		5806	return error;
		5807	}
		5808
5783	int	5809	int
5784	xfs_bmap_insert_extents(	5810	xfs_bmap_insert_extents(
5785	struct xfs_trans *tp,	5811	struct xfs_trans *tp,

fs/xfs/libxfs/xfs_bmap.h+2−0

 		xfs_fileoff_t *next_fsb, xfs_fileoff_t offset_shift_fsb,
 		bool *done, xfs_fsblock_t *firstblock,
 		struct xfs_defer_ops *dfops);
+int	xfs_bmap_can_insert_extents(struct xfs_inode *ip, xfs_fileoff_t off,
+		xfs_fileoff_t shift);
 int	xfs_bmap_insert_extents(struct xfs_trans *tp, struct xfs_inode *ip,
 		xfs_fileoff_t *next_fsb, xfs_fileoff_t offset_shift_fsb,
 		bool *done, xfs_fileoff_t stop_fsb, xfs_fsblock_t *firstblock,

fs/xfs/libxfs/xfs_format.h+5−0

 		XFS_DFORK_DSIZE(dip, mp) : \
 		XFS_DFORK_ASIZE(dip, mp))
+#define XFS_DFORK_MAXEXT(dip, mp, w) \
+	(XFS_DFORK_SIZE(dip, mp, w) / sizeof(struct xfs_bmbt_rec))
 /*
  * Return pointers to the data or attribute forks.
  */
 #define BMBT_STARTBLOCK_BITLEN	52
 #define BMBT_BLOCKCOUNT_BITLEN	21
+#define BMBT_STARTOFF_MASK	((1ULL << BMBT_STARTOFF_BITLEN) - 1)
 typedef struct xfs_bmbt_rec {
 	__be64			l0, l1;
 } xfs_bmbt_rec_t;

fs/xfs/libxfs/xfs_inode_buf.c+47−29

 	}
 }
+static xfs_failaddr_t
+xfs_dinode_verify_fork(
+	struct xfs_dinode	*dip,
+	struct xfs_mount	*mp,
+	int			whichfork)
+{
+	uint32_t		di_nextents = XFS_DFORK_NEXTENTS(dip, whichfork);
+	switch (XFS_DFORK_FORMAT(dip, whichfork)) {
+	case XFS_DINODE_FMT_LOCAL:
+		/*
+		 * no local regular files yet
+		 */
+		if (whichfork == XFS_DATA_FORK) {
+			if (S_ISREG(be16_to_cpu(dip->di_mode)))
+				return __this_address;
+			if (be64_to_cpu(dip->di_size) >
+					XFS_DFORK_SIZE(dip, mp, whichfork))
+				return __this_address;
+		}
+		if (di_nextents)
+			return __this_address;
+		break;
+	case XFS_DINODE_FMT_EXTENTS:
+		if (di_nextents > XFS_DFORK_MAXEXT(dip, mp, whichfork))
+			return __this_address;
+		break;
+	case XFS_DINODE_FMT_BTREE:
+		if (whichfork == XFS_ATTR_FORK) {
+			if (di_nextents > MAXAEXTNUM)
+				return __this_address;
+		} else if (di_nextents > MAXEXTNUM) {
+			return __this_address;
+		}
+		break;
+	default:
+		return __this_address;
+	}
+	return NULL;
+}
 xfs_failaddr_t
 xfs_dinode_verify(
 	struct xfs_mount	*mp,
 	case S_IFREG:
 	case S_IFLNK:
 	case S_IFDIR:
-		switch (dip->di_format) {
+		fa = xfs_dinode_verify_fork(dip, mp, XFS_DATA_FORK);
-		case XFS_DINODE_FMT_LOCAL:
+		if (fa)
-			/*
+			return fa;
-			 * no local regular files yet
-			 */
-			if (S_ISREG(mode))
-				return __this_address;
-			if (di_size > XFS_DFORK_DSIZE(dip, mp))
-				return __this_address;
-			if (dip->di_nextents)
-				return __this_address;
-			/* fall through */
-		case XFS_DINODE_FMT_EXTENTS:
-		case XFS_DINODE_FMT_BTREE:
-			break;
-		default:
-			return __this_address;
-		}
 		break;
 	case 0:
 		/* Uninitialized inode ok. */
 	}
 	if (XFS_DFORK_Q(dip)) {
-		switch (dip->di_aformat) {
+		fa = xfs_dinode_verify_fork(dip, mp, XFS_ATTR_FORK);
-		case XFS_DINODE_FMT_LOCAL:
+		if (fa)
-			if (dip->di_anextents)
+			return fa;
-				return __this_address;
-		/* fall through */
-		case XFS_DINODE_FMT_EXTENTS:
-		case XFS_DINODE_FMT_BTREE:
-			break;
-		default:
-			return __this_address;
-		}
 	} else {
 		/*
 		 * If there is no fork offset, this may be a freshly-made inode

fs/xfs/libxfs/xfs_rtbitmap.c+2−2

@@ -1029,8 +1029,8 @@ xfs_rtalloc_query_range( · 1028 unmodified lines
1029	if (low_rec->ar_startext >= mp->m_sb.sb_rextents \|\|	1029	if (low_rec->ar_startext >= mp->m_sb.sb_rextents \|\|
1030	low_rec->ar_startext == high_rec->ar_startext)	1030	low_rec->ar_startext == high_rec->ar_startext)
1031	return 0;	1031	return 0;
1032	if (high_rec->ar_startext >= mp->m_sb.sb_rextents)	1032	if (high_rec->ar_startext > mp->m_sb.sb_rextents)
1033	high_rec->ar_startext = mp->m_sb.sb_rextents - 1;	1033	high_rec->ar_startext = mp->m_sb.sb_rextents;
1034		1034
1035	/* Iterate the bitmap, looking for discrepancies. */	1035	/* Iterate the bitmap, looking for discrepancies. */
1036	rtstart = low_rec->ar_startext;	1036	rtstart = low_rec->ar_startext;

fs/xfs/xfs_bmap_util.c+52−54

 }
 /*
- * dead simple method of punching delalyed allocation blocks from a range in
+ * Dead simple method of punching delalyed allocation blocks from a range in
- * the inode. Walks a block at a time so will be slow, but is only executed in
+ * the inode.  This will always punch out both the start and end blocks, even
- * rare error cases so the overhead is not critical. This will always punch out
+ * if the ranges only partially overlap them, so it is up to the caller to
- * both the start and end blocks, even if the ranges only partially overlap
+ * ensure that partial blocks are not passed in.
- * them, so it is up to the caller to ensure that partial blocks are not
- * passed in.
  */
 int
 xfs_bmap_punch_delalloc_range(
 	xfs_fileoff_t		start_fsb,
 	xfs_fileoff_t		length)
 {
-	xfs_fileoff_t		remaining = length;
+	struct xfs_ifork	*ifp = &ip->i_df;
+	xfs_fileoff_t		end_fsb = start_fsb + length;
+	struct xfs_bmbt_irec	got, del;
+	struct xfs_iext_cursor	icur;
 	int			error = 0;
 	ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
-	do {
+	if (!(ifp->if_flags & XFS_IFEXTENTS)) {
-		int		done;
+		error = xfs_iread_extents(NULL, ip, XFS_DATA_FORK);
-		xfs_bmbt_irec_t	imap;
+		if (error)
-		int		nimaps = 1;
+			return error;
-		xfs_fsblock_t	firstblock;
+	}
-		struct xfs_defer_ops dfops;
-		/*
+	if (!xfs_iext_lookup_extent_before(ip, ifp, &end_fsb, &icur, &got))
-		 * Map the range first and check that it is a delalloc extent
+		return 0;
-		 * before trying to unmap the range. Otherwise we will be
-		 * trying to remove a real extent (which requires a
-		 * transaction) or a hole, which is probably a bad idea...
-		 */
-		error = xfs_bmapi_read(ip, start_fsb, 1, &imap, &nimaps,
-				       XFS_BMAPI_ENTIRE);
-		if (error) {
+	while (got.br_startoff + got.br_blockcount > start_fsb) {
-			/* something screwed, just bail */
+		del = got;
-			if (!XFS_FORCED_SHUTDOWN(ip->i_mount)) {
+		xfs_trim_extent(&del, start_fsb, length);
-				xfs_alert(ip->i_mount,
-			"Failed delalloc mapping lookup ino %lld fsb %lld.",
-						ip->i_ino, start_fsb);
-			}
-			break;
-		}
-		if (!nimaps) {
-			/* nothing there */
-			goto next_block;
-		}
-		if (imap.br_startblock != DELAYSTARTBLOCK) {
-			/* been converted, ignore */
-			goto next_block;
-		}
-		WARN_ON(imap.br_blockcount == 0);
 		/*
-		 * Note: while we initialise the firstblock/dfops pair, they
+		 * A delete can push the cursor forward. Step back to the
-		 * should never be used because blocks should never be
+		 * previous extent on non-delalloc or extents outside the
-		 * allocated or freed for a delalloc extent and hence we need
+		 * target range.
-		 * don't cancel or finish them after the xfs_bunmapi() call.
 		 */
-		xfs_defer_init(&dfops, &firstblock);
+		if (!del.br_blockcount ||
-		error = xfs_bunmapi(NULL, ip, start_fsb, 1, 0, 1, &firstblock,
+		    !isnullstartblock(del.br_startblock)) {
-					&dfops, &done);
+			if (!xfs_iext_prev_extent(ifp, &icur, &got))
-		if (error)
+				break;
-			break;
+			continue;
+		}
-		ASSERT(!xfs_defer_has_unfinished_work(&dfops));
+		error = xfs_bmap_del_extent_delay(ip, XFS_DATA_FORK, &icur,
-next_block:
+						  &got, &del);
-		start_fsb++;
+		if (error || !xfs_iext_get_extent(ifp, &icur, &got))
-		remaining--;
+			break;
-	} while(remaining > 0);
+	}
 	return error;
 }
 		return 0;
 	if (offset + len > XFS_ISIZE(ip))
 		len = XFS_ISIZE(ip) - offset;
-	return iomap_zero_range(VFS_I(ip), offset, len, NULL, &xfs_iomap_ops);
+	error = iomap_zero_range(VFS_I(ip), offset, len, NULL, &xfs_iomap_ops);
+	if (error)
+		return error;
+	/*
+	 * If we zeroed right up to EOF and EOF straddles a page boundary we
+	 * must make sure that the post-EOF area is also zeroed because the
+	 * page could be mmap'd and iomap_zero_range doesn't do that for us.
+	 * Writeback of the eof page will do this, albeit clumsily.
+	 */
+	if (offset + len >= XFS_ISIZE(ip) && ((offset + len) & PAGE_MASK)) {
+		error = filemap_write_and_wait_range(VFS_I(ip)->i_mapping,
+				(offset + len) & ~PAGE_MASK, LLONG_MAX);
+	}
+	return error;
 }
 /*
 	trace_xfs_insert_file_space(ip);
+	error = xfs_bmap_can_insert_extents(ip, stop_fsb, shift_fsb);
+	if (error)
+		return error;
 	error = xfs_prepare_shift(ip, offset);
 	if (error)
 		return error;

fs/xfs/xfs_fsmap.c+2−2

@@ -513,8 +513,8 @@ xfs_getfsmap_rtdev_rtbitmap_query( · 512 unmodified lines
513	struct xfs_trans *tp,	513	struct xfs_trans *tp,
514	struct xfs_getfsmap_info *info)	514	struct xfs_getfsmap_info *info)
515	{	515	{
516	struct xfs_rtalloc_rec alow;	516	struct xfs_rtalloc_rec alow = { 0 };
517	struct xfs_rtalloc_rec ahigh;	517	struct xfs_rtalloc_rec ahigh = { 0 };
518	int error;	518	int error;
519		519
520	xfs_ilock(tp->t_mountp->m_rbmip, XFS_ILOCK_SHARED);	520	xfs_ilock(tp->t_mountp->m_rbmip, XFS_ILOCK_SHARED);

fs/xfs/xfs_fsops.c+1−1

@@ -387,7 +387,7 @@ xfs_reserve_blocks( · 386 unmodified lines
387	do {	387	do {
388	free = percpu_counter_sum(&mp->m_fdblocks) -	388	free = percpu_counter_sum(&mp->m_fdblocks) -
389	mp->m_alloc_set_aside;	389	mp->m_alloc_set_aside;
390	if (!free)	390	if (free <= 0)
391	break;	391	break;
392		392
393	delta = request - mp->m_resblks;	393	delta = request - mp->m_resblks;

fs/xfs/xfs_inode.c+21−36

 	struct xfs_inode	*cip;
 	int			nr_found;
 	int			clcount = 0;
-	int			bufwasdelwri;
 	int			i;
 	pag = xfs_perag_get(mp, XFS_INO_TO_AGNO(mp, ip->i_ino));
 	 * inode buffer and shut down the filesystem.
 	 */
 	rcu_read_unlock();
-	/*
-	 * Clean up the buffer.  If it was delwri, just release it --
-	 * brelse can handle it with no problems.  If not, shut down the
-	 * filesystem before releasing the buffer.
-	 */
-	bufwasdelwri = (bp->b_flags & _XBF_DELWRI_Q);
-	if (bufwasdelwri)
-		xfs_buf_relse(bp);
 	xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
-	if (!bufwasdelwri) {
-		/*
-		 * Just like incore_relse: if we have b_iodone functions,
-		 * mark the buffer as an error and call them.  Otherwise
-		 * mark it as stale and brelse.
-		 */
-		if (bp->b_iodone) {
-			bp->b_flags &= ~XBF_DONE;
-			xfs_buf_stale(bp);
-			xfs_buf_ioerror(bp, -EIO);
-			xfs_buf_ioend(bp);
-		} else {
-			xfs_buf_stale(bp);
-			xfs_buf_relse(bp);
-		}
-	}
 	/*
-	 * Unlocks the flush lock
+	 * We'll always have an inode attached to the buffer for completion
+	 * process by the time we are called from xfs_iflush(). Hence we have
+	 * always need to do IO completion processing to abort the inodes
+	 * attached to the buffer.  handle them just like the shutdown case in
+	 * xfs_buf_submit().
 	 */
+	ASSERT(bp->b_iodone);
+	bp->b_flags &= ~XBF_DONE;
+	xfs_buf_stale(bp);
+	xfs_buf_ioerror(bp, -EIO);
+	xfs_buf_ioend(bp);
+	/* abort the corrupt inode, as it was not attached to the buffer */
 	xfs_iflush_abort(cip, false);
 	kmem_free(cilist);
 	xfs_perag_put(pag);
 		xfs_log_force(mp, 0);
 	/*
-	 * inode clustering:
+	 * inode clustering: try to gather other inodes into this write
-	 * see if other inodes can be gathered into this write
+	 *
+	 * Note: Any error during clustering will result in the filesystem
+	 * being shut down and completion callbacks run on the cluster buffer.
+	 * As we have already flushed and attached this inode to the buffer,
+	 * it has already been aborted and released by xfs_iflush_cluster() and
+	 * so we have no further error handling to do here.
 	 */
 	error = xfs_iflush_cluster(ip, bp);
 	if (error)
-		goto cluster_corrupt_out;
+		return error;
 	*bpp = bp;
 	return 0;
 	if (bp)
 		xfs_buf_relse(bp);
 	xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
-cluster_corrupt_out:
-	error = -EFSCORRUPTED;
 abort_out:
-	/*
+	/* abort the corrupt inode, as it was not attached to the buffer */
-	 * Unlocks the flush lock
-	 */
 	xfs_iflush_abort(ip, false);
 	return error;
 }

fs/xfs/xfs_iomap.c+14−1

 	unsigned		*lockmode)
 {
 	unsigned		mode = XFS_ILOCK_SHARED;
+	bool			is_write = flags & (IOMAP_WRITE | IOMAP_ZERO);
 	/*
 	 * COW writes may allocate delalloc space or convert unwritten COW
 	 * extents, so we need to make sure to take the lock exclusively here.
 	 */
-	if (xfs_is_reflink_inode(ip) && (flags & (IOMAP_WRITE | IOMAP_ZERO))) {
+	if (xfs_is_reflink_inode(ip) && is_write) {
 		/*
 		 * FIXME: It could still overwrite on unshared extents and not
 		 * need allocation.
 		mode = XFS_ILOCK_EXCL;
 	}
+relock:
 	if (flags & IOMAP_NOWAIT) {
 		if (!xfs_ilock_nowait(ip, mode))
 			return -EAGAIN;
 		xfs_ilock(ip, mode);
 	}
+	/*
+	 * The reflink iflag could have changed since the earlier unlocked
+	 * check, so if we got ILOCK_SHARED for a write and but we're now a
+	 * reflink inode we have to switch to ILOCK_EXCL and relock.
+	 */
+	if (mode == XFS_ILOCK_SHARED && is_write && xfs_is_reflink_inode(ip)) {
+		xfs_iunlock(ip, mode);
+		mode = XFS_ILOCK_EXCL;
+		goto relock;
+	}
 	*lockmode = mode;
 	return 0;
 }

fs/xfs/xfs_trans.c+6−1

 	if (!(flags & XFS_TRANS_NO_WRITECOUNT))
 		sb_start_intwrite(mp->m_super);
-	WARN_ON(mp->m_super->s_writers.frozen == SB_FREEZE_COMPLETE);
+	/*
+	 * Zero-reservation ("empty") transactions can't modify anything, so
+	 * they're allowed to run while we're frozen.
+	 */
+	WARN_ON(resp->tr_logres > 0 &&
+		mp->m_super->s_writers.frozen == SB_FREEZE_COMPLETE);
 	atomic_inc(&mp->m_active_trans);
 	tp = kmem_zone_zalloc(xfs_trans_zone,

include/acpi/processor.h+1−2

 {
 	return;
 }
-static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr,
+static inline void acpi_processor_ppc_has_changed(struct acpi_processor *pr,
 								int event_flag)
 {
 	static unsigned int printout = 1;
 		       "Consider compiling CPUfreq support into your kernel.\n");
 		printout = 0;
 	}
-	return 0;
 }
 static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit)
 {

include/asm-generic/qspinlock_types.h+1−1

@@ -63,7 +63,7 @@ typedef struct qspinlock { · 62 unmodified lines
63	/*	63	/*
64	* Initializier	64	* Initializier
65	*/	65	*/
66	#define __ARCH_SPIN_LOCK_UNLOCKED { .val = ATOMIC_INIT(0) }	66	#define __ARCH_SPIN_LOCK_UNLOCKED { { .val = ATOMIC_INIT(0) } }
67		67
68	/*	68	/*
69	* Bitfields in the atomic value:	69	* Bitfields in the atomic value:

include/crypto/if_alg.h+2−1

 			int offset, size_t size, int flags);
 void af_alg_free_resources(struct af_alg_async_req *areq);
 void af_alg_async_cb(struct crypto_async_request *_req, int err);
-__poll_t af_alg_poll_mask(struct socket *sock, __poll_t events);
+__poll_t af_alg_poll(struct file *file, struct socket *sock,
+			 poll_table *wait);
 struct af_alg_async_req *af_alg_alloc_areq(struct sock *sk,
 					   unsigned int areqlen);
 int af_alg_get_rsgl(struct sock *sk, struct msghdr *msg, int flags,

include/linux/acpi.h+3−0

@@ -443,6 +443,9 @@ int acpi_check_resource_conflict(const struct resource *res); · 442 unmodified lines
443	int acpi_check_region(resource_size_t start, resource_size_t n,	443	int acpi_check_region(resource_size_t start, resource_size_t n,
444	const char *name);	444	const char *name);
445		445
		446	acpi_status acpi_release_memory(acpi_handle handle, struct resource *res,
		447	u32 level);
		448
446	int acpi_resources_are_enforced(void);	449	int acpi_resources_are_enforced(void);
447		450
448	#ifdef CONFIG_HIBERNATION	451	#ifdef CONFIG_HIBERNATION

include/linux/atmdev.h+15−0

@@ -214,6 +214,7 @@ struct atmphy_ops { · 213 unmodified lines
214	struct atm_skb_data {	214	struct atm_skb_data {
215	struct atm_vcc vcc; / ATM VCC */	215	struct atm_vcc vcc; / ATM VCC */
216	unsigned long atm_options; /* ATM layer options */	216	unsigned long atm_options; /* ATM layer options */
		217	unsigned int acct_truesize; /* truesize accounted to vcc */
217	};	218	};
218		219
219	#define VCC_HTABLE_SIZE 32	220	#define VCC_HTABLE_SIZE 32
@@ -241,6 +242,20 @@ void vcc_insert_socket(struct sock *sk); · 21 unmodified lines
241		242
242	void atm_dev_release_vccs(struct atm_dev *dev);	243	void atm_dev_release_vccs(struct atm_dev *dev);
243		244
		245	static inline void atm_account_tx(struct atm_vcc vcc, struct sk_buff skb)
		246	{
		247	/*
		248	* Because ATM skbs may not belong to a sock (and we don't
		249	* necessarily want to), skb->truesize may be adjusted,
		250	* escaping the hack in pskb_expand_head() which avoids
		251	* doing so for some cases. So stash the value of truesize
		252	* at the time we accounted it, and atm_pop_raw() can use
		253	* that value later, in case it changes.
		254	*/
		255	refcount_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
		256	ATM_SKB(skb)->acct_truesize = skb->truesize;
		257	ATM_SKB(skb)->atm_options = vcc->atm_options;
		258	}
244		259
245	static inline void atm_force_charge(struct atm_vcc *vcc,int truesize)	260	static inline void atm_force_charge(struct atm_vcc *vcc,int truesize)
246	{	261	{

include/linux/backing-dev-defs.h+1−1

  */
 enum wb_state {
 	WB_registered,		/* bdi_register() was done */
-	WB_shutting_down,	/* wb_shutdown() in progress */
 	WB_writeback_running,	/* Writeback is in progress */
 	WB_has_dirty_io,	/* Dirty inodes on ->b_{dirty|io|more_io} */
 	WB_start_all,		/* nr_pages == 0 (all) work pending */
 #ifdef CONFIG_CGROUP_WRITEBACK
 	struct radix_tree_root cgwb_tree; /* radix tree of active cgroup wbs */
 	struct rb_root cgwb_congested_tree; /* their congested states */
+	struct mutex cgwb_release_mutex;  /* protect shutdown of wb structs */
 #else
 	struct bdi_writeback_congested *wb_congested;
 #endif

include/linux/blkdev.h+2−2

@@ -1119,8 +1119,8 @@ static inline unsigned int blk_max_size_offset(struct request_queue *q, · 1118 unmodified lines
1119	if (!q->limits.chunk_sectors)	1119	if (!q->limits.chunk_sectors)
1120	return q->limits.max_sectors;	1120	return q->limits.max_sectors;
1121		1121
1122	return q->limits.chunk_sectors -	1122	return min(q->limits.max_sectors, (unsigned int)(q->limits.chunk_sectors -
1123	(offset & (q->limits.chunk_sectors - 1));	1123	(offset & (q->limits.chunk_sectors - 1))));
1124	}	1124	}
1125		1125
1126	static inline unsigned int blk_rq_get_max_sectors(struct request *rq,	1126	static inline unsigned int blk_rq_get_max_sectors(struct request *rq,

include/linux/bpf.h+12−0

 /* Map specifics */
 struct xdp_buff;
+struct sk_buff;
 struct bpf_dtab_netdev *__dev_map_lookup_elem(struct bpf_map *map, u32 key);
 void __dev_map_insert_ctx(struct bpf_map *map, u32 index);
 void __dev_map_flush(struct bpf_map *map);
 int dev_map_enqueue(struct bpf_dtab_netdev *dst, struct xdp_buff *xdp,
 		    struct net_device *dev_rx);
+int dev_map_generic_redirect(struct bpf_dtab_netdev *dst, struct sk_buff *skb,
+			     struct bpf_prog *xdp_prog);
 struct bpf_cpu_map_entry *__cpu_map_lookup_elem(struct bpf_map *map, u32 key);
 void __cpu_map_insert_ctx(struct bpf_map *map, u32 index);
 	return 0;
 }
+struct sk_buff;
+static inline int dev_map_generic_redirect(struct bpf_dtab_netdev *dst,
+					   struct sk_buff *skb,
+					   struct bpf_prog *xdp_prog)
+{
+	return 0;
+}
 static inline
 struct bpf_cpu_map_entry *__cpu_map_lookup_elem(struct bpf_map *map, u32 key)
 {

include/linux/compat.h+7−1

  */
 #ifndef COMPAT_SYSCALL_DEFINEx
 #define COMPAT_SYSCALL_DEFINEx(x, name, ...)					\
+	__diag_push();								\
+	__diag_ignore(GCC, 8, "-Wattribute-alias",				\
+		      "Type aliasing is used to sanitize syscall arguments");\
 	asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));	\
 	asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))	\
 		__attribute__((alias(__stringify(__se_compat_sys##name))));	\
 	asmlinkage long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__));	\
 	asmlinkage long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))	\
 	{									\
-		return __do_compat_sys##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__));\
+		long ret = __do_compat_sys##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__));\
+		__MAP(x,__SC_TEST,__VA_ARGS__);					\
+		return ret;							\
 	}									\
+	__diag_pop();								\
 	static inline long __do_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))
 #endif /* COMPAT_SYSCALL_DEFINEx */

include/linux/compiler-gcc.h+25−0

@@ -347,3 +347,28 @@ · 346 unmodified lines
347	#if GCC_VERSION >= 50100	347	#if GCC_VERSION >= 50100
348	#define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1	348	#define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1
349	#endif	349	#endif
		350
		351	/*
		352	* Turn individual warnings and errors on and off locally, depending
		353	* on version.
		354	*/
		355	#define __diag_GCC(version, severity, s) \
		356	__diag_GCC_ ## version(__diag_GCC_ ## severity s)
		357
		358	/* Severity used in pragma directives */
		359	#define __diag_GCC_ignore ignored
		360	#define __diag_GCC_warn warning
		361	#define __diag_GCC_error error
		362
		363	/* Compilers before gcc-4.6 do not understand "#pragma GCC diagnostic push" */
		364	#if GCC_VERSION >= 40600
		365	#define __diag_str1(s) #s
		366	#define __diag_str(s) __diag_str1(s)
		367	#define __diag(s) _Pragma(__diag_str(GCC diagnostic s))
		368	#endif
		369
		370	#if GCC_VERSION >= 80000
		371	#define __diag_GCC_8(s) __diag(s)
		372	#else
		373	#define __diag_GCC_8(s)
		374	#endif

include/linux/compiler_types.h+18−0

@@ -271,4 +271,22 @@ struct ftrace_likely_data { · 270 unmodified lines
271	# define __native_word(t) (sizeof(t) == sizeof(char) \|\| sizeof(t) == sizeof(short) \|\| sizeof(t) == sizeof(int) \|\| sizeof(t) == sizeof(long))	271	# define __native_word(t) (sizeof(t) == sizeof(char) \|\| sizeof(t) == sizeof(short) \|\| sizeof(t) == sizeof(int) \|\| sizeof(t) == sizeof(long))
272	#endif	272	#endif
273		273
		274	#ifndef __diag
		275	#define __diag(string)
		276	#endif
		277
		278	#ifndef __diag_GCC
		279	#define __diag_GCC(version, severity, string)
		280	#endif
		281
		282	#define __diag_push() __diag(push)
		283	#define __diag_pop() __diag(pop)
		284
		285	#define __diag_ignore(compiler, version, option, comment) \
		286	__diag_ ## compiler(version, ignore, option)
		287	#define __diag_warn(compiler, version, option, comment) \
		288	__diag_ ## compiler(version, warn, option)
		289	#define __diag_error(compiler, version, option, comment) \
		290	__diag_ ## compiler(version, error, option)
		291
274	#endif /* __LINUX_COMPILER_TYPES_H */	292	#endif /* __LINUX_COMPILER_TYPES_H */

include/linux/dax.h+1−1

@@ -135,7 +135,7 @@ void dax_flush(struct dax_device dax_dev, void addr, size_t size); · 134 unmodified lines
135		135
136	ssize_t dax_iomap_rw(struct kiocb iocb, struct iov_iter iter,	136	ssize_t dax_iomap_rw(struct kiocb iocb, struct iov_iter iter,
137	const struct iomap_ops *ops);	137	const struct iomap_ops *ops);
138	int dax_iomap_fault(struct vm_fault *vmf, enum page_entry_size pe_size,	138	vm_fault_t dax_iomap_fault(struct vm_fault *vmf, enum page_entry_size pe_size,
139	pfn_t pfnp, int errp, const struct iomap_ops *ops);	139	pfn_t pfnp, int errp, const struct iomap_ops *ops);
140	vm_fault_t dax_finish_sync_fault(struct vm_fault *vmf,	140	vm_fault_t dax_finish_sync_fault(struct vm_fault *vmf,
141	enum page_entry_size pe_size, pfn_t pfn);	141	enum page_entry_size pe_size, pfn_t pfn);

include/linux/dma-contiguous.h+1−1

@@ -48,7 +48,7 @@ · 47 unmodified lines
48	* CMA should not be used by the device drivers directly. It is	48	* CMA should not be used by the device drivers directly. It is
49	* only a helper framework for dma-mapping subsystem.	49	* only a helper framework for dma-mapping subsystem.
50	*	50	*
51	* For more information, see kernel-docs in drivers/base/dma-contiguous.c	51	* For more information, see kernel-docs in kernel/dma/contiguous.c
52	*/	52	*/
53		53
54	#ifdef __KERNEL__	54	#ifdef __KERNEL__

include/linux/filter.h+60−23

@@ -19,6 +19,7 @@ · 18 unmodified lines
19	#include <linux/cryptohash.h>	19	#include <linux/cryptohash.h>
20	#include <linux/set_memory.h>	20	#include <linux/set_memory.h>
21	#include <linux/kallsyms.h>	21	#include <linux/kallsyms.h>
		22	#include <linux/if_vlan.h>
22		23
23	#include <net/sch_generic.h>	24	#include <net/sch_generic.h>
24		25
@@ -469,8 +470,11 @@ struct sock_fprog_kern { · 444 unmodified lines
469	};	470	};
470		471
471	struct bpf_binary_header {	472	struct bpf_binary_header {
472	unsigned int pages;	473	u16 pages;
473	u8 image[];	474	u16 locked:1;
		475
		476	/* Some arches need word alignment for their instructions */
		477	u8 image[] __aligned(4);
474	};	478	};
475		479
476	struct bpf_prog {	480	struct bpf_prog {
@@ -671,15 +675,18 @@ bpf_ctx_narrow_access_ok(u32 off, u32 size, u32 size_default) · 194 unmodified lines
671		675
672	#define bpf_classic_proglen(fprog) (fprog->len * sizeof(fprog->filter[0]))	676	#define bpf_classic_proglen(fprog) (fprog->len * sizeof(fprog->filter[0]))
673		677
674	#ifdef CONFIG_ARCH_HAS_SET_MEMORY
675	static inline void bpf_prog_lock_ro(struct bpf_prog *fp)	678	static inline void bpf_prog_lock_ro(struct bpf_prog *fp)
676	{	679	{
		680	#ifdef CONFIG_ARCH_HAS_SET_MEMORY
677	fp->locked = 1;	681	fp->locked = 1;
678	WARN_ON_ONCE(set_memory_ro((unsigned long)fp, fp->pages));	682	if (set_memory_ro((unsigned long)fp, fp->pages))
		683	fp->locked = 0;
		684	#endif
679	}	685	}
680		686
681	static inline void bpf_prog_unlock_ro(struct bpf_prog *fp)	687	static inline void bpf_prog_unlock_ro(struct bpf_prog *fp)
682	{	688	{
		689	#ifdef CONFIG_ARCH_HAS_SET_MEMORY
683	if (fp->locked) {	690	if (fp->locked) {
684	WARN_ON_ONCE(set_memory_rw((unsigned long)fp, fp->pages));	691	WARN_ON_ONCE(set_memory_rw((unsigned long)fp, fp->pages));
685	/* In case set_memory_rw() fails, we want to be the first	692	/* In case set_memory_rw() fails, we want to be the first
@@ -687,34 +694,30 @@ static inline void bpf_prog_unlock_ro(struct bpf_prog *fp) · 1 unmodified line
687	*/	694	*/
688	fp->locked = 0;	695	fp->locked = 0;
689	}	696	}
		697	#endif
690	}	698	}
691		699
692	static inline void bpf_jit_binary_lock_ro(struct bpf_binary_header *hdr)	700	static inline void bpf_jit_binary_lock_ro(struct bpf_binary_header *hdr)
693	{	701	{
694	WARN_ON_ONCE(set_memory_ro((unsigned long)hdr, hdr->pages));	702	#ifdef CONFIG_ARCH_HAS_SET_MEMORY
695	}	703	hdr->locked = 1;
696		704	if (set_memory_ro((unsigned long)hdr, hdr->pages))
697	static inline void bpf_jit_binary_unlock_ro(struct bpf_binary_header *hdr)	705	hdr->locked = 0;
698	{	706	#endif
699	WARN_ON_ONCE(set_memory_rw((unsigned long)hdr, hdr->pages));
700	}
701	#else
702	static inline void bpf_prog_lock_ro(struct bpf_prog *fp)
703	{
704	}
705
706	static inline void bpf_prog_unlock_ro(struct bpf_prog *fp)
707	{
708	}
709
710	static inline void bpf_jit_binary_lock_ro(struct bpf_binary_header *hdr)
711	{
712	}	707	}
713		708
714	static inline void bpf_jit_binary_unlock_ro(struct bpf_binary_header *hdr)	709	static inline void bpf_jit_binary_unlock_ro(struct bpf_binary_header *hdr)
715	{	710	{
		711	#ifdef CONFIG_ARCH_HAS_SET_MEMORY
		712	if (hdr->locked) {
		713	WARN_ON_ONCE(set_memory_rw((unsigned long)hdr, hdr->pages));
		714	/* In case set_memory_rw() fails, we want to be the first
		715	* to crash here instead of some random place later on.
		716	*/
		717	hdr->locked = 0;
		718	}
		719	#endif
716	}	720	}
717	#endif /* CONFIG_ARCH_HAS_SET_MEMORY */
718		721
719	static inline struct bpf_binary_header *	722	static inline struct bpf_binary_header *
720	bpf_jit_binary_hdr(const struct bpf_prog *fp)	723	bpf_jit_binary_hdr(const struct bpf_prog *fp)
@@ -725,6 +728,22 @@ bpf_jit_binary_hdr(const struct bpf_prog *fp) · 4 unmodified lines
725	return (void *)addr;	728	return (void *)addr;
726	}	729	}
727		730
		731	#ifdef CONFIG_ARCH_HAS_SET_MEMORY
		732	static inline int bpf_prog_check_pages_ro_single(const struct bpf_prog *fp)
		733	{
		734	if (!fp->locked)
		735	return -ENOLCK;
		736	if (fp->jited) {
		737	const struct bpf_binary_header *hdr = bpf_jit_binary_hdr(fp);
		738
		739	if (!hdr->locked)
		740	return -ENOLCK;
		741	}
		742
		743	return 0;
		744	}
		745	#endif
		746
728	int sk_filter_trim_cap(struct sock sk, struct sk_buff skb, unsigned int cap);	747	int sk_filter_trim_cap(struct sock sk, struct sk_buff skb, unsigned int cap);
729	static inline int sk_filter(struct sock sk, struct sk_buff skb)	748	static inline int sk_filter(struct sock sk, struct sk_buff skb)
730	{	749	{
@@ -786,6 +805,21 @@ static inline bool bpf_dump_raw_ok(void) · 55 unmodified lines
786	struct bpf_prog bpf_patch_insn_single(struct bpf_prog prog, u32 off,	805	struct bpf_prog bpf_patch_insn_single(struct bpf_prog prog, u32 off,
787	const struct bpf_insn *patch, u32 len);	806	const struct bpf_insn *patch, u32 len);
788		807
		808	static inline int __xdp_generic_ok_fwd_dev(struct sk_buff *skb,
		809	struct net_device *fwd)
		810	{
		811	unsigned int len;
		812
		813	if (unlikely(!(fwd->flags & IFF_UP)))
		814	return -ENETDOWN;
		815
		816	len = fwd->mtu + fwd->hard_header_len + VLAN_HLEN;
		817	if (skb->len > len)
		818	return -EMSGSIZE;
		819
		820	return 0;
		821	}
		822
789	/* The pair of xdp_do_redirect and xdp_do_flush_map MUST be called in the	823	/* The pair of xdp_do_redirect and xdp_do_flush_map MUST be called in the
790	* same cpu context. Further for best results no more than a single map	824	* same cpu context. Further for best results no more than a single map
791	* for the do_redirect/do_flush pair should be used. This limitation is	825	* for the do_redirect/do_flush pair should be used. This limitation is
@@ -961,6 +995,9 @@ static inline void bpf_prog_kallsyms_del(struct bpf_prog *fp) · 169 unmodified lines
961	}	995	}
962	#endif /* CONFIG_BPF_JIT */	996	#endif /* CONFIG_BPF_JIT */
963		997
		998	void bpf_prog_kallsyms_del_subprogs(struct bpf_prog *fp);
		999	void bpf_prog_kallsyms_del_all(struct bpf_prog *fp);
		1000
964	#define BPF_ANC BIT(15)	1001	#define BPF_ANC BIT(15)
965		1002
966	static inline bool bpf_needs_clear_a(const struct sock_filter *first)	1003	static inline bool bpf_needs_clear_a(const struct sock_filter *first)

include/linux/fs.h+0−2

 	int (*iterate) (struct file *, struct dir_context *);
 	int (*iterate_shared) (struct file *, struct dir_context *);
 	__poll_t (*poll) (struct file *, struct poll_table_struct *);
-	struct wait_queue_head * (*get_poll_head)(struct file *, __poll_t);
-	__poll_t (*poll_mask) (struct file *, __poll_t);
 	long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
 	long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
 	int (*mmap) (struct file *, struct vm_area_struct *);

include/linux/iio/buffer-dma.h+1−1

@@ -141,7 +141,7 @@ int iio_dma_buffer_read(struct iio_buffer *buffer, size_t n, · 140 unmodified lines
141	char __user *user_buffer);	141	char __user *user_buffer);
142	size_t iio_dma_buffer_data_available(struct iio_buffer *buffer);	142	size_t iio_dma_buffer_data_available(struct iio_buffer *buffer);
143	int iio_dma_buffer_set_bytes_per_datum(struct iio_buffer *buffer, size_t bpd);	143	int iio_dma_buffer_set_bytes_per_datum(struct iio_buffer *buffer, size_t bpd);
144	int iio_dma_buffer_set_length(struct iio_buffer *buffer, int length);	144	int iio_dma_buffer_set_length(struct iio_buffer *buffer, unsigned int length);
145	int iio_dma_buffer_request_update(struct iio_buffer *buffer);	145	int iio_dma_buffer_request_update(struct iio_buffer *buffer);
146		146
147	int iio_dma_buffer_init(struct iio_dma_buffer_queue *queue,	147	int iio_dma_buffer_init(struct iio_dma_buffer_queue *queue,

include/linux/input/mt.h+1−1

@@ -100,7 +100,7 @@ static inline bool input_is_mt_axis(int axis) · 99 unmodified lines
100	return axis == ABS_MT_SLOT \|\| input_is_mt_value(axis);	100	return axis == ABS_MT_SLOT \|\| input_is_mt_value(axis);
101	}	101	}
102		102
103	void input_mt_report_slot_state(struct input_dev *dev,	103	bool input_mt_report_slot_state(struct input_dev *dev,
104	unsigned int tool_type, bool active);	104	unsigned int tool_type, bool active);
105		105
106	void input_mt_report_finger_count(struct input_dev *dev, int count);	106	void input_mt_report_finger_count(struct input_dev *dev, int count);

include/linux/irq.h+1−0

@@ -503,6 +503,7 @@ struct irq_chip { · 502 unmodified lines
503	* IRQCHIP_SKIP_SET_WAKE: Skip chip.irq_set_wake(), for this irq chip	503	* IRQCHIP_SKIP_SET_WAKE: Skip chip.irq_set_wake(), for this irq chip
504	* IRQCHIP_ONESHOT_SAFE: One shot does not require mask/unmask	504	* IRQCHIP_ONESHOT_SAFE: One shot does not require mask/unmask
505	* IRQCHIP_EOI_THREADED: Chip requires eoi() on unmask in threaded mode	505	* IRQCHIP_EOI_THREADED: Chip requires eoi() on unmask in threaded mode
		506	* IRQCHIP_SUPPORTS_LEVEL_MSI Chip can provide two doorbells for Level MSIs
506	*/	507	*/
507	enum {	508	enum {
508	IRQCHIP_SET_TYPE_MASKED = (1 << 0),	509	IRQCHIP_SET_TYPE_MASKED = (1 << 0),

include/linux/irqdesc.h+0−5

 	return desc->irq_common_data.handler_data;
 }
-static inline struct msi_desc *irq_desc_get_msi_desc(struct irq_desc *desc)
-{
-	return desc->irq_common_data.msi_desc;
-}
 /*
  * Architectures call this to let the generic IRQ layer
  * handle an interrupt.

include/linux/kernel.h+1−1

@@ -666,7 +666,7 @@ do { \ · 665 unmodified lines
666	* your code. (Extra memory is used for special buffers that are	666	* your code. (Extra memory is used for special buffers that are
667	* allocated when trace_printk() is used.)	667	* allocated when trace_printk() is used.)
668	*	668	*
669	* A little optization trick is done here. If there's only one	669	* A little optimization trick is done here. If there's only one
670	* argument, there's no need to scan the string for printf formats.	670	* argument, there's no need to scan the string for printf formats.
671	* The trace_puts() will suffice. But how can we take advantage of	671	* The trace_puts() will suffice. But how can we take advantage of
672	* using trace_puts() when trace_printk() has only one argument?	672	* using trace_puts() when trace_printk() has only one argument?

include/linux/memory.h+1−0

@@ -38,6 +38,7 @@ struct memory_block { · 37 unmodified lines
38		38
39	int arch_get_memory_phys_device(unsigned long start_pfn);	39	int arch_get_memory_phys_device(unsigned long start_pfn);
40	unsigned long memory_block_size_bytes(void);	40	unsigned long memory_block_size_bytes(void);
		41	int set_memory_block_size_order(unsigned int order);
41		42
42	/* These states are exposed to userspace as text strings in sysfs */	43	/* These states are exposed to userspace as text strings in sysfs */
43	#define MEM_ONLINE (1<<0) /* exposed to userspace */	44	#define MEM_ONLINE (1<<0) /* exposed to userspace */

include/linux/mod_devicetable.h+1−0

@@ -501,6 +501,7 @@ enum dmi_field { · 500 unmodified lines
501	DMI_PRODUCT_VERSION,	501	DMI_PRODUCT_VERSION,
502	DMI_PRODUCT_SERIAL,	502	DMI_PRODUCT_SERIAL,
503	DMI_PRODUCT_UUID,	503	DMI_PRODUCT_UUID,
		504	DMI_PRODUCT_SKU,
504	DMI_PRODUCT_FAMILY,	505	DMI_PRODUCT_FAMILY,
505	DMI_BOARD_VENDOR,	506	DMI_BOARD_VENDOR,
506	DMI_BOARD_NAME,	507	DMI_BOARD_NAME,

include/linux/net.h+0−1

@@ -147,7 +147,6 @@ struct proto_ops { · 146 unmodified lines
147	int (getname) (struct socket sock,	147	int (getname) (struct socket sock,
148	struct sockaddr *addr,	148	struct sockaddr *addr,
149	int peer);	149	int peer);
150	__poll_t (poll_mask) (struct socket sock, __poll_t events);
151	__poll_t (poll) (struct file file, struct socket *sock,	150	__poll_t (poll) (struct file file, struct socket *sock,
152	struct poll_table_struct *wait);	151	struct poll_table_struct *wait);
153	int (ioctl) (struct socket sock, unsigned int cmd,	152	int (ioctl) (struct socket sock, unsigned int cmd,

include/linux/nfs_xdr.h+2−0

@@ -1438,6 +1438,8 @@ enum { · 1437 unmodified lines
1438	NFS_IOHDR_EOF,	1438	NFS_IOHDR_EOF,
1439	NFS_IOHDR_REDO,	1439	NFS_IOHDR_REDO,
1440	NFS_IOHDR_STAT,	1440	NFS_IOHDR_STAT,
		1441	NFS_IOHDR_RESEND_PNFS,
		1442	NFS_IOHDR_RESEND_MDS,
1441	};	1443	};
1442		1444
1443	struct nfs_io_completion;	1445	struct nfs_io_completion;

include/linux/pm_domain.h+3−3

@@ -234,7 +234,7 @@ struct generic_pm_domain of_genpd_remove_last(struct device_node np); · 233 unmodified lines
234	int of_genpd_parse_idle_states(struct device_node *dn,	234	int of_genpd_parse_idle_states(struct device_node *dn,
235	struct genpd_power_state *states, int n);	235	struct genpd_power_state *states, int n);
236	unsigned int of_genpd_opp_to_performance_state(struct device *dev,	236	unsigned int of_genpd_opp_to_performance_state(struct device *dev,
237	struct device_node *opp_node);	237	struct device_node *np);
238		238
239	int genpd_dev_pm_attach(struct device *dev);	239	int genpd_dev_pm_attach(struct device *dev);
240	struct device genpd_dev_pm_attach_by_id(struct device dev,	240	struct device genpd_dev_pm_attach_by_id(struct device dev,
@@ -274,9 +274,9 @@ static inline int of_genpd_parse_idle_states(struct device_node *dn, · 33 unmodified lines
274		274
275	static inline unsigned int	275	static inline unsigned int
276	of_genpd_opp_to_performance_state(struct device *dev,	276	of_genpd_opp_to_performance_state(struct device *dev,
277	struct device_node *opp_node)	277	struct device_node *np)
278	{	278	{
279	return -ENODEV;	279	return 0;
280	}	280	}
281		281
282	static inline int genpd_dev_pm_attach(struct device *dev)	282	static inline int genpd_dev_pm_attach(struct device *dev)

include/linux/poll.h+6−6

 	pt->_key   = ~(__poll_t)0; /* all events enabled */
 }
-static inline bool file_has_poll_mask(struct file *file)
+static inline bool file_can_poll(struct file *file)
 {
-	return file->f_op->get_poll_head && file->f_op->poll_mask;
+	return file->f_op->poll;
 }
-static inline bool file_can_poll(struct file *file)
+static inline __poll_t vfs_poll(struct file *file, struct poll_table_struct *pt)
 {
-	return file->f_op->poll || file_has_poll_mask(file);
+	if (unlikely(!file->f_op->poll))
+		return DEFAULT_POLLMASK;
+	return file->f_op->poll(file, pt);
 }
-__poll_t vfs_poll(struct file *file, struct poll_table_struct *pt);
 struct poll_table_entry {
 	struct file *filp;
 	__poll_t key;

include/linux/refcount.h+3−1

@@ -98,5 +98,7 @@ extern __must_check bool refcount_dec_if_one(refcount_t *r); · 97 unmodified lines
98	extern __must_check bool refcount_dec_not_one(refcount_t *r);	98	extern __must_check bool refcount_dec_not_one(refcount_t *r);
99	extern __must_check bool refcount_dec_and_mutex_lock(refcount_t r, struct mutex lock);	99	extern __must_check bool refcount_dec_and_mutex_lock(refcount_t r, struct mutex lock);
100	extern __must_check bool refcount_dec_and_lock(refcount_t r, spinlock_t lock);	100	extern __must_check bool refcount_dec_and_lock(refcount_t r, spinlock_t lock);
101		101	extern __must_check bool refcount_dec_and_lock_irqsave(refcount_t *r,
		102	spinlock_t *lock,
		103	unsigned long *flags);
102	#endif /* _LINUX_REFCOUNT_H */	104	#endif /* _LINUX_REFCOUNT_H */

include/linux/rmi.h+2−0

@@ -354,6 +354,8 @@ struct rmi_driver_data { · 353 unmodified lines
354	struct mutex irq_mutex;	354	struct mutex irq_mutex;
355	struct input_dev *input;	355	struct input_dev *input;
356		356
		357	struct irq_domain *irqdomain;
		358
357	u8 pdt_props;	359	u8 pdt_props;
358		360
359	u8 num_rx_electrodes;	361	u8 num_rx_electrodes;

include/linux/scatterlist.h+0−18

 #include <asm/io.h>
 struct scatterlist {
-#ifdef CONFIG_DEBUG_SG
-	unsigned long	sg_magic;
-#endif
 	unsigned long	page_link;
 	unsigned int	offset;
 	unsigned int	length;
  *
  */
-#define SG_MAGIC	0x87654321
 #define SG_CHAIN	0x01UL
 #define SG_END		0x02UL
 	 */
 	BUG_ON((unsigned long) page & (SG_CHAIN | SG_END));
 #ifdef CONFIG_DEBUG_SG
-	BUG_ON(sg->sg_magic != SG_MAGIC);
 	BUG_ON(sg_is_chain(sg));
 #endif
 	sg->page_link = page_link | (unsigned long) page;
 static inline struct page *sg_page(struct scatterlist *sg)
 {
 #ifdef CONFIG_DEBUG_SG
-	BUG_ON(sg->sg_magic != SG_MAGIC);
 	BUG_ON(sg_is_chain(sg));
 #endif
 	return (struct page *)((sg)->page_link & ~(SG_CHAIN | SG_END));
  **/
 static inline void sg_mark_end(struct scatterlist *sg)
 {
-#ifdef CONFIG_DEBUG_SG
-	BUG_ON(sg->sg_magic != SG_MAGIC);
-#endif
 	/*
 	 * Set termination bit, clear potential chain bit
 	 */
  **/
 static inline void sg_unmark_end(struct scatterlist *sg)
 {
-#ifdef CONFIG_DEBUG_SG
-	BUG_ON(sg->sg_magic != SG_MAGIC);
-#endif
 	sg->page_link &= ~SG_END;
 }
 static inline void sg_init_marker(struct scatterlist *sgl,
 				  unsigned int nents)
 {
-#ifdef CONFIG_DEBUG_SG
-	unsigned int i;
-	for (i = 0; i < nents; i++)
-		sgl[i].sg_magic = SG_MAGIC;
-#endif
 	sg_mark_end(&sgl[nents - 1]);
 }

include/linux/sched.h+12−11

 		set_tsk_thread_flag(t, TIF_NOTIFY_RESUME);
 }
-void __rseq_handle_notify_resume(struct pt_regs *regs);
+void __rseq_handle_notify_resume(struct ksignal *sig, struct pt_regs *regs);
-static inline void rseq_handle_notify_resume(struct pt_regs *regs)
+static inline void rseq_handle_notify_resume(struct ksignal *ksig,
+					     struct pt_regs *regs)
 {
 	if (current->rseq)
-		__rseq_handle_notify_resume(regs);
+		__rseq_handle_notify_resume(ksig, regs);
 }
-static inline void rseq_signal_deliver(struct pt_regs *regs)
+static inline void rseq_signal_deliver(struct ksignal *ksig,
+				       struct pt_regs *regs)
 {
 	preempt_disable();
 	__set_bit(RSEQ_EVENT_SIGNAL_BIT, &current->rseq_event_mask);
 	preempt_enable();
-	rseq_handle_notify_resume(regs);
+	rseq_handle_notify_resume(ksig, regs);
 }
 /* rseq_preempt() requires preemption to be disabled. */
 /*
  * If parent process has a registered restartable sequences area, the
- * child inherits. Only applies when forking a process, not a thread. In
+ * child inherits. Only applies when forking a process, not a thread.
- * case a parent fork() in the middle of a restartable sequence, set the
- * resume notifier to force the child to retry.
  */
 static inline void rseq_fork(struct task_struct *t, unsigned long clone_flags)
 {
 		t->rseq_len = current->rseq_len;
 		t->rseq_sig = current->rseq_sig;
 		t->rseq_event_mask = current->rseq_event_mask;
-		rseq_preempt(t);
 	}
 }
 static inline void rseq_set_notify_resume(struct task_struct *t)
 {
 }
-static inline void rseq_handle_notify_resume(struct pt_regs *regs)
+static inline void rseq_handle_notify_resume(struct ksignal *ksig,
+					     struct pt_regs *regs)
 {
 }
-static inline void rseq_signal_deliver(struct pt_regs *regs)
+static inline void rseq_signal_deliver(struct ksignal *ksig,
+				       struct pt_regs *regs)
 {
 }
 static inline void rseq_preempt(struct task_struct *t)

include/linux/skbuff.h+2−1

 				    int *peeked, int *off, int *err);
 struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
 				  int *err);
-__poll_t datagram_poll_mask(struct socket *sock, __poll_t events);
+__poll_t datagram_poll(struct file *file, struct socket *sock,
+			   struct poll_table_struct *wait);
 int skb_copy_datagram_iter(const struct sk_buff *from, int offset,
 			   struct iov_iter *to, int size);
 static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset,

include/linux/slub_def.h+4−0

 #ifdef CONFIG_SYSFS
 #define SLAB_SUPPORTS_SYSFS
+void sysfs_slab_unlink(struct kmem_cache *);
 void sysfs_slab_release(struct kmem_cache *);
 #else
+static inline void sysfs_slab_unlink(struct kmem_cache *s)
+{
+}
 static inline void sysfs_slab_release(struct kmem_cache *s)
 {
 }

include/linux/spinlock.h+5−0

 #define atomic_dec_and_lock(atomic, lock) \
 		__cond_lock(lock, _atomic_dec_and_lock(atomic, lock))
+extern int _atomic_dec_and_lock_irqsave(atomic_t *atomic, spinlock_t *lock,
+					unsigned long *flags);
+#define atomic_dec_and_lock_irqsave(atomic, lock, flags) \
+		__cond_lock(lock, _atomic_dec_and_lock_irqsave(atomic, lock, &(flags)))
 int alloc_bucket_spinlocks(spinlock_t **locks, unsigned int *lock_mask,
 			   size_t max_size, unsigned int cpu_mult,
 			   gfp_t gfp);

include/linux/syscalls.h+4−0

  */
 #ifndef __SYSCALL_DEFINEx
 #define __SYSCALL_DEFINEx(x, name, ...)					\
+	__diag_push();							\
+	__diag_ignore(GCC, 8, "-Wattribute-alias",			\
+		      "Type aliasing is used to sanitize syscall arguments");\
 	asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))	\
 		__attribute__((alias(__stringify(__se_sys##name))));	\
 	ALLOW_ERROR_INJECTION(sys##name, ERRNO);			\
 		__PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__));	\
 		return ret;						\
 	}								\
+	__diag_pop();							\
 	static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))
 #endif /* __SYSCALL_DEFINEx */

include/net/bluetooth/bluetooth.h+1−1

@@ -271,7 +271,7 @@ int bt_sock_recvmsg(struct socket sock, struct msghdr msg, size_t len, · 270 unmodified lines
271	int flags);	271	int flags);
272	int bt_sock_stream_recvmsg(struct socket sock, struct msghdr msg,	272	int bt_sock_stream_recvmsg(struct socket sock, struct msghdr msg,
273	size_t len, int flags);	273	size_t len, int flags);
274	__poll_t bt_sock_poll_mask(struct socket *sock, __poll_t events);	274	__poll_t bt_sock_poll(struct file file, struct socket sock, poll_table *wait);
275	int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);	275	int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
276	int bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo);	276	int bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo);
277	int bt_sock_wait_ready(struct sock *sk, unsigned long flags);	277	int bt_sock_wait_ready(struct sock *sk, unsigned long flags);

include/net/ip6_fib.h+3−2

 					unused:3;
 	struct fib6_nh			fib6_nh;
+	struct rcu_head			rcu;
 };
 struct rt6_info {
 }
 struct fib6_info *fib6_info_alloc(gfp_t gfp_flags);
-void fib6_info_destroy(struct fib6_info *f6i);
+void fib6_info_destroy_rcu(struct rcu_head *head);
 static inline void fib6_info_hold(struct fib6_info *f6i)
 {
 static inline void fib6_info_release(struct fib6_info *f6i)
 {
 	if (f6i && atomic_dec_and_test(&f6i->fib6_ref))
-		fib6_info_destroy(f6i);
+		call_rcu(&f6i->rcu, fib6_info_destroy_rcu);
 }
 enum fib6_walk_state {

include/net/iucv/af_iucv.h+2−0

@@ -153,6 +153,8 @@ struct iucv_sock_list { · 152 unmodified lines
153	atomic_t autobind_name;	153	atomic_t autobind_name;
154	};	154	};
155		155
		156	__poll_t iucv_sock_poll(struct file file, struct socket sock,
		157	poll_table *wait);
156	void iucv_sock_link(struct iucv_sock_list l, struct sock s);	158	void iucv_sock_link(struct iucv_sock_list l, struct sock s);
157	void iucv_sock_unlink(struct iucv_sock_list l, struct sock s);	159	void iucv_sock_unlink(struct iucv_sock_list l, struct sock s);
158	void iucv_accept_enqueue(struct sock parent, struct sock sk);	160	void iucv_accept_enqueue(struct sock parent, struct sock sk);

include/net/sctp/sctp.h+2−1

 int sctp_inet_listen(struct socket *sock, int backlog);
 void sctp_write_space(struct sock *sk);
 void sctp_data_ready(struct sock *sk);
-__poll_t sctp_poll_mask(struct socket *sock, __poll_t events);
+__poll_t sctp_poll(struct file *file, struct socket *sock,
+		poll_table *wait);
 void sctp_sock_rfree(struct sk_buff *skb);
 void sctp_copy_sock(struct sock *newsk, struct sock *sk,
 		    struct sctp_association *asoc);

include/net/tcp.h+2−1

 void tcp_close(struct sock *sk, long timeout);
 void tcp_init_sock(struct sock *sk);
 void tcp_init_transfer(struct sock *sk, int bpf_op);
-__poll_t tcp_poll_mask(struct socket *sock, __poll_t events);
+__poll_t tcp_poll(struct file *file, struct socket *sock,
+		      struct poll_table_struct *wait);
 int tcp_getsockopt(struct sock *sk, int level, int optname,
 		   char __user *optval, int __user *optlen);
 int tcp_setsockopt(struct sock *sk, int level, int optname,

include/net/tls.h+4−2

 	struct strparser strp;
 	void (*saved_data_ready)(struct sock *sk);
-	__poll_t (*sk_poll_mask)(struct socket *sock, __poll_t events);
+	unsigned int (*sk_poll)(struct file *file, struct socket *sock,
+				struct poll_table_struct *wait);
 	struct sk_buff *recv_pkt;
 	u8 control;
 	bool decrypted;
 void tls_sw_free_resources_rx(struct sock *sk);
 int tls_sw_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
 		   int nonblock, int flags, int *addr_len);
-__poll_t tls_sw_poll_mask(struct socket *sock, __poll_t events);
+unsigned int tls_sw_poll(struct file *file, struct socket *sock,
+			 struct poll_table_struct *wait);
 ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos,
 			   struct pipe_inode_info *pipe,
 			   size_t len, unsigned int flags);

include/net/udp.h+1−1

@@ -285,7 +285,7 @@ int udp_init_sock(struct sock *sk); · 284 unmodified lines
285	int udp_pre_connect(struct sock sk, struct sockaddr uaddr, int addr_len);	285	int udp_pre_connect(struct sock sk, struct sockaddr uaddr, int addr_len);
286	int __udp_disconnect(struct sock *sk, int flags);	286	int __udp_disconnect(struct sock *sk, int flags);
287	int udp_disconnect(struct sock *sk, int flags);	287	int udp_disconnect(struct sock *sk, int flags);
288	__poll_t udp_poll_mask(struct socket *sock, __poll_t events);	288	__poll_t udp_poll(struct file file, struct socket sock, poll_table *wait);
289	struct sk_buff skb_udp_tunnel_segment(struct sk_buff skb,	289	struct sk_buff skb_udp_tunnel_segment(struct sk_buff skb,
290	netdev_features_t features,	290	netdev_features_t features,
291	bool is_ipv6);	291	bool is_ipv6);

include/rdma/ib_verbs.h+8−5

  *
  * Users can examine the cq structure to determine the actual CQ size.
  */
-struct ib_cq *ib_create_cq(struct ib_device *device,
+struct ib_cq *__ib_create_cq(struct ib_device *device,
-			   ib_comp_handler comp_handler,
+			     ib_comp_handler comp_handler,
-			   void (*event_handler)(struct ib_event *, void *),
+			     void (*event_handler)(struct ib_event *, void *),
-			   void *cq_context,
+			     void *cq_context,
-			   const struct ib_cq_init_attr *cq_attr);
+			     const struct ib_cq_init_attr *cq_attr,
+			     const char *caller);
+#define ib_create_cq(device, cmp_hndlr, evt_hndlr, cq_ctxt, cq_attr) \
+	__ib_create_cq((device), (cmp_hndlr), (evt_hndlr), (cq_ctxt), (cq_attr), KBUILD_MODNAME)
 /**
  * ib_resize_cq - Modifies the capacity of the CQ.

include/uapi/linux/aio_abi.h+4−2

 	IOCB_CMD_PWRITE = 1,
 	IOCB_CMD_FSYNC = 2,
 	IOCB_CMD_FDSYNC = 3,
-	/* 4 was the experimental IOCB_CMD_PREADX */
+	/* These two are experimental.
-	IOCB_CMD_POLL = 5,
+	 * IOCB_CMD_PREADX = 4,
+	 * IOCB_CMD_POLL = 5,
+	 */
 	IOCB_CMD_NOOP = 6,
 	IOCB_CMD_PREADV = 7,
 	IOCB_CMD_PWRITEV = 8,

include/uapi/linux/nbd.h+3−0

@@ -53,6 +53,9 @@ enum { · 52 unmodified lines
53	/* These are client behavior specific flags. */	53	/* These are client behavior specific flags. */
54	#define NBD_CFLAG_DESTROY_ON_DISCONNECT (1 << 0) /* delete the nbd device on	54	#define NBD_CFLAG_DESTROY_ON_DISCONNECT (1 << 0) /* delete the nbd device on
55	disconnect. */	55	disconnect. */
		56	#define NBD_CFLAG_DISCONNECT_ON_CLOSE (1 << 1) /* disconnect the nbd device on
		57	* close by last opener.
		58	*/
56		59
57	/* userspace doesn't need the nbd_device structure */	60	/* userspace doesn't need the nbd_device structure */
58		61

include/uapi/linux/target_core_user.h+3−1

 #define TCMU_MAILBOX_VERSION 2
 #define ALIGN_SIZE 64 /* Should be enough for most CPUs */
 #define TCMU_MAILBOX_FLAG_CAP_OOOC (1 << 0) /* Out-of-order completions */
+#define TCMU_MAILBOX_FLAG_CAP_READ_LEN (1 << 1) /* Read data length */
 struct tcmu_mailbox {
 	__u16 version;
 	__u16 cmd_id;
 	__u8 kflags;
 #define TCMU_UFLAG_UNKNOWN_OP 0x1
+#define TCMU_UFLAG_READ_LEN   0x2
 	__u8 uflags;
 } __packed;
 			__u8 scsi_status;
 			__u8 __pad1;
 			__u16 __pad2;
-			__u32 __pad3;
+			__u32 read_len;
 			char sense_buffer[TCMU_SENSE_BUFFERSIZE];
 		} rsp;
 	};

include/xen/xen.h+5−1

 #define xen_hvm_domain()	(xen_domain_type == XEN_HVM_DOMAIN)
 #define xen_pvh_domain()	(xen_pvh)
+#include <linux/types.h>
+extern uint32_t xen_start_flags;
 #ifdef CONFIG_XEN_DOM0
 #include <xen/interface/xen.h>
 #include <asm/xen/hypervisor.h>
 #define xen_initial_domain()	(xen_domain() && \
-				 xen_start_info && xen_start_info->flags & SIF_INITDOMAIN)
+				 (xen_start_flags & SIF_INITDOMAIN))
 #else  /* !CONFIG_XEN_DOM0 */
 #define xen_initial_domain()	(0)
 #endif	/* CONFIG_XEN_DOM0 */

init/Kconfig+3−8

 	depends on HAVE_LD_DEAD_CODE_DATA_ELIMINATION
 	depends on EXPERT
 	help
-	  Select this if the architecture wants to do dead code and
+	  Enable this if you want to do dead code and data elimination with
-	  data elimination with the linker by compiling with
+	  the linker by compiling with -ffunction-sections -fdata-sections,
-	  -ffunction-sections -fdata-sections, and linking with
+	  and linking with --gc-sections.
-	  --gc-sections.
 	  This can reduce on disk and in-memory size of the kernel
 	  code and static data, particularly for small configs and
 endmenu		# General setup
-config HAVE_GENERIC_DMA_COHERENT
-	bool
-	default n
 config RT_MUTEXES
 	bool

kernel/Makefile+1−0

@@ -41,6 +41,7 @@ obj-y += printk/ · 40 unmodified lines
41	obj-y += irq/	41	obj-y += irq/
42	obj-y += rcu/	42	obj-y += rcu/
43	obj-y += livepatch/	43	obj-y += livepatch/
		44	obj-y += dma/
44		45
45	obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o	46	obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
46	obj-$(CONFIG_FREEZER) += freezer.o	47	obj-$(CONFIG_FREEZER) += freezer.o

kernel/bpf/core.c+62−7

@@ -350,6 +350,20 @@ struct bpf_prog bpf_patch_insn_single(struct bpf_prog prog, u32 off, · 349 unmodified lines
350	return prog_adj;	350	return prog_adj;
351	}	351	}
352		352
		353	void bpf_prog_kallsyms_del_subprogs(struct bpf_prog *fp)
		354	{
		355	int i;
		356
		357	for (i = 0; i < fp->aux->func_cnt; i++)
		358	bpf_prog_kallsyms_del(fp->aux->func[i]);
		359	}
		360
		361	void bpf_prog_kallsyms_del_all(struct bpf_prog *fp)
		362	{
		363	bpf_prog_kallsyms_del_subprogs(fp);
		364	bpf_prog_kallsyms_del(fp);
		365	}
		366
353	#ifdef CONFIG_BPF_JIT	367	#ifdef CONFIG_BPF_JIT
354	/* All BPF JIT sysctl knobs here. */	368	/* All BPF JIT sysctl knobs here. */
355	int bpf_jit_enable __read_mostly = IS_BUILTIN(CONFIG_BPF_JIT_ALWAYS_ON);	369	int bpf_jit_enable __read_mostly = IS_BUILTIN(CONFIG_BPF_JIT_ALWAYS_ON);
@@ -584,6 +598,8 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr, · 228 unmodified lines
584	bpf_fill_ill_insns(hdr, size);	598	bpf_fill_ill_insns(hdr, size);
585		599
586	hdr->pages = size / PAGE_SIZE;	600	hdr->pages = size / PAGE_SIZE;
		601	hdr->locked = 0;
		602
587	hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),	603	hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
588	PAGE_SIZE - sizeof(*hdr));	604	PAGE_SIZE - sizeof(*hdr));
589	start = (get_random_int() % hole) & ~(alignment - 1);	605	start = (get_random_int() % hole) & ~(alignment - 1);
@@ -1434,6 +1450,33 @@ static int bpf_check_tail_call(const struct bpf_prog *fp) · 844 unmodified lines
1434	return 0;	1450	return 0;
1435	}	1451	}
1436		1452
		1453	static int bpf_prog_check_pages_ro_locked(const struct bpf_prog *fp)
		1454	{
		1455	#ifdef CONFIG_ARCH_HAS_SET_MEMORY
		1456	int i, err;
		1457
		1458	for (i = 0; i < fp->aux->func_cnt; i++) {
		1459	err = bpf_prog_check_pages_ro_single(fp->aux->func[i]);
		1460	if (err)
		1461	return err;
		1462	}
		1463
		1464	return bpf_prog_check_pages_ro_single(fp);
		1465	#endif
		1466	return 0;
		1467	}
		1468
		1469	static void bpf_prog_select_func(struct bpf_prog *fp)
		1470	{
		1471	#ifndef CONFIG_BPF_JIT_ALWAYS_ON
		1472	u32 stack_depth = max_t(u32, fp->aux->stack_depth, 1);
		1473
		1474	fp->bpf_func = interpreters[(round_up(stack_depth, 32) / 32) - 1];
		1475	#else
		1476	fp->bpf_func = __bpf_prog_ret0_warn;
		1477	#endif
		1478	}
		1479
1437	/**	1480	/**
1438	* bpf_prog_select_runtime - select exec runtime for BPF program	1481	* bpf_prog_select_runtime - select exec runtime for BPF program
1439	* @fp: bpf_prog populated with internal BPF program	1482	* @fp: bpf_prog populated with internal BPF program
@@ -1444,13 +1487,13 @@ static int bpf_check_tail_call(const struct bpf_prog *fp) · 4 unmodified lines
1444	*/	1487	*/
1445	struct bpf_prog bpf_prog_select_runtime(struct bpf_prog fp, int *err)	1488	struct bpf_prog bpf_prog_select_runtime(struct bpf_prog fp, int *err)
1446	{	1489	{
1447	#ifndef CONFIG_BPF_JIT_ALWAYS_ON	1490	/* In case of BPF to BPF calls, verifier did all the prep
1448	u32 stack_depth = max_t(u32, fp->aux->stack_depth, 1);	1491	* work with regards to JITing, etc.
		1492	*/
		1493	if (fp->bpf_func)
		1494	goto finalize;
1449		1495
1450	fp->bpf_func = interpreters[(round_up(stack_depth, 32) / 32) - 1];	1496	bpf_prog_select_func(fp);
1451	#else
1452	fp->bpf_func = __bpf_prog_ret0_warn;
1453	#endif
1454		1497
1455	/* eBPF JITs can rewrite the program in case constant	1498	/* eBPF JITs can rewrite the program in case constant
1456	* blinding is active. However, in case of error during	1499	* blinding is active. However, in case of error during
@@ -1471,6 +1514,8 @@ struct bpf_prog bpf_prog_select_runtime(struct bpf_prog fp, int *err) · 14 unmodified lines
1471	if (*err)	1514	if (*err)
1472	return fp;	1515	return fp;
1473	}	1516	}
		1517
		1518	finalize:
1474	bpf_prog_lock_ro(fp);	1519	bpf_prog_lock_ro(fp);
1475		1520
1476	/* The tail call compatibility check can only be done at	1521	/* The tail call compatibility check can only be done at
@@ -1479,7 +1524,17 @@ struct bpf_prog bpf_prog_select_runtime(struct bpf_prog fp, int *err) · 2 unmodified lines
1479	* all eBPF JITs might immediately support all features.	1524	* all eBPF JITs might immediately support all features.
1480	*/	1525	*/
1481	*err = bpf_check_tail_call(fp);	1526	*err = bpf_check_tail_call(fp);
1482		1527	if (*err)
		1528	return fp;
		1529
		1530	/* Checkpoint: at this point onwards any cBPF -> eBPF or
		1531	* native eBPF program is read-only. If we failed to change
		1532	* the page attributes (e.g. allocation failure from
		1533	* splitting large pages), then reject the whole program
		1534	* in order to guarantee not ending up with any W+X pages
		1535	* from BPF side in kernel.
		1536	*/
		1537	*err = bpf_prog_check_pages_ro_locked(fp);
1483	return fp;	1538	return fp;
1484	}	1539	}
1485	EXPORT_SYMBOL_GPL(bpf_prog_select_runtime);	1540	EXPORT_SYMBOL_GPL(bpf_prog_select_runtime);

kernel/bpf/devmap.c+14−0

@@ -345,6 +345,20 @@ int dev_map_enqueue(struct bpf_dtab_netdev dst, struct xdp_buff xdp, · 344 unmodified lines
345	return bq_enqueue(dst, xdpf, dev_rx);	345	return bq_enqueue(dst, xdpf, dev_rx);
346	}	346	}
347		347
		348	int dev_map_generic_redirect(struct bpf_dtab_netdev dst, struct sk_buff skb,
		349	struct bpf_prog *xdp_prog)
		350	{
		351	int err;
		352
		353	err = __xdp_generic_ok_fwd_dev(skb, dst->dev);
		354	if (unlikely(err))
		355	return err;
		356	skb->dev = dst->dev;
		357	generic_xdp_tx(skb, xdp_prog);
		358
		359	return 0;
		360	}
		361
348	static void dev_map_lookup_elem(struct bpf_map map, void *key)	362	static void dev_map_lookup_elem(struct bpf_map map, void *key)
349	{	363	{
350	struct bpf_dtab_netdev obj = __dev_map_lookup_elem(map, (u32 *)key);	364	struct bpf_dtab_netdev obj = __dev_map_lookup_elem(map, (u32 *)key);

kernel/bpf/syscall.c+3−9

@@ -1034,14 +1034,9 @@ static void __bpf_prog_put_rcu(struct rcu_head *rcu) · 1033 unmodified lines
1034	static void __bpf_prog_put(struct bpf_prog *prog, bool do_idr_lock)	1034	static void __bpf_prog_put(struct bpf_prog *prog, bool do_idr_lock)
1035	{	1035	{
1036	if (atomic_dec_and_test(&prog->aux->refcnt)) {	1036	if (atomic_dec_and_test(&prog->aux->refcnt)) {
1037	int i;
1038
1039	/* bpf_prog_free_id() must be called first */	1037	/* bpf_prog_free_id() must be called first */
1040	bpf_prog_free_id(prog, do_idr_lock);	1038	bpf_prog_free_id(prog, do_idr_lock);
1041		1039	bpf_prog_kallsyms_del_all(prog);
1042	for (i = 0; i < prog->aux->func_cnt; i++)
1043	bpf_prog_kallsyms_del(prog->aux->func[i]);
1044	bpf_prog_kallsyms_del(prog);
1045		1040
1046	call_rcu(&prog->aux->rcu, __bpf_prog_put_rcu);	1041	call_rcu(&prog->aux->rcu, __bpf_prog_put_rcu);
1047	}	1042	}
@@ -1358,9 +1353,7 @@ static int bpf_prog_load(union bpf_attr *attr) · 310 unmodified lines
1358	if (err < 0)	1353	if (err < 0)
1359	goto free_used_maps;	1354	goto free_used_maps;
1360		1355
1361	/* eBPF program is ready to be JITed */	1356	prog = bpf_prog_select_runtime(prog, &err);
1362	if (!prog->bpf_func)
1363	prog = bpf_prog_select_runtime(prog, &err);
1364	if (err < 0)	1357	if (err < 0)
1365	goto free_used_maps;	1358	goto free_used_maps;
1366		1359
@@ -1384,6 +1377,7 @@ static int bpf_prog_load(union bpf_attr *attr) · 17 unmodified lines
1384	return err;	1377	return err;
1385		1378
1386	free_used_maps:	1379	free_used_maps:
		1380	bpf_prog_kallsyms_del_subprogs(prog);
1387	free_used_maps(prog->aux);	1381	free_used_maps(prog->aux);
1388	free_prog:	1382	free_prog:
1389	bpf_prog_uncharge_memlock(prog);	1383	bpf_prog_uncharge_memlock(prog);

kernel/dma/Kconfig+50−0

@@ -0,0 +1,50 @@
	1
	2	config HAS_DMA
	3	bool
	4	depends on !NO_DMA
	5	default y
	6
	7	config NEED_SG_DMA_LENGTH
	8	bool
	9
	10	config NEED_DMA_MAP_STATE
	11	bool
	12
	13	config ARCH_DMA_ADDR_T_64BIT
	14	def_bool 64BIT \|\| PHYS_ADDR_T_64BIT
	15
	16	config HAVE_GENERIC_DMA_COHERENT
	17	bool
	18
	19	config ARCH_HAS_SYNC_DMA_FOR_DEVICE
	20	bool
	21
	22	config ARCH_HAS_SYNC_DMA_FOR_CPU
	23	bool
	24	select NEED_DMA_MAP_STATE
	25
	26	config DMA_DIRECT_OPS
	27	bool
	28	depends on HAS_DMA
	29
	30	config DMA_NONCOHERENT_OPS
	31	bool
	32	depends on HAS_DMA
	33	select DMA_DIRECT_OPS
	34
	35	config DMA_NONCOHERENT_MMAP
	36	bool
	37	depends on DMA_NONCOHERENT_OPS
	38
	39	config DMA_NONCOHERENT_CACHE_SYNC
	40	bool
	41	depends on DMA_NONCOHERENT_OPS
	42
	43	config DMA_VIRT_OPS
	44	bool
	45	depends on HAS_DMA
	46
	47	config SWIOTLB
	48	bool
	49	select DMA_DIRECT_OPS
	50	select NEED_DMA_MAP_STATE

kernel/dma/Makefile+11−0

@@ -0,0 +1,11 @@
	1	# SPDX-License-Identifier: GPL-2.0
	2
	3	obj-$(CONFIG_HAS_DMA) += mapping.o
	4	obj-$(CONFIG_DMA_CMA) += contiguous.o
	5	obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += coherent.o
	6	obj-$(CONFIG_DMA_DIRECT_OPS) += direct.o
	7	obj-$(CONFIG_DMA_NONCOHERENT_OPS) += noncoherent.o
	8	obj-$(CONFIG_DMA_VIRT_OPS) += virt.o
	9	obj-$(CONFIG_DMA_API_DEBUG) += debug.o
	10	obj-$(CONFIG_SWIOTLB) += swiotlb.o
	11

kernel/dma/coherent.crenamed from drivers/base/dma-coherent.c+0−0

File renamed without changes.

kernel/dma/contiguous.crenamed from drivers/base/dma-contiguous.c+0−0

File renamed without changes.

kernel/dma/debug.crenamed from lib/dma-debug.c+0−0

File renamed without changes.

kernel/dma/direct.crenamed from lib/dma-direct.c+0−0

File renamed without changes.

kernel/dma/mapping.crenamed from drivers/base/dma-mapping.c+1−1

@@ -1,6 +1,6 @@
1	// SPDX-License-Identifier: GPL-2.0	1	// SPDX-License-Identifier: GPL-2.0
2	/*	2	/*
3	* drivers/base/dma-mapping.c - arch-independent dma-mapping routines	3	* arch-independent dma-mapping routines
4	*	4	*
5	* Copyright (c) 2006 SUSE Linux Products GmbH	5	* Copyright (c) 2006 SUSE Linux Products GmbH
6	* Copyright (c) 2006 Tejun Heo <teheo@suse.de>	6	* Copyright (c) 2006 Tejun Heo <teheo@suse.de>

kernel/dma/noncoherent.crenamed from lib/dma-noncoherent.c+0−0

File renamed without changes.

kernel/dma/swiotlb.crenamed from lib/swiotlb.c+1−0

@@ -1085,3 +1085,4 @@ const struct dma_map_ops swiotlb_dma_ops = { · 1084 unmodified lines
1085	.unmap_page = swiotlb_unmap_page,	1085	.unmap_page = swiotlb_unmap_page,
1086	.dma_supported = dma_direct_supported,	1086	.dma_supported = dma_direct_supported,
1087	};	1087	};
		1088	EXPORT_SYMBOL(swiotlb_dma_ops);

kernel/dma/virt.crenamed from lib/dma-virt.c+0−2

@@ -1,7 +1,5 @@
1	// SPDX-License-Identifier: GPL-2.0	1	// SPDX-License-Identifier: GPL-2.0
2	/*	2	/*
3	* lib/dma-virt.c
4	*
5	* DMA operations that map to virtual addresses without flushing memory.	3	* DMA operations that map to virtual addresses without flushing memory.
6	*/	4	*/
7	#include <linux/export.h>	5	#include <linux/export.h>

kernel/events/core.c+1−1

@@ -6482,7 +6482,7 @@ void perf_prepare_sample(struct perf_event_header *header, · 6481 unmodified lines
6482	data->phys_addr = perf_virt_to_phys(data->addr);	6482	data->phys_addr = perf_virt_to_phys(data->addr);
6483	}	6483	}
6484		6484
6485	static void __always_inline	6485	static __always_inline void
6486	__perf_event_output(struct perf_event *event,	6486	__perf_event_output(struct perf_event *event,
6487	struct perf_sample_data *data,	6487	struct perf_sample_data *data,
6488	struct pt_regs *regs,	6488	struct pt_regs *regs,

kernel/events/ring_buffer.c+3−3

@@ -103,7 +103,7 @@ out: · 102 unmodified lines
103	preempt_enable();	103	preempt_enable();
104	}	104	}
105		105
106	static bool __always_inline	106	static __always_inline bool
107	ring_buffer_has_space(unsigned long head, unsigned long tail,	107	ring_buffer_has_space(unsigned long head, unsigned long tail,
108	unsigned long data_size, unsigned int size,	108	unsigned long data_size, unsigned int size,
109	bool backward)	109	bool backward)
@@ -114,7 +114,7 @@ ring_buffer_has_space(unsigned long head, unsigned long tail, · 4 unmodified lines
114	return CIRC_SPACE(tail, head, data_size) >= size;	114	return CIRC_SPACE(tail, head, data_size) >= size;
115	}	115	}
116		116
117	static int __always_inline	117	static __always_inline int
118	__perf_output_begin(struct perf_output_handle *handle,	118	__perf_output_begin(struct perf_output_handle *handle,
119	struct perf_event *event, unsigned int size,	119	struct perf_event *event, unsigned int size,
120	bool backward)	120	bool backward)
@@ -414,7 +414,7 @@ err: · 293 unmodified lines
414	}	414	}
415	EXPORT_SYMBOL_GPL(perf_aux_output_begin);	415	EXPORT_SYMBOL_GPL(perf_aux_output_begin);
416		416
417	static bool __always_inline rb_need_aux_wakeup(struct ring_buffer *rb)	417	static __always_inline bool rb_need_aux_wakeup(struct ring_buffer *rb)
418	{	418	{
419	if (rb->aux_overwrite)	419	if (rb->aux_overwrite)
420	return false;	420	return false;

kernel/irq/debugfs.c+1−0

@@ -55,6 +55,7 @@ static const struct irq_bit_descr irqchip_flags[] = { · 54 unmodified lines
55	BIT_MASK_DESCR(IRQCHIP_SKIP_SET_WAKE),	55	BIT_MASK_DESCR(IRQCHIP_SKIP_SET_WAKE),
56	BIT_MASK_DESCR(IRQCHIP_ONESHOT_SAFE),	56	BIT_MASK_DESCR(IRQCHIP_ONESHOT_SAFE),
57	BIT_MASK_DESCR(IRQCHIP_EOI_THREADED),	57	BIT_MASK_DESCR(IRQCHIP_EOI_THREADED),
		58	BIT_MASK_DESCR(IRQCHIP_SUPPORTS_LEVEL_MSI),
58	};	59	};
59		60
60	static void	61	static void

kernel/locking/lockdep.c+6−6

@@ -1265,11 +1265,11 @@ unsigned long lockdep_count_forward_deps(struct lock_class *class) · 1264 unmodified lines
1265	this.parent = NULL;	1265	this.parent = NULL;
1266	this.class = class;	1266	this.class = class;
1267		1267
1268	local_irq_save(flags);	1268	raw_local_irq_save(flags);
1269	arch_spin_lock(&lockdep_lock);	1269	arch_spin_lock(&lockdep_lock);
1270	ret = __lockdep_count_forward_deps(&this);	1270	ret = __lockdep_count_forward_deps(&this);
1271	arch_spin_unlock(&lockdep_lock);	1271	arch_spin_unlock(&lockdep_lock);
1272	local_irq_restore(flags);	1272	raw_local_irq_restore(flags);
1273		1273
1274	return ret;	1274	return ret;
1275	}	1275	}
@@ -1292,11 +1292,11 @@ unsigned long lockdep_count_backward_deps(struct lock_class *class) · 16 unmodified lines
1292	this.parent = NULL;	1292	this.parent = NULL;
1293	this.class = class;	1293	this.class = class;
1294		1294
1295	local_irq_save(flags);	1295	raw_local_irq_save(flags);
1296	arch_spin_lock(&lockdep_lock);	1296	arch_spin_lock(&lockdep_lock);
1297	ret = __lockdep_count_backward_deps(&this);	1297	ret = __lockdep_count_backward_deps(&this);
1298	arch_spin_unlock(&lockdep_lock);	1298	arch_spin_unlock(&lockdep_lock);
1299	local_irq_restore(flags);	1299	raw_local_irq_restore(flags);
1300		1300
1301	return ret;	1301	return ret;
1302	}	1302	}
@@ -4411,7 +4411,7 @@ void debug_check_no_locks_freed(const void *mem_from, unsigned long mem_len) · 3108 unmodified lines
4411	if (unlikely(!debug_locks))	4411	if (unlikely(!debug_locks))
4412	return;	4412	return;
4413		4413
4414	local_irq_save(flags);	4414	raw_local_irq_save(flags);
4415	for (i = 0; i < curr->lockdep_depth; i++) {	4415	for (i = 0; i < curr->lockdep_depth; i++) {
4416	hlock = curr->held_locks + i;	4416	hlock = curr->held_locks + i;
4417		4417
@@ -4422,7 +4422,7 @@ void debug_check_no_locks_freed(const void *mem_from, unsigned long mem_len) · 4 unmodified lines
4422	print_freed_lock_bug(curr, mem_from, mem_from + mem_len, hlock);	4422	print_freed_lock_bug(curr, mem_from, mem_from + mem_len, hlock);
4423	break;	4423	break;
4424	}	4424	}
4425	local_irq_restore(flags);	4425	raw_local_irq_restore(flags);
4426	}	4426	}
4427	EXPORT_SYMBOL_GPL(debug_check_no_locks_freed);	4427	EXPORT_SYMBOL_GPL(debug_check_no_locks_freed);
4428		4428

kernel/locking/rwsem.c+1−0

@@ -181,6 +181,7 @@ void down_read_non_owner(struct rw_semaphore *sem) · 180 unmodified lines
181	might_sleep();	181	might_sleep();
182		182
183	__down_read(sem);	183	__down_read(sem);
		184	rwsem_set_reader_owned(sem);
184	}	185	}
185		186
186	EXPORT_SYMBOL(down_read_non_owner);	187	EXPORT_SYMBOL(down_read_non_owner);

kernel/rseq.c+4−3

  * respect to other threads scheduled on the same CPU, and with respect
  * to signal handlers.
  */
-void __rseq_handle_notify_resume(struct pt_regs *regs)
+void __rseq_handle_notify_resume(struct ksignal *ksig, struct pt_regs *regs)
 {
 	struct task_struct *t = current;
-	int ret;
+	int ret, sig;
 	if (unlikely(t->flags & PF_EXITING))
 		return;
 	return;
 error:
-	force_sig(SIGSEGV, t);
+	sig = ksig ? ksig->sig : 0;
+	force_sigsegv(sig, t);
 }
 #ifdef CONFIG_DEBUG_RSEQ

kernel/softirq.c+5−1

@@ -139,9 +139,13 @@ static void __local_bh_enable(unsigned int cnt) · 138 unmodified lines
139	{	139	{
140	lockdep_assert_irqs_disabled();	140	lockdep_assert_irqs_disabled();
141		141
		142	if (preempt_count() == cnt)
		143	trace_preempt_on(CALLER_ADDR0, get_lock_parent_ip());
		144
142	if (softirq_count() == (cnt & SOFTIRQ_MASK))	145	if (softirq_count() == (cnt & SOFTIRQ_MASK))
143	trace_softirqs_on(_RET_IP_);	146	trace_softirqs_on(_RET_IP_);
144	preempt_count_sub(cnt);	147
		148	__preempt_count_sub(cnt);
145	}	149	}
146		150
147	/*	151	/*

kernel/time/hrtimer.c+1−1

@@ -1659,7 +1659,7 @@ EXPORT_SYMBOL_GPL(hrtimer_init_sleeper); · 1658 unmodified lines
1659	int nanosleep_copyout(struct restart_block restart, struct timespec64 ts)	1659	int nanosleep_copyout(struct restart_block restart, struct timespec64 ts)
1660	{	1660	{
1661	switch(restart->nanosleep.type) {	1661	switch(restart->nanosleep.type) {
1662	#ifdef CONFIG_COMPAT	1662	#ifdef CONFIG_COMPAT_32BIT_TIME
1663	case TT_COMPAT:	1663	case TT_COMPAT:
1664	if (compat_put_timespec64(ts, restart->nanosleep.compat_rmtp))	1664	if (compat_put_timespec64(ts, restart->nanosleep.compat_rmtp))
1665	return -EFAULT;	1665	return -EFAULT;

kernel/time/posix-cpu-timers.c+0−2

 	/*
 	 * Disarm any old timer after extracting its expiry time.
 	 */
-	lockdep_assert_irqs_disabled();
 	ret = 0;
 	old_incr = timer->it.cpu.incr;
 	/*
 	 * Now re-arm for the new expiry time.
 	 */
-	lockdep_assert_irqs_disabled();
 	arm_timer(timer);
 unlock:
 	unlock_task_sighand(p, &flags);

kernel/time/time.c+4−2

  */
 #include <linux/export.h>
+#include <linux/kernel.h>
 #include <linux/timex.h>
 #include <linux/capability.h>
 #include <linux/timekeeper_internal.h>
 	return (j + (HZ / MSEC_PER_SEC) - 1)/(HZ / MSEC_PER_SEC);
 #else
 # if BITS_PER_LONG == 32
-	return (HZ_TO_MSEC_MUL32 * j) >> HZ_TO_MSEC_SHR32;
+	return (HZ_TO_MSEC_MUL32 * j + (1ULL << HZ_TO_MSEC_SHR32) - 1) >>
+	       HZ_TO_MSEC_SHR32;
 # else
-	return (j * HZ_TO_MSEC_NUM) / HZ_TO_MSEC_DEN;
+	return DIV_ROUND_UP(j * HZ_TO_MSEC_NUM, HZ_TO_MSEC_DEN);
 # endif
 #endif
 }

kernel/trace/trace.c+1−5

 void
 update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu)
 {
-	struct ring_buffer *buf;
 	if (tr->stop_count)
 		return;
 	arch_spin_lock(&tr->max_lock);
-	buf = tr->trace_buffer.buffer;
+	swap(tr->trace_buffer.buffer, tr->max_buffer.buffer);
-	tr->trace_buffer.buffer = tr->max_buffer.buffer;
-	tr->max_buffer.buffer = buf;
 	__update_max_tr(tr, tsk, cpu);
 	arch_spin_unlock(&tr->max_lock);

kernel/trace/trace_events_filter.c+9−1

 	C(TOO_MANY_PREDS,	"Too many terms in predicate expression"), \
 	C(INVALID_FILTER,	"Meaningless filter expression"),	\
 	C(IP_FIELD_ONLY,	"Only 'ip' field is supported for function trace"), \
-	C(INVALID_VALUE,	"Invalid value (did you forget quotes)?"),
+	C(INVALID_VALUE,	"Invalid value (did you forget quotes)?"), \
+	C(NO_FILTER,		"No filter found"),
 #undef C
 #define C(a, b)		FILT_ERR_##a
 		goto out_free;
 	}
+	if (!N) {
+		/* No program? */
+		ret = -EINVAL;
+		parse_error(pe, FILT_ERR_NO_FILTER, ptr - str);
+		goto out_free;
+	}
 	prog[N].pred = NULL;					/* #13 */
 	prog[N].target = 1;		/* TRUE */
 	prog[N+1].pred = NULL;

lib/Kconfig+1−46

@@ -420,60 +420,15 @@ config HAS_IOPORT_MAP · 419 unmodified lines
420	depends on HAS_IOMEM && !NO_IOPORT_MAP	420	depends on HAS_IOMEM && !NO_IOPORT_MAP
421	default y	421	default y
422		422
423	config HAS_DMA	423	source "kernel/dma/Kconfig"
424	bool
425	depends on !NO_DMA
426	default y
427		424
428	config SGL_ALLOC	425	config SGL_ALLOC
429	bool	426	bool
430	default n	427	default n
431		428
432	config NEED_SG_DMA_LENGTH
433	bool
434
435	config NEED_DMA_MAP_STATE
436	bool
437
438	config ARCH_DMA_ADDR_T_64BIT
439	def_bool 64BIT \|\| PHYS_ADDR_T_64BIT
440
441	config IOMMU_HELPER	429	config IOMMU_HELPER
442	bool	430	bool
443		431
444	config ARCH_HAS_SYNC_DMA_FOR_DEVICE
445	bool
446
447	config ARCH_HAS_SYNC_DMA_FOR_CPU
448	bool
449	select NEED_DMA_MAP_STATE
450
451	config DMA_DIRECT_OPS
452	bool
453	depends on HAS_DMA
454
455	config DMA_NONCOHERENT_OPS
456	bool
457	depends on HAS_DMA
458	select DMA_DIRECT_OPS
459
460	config DMA_NONCOHERENT_MMAP
461	bool
462	depends on DMA_NONCOHERENT_OPS
463
464	config DMA_NONCOHERENT_CACHE_SYNC
465	bool
466	depends on DMA_NONCOHERENT_OPS
467
468	config DMA_VIRT_OPS
469	bool
470	depends on HAS_DMA
471
472	config SWIOTLB
473	bool
474	select DMA_DIRECT_OPS
475	select NEED_DMA_MAP_STATE
476
477	config CHECK_SIGNATURE	432	config CHECK_SIGNATURE
478	bool	433	bool
479		434

lib/Kconfig.kasan+1−0

@@ -6,6 +6,7 @@ if HAVE_ARCH_KASAN · 5 unmodified lines
6	config KASAN	6	config KASAN
7	bool "KASan: runtime memory debugger"	7	bool "KASan: runtime memory debugger"
8	depends on SLUB \|\| (SLAB && !DEBUG_SLAB)	8	depends on SLUB \|\| (SLAB && !DEBUG_SLAB)
		9	select SLUB_DEBUG if SLUB
9	select CONSTRUCTORS	10	select CONSTRUCTORS
10	select STACKDEPOT	11	select STACKDEPOT
11	help	12	help

lib/Makefile+1−11

 	 sha1.o chacha20.o irq_regs.o argv_split.o \
 	 flex_proportions.o ratelimit.o show_mem.o \
 	 is_single_threaded.o plist.o decompress.o kobject_uevent.o \
-	 earlycpio.o seq_buf.o siphash.o \
+	 earlycpio.o seq_buf.o siphash.o dec_and_lock.o \
 	 nmi_backtrace.o nodemask.o win_minmax.o
 lib-$(CONFIG_PRINTK) += dump_stack.o
 lib-$(CONFIG_MMU) += ioremap.o
 lib-$(CONFIG_SMP) += cpumask.o
-lib-$(CONFIG_DMA_DIRECT_OPS) += dma-direct.o
-lib-$(CONFIG_DMA_NONCOHERENT_OPS) += dma-noncoherent.o
-lib-$(CONFIG_DMA_VIRT_OPS) += dma-virt.o
 lib-y	+= kobject.o klist.o
 obj-y	+= lockref.o
 obj-$(CONFIG_DEBUG_LIST) += list_debug.o
 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
-ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
-  lib-y += dec_and_lock.o
-endif
 obj-$(CONFIG_BITREVERSE) += bitrev.o
 obj-$(CONFIG_RATIONAL)	+= rational.o
 obj-$(CONFIG_CRC_CCITT)	+= crc-ccitt.o
 obj-$(CONFIG_AUDIT_GENERIC) += audit.o
 obj-$(CONFIG_AUDIT_COMPAT_GENERIC) += compat_audit.o
-obj-$(CONFIG_SWIOTLB) += swiotlb.o
 obj-$(CONFIG_IOMMU_HELPER) += iommu-helper.o
 obj-$(CONFIG_FAULT_INJECTION) += fault-inject.o
 obj-$(CONFIG_NOTIFIER_ERROR_INJECTION) += notifier-error-inject.o
 obj-$(CONFIG_LRU_CACHE) += lru_cache.o
-obj-$(CONFIG_DMA_API_DEBUG) += dma-debug.o
 obj-$(CONFIG_GENERIC_CSUM) += checksum.o
 obj-$(CONFIG_GENERIC_ATOMIC64) += atomic64.o

lib/dec_and_lock.c+16−0

@@ -33,3 +33,19 @@ int _atomic_dec_and_lock(atomic_t atomic, spinlock_t lock) · 32 unmodified lines
33	}	33	}
34		34
35	EXPORT_SYMBOL(_atomic_dec_and_lock);	35	EXPORT_SYMBOL(_atomic_dec_and_lock);
		36
		37	int _atomic_dec_and_lock_irqsave(atomic_t atomic, spinlock_t lock,
		38	unsigned long *flags)
		39	{
		40	/* Subtract 1 from counter unless that drops it to 0 (ie. it was 1) */
		41	if (atomic_add_unless(atomic, -1, 1))
		42	return 0;
		43
		44	/* Otherwise do it the slow way */
		45	spin_lock_irqsave(lock, *flags);
		46	if (atomic_dec_and_test(atomic))
		47	return 1;
		48	spin_unlock_irqrestore(lock, *flags);
		49	return 0;
		50	}
		51	EXPORT_SYMBOL(_atomic_dec_and_lock_irqsave);

lib/percpu_ida.c+1−1

@@ -141,7 +141,7 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state) · 140 unmodified lines
141	spin_lock_irqsave(&tags->lock, flags);	141	spin_lock_irqsave(&tags->lock, flags);
142		142
143	/* Fastpath */	143	/* Fastpath */
144	if (likely(tags->nr_free >= 0)) {	144	if (likely(tags->nr_free)) {
145	tag = tags->freelist[--tags->nr_free];	145	tag = tags->freelist[--tags->nr_free];
146	spin_unlock_irqrestore(&tags->lock, flags);	146	spin_unlock_irqrestore(&tags->lock, flags);
147	return tag;	147	return tag;

lib/refcount.c+28−0

@@ -350,3 +350,31 @@ bool refcount_dec_and_lock(refcount_t r, spinlock_t lock) · 349 unmodified lines
350	}	350	}
351	EXPORT_SYMBOL(refcount_dec_and_lock);	351	EXPORT_SYMBOL(refcount_dec_and_lock);
352		352
		353	/**
		354	* refcount_dec_and_lock_irqsave - return holding spinlock with disabled
		355	* interrupts if able to decrement refcount to 0
		356	* @r: the refcount
		357	* @lock: the spinlock to be locked
		358	* @flags: saved IRQ-flags if the is acquired
		359	*
		360	* Same as refcount_dec_and_lock() above except that the spinlock is acquired
		361	* with disabled interupts.
		362	*
		363	* Return: true and hold spinlock if able to decrement refcount to 0, false
		364	* otherwise
		365	*/
		366	bool refcount_dec_and_lock_irqsave(refcount_t r, spinlock_t lock,
		367	unsigned long *flags)
		368	{
		369	if (refcount_dec_not_one(r))
		370	return false;
		371
		372	spin_lock_irqsave(lock, *flags);
		373	if (!refcount_dec_and_test(r)) {
		374	spin_unlock_irqrestore(lock, *flags);
		375	return false;
		376	}
		377
		378	return true;
		379	}
		380	EXPORT_SYMBOL(refcount_dec_and_lock_irqsave);

lib/scatterlist.c+0−6

  **/
 struct scatterlist *sg_next(struct scatterlist *sg)
 {
-#ifdef CONFIG_DEBUG_SG
-	BUG_ON(sg->sg_magic != SG_MAGIC);
-#endif
 	if (sg_is_last(sg))
 		return NULL;
 	for_each_sg(sgl, sg, nents, i)
 		ret = sg;
-#ifdef CONFIG_DEBUG_SG
-	BUG_ON(sgl[0].sg_magic != SG_MAGIC);
 	BUG_ON(!sg_is_last(ret));
-#endif
 	return ret;
 }
 EXPORT_SYMBOL(sg_last);

lib/test_printf.c+0−7

@@ -260,13 +260,6 @@ plain(void) · 259 unmodified lines
260	{	260	{
261	int err;	261	int err;
262		262
263	/*
264	* Make sure crng is ready. Otherwise we get "(ptrval)" instead
265	* of a hashed address when printing '%p' in plain_hash() and
266	* plain_format().
267	*/
268	wait_for_random_bytes();
269
270	err = plain_hash();	263	err = plain_hash();
271	if (err) {	264	if (err) {
272	pr_warn("plain 'p' does not appear to be hashed\n");	265	pr_warn("plain 'p' does not appear to be hashed\n");

mm/backing-dev.c+7−13

 	spin_lock_bh(&wb->work_lock);
 	if (!test_and_clear_bit(WB_registered, &wb->state)) {
 		spin_unlock_bh(&wb->work_lock);
-		/*
-		 * Wait for wb shutdown to finish if someone else is just
-		 * running wb_shutdown(). Otherwise we could proceed to wb /
-		 * bdi destruction before wb_shutdown() is finished.
-		 */
-		wait_on_bit(&wb->state, WB_shutting_down, TASK_UNINTERRUPTIBLE);
 		return;
 	}
-	set_bit(WB_shutting_down, &wb->state);
 	spin_unlock_bh(&wb->work_lock);
 	cgwb_remove_from_bdi_list(wb);
 	mod_delayed_work(bdi_wq, &wb->dwork, 0);
 	flush_delayed_work(&wb->dwork);
 	WARN_ON(!list_empty(&wb->work_list));
-	/*
-	 * Make sure bit gets cleared after shutdown is finished. Matches with
-	 * the barrier provided by test_and_clear_bit() above.
-	 */
-	smp_wmb();
-	clear_and_wake_up_bit(WB_shutting_down, &wb->state);
 }
 static void wb_exit(struct bdi_writeback *wb)
 	struct bdi_writeback *wb = container_of(work, struct bdi_writeback,
 						release_work);
+	mutex_lock(&wb->bdi->cgwb_release_mutex);
 	wb_shutdown(wb);
 	css_put(wb->memcg_css);
 	css_put(wb->blkcg_css);
+	mutex_unlock(&wb->bdi->cgwb_release_mutex);
 	fprop_local_destroy_percpu(&wb->memcg_completions);
 	percpu_ref_exit(&wb->refcnt);
 	INIT_RADIX_TREE(&bdi->cgwb_tree, GFP_ATOMIC);
 	bdi->cgwb_congested_tree = RB_ROOT;
+	mutex_init(&bdi->cgwb_release_mutex);
 	ret = wb_init(&bdi->wb, bdi, 1, GFP_KERNEL);
 	if (!ret) {
 	spin_lock_irq(&cgwb_lock);
 	radix_tree_for_each_slot(slot, &bdi->cgwb_tree, &iter, 0)
 		cgwb_kill(*slot);
+	spin_unlock_irq(&cgwb_lock);
+	mutex_lock(&bdi->cgwb_release_mutex);
+	spin_lock_irq(&cgwb_lock);
 	while (!list_empty(&bdi->wb_list)) {
 		wb = list_first_entry(&bdi->wb_list, struct bdi_writeback,
 				      bdi_node);
 		spin_lock_irq(&cgwb_lock);
 	}
 	spin_unlock_irq(&cgwb_lock);
+	mutex_unlock(&bdi->cgwb_release_mutex);
 }
 /**

mm/memblock.c+0−1

@@ -20,7 +20,6 @@ · 19 unmodified lines
20	#include <linux/kmemleak.h>	20	#include <linux/kmemleak.h>
21	#include <linux/seq_file.h>	21	#include <linux/seq_file.h>
22	#include <linux/memblock.h>	22	#include <linux/memblock.h>
23	#include <linux/bootmem.h>
24		23
25	#include <asm/sections.h>	24	#include <asm/sections.h>
26	#include <linux/io.h>	25	#include <linux/io.h>

mm/slab_common.c+4−0

 	list_del(&s->list);
 	if (s->flags & SLAB_TYPESAFE_BY_RCU) {
+#ifdef SLAB_SUPPORTS_SYSFS
+		sysfs_slab_unlink(s);
+#endif
 		list_add_tail(&s->list, &slab_caches_to_rcu_destroy);
 		schedule_work(&slab_caches_to_rcu_destroy_work);
 	} else {
 #ifdef SLAB_SUPPORTS_SYSFS
+		sysfs_slab_unlink(s);
 		sysfs_slab_release(s);
 #else
 		slab_kmem_cache_release(s);

mm/slub.c+6−1

 	kset_unregister(s->memcg_kset);
 #endif
 	kobject_uevent(&s->kobj, KOBJ_REMOVE);
-	kobject_del(&s->kobj);
 out:
 	kobject_put(&s->kobj);
 }
 	schedule_work(&s->kobj_remove_work);
 }
+void sysfs_slab_unlink(struct kmem_cache *s)
+{
+	if (slab_state >= FULL)
+		kobject_del(&s->kobj);
+}
 void sysfs_slab_release(struct kmem_cache *s)
 {
 	if (slab_state >= FULL)

mm/vmstat.c+0−2

 		 * to occur in the future. Keep on running the
 		 * update worker thread.
 		 */
-		preempt_disable();
 		queue_delayed_work_on(smp_processor_id(), mm_percpu_wq,
 				this_cpu_ptr(&vmstat_work),
 				round_jiffies_relative(sysctl_stat_interval));
-		preempt_enable();
 	}
 }

net/appletalk/ddp.c+1−1

@@ -1869,7 +1869,7 @@ static const struct proto_ops atalk_dgram_ops = { · 1868 unmodified lines
1869	.socketpair = sock_no_socketpair,	1869	.socketpair = sock_no_socketpair,
1870	.accept = sock_no_accept,	1870	.accept = sock_no_accept,
1871	.getname = atalk_getname,	1871	.getname = atalk_getname,
1872	.poll_mask = datagram_poll_mask,	1872	.poll = datagram_poll,
1873	.ioctl = atalk_ioctl,	1873	.ioctl = atalk_ioctl,
1874	#ifdef CONFIG_COMPAT	1874	#ifdef CONFIG_COMPAT
1875	.compat_ioctl = atalk_compat_ioctl,	1875	.compat_ioctl = atalk_compat_ioctl,

net/atm/br2684.c+1−2

@@ -252,8 +252,7 @@ static int br2684_xmit_vcc(struct sk_buff skb, struct net_device dev, · 251 unmodified lines
252		252
253	ATM_SKB(skb)->vcc = atmvcc = brvcc->atmvcc;	253	ATM_SKB(skb)->vcc = atmvcc = brvcc->atmvcc;
254	pr_debug("atm_skb(%p)->vcc(%p)->dev(%p)\n", skb, atmvcc, atmvcc->dev);	254	pr_debug("atm_skb(%p)->vcc(%p)->dev(%p)\n", skb, atmvcc, atmvcc->dev);
255	refcount_add(skb->truesize, &sk_atm(atmvcc)->sk_wmem_alloc);	255	atm_account_tx(atmvcc, skb);
256	ATM_SKB(skb)->atm_options = atmvcc->atm_options;
257	dev->stats.tx_packets++;	256	dev->stats.tx_packets++;
258	dev->stats.tx_bytes += skb->len;	257	dev->stats.tx_bytes += skb->len;
259		258

net/atm/clip.c+1−2

 		memcpy(here, llc_oui, sizeof(llc_oui));
 		((__be16 *) here)[3] = skb->protocol;
 	}
-	refcount_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
+	atm_account_tx(vcc, skb);
-	ATM_SKB(skb)->atm_options = vcc->atm_options;
 	entry->vccs->last_use = jiffies;
 	pr_debug("atm_skb(%p)->vcc(%p)->dev(%p)\n", skb, vcc, vcc->dev);
 	old = xchg(&entry->vccs->xoff, 1);	/* assume XOFF ... */

net/atm/common.c+9−5

 		goto out;
 	}
 	pr_debug("%d += %d\n", sk_wmem_alloc_get(sk), skb->truesize);
-	refcount_add(skb->truesize, &sk->sk_wmem_alloc);
+	atm_account_tx(vcc, skb);
 	skb->dev = NULL; /* for paths shared with net_device interfaces */
-	ATM_SKB(skb)->atm_options = vcc->atm_options;
 	if (!copy_from_iter_full(skb_put(skb, size), size, &m->msg_iter)) {
 		kfree_skb(skb);
 		error = -EFAULT;
 	return error;
 }
-__poll_t vcc_poll_mask(struct socket *sock, __poll_t events)
+__poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait)
 {
 	struct sock *sk = sock->sk;
-	struct atm_vcc *vcc = ATM_SD(sock);
+	struct atm_vcc *vcc;
-	__poll_t mask = 0;
+	__poll_t mask;
+	sock_poll_wait(file, sk_sleep(sk), wait);
+	mask = 0;
+	vcc = ATM_SD(sock);
 	/* exceptional events */
 	if (sk->sk_err)

net/atm/common.h+1−1

@@ -17,7 +17,7 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci); · 16 unmodified lines
17	int vcc_recvmsg(struct socket sock, struct msghdr msg, size_t size,	17	int vcc_recvmsg(struct socket sock, struct msghdr msg, size_t size,
18	int flags);	18	int flags);
19	int vcc_sendmsg(struct socket sock, struct msghdr m, size_t total_len);	19	int vcc_sendmsg(struct socket sock, struct msghdr m, size_t total_len);
20	__poll_t vcc_poll_mask(struct socket *sock, __poll_t events);	20	__poll_t vcc_poll(struct file file, struct socket sock, poll_table *wait);
21	int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);	21	int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
22	int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);	22	int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
23	int vcc_setsockopt(struct socket *sock, int level, int optname,	23	int vcc_setsockopt(struct socket *sock, int level, int optname,

net/atm/lec.c+1−2

@@ -182,9 +182,8 @@ lec_send(struct atm_vcc vcc, struct sk_buff skb) · 181 unmodified lines
182	struct net_device *dev = skb->dev;	182	struct net_device *dev = skb->dev;
183		183
184	ATM_SKB(skb)->vcc = vcc;	184	ATM_SKB(skb)->vcc = vcc;
185	ATM_SKB(skb)->atm_options = vcc->atm_options;	185	atm_account_tx(vcc, skb);
186		186
187	refcount_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
188	if (vcc->send(vcc, skb) < 0) {	187	if (vcc->send(vcc, skb) < 0) {
189	dev->stats.tx_dropped++;	188	dev->stats.tx_dropped++;
190	return;	189	return;

net/atm/mpc.c+1−2

@@ -555,8 +555,7 @@ static int send_via_shortcut(struct sk_buff skb, struct mpoa_client mpc) · 554 unmodified lines
555	sizeof(struct llc_snap_hdr));	555	sizeof(struct llc_snap_hdr));
556	}	556	}
557		557
558	refcount_add(skb->truesize, &sk_atm(entry->shortcut)->sk_wmem_alloc);	558	atm_account_tx(entry->shortcut, skb);
559	ATM_SKB(skb)->atm_options = entry->shortcut->atm_options;
560	entry->shortcut->send(entry->shortcut, skb);	559	entry->shortcut->send(entry->shortcut, skb);
561	entry->packets_fwded++;	560	entry->packets_fwded++;
562	mpc->in_ops->put(entry);	561	mpc->in_ops->put(entry);

net/atm/pppoatm.c+1−2

@@ -350,8 +350,7 @@ static int pppoatm_send(struct ppp_channel chan, struct sk_buff skb) · 349 unmodified lines
350	return 1;	350	return 1;
351	}	351	}
352		352
353	refcount_add(skb->truesize, &sk_atm(ATM_SKB(skb)->vcc)->sk_wmem_alloc);	353	atm_account_tx(vcc, skb);
354	ATM_SKB(skb)->atm_options = ATM_SKB(skb)->vcc->atm_options;
355	pr_debug("atm_skb(%p)->vcc(%p)->dev(%p)\n",	354	pr_debug("atm_skb(%p)->vcc(%p)->dev(%p)\n",
356	skb, ATM_SKB(skb)->vcc, ATM_SKB(skb)->vcc->dev);	355	skb, ATM_SKB(skb)->vcc, ATM_SKB(skb)->vcc->dev);
357	ret = ATM_SKB(skb)->vcc->send(ATM_SKB(skb)->vcc, skb)	356	ret = ATM_SKB(skb)->vcc->send(ATM_SKB(skb)->vcc, skb)

net/atm/pvc.c+1−1

@@ -113,7 +113,7 @@ static const struct proto_ops pvc_proto_ops = { · 112 unmodified lines
113	.socketpair = sock_no_socketpair,	113	.socketpair = sock_no_socketpair,
114	.accept = sock_no_accept,	114	.accept = sock_no_accept,
115	.getname = pvc_getname,	115	.getname = pvc_getname,
116	.poll_mask = vcc_poll_mask,	116	.poll = vcc_poll,
117	.ioctl = vcc_ioctl,	117	.ioctl = vcc_ioctl,
118	#ifdef CONFIG_COMPAT	118	#ifdef CONFIG_COMPAT
119	.compat_ioctl = vcc_compat_ioctl,	119	.compat_ioctl = vcc_compat_ioctl,

net/atm/raw.c+2−2

@@ -35,8 +35,8 @@ static void atm_pop_raw(struct atm_vcc vcc, struct sk_buff skb) · 34 unmodified lines
35	struct sock *sk = sk_atm(vcc);	35	struct sock *sk = sk_atm(vcc);
36		36
37	pr_debug("(%d) %d -= %d\n",	37	pr_debug("(%d) %d -= %d\n",
38	vcc->vci, sk_wmem_alloc_get(sk), skb->truesize);	38	vcc->vci, sk_wmem_alloc_get(sk), ATM_SKB(skb)->acct_truesize);
39	WARN_ON(refcount_sub_and_test(skb->truesize, &sk->sk_wmem_alloc));	39	WARN_ON(refcount_sub_and_test(ATM_SKB(skb)->acct_truesize, &sk->sk_wmem_alloc));
40	dev_kfree_skb_any(skb);	40	dev_kfree_skb_any(skb);
41	sk->sk_write_space(sk);	41	sk->sk_write_space(sk);
42	}	42	}

net/atm/svc.c+1−1

@@ -636,7 +636,7 @@ static const struct proto_ops svc_proto_ops = { · 635 unmodified lines
636	.socketpair = sock_no_socketpair,	636	.socketpair = sock_no_socketpair,
637	.accept = svc_accept,	637	.accept = svc_accept,
638	.getname = svc_getname,	638	.getname = svc_getname,
639	.poll_mask = vcc_poll_mask,	639	.poll = vcc_poll,
640	.ioctl = svc_ioctl,	640	.ioctl = svc_ioctl,
641	#ifdef CONFIG_COMPAT	641	#ifdef CONFIG_COMPAT
642	.compat_ioctl = svc_compat_ioctl,	642	.compat_ioctl = svc_compat_ioctl,

net/ax25/af_ax25.c+1−1

@@ -1941,7 +1941,7 @@ static const struct proto_ops ax25_proto_ops = { · 1940 unmodified lines
1941	.socketpair = sock_no_socketpair,	1941	.socketpair = sock_no_socketpair,
1942	.accept = ax25_accept,	1942	.accept = ax25_accept,
1943	.getname = ax25_getname,	1943	.getname = ax25_getname,
1944	.poll_mask = datagram_poll_mask,	1944	.poll = datagram_poll,
1945	.ioctl = ax25_ioctl,	1945	.ioctl = ax25_ioctl,
1946	.listen = ax25_listen,	1946	.listen = ax25_listen,
1947	.shutdown = ax25_shutdown,	1947	.shutdown = ax25_shutdown,

net/bluetooth/af_bluetooth.c+5−2

 	return 0;
 }
-__poll_t bt_sock_poll_mask(struct socket *sock, __poll_t events)
+__poll_t bt_sock_poll(struct file *file, struct socket *sock,
+			  poll_table *wait)
 {
 	struct sock *sk = sock->sk;
 	__poll_t mask = 0;
 	BT_DBG("sock %p, sk %p", sock, sk);
+	poll_wait(file, sk_sleep(sk), wait);
 	if (sk->sk_state == BT_LISTEN)
 		return bt_accept_poll(sk);
 	return mask;
 }
-EXPORT_SYMBOL(bt_sock_poll_mask);
+EXPORT_SYMBOL(bt_sock_poll);
 int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 {

net/bluetooth/hci_sock.c+1−1

@@ -1975,7 +1975,7 @@ static const struct proto_ops hci_sock_ops = { · 1974 unmodified lines
1975	.sendmsg = hci_sock_sendmsg,	1975	.sendmsg = hci_sock_sendmsg,
1976	.recvmsg = hci_sock_recvmsg,	1976	.recvmsg = hci_sock_recvmsg,
1977	.ioctl = hci_sock_ioctl,	1977	.ioctl = hci_sock_ioctl,
1978	.poll_mask = datagram_poll_mask,	1978	.poll = datagram_poll,
1979	.listen = sock_no_listen,	1979	.listen = sock_no_listen,
1980	.shutdown = sock_no_shutdown,	1980	.shutdown = sock_no_shutdown,
1981	.setsockopt = hci_sock_setsockopt,	1981	.setsockopt = hci_sock_setsockopt,

net/bluetooth/l2cap_sock.c+1−1

@@ -1653,7 +1653,7 @@ static const struct proto_ops l2cap_sock_ops = { · 1652 unmodified lines
1653	.getname = l2cap_sock_getname,	1653	.getname = l2cap_sock_getname,
1654	.sendmsg = l2cap_sock_sendmsg,	1654	.sendmsg = l2cap_sock_sendmsg,
1655	.recvmsg = l2cap_sock_recvmsg,	1655	.recvmsg = l2cap_sock_recvmsg,
1656	.poll_mask = bt_sock_poll_mask,	1656	.poll = bt_sock_poll,
1657	.ioctl = bt_sock_ioctl,	1657	.ioctl = bt_sock_ioctl,
1658	.mmap = sock_no_mmap,	1658	.mmap = sock_no_mmap,
1659	.socketpair = sock_no_socketpair,	1659	.socketpair = sock_no_socketpair,

net/bluetooth/rfcomm/sock.c+1−1

@@ -1049,7 +1049,7 @@ static const struct proto_ops rfcomm_sock_ops = { · 1048 unmodified lines
1049	.setsockopt = rfcomm_sock_setsockopt,	1049	.setsockopt = rfcomm_sock_setsockopt,
1050	.getsockopt = rfcomm_sock_getsockopt,	1050	.getsockopt = rfcomm_sock_getsockopt,
1051	.ioctl = rfcomm_sock_ioctl,	1051	.ioctl = rfcomm_sock_ioctl,
1052	.poll_mask = bt_sock_poll_mask,	1052	.poll = bt_sock_poll,
1053	.socketpair = sock_no_socketpair,	1053	.socketpair = sock_no_socketpair,
1054	.mmap = sock_no_mmap	1054	.mmap = sock_no_mmap
1055	};	1055	};

net/bluetooth/sco.c+1−1

@@ -1197,7 +1197,7 @@ static const struct proto_ops sco_sock_ops = { · 1196 unmodified lines
1197	.getname = sco_sock_getname,	1197	.getname = sco_sock_getname,
1198	.sendmsg = sco_sock_sendmsg,	1198	.sendmsg = sco_sock_sendmsg,
1199	.recvmsg = sco_sock_recvmsg,	1199	.recvmsg = sco_sock_recvmsg,
1200	.poll_mask = bt_sock_poll_mask,	1200	.poll = bt_sock_poll,
1201	.ioctl = bt_sock_ioctl,	1201	.ioctl = bt_sock_ioctl,
1202	.mmap = sock_no_mmap,	1202	.mmap = sock_no_mmap,
1203	.socketpair = sock_no_socketpair,	1203	.socketpair = sock_no_socketpair,

net/bpfilter/.gitignore+1−0

@@ -0,0 +1 @@
		1	bpfilter_umh

net/bpfilter/Makefile+4−2

 # which bpfilter_kern.c passes further into umh blob loader at run-time
 quiet_cmd_copy_umh = GEN $@
       cmd_copy_umh = echo ':' > $(obj)/.bpfilter_umh.o.cmd; \
-      $(OBJCOPY) -I binary -O `$(OBJDUMP) -f $<|grep format|cut -d' ' -f8` \
+      $(OBJCOPY) -I binary \
-      -B `$(OBJDUMP) -f $<|grep architecture|cut -d, -f1|cut -d' ' -f2` \
+          `LC_ALL=C $(OBJDUMP) -f net/bpfilter/bpfilter_umh \
+          |awk -F' |,' '/file format/{print "-O",$$NF} \
+          /^architecture:/{print "-B",$$2}'` \
       --rename-section .data=.init.rodata $< $@
 $(obj)/bpfilter_umh.o: $(obj)/bpfilter_umh

net/caif/caif_socket.c+8−4

@@ -934,11 +934,15 @@ static int caif_release(struct socket *sock) · 933 unmodified lines
934	}	934	}
935		935
936	/* Copied from af_unix.c:unix_poll(), added CAIF tx_flow handling */	936	/* Copied from af_unix.c:unix_poll(), added CAIF tx_flow handling */
937	static __poll_t caif_poll_mask(struct socket *sock, __poll_t events)	937	static __poll_t caif_poll(struct file *file,
		938	struct socket sock, poll_table wait)
938	{	939	{
939	struct sock *sk = sock->sk;	940	struct sock *sk = sock->sk;
		941	__poll_t mask;
940	struct caifsock *cf_sk = container_of(sk, struct caifsock, sk);	942	struct caifsock *cf_sk = container_of(sk, struct caifsock, sk);
941	__poll_t mask = 0;	943
		944	sock_poll_wait(file, sk_sleep(sk), wait);
		945	mask = 0;
942		946
943	/* exceptional events? */	947	/* exceptional events? */
944	if (sk->sk_err)	948	if (sk->sk_err)
@@ -972,7 +976,7 @@ static const struct proto_ops caif_seqpacket_ops = { · 27 unmodified lines
972	.socketpair = sock_no_socketpair,	976	.socketpair = sock_no_socketpair,
973	.accept = sock_no_accept,	977	.accept = sock_no_accept,
974	.getname = sock_no_getname,	978	.getname = sock_no_getname,
975	.poll_mask = caif_poll_mask,	979	.poll = caif_poll,
976	.ioctl = sock_no_ioctl,	980	.ioctl = sock_no_ioctl,
977	.listen = sock_no_listen,	981	.listen = sock_no_listen,
978	.shutdown = sock_no_shutdown,	982	.shutdown = sock_no_shutdown,
@@ -993,7 +997,7 @@ static const struct proto_ops caif_stream_ops = { · 14 unmodified lines
993	.socketpair = sock_no_socketpair,	997	.socketpair = sock_no_socketpair,
994	.accept = sock_no_accept,	998	.accept = sock_no_accept,
995	.getname = sock_no_getname,	999	.getname = sock_no_getname,
996	.poll_mask = caif_poll_mask,	1000	.poll = caif_poll,
997	.ioctl = sock_no_ioctl,	1001	.ioctl = sock_no_ioctl,
998	.listen = sock_no_listen,	1002	.listen = sock_no_listen,
999	.shutdown = sock_no_shutdown,	1003	.shutdown = sock_no_shutdown,

net/can/bcm.c+1−1

@@ -1660,7 +1660,7 @@ static const struct proto_ops bcm_ops = { · 1659 unmodified lines
1660	.socketpair = sock_no_socketpair,	1660	.socketpair = sock_no_socketpair,
1661	.accept = sock_no_accept,	1661	.accept = sock_no_accept,
1662	.getname = sock_no_getname,	1662	.getname = sock_no_getname,
1663	.poll_mask = datagram_poll_mask,	1663	.poll = datagram_poll,
1664	.ioctl = can_ioctl, /* use can_ioctl() from af_can.c */	1664	.ioctl = can_ioctl, /* use can_ioctl() from af_can.c */
1665	.listen = sock_no_listen,	1665	.listen = sock_no_listen,
1666	.shutdown = sock_no_shutdown,	1666	.shutdown = sock_no_shutdown,

net/can/raw.c+1−1

@@ -843,7 +843,7 @@ static const struct proto_ops raw_ops = { · 842 unmodified lines
843	.socketpair = sock_no_socketpair,	843	.socketpair = sock_no_socketpair,
844	.accept = sock_no_accept,	844	.accept = sock_no_accept,
845	.getname = raw_getname,	845	.getname = raw_getname,
846	.poll_mask = datagram_poll_mask,	846	.poll = datagram_poll,
847	.ioctl = can_ioctl, /* use can_ioctl() from af_can.c */	847	.ioctl = can_ioctl, /* use can_ioctl() from af_can.c */
848	.listen = sock_no_listen,	848	.listen = sock_no_listen,
849	.shutdown = sock_no_shutdown,	849	.shutdown = sock_no_shutdown,

net/core/datagram.c+9−4

 /**
  * 	datagram_poll - generic datagram poll
+ *	@file: file struct
  *	@sock: socket
- *	@events to wait for
+ *	@wait: poll table
  *
  *	Datagram poll: Again totally generic. This also handles
  *	sequenced packet sockets providing the socket receive queue
  *	and you use a different write policy from sock_writeable()
  *	then please supply your own write_space callback.
  */
-__poll_t datagram_poll_mask(struct socket *sock, __poll_t events)
+__poll_t datagram_poll(struct file *file, struct socket *sock,
+			   poll_table *wait)
 {
 	struct sock *sk = sock->sk;
-	__poll_t mask = 0;
+	__poll_t mask;
+	sock_poll_wait(file, sk_sleep(sk), wait);
+	mask = 0;
 	/* exceptional events? */
 	if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
 	return mask;
 }
-EXPORT_SYMBOL(datagram_poll_mask);
+EXPORT_SYMBOL(datagram_poll);

net/core/dev.c+2−2

 		/* We get here if we can't use the current device name */
 		if (!pat)
 			goto out;
-		if (dev_get_valid_name(net, dev, pat) < 0)
+		err = dev_get_valid_name(net, dev, pat);
+		if (err < 0)
 			goto out;
 	}
 	dev_close(dev);
 	/* And unlink it from device chain */
-	err = -ENODEV;
 	unlist_netdevice(dev);
 	synchronize_net();

net/core/filter.c+4−17

 }
 EXPORT_SYMBOL_GPL(xdp_do_redirect);
-static int __xdp_generic_ok_fwd_dev(struct sk_buff *skb, struct net_device *fwd)
-{
-	unsigned int len;
-	if (unlikely(!(fwd->flags & IFF_UP)))
-		return -ENETDOWN;
-	len = fwd->mtu + fwd->hard_header_len + VLAN_HLEN;
-	if (skb->len > len)
-		return -EMSGSIZE;
-	return 0;
-}
 static int xdp_do_generic_redirect_map(struct net_device *dev,
 				       struct sk_buff *skb,
 				       struct xdp_buff *xdp,
 	}
 	if (map->map_type == BPF_MAP_TYPE_DEVMAP) {
-		if (unlikely((err = __xdp_generic_ok_fwd_dev(skb, fwd))))
+		struct bpf_dtab_netdev *dst = fwd;
+		err = dev_map_generic_redirect(dst, skb, xdp_prog);
+		if (unlikely(err))
 			goto err;
-		skb->dev = fwd;
-		generic_xdp_tx(skb, xdp_prog);
 	} else if (map->map_type == BPF_MAP_TYPE_XSKMAP) {
 		struct xdp_sock *xs = fwd;

net/dccp/ccids/ccid3.c+9−7

 {
 	struct ccid3_hc_rx_sock *hc = ccid3_hc_rx_sk(sk);
 	struct dccp_sock *dp = dccp_sk(sk);
-	ktime_t now = ktime_get_real();
+	ktime_t now = ktime_get();
 	s64 delta = 0;
 	switch (fbtype) {
 	case CCID3_FBACK_PERIODIC:
 		delta = ktime_us_delta(now, hc->rx_tstamp_last_feedback);
 		if (delta <= 0)
-			DCCP_BUG("delta (%ld) <= 0", (long)delta);
+			delta = 1;
-		else
+		hc->rx_x_recv = scaled_div32(hc->rx_bytes_recv, delta);
-			hc->rx_x_recv = scaled_div32(hc->rx_bytes_recv, delta);
 		break;
 	default:
 		return;
 	}
-	ccid3_pr_debug("Interval %ldusec, X_recv=%u, 1/p=%u\n", (long)delta,
+	ccid3_pr_debug("Interval %lldusec, X_recv=%u, 1/p=%u\n", delta,
 		       hc->rx_x_recv, hc->rx_pinv);
 	hc->rx_tstamp_last_feedback = now;
 static u32 ccid3_first_li(struct sock *sk)
 {
 	struct ccid3_hc_rx_sock *hc = ccid3_hc_rx_sk(sk);
-	u32 x_recv, p, delta;
+	u32 x_recv, p;
+	s64 delta;
 	u64 fval;
 	if (hc->rx_rtt == 0) {
 		hc->rx_rtt = DCCP_FALLBACK_RTT;
 	}
-	delta  = ktime_to_us(net_timedelta(hc->rx_tstamp_last_feedback));
+	delta = ktime_us_delta(ktime_get(), hc->rx_tstamp_last_feedback);
+	if (delta <= 0)
+		delta = 1;
 	x_recv = scaled_div32(hc->rx_bytes_recv, delta);
 	if (x_recv == 0) {		/* would also trigger divide-by-zero */
 		DCCP_WARN("X_recv==0\n");

net/dccp/dccp.h+2−1

@@ -316,7 +316,8 @@ int dccp_recvmsg(struct sock sk, struct msghdr msg, size_t len, int nonblock, · 315 unmodified lines
316	int flags, int *addr_len);	316	int flags, int *addr_len);
317	void dccp_shutdown(struct sock *sk, int how);	317	void dccp_shutdown(struct sock *sk, int how);
318	int inet_dccp_listen(struct socket *sock, int backlog);	318	int inet_dccp_listen(struct socket *sock, int backlog);
319	__poll_t dccp_poll_mask(struct socket *sock, __poll_t events);	319	__poll_t dccp_poll(struct file file, struct socket sock,
		320	poll_table *wait);
320	int dccp_v4_connect(struct sock sk, struct sockaddr uaddr, int addr_len);	321	int dccp_v4_connect(struct sock sk, struct sockaddr uaddr, int addr_len);
321	void dccp_req_err(struct sock *sk, u64 seq);	322	void dccp_req_err(struct sock *sk, u64 seq);
322		323

net/dccp/ipv4.c+1−1

@@ -984,7 +984,7 @@ static const struct proto_ops inet_dccp_ops = { · 983 unmodified lines
984	.accept = inet_accept,	984	.accept = inet_accept,
985	.getname = inet_getname,	985	.getname = inet_getname,
986	/* FIXME: work on tcp_poll to rename it to inet_csk_poll */	986	/* FIXME: work on tcp_poll to rename it to inet_csk_poll */
987	.poll_mask = dccp_poll_mask,	987	.poll = dccp_poll,
988	.ioctl = inet_ioctl,	988	.ioctl = inet_ioctl,
989	/* FIXME: work on inet_listen to rename it to sock_common_listen */	989	/* FIXME: work on inet_listen to rename it to sock_common_listen */
990	.listen = inet_dccp_listen,	990	.listen = inet_dccp_listen,

net/dccp/ipv6.c+1−1

@@ -1070,7 +1070,7 @@ static const struct proto_ops inet6_dccp_ops = { · 1069 unmodified lines
1070	.socketpair = sock_no_socketpair,	1070	.socketpair = sock_no_socketpair,
1071	.accept = inet_accept,	1071	.accept = inet_accept,
1072	.getname = inet6_getname,	1072	.getname = inet6_getname,
1073	.poll_mask = dccp_poll_mask,	1073	.poll = dccp_poll,
1074	.ioctl = inet6_ioctl,	1074	.ioctl = inet6_ioctl,
1075	.listen = inet_dccp_listen,	1075	.listen = inet_dccp_listen,
1076	.shutdown = inet_shutdown,	1076	.shutdown = inet_shutdown,

net/dccp/proto.c+11−2

 EXPORT_SYMBOL_GPL(dccp_disconnect);
-__poll_t dccp_poll_mask(struct socket *sock, __poll_t events)
+/*
+ *	Wait for a DCCP event.
+ *
+ *	Note that we don't need to lock the socket, as the upper poll layers
+ *	take care of normal races (between the test and the event) and we don't
+ *	go look at any of the socket buffers directly.
+ */
+__poll_t dccp_poll(struct file *file, struct socket *sock,
+		       poll_table *wait)
 {
 	__poll_t mask;
 	struct sock *sk = sock->sk;
+	sock_poll_wait(file, sk_sleep(sk), wait);
 	if (sk->sk_state == DCCP_LISTEN)
 		return inet_csk_listen_poll(sk);
 	return mask;
 }
-EXPORT_SYMBOL_GPL(dccp_poll_mask);
+EXPORT_SYMBOL_GPL(dccp_poll);
 int dccp_ioctl(struct sock *sk, int cmd, unsigned long arg)
 {

net/decnet/af_decnet.c+3−3

@@ -1207,11 +1207,11 @@ static int dn_getname(struct socket sock, struct sockaddr uaddr,int peer) · 1206 unmodified lines
1207	}	1207	}
1208		1208
1209		1209
1210	static __poll_t dn_poll_mask(struct socket *sock, __poll_t events)	1210	static __poll_t dn_poll(struct file file, struct socket sock, poll_table *wait)
1211	{	1211	{
1212	struct sock *sk = sock->sk;	1212	struct sock *sk = sock->sk;
1213	struct dn_scp *scp = DN_SK(sk);	1213	struct dn_scp *scp = DN_SK(sk);
1214	__poll_t mask = datagram_poll_mask(sock, events);	1214	__poll_t mask = datagram_poll(file, sock, wait);
1215		1215
1216	if (!skb_queue_empty(&scp->other_receive_queue))	1216	if (!skb_queue_empty(&scp->other_receive_queue))
1217	mask \|= EPOLLRDBAND;	1217	mask \|= EPOLLRDBAND;
@@ -2331,7 +2331,7 @@ static const struct proto_ops dn_proto_ops = { · 1113 unmodified lines
2331	.socketpair = sock_no_socketpair,	2331	.socketpair = sock_no_socketpair,
2332	.accept = dn_accept,	2332	.accept = dn_accept,
2333	.getname = dn_getname,	2333	.getname = dn_getname,
2334	.poll_mask = dn_poll_mask,	2334	.poll = dn_poll,
2335	.ioctl = dn_ioctl,	2335	.ioctl = dn_ioctl,
2336	.listen = dn_listen,	2336	.listen = dn_listen,
2337	.shutdown = dn_shutdown,	2337	.shutdown = dn_shutdown,

net/ieee802154/socket.c+2−2

@@ -423,7 +423,7 @@ static const struct proto_ops ieee802154_raw_ops = { · 422 unmodified lines
423	.socketpair = sock_no_socketpair,	423	.socketpair = sock_no_socketpair,
424	.accept = sock_no_accept,	424	.accept = sock_no_accept,
425	.getname = sock_no_getname,	425	.getname = sock_no_getname,
426	.poll_mask = datagram_poll_mask,	426	.poll = datagram_poll,
427	.ioctl = ieee802154_sock_ioctl,	427	.ioctl = ieee802154_sock_ioctl,
428	.listen = sock_no_listen,	428	.listen = sock_no_listen,
429	.shutdown = sock_no_shutdown,	429	.shutdown = sock_no_shutdown,
@@ -969,7 +969,7 @@ static const struct proto_ops ieee802154_dgram_ops = { · 539 unmodified lines
969	.socketpair = sock_no_socketpair,	969	.socketpair = sock_no_socketpair,
970	.accept = sock_no_accept,	970	.accept = sock_no_accept,
971	.getname = sock_no_getname,	971	.getname = sock_no_getname,
972	.poll_mask = datagram_poll_mask,	972	.poll = datagram_poll,
973	.ioctl = ieee802154_sock_ioctl,	973	.ioctl = ieee802154_sock_ioctl,
974	.listen = sock_no_listen,	974	.listen = sock_no_listen,
975	.shutdown = sock_no_shutdown,	975	.shutdown = sock_no_shutdown,

net/ipv4/af_inet.c+4−4

@@ -986,7 +986,7 @@ const struct proto_ops inet_stream_ops = { · 985 unmodified lines
986	.socketpair = sock_no_socketpair,	986	.socketpair = sock_no_socketpair,
987	.accept = inet_accept,	987	.accept = inet_accept,
988	.getname = inet_getname,	988	.getname = inet_getname,
989	.poll_mask = tcp_poll_mask,	989	.poll = tcp_poll,
990	.ioctl = inet_ioctl,	990	.ioctl = inet_ioctl,
991	.listen = inet_listen,	991	.listen = inet_listen,
992	.shutdown = inet_shutdown,	992	.shutdown = inet_shutdown,
@@ -1021,7 +1021,7 @@ const struct proto_ops inet_dgram_ops = { · 28 unmodified lines
1021	.socketpair = sock_no_socketpair,	1021	.socketpair = sock_no_socketpair,
1022	.accept = sock_no_accept,	1022	.accept = sock_no_accept,
1023	.getname = inet_getname,	1023	.getname = inet_getname,
1024	.poll_mask = udp_poll_mask,	1024	.poll = udp_poll,
1025	.ioctl = inet_ioctl,	1025	.ioctl = inet_ioctl,
1026	.listen = sock_no_listen,	1026	.listen = sock_no_listen,
1027	.shutdown = inet_shutdown,	1027	.shutdown = inet_shutdown,
@@ -1042,7 +1042,7 @@ EXPORT_SYMBOL(inet_dgram_ops); · 14 unmodified lines
1042		1042
1043	/*	1043	/*
1044	* For SOCK_RAW sockets; should be the same as inet_dgram_ops but without	1044	* For SOCK_RAW sockets; should be the same as inet_dgram_ops but without
1045	* udp_poll_mask	1045	* udp_poll
1046	*/	1046	*/
1047	static const struct proto_ops inet_sockraw_ops = {	1047	static const struct proto_ops inet_sockraw_ops = {
1048	.family = PF_INET,	1048	.family = PF_INET,
@@ -1053,7 +1053,7 @@ static const struct proto_ops inet_sockraw_ops = { · 4 unmodified lines
1053	.socketpair = sock_no_socketpair,	1053	.socketpair = sock_no_socketpair,
1054	.accept = sock_no_accept,	1054	.accept = sock_no_accept,
1055	.getname = inet_getname,	1055	.getname = inet_getname,
1056	.poll_mask = datagram_poll_mask,	1056	.poll = datagram_poll,
1057	.ioctl = inet_ioctl,	1057	.ioctl = inet_ioctl,
1058	.listen = sock_no_listen,	1058	.listen = sock_no_listen,
1059	.shutdown = inet_shutdown,	1059	.shutdown = inet_shutdown,

net/ipv4/inet_hashtables.c+2−2

@@ -243,9 +243,9 @@ static inline int compute_score(struct sock sk, struct net net, · 242 unmodified lines
243	bool dev_match = (sk->sk_bound_dev_if == dif \|\|	243	bool dev_match = (sk->sk_bound_dev_if == dif \|\|
244	sk->sk_bound_dev_if == sdif);	244	sk->sk_bound_dev_if == sdif);
245		245
246	if (exact_dif && !dev_match)	246	if (!dev_match)
247	return -1;	247	return -1;
248	if (sk->sk_bound_dev_if && dev_match)	248	if (sk->sk_bound_dev_if)
249	score += 4;	249	score += 4;
250	}	250	}
251	if (sk->sk_incoming_cpu == raw_smp_processor_id())	251	if (sk->sk_incoming_cpu == raw_smp_processor_id())

net/ipv4/ip_output.c+2−1

@@ -1145,7 +1145,8 @@ static int ip_setup_cork(struct sock sk, struct inet_cork cork, · 1144 unmodified lines
1145	cork->fragsize = ip_sk_use_pmtu(sk) ?	1145	cork->fragsize = ip_sk_use_pmtu(sk) ?
1146	dst_mtu(&rt->dst) : rt->dst.dev->mtu;	1146	dst_mtu(&rt->dst) : rt->dst.dev->mtu;
1147		1147
1148	cork->gso_size = sk->sk_type == SOCK_DGRAM ? ipc->gso_size : 0;	1148	cork->gso_size = sk->sk_type == SOCK_DGRAM &&
		1149	sk->sk_protocol == IPPROTO_UDP ? ipc->gso_size : 0;
1149	cork->dst = &rt->dst;	1150	cork->dst = &rt->dst;
1150	cork->length = 0;	1151	cork->length = 0;
1151	cork->ttl = ipc->ttl;	1152	cork->ttl = ipc->ttl;

net/ipv4/tcp.c+17−6

 }
 /*
- * Socket is not locked. We are protected from async events by poll logic and
+ *	Wait for a TCP event.
- * correct handling of state changes made by other threads is impossible in
+ *
- * any case.
+ *	Note that we don't need to lock the socket, as the upper poll layers
+ *	take care of normal races (between the test and the event) and we don't
+ *	go look at any of the socket buffers directly.
  */
-__poll_t tcp_poll_mask(struct socket *sock, __poll_t events)
+__poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
 {
+	__poll_t mask;
 	struct sock *sk = sock->sk;
 	const struct tcp_sock *tp = tcp_sk(sk);
-	__poll_t mask = 0;
 	int state;
+	sock_poll_wait(file, sk_sleep(sk), wait);
 	state = inet_sk_state_load(sk);
 	if (state == TCP_LISTEN)
 		return inet_csk_listen_poll(sk);
+	/* Socket is not locked. We are protected from async events
+	 * by poll logic and correct handling of state changes
+	 * made by other threads is impossible in any case.
+	 */
+	mask = 0;
 	/*
 	 * EPOLLHUP is certainly not done right. But poll() doesn't
 	 * have a notion of HUP in just one direction, and for a
 	return mask;
 }
-EXPORT_SYMBOL(tcp_poll_mask);
+EXPORT_SYMBOL(tcp_poll);
 int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg)
 {

net/ipv4/udp.c+5−5

@@ -2591,7 +2591,7 @@ int compat_udp_getsockopt(struct sock *sk, int level, int optname, · 2590 unmodified lines
2591	* udp_poll - wait for a UDP event.	2591	* udp_poll - wait for a UDP event.
2592	* @file - file struct	2592	* @file - file struct
2593	* @sock - socket	2593	* @sock - socket
2594	* @events - events to wait for	2594	* @wait - poll table
2595	*	2595	*
2596	* This is same as datagram poll, except for the special case of	2596	* This is same as datagram poll, except for the special case of
2597	* blocking sockets. If application is using a blocking fd	2597	* blocking sockets. If application is using a blocking fd
@@ -2600,23 +2600,23 @@ int compat_udp_getsockopt(struct sock *sk, int level, int optname, · 2 unmodified lines
2600	* but then block when reading it. Add special case code	2600	* but then block when reading it. Add special case code
2601	* to work around these arguably broken applications.	2601	* to work around these arguably broken applications.
2602	*/	2602	*/
2603	__poll_t udp_poll_mask(struct socket *sock, __poll_t events)	2603	__poll_t udp_poll(struct file file, struct socket sock, poll_table *wait)
2604	{	2604	{
2605	__poll_t mask = datagram_poll_mask(sock, events);	2605	__poll_t mask = datagram_poll(file, sock, wait);
2606	struct sock *sk = sock->sk;	2606	struct sock *sk = sock->sk;
2607		2607
2608	if (!skb_queue_empty(&udp_sk(sk)->reader_queue))	2608	if (!skb_queue_empty(&udp_sk(sk)->reader_queue))
2609	mask \|= EPOLLIN \| EPOLLRDNORM;	2609	mask \|= EPOLLIN \| EPOLLRDNORM;
2610		2610
2611	/* Check for false positives due to checksum errors */	2611	/* Check for false positives due to checksum errors */
2612	if ((mask & EPOLLRDNORM) && !(sock->file->f_flags & O_NONBLOCK) &&	2612	if ((mask & EPOLLRDNORM) && !(file->f_flags & O_NONBLOCK) &&
2613	!(sk->sk_shutdown & RCV_SHUTDOWN) && first_packet_length(sk) == -1)	2613	!(sk->sk_shutdown & RCV_SHUTDOWN) && first_packet_length(sk) == -1)
2614	mask &= ~(EPOLLIN \| EPOLLRDNORM);	2614	mask &= ~(EPOLLIN \| EPOLLRDNORM);
2615		2615
2616	return mask;	2616	return mask;
2617		2617
2618	}	2618	}
2619	EXPORT_SYMBOL(udp_poll_mask);	2619	EXPORT_SYMBOL(udp_poll);
2620		2620
2621	int udp_abort(struct sock *sk, int err)	2621	int udp_abort(struct sock *sk, int err)
2622	{	2622	{

net/ipv6/af_inet6.c+2−2

net/ipv6/inet6_hashtables.c+2−2

@@ -113,9 +113,9 @@ static inline int compute_score(struct sock sk, struct net net, · 112 unmodified lines
113	bool dev_match = (sk->sk_bound_dev_if == dif \|\|	113	bool dev_match = (sk->sk_bound_dev_if == dif \|\|
114	sk->sk_bound_dev_if == sdif);	114	sk->sk_bound_dev_if == sdif);
115		115
116	if (exact_dif && !dev_match)	116	if (!dev_match)
117	return -1;	117	return -1;
118	if (sk->sk_bound_dev_if && dev_match)	118	if (sk->sk_bound_dev_if)
119	score++;	119	score++;
120	}	120	}
121	if (sk->sk_incoming_cpu == raw_smp_processor_id())	121	if (sk->sk_incoming_cpu == raw_smp_processor_id())

net/ipv6/ip6_fib.c+3−2

 	return f6i;
 }
-void fib6_info_destroy(struct fib6_info *f6i)
+void fib6_info_destroy_rcu(struct rcu_head *head)
 {
+	struct fib6_info *f6i = container_of(head, struct fib6_info, rcu);
 	struct rt6_exception_bucket *bucket;
 	struct dst_metrics *m;
 	kfree(f6i);
 }
-EXPORT_SYMBOL_GPL(fib6_info_destroy);
+EXPORT_SYMBOL_GPL(fib6_info_destroy_rcu);
 static struct fib6_node *node_alloc(struct net *net)
 {

net/ipv6/ip6_output.c+2−1

@@ -1219,7 +1219,8 @@ static int ip6_setup_cork(struct sock sk, struct inet_cork_full cork, · 1218 unmodified lines
1219	if (mtu < IPV6_MIN_MTU)	1219	if (mtu < IPV6_MIN_MTU)
1220	return -EINVAL;	1220	return -EINVAL;
1221	cork->base.fragsize = mtu;	1221	cork->base.fragsize = mtu;
1222	cork->base.gso_size = sk->sk_type == SOCK_DGRAM ? ipc6->gso_size : 0;	1222	cork->base.gso_size = sk->sk_type == SOCK_DGRAM &&
		1223	sk->sk_protocol == IPPROTO_UDP ? ipc6->gso_size : 0;
1223		1224
1224	if (dst_allfrag(xfrm_dst_path(&rt->dst)))	1225	if (dst_allfrag(xfrm_dst_path(&rt->dst)))
1225	cork->base.flags \|= IPCORK_ALLFRAG;	1226	cork->base.flags \|= IPCORK_ALLFRAG;

net/ipv6/mcast.c+6−3

 		mld_send_initial_cr(idev);
 		idev->mc_dad_count--;
 		if (idev->mc_dad_count)
-			mld_dad_start_timer(idev, idev->mc_maxdelay);
+			mld_dad_start_timer(idev,
+					    unsolicited_report_interval(idev));
 	}
 }
 	if (idev->mc_dad_count) {
 		idev->mc_dad_count--;
 		if (idev->mc_dad_count)
-			mld_dad_start_timer(idev, idev->mc_maxdelay);
+			mld_dad_start_timer(idev,
+					    unsolicited_report_interval(idev));
 	}
 	in6_dev_put(idev);
 }
 	if (idev->mc_ifc_count) {
 		idev->mc_ifc_count--;
 		if (idev->mc_ifc_count)
-			mld_ifc_start_timer(idev, idev->mc_maxdelay);
+			mld_ifc_start_timer(idev,
+					    unsolicited_report_interval(idev));
 	}
 	in6_dev_put(idev);
 }

net/ipv6/raw.c+2−2

@@ -1334,7 +1334,7 @@ void raw6_proc_exit(void) · 1333 unmodified lines
1334	}	1334	}
1335	#endif /* CONFIG_PROC_FS */	1335	#endif /* CONFIG_PROC_FS */
1336		1336
1337	/* Same as inet6_dgram_ops, sans udp_poll_mask. */	1337	/* Same as inet6_dgram_ops, sans udp_poll. */
1338	const struct proto_ops inet6_sockraw_ops = {	1338	const struct proto_ops inet6_sockraw_ops = {
1339	.family = PF_INET6,	1339	.family = PF_INET6,
1340	.owner = THIS_MODULE,	1340	.owner = THIS_MODULE,
@@ -1344,7 +1344,7 @@ const struct proto_ops inet6_sockraw_ops = { · 3 unmodified lines
1344	.socketpair = sock_no_socketpair, /* a do nothing */	1344	.socketpair = sock_no_socketpair, /* a do nothing */
1345	.accept = sock_no_accept, /* a do nothing */	1345	.accept = sock_no_accept, /* a do nothing */
1346	.getname = inet6_getname,	1346	.getname = inet6_getname,
1347	.poll_mask = datagram_poll_mask, /* ok */	1347	.poll = datagram_poll, /* ok */
1348	.ioctl = inet6_ioctl, /* must change */	1348	.ioctl = inet6_ioctl, /* must change */
1349	.listen = sock_no_listen, /* ok */	1349	.listen = sock_no_listen, /* ok */
1350	.shutdown = inet_shutdown, /* ok */	1350	.shutdown = inet_shutdown, /* ok */

net/iucv/af_iucv.c+5−2

 	return 0;
 }
-static __poll_t iucv_sock_poll_mask(struct socket *sock, __poll_t events)
+__poll_t iucv_sock_poll(struct file *file, struct socket *sock,
+			    poll_table *wait)
 {
 	struct sock *sk = sock->sk;
 	__poll_t mask = 0;
+	sock_poll_wait(file, sk_sleep(sk), wait);
 	if (sk->sk_state == IUCV_LISTEN)
 		return iucv_accept_poll(sk);
 	.getname	= iucv_sock_getname,
 	.sendmsg	= iucv_sock_sendmsg,
 	.recvmsg	= iucv_sock_recvmsg,
-	.poll_mask	= iucv_sock_poll_mask,
+	.poll		= iucv_sock_poll,
 	.ioctl		= sock_no_ioctl,
 	.mmap		= sock_no_mmap,
 	.socketpair	= sock_no_socketpair,

net/kcm/kcmsock.c+5−5

@@ -1336,9 +1336,9 @@ static void init_kcm_sock(struct kcm_sock kcm, struct kcm_mux mux) · 1335 unmodified lines
1336	struct list_head *head;	1336	struct list_head *head;
1337	int index = 0;	1337	int index = 0;
1338		1338
1339	/* For SOCK_SEQPACKET sock type, datagram_poll_mask checks the sk_state,	1339	/* For SOCK_SEQPACKET sock type, datagram_poll checks the sk_state, so
1340	* so we set sk_state, otherwise epoll_wait always returns right away	1340	* we set sk_state, otherwise epoll_wait always returns right away with
1341	* with EPOLLHUP	1341	* EPOLLHUP
1342	*/	1342	*/
1343	kcm->sk.sk_state = TCP_ESTABLISHED;	1343	kcm->sk.sk_state = TCP_ESTABLISHED;
1344		1344
@@ -1903,7 +1903,7 @@ static const struct proto_ops kcm_dgram_ops = { · 558 unmodified lines
1903	.socketpair = sock_no_socketpair,	1903	.socketpair = sock_no_socketpair,
1904	.accept = sock_no_accept,	1904	.accept = sock_no_accept,
1905	.getname = sock_no_getname,	1905	.getname = sock_no_getname,
1906	.poll_mask = datagram_poll_mask,	1906	.poll = datagram_poll,
1907	.ioctl = kcm_ioctl,	1907	.ioctl = kcm_ioctl,
1908	.listen = sock_no_listen,	1908	.listen = sock_no_listen,
1909	.shutdown = sock_no_shutdown,	1909	.shutdown = sock_no_shutdown,
@@ -1924,7 +1924,7 @@ static const struct proto_ops kcm_seqpacket_ops = { · 14 unmodified lines
1924	.socketpair = sock_no_socketpair,	1924	.socketpair = sock_no_socketpair,
1925	.accept = sock_no_accept,	1925	.accept = sock_no_accept,
1926	.getname = sock_no_getname,	1926	.getname = sock_no_getname,
1927	.poll_mask = datagram_poll_mask,	1927	.poll = datagram_poll,
1928	.ioctl = kcm_ioctl,	1928	.ioctl = kcm_ioctl,
1929	.listen = sock_no_listen,	1929	.listen = sock_no_listen,
1930	.shutdown = sock_no_shutdown,	1930	.shutdown = sock_no_shutdown,

net/key/af_key.c+1−1

@@ -3751,7 +3751,7 @@ static const struct proto_ops pfkey_ops = { · 3750 unmodified lines
3751		3751
3752	/* Now the operations that really occur. */	3752	/* Now the operations that really occur. */
3753	.release = pfkey_release,	3753	.release = pfkey_release,
3754	.poll_mask = datagram_poll_mask,	3754	.poll = datagram_poll,
3755	.sendmsg = pfkey_sendmsg,	3755	.sendmsg = pfkey_sendmsg,
3756	.recvmsg = pfkey_recvmsg,	3756	.recvmsg = pfkey_recvmsg,
3757	};	3757	};

net/l2tp/l2tp_ip.c+1−1

@@ -613,7 +613,7 @@ static const struct proto_ops l2tp_ip_ops = { · 612 unmodified lines
613	.socketpair = sock_no_socketpair,	613	.socketpair = sock_no_socketpair,
614	.accept = sock_no_accept,	614	.accept = sock_no_accept,
615	.getname = l2tp_ip_getname,	615	.getname = l2tp_ip_getname,
616	.poll_mask = datagram_poll_mask,	616	.poll = datagram_poll,
617	.ioctl = inet_ioctl,	617	.ioctl = inet_ioctl,
618	.listen = sock_no_listen,	618	.listen = sock_no_listen,
619	.shutdown = inet_shutdown,	619	.shutdown = inet_shutdown,

net/l2tp/l2tp_ip6.c+1−1

@@ -754,7 +754,7 @@ static const struct proto_ops l2tp_ip6_ops = { · 753 unmodified lines
754	.socketpair = sock_no_socketpair,	754	.socketpair = sock_no_socketpair,
755	.accept = sock_no_accept,	755	.accept = sock_no_accept,
756	.getname = l2tp_ip6_getname,	756	.getname = l2tp_ip6_getname,
757	.poll_mask = datagram_poll_mask,	757	.poll = datagram_poll,
758	.ioctl = inet6_ioctl,	758	.ioctl = inet6_ioctl,
759	.listen = sock_no_listen,	759	.listen = sock_no_listen,
760	.shutdown = inet_shutdown,	760	.shutdown = inet_shutdown,

net/l2tp/l2tp_ppp.c+1−1

@@ -1818,7 +1818,7 @@ static const struct proto_ops pppol2tp_ops = { · 1817 unmodified lines
1818	.socketpair = sock_no_socketpair,	1818	.socketpair = sock_no_socketpair,
1819	.accept = sock_no_accept,	1819	.accept = sock_no_accept,
1820	.getname = pppol2tp_getname,	1820	.getname = pppol2tp_getname,
1821	.poll_mask = datagram_poll_mask,	1821	.poll = datagram_poll,
1822	.listen = sock_no_listen,	1822	.listen = sock_no_listen,
1823	.shutdown = sock_no_shutdown,	1823	.shutdown = sock_no_shutdown,
1824	.setsockopt = pppol2tp_setsockopt,	1824	.setsockopt = pppol2tp_setsockopt,

net/llc/af_llc.c+1−1

@@ -1192,7 +1192,7 @@ static const struct proto_ops llc_ui_ops = { · 1191 unmodified lines
1192	.socketpair = sock_no_socketpair,	1192	.socketpair = sock_no_socketpair,
1193	.accept = llc_ui_accept,	1193	.accept = llc_ui_accept,
1194	.getname = llc_ui_getname,	1194	.getname = llc_ui_getname,
1195	.poll_mask = datagram_poll_mask,	1195	.poll = datagram_poll,
1196	.ioctl = llc_ui_ioctl,	1196	.ioctl = llc_ui_ioctl,
1197	.listen = llc_ui_listen,	1197	.listen = llc_ui_listen,
1198	.shutdown = llc_ui_shutdown,	1198	.shutdown = llc_ui_shutdown,

net/ncsi/ncsi-aen.c+5−5

net/ncsi/ncsi-manage.c+22−27

 		}
 		break;
 	case ncsi_dev_state_config_done:
-		netdev_printk(KERN_DEBUG, ndp->ndev.dev,
+		netdev_dbg(ndp->ndev.dev, "NCSI: channel %u config done\n",
-			      "NCSI: channel %u config done\n", nc->id);
+			   nc->id);
 		spin_lock_irqsave(&nc->lock, flags);
 		if (nc->reconfigure_needed) {
 			/* This channel's configuration has been updated
 			list_add_tail_rcu(&nc->link, &ndp->channel_queue);
 			spin_unlock_irqrestore(&ndp->lock, flags);
-			netdev_printk(KERN_DEBUG, dev,
+			netdev_dbg(dev, "Dirty NCSI channel state reset\n");
-				      "Dirty NCSI channel state reset\n");
 			ncsi_process_next_channel(ndp);
 			break;
 		}
 		} else {
 			hot_nc = NULL;
 			nc->state = NCSI_CHANNEL_INACTIVE;
-			netdev_warn(ndp->ndev.dev,
+			netdev_dbg(ndp->ndev.dev,
-				    "NCSI: channel %u link down after config\n",
+				   "NCSI: channel %u link down after config\n",
-				    nc->id);
+				   nc->id);
 		}
 		spin_unlock_irqrestore(&nc->lock, flags);
 	}
 	ncm = &found->modes[NCSI_MODE_LINK];
-	netdev_printk(KERN_DEBUG, ndp->ndev.dev,
+	netdev_dbg(ndp->ndev.dev,
-		      "NCSI: Channel %u added to queue (link %s)\n",
+		   "NCSI: Channel %u added to queue (link %s)\n",
-		      found->id, ncm->data[2] & 0x1 ? "up" : "down");
+		   found->id, ncm->data[2] & 0x1 ? "up" : "down");
 out:
 	spin_lock_irqsave(&ndp->lock, flags);
 	switch (old_state) {
 	case NCSI_CHANNEL_INACTIVE:
 		ndp->ndev.state = ncsi_dev_state_config;
-		netdev_info(ndp->ndev.dev, "NCSI: configuring channel %u\n",
+		netdev_dbg(ndp->ndev.dev, "NCSI: configuring channel %u\n",
-			    nc->id);
+	                   nc->id);
 		ncsi_configure_channel(ndp);
 		break;
 	case NCSI_CHANNEL_ACTIVE:
 		ndp->ndev.state = ncsi_dev_state_suspend;
-		netdev_info(ndp->ndev.dev, "NCSI: suspending channel %u\n",
+		netdev_dbg(ndp->ndev.dev, "NCSI: suspending channel %u\n",
-			    nc->id);
+			   nc->id);
 		ncsi_suspend_channel(ndp);
 		break;
 	default:
 		return ncsi_choose_active_channel(ndp);
 	}
-	netdev_printk(KERN_DEBUG, ndp->ndev.dev,
-		      "NCSI: No more channels to process\n");
 	ncsi_report_link(ndp, false);
 	return -ENODEV;
 }
 				if ((ndp->ndev.state & 0xff00) ==
 						ncsi_dev_state_config ||
 						!list_empty(&nc->link)) {
-					netdev_printk(KERN_DEBUG, nd->dev,
+					netdev_dbg(nd->dev,
-						      "NCSI: channel %p marked dirty\n",
+						   "NCSI: channel %p marked dirty\n",
-						      nc);
+						   nc);
 					nc->reconfigure_needed = true;
 				}
 				spin_unlock_irqrestore(&nc->lock, flags);
 			list_add_tail_rcu(&nc->link, &ndp->channel_queue);
 			spin_unlock_irqrestore(&ndp->lock, flags);
-			netdev_printk(KERN_DEBUG, nd->dev,
+			netdev_dbg(nd->dev, "NCSI: kicked channel %p\n", nc);
-				      "NCSI: kicked channel %p\n", nc);
 			n++;
 		}
 	}
 	list_for_each_entry_rcu(vlan, &ndp->vlan_vids, list) {
 		n_vids++;
 		if (vlan->vid == vid) {
-			netdev_printk(KERN_DEBUG, dev,
+			netdev_dbg(dev, "NCSI: vid %u already registered\n",
-				      "NCSI: vid %u already registered\n", vid);
+				   vid);
 			return 0;
 		}
 	}
 	vlan->vid = vid;
 	list_add_rcu(&vlan->list, &ndp->vlan_vids);
-	netdev_printk(KERN_DEBUG, dev, "NCSI: Added new vid %u\n", vid);
+	netdev_dbg(dev, "NCSI: Added new vid %u\n", vid);
 	found = ncsi_kick_channels(ndp) != 0;
 	/* Remove the VLAN id from our internal list */
 	list_for_each_entry_safe(vlan, tmp, &ndp->vlan_vids, list)
 		if (vlan->vid == vid) {
-			netdev_printk(KERN_DEBUG, dev,
+			netdev_dbg(dev, "NCSI: vid %u found, removing\n", vid);
-				      "NCSI: vid %u found, removing\n", vid);
 			list_del_rcu(&vlan->list);
 			found = true;
 			kfree(vlan);
 		}
 	}
-	netdev_printk(KERN_DEBUG, ndp->ndev.dev, "NCSI: Stopping device\n");
+	netdev_dbg(ndp->ndev.dev, "NCSI: Stopping device\n");
 	ncsi_report_link(ndp, true);
 }
 EXPORT_SYMBOL_GPL(ncsi_stop_dev);

net/netlink/af_netlink.c+1−1

@@ -2658,7 +2658,7 @@ static const struct proto_ops netlink_ops = { · 2657 unmodified lines
2658	.socketpair = sock_no_socketpair,	2658	.socketpair = sock_no_socketpair,
2659	.accept = sock_no_accept,	2659	.accept = sock_no_accept,
2660	.getname = netlink_getname,	2660	.getname = netlink_getname,
2661	.poll_mask = datagram_poll_mask,	2661	.poll = datagram_poll,
2662	.ioctl = netlink_ioctl,	2662	.ioctl = netlink_ioctl,
2663	.listen = sock_no_listen,	2663	.listen = sock_no_listen,
2664	.shutdown = sock_no_shutdown,	2664	.shutdown = sock_no_shutdown,

net/netrom/af_netrom.c+1−1

@@ -1355,7 +1355,7 @@ static const struct proto_ops nr_proto_ops = { · 1354 unmodified lines
1355	.socketpair = sock_no_socketpair,	1355	.socketpair = sock_no_socketpair,
1356	.accept = nr_accept,	1356	.accept = nr_accept,
1357	.getname = nr_getname,	1357	.getname = nr_getname,
1358	.poll_mask = datagram_poll_mask,	1358	.poll = datagram_poll,
1359	.ioctl = nr_ioctl,	1359	.ioctl = nr_ioctl,
1360	.listen = nr_listen,	1360	.listen = nr_listen,
1361	.shutdown = sock_no_shutdown,	1361	.shutdown = sock_no_shutdown,

net/nfc/llcp_sock.c+6−3

 	return 0;
 }
-static __poll_t llcp_sock_poll_mask(struct socket *sock, __poll_t events)
+static __poll_t llcp_sock_poll(struct file *file, struct socket *sock,
+				   poll_table *wait)
 {
 	struct sock *sk = sock->sk;
 	__poll_t mask = 0;
 	pr_debug("%p\n", sk);
+	sock_poll_wait(file, sk_sleep(sk), wait);
 	if (sk->sk_state == LLCP_LISTEN)
 		return llcp_accept_poll(sk);
 	.socketpair     = sock_no_socketpair,
 	.accept         = llcp_sock_accept,
 	.getname        = llcp_sock_getname,
-	.poll_mask      = llcp_sock_poll_mask,
+	.poll           = llcp_sock_poll,
 	.ioctl          = sock_no_ioctl,
 	.listen         = llcp_sock_listen,
 	.shutdown       = sock_no_shutdown,
 	.socketpair     = sock_no_socketpair,
 	.accept         = sock_no_accept,
 	.getname        = llcp_sock_getname,
-	.poll_mask      = llcp_sock_poll_mask,
+	.poll           = llcp_sock_poll,
 	.ioctl          = sock_no_ioctl,
 	.listen         = sock_no_listen,
 	.shutdown       = sock_no_shutdown,

net/nfc/rawsock.c+2−2

@@ -284,7 +284,7 @@ static const struct proto_ops rawsock_ops = { · 283 unmodified lines
284	.socketpair = sock_no_socketpair,	284	.socketpair = sock_no_socketpair,
285	.accept = sock_no_accept,	285	.accept = sock_no_accept,
286	.getname = sock_no_getname,	286	.getname = sock_no_getname,
287	.poll_mask = datagram_poll_mask,	287	.poll = datagram_poll,
288	.ioctl = sock_no_ioctl,	288	.ioctl = sock_no_ioctl,
289	.listen = sock_no_listen,	289	.listen = sock_no_listen,
290	.shutdown = sock_no_shutdown,	290	.shutdown = sock_no_shutdown,
@@ -304,7 +304,7 @@ static const struct proto_ops rawsock_raw_ops = { · 13 unmodified lines
304	.socketpair = sock_no_socketpair,	304	.socketpair = sock_no_socketpair,
305	.accept = sock_no_accept,	305	.accept = sock_no_accept,
306	.getname = sock_no_getname,	306	.getname = sock_no_getname,
307	.poll_mask = datagram_poll_mask,	307	.poll = datagram_poll,
308	.ioctl = sock_no_ioctl,	308	.ioctl = sock_no_ioctl,
309	.listen = sock_no_listen,	309	.listen = sock_no_listen,
310	.shutdown = sock_no_shutdown,	310	.shutdown = sock_no_shutdown,

net/packet/af_packet.c+12−13

 		if (po->stats.stats1.tp_drops)
 			status |= TP_STATUS_LOSING;
 	}
+	if (do_vnet &&
+	    virtio_net_hdr_from_skb(skb, h.raw + macoff -
+				    sizeof(struct virtio_net_hdr),
+				    vio_le(), true, 0))
+		goto drop_n_account;
 	po->stats.stats1.tp_packets++;
 	if (copy_skb) {
 		status |= TP_STATUS_COPY;
 	}
 	spin_unlock(&sk->sk_receive_queue.lock);
-	if (do_vnet) {
-		if (virtio_net_hdr_from_skb(skb, h.raw + macoff -
-					    sizeof(struct virtio_net_hdr),
-					    vio_le(), true, 0)) {
-			spin_lock(&sk->sk_receive_queue.lock);
-			goto drop_n_account;
-		}
-	}
 	skb_copy_bits(skb, 0, h.raw + macoff, snaplen);
 	if (!(ts_status = tpacket_get_timestamp(skb, &ts, po->tp_tstamp)))
 	return 0;
 }
-static __poll_t packet_poll_mask(struct socket *sock, __poll_t events)
+static __poll_t packet_poll(struct file *file, struct socket *sock,
+				poll_table *wait)
 {
 	struct sock *sk = sock->sk;
 	struct packet_sock *po = pkt_sk(sk);
-	__poll_t mask = datagram_poll_mask(sock, events);
+	__poll_t mask = datagram_poll(file, sock, wait);
 	spin_lock_bh(&sk->sk_receive_queue.lock);
 	if (po->rx_ring.pg_vec) {
 	.socketpair =	sock_no_socketpair,
 	.accept =	sock_no_accept,
 	.getname =	packet_getname_spkt,
-	.poll_mask =	datagram_poll_mask,
+	.poll =		datagram_poll,
 	.ioctl =	packet_ioctl,
 	.listen =	sock_no_listen,
 	.shutdown =	sock_no_shutdown,
 	.socketpair =	sock_no_socketpair,
 	.accept =	sock_no_accept,
 	.getname =	packet_getname,
-	.poll_mask =	packet_poll_mask,
+	.poll =		packet_poll,
 	.ioctl =	packet_ioctl,
 	.listen =	sock_no_listen,
 	.shutdown =	sock_no_shutdown,

net/phonet/socket.c+6−3

 	return sizeof(struct sockaddr_pn);
 }
-static __poll_t pn_socket_poll_mask(struct socket *sock, __poll_t events)
+static __poll_t pn_socket_poll(struct file *file, struct socket *sock,
+					poll_table *wait)
 {
 	struct sock *sk = sock->sk;
 	struct pep_sock *pn = pep_sk(sk);
 	__poll_t mask = 0;
+	poll_wait(file, sk_sleep(sk), wait);
 	if (sk->sk_state == TCP_CLOSE)
 		return EPOLLERR;
 	if (!skb_queue_empty(&sk->sk_receive_queue))
 	.socketpair	= sock_no_socketpair,
 	.accept		= sock_no_accept,
 	.getname	= pn_socket_getname,
-	.poll_mask	= datagram_poll_mask,
+	.poll		= datagram_poll,
 	.ioctl		= pn_socket_ioctl,
 	.listen		= sock_no_listen,
 	.shutdown	= sock_no_shutdown,
 	.socketpair	= sock_no_socketpair,
 	.accept		= pn_socket_accept,
 	.getname	= pn_socket_getname,
-	.poll_mask	= pn_socket_poll_mask,
+	.poll		= pn_socket_poll,
 	.ioctl		= pn_socket_ioctl,
 	.listen		= pn_socket_listen,
 	.shutdown	= sock_no_shutdown,

net/qrtr/qrtr.c+1−1

@@ -1023,7 +1023,7 @@ static const struct proto_ops qrtr_proto_ops = { · 1022 unmodified lines
1023	.recvmsg = qrtr_recvmsg,	1023	.recvmsg = qrtr_recvmsg,
1024	.getname = qrtr_getname,	1024	.getname = qrtr_getname,
1025	.ioctl = qrtr_ioctl,	1025	.ioctl = qrtr_ioctl,
1026	.poll_mask = datagram_poll_mask,	1026	.poll = datagram_poll,
1027	.shutdown = sock_no_shutdown,	1027	.shutdown = sock_no_shutdown,
1028	.setsockopt = sock_no_setsockopt,	1028	.setsockopt = sock_no_setsockopt,
1029	.getsockopt = sock_no_getsockopt,	1029	.getsockopt = sock_no_getsockopt,

net/rose/af_rose.c+1−1

@@ -1470,7 +1470,7 @@ static const struct proto_ops rose_proto_ops = { · 1469 unmodified lines
1470	.socketpair = sock_no_socketpair,	1470	.socketpair = sock_no_socketpair,
1471	.accept = rose_accept,	1471	.accept = rose_accept,
1472	.getname = rose_getname,	1472	.getname = rose_getname,
1473	.poll_mask = datagram_poll_mask,	1473	.poll = datagram_poll,
1474	.ioctl = rose_ioctl,	1474	.ioctl = rose_ioctl,
1475	.listen = rose_listen,	1475	.listen = rose_listen,
1476	.shutdown = sock_no_shutdown,	1476	.shutdown = sock_no_shutdown,

net/rxrpc/af_rxrpc.c+7−3

 /*
  * permit an RxRPC socket to be polled
  */
-static __poll_t rxrpc_poll_mask(struct socket *sock, __poll_t events)
+static __poll_t rxrpc_poll(struct file *file, struct socket *sock,
+			       poll_table *wait)
 {
 	struct sock *sk = sock->sk;
 	struct rxrpc_sock *rx = rxrpc_sk(sk);
-	__poll_t mask = 0;
+	__poll_t mask;
+	sock_poll_wait(file, sk_sleep(sk), wait);
+	mask = 0;
 	/* the socket is readable if there are any messages waiting on the Rx
 	 * queue */
 	.socketpair	= sock_no_socketpair,
 	.accept		= sock_no_accept,
 	.getname	= sock_no_getname,
-	.poll_mask	= rxrpc_poll_mask,
+	.poll		= rxrpc_poll,
 	.ioctl		= sock_no_ioctl,
 	.listen		= rxrpc_listen,
 	.shutdown	= rxrpc_shutdown,

net/sched/act_ife.c+5−7

 	spin_unlock_bh(&ife->tcf_lock);
 	p = rcu_dereference_protected(ife->params, 1);
-	kfree_rcu(p, rcu);
+	if (p)
+		kfree_rcu(p, rcu);
 }
 /* under ife->tcf_lock for existing action */
 			saddr = nla_data(tb[TCA_IFE_SMAC]);
 	}
-	ife->tcf_action = parm->action;
 	if (parm->flags & IFE_ENCODE) {
 		if (daddr)
 			ether_addr_copy(p->eth_dst, daddr);
 				       NULL, NULL);
 		if (err) {
 metadata_parse_err:
-			if (exists)
-				tcf_idr_release(*a, bind);
 			if (ret == ACT_P_CREATED)
-				_tcf_ife_cleanup(*a);
+				tcf_idr_release(*a, bind);
 			if (exists)
 				spin_unlock_bh(&ife->tcf_lock);
 		err = use_all_metadata(ife);
 		if (err) {
 			if (ret == ACT_P_CREATED)
-				_tcf_ife_cleanup(*a);
+				tcf_idr_release(*a, bind);
 			if (exists)
 				spin_unlock_bh(&ife->tcf_lock);
 		}
 	}
+	ife->tcf_action = parm->action;
 	if (exists)
 		spin_unlock_bh(&ife->tcf_lock);

net/sched/cls_flower.c+17−4

 	struct rhashtable_params filter_ht_params;
 	struct flow_dissector dissector;
 	struct list_head filters;
-	struct rcu_head rcu;
+	struct rcu_work rwork;
 	struct list_head list;
 };
 	return rhashtable_init(&head->ht, &mask_ht_params);
 }
+static void fl_mask_free(struct fl_flow_mask *mask)
+{
+	rhashtable_destroy(&mask->ht);
+	kfree(mask);
+}
+static void fl_mask_free_work(struct work_struct *work)
+{
+	struct fl_flow_mask *mask = container_of(to_rcu_work(work),
+						 struct fl_flow_mask, rwork);
+	fl_mask_free(mask);
+}
 static bool fl_mask_put(struct cls_fl_head *head, struct fl_flow_mask *mask,
 			bool async)
 {
 		return false;
 	rhashtable_remove_fast(&head->ht, &mask->ht_node, mask_ht_params);
-	rhashtable_destroy(&mask->ht);
 	list_del_rcu(&mask->list);
 	if (async)
-		kfree_rcu(mask, rcu);
+		tcf_queue_work(&mask->rwork, fl_mask_free_work);
 	else
-		kfree(mask);
+		fl_mask_free(mask);
 	return true;
 }

net/sched/sch_blackhole.c+1−1

@@ -21,7 +21,7 @@ static int blackhole_enqueue(struct sk_buff skb, struct Qdisc sch, · 20 unmodified lines
21	struct sk_buff **to_free)	21	struct sk_buff **to_free)
22	{	22	{
23	qdisc_drop(skb, sch, to_free);	23	qdisc_drop(skb, sch, to_free);
24	return NET_XMIT_SUCCESS;	24	return NET_XMIT_SUCCESS \| __NET_XMIT_BYPASS;
25	}	25	}
26		26
27	static struct sk_buff blackhole_dequeue(struct Qdisc sch)	27	static struct sk_buff blackhole_dequeue(struct Qdisc sch)

net/sched/sch_hfsc.c+2−2

@@ -1385,8 +1385,8 @@ hfsc_schedule_watchdog(struct Qdisc *sch) · 1384 unmodified lines
1385	if (next_time == 0 \|\| next_time > q->root.cl_cfmin)	1385	if (next_time == 0 \|\| next_time > q->root.cl_cfmin)
1386	next_time = q->root.cl_cfmin;	1386	next_time = q->root.cl_cfmin;
1387	}	1387	}
1388	WARN_ON(next_time == 0);	1388	if (next_time)
1389	qdisc_watchdog_schedule(&q->watchdog, next_time);	1389	qdisc_watchdog_schedule(&q->watchdog, next_time);
1390	}	1390	}
1391		1391
1392	static int	1392	static int

net/sctp/chunk.c+3−1

 	/* Account for a different sized first fragment */
 	if (msg_len >= first_len) {
 		msg->can_delay = 0;
-		SCTP_INC_STATS(sock_net(asoc->base.sk), SCTP_MIB_FRAGUSRMSGS);
+		if (msg_len > first_len)
+			SCTP_INC_STATS(sock_net(asoc->base.sk),
+				       SCTP_MIB_FRAGUSRMSGS);
 	} else {
 		/* Which may be the only one... */
 		first_len = msg_len;

net/sctp/ipv6.c+1−1

@@ -1010,7 +1010,7 @@ static const struct proto_ops inet6_seqpacket_ops = { · 1009 unmodified lines
1010	.socketpair = sock_no_socketpair,	1010	.socketpair = sock_no_socketpair,
1011	.accept = inet_accept,	1011	.accept = inet_accept,
1012	.getname = sctp_getname,	1012	.getname = sctp_getname,
1013	.poll_mask = sctp_poll_mask,	1013	.poll = sctp_poll,
1014	.ioctl = inet6_ioctl,	1014	.ioctl = inet6_ioctl,
1015	.listen = sctp_inet_listen,	1015	.listen = sctp_inet_listen,
1016	.shutdown = inet_shutdown,	1016	.shutdown = inet_shutdown,

net/sctp/protocol.c+1−1

@@ -1016,7 +1016,7 @@ static const struct proto_ops inet_seqpacket_ops = { · 1015 unmodified lines
1016	.socketpair = sock_no_socketpair,	1016	.socketpair = sock_no_socketpair,
1017	.accept = inet_accept,	1017	.accept = inet_accept,
1018	.getname = inet_getname, /* Semantics are different. */	1018	.getname = inet_getname, /* Semantics are different. */
1019	.poll_mask = sctp_poll_mask,	1019	.poll = sctp_poll,
1020	.ioctl = inet_ioctl,	1020	.ioctl = inet_ioctl,
1021	.listen = sctp_inet_listen,	1021	.listen = sctp_inet_listen,
1022	.shutdown = inet_shutdown, /* Looks harmless. */	1022	.shutdown = inet_shutdown, /* Looks harmless. */

net/sctp/socket.c+3−1

  * here, again, by modeling the current TCP/UDP code.  We don't have
  * a good way to test with it yet.
  */
-__poll_t sctp_poll_mask(struct socket *sock, __poll_t events)
+__poll_t sctp_poll(struct file *file, struct socket *sock, poll_table *wait)
 {
 	struct sock *sk = sock->sk;
 	struct sctp_sock *sp = sctp_sk(sk);
 	__poll_t mask;
+	poll_wait(file, sk_sleep(sk), wait);
 	sock_rps_record_flow(sk);
 	/* A TCP-style listening socket becomes readable when the accept queue

net/smc/af_smc.c+9−3

 	return mask;
 }
-static __poll_t smc_poll_mask(struct socket *sock, __poll_t events)
+static __poll_t smc_poll(struct file *file, struct socket *sock,
+			     poll_table *wait)
 {
 	struct sock *sk = sock->sk;
 	__poll_t mask = 0;
 	if ((sk->sk_state == SMC_INIT) || smc->use_fallback) {
 		/* delegate to CLC child sock */
 		release_sock(sk);
-		mask = smc->clcsock->ops->poll_mask(smc->clcsock, events);
+		mask = smc->clcsock->ops->poll(file, smc->clcsock, wait);
 		lock_sock(sk);
 		sk->sk_err = smc->clcsock->sk->sk_err;
 		if (sk->sk_err) {
 			}
 		}
 	} else {
+		if (sk->sk_state != SMC_CLOSED) {
+			release_sock(sk);
+			sock_poll_wait(file, sk_sleep(sk), wait);
+			lock_sock(sk);
+		}
 		if (sk->sk_err)
 			mask |= EPOLLERR;
 		if ((sk->sk_shutdown == SHUTDOWN_MASK) ||
 	.socketpair	= sock_no_socketpair,
 	.accept		= smc_accept,
 	.getname	= smc_getname,
-	.poll_mask	= smc_poll_mask,
+	.poll		= smc_poll,
 	.ioctl		= smc_ioctl,
 	.listen		= smc_listen,
 	.shutdown	= smc_shutdown,

net/socket.c+7−43

@@ -117,10 +117,8 @@ static ssize_t sock_write_iter(struct kiocb iocb, struct iov_iter from); · 116 unmodified lines
117	static int sock_mmap(struct file file, struct vm_area_struct vma);	117	static int sock_mmap(struct file file, struct vm_area_struct vma);
118		118
119	static int sock_close(struct inode inode, struct file file);	119	static int sock_close(struct inode inode, struct file file);
120	static struct wait_queue_head sock_get_poll_head(struct file file,

71 more lines aren’t shown here.

net/strparser/strparser.c+1−4

This diff is large: its 19 lines aren’t shown here.

net/sunrpc/xprt.c+7−3

This diff is large: its 31 lines aren’t shown here.

net/tipc/socket.c+9−5

This diff is large: its 56 lines aren’t shown here.

net/tls/tls_main.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/tls/tls_sw.c+10−9

This diff is large: its 41 lines aren’t shown here.

net/unix/af_unix.c+19−11

This diff is large: its 83 lines aren’t shown here.

net/vmw_vsock/af_vsock.c+13−6

This diff is large: its 41 lines aren’t shown here.

net/vmw_vsock/virtio_transport.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/x25/af_x25.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/xdp/xsk.c+7−3

This diff is large: its 32 lines aren’t shown here.

scripts/Makefile.build+1−1

This diff is large: its 16 lines aren’t shown here.

scripts/checkpatch.pl+0−6

This diff is large: its 13 lines aren’t shown here.

scripts/gcc-x86_64-has-stack-protector.sh+1−1

This diff is large: its 6 lines aren’t shown here.

scripts/kconfig/expr.h+3−0

This diff is large: its 10 lines aren’t shown here.

scripts/kconfig/preprocess.c+1−1

This diff is large: its 9 lines aren’t shown here.

scripts/kconfig/zconf.y+6−2

This diff is large: its 29 lines aren’t shown here.

security/keys/dh.c+4−2

This diff is large: its 20 lines aren’t shown here.

security/selinux/selinuxfs.c+33−45

This diff is large: its 142 lines aren’t shown here.

security/smack/smack_lsm.c+1−0

This diff is large: its 8 lines aren’t shown here.

sound/core/seq/seq_clientmgr.c+2−1

This diff is large: its 10 lines aren’t shown here.

sound/core/timer.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/pci/hda/hda_codec.c+3−2

This diff is large: its 12 lines aren’t shown here.

sound/pci/hda/hda_codec.h+1−0

This diff is large: its 8 lines aren’t shown here.

sound/pci/hda/patch_ca0132.c+23−41

This diff is large: its 165 lines aren’t shown here.

sound/pci/hda/patch_hdmi.c+5−0

This diff is large: its 12 lines aren’t shown here.

sound/pci/hda/patch_realtek.c+17−3

This diff is large: its 63 lines aren’t shown here.

sound/pci/lx6464es/lx6464es.c+1−0

This diff is large: its 8 lines aren’t shown here.

tools/arch/arm/include/uapi/asm/kvm.h+1−0

This diff is large: its 8 lines aren’t shown here.

tools/arch/arm64/include/uapi/asm/kvm.h+1−0

This diff is large: its 8 lines aren’t shown here.

tools/arch/powerpc/include/uapi/asm/kvm.h+1−0

This diff is large: its 8 lines aren’t shown here.

tools/arch/powerpc/include/uapi/asm/unistd.h+1−0

This diff is large: its 7 lines aren’t shown here.

tools/arch/x86/include/asm/cpufeatures.h+2−0

This diff is large: its 10 lines aren’t shown here.

tools/bpf/bpftool/perf.c+3−2

This diff is large: its 13 lines aren’t shown here.

tools/bpf/bpftool/prog.c+3−1

This diff is large: its 11 lines aren’t shown here.

tools/include/uapi/drm/drm.h+7−0

This diff is large: its 14 lines aren’t shown here.

tools/include/uapi/linux/bpf.h+1−1

This diff is large: its 9 lines aren’t shown here.

tools/include/uapi/linux/if_link.h+2−0

This diff is large: its 16 lines aren’t shown here.

tools/include/uapi/linux/kvm.h+1−0

This diff is large: its 8 lines aren’t shown here.

tools/objtool/check.c+1−0

This diff is large: its 8 lines aren’t shown here.

tools/perf/Documentation/perf-stat.txt+3−0

This diff is large: its 10 lines aren’t shown here.

tools/perf/arch/powerpc/util/skip-callchain-idx.c+1−1

This diff is large: its 9 lines aren’t shown here.

tools/perf/arch/x86/entry/syscalls/syscall_64.tbl+2−0

This diff is large: its 9 lines aren’t shown here.

tools/perf/bench/numa.c+3−2

This diff is large: its 19 lines aren’t shown here.

tools/perf/builtin-annotate.c+10−1

This diff is large: its 25 lines aren’t shown here.

tools/perf/builtin-c2c.c+5−5

This diff is large: its 22 lines aren’t shown here.

tools/perf/builtin-report.c+2−1

This diff is large: its 10 lines aren’t shown here.

tools/perf/builtin-script.c+39−3

This diff is large: its 84 lines aren’t shown here.

tools/perf/builtin-stat.c+28−20

This diff is large: its 175 lines aren’t shown here.

tools/perf/tests/parse-events.c+20−5

This diff is large: its 78 lines aren’t shown here.

tools/perf/tests/topology.c+1−0

This diff is large: its 8 lines aren’t shown here.

tools/perf/ui/gtk/hists.c+1−1

This diff is large: its 9 lines aren’t shown here.

tools/perf/util/c++/clang.cpp+9−2

This diff is large: its 18 lines aren’t shown here.

tools/perf/util/header.c+10−2

This diff is large: its 40 lines aren’t shown here.

tools/perf/util/hist.c+8−4

This diff is large: its 36 lines aren’t shown here.

tools/perf/util/hist.h+2−2

This diff is large: its 18 lines aren’t shown here.

tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c+1−1

This diff is large: its 9 lines aren’t shown here.

tools/perf/util/parse-events.y+5−0

This diff is large: its 17 lines aren’t shown here.

tools/perf/util/pmu.c+97−2

This diff is large: its 138 lines aren’t shown here.

tools/perf/util/sort.h+3−1

This diff is large: its 18 lines aren’t shown here.

tools/power/x86/turbostat/turbostat.8+1−1

This diff is large: its 9 lines aren’t shown here.

tools/power/x86/turbostat/turbostat.c+166−74

This diff is large: its 431 lines aren’t shown here.

tools/testing/selftests/bpf/config+10−0

This diff is large: its 14 lines aren’t shown here.

tools/testing/selftests/bpf/test_offload.py+10−2

This diff is large: its 33 lines aren’t shown here.

tools/testing/selftests/bpf/test_tunnel.sh+14−12

This diff is large: its 58 lines aren’t shown here.

tools/testing/selftests/net/.gitignore+1−0

This diff is large: its 5 lines aren’t shown here.

tools/testing/selftests/net/config+2−0

This diff is large: its 6 lines aren’t shown here.

tools/testing/selftests/pstore/pstore_post_reboot_tests+4−1

This diff is large: its 18 lines aren’t shown here.

tools/testing/selftests/rseq/param_test.c+24−0

This diff is large: its 31 lines aren’t shown here.

tools/testing/selftests/rseq/rseq-arm.h+1−0

This diff is large: its 8 lines aren’t shown here.

tools/testing/selftests/rseq/rseq-mips.h+725−0

This diff is large: its 726 lines aren’t shown here.

tools/testing/selftests/rseq/rseq.h+2−0

This diff is large: its 9 lines aren’t shown here.

tools/testing/selftests/rseq/run_param_test.sh+0−0

File mode changed from 100644 to 100755.

tools/testing/selftests/sparc64/Makefile+12−8

This diff is large: its 46 lines aren’t shown here.

tools/testing/selftests/sparc64/drivers/Makefile+1−1

This diff is large: its 6 lines aren’t shown here.

tools/testing/selftests/static_keys/test_static_keys.sh+13−0

This diff is large: its 20 lines aren’t shown here.

tools/testing/selftests/sync/config+4−0

This diff is large: its 5 lines aren’t shown here.

tools/testing/selftests/sysctl/sysctl.sh+13−7

This diff is large: its 64 lines aren’t shown here.

tools/testing/selftests/user/test_user_copy.sh+7−0

This diff is large: its 14 lines aren’t shown here.

tools/testing/selftests/vm/compaction_test.c+3−1

This diff is large: its 18 lines aren’t shown here.

tools/testing/selftests/vm/mlock2-tests.c+7−5

This diff is large: its 54 lines aren’t shown here.

tools/testing/selftests/vm/run_vmtests+4−1

This diff is large: its 19 lines aren’t shown here.

tools/testing/selftests/vm/userfaultfd.c+3−1

This diff is large: its 18 lines aren’t shown here.

tools/testing/selftests/x86/sigreturn.c+36−23

This diff is large: its 84 lines aren’t shown here.

tools/testing/selftests/zram/zram.sh+4−1

This diff is large: its 17 lines aren’t shown here.

tools/testing/selftests/zram/zram_lib.sh+4−1

This diff is large: its 19 lines aren’t shown here.

tools/virtio/linux/scatterlist.h+0−18

This diff is large: its 58 lines aren’t shown here.

virt/kvm/Kconfig+1−1

This diff is large: its 9 lines aren’t shown here.

virt/kvm/arm/mmu.c+2−0

This diff is large: its 9 lines aren’t shown here.

virt/kvm/arm/vgic/vgic-v3.c+0−5

This diff is large: its 12 lines aren’t shown here.

virt/kvm/kvm_main.c+9−10

This diff is large: its 59 lines aren’t shown here.

Merge v4.18-rc3 into drm-next

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code

@@ -570,7 +570,7 @@ const struct proto_ops inet6_stream_ops = { · 569 unmodified lines
570	.socketpair = sock_no_socketpair, /* a do nothing */	570	.socketpair = sock_no_socketpair, /* a do nothing */
571	.accept = inet_accept, /* ok */	571	.accept = inet_accept, /* ok */
572	.getname = inet6_getname,	572	.getname = inet6_getname,
573	.poll_mask = tcp_poll_mask, /* ok */	573	.poll = tcp_poll, /* ok */
574	.ioctl = inet6_ioctl, /* must change */	574	.ioctl = inet6_ioctl, /* must change */
575	.listen = inet_listen, /* ok */	575	.listen = inet_listen, /* ok */
576	.shutdown = inet_shutdown, /* ok */	576	.shutdown = inet_shutdown, /* ok */
@@ -603,7 +603,7 @@ const struct proto_ops inet6_dgram_ops = { · 26 unmodified lines
603	.socketpair = sock_no_socketpair, /* a do nothing */	603	.socketpair = sock_no_socketpair, /* a do nothing */
604	.accept = sock_no_accept, /* a do nothing */	604	.accept = sock_no_accept, /* a do nothing */
605	.getname = inet6_getname,	605	.getname = inet6_getname,
606	.poll_mask = udp_poll_mask, /* ok */	606	.poll = udp_poll, /* ok */
607	.ioctl = inet6_ioctl, /* must change */	607	.ioctl = inet6_ioctl, /* must change */
608	.listen = sock_no_listen, /* ok */	608	.listen = sock_no_listen, /* ok */
609	.shutdown = inet_shutdown, /* ok */	609	.shutdown = inet_shutdown, /* ok */

@@ -73,8 +73,8 @@ static int ncsi_aen_handler_lsc(struct ncsi_dev_priv *ndp, · 72 unmodified lines
73	ncm->data[2] = data;	73	ncm->data[2] = data;
74	ncm->data[4] = ntohl(lsc->oem_status);	74	ncm->data[4] = ntohl(lsc->oem_status);
75		75
76	netdev_info(ndp->ndev.dev, "NCSI: LSC AEN - channel %u state %s\n",	76	netdev_dbg(ndp->ndev.dev, "NCSI: LSC AEN - channel %u state %s\n",
77	nc->id, data & 0x1 ? "up" : "down");	77	nc->id, data & 0x1 ? "up" : "down");
78		78
79	chained = !list_empty(&nc->link);	79	chained = !list_empty(&nc->link);
80	state = nc->state;	80	state = nc->state;
@@ -148,9 +148,9 @@ static int ncsi_aen_handler_hncdsc(struct ncsi_dev_priv *ndp, · 67 unmodified lines
148	hncdsc = (struct ncsi_aen_hncdsc_pkt *)h;	148	hncdsc = (struct ncsi_aen_hncdsc_pkt *)h;
149	ncm->data[3] = ntohl(hncdsc->status);	149	ncm->data[3] = ntohl(hncdsc->status);
150	spin_unlock_irqrestore(&nc->lock, flags);	150	spin_unlock_irqrestore(&nc->lock, flags);
151	netdev_printk(KERN_DEBUG, ndp->ndev.dev,	151	netdev_dbg(ndp->ndev.dev,
152	"NCSI: host driver %srunning on channel %u\n",	152	"NCSI: host driver %srunning on channel %u\n",
153	ncm->data[3] & 0x1 ? "" : "not ", nc->id);	153	ncm->data[3] & 0x1 ? "" : "not ", nc->id);
154		154
155	return 0;	155	return 0;
156	}	156	}