lael-labs/linux

.clang-format+12−0

   - 'css_for_each_descendant_pre'
   - 'device_for_each_child_node'
   - 'dma_fence_chain_for_each'
+  - 'do_for_each_ftrace_op'
   - 'drm_atomic_crtc_for_each_plane'
   - 'drm_atomic_crtc_state_for_each_plane'
   - 'drm_atomic_crtc_state_for_each_plane_state'
   - 'for_each_active_dev_scope'
   - 'for_each_active_drhd_unit'
   - 'for_each_active_iommu'
+  - 'for_each_aggr_pgid'
   - 'for_each_available_child_of_node'
   - 'for_each_bio'
   - 'for_each_board_func_rsrc'
   - 'for_each_node_state'
   - 'for_each_node_with_cpus'
   - 'for_each_node_with_property'
+  - 'for_each_nonreserved_multicast_dest_pgid'
   - 'for_each_of_allnodes'
   - 'for_each_of_allnodes_from'
   - 'for_each_of_cpu_node'
   - 'for_each_pci_dev'
   - 'for_each_pci_msi_entry'
   - 'for_each_pcm_streams'
+  - 'for_each_physmem_range'
   - 'for_each_populated_zone'
   - 'for_each_possible_cpu'
   - 'for_each_present_cpu'
   - 'for_each_process_thread'
   - 'for_each_property_of_node'
   - 'for_each_registered_fb'
+  - 'for_each_requested_gpio'
+  - 'for_each_requested_gpio_in_range'
   - 'for_each_reserved_mem_region'
   - 'for_each_rtd_codec_dais'
   - 'for_each_rtd_codec_dais_rollback'
   - 'for_each_sg'
   - 'for_each_sg_dma_page'
   - 'for_each_sg_page'
+  - 'for_each_sgtable_dma_page'
+  - 'for_each_sgtable_dma_sg'
+  - 'for_each_sgtable_page'
+  - 'for_each_sgtable_sg'
   - 'for_each_sibling_event'
   - 'for_each_subelement'
   - 'for_each_subelement_extid'
   - 'for_each_subelement_id'
   - '__for_each_thread'
   - 'for_each_thread'
+  - 'for_each_unicast_dest_pgid'
   - 'for_each_wakeup_source'
   - 'for_each_zone'
   - 'for_each_zone_zonelist'
   - 'v4l2_m2m_for_each_src_buf'
   - 'v4l2_m2m_for_each_src_buf_safe'
   - 'virtio_device_for_each_vq'
+  - 'while_for_each_ftrace_op'
   - 'xa_for_each'
   - 'xa_for_each_marked'
   - 'xa_for_each_range'

.mailmap+1−0

@@ -308,6 +308,7 @@ Tony Luck <tony.luck@intel.com> · 307 unmodified lines
308	TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>	308	TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>
309	TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>	309	TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
310	Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>	310	Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
		311	Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
311	Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>	312	Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
312	Uwe Kleine-König <ukl@pengutronix.de>	313	Uwe Kleine-König <ukl@pengutronix.de>
313	Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>	314	Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Documentation/RCU/lockdep.rst+1−1

@@ -49,7 +49,7 @@ checking of rcu_dereference() primitives: · 48 unmodified lines
49	is invoked by both RCU-sched readers and updaters.	49	is invoked by both RCU-sched readers and updaters.
50	srcu_dereference_check(p, c):	50	srcu_dereference_check(p, c):
51	Use explicit check expression "c" along with	51	Use explicit check expression "c" along with
52	srcu_read_lock_held()(). This is useful in code that	52	srcu_read_lock_held(). This is useful in code that
53	is invoked by both SRCU readers and updaters.	53	is invoked by both SRCU readers and updaters.
54	rcu_dereference_raw(p):	54	rcu_dereference_raw(p):
55	Don't check. (Use sparingly, if at all.)	55	Don't check. (Use sparingly, if at all.)

Documentation/admin-guide/devices.txt+1−1

@@ -1662,7 +1662,7 @@ · 1661 unmodified lines
1662		1662
1663	98 block User-mode virtual block device	1663	98 block User-mode virtual block device
1664	0 = /dev/ubda First user-mode block device	1664	0 = /dev/ubda First user-mode block device
1665	16 = /dev/udbb Second user-mode block device	1665	16 = /dev/ubdb Second user-mode block device
1666	...	1666	...
1667		1667
1668	Partitions are handled in the same way as for IDE	1668	Partitions are handled in the same way as for IDE

Documentation/admin-guide/dynamic-debug-howto.rst+0−1

@@ -156,7 +156,6 @@ against. Possible keywords are::: · 155 unmodified lines
156	``line-range`` cannot contain space, e.g.	156	``line-range`` cannot contain space, e.g.
157	"1-30" is valid range but "1 - 30" is not.	157	"1-30" is valid range but "1 - 30" is not.
158		158
159	``module=foo`` combined keyword=value form is interchangably accepted
160		159
161	The meanings of each keyword are:	160	The meanings of each keyword are:
162		161

Documentation/admin-guide/laptops/thinkpad-acpi.rst+1−1

@@ -1434,7 +1434,7 @@ on the feature, restricting the viewing angles. · 1433 unmodified lines
1434		1434
1435		1435
1436	DYTC Lapmode sensor	1436	DYTC Lapmode sensor
1437	------------------	1437	-------------------
1438		1438
1439	sysfs: dytc_lapmode	1439	sysfs: dytc_lapmode
1440		1440

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

@@ -123,7 +123,9 @@ Energy-Performance Bias (EPB) knob (otherwise), which means that the processor's · 122 unmodified lines
123	internal P-state selection logic is expected to focus entirely on performance.	123	internal P-state selection logic is expected to focus entirely on performance.
124		124
125	This will override the EPP/EPB setting coming from the ``sysfs`` interface	125	This will override the EPP/EPB setting coming from the ``sysfs`` interface
126	(see `Energy vs Performance Hints`_ below).	126	(see `Energy vs Performance Hints`_ below). Moreover, any attempts to change
		127	the EPP/EPB to a value different from 0 ("performance") via ``sysfs`` in this
		128	configuration will be rejected.
127		129
128	Also, in this configuration the range of P-states available to the processor's	130	Also, in this configuration the range of P-states available to the processor's
129	internal P-state selection logic is always restricted to the upper boundary	131	internal P-state selection logic is always restricted to the upper boundary

Documentation/devicetree/bindings/mmc/arasan,sdhci.yaml+7−3

     then:
       properties:
         clock-output-names:
-          items:
+          oneOf:
-            - const: clk_out_sd0
+            - items:
-            - const: clk_in_sd0
+              - const: clk_out_sd0
+              - const: clk_in_sd0
+            - items:
+              - const: clk_out_sd1
+              - const: clk_in_sd1
 properties:
   compatible:

Documentation/devicetree/bindings/mmc/mtk-sd.txt+2−0

@@ -50,6 +50,8 @@ Optional properties: · 49 unmodified lines
50	error caused by stop clock(fifo full)	50	error caused by stop clock(fifo full)
51	Valid range = [0:0x7]. if not present, default value is 0.	51	Valid range = [0:0x7]. if not present, default value is 0.
52	applied to compatible "mediatek,mt2701-mmc".	52	applied to compatible "mediatek,mt2701-mmc".
		53	- resets: Phandle and reset specifier pair to softreset line of MSDC IP.
		54	- reset-names: Should be "hrst".
53		55
54	Examples:	56	Examples:
55	mmc0: mmc@11230000 {	57	mmc0: mmc@11230000 {

Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt+29−3

@@ -15,8 +15,15 @@ Required properties: · 14 unmodified lines
15	- "nvidia,tegra210-sdhci": for Tegra210	15	- "nvidia,tegra210-sdhci": for Tegra210
16	- "nvidia,tegra186-sdhci": for Tegra186	16	- "nvidia,tegra186-sdhci": for Tegra186
17	- "nvidia,tegra194-sdhci": for Tegra194	17	- "nvidia,tegra194-sdhci": for Tegra194
18	- clocks : Must contain one entry, for the module clock.	18	- clocks: For Tegra210, Tegra186 and Tegra194 must contain two entries.
19	See ../clocks/clock-bindings.txt for details.	19	One for the module clock and one for the timeout clock.
		20	For all other Tegra devices, must contain a single entry for
		21	the module clock. See ../clocks/clock-bindings.txt for details.
		22	- clock-names: For Tegra210, Tegra186 and Tegra194 must contain the
		23	strings 'sdhci' and 'tmclk' to represent the module and
		24	the timeout clocks, respectively.
		25	For all other Tegra devices must contain the string 'sdhci'
		26	to represent the module clock.
20	- resets : Must contain an entry for each entry in reset-names.	27	- resets : Must contain an entry for each entry in reset-names.
21	See ../reset/reset.txt for details.	28	See ../reset/reset.txt for details.
22	- reset-names : Must include the following entries:	29	- reset-names : Must include the following entries:
@@ -99,7 +106,7 @@ Optional properties for Tegra210, Tegra186 and Tegra194: · 76 unmodified lines
99		106
100	Example:	107	Example:
101	sdhci@700b0000 {	108	sdhci@700b0000 {
102	compatible = "nvidia,tegra210-sdhci", "nvidia,tegra124-sdhci";	109	compatible = "nvidia,tegra124-sdhci";
103	reg = <0x0 0x700b0000 0x0 0x200>;	110	reg = <0x0 0x700b0000 0x0 0x200>;
104	interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;	111	interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
105	clocks = <&tegra_car TEGRA210_CLK_SDMMC1>;	112	clocks = <&tegra_car TEGRA210_CLK_SDMMC1>;
@@ -115,3 +122,22 @@ sdhci@700b0000 { · 9 unmodified lines
115	nvidia,pad-autocal-pull-down-offset-1v8 = <0x7b>;	122	nvidia,pad-autocal-pull-down-offset-1v8 = <0x7b>;
116	status = "disabled";	123	status = "disabled";
117	};	124	};
		125
		126	sdhci@700b0000 {
		127	compatible = "nvidia,tegra210-sdhci";
		128	reg = <0x0 0x700b0000 0x0 0x200>;
		129	interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
		130	clocks = <&tegra_car TEGRA210_CLK_SDMMC1>,
		131	<&tegra_car TEGRA210_CLK_SDMMC_LEGACY>;
		132	clock-names = "sdhci", "tmclk";
		133	resets = <&tegra_car 14>;
		134	reset-names = "sdhci";
		135	pinctrl-names = "sdmmc-3v3", "sdmmc-1v8";
		136	pinctrl-0 = <&sdmmc1_3v3>;
		137	pinctrl-1 = <&sdmmc1_1v8>;
		138	nvidia,pad-autocal-pull-up-offset-3v3 = <0x00>;
		139	nvidia,pad-autocal-pull-down-offset-3v3 = <0x7d>;
		140	nvidia,pad-autocal-pull-up-offset-1v8 = <0x7b>;
		141	nvidia,pad-autocal-pull-down-offset-1v8 = <0x7b>;
		142	status = "disabled";
		143	};

Documentation/devicetree/bindings/net/dsa/dsa.txt+1−1

@@ -1,4 +1,4 @@
1	Distributed Switch Architecture Device Tree Bindings	1	Distributed Switch Architecture Device Tree Bindings
2	----------------------------------------------------	2	----------------------------------------------------
3		3
4	See Documentation/devicetree/bindings/net/dsa/dsa.yaml for the documenation.	4	See Documentation/devicetree/bindings/net/dsa/dsa.yaml for the documentation.

Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt+8−8

@@ -23,8 +23,8 @@ Required properties: · 22 unmodified lines
23		23
24	- compatible:	24	- compatible:
25	Must be one of :	25	Must be one of :
26	"brcm,spi-bcm-qspi", "brcm,spi-brcmstb-qspi" : MSPI+BSPI on BRCMSTB SoCs	26	"brcm,spi-brcmstb-qspi", "brcm,spi-bcm-qspi" : MSPI+BSPI on BRCMSTB SoCs
27	"brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI	27	"brcm,spi-brcmstb-mspi", "brcm,spi-bcm-qspi" : Second Instance of MSPI
28	BRCMSTB SoCs	28	BRCMSTB SoCs
29	"brcm,spi-bcm7425-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI	29	"brcm,spi-bcm7425-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI
30	BRCMSTB SoCs	30	BRCMSTB SoCs
@@ -36,8 +36,8 @@ Required properties: · 5 unmodified lines
36	BRCMSTB SoCs	36	BRCMSTB SoCs
37	"brcm,spi-bcm7278-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI	37	"brcm,spi-bcm7278-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI
38	BRCMSTB SoCs	38	BRCMSTB SoCs
39	"brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi" : MSPI+BSPI on Cygnus, NSP	39	"brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi" : MSPI+BSPI on Cygnus, NSP
40	"brcm,spi-bcm-qspi", "brcm,spi-ns2-qspi" : NS2 SoCs	40	"brcm,spi-ns2-qspi", "brcm,spi-bcm-qspi" : NS2 SoCs
41		41
42	- reg:	42	- reg:
43	Define the bases and ranges of the associated I/O address spaces.	43	Define the bases and ranges of the associated I/O address spaces.
@@ -86,7 +86,7 @@ BRCMSTB SoC Example: · 42 unmodified lines
86	spi@f03e3400 {	86	spi@f03e3400 {
87	#address-cells = <0x1>;	87	#address-cells = <0x1>;
88	#size-cells = <0x0>;	88	#size-cells = <0x0>;
89	compatible = "brcm,spi-brcmstb-qspi", "brcm,spi-brcmstb-qspi";	89	compatible = "brcm,spi-brcmstb-qspi", "brcm,spi-bcm-qspi";
90	reg = <0xf03e0920 0x4 0xf03e3400 0x188 0xf03e3200 0x50>;	90	reg = <0xf03e0920 0x4 0xf03e3400 0x188 0xf03e3200 0x50>;
91	reg-names = "cs_reg", "mspi", "bspi";	91	reg-names = "cs_reg", "mspi", "bspi";
92	interrupts = <0x6 0x5 0x4 0x3 0x2 0x1 0x0>;	92	interrupts = <0x6 0x5 0x4 0x3 0x2 0x1 0x0>;
@@ -149,7 +149,7 @@ BRCMSTB SoC Example: · 56 unmodified lines
149	#address-cells = <1>;	149	#address-cells = <1>;
150	#size-cells = <0>;	150	#size-cells = <0>;
151	clocks = <&upg_fixed>;	151	clocks = <&upg_fixed>;
152	compatible = "brcm,spi-brcmstb-qspi", "brcm,spi-brcmstb-mspi";	152	compatible = "brcm,spi-brcmstb-mspi", "brcm,spi-bcm-qspi";
153	reg = <0xf0416000 0x180>;	153	reg = <0xf0416000 0x180>;
154	reg-names = "mspi";	154	reg-names = "mspi";
155	interrupts = <0x14>;	155	interrupts = <0x14>;
@@ -160,7 +160,7 @@ BRCMSTB SoC Example: · 4 unmodified lines
160	iProc SoC Example:	160	iProc SoC Example:
161		161
162	qspi: spi@18027200 {	162	qspi: spi@18027200 {
163	compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";	163	compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi";
164	reg = <0x18027200 0x184>,	164	reg = <0x18027200 0x184>,
165	<0x18027000 0x124>,	165	<0x18027000 0x124>,
166	<0x1811c408 0x004>,	166	<0x1811c408 0x004>,
@@ -191,7 +191,7 @@ iProc SoC Example: · 24 unmodified lines
191	NS2 SoC Example:	191	NS2 SoC Example:
192		192
193	qspi: spi@66470200 {	193	qspi: spi@66470200 {
194	compatible = "brcm,spi-bcm-qspi", "brcm,spi-ns2-qspi";	194	compatible = "brcm,spi-ns2-qspi", "brcm,spi-bcm-qspi";
195	reg = <0x66470200 0x184>,	195	reg = <0x66470200 0x184>,
196	<0x66470000 0x124>,	196	<0x66470000 0x124>,
197	<0x67017408 0x004>,	197	<0x67017408 0x004>,

Documentation/driver-api/dma-buf.rst+1−1

@@ -179,7 +179,7 @@ DMA Fence uABI/Sync File · 178 unmodified lines
179	:internal:	179	:internal:
180		180
181	Indefinite DMA Fences	181	Indefinite DMA Fences
182	~~~~~~~~~~~~~~~~~~~~	182	~~~~~~~~~~~~~~~~~~~~~
183		183
184	At various times &dma_fence with an indefinite time until dma_fence_wait()	184	At various times &dma_fence with an indefinite time until dma_fence_wait()
185	finishes have been proposed. Examples include:	185	finishes have been proposed. Examples include:

Documentation/driver-api/fpga/fpga-bridge.rst+3−3

@@ -6,9 +6,9 @@ API to implement a new FPGA bridge · 5 unmodified lines
6		6
7	* struct :c:type:`fpga_bridge` — The FPGA Bridge structure	7	* struct :c:type:`fpga_bridge` — The FPGA Bridge structure
8	* struct :c:type:`fpga_bridge_ops` — Low level Bridge driver ops	8	* struct :c:type:`fpga_bridge_ops` — Low level Bridge driver ops
9	* :c:func:`devm_fpga_bridge_create()` — Allocate and init a bridge struct	9	* devm_fpga_bridge_create() — Allocate and init a bridge struct
10	* :c:func:`fpga_bridge_register()` — Register a bridge	10	* fpga_bridge_register() — Register a bridge
11	* :c:func:`fpga_bridge_unregister()` — Unregister a bridge	11	* fpga_bridge_unregister() — Unregister a bridge
12		12
13	.. kernel-doc:: include/linux/fpga/fpga-bridge.h	13	.. kernel-doc:: include/linux/fpga/fpga-bridge.h
14	:functions: fpga_bridge	14	:functions: fpga_bridge

Documentation/driver-api/fpga/fpga-mgr.rst+3−3

@@ -104,9 +104,9 @@ API for implementing a new FPGA Manager driver · 103 unmodified lines
104	* ``fpga_mgr_states`` — Values for :c:member:`fpga_manager->state`.	104	* ``fpga_mgr_states`` — Values for :c:member:`fpga_manager->state`.
105	* struct :c:type:`fpga_manager` — the FPGA manager struct	105	* struct :c:type:`fpga_manager` — the FPGA manager struct
106	* struct :c:type:`fpga_manager_ops` — Low level FPGA manager driver ops	106	* struct :c:type:`fpga_manager_ops` — Low level FPGA manager driver ops
107	* :c:func:`devm_fpga_mgr_create` — Allocate and init a manager struct	107	* devm_fpga_mgr_create() — Allocate and init a manager struct
108	* :c:func:`fpga_mgr_register` — Register an FPGA manager	108	* fpga_mgr_register() — Register an FPGA manager
109	* :c:func:`fpga_mgr_unregister` — Unregister an FPGA manager	109	* fpga_mgr_unregister() — Unregister an FPGA manager
110		110
111	.. kernel-doc:: include/linux/fpga/fpga-mgr.h	111	.. kernel-doc:: include/linux/fpga/fpga-mgr.h
112	:functions: fpga_mgr_states	112	:functions: fpga_mgr_states

Documentation/driver-api/fpga/fpga-programming.rst+8−8

@@ -6,9 +6,9 @@ Overview · 5 unmodified lines
6		6
7	The in-kernel API for FPGA programming is a combination of APIs from	7	The in-kernel API for FPGA programming is a combination of APIs from
8	FPGA manager, bridge, and regions. The actual function used to	8	FPGA manager, bridge, and regions. The actual function used to
9	trigger FPGA programming is :c:func:`fpga_region_program_fpga()`.	9	trigger FPGA programming is fpga_region_program_fpga().
10		10
11	:c:func:`fpga_region_program_fpga()` uses functionality supplied by	11	fpga_region_program_fpga() uses functionality supplied by
12	the FPGA manager and bridges. It will:	12	the FPGA manager and bridges. It will:
13		13
14	* lock the region's mutex	14	* lock the region's mutex
@@ -20,8 +20,8 @@ the FPGA manager and bridges. It will: · 5 unmodified lines
20	* release the locks	20	* release the locks
21		21
22	The struct fpga_image_info specifies what FPGA image to program. It is	22	The struct fpga_image_info specifies what FPGA image to program. It is
23	allocated/freed by :c:func:`fpga_image_info_alloc()` and freed with	23	allocated/freed by fpga_image_info_alloc() and freed with
24	:c:func:`fpga_image_info_free()`	24	fpga_image_info_free()
25		25
26	How to program an FPGA using a region	26	How to program an FPGA using a region
27	-------------------------------------	27	-------------------------------------
@@ -84,10 +84,10 @@ will generate that list. Here's some sample code of what to do next:: · 56 unmodified lines
84	API for programming an FPGA	84	API for programming an FPGA
85	---------------------------	85	---------------------------
86		86
87	* :c:func:`fpga_region_program_fpga` — Program an FPGA	87	* fpga_region_program_fpga() — Program an FPGA
88	* :c:type:`fpga_image_info` — Specifies what FPGA image to program	88	* fpga_image_info() — Specifies what FPGA image to program
89	* :c:func:`fpga_image_info_alloc()` — Allocate an FPGA image info struct	89	* fpga_image_info_alloc() — Allocate an FPGA image info struct
90	* :c:func:`fpga_image_info_free()` — Free an FPGA image info struct	90	* fpga_image_info_free() — Free an FPGA image info struct
91		91
92	.. kernel-doc:: drivers/fpga/fpga-region.c	92	.. kernel-doc:: drivers/fpga/fpga-region.c
93	:functions: fpga_region_program_fpga	93	:functions: fpga_region_program_fpga

Documentation/driver-api/fpga/fpga-region.rst+9−9

@@ -46,18 +46,18 @@ API to add a new FPGA region · 45 unmodified lines
46	----------------------------	46	----------------------------
47		47
48	* struct :c:type:`fpga_region` — The FPGA region struct	48	* struct :c:type:`fpga_region` — The FPGA region struct
49	* :c:func:`devm_fpga_region_create` — Allocate and init a region struct	49	* devm_fpga_region_create() — Allocate and init a region struct
50	* :c:func:`fpga_region_register` — Register an FPGA region	50	* fpga_region_register() — Register an FPGA region
51	* :c:func:`fpga_region_unregister` — Unregister an FPGA region	51	* fpga_region_unregister() — Unregister an FPGA region
52		52
53	The FPGA region's probe function will need to get a reference to the FPGA	53	The FPGA region's probe function will need to get a reference to the FPGA
54	Manager it will be using to do the programming. This usually would happen	54	Manager it will be using to do the programming. This usually would happen
55	during the region's probe function.	55	during the region's probe function.
56		56
57	* :c:func:`fpga_mgr_get` — Get a reference to an FPGA manager, raise ref count	57	* fpga_mgr_get() — Get a reference to an FPGA manager, raise ref count
58	* :c:func:`of_fpga_mgr_get` — Get a reference to an FPGA manager, raise ref count,	58	* of_fpga_mgr_get() — Get a reference to an FPGA manager, raise ref count,
59	given a device node.	59	given a device node.
60	* :c:func:`fpga_mgr_put` — Put an FPGA manager	60	* fpga_mgr_put() — Put an FPGA manager
61		61
62	The FPGA region will need to specify which bridges to control while programming	62	The FPGA region will need to specify which bridges to control while programming
63	the FPGA. The region driver can build a list of bridges during probe time	63	the FPGA. The region driver can build a list of bridges during probe time
@@ -66,11 +66,11 @@ the list of bridges to program just before programming · 2 unmodified lines
66	(:c:member:`fpga_region->get_bridges`). The FPGA bridge framework supplies the	66	(:c:member:`fpga_region->get_bridges`). The FPGA bridge framework supplies the
67	following APIs to handle building or tearing down that list.	67	following APIs to handle building or tearing down that list.
68		68
69	* :c:func:`fpga_bridge_get_to_list` — Get a ref of an FPGA bridge, add it to a	69	* fpga_bridge_get_to_list() — Get a ref of an FPGA bridge, add it to a
70	list	70	list
71	* :c:func:`of_fpga_bridge_get_to_list` — Get a ref of an FPGA bridge, add it to a	71	* of_fpga_bridge_get_to_list() — Get a ref of an FPGA bridge, add it to a
72	list, given a device node	72	list, given a device node
73	* :c:func:`fpga_bridges_put` — Given a list of bridges, put them	73	* fpga_bridges_put() — Given a list of bridges, put them
74		74
75	.. kernel-doc:: include/linux/fpga/fpga-region.h	75	.. kernel-doc:: include/linux/fpga/fpga-region.h
76	:functions: fpga_region	76	:functions: fpga_region

Documentation/driver-api/iio/core.rst+8−8

@@ -11,10 +11,10 @@ Industrial I/O Devices · 10 unmodified lines
11	----------------------	11	----------------------
12		12
13	* struct :c:type:`iio_dev` - industrial I/O device	13	* struct :c:type:`iio_dev` - industrial I/O device
14	* :c:func:`iio_device_alloc()` - allocate an :c:type:`iio_dev` from a driver	14	* iio_device_alloc() - allocate an :c:type:`iio_dev` from a driver
15	* :c:func:`iio_device_free()` - free an :c:type:`iio_dev` from a driver	15	* iio_device_free() - free an :c:type:`iio_dev` from a driver
16	* :c:func:`iio_device_register()` - register a device with the IIO subsystem	16	* iio_device_register() - register a device with the IIO subsystem
17	* :c:func:`iio_device_unregister()` - unregister a device from the IIO	17	* iio_device_unregister() - unregister a device from the IIO
18	subsystem	18	subsystem
19		19
20	An IIO device usually corresponds to a single hardware sensor and it	20	An IIO device usually corresponds to a single hardware sensor and it
@@ -34,17 +34,17 @@ A typical IIO driver will register itself as an :doc:`I2C <../i2c>` or · 13 unmodified lines
34		34
35	At probe:	35	At probe:
36		36
37	1. Call :c:func:`iio_device_alloc()`, which allocates memory for an IIO device.	37	1. Call iio_device_alloc(), which allocates memory for an IIO device.
38	2. Initialize IIO device fields with driver specific information (e.g.	38	2. Initialize IIO device fields with driver specific information (e.g.
39	device name, device channels).	39	device name, device channels).
40	3. Call :c:func:`iio_device_register()`, this registers the device with the	40	3. Call iio_device_register(), this registers the device with the
41	IIO core. After this call the device is ready to accept requests from user	41	IIO core. After this call the device is ready to accept requests from user
42	space applications.	42	space applications.
43		43
44	At remove, we free the resources allocated in probe in reverse order:	44	At remove, we free the resources allocated in probe in reverse order:
45		45
46	1. :c:func:`iio_device_unregister()`, unregister the device from the IIO core.	46	1. iio_device_unregister(), unregister the device from the IIO core.
47	2. :c:func:`iio_device_free()`, free the memory allocated for the IIO device.	47	2. iio_device_free(), free the memory allocated for the IIO device.
48		48
49	IIO device sysfs interface	49	IIO device sysfs interface
50	==========================	50	==========================

Documentation/filesystems/affs.rst+10−6

   - R maps to r for user, group and others. On directories, R implies x.
-  - If both W and D are allowed, w will be set.
+  - W maps to w.
   - E maps to x.
-  - H and P are always retained and ignored under Linux.
+  - D is ignored.
-  - A is always reset when a file is written to.
+  - H, S and P are always retained and ignored under Linux.
+  - A is cleared when a file is written to.
 User id and group id will be used unless set[gu]id are given as mount
 options. Since most of the Amiga file systems are single user systems
 The Linux rwxrwxrwx file mode is handled as follows:
-  - r permission will set R for user, group and others.
+  - r permission will allow R for user, group and others.
+  - w permission will allow W for user, group and others.
-  - w permission will set W and D for user, group and others.
+  - x permission of the user will allow E for plain files.
-  - x permission of the user will set E for plain files.
+  - D will be allowed for user, group and others.
   - All other flags (suid, sgid, ...) are ignored and will
     not be retained.

Documentation/hwmon/abituguru-datasheet.rst+3−3

Documentation/hwmon/abituguru.rst+2−2

Documentation/hwmon/abituguru3.rst+2−2

@@ -13,7 +13,7 @@ Supported chips: · 12 unmodified lines
13	Note:	13	Note:
14	The uGuru is a microcontroller with onboard firmware which programs	14	The uGuru is a microcontroller with onboard firmware which programs
15	it to behave as a hwmon IC. There are many different revisions of the	15	it to behave as a hwmon IC. There are many different revisions of the
16	firmware and thus effectivly many different revisions of the uGuru.	16	firmware and thus effectively many different revisions of the uGuru.
17	Below is an incomplete list with which revisions are used for which	17	Below is an incomplete list with which revisions are used for which
18	Motherboards:	18	Motherboards:
19		19
@@ -24,7 +24,7 @@ Supported chips: · 4 unmodified lines
24	- uGuru 3.0.0.0 ~ 3.0.x.x (AW8, AL8, AT8, NI8 SLI, AT8 32X, AN8 32X,	24	- uGuru 3.0.0.0 ~ 3.0.x.x (AW8, AL8, AT8, NI8 SLI, AT8 32X, AN8 32X,
25	AW9D-MAX)	25	AW9D-MAX)
26		26
27	The abituguru3 driver is only for revison 3.0.x.x motherboards,	27	The abituguru3 driver is only for revision 3.0.x.x motherboards,
28	this driver will not work on older motherboards. For older	28	this driver will not work on older motherboards. For older
29	motherboards use the abituguru (without the 3 !) driver.	29	motherboards use the abituguru (without the 3 !) driver.
30		30

Documentation/kbuild/llvm.rst+13−13

@@ -23,8 +23,8 @@ supports C and the GNU C extensions required by the kernel, and is pronounced · 22 unmodified lines
23	Clang	23	Clang
24	-----	24	-----
25		25
26	The compiler used can be swapped out via `CC=` command line argument to `make`.	26	The compiler used can be swapped out via ``CC=`` command line argument to ``make``.
27	`CC=` should be set when selecting a config and during a build.	27	``CC=`` should be set when selecting a config and during a build. ::
28		28
29	make CC=clang defconfig	29	make CC=clang defconfig
30		30
@@ -34,33 +34,33 @@ Cross Compiling · 3 unmodified lines
34	---------------	34	---------------
35		35
36	A single Clang compiler binary will typically contain all supported backends,	36	A single Clang compiler binary will typically contain all supported backends,
37	which can help simplify cross compiling.	37	which can help simplify cross compiling. ::
38		38
39	ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- make CC=clang	39	ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- make CC=clang
40		40
41	`CROSS_COMPILE` is not used to prefix the Clang compiler binary, instead	41	``CROSS_COMPILE`` is not used to prefix the Clang compiler binary, instead
42	`CROSS_COMPILE` is used to set a command line flag: `--target <triple>`. For	42	``CROSS_COMPILE`` is used to set a command line flag: ``--target <triple>``. For
43	example:	43	example: ::
44		44
45	clang --target aarch64-linux-gnu foo.c	45	clang --target aarch64-linux-gnu foo.c
46		46
47	LLVM Utilities	47	LLVM Utilities
48	--------------	48	--------------
49		49
50	LLVM has substitutes for GNU binutils utilities. Kbuild supports `LLVM=1`	50	LLVM has substitutes for GNU binutils utilities. Kbuild supports ``LLVM=1``
51	to enable them.	51	to enable them. ::
52		52
53	make LLVM=1	53	make LLVM=1
54		54
55	They can be enabled individually. The full list of the parameters:	55	They can be enabled individually. The full list of the parameters: ::
56		56
57	make CC=clang LD=ld.lld AR=llvm-ar NM=llvm-nm STRIP=llvm-strip \\	57	make CC=clang LD=ld.lld AR=llvm-ar NM=llvm-nm STRIP=llvm-strip \
58	OBJCOPY=llvm-objcopy OBJDUMP=llvm-objdump OBJSIZE=llvm-size \\	58	OBJCOPY=llvm-objcopy OBJDUMP=llvm-objdump OBJSIZE=llvm-size \
59	READELF=llvm-readelf HOSTCC=clang HOSTCXX=clang++ HOSTAR=llvm-ar \\	59	READELF=llvm-readelf HOSTCC=clang HOSTCXX=clang++ HOSTAR=llvm-ar \
60	HOSTLD=ld.lld	60	HOSTLD=ld.lld
61		61
62	Currently, the integrated assembler is disabled by default. You can pass	62	Currently, the integrated assembler is disabled by default. You can pass
63	`LLVM_IAS=1` to enable it.	63	``LLVM_IAS=1`` to enable it.
64		64
65	Getting Help	65	Getting Help
66	------------	66	------------

Documentation/kbuild/makefiles.rst+9−9

@@ -16,7 +16,7 @@ This document describes the Linux kernel Makefiles. · 15 unmodified lines
16	--- 3.5 Library file goals - lib-y	16	--- 3.5 Library file goals - lib-y
17	--- 3.6 Descending down in directories	17	--- 3.6 Descending down in directories
18	--- 3.7 Compilation flags	18	--- 3.7 Compilation flags
19	--- 3.8 Command line dependency	19	--- 3.8 <deleted>
20	--- 3.9 Dependency tracking	20	--- 3.9 Dependency tracking
21	--- 3.10 Special Rules	21	--- 3.10 Special Rules
22	--- 3.11 $(CC) support functions	22	--- 3.11 $(CC) support functions
@@ -39,8 +39,8 @@ This document describes the Linux kernel Makefiles. · 16 unmodified lines
39		39
40	=== 7 Architecture Makefiles	40	=== 7 Architecture Makefiles
41	--- 7.1 Set variables to tweak the build to the architecture	41	--- 7.1 Set variables to tweak the build to the architecture
42	--- 7.2 Add prerequisites to archheaders:	42	--- 7.2 Add prerequisites to archheaders
43	--- 7.3 Add prerequisites to archprepare:	43	--- 7.3 Add prerequisites to archprepare
44	--- 7.4 List directories to visit when descending	44	--- 7.4 List directories to visit when descending
45	--- 7.5 Architecture-specific boot images	45	--- 7.5 Architecture-specific boot images
46	--- 7.6 Building non-kbuild targets	46	--- 7.6 Building non-kbuild targets
@@ -129,7 +129,7 @@ The preferred name for the kbuild files are 'Makefile' but 'Kbuild' can · 82 unmodified lines
129	be used and if both a 'Makefile' and a 'Kbuild' file exists, then the 'Kbuild'	129	be used and if both a 'Makefile' and a 'Kbuild' file exists, then the 'Kbuild'
130	file will be used.	130	file will be used.
131		131
132	Section 3.1 "Goal definitions" is a quick intro, further chapters provide	132	Section 3.1 "Goal definitions" is a quick intro; further chapters provide
133	more details, with real examples.	133	more details, with real examples.
134		134
135	3.1 Goal definitions	135	3.1 Goal definitions
@@ -965,7 +965,7 @@ When kbuild executes, the following steps are followed (roughly): · 829 unmodified lines
965	KBUILD_LDFLAGS := -m elf_s390	965	KBUILD_LDFLAGS := -m elf_s390
966		966
967	Note: ldflags-y can be used to further customise	967	Note: ldflags-y can be used to further customise
968	the flags used. See chapter 3.7.	968	the flags used. See section 3.7.
969		969
970	LDFLAGS_vmlinux	970	LDFLAGS_vmlinux
971	Options for $(LD) when linking vmlinux	971	Options for $(LD) when linking vmlinux
@@ -1121,7 +1121,7 @@ When kbuild executes, the following steps are followed (roughly): · 149 unmodified lines
1121		1121
1122	In this example, the file target maketools will be processed	1122	In this example, the file target maketools will be processed
1123	before descending down in the subdirectories.	1123	before descending down in the subdirectories.
1124	See also chapter XXX-TODO that describe how kbuild supports	1124	See also chapter XXX-TODO that describes how kbuild supports
1125	generating offset header files.	1125	generating offset header files.
1126		1126
1127		1127
@@ -1261,7 +1261,7 @@ When kbuild executes, the following steps are followed (roughly): · 133 unmodified lines
1261	always be built.	1261	always be built.
1262	Assignments to $(targets) are without $(obj)/ prefix.	1262	Assignments to $(targets) are without $(obj)/ prefix.
1263	if_changed may be used in conjunction with custom commands as	1263	if_changed may be used in conjunction with custom commands as
1264	defined in 6.8 "Custom kbuild commands".	1264	defined in 7.8 "Custom kbuild commands".
1265		1265
1266	Note: It is a typical mistake to forget the FORCE prerequisite.	1266	Note: It is a typical mistake to forget the FORCE prerequisite.
1267	Another common pitfall is that whitespace is sometimes	1267	Another common pitfall is that whitespace is sometimes
@@ -1411,7 +1411,7 @@ When kbuild executes, the following steps are followed (roughly): · 143 unmodified lines
1411	that may be shared between individual architectures.	1411	that may be shared between individual architectures.
1412	The recommended approach how to use a generic header file is	1412	The recommended approach how to use a generic header file is
1413	to list the file in the Kbuild file.	1413	to list the file in the Kbuild file.
1414	See "7.2 generic-y" for further info on syntax etc.	1414	See "8.2 generic-y" for further info on syntax etc.
1415		1415
1416	7.11 Post-link pass	1416	7.11 Post-link pass
1417	-------------------	1417	-------------------
@@ -1601,4 +1601,4 @@ is the right choice. · 183 unmodified lines
1601		1601
1602	- Describe how kbuild supports shipped files with _shipped.	1602	- Describe how kbuild supports shipped files with _shipped.
1603	- Generating offset header files.	1603	- Generating offset header files.
1604	- Add more variables to section 7?	1604	- Add more variables to chapters 7 or 9?

Documentation/locking/locktypes.rst+12−12

@@ -164,14 +164,14 @@ by disabling preemption or interrupts. · 163 unmodified lines
164	On non-PREEMPT_RT kernels local_lock operations map to the preemption and	164	On non-PREEMPT_RT kernels local_lock operations map to the preemption and
165	interrupt disabling and enabling primitives:	165	interrupt disabling and enabling primitives:
166		166
167	=========================== ======================	167	=============================== ======================
168	local_lock(&llock) preempt_disable()	168	local_lock(&llock) preempt_disable()
169	local_unlock(&llock) preempt_enable()	169	local_unlock(&llock) preempt_enable()
170	local_lock_irq(&llock) local_irq_disable()	170	local_lock_irq(&llock) local_irq_disable()
171	local_unlock_irq(&llock) local_irq_enable()	171	local_unlock_irq(&llock) local_irq_enable()
172	local_lock_save(&llock) local_irq_save()	172	local_lock_irqsave(&llock) local_irq_save()
173	local_lock_restore(&llock) local_irq_save()	173	local_unlock_irqrestore(&llock) local_irq_restore()
174	=========================== ======================	174	=============================== ======================
175		175
176	The named scope of local_lock has two advantages over the regular	176	The named scope of local_lock has two advantages over the regular
177	primitives:	177	primitives:
@@ -353,14 +353,14 @@ protection scope. So the following substitution is wrong:: · 175 unmodified lines
353	{	353	{
354	local_irq_save(flags); -> local_lock_irqsave(&local_lock_1, flags);	354	local_irq_save(flags); -> local_lock_irqsave(&local_lock_1, flags);
355	func3();	355	func3();
356	local_irq_restore(flags); -> local_lock_irqrestore(&local_lock_1, flags);	356	local_irq_restore(flags); -> local_unlock_irqrestore(&local_lock_1, flags);
357	}	357	}
358		358
359	func2()	359	func2()
360	{	360	{
361	local_irq_save(flags); -> local_lock_irqsave(&local_lock_2, flags);	361	local_irq_save(flags); -> local_lock_irqsave(&local_lock_2, flags);
362	func3();	362	func3();
363	local_irq_restore(flags); -> local_lock_irqrestore(&local_lock_2, flags);	363	local_irq_restore(flags); -> local_unlock_irqrestore(&local_lock_2, flags);
364	}	364	}
365		365
366	func3()	366	func3()
@@ -379,14 +379,14 @@ PREEMPT_RT-specific semantics of spinlock_t. The correct substitution is:: · 12 unmodified lines
379	{	379	{
380	local_irq_save(flags); -> local_lock_irqsave(&local_lock, flags);	380	local_irq_save(flags); -> local_lock_irqsave(&local_lock, flags);
381	func3();	381	func3();
382	local_irq_restore(flags); -> local_lock_irqrestore(&local_lock, flags);	382	local_irq_restore(flags); -> local_unlock_irqrestore(&local_lock, flags);
383	}	383	}
384		384
385	func2()	385	func2()
386	{	386	{
387	local_irq_save(flags); -> local_lock_irqsave(&local_lock, flags);	387	local_irq_save(flags); -> local_lock_irqsave(&local_lock, flags);
388	func3();	388	func3();
389	local_irq_restore(flags); -> local_lock_irqrestore(&local_lock, flags);	389	local_irq_restore(flags); -> local_unlock_irqrestore(&local_lock, flags);
390	}	390	}
391		391
392	func3()	392	func3()

Documentation/maintainer/maintainer-entry-profile.rst+1−0

@@ -101,3 +101,4 @@ to do something different in the near future. · 100 unmodified lines
101		101
102	../doc-guide/maintainer-profile	102	../doc-guide/maintainer-profile
103	../nvdimm/maintainer-entry-profile	103	../nvdimm/maintainer-entry-profile
		104	../riscv/patch-acceptance

Documentation/networking/dsa/configuration.rst+1−1

@@ -180,7 +180,7 @@ The configuration can only be set up via VLAN tagging and bridge setup. · 179 unmodified lines
180		180
181	# bring up the slave interfaces	181	# bring up the slave interfaces
182	ip link set lan1 up	182	ip link set lan1 up
183	ip link set lan1 up	183	ip link set lan2 up
184	ip link set lan3 up	184	ip link set lan3 up
185		185
186	# create bridge	186	# create bridge

Documentation/process/deprecated.rst+1−1

@@ -142,7 +142,7 @@ only NUL-terminated strings. The safe replacement is strscpy(). · 141 unmodified lines
142	(Users of strscpy() still needing NUL-padding should instead	142	(Users of strscpy() still needing NUL-padding should instead
143	use strscpy_pad().)	143	use strscpy_pad().)
144		144
145	If a caller is using non-NUL-terminated strings, strncpy()() can	145	If a caller is using non-NUL-terminated strings, strncpy() can
146	still be used, but destinations should be marked with the `__nonstring	146	still be used, but destinations should be marked with the `__nonstring
147	<https://gcc.gnu.org/onlinedocs/gcc/Common-Variable-Attributes.html>`_	147	<https://gcc.gnu.org/onlinedocs/gcc/Common-Variable-Attributes.html>`_
148	attribute to avoid future compiler warnings.	148	attribute to avoid future compiler warnings.

Documentation/sound/cards/audigy-mixer.rst+1−1

@@ -332,7 +332,7 @@ WO 9901953 (A1) · 331 unmodified lines
332		332
333		333
334	US Patents (https://www.uspto.gov/)	334	US Patents (https://www.uspto.gov/)
335	----------------------------------	335	-----------------------------------
336		336
337	US 5925841	337	US 5925841
338	Digital Sampling Instrument employing cache memory (Jul. 20, 1999)	338	Digital Sampling Instrument employing cache memory (Jul. 20, 1999)

Documentation/sound/cards/sb-live-mixer.rst+1−1

@@ -337,7 +337,7 @@ WO 9901953 (A1) · 336 unmodified lines
337		337
338		338
339	US Patents (https://www.uspto.gov/)	339	US Patents (https://www.uspto.gov/)
340	----------------------------------	340	-----------------------------------
341		341
342	US 5925841	342	US 5925841
343	Digital Sampling Instrument employing cache memory (Jul. 20, 1999)	343	Digital Sampling Instrument employing cache memory (Jul. 20, 1999)

Documentation/sound/designs/timestamping.rst+1−1

@@ -143,7 +143,7 @@ timestamp shows when the information is put together by the driver · 142 unmodified lines
143	before returning from the ``STATUS`` and ``STATUS_EXT`` ioctl. in most cases	143	before returning from the ``STATUS`` and ``STATUS_EXT`` ioctl. in most cases
144	this driver_timestamp will be identical to the regular system tstamp.	144	this driver_timestamp will be identical to the regular system tstamp.
145		145
146	Examples of typestamping with HDaudio:	146	Examples of timestamping with HDAudio:
147		147
148	1. DMA timestamp, no compensation for DMA+analog delay	148	1. DMA timestamp, no compensation for DMA+analog delay
149	::	149	::

Documentation/translations/it_IT/process/deprecated.rst+1−1

@@ -130,7 +130,7 @@ chi usa solo stringe terminate. La versione sicura da usare è · 129 unmodified lines
130	strscpy(). (chi usa strscpy() e necessita di estendere la	130	strscpy(). (chi usa strscpy() e necessita di estendere la
131	terminazione con NUL deve aggiungere una chiamata a memset())	131	terminazione con NUL deve aggiungere una chiamata a memset())
132		132
133	Se il chiamate no usa stringhe terminate con NUL, allore strncpy()()	133	Se il chiamate no usa stringhe terminate con NUL, allore strncpy()
134	può continuare ad essere usata, ma i buffer di destinazione devono essere	134	può continuare ad essere usata, ma i buffer di destinazione devono essere
135	marchiati con l'attributo `__nonstring <https://gcc.gnu.org/onlinedocs/gcc/Common-Variable-Attributes.html>`_	135	marchiati con l'attributo `__nonstring <https://gcc.gnu.org/onlinedocs/gcc/Common-Variable-Attributes.html>`_
136	per evitare avvisi durante la compilazione.	136	per evitare avvisi durante la compilazione.

Documentation/virt/kvm/api.rst+18−4

 8.21 KVM_CAP_HYPERV_DIRECT_TLBFLUSH
 -----------------------------------
-:Architecture: x86
+:Architectures: x86
 This capability indicates that KVM running on top of Hyper-V hypervisor
 enables Direct TLB flush for its guests meaning that TLB flush
 thinks it's running on Hyper-V and only use Hyper-V hypercalls.
 8.22 KVM_CAP_S390_VCPU_RESETS
+-----------------------------
-Architectures: s390
+:Architectures: s390
 This capability indicates that the KVM_S390_NORMAL_RESET and
 KVM_S390_CLEAR_RESET ioctls are available.
 8.23 KVM_CAP_S390_PROTECTED
+---------------------------
-Architecture: s390
+:Architectures: s390
 This capability indicates that the Ultravisor has been initialized and
 KVM can therefore start protected VMs.
 This capability governs the KVM_S390_PV_COMMAND ioctl and the
 KVM_MP_STATE_LOAD MP_STATE. KVM_SET_MP_STATE can fail for protected
 guests when the state change is invalid.
+8.24 KVM_CAP_STEAL_TIME
+-----------------------
+:Architectures: arm64, x86
+This capability indicates that KVM supports steal time accounting.
+When steal time accounting is supported it may be enabled with
+architecture-specific interfaces.  This capability and the architecture-
+specific interfaces must be consistent, i.e. if one says the feature
+is supported, than the other should as well and vice versa.  For arm64
+see Documentation/virt/kvm/devices/vcpu.rst "KVM_ARM_VCPU_PVTIME_CTRL".
+For x86 see Documentation/virt/kvm/msr.rst "MSR_KVM_STEAL_TIME".

MAINTAINERS+51−20

 ARM/CAVIUM THUNDER NETWORK DRIVER
 M:	Sunil Goutham <sgoutham@marvell.com>
-M:	Robert Richter <rrichter@marvell.com>
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:	Supported
 F:	drivers/net/ethernet/cavium/thunder/
 L:	netdev@vger.kernel.org
 L:	openwrt-devel@lists.openwrt.org (subscribers-only)
 S:	Supported
+F:	Documentation/devicetree/bindings/net/dsa/b53.txt
 F:	drivers/net/dsa/b53/*
 F:	include/linux/platform_data/b53.h
 S:	Maintained
 F:	drivers/phy/broadcom/phy-brcm-usb*
+BROADCOM ETHERNET PHY DRIVERS
+M:	Florian Fainelli <f.fainelli@gmail.com>
+L:	bcm-kernel-feedback-list@broadcom.com
+L:	netdev@vger.kernel.org
+S:	Supported
+F:	Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt
+F:	drivers/net/phy/bcm*.[ch]
+F:	drivers/net/phy/broadcom.c
+F:	include/linux/brcmphy.h
 BROADCOM GENET ETHERNET DRIVER
 M:	Doug Berger <opendmb@gmail.com>
 M:	Florian Fainelli <f.fainelli@gmail.com>
 L:	bcm-kernel-feedback-list@broadcom.com
 L:	netdev@vger.kernel.org
 S:	Supported
+F:	Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
+F:	Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
 F:	drivers/net/ethernet/broadcom/genet/
+F:	drivers/net/mdio/mdio-bcm-unimac.c
+F:	include/linux/platform_data/bcmgenet.h
+F:	include/linux/platform_data/mdio-bcm-unimac.h
 BROADCOM IPROC ARM ARCHITECTURE
 M:	Ray Jui <rjui@broadcom.com>
 F:	drivers/net/wireless/ath/carl9170/
 CAVIUM I2C DRIVER
-M:	Robert Richter <rrichter@marvell.com>
+M:	Robert Richter <rric@kernel.org>
-S:	Supported
+S:	Odd Fixes
 W:	http://www.marvell.com
 F:	drivers/i2c/busses/i2c-octeon*
 F:	drivers/i2c/busses/i2c-thunderx*
 F:	drivers/net/ethernet/cavium/liquidio/
 CAVIUM MMC DRIVER
-M:	Robert Richter <rrichter@marvell.com>
+M:	Robert Richter <rric@kernel.org>
-S:	Supported
+S:	Odd Fixes
 W:	http://www.marvell.com
 F:	drivers/mmc/host/cavium*
 F:	drivers/crypto/cavium/cpt/
 CAVIUM THUNDERX2 ARM64 SOC
-M:	Robert Richter <rrichter@marvell.com>
+M:	Robert Richter <rric@kernel.org>
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:	Maintained
+S:	Odd Fixes
 F:	Documentation/devicetree/bindings/arm/cavium-thunder2.txt
 F:	arch/arm64/boot/dts/cavium/thunder2-99xx*
 F:	.clang-format
 CLANG/LLVM BUILD SUPPORT
+M:	Nathan Chancellor <natechancellor@gmail.com>
+M:	Nick Desaulniers <ndesaulniers@google.com>
 L:	clang-built-linux@googlegroups.com
 S:	Supported
 W:	https://clangbuiltlinux.github.io/
 M:	Jonathan Corbet <corbet@lwn.net>
 L:	linux-doc@vger.kernel.org
 S:	Maintained
+P:	Documentation/doc-guide/maintainer-profile.rst
 T:	git git://git.lwn.net/linux.git docs-next
 F:	Documentation/
 F:	scripts/documentation-file-ref-check
 EDAC-CAVIUM OCTEON
 M:	Ralf Baechle <ralf@linux-mips.org>
-M:	Robert Richter <rrichter@marvell.com>
 L:	linux-edac@vger.kernel.org
 L:	linux-mips@vger.kernel.org
 S:	Supported
 F:	drivers/edac/octeon_edac*
 EDAC-CAVIUM THUNDERX
-M:	Robert Richter <rrichter@marvell.com>
+M:	Robert Richter <rric@kernel.org>
 L:	linux-edac@vger.kernel.org
-S:	Supported
+S:	Odd Fixes
 F:	drivers/edac/thunderx_edac*
 EDAC-CORE
 M:	Mauro Carvalho Chehab <mchehab@kernel.org>
 M:	Tony Luck <tony.luck@intel.com>
 R:	James Morse <james.morse@arm.com>
-R:	Robert Richter <rrichter@marvell.com>
+R:	Robert Richter <rric@kernel.org>
 L:	linux-edac@vger.kernel.org
 S:	Supported
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac-for-next
 ETHERNET PHY LIBRARY
 M:	Andrew Lunn <andrew@lunn.ch>
-M:	Florian Fainelli <f.fainelli@gmail.com>
 M:	Heiner Kallweit <hkallweit1@gmail.com>
 R:	Russell King <linux@armlinux.org.uk>
 L:	netdev@vger.kernel.org
 S:	Maintained
 F:	drivers/dma/fsldma.*
+FREESCALE DSPI DRIVER
+M:	Vladimir Oltean <olteanv@gmail.com>
+L:	linux-spi@vger.kernel.org
+S:	Maintained
+F:	Documentation/devicetree/bindings/spi/spi-fsl-dspi.txt
+F:	drivers/spi/spi-fsl-dspi.c
+F:	include/linux/spi/spi-fsl-dspi.h
 FREESCALE ENETC ETHERNET DRIVERS
 M:	Claudiu Manoil <claudiu.manoil@nxp.com>
 L:	netdev@vger.kernel.org
 M:	Tony Luck <tony.luck@intel.com>
 M:	Fenghua Yu <fenghua.yu@intel.com>
 L:	linux-ia64@vger.kernel.org
-S:	Maintained
+S:	Odd Fixes
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
 F:	Documentation/ia64/
 F:	arch/ia64/
 LEAKING_ADDRESSES
 M:	Tobin C. Harding <me@tobin.cc>
-M:	Tycho Andersen <tycho@tycho.ws>
+M:	Tycho Andersen <tycho@tycho.pizza>
 L:	kernel-hardening@lists.openwall.com
 S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git
 F:	drivers/pci/controller/dwc/*artpec*
 PCIE DRIVER FOR CAVIUM THUNDERX
-M:	Robert Richter <rrichter@marvell.com>
+M:	Robert Richter <rric@kernel.org>
 L:	linux-pci@vger.kernel.org
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:	Supported
+S:	Odd Fixes
 F:	drivers/pci/controller/pci-thunder-*
 PCIE DRIVER FOR HISILICON
 F:	tools/lib/perf/
 F:	tools/perf/
-PERFORMANCE EVENTS SUBSYSTEM ARM64 PMU EVENTS
+PERFORMANCE EVENTS TOOLING ARM64
 R:	John Garry <john.garry@huawei.com>
 R:	Will Deacon <will@kernel.org>
+R:	Mathieu Poirier <mathieu.poirier@linaro.org>
+R:	Leo Yan <leo.yan@linaro.org>
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:	Supported
+F:	tools/build/feature/test-libopencsd.c
+F:	tools/perf/arch/arm*/
 F:	tools/perf/pmu-events/arch/arm64/
+F:	tools/perf/util/arm-spe*
+F:	tools/perf/util/cs-etm*
 PERSONALITY HANDLING
 M:	Christoph Hellwig <hch@infradead.org>
 L:	iommu@lists.linux-foundation.org
 L:	linux-arm-msm@vger.kernel.org
 S:	Maintained
-F:	drivers/iommu/qcom_iommu.c
+F:	drivers/iommu/arm/arm-smmu/qcom_iommu.c
 QUALCOMM IPCC MAILBOX DRIVER
 M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 SECURITY CONTACT
 M:	Security Officers <security@kernel.org>
 S:	Supported
+F:	Documentation/admin-guide/security-bugs.rst
 SECURITY SUBSYSTEM
 M:	James Morris <jmorris@namei.org>
 F:	drivers/net/thunderbolt.c
 THUNDERX GPIO DRIVER
-M:	Robert Richter <rrichter@marvell.com>
+M:	Robert Richter <rric@kernel.org>
-S:	Maintained
+S:	Odd Fixes
 F:	drivers/gpio/gpio-thunderx.c
 TI AM437X VPFE DRIVER

Makefile+1−5

 VERSION = 5
 PATCHLEVEL = 9
 SUBLEVEL = 0
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc5
 NAME = Kleptomaniac Octopus
 # *DOCUMENTATION*
 LDFLAGS_vmlinux += --gc-sections
 endif
-ifdef CONFIG_LIVEPATCH
-KBUILD_CFLAGS += $(call cc-option, -flive-patching=inline-clone)
-endif
 ifdef CONFIG_SHADOW_CALL_STACK
 CC_FLAGS_SCS	:= -fsanitize=shadow-call-stack
 KBUILD_CFLAGS	+= $(CC_FLAGS_SCS)

arch/arc/boot/dts/hsdk.dts+4−2

 	arcpct: pct {
 		compatible = "snps,archs-pct";
+		interrupt-parent = <&cpu_intc>;
+		interrupts = <20>;
 	};
 	/* TIMER0 with interrupt for clockevent */
 			reg = <0x8000 0x2000>;
 			interrupts = <10>;
 			interrupt-names = "macirq";
-			phy-mode = "rgmii";
+			phy-mode = "rgmii-id";
 			snps,pbl = <32>;
 			snps,multicast-filter-bins = <256>;
 			clocks = <&gmacclk>;
 				#address-cells = <1>;
 				#size-cells = <0>;
 				compatible = "snps,dwmac-mdio";
-				phy0: ethernet-phy@0 {
+				phy0: ethernet-phy@0 { /* Micrel KSZ9031 */
 					reg = <0>;
 				};
 			};

arch/arc/include/asm/pgalloc.h+2−2

@@ -18,10 +18,10 @@ · 17 unmodified lines
18	* vineetg: April 2010	18	* vineetg: April 2010
19	* -Switched pgtable_t from being struct page * to unsigned long	19	* -Switched pgtable_t from being struct page * to unsigned long
20	* =Needed so that Page Table allocator (pte_alloc_one) is not forced to	20	* =Needed so that Page Table allocator (pte_alloc_one) is not forced to
21	* to deal with struct page. Thay way in future we can make it allocate	21	* deal with struct page. That way in future we can make it allocate
22	* multiple PG Tbls in one Page Frame	22	* multiple PG Tbls in one Page Frame
23	* =sweet side effect is avoiding calls to ugly page_address( ) from the	23	* =sweet side effect is avoiding calls to ugly page_address( ) from the
24	* pg-tlb allocator sub-sys (pte_alloc_one, ptr_free, pmd_populate	24	* pg-tlb allocator sub-sys (pte_alloc_one, ptr_free, pmd_populate)
25	*	25	*
26	* Amit Bhor, Sameer Dhavale: Codito Technologies 2004	26	* Amit Bhor, Sameer Dhavale: Codito Technologies 2004
27	*/	27	*/

arch/arc/kernel/perf_event.c+4−10

@@ -562,7 +562,7 @@ static int arc_pmu_device_probe(struct platform_device *pdev) · 561 unmodified lines
562	{	562	{
563	struct arc_reg_pct_build pct_bcr;	563	struct arc_reg_pct_build pct_bcr;
564	struct arc_reg_cc_build cc_bcr;	564	struct arc_reg_cc_build cc_bcr;
565	int i, has_interrupts;	565	int i, has_interrupts, irq;
566	int counter_size; /* in bits */	566	int counter_size; /* in bits */
567		567
568	union cc_name {	568	union cc_name {
@@ -637,13 +637,7 @@ static int arc_pmu_device_probe(struct platform_device *pdev) · 68 unmodified lines
637	.attr_groups = arc_pmu->attr_groups,	637	.attr_groups = arc_pmu->attr_groups,
638	};	638	};
639		639
640	if (has_interrupts) {	640	if (has_interrupts && (irq = platform_get_irq(pdev, 0) >= 0)) {
641	int irq = platform_get_irq(pdev, 0);
642
643	if (irq < 0) {
644	pr_err("Cannot get IRQ number for the platform\n");
645	return -ENODEV;
646	}
647		641
648	arc_pmu->irq = irq;	642	arc_pmu->irq = irq;
649		643
@@ -652,9 +646,9 @@ static int arc_pmu_device_probe(struct platform_device *pdev) · 2 unmodified lines
652	this_cpu_ptr(&arc_pmu_cpu));	646	this_cpu_ptr(&arc_pmu_cpu));
653		647
654	on_each_cpu(arc_cpu_pmu_irq_init, &irq, 1);	648	on_each_cpu(arc_cpu_pmu_irq_init, &irq, 1);
655		649	} else {
656	} else
657	arc_pmu->pmu.capabilities \|= PERF_PMU_CAP_NO_INTERRUPT;	650	arc_pmu->pmu.capabilities \|= PERF_PMU_CAP_NO_INTERRUPT;
		651	}
658		652
659	/*	653	/*
660	* perf parser doesn't really like '-' symbol in events name, so let's	654	* perf parser doesn't really like '-' symbol in events name, so let's

arch/arc/kernel/troubleshoot.c+30−47

@@ -18,44 +18,37 @@ · 17 unmodified lines
18		18
19	#define ARC_PATH_MAX 256	19	#define ARC_PATH_MAX 256
20		20
21	/*	21	static noinline void print_regs_scratch(struct pt_regs *regs)
22	* Common routine to print scratch regs (r0-r12) or callee regs (r13-r25)
23	* -Prints 3 regs per line and a CR.
24	* -To continue, callee regs right after scratch, special handling of CR
25	*/
26	static noinline void print_reg_file(long *reg_rev, int start_num)
27	{	22	{
28	unsigned int i;	23	pr_cont("BTA: 0x%08lx\n SP: 0x%08lx FP: 0x%08lx BLK: %pS\n",
29	char buf[512];	24	regs->bta, regs->sp, regs->fp, (void *)regs->blink);
30	int n = 0, len = sizeof(buf);	25	pr_cont("LPS: 0x%08lx\tLPE: 0x%08lx\tLPC: 0x%08lx\n",
31		26	regs->lp_start, regs->lp_end, regs->lp_count);
32	for (i = start_num; i < start_num + 13; i++) {
33	n += scnprintf(buf + n, len - n, "r%02u: 0x%08lx\t",
34	i, (unsigned long)*reg_rev);
35
36	if (((i + 1) % 3) == 0)
37	n += scnprintf(buf + n, len - n, "\n");
38
39	/* because pt_regs has regs reversed: r12..r0, r25..r13 */
40	if (is_isa_arcv2() && start_num == 0)
41	reg_rev++;
42	else
43	reg_rev--;
44	}
45
46	if (start_num != 0)
47	n += scnprintf(buf + n, len - n, "\n\n");
48		27
49	/* To continue printing callee regs on same line as scratch regs */	28	pr_info("r00: 0x%08lx\tr01: 0x%08lx\tr02: 0x%08lx\n" \
50	if (start_num == 0)	29	"r03: 0x%08lx\tr04: 0x%08lx\tr05: 0x%08lx\n" \
51	pr_info("%s", buf);	30	"r06: 0x%08lx\tr07: 0x%08lx\tr08: 0x%08lx\n" \
52	else	31	"r09: 0x%08lx\tr10: 0x%08lx\tr11: 0x%08lx\n" \
53	pr_cont("%s\n", buf);	32	"r12: 0x%08lx\t",
		33	regs->r0, regs->r1, regs->r2,
		34	regs->r3, regs->r4, regs->r5,
		35	regs->r6, regs->r7, regs->r8,
		36	regs->r9, regs->r10, regs->r11,
		37	regs->r12);
54	}	38	}
55		39
56	static void show_callee_regs(struct callee_regs *cregs)	40	static void print_regs_callee(struct callee_regs *regs)
57	{	41	{
58	print_reg_file(&(cregs->r13), 13);	42	pr_cont("r13: 0x%08lx\tr14: 0x%08lx\n" \
		43	"r15: 0x%08lx\tr16: 0x%08lx\tr17: 0x%08lx\n" \
		44	"r18: 0x%08lx\tr19: 0x%08lx\tr20: 0x%08lx\n" \
		45	"r21: 0x%08lx\tr22: 0x%08lx\tr23: 0x%08lx\n" \
		46	"r24: 0x%08lx\tr25: 0x%08lx\n",
		47	regs->r13, regs->r14,
		48	regs->r15, regs->r16, regs->r17,
		49	regs->r18, regs->r19, regs->r20,
		50	regs->r21, regs->r22, regs->r23,
		51	regs->r24, regs->r25);
59	}	52	}
60		53
61	static void print_task_path_n_nm(struct task_struct *tsk)	54	static void print_task_path_n_nm(struct task_struct *tsk)
@@ -175,7 +168,7 @@ static void show_ecr_verbose(struct pt_regs *regs) · 113 unmodified lines
175	void show_regs(struct pt_regs *regs)	168	void show_regs(struct pt_regs *regs)
176	{	169	{
177	struct task_struct *tsk = current;	170	struct task_struct *tsk = current;
178	struct callee_regs *cregs;	171	struct callee_regs cregs = (struct callee_regs )tsk->thread.callee_reg;
179		172
180	/*	173	/*
181	* generic code calls us with preemption disabled, but some calls	174	* generic code calls us with preemption disabled, but some calls
@@ -204,25 +197,15 @@ void show_regs(struct pt_regs *regs) · 22 unmodified lines
204	STS_BIT(regs, A2), STS_BIT(regs, A1),	197	STS_BIT(regs, A2), STS_BIT(regs, A1),
205	STS_BIT(regs, E2), STS_BIT(regs, E1));	198	STS_BIT(regs, E2), STS_BIT(regs, E1));
206	#else	199	#else
207	pr_cont(" [%2s%2s%2s%2s]",	200	pr_cont(" [%2s%2s%2s%2s] ",
208	STS_BIT(regs, IE),	201	STS_BIT(regs, IE),
209	(regs->status32 & STATUS_U_MASK) ? "U " : "K ",	202	(regs->status32 & STATUS_U_MASK) ? "U " : "K ",
210	STS_BIT(regs, DE), STS_BIT(regs, AE));	203	STS_BIT(regs, DE), STS_BIT(regs, AE));
211	#endif	204	#endif
212	pr_cont(" BTA: 0x%08lx\n SP: 0x%08lx FP: 0x%08lx BLK: %pS\n",
213	regs->bta, regs->sp, regs->fp, (void *)regs->blink);
214	pr_info("LPS: 0x%08lx\tLPE: 0x%08lx\tLPC: 0x%08lx\n",
215	regs->lp_start, regs->lp_end, regs->lp_count);
216
217	/* print regs->r0 thru regs->r12
218	* Sequential printing was generating horrible code
219	*/
220	print_reg_file(&(regs->r0), 0);
221		205
222	/* If Callee regs were saved, display them too */	206	print_regs_scratch(regs);
223	cregs = (struct callee_regs *)current->thread.callee_reg;
224	if (cregs)	207	if (cregs)
225	show_callee_regs(cregs);	208	print_regs_callee(cregs);
226		209
227	preempt_disable();	210	preempt_disable();
228	}	211	}

arch/arc/mm/init.c+16−11

 #ifdef CONFIG_HIGHMEM
 static unsigned long min_high_pfn, max_high_pfn;
-static u64 high_mem_start;
+static phys_addr_t high_mem_start;
-static u64 high_mem_sz;
+static phys_addr_t high_mem_sz;
 #endif
 #ifdef CONFIG_DISCONTIGMEM
 		high_mem_sz = size;
 		in_use = 1;
 		memblock_add_node(base, size, 1);
+		memblock_reserve(base, size);
 #endif
 	}
 	min_high_pfn = PFN_DOWN(high_mem_start);
 	max_high_pfn = PFN_DOWN(high_mem_start + high_mem_sz);
-	max_zone_pfn[ZONE_HIGHMEM] = max_high_pfn;
+	max_zone_pfn[ZONE_HIGHMEM] = min_low_pfn;
 	high_memory = (void *)(min_high_pfn << PAGE_SHIFT);
 	kmap_init();
 	free_area_init(max_zone_pfn);
 }
-/*
+static void __init highmem_init(void)
- * mem_init - initializes memory
- *
- * Frees up bootmem
- * Calculates and displays memory available/used
- */
-void __init mem_init(void)
 {
 #ifdef CONFIG_HIGHMEM
 	unsigned long tmp;
-	reset_all_zones_managed_pages();
+	memblock_free(high_mem_start, high_mem_sz);
 	for (tmp = min_high_pfn; tmp < max_high_pfn; tmp++)
 		free_highmem_page(pfn_to_page(tmp));
 #endif
+}
+/*
+ * mem_init - initializes memory
+ *
+ * Frees up bootmem
+ * Calculates and displays memory available/used
+ */
+void __init mem_init(void)
+{
 	memblock_free_all();
+	highmem_init();
 	mem_init_print_info(NULL);
 }

arch/arc/plat-eznps/include/plat/ctop.h+0−1

@@ -33,7 +33,6 @@ · 32 unmodified lines
33	#define CTOP_AUX_DPC (CTOP_AUX_BASE + 0x02C)	33	#define CTOP_AUX_DPC (CTOP_AUX_BASE + 0x02C)
34	#define CTOP_AUX_LPC (CTOP_AUX_BASE + 0x030)	34	#define CTOP_AUX_LPC (CTOP_AUX_BASE + 0x030)
35	#define CTOP_AUX_EFLAGS (CTOP_AUX_BASE + 0x080)	35	#define CTOP_AUX_EFLAGS (CTOP_AUX_BASE + 0x080)
36	#define CTOP_AUX_IACK (CTOP_AUX_BASE + 0x088)
37	#define CTOP_AUX_GPA1 (CTOP_AUX_BASE + 0x08C)	36	#define CTOP_AUX_GPA1 (CTOP_AUX_BASE + 0x08C)
38	#define CTOP_AUX_UDMC (CTOP_AUX_BASE + 0x300)	37	#define CTOP_AUX_UDMC (CTOP_AUX_BASE + 0x300)
39		38

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

@@ -217,7 +217,7 @@ · 216 unmodified lines
217	};	217	};
218		218
219	qspi: spi@27200 {	219	qspi: spi@27200 {
220	compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";	220	compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi";
221	reg = <0x027200 0x184>,	221	reg = <0x027200 0x184>,
222	<0x027000 0x124>,	222	<0x027000 0x124>,
223	<0x11c408 0x004>,	223	<0x11c408 0x004>,

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

@@ -284,7 +284,7 @@ · 283 unmodified lines
284	};	284	};
285		285
286	qspi: spi@27200 {	286	qspi: spi@27200 {
287	compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";	287	compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi";
288	reg = <0x027200 0x184>,	288	reg = <0x027200 0x184>,
289	<0x027000 0x124>,	289	<0x027000 0x124>,
290	<0x11c408 0x004>,	290	<0x11c408 0x004>,

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

@@ -488,7 +488,7 @@ · 487 unmodified lines
488	};	488	};
489		489
490	spi@18029200 {	490	spi@18029200 {
491	compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";	491	compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi";
492	reg = <0x18029200 0x184>,	492	reg = <0x18029200 0x184>,
493	<0x18029000 0x124>,	493	<0x18029000 0x124>,
494	<0x1811b408 0x004>,	494	<0x1811b408 0x004>,

arch/arm/boot/dts/imx6q-logicpd.dts+1−1

@@ -13,7 +13,7 @@ · 12 unmodified lines
13		13
14	backlight: backlight-lvds {	14	backlight: backlight-lvds {
15	compatible = "pwm-backlight";	15	compatible = "pwm-backlight";
16	pwms = <&pwm3 0 20000>;	16	pwms = <&pwm3 0 20000 0>;
17	brightness-levels = <0 4 8 16 32 64 128 255>;	17	brightness-levels = <0 4 8 16 32 64 128 255>;
18	default-brightness-level = <6>;	18	default-brightness-level = <6>;
19	power-supply = <&reg_lcd>;	19	power-supply = <&reg_lcd>;

arch/arm/boot/dts/imx6q-prtwd2.dts+1−1

@@ -30,7 +30,7 @@ · 29 unmodified lines
30	};	30	};
31		31
32	/* PRTWD2 rev 1 bitbang I2C for Ethernet Switch */	32	/* PRTWD2 rev 1 bitbang I2C for Ethernet Switch */
33	i2c@4 {	33	i2c {
34	compatible = "i2c-gpio";	34	compatible = "i2c-gpio";
35	pinctrl-names = "default";	35	pinctrl-names = "default";
36	pinctrl-0 = <&pinctrl_i2c4>;	36	pinctrl-0 = <&pinctrl_i2c4>;

arch/arm/boot/dts/imx6qdl-gw51xx.dtsi+0−2

@@ -22,8 +22,6 @@ · 21 unmodified lines
22		22
23	gpio-keys {	23	gpio-keys {
24	compatible = "gpio-keys";	24	compatible = "gpio-keys";
25	#address-cells = <1>;
26	#size-cells = <0>;
27		25
28	user-pb {	26	user-pb {
29	label = "user_pb";	27	label = "user_pb";

arch/arm/boot/dts/imx6sx-pinfunc.h+1−1

@@ -1026,7 +1026,7 @@ · 1025 unmodified lines
1026	#define MX6SX_PAD_QSPI1B_DQS__SIM_M_HADDR_15 0x01B0 0x04F8 0x0000 0x7 0x0	1026	#define MX6SX_PAD_QSPI1B_DQS__SIM_M_HADDR_15 0x01B0 0x04F8 0x0000 0x7 0x0
1027	#define MX6SX_PAD_QSPI1B_SCLK__QSPI1_B_SCLK 0x01B4 0x04FC 0x0000 0x0 0x0	1027	#define MX6SX_PAD_QSPI1B_SCLK__QSPI1_B_SCLK 0x01B4 0x04FC 0x0000 0x0 0x0
1028	#define MX6SX_PAD_QSPI1B_SCLK__UART3_DCE_RX 0x01B4 0x04FC 0x0840 0x1 0x4	1028	#define MX6SX_PAD_QSPI1B_SCLK__UART3_DCE_RX 0x01B4 0x04FC 0x0840 0x1 0x4
1029	#define MX6SX_PAD_QSPI1B_SCLK__UART3_DTE_TX 0x01B4 0x04FC 0x0000 0x0 0x0	1029	#define MX6SX_PAD_QSPI1B_SCLK__UART3_DTE_TX 0x01B4 0x04FC 0x0000 0x1 0x0
1030	#define MX6SX_PAD_QSPI1B_SCLK__ECSPI3_SCLK 0x01B4 0x04FC 0x0730 0x2 0x1	1030	#define MX6SX_PAD_QSPI1B_SCLK__ECSPI3_SCLK 0x01B4 0x04FC 0x0730 0x2 0x1
1031	#define MX6SX_PAD_QSPI1B_SCLK__ESAI_RX_HF_CLK 0x01B4 0x04FC 0x0780 0x3 0x2	1031	#define MX6SX_PAD_QSPI1B_SCLK__ESAI_RX_HF_CLK 0x01B4 0x04FC 0x0780 0x3 0x2
1032	#define MX6SX_PAD_QSPI1B_SCLK__CSI1_DATA_16 0x01B4 0x04FC 0x06DC 0x4 0x1	1032	#define MX6SX_PAD_QSPI1B_SCLK__CSI1_DATA_16 0x01B4 0x04FC 0x06DC 0x4 0x1

arch/arm/boot/dts/imx7d-zii-rmu2.dts+1−1

@@ -58,7 +58,7 @@ · 57 unmodified lines
58	<&clks IMX7D_ENET1_TIME_ROOT_CLK>;	58	<&clks IMX7D_ENET1_TIME_ROOT_CLK>;
59	assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>;	59	assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>;
60	assigned-clock-rates = <0>, <100000000>;	60	assigned-clock-rates = <0>, <100000000>;
61	phy-mode = "rgmii";	61	phy-mode = "rgmii-id";
62	phy-handle = <&fec1_phy>;	62	phy-handle = <&fec1_phy>;
63	status = "okay";	63	status = "okay";
64		64

arch/arm/boot/dts/imx7ulp.dtsi+4−4

@@ -394,7 +394,7 @@ · 393 unmodified lines
394	clocks = <&pcc2 IMX7ULP_CLK_RGPIO2P1>,	394	clocks = <&pcc2 IMX7ULP_CLK_RGPIO2P1>,
395	<&pcc3 IMX7ULP_CLK_PCTLC>;	395	<&pcc3 IMX7ULP_CLK_PCTLC>;
396	clock-names = "gpio", "port";	396	clock-names = "gpio", "port";
397	gpio-ranges = <&iomuxc1 0 0 32>;	397	gpio-ranges = <&iomuxc1 0 0 20>;
398	};	398	};
399		399
400	gpio_ptd: gpio@40af0000 {	400	gpio_ptd: gpio@40af0000 {
@@ -408,7 +408,7 @@ · 7 unmodified lines
408	clocks = <&pcc2 IMX7ULP_CLK_RGPIO2P1>,	408	clocks = <&pcc2 IMX7ULP_CLK_RGPIO2P1>,
409	<&pcc3 IMX7ULP_CLK_PCTLD>;	409	<&pcc3 IMX7ULP_CLK_PCTLD>;
410	clock-names = "gpio", "port";	410	clock-names = "gpio", "port";
411	gpio-ranges = <&iomuxc1 0 32 32>;	411	gpio-ranges = <&iomuxc1 0 32 12>;
412	};	412	};
413		413
414	gpio_pte: gpio@40b00000 {	414	gpio_pte: gpio@40b00000 {
@@ -422,7 +422,7 @@ · 7 unmodified lines
422	clocks = <&pcc2 IMX7ULP_CLK_RGPIO2P1>,	422	clocks = <&pcc2 IMX7ULP_CLK_RGPIO2P1>,
423	<&pcc3 IMX7ULP_CLK_PCTLE>;	423	<&pcc3 IMX7ULP_CLK_PCTLE>;
424	clock-names = "gpio", "port";	424	clock-names = "gpio", "port";
425	gpio-ranges = <&iomuxc1 0 64 32>;	425	gpio-ranges = <&iomuxc1 0 64 16>;
426	};	426	};
427		427
428	gpio_ptf: gpio@40b10000 {	428	gpio_ptf: gpio@40b10000 {
@@ -436,7 +436,7 @@ · 7 unmodified lines
436	clocks = <&pcc2 IMX7ULP_CLK_RGPIO2P1>,	436	clocks = <&pcc2 IMX7ULP_CLK_RGPIO2P1>,
437	<&pcc3 IMX7ULP_CLK_PCTLF>;	437	<&pcc3 IMX7ULP_CLK_PCTLF>;
438	clock-names = "gpio", "port";	438	clock-names = "gpio", "port";
439	gpio-ranges = <&iomuxc1 0 96 32>;	439	gpio-ranges = <&iomuxc1 0 96 20>;
440	};	440	};
441	};	441	};
442		442

arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi+7−22

 &mcbsp2 {
 	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&mcbsp2_pins>;
 };
 &charger {
 		regulator-max-microvolt = <3300000>;
 	};
-	lcd0: display@0 {
+	lcd0: display {
-		compatible = "panel-dpi";
+		/* This isn't the exact LCD, but the timings meet spec */
-		label = "28";
+		compatible = "logicpd,type28";
-		status = "okay";
-		/* default-on; */
 		pinctrl-names = "default";
 		pinctrl-0 = <&lcd_enable_pin>;
-		enable-gpios = <&gpio5 27 GPIO_ACTIVE_HIGH>;	/* gpio155, lcd INI */
+		backlight = <&bl>;
+		enable-gpios = <&gpio5 27 GPIO_ACTIVE_HIGH>;
 		port {
 			lcd_in: endpoint {
 				remote-endpoint = <&dpi_out>;
 			};
 		};
-		panel-timing {
-			clock-frequency = <9000000>;
-			hactive = <480>;
-			vactive = <272>;
-			hfront-porch = <3>;
-			hback-porch = <2>;
-			hsync-len = <42>;
-			vback-porch = <3>;
-			vfront-porch = <2>;
-			vsync-len = <11>;
-			hsync-active = <1>;
-			vsync-active = <1>;
-			de-active = <1>;
-			pixelclk-active = <0>;
-		};
 	};
 	bl: backlight {

arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi+2−0

@@ -81,6 +81,8 @@ · 80 unmodified lines
81	};	81	};
82		82
83	&mcbsp2 {	83	&mcbsp2 {
		84	pinctrl-names = "default";
		85	pinctrl-0 = <&mcbsp2_pins>;
84	status = "okay";	86	status = "okay";
85	};	87	};
86		88

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

@@ -182,7 +182,7 @@ · 181 unmodified lines
182	#address-cells = <1>;	182	#address-cells = <1>;
183	#size-cells = <0>;	183	#size-cells = <0>;
184	reg = <0x0 0x1550000 0x0 0x10000>,	184	reg = <0x0 0x1550000 0x0 0x10000>,
185	<0x0 0x40000000 0x0 0x40000000>;	185	<0x0 0x40000000 0x0 0x20000000>;
186	reg-names = "QuadSPI", "QuadSPI-memory";	186	reg-names = "QuadSPI", "QuadSPI-memory";
187	interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;	187	interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
188	clock-names = "qspi_en", "qspi";	188	clock-names = "qspi_en", "qspi";

arch/arm/boot/dts/omap5.dtsi+11−9

 					};
 				};
-				target-module@5000 {
+				target-module@4000 {
 					compatible = "ti,sysc-omap2", "ti,sysc";
-					reg = <0x5000 0x4>,
+					reg = <0x4000 0x4>,
-					      <0x5010 0x4>,
+					      <0x4010 0x4>,
-					      <0x5014 0x4>;
+					      <0x4014 0x4>;
 					reg-names = "rev", "sysc", "syss";
 					ti,sysc-sidle = <SYSC_IDLE_FORCE>,
 							<SYSC_IDLE_NO>,
 					ti,syss-mask = <1>;
 					#address-cells = <1>;
 					#size-cells = <1>;
-					ranges = <0 0x5000 0x1000>;
+					ranges = <0 0x4000 0x1000>;
 					dsi1: encoder@0 {
 						compatible = "ti,omap5-dsi";
 						reg-names = "proto", "phy", "pll";
 						interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
 						status = "disabled";
-						clocks = <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 8>;
+						clocks = <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 8>,
-						clock-names = "fck";
+							 <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 10>;
+						clock-names = "fck", "sys_clk";
 					};
 				};
 						reg-names = "proto", "phy", "pll";
 						interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
 						status = "disabled";
-						clocks = <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 8>;
+						clocks = <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 8>,
-						clock-names = "fck";
+							 <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 10>;
+						clock-names = "fck", "sys_clk";
 					};
 				};

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

@@ -821,7 +821,7 @@ · 820 unmodified lines
821	timer3: timer3@ffd00100 {	821	timer3: timer3@ffd00100 {
822	compatible = "snps,dw-apb-timer";	822	compatible = "snps,dw-apb-timer";
823	interrupts = <0 118 IRQ_TYPE_LEVEL_HIGH>;	823	interrupts = <0 118 IRQ_TYPE_LEVEL_HIGH>;
824	reg = <0xffd01000 0x100>;	824	reg = <0xffd00100 0x100>;
825	clocks = <&l4_sys_free_clk>;	825	clocks = <&l4_sys_free_clk>;
826	clock-names = "timer";	826	clock-names = "timer";
827	resets = <&rst L4SYSTIMER1_RESET>;	827	resets = <&rst L4SYSTIMER1_RESET>;

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

@@ -495,7 +495,7 @@ · 494 unmodified lines
495	};	495	};
496		496
497	ocotp: ocotp@400a5000 {	497	ocotp: ocotp@400a5000 {
498	compatible = "fsl,vf610-ocotp";	498	compatible = "fsl,vf610-ocotp", "syscon";
499	reg = <0x400a5000 0x1000>;	499	reg = <0x400a5000 0x1000>;
500	clocks = <&clks VF610_CLK_OCOTP>;	500	clocks = <&clks VF610_CLK_OCOTP>;
501	};	501	};

arch/arm/configs/integrator_defconfig+8−8

 CONFIG_SYSVIPC=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_PREEMPT=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_MULTI_V4T=y
 CONFIG_ARCH_MULTI_V5=y
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_INTEGRATOR_AP=y
 CONFIG_INTEGRATOR_IMPD1=y
 CONFIG_ARCH_INTEGRATOR_CP=y
-CONFIG_PCI=y
-CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 # CONFIG_ATAGS is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="console=ttyAM0,38400n8 root=/dev/nfs ip=bootp"
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPUFREQ_DT=y
-CONFIG_CMA=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_PARTITION_ADVANCED=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 # CONFIG_IPV6 is not set
+CONFIG_PCI=y
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_AFS_PARTS=y
 CONFIG_NETDEVICES=y
 CONFIG_E100=y
 CONFIG_SMC91X=y
+CONFIG_INPUT_EVDEV=y
 # CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_GPIO=y
 # CONFIG_SERIO_SERPORT is not set
 CONFIG_DRM=y
+CONFIG_DRM_DISPLAY_CONNECTOR=y
 CONFIG_DRM_SIMPLE_BRIDGE=y
 CONFIG_DRM_PL111=y
 CONFIG_FB_MODE_HELPERS=y

arch/arm/mach-omap2/omap-iommu.c+1−1

@@ -74,7 +74,7 @@ static struct powerdomain _get_pwrdm(struct device dev) · 73 unmodified lines
74	return pwrdm;	74	return pwrdm;
75		75
76	clk = of_clk_get(dev->of_node->parent, 0);	76	clk = of_clk_get(dev->of_node->parent, 0);
77	if (!clk) {	77	if (IS_ERR(clk)) {
78	dev_err(dev, "no fck found\n");	78	dev_err(dev, "no fck found\n");
79	return NULL;	79	return NULL;
80	}	80	}

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

@@ -745,7 +745,7 @@ · 744 unmodified lines
745	};	745	};
746		746
747	qspi: spi@66470200 {	747	qspi: spi@66470200 {
748	compatible = "brcm,spi-bcm-qspi", "brcm,spi-ns2-qspi";	748	compatible = "brcm,spi-ns2-qspi", "brcm,spi-bcm-qspi";
749	reg = <0x66470200 0x184>,	749	reg = <0x66470200 0x184>,
750	<0x66470000 0x124>,	750	<0x66470000 0x124>,
751	<0x67017408 0x004>,	751	<0x67017408 0x004>,

arch/arm64/boot/dts/freescale/Makefile+1−0

@@ -28,6 +28,7 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-honeycomb.dtb · 27 unmodified lines
28	dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-qds.dtb	28	dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-qds.dtb
29	dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-rdb.dtb	29	dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-rdb.dtb
30		30
		31	dtb-$(CONFIG_ARCH_MXC) += imx8mm-beacon-kit.dtb
31	dtb-$(CONFIG_ARCH_MXC) += imx8mm-evk.dtb	32	dtb-$(CONFIG_ARCH_MXC) += imx8mm-evk.dtb
32	dtb-$(CONFIG_ARCH_MXC) += imx8mn-evk.dtb	33	dtb-$(CONFIG_ARCH_MXC) += imx8mn-evk.dtb
33	dtb-$(CONFIG_ARCH_MXC) += imx8mn-ddr4-evk.dtb	34	dtb-$(CONFIG_ARCH_MXC) += imx8mn-ddr4-evk.dtb

arch/arm64/boot/dts/freescale/imx8mp.dtsi+1−1

@@ -702,7 +702,7 @@ · 701 unmodified lines
702	reg = <0x30bd0000 0x10000>;	702	reg = <0x30bd0000 0x10000>;
703	interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;	703	interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
704	clocks = <&clk IMX8MP_CLK_SDMA1_ROOT>,	704	clocks = <&clk IMX8MP_CLK_SDMA1_ROOT>,
705	<&clk IMX8MP_CLK_SDMA1_ROOT>;	705	<&clk IMX8MP_CLK_AHB>;
706	clock-names = "ipg", "ahb";	706	clock-names = "ipg", "ahb";
707	#dma-cells = <3>;	707	#dma-cells = <3>;
708	fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";	708	fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";

arch/arm64/boot/dts/freescale/imx8mq.dtsi+1−1

@@ -423,7 +423,7 @@ · 422 unmodified lines
423	tmu: tmu@30260000 {	423	tmu: tmu@30260000 {
424	compatible = "fsl,imx8mq-tmu";	424	compatible = "fsl,imx8mq-tmu";
425	reg = <0x30260000 0x10000>;	425	reg = <0x30260000 0x10000>;
426	interrupt = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;	426	interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
427	clocks = <&clk IMX8MQ_CLK_TMU_ROOT>;	427	clocks = <&clk IMX8MQ_CLK_TMU_ROOT>;
428	little-endian;	428	little-endian;
429	fsl,tmu-range = <0xb0000 0xa0026 0x80048 0x70061>;	429	fsl,tmu-range = <0xb0000 0xa0026 0x80048 0x70061>;

arch/arm64/boot/dts/mediatek/mt7622.dtsi+2−0

@@ -686,6 +686,8 @@ · 685 unmodified lines
686	clocks = <&pericfg CLK_PERI_MSDC30_0_PD>,	686	clocks = <&pericfg CLK_PERI_MSDC30_0_PD>,
687	<&topckgen CLK_TOP_MSDC50_0_SEL>;	687	<&topckgen CLK_TOP_MSDC50_0_SEL>;
688	clock-names = "source", "hclk";	688	clock-names = "source", "hclk";
		689	resets = <&pericfg MT7622_PERI_MSDC0_SW_RST>;
		690	reset-names = "hrst";
689	status = "disabled";	691	status = "disabled";
690	};	692	};
691		693

arch/arm64/boot/dts/nvidia/tegra186.dtsi+12−8

 		compatible = "nvidia,tegra186-sdhci";
 		reg = <0x0 0x03400000 0x0 0x10000>;
 		interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&bpmp TEGRA186_CLK_SDMMC1>;
+		clocks = <&bpmp TEGRA186_CLK_SDMMC1>,
-		clock-names = "sdhci";
+			 <&bpmp TEGRA186_CLK_SDMMC_LEGACY_TM>;
+		clock-names = "sdhci", "tmclk";
 		resets = <&bpmp TEGRA186_RESET_SDMMC1>;
 		reset-names = "sdhci";
 		interconnects = <&mc TEGRA186_MEMORY_CLIENT_SDMMCRA &emc>,
 		compatible = "nvidia,tegra186-sdhci";
 		reg = <0x0 0x03420000 0x0 0x10000>;
 		interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&bpmp TEGRA186_CLK_SDMMC2>;
+		clocks = <&bpmp TEGRA186_CLK_SDMMC2>,
-		clock-names = "sdhci";
+			 <&bpmp TEGRA186_CLK_SDMMC_LEGACY_TM>;
+		clock-names = "sdhci", "tmclk";
 		resets = <&bpmp TEGRA186_RESET_SDMMC2>;
 		reset-names = "sdhci";
 		interconnects = <&mc TEGRA186_MEMORY_CLIENT_SDMMCRAA &emc>,
 		compatible = "nvidia,tegra186-sdhci";
 		reg = <0x0 0x03440000 0x0 0x10000>;
 		interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&bpmp TEGRA186_CLK_SDMMC3>;
+		clocks = <&bpmp TEGRA186_CLK_SDMMC3>,
-		clock-names = "sdhci";
+			 <&bpmp TEGRA186_CLK_SDMMC_LEGACY_TM>;
+		clock-names = "sdhci", "tmclk";
 		resets = <&bpmp TEGRA186_RESET_SDMMC3>;
 		reset-names = "sdhci";
 		interconnects = <&mc TEGRA186_MEMORY_CLIENT_SDMMCR &emc>,
 		compatible = "nvidia,tegra186-sdhci";
 		reg = <0x0 0x03460000 0x0 0x10000>;
 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&bpmp TEGRA186_CLK_SDMMC4>;
+		clocks = <&bpmp TEGRA186_CLK_SDMMC4>,
-		clock-names = "sdhci";
+			 <&bpmp TEGRA186_CLK_SDMMC_LEGACY_TM>;
+		clock-names = "sdhci", "tmclk";
 		assigned-clocks = <&bpmp TEGRA186_CLK_SDMMC4>,
 				  <&bpmp TEGRA186_CLK_PLLC4_VCO>;
 		assigned-clock-parents = <&bpmp TEGRA186_CLK_PLLC4_VCO>;

arch/arm64/boot/dts/nvidia/tegra194.dtsi+9−6

 			compatible = "nvidia,tegra194-sdhci";
 			reg = <0x03400000 0x10000>;
 			interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&bpmp TEGRA194_CLK_SDMMC1>;
+			clocks = <&bpmp TEGRA194_CLK_SDMMC1>,
-			clock-names = "sdhci";
+				 <&bpmp TEGRA194_CLK_SDMMC_LEGACY_TM>;
+			clock-names = "sdhci", "tmclk";
 			resets = <&bpmp TEGRA194_RESET_SDMMC1>;
 			reset-names = "sdhci";
 			interconnects = <&mc TEGRA194_MEMORY_CLIENT_SDMMCRA &emc>,
 			compatible = "nvidia,tegra194-sdhci";
 			reg = <0x03440000 0x10000>;
 			interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&bpmp TEGRA194_CLK_SDMMC3>;
+			clocks = <&bpmp TEGRA194_CLK_SDMMC3>,
-			clock-names = "sdhci";
+				 <&bpmp TEGRA194_CLK_SDMMC_LEGACY_TM>;
+			clock-names = "sdhci", "tmclk";
 			resets = <&bpmp TEGRA194_RESET_SDMMC3>;
 			reset-names = "sdhci";
 			interconnects = <&mc TEGRA194_MEMORY_CLIENT_SDMMCR &emc>,
 			compatible = "nvidia,tegra194-sdhci";
 			reg = <0x03460000 0x10000>;
 			interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&bpmp TEGRA194_CLK_SDMMC4>;
+			clocks = <&bpmp TEGRA194_CLK_SDMMC4>,
-			clock-names = "sdhci";
+				 <&bpmp TEGRA194_CLK_SDMMC_LEGACY_TM>;
+			clock-names = "sdhci", "tmclk";
 			assigned-clocks = <&bpmp TEGRA194_CLK_SDMMC4>,
 					  <&bpmp TEGRA194_CLK_PLLC4>;
 			assigned-clock-parents =

arch/arm64/boot/dts/nvidia/tegra210.dtsi+12−8

 		compatible = "nvidia,tegra210-sdhci";
 		reg = <0x0 0x700b0000 0x0 0x200>;
 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&tegra_car TEGRA210_CLK_SDMMC1>;
+		clocks = <&tegra_car TEGRA210_CLK_SDMMC1>,
-		clock-names = "sdhci";
+			 <&tegra_car TEGRA210_CLK_SDMMC_LEGACY>;
+		clock-names = "sdhci", "tmclk";
 		resets = <&tegra_car 14>;
 		reset-names = "sdhci";
 		pinctrl-names = "sdmmc-3v3", "sdmmc-1v8",
 		compatible = "nvidia,tegra210-sdhci";
 		reg = <0x0 0x700b0200 0x0 0x200>;
 		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&tegra_car TEGRA210_CLK_SDMMC2>;
+		clocks = <&tegra_car TEGRA210_CLK_SDMMC2>,
-		clock-names = "sdhci";
+			 <&tegra_car TEGRA210_CLK_SDMMC_LEGACY>;
+		clock-names = "sdhci", "tmclk";
 		resets = <&tegra_car 9>;
 		reset-names = "sdhci";
 		pinctrl-names = "sdmmc-1v8-drv";
 		compatible = "nvidia,tegra210-sdhci";
 		reg = <0x0 0x700b0400 0x0 0x200>;
 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&tegra_car TEGRA210_CLK_SDMMC3>;
+		clocks = <&tegra_car TEGRA210_CLK_SDMMC3>,
-		clock-names = "sdhci";
+			 <&tegra_car TEGRA210_CLK_SDMMC_LEGACY>;
+		clock-names = "sdhci", "tmclk";
 		resets = <&tegra_car 69>;
 		reset-names = "sdhci";
 		pinctrl-names = "sdmmc-3v3", "sdmmc-1v8",
 		compatible = "nvidia,tegra210-sdhci";
 		reg = <0x0 0x700b0600 0x0 0x200>;
 		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&tegra_car TEGRA210_CLK_SDMMC4>;
+		clocks = <&tegra_car TEGRA210_CLK_SDMMC4>,
-		clock-names = "sdhci";
+			 <&tegra_car TEGRA210_CLK_SDMMC_LEGACY>;
+		clock-names = "sdhci", "tmclk";
 		resets = <&tegra_car 15>;
 		reset-names = "sdhci";
 		pinctrl-names = "sdmmc-3v3-drv", "sdmmc-1v8-drv";

arch/arm64/boot/dts/xilinx/zynqmp.dtsi+11−1

  */
 #include <dt-bindings/power/xlnx-zynqmp-power.h>
+#include <dt-bindings/reset/xlnx-zynqmp-resets.h>
 / {
 	compatible = "xlnx,zynqmp";
 			};
 		};
+		psgtr: phy@fd400000 {
+			compatible = "xlnx,zynqmp-psgtr-v1.1";
+			status = "disabled";
+			reg = <0x0 0xfd400000 0x0 0x40000>,
+			      <0x0 0xfd3d0000 0x0 0x1000>;
+			reg-names = "serdes", "siou";
+			#phy-cells = <4>;
+		};
 		rtc: rtc@ffa60000 {
 			compatible = "xlnx,zynqmp-rtc";
 			status = "disabled";
 			power-domains = <&zynqmp_firmware PD_SD_1>;
 		};
-		smmu: smmu@fd800000 {
+		smmu: iommu@fd800000 {
 			compatible = "arm,mmu-500";
 			reg = <0x0 0xfd800000 0x0 0x20000>;
 			status = "disabled";

arch/arm64/configs/defconfig+12−0

 CONFIG_USB_RENESAS_USBHS_UDC=m
 CONFIG_USB_RENESAS_USB3=m
 CONFIG_USB_TEGRA_XUDC=m
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_TYPEC=m
 CONFIG_TYPEC_TCPM=m
 CONFIG_TYPEC_FUSB302=m
 CONFIG_ARCH_K3_AM6_SOC=y
 CONFIG_ARCH_K3_J721E_SOC=y
 CONFIG_TI_SCI_PM_DOMAINS=y
+CONFIG_EXTCON_PTN5150=m
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_EXTCON_USBC_CROS_EC=y
 CONFIG_IIO=y

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

 	/* Guest PV state */
 	struct {
-		u64 steal;
 		u64 last_steal;
 		gpa_t base;
 	} steal;
 gpa_t kvm_init_stolen_time(struct kvm_vcpu *vcpu);
 void kvm_update_stolen_time(struct kvm_vcpu *vcpu);
+bool kvm_arm_pvtime_supported(void);
 int kvm_arm_pvtime_set_attr(struct kvm_vcpu *vcpu,
 			    struct kvm_device_attr *attr);
 int kvm_arm_pvtime_get_attr(struct kvm_vcpu *vcpu,

arch/arm64/kernel/module-plts.c+1−2

 			mod->arch.core.plt_shndx = i;
 		else if (!strcmp(secstrings + sechdrs[i].sh_name, ".init.plt"))
 			mod->arch.init.plt_shndx = i;
-		else if (IS_ENABLED(CONFIG_DYNAMIC_FTRACE) &&
+		else if (!strcmp(secstrings + sechdrs[i].sh_name,
-			 !strcmp(secstrings + sechdrs[i].sh_name,
 				 ".text.ftrace_trampoline"))
 			tramp = sechdrs + i;
 		else if (sechdrs[i].sh_type == SHT_SYMTAB)

arch/arm64/kernel/setup.c+0−1

@@ -280,7 +280,6 @@ u64 cpu_logical_map(int cpu) · 279 unmodified lines
280	{	280	{
281	return __cpu_logical_map[cpu];	281	return __cpu_logical_map[cpu];
282	}	282	}
283	EXPORT_SYMBOL_GPL(cpu_logical_map);
284		283
285	void __init __no_sanitize_address setup_arch(char **cmdline_p)	284	void __init __no_sanitize_address setup_arch(char **cmdline_p)
286	{	285	{

arch/arm64/kvm/arm.c+3−0

 		 */
 		r = 1;
 		break;
+	case KVM_CAP_STEAL_TIME:
+		r = kvm_arm_pvtime_supported();
+		break;
 	default:
 		r = kvm_arch_vm_ioctl_check_extension(kvm, ext);
 		break;

arch/arm64/kvm/mmu.c+7−1

 	    !fault_supports_stage2_huge_mapping(memslot, hva, vma_pagesize)) {
 		force_pte = true;
 		vma_pagesize = PAGE_SIZE;
+		vma_shift = PAGE_SHIFT;
 	}
 	/*
 		(fault_status == FSC_PERM &&
 		 stage2_is_exec(mmu, fault_ipa, vma_pagesize));
-	if (vma_pagesize == PUD_SIZE) {
+	/*
+	 * If PUD_SIZE == PMD_SIZE, there is no real PUD level, and
+	 * all we have is a 2-level page table. Trying to map a PUD in
+	 * this case would be fatally wrong.
+	 */
+	if (PUD_SIZE != PMD_SIZE && vma_pagesize == PUD_SIZE) {
 		pud_t new_pud = kvm_pfn_pud(pfn, mem_type);
 		new_pud = kvm_pud_mkhuge(new_pud);

arch/arm64/kvm/pvtime.c+13−16

 void kvm_update_stolen_time(struct kvm_vcpu *vcpu)
 {
 	struct kvm *kvm = vcpu->kvm;
-	u64 steal;
-	__le64 steal_le;
-	u64 offset;
-	int idx;
 	u64 base = vcpu->arch.steal.base;
+	u64 last_steal = vcpu->arch.steal.last_steal;
+	u64 offset = offsetof(struct pvclock_vcpu_stolen_time, stolen_time);
+	u64 steal = 0;
+	int idx;
 	if (base == GPA_INVALID)
 		return;
-	/* Let's do the local bookkeeping */
-	steal = vcpu->arch.steal.steal;
-	steal += current->sched_info.run_delay - vcpu->arch.steal.last_steal;
-	vcpu->arch.steal.last_steal = current->sched_info.run_delay;
-	vcpu->arch.steal.steal = steal;
-	steal_le = cpu_to_le64(steal);
 	idx = srcu_read_lock(&kvm->srcu);
-	offset = offsetof(struct pvclock_vcpu_stolen_time, stolen_time);
+	if (!kvm_get_guest(kvm, base + offset, steal)) {
-	kvm_put_guest(kvm, base + offset, steal_le, u64);
+		steal = le64_to_cpu(steal);
+		vcpu->arch.steal.last_steal = READ_ONCE(current->sched_info.run_delay);
+		steal += vcpu->arch.steal.last_steal - last_steal;
+		kvm_put_guest(kvm, base + offset, cpu_to_le64(steal));
+	}
 	srcu_read_unlock(&kvm->srcu, idx);
 }
 	switch (feature) {
 	case ARM_SMCCC_HV_PV_TIME_FEATURES:
 	case ARM_SMCCC_HV_PV_TIME_ST:
-		val = SMCCC_RET_SUCCESS;
+		if (vcpu->arch.steal.base != GPA_INVALID)
+			val = SMCCC_RET_SUCCESS;
 		break;
 	}
 	 * Start counting stolen time from the time the guest requests
 	 * the feature enabled.
 	 */
-	vcpu->arch.steal.steal = 0;
 	vcpu->arch.steal.last_steal = current->sched_info.run_delay;
 	idx = srcu_read_lock(&kvm->srcu);
 	return base;
 }
-static bool kvm_arm_pvtime_supported(void)
+bool kvm_arm_pvtime_supported(void)
 {
 	return !!sched_info_on();
 }

arch/arm64/kvm/trace_arm.h+8−8

@@ -23,7 +23,7 @@ TRACE_EVENT(kvm_entry, · 22 unmodified lines
23	__entry->vcpu_pc = vcpu_pc;	23	__entry->vcpu_pc = vcpu_pc;
24	),	24	),
25		25
26	TP_printk("PC: 0x%08lx", __entry->vcpu_pc)	26	TP_printk("PC: 0x%016lx", __entry->vcpu_pc)
27	);	27	);
28		28
29	TRACE_EVENT(kvm_exit,	29	TRACE_EVENT(kvm_exit,
@@ -42,7 +42,7 @@ TRACE_EVENT(kvm_exit, · 12 unmodified lines
42	__entry->vcpu_pc = vcpu_pc;	42	__entry->vcpu_pc = vcpu_pc;
43	),	43	),
44		44
45	TP_printk("%s: HSR_EC: 0x%04x (%s), PC: 0x%08lx",	45	TP_printk("%s: HSR_EC: 0x%04x (%s), PC: 0x%016lx",
46	__print_symbolic(__entry->ret, kvm_arm_exception_type),	46	__print_symbolic(__entry->ret, kvm_arm_exception_type),
47	__entry->esr_ec,	47	__entry->esr_ec,
48	__print_symbolic(__entry->esr_ec, kvm_arm_exception_class),	48	__print_symbolic(__entry->esr_ec, kvm_arm_exception_class),
@@ -69,7 +69,7 @@ TRACE_EVENT(kvm_guest_fault, · 20 unmodified lines
69	__entry->ipa = ipa;	69	__entry->ipa = ipa;
70	),	70	),
71		71
72	TP_printk("ipa %#llx, hsr %#08lx, hxfar %#08lx, pc %#08lx",	72	TP_printk("ipa %#llx, hsr %#08lx, hxfar %#08lx, pc %#016lx",
73	__entry->ipa, __entry->hsr,	73	__entry->ipa, __entry->hsr,
74	__entry->hxfar, __entry->vcpu_pc)	74	__entry->hxfar, __entry->vcpu_pc)
75	);	75	);
@@ -131,7 +131,7 @@ TRACE_EVENT(kvm_mmio_emulate, · 55 unmodified lines
131	__entry->cpsr = cpsr;	131	__entry->cpsr = cpsr;
132	),	132	),
133		133
134	TP_printk("Emulate MMIO at: 0x%08lx (instr: %08lx, cpsr: %08lx)",	134	TP_printk("Emulate MMIO at: 0x%016lx (instr: %08lx, cpsr: %08lx)",
135	__entry->vcpu_pc, __entry->instr, __entry->cpsr)	135	__entry->vcpu_pc, __entry->instr, __entry->cpsr)
136	);	136	);
137		137
@@ -149,7 +149,7 @@ TRACE_EVENT(kvm_unmap_hva_range, · 11 unmodified lines
149	__entry->end = end;	149	__entry->end = end;
150	),	150	),
151		151
152	TP_printk("mmu notifier unmap range: %#08lx -- %#08lx",	152	TP_printk("mmu notifier unmap range: %#016lx -- %#016lx",
153	__entry->start, __entry->end)	153	__entry->start, __entry->end)
154	);	154	);
155		155
@@ -165,7 +165,7 @@ TRACE_EVENT(kvm_set_spte_hva, · 9 unmodified lines
165	__entry->hva = hva;	165	__entry->hva = hva;
166	),	166	),
167		167
168	TP_printk("mmu notifier set pte hva: %#08lx", __entry->hva)	168	TP_printk("mmu notifier set pte hva: %#016lx", __entry->hva)
169	);	169	);
170		170
171	TRACE_EVENT(kvm_age_hva,	171	TRACE_EVENT(kvm_age_hva,
@@ -182,7 +182,7 @@ TRACE_EVENT(kvm_age_hva, · 10 unmodified lines
182	__entry->end = end;	182	__entry->end = end;
183	),	183	),
184		184
185	TP_printk("mmu notifier age hva: %#08lx -- %#08lx",	185	TP_printk("mmu notifier age hva: %#016lx -- %#016lx",
186	__entry->start, __entry->end)	186	__entry->start, __entry->end)
187	);	187	);
188		188
@@ -198,7 +198,7 @@ TRACE_EVENT(kvm_test_age_hva, · 9 unmodified lines
198	__entry->hva = hva;	198	__entry->hva = hva;
199	),	199	),
200		200
201	TP_printk("mmu notifier test age hva: %#08lx", __entry->hva)	201	TP_printk("mmu notifier test age hva: %#016lx", __entry->hva)
202	);	202	);
203		203
204	TRACE_EVENT(kvm_set_way_flush,	204	TRACE_EVENT(kvm_set_way_flush,

arch/arm64/kvm/trace_handle_exit.h+3−3

@@ -22,7 +22,7 @@ TRACE_EVENT(kvm_wfx_arm64, · 21 unmodified lines
22	__entry->is_wfe = is_wfe;	22	__entry->is_wfe = is_wfe;
23	),	23	),
24		24
25	TP_printk("guest executed wf%c at: 0x%08lx",	25	TP_printk("guest executed wf%c at: 0x%016lx",
26	__entry->is_wfe ? 'e' : 'i', __entry->vcpu_pc)	26	__entry->is_wfe ? 'e' : 'i', __entry->vcpu_pc)
27	);	27	);
28		28
@@ -42,7 +42,7 @@ TRACE_EVENT(kvm_hvc_arm64, · 13 unmodified lines
42	__entry->imm = imm;	42	__entry->imm = imm;
43	),	43	),
44		44
45	TP_printk("HVC at 0x%08lx (r0: 0x%08lx, imm: 0x%lx)",	45	TP_printk("HVC at 0x%016lx (r0: 0x%016lx, imm: 0x%lx)",
46	__entry->vcpu_pc, __entry->r0, __entry->imm)	46	__entry->vcpu_pc, __entry->r0, __entry->imm)
47	);	47	);
48		48
@@ -135,7 +135,7 @@ TRACE_EVENT(trap_reg, · 86 unmodified lines
135	__entry->write_value = write_value;	135	__entry->write_value = write_value;
136	),	136	),
137		137
138	TP_printk("%s %s reg %d (0x%08llx)", __entry->fn, __entry->is_write?"write to":"read from", __entry->reg, __entry->write_value)	138	TP_printk("%s %s reg %d (0x%016llx)", __entry->fn, __entry->is_write?"write to":"read from", __entry->reg, __entry->write_value)
139	);	139	);
140		140
141	TRACE_EVENT(kvm_handle_sys_reg,	141	TRACE_EVENT(kvm_handle_sys_reg,

arch/ia64/kernel/ia64_ksyms.c+1−1

@@ -3,7 +3,7 @@ · 2 unmodified lines
3	* Architecture-specific kernel symbols	3	* Architecture-specific kernel symbols
4	*/	4	*/
5		5
6	#ifdef CONFIG_VIRTUAL_MEM_MAP	6	#if defined(CONFIG_VIRTUAL_MEM_MAP) \|\| defined(CONFIG_DISCONTIGMEM)
7	#include <linux/compiler.h>	7	#include <linux/compiler.h>
8	#include <linux/export.h>	8	#include <linux/export.h>
9	#include <linux/memblock.h>	9	#include <linux/memblock.h>

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

@@ -46,6 +46,9 @@ unsigned long memory_size; · 45 unmodified lines
46	EXPORT_SYMBOL(memory_size);	46	EXPORT_SYMBOL(memory_size);
47	unsigned long lowmem_size;	47	unsigned long lowmem_size;
48		48
		49	EXPORT_SYMBOL(min_low_pfn);
		50	EXPORT_SYMBOL(max_low_pfn);
		51
49	#ifdef CONFIG_HIGHMEM	52	#ifdef CONFIG_HIGHMEM
50	pte_t *kmap_pte;	53	pte_t *kmap_pte;
51	EXPORT_SYMBOL(kmap_pte);	54	EXPORT_SYMBOL(kmap_pte);

arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h+0−2

 #define cpu_has_counter		1
 #define cpu_has_dc_aliases	(PAGE_SIZE < 0x4000)
 #define cpu_has_divec		0
-#define cpu_has_ejtag		0
 #define cpu_has_inclusive_pcaches	1
 #define cpu_has_llsc		1
 #define cpu_has_mcheck		0
 #define cpu_has_veic		0
 #define cpu_has_vint		0
 #define cpu_has_vtag_icache	0
-#define cpu_has_watch		1
 #define cpu_has_wsbh		1
 #define cpu_has_ic_fills_f_dc	1
 #define cpu_hwrena_impl_bits	0xc0000000

arch/mips/include/asm/mach-loongson64/irq.h+0−2

@@ -2,8 +2,6 @@ · 1 unmodified line
2	#ifndef __ASM_MACH_LOONGSON64_IRQ_H_	2	#ifndef __ASM_MACH_LOONGSON64_IRQ_H_
3	#define __ASM_MACH_LOONGSON64_IRQ_H_	3	#define __ASM_MACH_LOONGSON64_IRQ_H_
4		4
5	#include <boot_param.h>
6
7	/* cpu core interrupt numbers */	5	/* cpu core interrupt numbers */
8	#define NR_IRQS_LEGACY 16	6	#define NR_IRQS_LEGACY 16
9	#define NR_MIPS_CPU_IRQS 8	7	#define NR_MIPS_CPU_IRQS 8

arch/mips/include/asm/mach-loongson64/mmzone.h+0−1

@@ -9,7 +9,6 @@ · 8 unmodified lines
9	#ifndef _ASM_MACH_LOONGSON64_MMZONE_H	9	#ifndef _ASM_MACH_LOONGSON64_MMZONE_H
10	#define _ASM_MACH_LOONGSON64_MMZONE_H	10	#define _ASM_MACH_LOONGSON64_MMZONE_H
11		11
12	#include <boot_param.h>
13	#define NODE_ADDRSPACE_SHIFT 44	12	#define NODE_ADDRSPACE_SHIFT 44
14	#define NODE0_ADDRSPACE_OFFSET 0x000000000000UL	13	#define NODE0_ADDRSPACE_OFFSET 0x000000000000UL
15	#define NODE1_ADDRSPACE_OFFSET 0x100000000000UL	14	#define NODE1_ADDRSPACE_OFFSET 0x100000000000UL

arch/mips/kernel/perf_event_mipsxx.c+2−2

@@ -1898,8 +1898,8 @@ static const struct mips_perf_event *mipsxx_pmu_map_raw_event(u64 config) · 1897 unmodified lines
1898	(base_id >= 64 && base_id < 90) \|\|	1898	(base_id >= 64 && base_id < 90) \|\|
1899	(base_id >= 128 && base_id < 164) \|\|	1899	(base_id >= 128 && base_id < 164) \|\|
1900	(base_id >= 192 && base_id < 200) \|\|	1900	(base_id >= 192 && base_id < 200) \|\|
1901	(base_id >= 256 && base_id < 274) \|\|	1901	(base_id >= 256 && base_id < 275) \|\|
1902	(base_id >= 320 && base_id < 358) \|\|	1902	(base_id >= 320 && base_id < 361) \|\|
1903	(base_id >= 384 && base_id < 574))	1903	(base_id >= 384 && base_id < 574))
1904	break;	1904	break;
1905		1905

arch/mips/kernel/smp-bmips.c+2−0

@@ -239,6 +239,8 @@ static int bmips_boot_secondary(int cpu, struct task_struct *idle) · 238 unmodified lines
239	*/	239	*/
240	static void bmips_init_secondary(void)	240	static void bmips_init_secondary(void)
241	{	241	{
		242	bmips_cpu_setup();
		243
242	switch (current_cpu_type()) {	244	switch (current_cpu_type()) {
243	case CPU_BMIPS4350:	245	case CPU_BMIPS4350:
244	case CPU_BMIPS4380:	246	case CPU_BMIPS4380:

arch/mips/kernel/traps.c+12−0

@@ -1287,6 +1287,18 @@ static int enable_restore_fp_context(int msa) · 1286 unmodified lines
1287	err = own_fpu_inatomic(1);	1287	err = own_fpu_inatomic(1);
1288	if (msa && !err) {	1288	if (msa && !err) {
1289	enable_msa();	1289	enable_msa();
		1290	/*
		1291	* with MSA enabled, userspace can see MSACSR
		1292	* and MSA regs, but the values in them are from
		1293	* other task before current task, restore them
		1294	* from saved fp/msa context
		1295	*/
		1296	write_msa_csr(current->thread.fpu.msacsr);
		1297	/*
		1298	* own_fpu_inatomic(1) just restore low 64bit,
		1299	* fix the high 64bit
		1300	*/
		1301	init_msa_upper();
1290	set_thread_flag(TIF_USEDMSA);	1302	set_thread_flag(TIF_USEDMSA);
1291	set_thread_flag(TIF_MSA_CTX_LIVE);	1303	set_thread_flag(TIF_MSA_CTX_LIVE);
1292	}	1304	}

arch/mips/kvm/mips.c+2−0

 int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
 {
 	switch (type) {
+	case KVM_VM_MIPS_AUTO:
+		break;
 #ifdef CONFIG_KVM_MIPS_VZ
 	case KVM_VM_MIPS_VZ:
 #else

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

 				printk("MIPS secondary cache %ldkB, %s, linesize %d bytes.\n",
 				       scache_size >> 10,
 				       way_string[c->scache.ways], c->scache.linesz);
+				if (current_cpu_type() == CPU_BMIPS5000)
+					c->options |= MIPS_CPU_INCLUSIVE_CACHES;
 			}
 #else
 			if (!(c->scache.flags & MIPS_CACHE_NOT_PRESENT))
 				panic("Dunno how to handle MIPS32 / MIPS64 second level cache");

arch/mips/oprofile/op_model_mipsxx.c+3−1

 	switch (counters) {
 #define HANDLE_COUNTER(n)						\
-	fallthrough;							\
 	case n + 1:							\
 		control = r_c0_perfctrl ## n();				\
 		counter = r_c0_perfcntr ## n();				\
 			handled = IRQ_HANDLED;				\
 		}
 	HANDLE_COUNTER(3)
+	fallthrough;
 	HANDLE_COUNTER(2)
+	fallthrough;
 	HANDLE_COUNTER(1)
+	fallthrough;
 	HANDLE_COUNTER(0)
 	}

arch/mips/sni/a20r.c+2−2

@@ -222,8 +222,8 @@ void __init sni_a20r_irq_init(void) · 221 unmodified lines
222	irq_set_chip_and_handler(i, &a20r_irq_type, handle_level_irq);	222	irq_set_chip_and_handler(i, &a20r_irq_type, handle_level_irq);
223	sni_hwint = a20r_hwint;	223	sni_hwint = a20r_hwint;
224	change_c0_status(ST0_IM, IE_IRQ0);	224	change_c0_status(ST0_IM, IE_IRQ0);
225	if (request_irq(SNI_A20R_IRQ_BASE + 3, sni_isa_irq_handler, 0, "ISA",	225	if (request_irq(SNI_A20R_IRQ_BASE + 3, sni_isa_irq_handler,
226	NULL))	226	IRQF_SHARED, "ISA", sni_isa_irq_handler))
227	pr_err("Failed to register ISA interrupt\n");	227	pr_err("Failed to register ISA interrupt\n");
228	}	228	}
229		229

arch/openrisc/include/asm/uaccess.h+21−12

 #define __get_user_nocheck(x, ptr, size)			\
 ({								\
-	long __gu_err, __gu_val;				\
+	long __gu_err;						\
-	__get_user_size(__gu_val, (ptr), (size), __gu_err);	\
+	__get_user_size((x), (ptr), (size), __gu_err);		\
-	(x) = (__force __typeof__(*(ptr)))__gu_val;		\
 	__gu_err;						\
 })
 #define __get_user_check(x, ptr, size)					\
 ({									\
-	long __gu_err = -EFAULT, __gu_val = 0;				\
+	long __gu_err = -EFAULT;					\
 	const __typeof__(*(ptr)) __user *__gu_addr = (ptr);		\
-	if (access_ok(__gu_addr, size))			\
+	if (access_ok(__gu_addr, size))					\
-		__get_user_size(__gu_val, __gu_addr, (size), __gu_err);	\
+		__get_user_size((x), __gu_addr, (size), __gu_err);	\
-	(x) = (__force __typeof__(*(ptr)))__gu_val;			\
+	else								\
+		(x) = (__typeof__(*(ptr))) 0;				\
 	__gu_err;							\
 })
 	case 2: __get_user_asm(x, ptr, retval, "l.lhz"); break;		\
 	case 4: __get_user_asm(x, ptr, retval, "l.lwz"); break;		\
 	case 8: __get_user_asm2(x, ptr, retval); break;			\
-	default: (x) = __get_user_bad();				\
+	default: (x) = (__typeof__(*(ptr)))__get_user_bad();		\
 	}								\
 } while (0)
 #define __get_user_asm(x, addr, err, op)		\
+{							\
+	unsigned long __gu_tmp;				\
 	__asm__ __volatile__(				\
 		"1:	"op" %1,0(%2)\n"		\
 		"2:\n"					\
 		"	.align 2\n"			\
 		"	.long 1b,3b\n"			\
 		".previous"				\
-		: "=r"(err), "=r"(x)			\
+		: "=r"(err), "=r"(__gu_tmp)		\
-		: "r"(addr), "i"(-EFAULT), "0"(err))
+		: "r"(addr), "i"(-EFAULT), "0"(err));	\
+	(x) = (__typeof__(*(addr)))__gu_tmp;		\
+}
 #define __get_user_asm2(x, addr, err)			\
+{							\
+	unsigned long long __gu_tmp;			\
 	__asm__ __volatile__(				\
 		"1:	l.lwz %1,0(%2)\n"		\
 		"2:	l.lwz %H1,4(%2)\n"		\
 		"	.long 1b,4b\n"			\
 		"	.long 2b,4b\n"			\
 		".previous"				\
-		: "=r"(err), "=&r"(x)			\
+		: "=r"(err), "=&r"(__gu_tmp)		\
-		: "r"(addr), "i"(-EFAULT), "0"(err))
+		: "r"(addr), "i"(-EFAULT), "0"(err));	\
+	(x) = (__typeof__(*(addr)))(			\
+		(__typeof__((x)-(x)))__gu_tmp);		\
+}
 /* more complex routines */

arch/openrisc/kernel/setup.c+10−0

@@ -80,6 +80,16 @@ static void __init setup_memory(void) · 79 unmodified lines
80	*/	80	*/
81	memblock_reserve(__pa(_stext), _end - _stext);	81	memblock_reserve(__pa(_stext), _end - _stext);
82		82
		83	#ifdef CONFIG_BLK_DEV_INITRD
		84	/* Then reserve the initrd, if any */
		85	if (initrd_start && (initrd_end > initrd_start)) {
		86	unsigned long aligned_start = ALIGN_DOWN(initrd_start, PAGE_SIZE);
		87	unsigned long aligned_end = ALIGN(initrd_end, PAGE_SIZE);
		88
		89	memblock_reserve(__pa(aligned_start), aligned_end - aligned_start);
		90	}
		91	#endif /* CONFIG_BLK_DEV_INITRD */
		92
83	early_init_fdt_reserve_self();	93	early_init_fdt_reserve_self();
84	early_init_fdt_scan_reserved_mem();	94	early_init_fdt_scan_reserved_mem();
85		95

arch/openrisc/mm/cache.c+1−1

@@ -16,7 +16,7 @@ · 15 unmodified lines
16	#include <asm/cacheflush.h>	16	#include <asm/cacheflush.h>
17	#include <asm/tlbflush.h>	17	#include <asm/tlbflush.h>
18		18
19	static void cache_loop(struct page *page, const unsigned int reg)	19	static __always_inline void cache_loop(struct page *page, const unsigned int reg)
20	{	20	{
21	unsigned long paddr = page_to_pfn(page) << PAGE_SHIFT;	21	unsigned long paddr = page_to_pfn(page) << PAGE_SHIFT;
22	unsigned long line = paddr & ~(L1_CACHE_BYTES - 1);	22	unsigned long line = paddr & ~(L1_CACHE_BYTES - 1);

arch/s390/Kconfig+1−1

@@ -30,7 +30,7 @@ config GENERIC_BUG_RELATIVE_POINTERS · 29 unmodified lines
30	def_bool y	30	def_bool y
31		31
32	config GENERIC_LOCKBREAK	32	config GENERIC_LOCKBREAK
33	def_bool y if PREEMPTTION	33	def_bool y if PREEMPTION
34		34
35	config PGSTE	35	config PGSTE
36	def_bool y if KVM	36	def_bool y if KVM

arch/s390/configs/debug_defconfig+4−0

 CONFIG_PROC_KCORE=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_INODE64=y
 CONFIG_HUGETLBFS=y
 CONFIG_CONFIGFS_FS=m
 CONFIG_ECRYPT_FS=m
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_DEBUG_CREDENTIALS=y
 CONFIG_RCU_TORTURE_TEST=m
+CONFIG_RCU_REF_SCALE_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=300
 # CONFIG_RCU_TRACE is not set
 CONFIG_LATENCYTOP=y
 CONFIG_SCHED_TRACER=y
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_BPF_KPROBE_OVERRIDE=y
 CONFIG_HIST_TRIGGERS=y
 CONFIG_S390_PTDUMP=y
 CONFIG_NOTIFIER_ERROR_INJECTION=m
 CONFIG_FAIL_IO_TIMEOUT=y
 CONFIG_FAIL_FUTEX=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAIL_FUNCTION=y
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 CONFIG_LKDTM=m
 CONFIG_TEST_LIST_SORT=y

arch/s390/configs/defconfig+3−0

 CONFIG_PROC_KCORE=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_INODE64=y
 CONFIG_HUGETLBFS=y
 CONFIG_CONFIGFS_FS=m
 CONFIG_ECRYPT_FS=m
 CONFIG_TEST_LOCKUP=m
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_RCU_TORTURE_TEST=m
+CONFIG_RCU_REF_SCALE_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_LATENCYTOP=y
 CONFIG_BOOTTIME_TRACING=y
 CONFIG_SCHED_TRACER=y
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_BPF_KPROBE_OVERRIDE=y
 CONFIG_HIST_TRIGGERS=y
 CONFIG_S390_PTDUMP=y
 CONFIG_LKDTM=m

arch/s390/configs/zfcpdump_defconfig+1−0

@@ -74,5 +74,6 @@ CONFIG_DEBUG_KERNEL=y · 73 unmodified lines
74	CONFIG_PANIC_ON_OOPS=y	74	CONFIG_PANIC_ON_OOPS=y
75	# CONFIG_SCHED_DEBUG is not set	75	# CONFIG_SCHED_DEBUG is not set
76	CONFIG_RCU_CPU_STALL_TIMEOUT=60	76	CONFIG_RCU_CPU_STALL_TIMEOUT=60
		77	# CONFIG_RCU_TRACE is not set
77	# CONFIG_FTRACE is not set	78	# CONFIG_FTRACE is not set
78	# CONFIG_RUNTIME_TESTING_MENU is not set	79	# CONFIG_RUNTIME_TESTING_MENU is not set

arch/x86/entry/common.c+20−9

@@ -60,16 +60,10 @@ __visible noinstr void do_syscall_64(unsigned long nr, struct pt_regs *regs) · 59 unmodified lines
60	#if defined(CONFIG_X86_32) \|\| defined(CONFIG_IA32_EMULATION)	60	#if defined(CONFIG_X86_32) \|\| defined(CONFIG_IA32_EMULATION)
61	static __always_inline unsigned int syscall_32_enter(struct pt_regs *regs)	61	static __always_inline unsigned int syscall_32_enter(struct pt_regs *regs)
62	{	62	{
63	unsigned int nr = (unsigned int)regs->orig_ax;
64
65	if (IS_ENABLED(CONFIG_IA32_EMULATION))	63	if (IS_ENABLED(CONFIG_IA32_EMULATION))
66	current_thread_info()->status \|= TS_COMPAT;	64	current_thread_info()->status \|= TS_COMPAT;
67	/*	65
68	* Subtlety here: if ptrace pokes something larger than 2^32-1 into	66	return (unsigned int)regs->orig_ax;
69	* orig_ax, the unsigned int return value truncates it. This may
70	* or may not be necessary, but it matches the old asm behavior.
71	*/
72	return (unsigned int)syscall_enter_from_user_mode(regs, nr);
73	}	67	}
74		68
75	/*	69	/*
@@ -91,15 +85,29 @@ __visible noinstr void do_int80_syscall_32(struct pt_regs *regs) · 15 unmodified lines
91	{	85	{
92	unsigned int nr = syscall_32_enter(regs);	86	unsigned int nr = syscall_32_enter(regs);
93		87
		88	/*
		89	* Subtlety here: if ptrace pokes something larger than 2^32-1 into
		90	* orig_ax, the unsigned int return value truncates it. This may
		91	* or may not be necessary, but it matches the old asm behavior.
		92	*/
		93	nr = (unsigned int)syscall_enter_from_user_mode(regs, nr);
		94
94	do_syscall_32_irqs_on(regs, nr);	95	do_syscall_32_irqs_on(regs, nr);
95	syscall_exit_to_user_mode(regs);	96	syscall_exit_to_user_mode(regs);
96	}	97	}
97		98
98	static noinstr bool __do_fast_syscall_32(struct pt_regs *regs)	99	static noinstr bool __do_fast_syscall_32(struct pt_regs *regs)
99	{	100	{
100	unsigned int nr = syscall_32_enter(regs);	101	unsigned int nr = syscall_32_enter(regs);
101	int res;	102	int res;
102		103
		104	/*
		105	* This cannot use syscall_enter_from_user_mode() as it has to
		106	* fetch EBP before invoking any of the syscall entry work
		107	* functions.
		108	*/
		109	syscall_enter_from_user_mode_prepare(regs);
		110
103	instrumentation_begin();	111	instrumentation_begin();
104	/* Fetch EBP from where the vDSO stashed it. */	112	/* Fetch EBP from where the vDSO stashed it. */
105	if (IS_ENABLED(CONFIG_X86_64)) {	113	if (IS_ENABLED(CONFIG_X86_64)) {
@@ -122,6 +130,9 @@ static noinstr bool __do_fast_syscall_32(struct pt_regs *regs) · 16 unmodified lines
122	return false;	130	return false;
123	}	131	}
124		132
		133	/* The case truncates any ptrace induced syscall nr > 2^32 -1 */
		134	nr = (unsigned int)syscall_enter_from_user_mode_work(regs, nr);
		135
125	/* Now this is just like a normal syscall. */	136	/* Now this is just like a normal syscall. */
126	do_syscall_32_irqs_on(regs, nr);	137	do_syscall_32_irqs_on(regs, nr);
127	syscall_exit_to_user_mode(regs);	138	syscall_exit_to_user_mode(regs);

arch/x86/include/asm/entry-common.h+10−2

@@ -18,8 +18,16 @@ static __always_inline void arch_check_user_regs(struct pt_regs *regs) · 17 unmodified lines
18	* state, not the interrupt state as imagined by Xen.	18	* state, not the interrupt state as imagined by Xen.
19	*/	19	*/
20	unsigned long flags = native_save_fl();	20	unsigned long flags = native_save_fl();
21	WARN_ON_ONCE(flags & (X86_EFLAGS_AC \| X86_EFLAGS_DF \|	21	unsigned long mask = X86_EFLAGS_DF \| X86_EFLAGS_NT;
22	X86_EFLAGS_NT));	22
		23	/*
		24	* For !SMAP hardware we patch out CLAC on entry.
		25	*/
		26	if (boot_cpu_has(X86_FEATURE_SMAP) \|\|
		27	(IS_ENABLED(CONFIG_64_BIT) && boot_cpu_has(X86_FEATURE_XENPV)))
		28	mask \|= X86_EFLAGS_AC;
		29
		30	WARN_ON_ONCE(flags & mask);
23		31
24	/* We think we came from user mode. Make sure pt_regs agrees. */	32	/* We think we came from user mode. Make sure pt_regs agrees. */
25	WARN_ON_ONCE(!user_mode(regs));	33	WARN_ON_ONCE(!user_mode(regs));

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

 	static const unsigned int argument_offs[] = {
 #ifdef __i386__
 		offsetof(struct pt_regs, ax),
-		offsetof(struct pt_regs, cx),
 		offsetof(struct pt_regs, dx),
+		offsetof(struct pt_regs, cx),
 #define NR_REG_ARGUMENTS 3
 #else
 		offsetof(struct pt_regs, di),

arch/x86/kernel/kvm.c+20−6

 {
 	struct pt_regs *old_regs = set_irq_regs(regs);
 	u32 token;
-	irqentry_state_t state;
-	state = irqentry_enter(regs);
+	ack_APIC_irq();
 	inc_irq_stat(irq_hv_callback_count);
 		wrmsrl(MSR_KVM_ASYNC_PF_ACK, 1);
 	}
-	irqentry_exit(regs, state);
 	set_irq_regs(old_regs);
 }
 	}
 	if (pv_tlb_flush_supported()) {
-		pv_ops.mmu.flush_tlb_others = kvm_flush_tlb_others;
 		pv_ops.mmu.tlb_remove_table = tlb_remove_table;
 		pr_info("KVM setup pv remote TLB flush\n");
 	}
 }
 arch_initcall(activate_jump_labels);
+static void kvm_free_pv_cpu_mask(void)
+{
+	unsigned int cpu;
+	for_each_possible_cpu(cpu)
+		free_cpumask_var(per_cpu(__pv_cpu_mask, cpu));
+}
 static __init int kvm_alloc_cpumask(void)
 {
 	int cpu;
 	if (alloc)
 		for_each_possible_cpu(cpu) {
-			zalloc_cpumask_var_node(per_cpu_ptr(&__pv_cpu_mask, cpu),
+			if (!zalloc_cpumask_var_node(
-				GFP_KERNEL, cpu_to_node(cpu));
+				per_cpu_ptr(&__pv_cpu_mask, cpu),
+				GFP_KERNEL, cpu_to_node(cpu))) {
+				goto zalloc_cpumask_fail;
+			}
 		}
+	apic->send_IPI_mask_allbutself = kvm_send_ipi_mask_allbutself;
+	pv_ops.mmu.flush_tlb_others = kvm_flush_tlb_others;
 	return 0;
+zalloc_cpumask_fail:
+	kvm_free_pv_cpu_mask();
+	return -ENOMEM;
 }
 arch_initcall(kvm_alloc_cpumask);

arch/x86/kernel/traps.c+31−34

 #endif
 }
-static __always_inline void debug_enter(unsigned long *dr6, unsigned long *dr7)
+static __always_inline unsigned long debug_read_clear_dr6(void)
 {
-	/*
+	unsigned long dr6;
-	 * Disable breakpoints during exception handling; recursive exceptions
-	 * are exceedingly 'fun'.
-	 *
-	 * Since this function is NOKPROBE, and that also applies to
-	 * HW_BREAKPOINT_X, we can't hit a breakpoint before this (XXX except a
-	 * HW_BREAKPOINT_W on our stack)
-	 *
-	 * Entry text is excluded for HW_BP_X and cpu_entry_area, which
-	 * includes the entry stack is excluded for everything.
-	 */
-	*dr7 = local_db_save();
 	/*
 	 * The Intel SDM says:
 	 *
 	 * Keep it simple: clear DR6 immediately.
 	 */
-	get_debugreg(*dr6, 6);
+	get_debugreg(dr6, 6);
 	set_debugreg(0, 6);
 	/* Filter out all the reserved bits which are preset to 1 */
-	*dr6 &= ~DR6_RESERVED;
+	dr6 &= ~DR6_RESERVED;
-}
-static __always_inline void debug_exit(unsigned long dr7)
+	return dr6;
-{
-	local_db_restore(dr7);
 }
 /*
 static __always_inline void exc_debug_kernel(struct pt_regs *regs,
 					     unsigned long dr6)
 {
+	/*
+	 * Disable breakpoints during exception handling; recursive exceptions
+	 * are exceedingly 'fun'.
+	 *
+	 * Since this function is NOKPROBE, and that also applies to
+	 * HW_BREAKPOINT_X, we can't hit a breakpoint before this (XXX except a
+	 * HW_BREAKPOINT_W on our stack)
+	 *
+	 * Entry text is excluded for HW_BP_X and cpu_entry_area, which
+	 * includes the entry stack is excluded for everything.
+	 */
+	unsigned long dr7 = local_db_save();
 	bool irq_state = idtentry_enter_nmi(regs);
 	instrumentation_begin();
 	instrumentation_end();
 	idtentry_exit_nmi(regs, irq_state);
+	local_db_restore(dr7);
 }
 static __always_inline void exc_debug_user(struct pt_regs *regs,
 	 */
 	WARN_ON_ONCE(!user_mode(regs));
+	/*
+	 * NB: We can't easily clear DR7 here because
+	 * idtentry_exit_to_usermode() can invoke ptrace, schedule, access
+	 * user memory, etc.  This means that a recursive #DB is possible.  If
+	 * this happens, that #DB will hit exc_debug_kernel() and clear DR7.
+	 * Since we're not on the IST stack right now, everything will be
+	 * fine.
+	 */
 	irqentry_enter_from_user_mode(regs);
 	instrumentation_begin();
 /* IST stack entry */
 DEFINE_IDTENTRY_DEBUG(exc_debug)
 {
-	unsigned long dr6, dr7;
+	exc_debug_kernel(regs, debug_read_clear_dr6());
-	debug_enter(&dr6, &dr7);
-	exc_debug_kernel(regs, dr6);
-	debug_exit(dr7);
 }
 /* User entry, runs on regular task stack */
 DEFINE_IDTENTRY_DEBUG_USER(exc_debug)
 {
-	unsigned long dr6, dr7;
+	exc_debug_user(regs, debug_read_clear_dr6());
-	debug_enter(&dr6, &dr7);
-	exc_debug_user(regs, dr6);
-	debug_exit(dr7);
 }
 #else
 /* 32 bit does not have separate entry points. */
 DEFINE_IDTENTRY_RAW(exc_debug)
 {
-	unsigned long dr6, dr7;
+	unsigned long dr6 = debug_read_clear_dr6();
-	debug_enter(&dr6, &dr7);
 	if (user_mode(regs))
 		exc_debug_user(regs, dr6);
 	else
 		exc_debug_kernel(regs, dr6);
-	debug_exit(dr7);
 }
 #endif

arch/x86/kvm/emulate.c+17−5

@@ -2505,9 +2505,14 @@ static int rsm_load_state_32(struct x86_emulate_ctxt *ctxt, · 2504 unmodified lines
2505	reg_write(ctxt, i) = GET_SMSTATE(u32, smstate, 0x7fd0 + i 4);	2505	reg_write(ctxt, i) = GET_SMSTATE(u32, smstate, 0x7fd0 + i 4);
2506		2506
2507	val = GET_SMSTATE(u32, smstate, 0x7fcc);	2507	val = GET_SMSTATE(u32, smstate, 0x7fcc);
2508	ctxt->ops->set_dr(ctxt, 6, (val & DR6_VOLATILE) \| DR6_FIXED_1);	2508
		2509	if (ctxt->ops->set_dr(ctxt, 6, (val & DR6_VOLATILE) \| DR6_FIXED_1))
		2510	return X86EMUL_UNHANDLEABLE;
		2511
2509	val = GET_SMSTATE(u32, smstate, 0x7fc8);	2512	val = GET_SMSTATE(u32, smstate, 0x7fc8);
2510	ctxt->ops->set_dr(ctxt, 7, (val & DR7_VOLATILE) \| DR7_FIXED_1);	2513
		2514	if (ctxt->ops->set_dr(ctxt, 7, (val & DR7_VOLATILE) \| DR7_FIXED_1))
		2515	return X86EMUL_UNHANDLEABLE;
2511		2516
2512	selector = GET_SMSTATE(u32, smstate, 0x7fc4);	2517	selector = GET_SMSTATE(u32, smstate, 0x7fc4);
2513	set_desc_base(&desc, GET_SMSTATE(u32, smstate, 0x7f64));	2518	set_desc_base(&desc, GET_SMSTATE(u32, smstate, 0x7f64));
@@ -2560,16 +2565,23 @@ static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt, · 46 unmodified lines
2560	ctxt->eflags = GET_SMSTATE(u32, smstate, 0x7f70) \| X86_EFLAGS_FIXED;	2565	ctxt->eflags = GET_SMSTATE(u32, smstate, 0x7f70) \| X86_EFLAGS_FIXED;
2561		2566
2562	val = GET_SMSTATE(u32, smstate, 0x7f68);	2567	val = GET_SMSTATE(u32, smstate, 0x7f68);
2563	ctxt->ops->set_dr(ctxt, 6, (val & DR6_VOLATILE) \| DR6_FIXED_1);	2568
		2569	if (ctxt->ops->set_dr(ctxt, 6, (val & DR6_VOLATILE) \| DR6_FIXED_1))
		2570	return X86EMUL_UNHANDLEABLE;
		2571
2564	val = GET_SMSTATE(u32, smstate, 0x7f60);	2572	val = GET_SMSTATE(u32, smstate, 0x7f60);
2565	ctxt->ops->set_dr(ctxt, 7, (val & DR7_VOLATILE) \| DR7_FIXED_1);	2573
		2574	if (ctxt->ops->set_dr(ctxt, 7, (val & DR7_VOLATILE) \| DR7_FIXED_1))
		2575	return X86EMUL_UNHANDLEABLE;
2566		2576
2567	cr0 = GET_SMSTATE(u64, smstate, 0x7f58);	2577	cr0 = GET_SMSTATE(u64, smstate, 0x7f58);
2568	cr3 = GET_SMSTATE(u64, smstate, 0x7f50);	2578	cr3 = GET_SMSTATE(u64, smstate, 0x7f50);
2569	cr4 = GET_SMSTATE(u64, smstate, 0x7f48);	2579	cr4 = GET_SMSTATE(u64, smstate, 0x7f48);
2570	ctxt->ops->set_smbase(ctxt, GET_SMSTATE(u32, smstate, 0x7f00));	2580	ctxt->ops->set_smbase(ctxt, GET_SMSTATE(u32, smstate, 0x7f00));
2571	val = GET_SMSTATE(u64, smstate, 0x7ed0);	2581	val = GET_SMSTATE(u64, smstate, 0x7ed0);
2572	ctxt->ops->set_msr(ctxt, MSR_EFER, val & ~EFER_LMA);	2582
		2583	if (ctxt->ops->set_msr(ctxt, MSR_EFER, val & ~EFER_LMA))
		2584	return X86EMUL_UNHANDLEABLE;
2573		2585
2574	selector = GET_SMSTATE(u32, smstate, 0x7e90);	2586	selector = GET_SMSTATE(u32, smstate, 0x7e90);
2575	rsm_set_desc_flags(&desc, GET_SMSTATE(u32, smstate, 0x7e92) << 8);	2587	rsm_set_desc_flags(&desc, GET_SMSTATE(u32, smstate, 0x7e92) << 8);

arch/x86/kvm/mmu/mmu.c+1−1

@@ -2469,7 +2469,7 @@ static struct kvm_mmu_page kvm_mmu_get_page(struct kvm_vcpu vcpu, · 2468 unmodified lines
2469	}	2469	}
2470		2470
2471	if (sp->unsync_children)	2471	if (sp->unsync_children)
2472	kvm_make_request(KVM_REQ_TLB_FLUSH_CURRENT, vcpu);	2472	kvm_make_request(KVM_REQ_MMU_SYNC, vcpu);
2473		2473
2474	__clear_sp_write_flooding_count(sp);	2474	__clear_sp_write_flooding_count(sp);
2475		2475

arch/x86/kvm/svm/nested.c+6−1

 	svm->vcpu.arch.mp_state = KVM_MP_STATE_RUNNABLE;
 	/* Give the current vmcb to the guest */
-	svm_set_gif(svm, false);
 	nested_vmcb->save.es     = vmcb->save.es;
 	nested_vmcb->save.cs     = vmcb->save.cs;
 	/* Restore the original control entries */
 	copy_vmcb_control_area(&vmcb->control, &hsave->control);
+	/* On vmexit the  GIF is set to false */
+	svm_set_gif(svm, false);
 	svm->vmcb->control.tsc_offset = svm->vcpu.arch.tsc_offset =
 		svm->vcpu.arch.l1_tsc_offset;
 	load_nested_vmcb_control(svm, &ctl);
 	nested_prepare_vmcb_control(svm);
+	if (!nested_svm_vmrun_msrpm(svm))
+		return -EINVAL;
 out_set_gif:
 	svm_set_gif(svm, !!(kvm_state->flags & KVM_STATE_NESTED_GIF_SET));
 	return 0;

arch/x86/kvm/svm/sev.c+1−0

@@ -1106,6 +1106,7 @@ void sev_vm_destroy(struct kvm *kvm) · 1105 unmodified lines
1106	list_for_each_safe(pos, q, head) {	1106	list_for_each_safe(pos, q, head) {
1107	__unregister_enc_region_locked(kvm,	1107	__unregister_enc_region_locked(kvm,
1108	list_entry(pos, struct enc_region, list));	1108	list_entry(pos, struct enc_region, list));
		1109	cond_resched();
1109	}	1110	}
1110	}	1111	}
1111		1112

arch/x86/kvm/svm/svm.c+21−15

@@ -2938,8 +2938,6 @@ static int handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath) · 2937 unmodified lines
2938	if (npt_enabled)	2938	if (npt_enabled)
2939	vcpu->arch.cr3 = svm->vmcb->save.cr3;	2939	vcpu->arch.cr3 = svm->vmcb->save.cr3;
2940		2940
2941	svm_complete_interrupts(svm);
2942
2943	if (is_guest_mode(vcpu)) {	2941	if (is_guest_mode(vcpu)) {
2944	int vmexit;	2942	int vmexit;
2945		2943
@@ -3504,7 +3502,6 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu) · 558 unmodified lines
3504	stgi();	3502	stgi();
3505		3503
3506	/* Any pending NMI will happen here */	3504	/* Any pending NMI will happen here */
3507	exit_fastpath = svm_exit_handlers_fastpath(vcpu);
3508		3505
3509	if (unlikely(svm->vmcb->control.exit_code == SVM_EXIT_NMI))	3506	if (unlikely(svm->vmcb->control.exit_code == SVM_EXIT_NMI))
3510	kvm_after_interrupt(&svm->vcpu);	3507	kvm_after_interrupt(&svm->vcpu);
@@ -3518,6 +3515,7 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu) · 7 unmodified lines
3518	}	3515	}
3519		3516
3520	svm->vmcb->control.tlb_ctl = TLB_CONTROL_DO_NOTHING;	3517	svm->vmcb->control.tlb_ctl = TLB_CONTROL_DO_NOTHING;
		3518	vmcb_mark_all_clean(svm->vmcb);
3521		3519
3522	/* if exit due to PF check for async PF */	3520	/* if exit due to PF check for async PF */
3523	if (svm->vmcb->control.exit_code == SVM_EXIT_EXCP_BASE + PF_VECTOR)	3521	if (svm->vmcb->control.exit_code == SVM_EXIT_EXCP_BASE + PF_VECTOR)
@@ -3537,7 +3535,8 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu) · 13 unmodified lines
3537	SVM_EXIT_EXCP_BASE + MC_VECTOR))	3535	SVM_EXIT_EXCP_BASE + MC_VECTOR))
3538	svm_handle_mce(svm);	3536	svm_handle_mce(svm);
3539		3537
3540	vmcb_mark_all_clean(svm->vmcb);	3538	svm_complete_interrupts(svm);
		3539	exit_fastpath = svm_exit_handlers_fastpath(vcpu);
3541	return exit_fastpath;	3540	return exit_fastpath;
3542	}	3541	}
3543		3542
@@ -3900,21 +3899,28 @@ static int svm_pre_enter_smm(struct kvm_vcpu vcpu, char smstate) · 356 unmodified lines
3900	static int svm_pre_leave_smm(struct kvm_vcpu vcpu, const char smstate)	3899	static int svm_pre_leave_smm(struct kvm_vcpu vcpu, const char smstate)
3901	{	3900	{
3902	struct vcpu_svm *svm = to_svm(vcpu);	3901	struct vcpu_svm *svm = to_svm(vcpu);
3903	struct vmcb *nested_vmcb;
3904	struct kvm_host_map map;	3902	struct kvm_host_map map;
3905	u64 guest;
3906	u64 vmcb;
3907	int ret = 0;	3903	int ret = 0;
3908		3904
3909	guest = GET_SMSTATE(u64, smstate, 0x7ed8);	3905	if (guest_cpuid_has(vcpu, X86_FEATURE_LM)) {
3910	vmcb = GET_SMSTATE(u64, smstate, 0x7ee0);	3906	u64 saved_efer = GET_SMSTATE(u64, smstate, 0x7ed0);
		3907	u64 guest = GET_SMSTATE(u64, smstate, 0x7ed8);
		3908	u64 vmcb = GET_SMSTATE(u64, smstate, 0x7ee0);
3911		3909
3912	if (guest) {	3910	if (guest) {
3913	if (kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(vmcb), &map) == -EINVAL)	3911	if (!guest_cpuid_has(vcpu, X86_FEATURE_SVM))
3914	return 1;	3912	return 1;
3915	nested_vmcb = map.hva;	3913
3916	ret = enter_svm_guest_mode(svm, vmcb, nested_vmcb);	3914	if (!(saved_efer & EFER_SVME))
3917	kvm_vcpu_unmap(&svm->vcpu, &map, true);	3915	return 1;
		3916
		3917	if (kvm_vcpu_map(&svm->vcpu,
		3918	gpa_to_gfn(vmcb), &map) == -EINVAL)
		3919	return 1;
		3920
		3921	ret = enter_svm_guest_mode(svm, vmcb, map.hva);
		3922	kvm_vcpu_unmap(&svm->vcpu, &map, true);
		3923	}
3918	}	3924	}
3919		3925
3920	return ret;	3926	return ret;

arch/x86/kvm/vmx/nested.c+9−1

 	if (kvm_check_request(KVM_REQ_TLB_FLUSH_CURRENT, vcpu))
 		kvm_vcpu_flush_tlb_current(vcpu);
+	/*
+	 * VCPU_EXREG_PDPTR will be clobbered in arch/x86/kvm/vmx/vmx.h between
+	 * now and the new vmentry.  Ensure that the VMCS02 PDPTR fields are
+	 * up-to-date before switching to L1.
+	 */
+	if (enable_ept && is_pae_paging(vcpu))
+		vmx_ept_load_pdptrs(vcpu);
 	leave_guest_mode(vcpu);
 	if (nested_cpu_has_preemption_timer(vmcs12))
 		vmx->nested.msrs.entry_ctls_high &=
 				~VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL;
 		vmx->nested.msrs.exit_ctls_high &=
-				~VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL;
+				~VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL;
 	}
 }

arch/x86/kvm/vmx/vmx.c+3−2

 	vpid_sync_context(to_vmx(vcpu)->vpid);
 }
-static void ept_load_pdptrs(struct kvm_vcpu *vcpu)
+void vmx_ept_load_pdptrs(struct kvm_vcpu *vcpu)
 {
 	struct kvm_mmu *mmu = vcpu->arch.walk_mmu;
 			guest_cr3 = vcpu->arch.cr3;
 		else /* vmcs01.GUEST_CR3 is already up-to-date. */
 			update_guest_cr3 = false;
-		ept_load_pdptrs(vcpu);
+		vmx_ept_load_pdptrs(vcpu);
 	} else {
 		guest_cr3 = pgd;
 	}
 			(exit_reason != EXIT_REASON_EXCEPTION_NMI &&
 			exit_reason != EXIT_REASON_EPT_VIOLATION &&
 			exit_reason != EXIT_REASON_PML_FULL &&
+			exit_reason != EXIT_REASON_APIC_ACCESS &&
 			exit_reason != EXIT_REASON_TASK_SWITCH)) {
 		vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;
 		vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_DELIVERY_EV;

arch/x86/kvm/vmx/vmx.h+1−0

@@ -356,6 +356,7 @@ void vmx_update_host_rsp(struct vcpu_vmx *vmx, unsigned long host_rsp); · 355 unmodified lines
356	int vmx_find_msr_index(struct vmx_msrs *m, u32 msr);	356	int vmx_find_msr_index(struct vmx_msrs *m, u32 msr);
357	int vmx_handle_memory_failure(struct kvm_vcpu *vcpu, int r,	357	int vmx_handle_memory_failure(struct kvm_vcpu *vcpu, int r,
358	struct x86_exception *e);	358	struct x86_exception *e);
		359	void vmx_ept_load_pdptrs(struct kvm_vcpu *vcpu);
359		360
360	#define POSTED_INTR_ON 0	361	#define POSTED_INTR_ON 0
361	#define POSTED_INTR_SN 1	362	#define POSTED_INTR_SN 1

arch/x86/kvm/x86.c+4−1

 		return 1;
 	if (!lapic_in_kernel(vcpu))
-		return 1;
+		return data ? 1 : 0;
 	vcpu->arch.apf.msr_en_val = data;
 	case KVM_CAP_SMALLER_MAXPHYADDR:
 		r = (int) allow_smaller_maxphyaddr;
 		break;
+	case KVM_CAP_STEAL_TIME:
+		r = sched_info_on();
+		break;
 	default:
 		break;
 	}

arch/x86/lib/Makefile+1−1

@@ -24,7 +24,7 @@ ifdef CONFIG_FUNCTION_TRACER · 23 unmodified lines
24	CFLAGS_REMOVE_cmdline.o = -pg	24	CFLAGS_REMOVE_cmdline.o = -pg
25	endif	25	endif
26		26
27	CFLAGS_cmdline.o := -fno-stack-protector	27	CFLAGS_cmdline.o := -fno-stack-protector -fno-jump-tables
28	endif	28	endif
29		29
30	inat_tables_script = $(srctree)/arch/x86/tools/gen-insn-attr-x86.awk	30	inat_tables_script = $(srctree)/arch/x86/tools/gen-insn-attr-x86.awk

arch/x86/mm/fault.c+78−0

@@ -190,6 +190,53 @@ static inline pmd_t vmalloc_sync_one(pgd_t pgd, unsigned long address) · 189 unmodified lines
190	return pmd_k;	190	return pmd_k;
191	}	191	}
192		192
		193	/*
		194	* Handle a fault on the vmalloc or module mapping area
		195	*
		196	* This is needed because there is a race condition between the time
		197	* when the vmalloc mapping code updates the PMD to the point in time
		198	* where it synchronizes this update with the other page-tables in the
		199	* system.
		200	*
		201	* In this race window another thread/CPU can map an area on the same
		202	* PMD, finds it already present and does not synchronize it with the
		203	* rest of the system yet. As a result v[mz]alloc might return areas
		204	* which are not mapped in every page-table in the system, causing an
		205	* unhandled page-fault when they are accessed.
		206	*/
		207	static noinline int vmalloc_fault(unsigned long address)
		208	{
		209	unsigned long pgd_paddr;
		210	pmd_t *pmd_k;
		211	pte_t *pte_k;
		212
		213	/* Make sure we are in vmalloc area: */
		214	if (!(address >= VMALLOC_START && address < VMALLOC_END))
		215	return -1;
		216
		217	/*
		218	* Synchronize this task's top level page-table
		219	* with the 'reference' page table.
		220	*
		221	* Do _not_ use "current" here. We might be inside
		222	* an interrupt in the middle of a task switch..
		223	*/
		224	pgd_paddr = read_cr3_pa();
		225	pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
		226	if (!pmd_k)
		227	return -1;
		228
		229	if (pmd_large(*pmd_k))
		230	return 0;
		231
		232	pte_k = pte_offset_kernel(pmd_k, address);
		233	if (!pte_present(*pte_k))
		234	return -1;
		235
		236	return 0;
		237	}
		238	NOKPROBE_SYMBOL(vmalloc_fault);
		239
193	void arch_sync_kernel_mappings(unsigned long start, unsigned long end)	240	void arch_sync_kernel_mappings(unsigned long start, unsigned long end)
194	{	241	{
195	unsigned long addr;	242	unsigned long addr;
@@ -1110,6 +1157,37 @@ do_kern_addr_fault(struct pt_regs *regs, unsigned long hw_error_code, · 914 unmodified lines
1110	*/	1157	*/
1111	WARN_ON_ONCE(hw_error_code & X86_PF_PK);	1158	WARN_ON_ONCE(hw_error_code & X86_PF_PK);
1112		1159
		1160	#ifdef CONFIG_X86_32
		1161	/*
		1162	* We can fault-in kernel-space virtual memory on-demand. The
		1163	* 'reference' page table is init_mm.pgd.
		1164	*
		1165	* NOTE! We MUST NOT take any locks for this case. We may
		1166	* be in an interrupt or a critical region, and should
		1167	* only copy the information from the master page table,
		1168	* nothing more.
		1169	*
		1170	* Before doing this on-demand faulting, ensure that the
		1171	* fault is not any of the following:
		1172	* 1. A fault on a PTE with a reserved bit set.
		1173	* 2. A fault caused by a user-mode access. (Do not demand-
		1174	* fault kernel memory due to user-mode accesses).
		1175	* 3. A fault caused by a page-level protection violation.
		1176	* (A demand fault would be on a non-present page which
		1177	* would have X86_PF_PROT==0).
		1178	*
		1179	* This is only needed to close a race condition on x86-32 in
		1180	* the vmalloc mapping/unmapping code. See the comment above
		1181	* vmalloc_fault() for details. On x86-64 the race does not
		1182	* exist as the vmalloc mappings don't need to be synchronized
		1183	* there.
		1184	*/
		1185	if (!(hw_error_code & (X86_PF_RSVD \| X86_PF_USER \| X86_PF_PROT))) {
		1186	if (vmalloc_fault(address) >= 0)
		1187	return;
		1188	}
		1189	#endif
		1190
1113	/* Was the fault spurious, caused by lazy TLB invalidation? */	1191	/* Was the fault spurious, caused by lazy TLB invalidation? */
1114	if (spurious_kernel_fault(hw_error_code, address))	1192	if (spurious_kernel_fault(hw_error_code, address))
1115	return;	1193	return;

arch/x86/mm/numa_emulation.c+1−1

@@ -321,7 +321,7 @@ static int __init split_nodes_size_interleave(struct numa_meminfo *ei, · 320 unmodified lines
321	u64 addr, u64 max_addr, u64 size)	321	u64 addr, u64 max_addr, u64 size)
322	{	322	{
323	return split_nodes_size_interleave_uniform(ei, pi, addr, max_addr, size,	323	return split_nodes_size_interleave_uniform(ei, pi, addr, max_addr, size,
324	0, NULL, NUMA_NO_NODE);	324	0, NULL, 0);
325	}	325	}
326		326
327	static int __init setup_emu2phys_nid(int *dfl_phys_nid)	327	static int __init setup_emu2phys_nid(int *dfl_phys_nid)

block/bfq-iosched.c+0−12

@@ -5895,18 +5895,6 @@ static void bfq_finish_requeue_request(struct request *rq) · 5894 unmodified lines
5895	struct bfq_queue *bfqq = RQ_BFQQ(rq);	5895	struct bfq_queue *bfqq = RQ_BFQQ(rq);
5896	struct bfq_data *bfqd;	5896	struct bfq_data *bfqd;
5897		5897
5898	/*
5899	* Requeue and finish hooks are invoked in blk-mq without
5900	* checking whether the involved request is actually still
5901	* referenced in the scheduler. To handle this fact, the
5902	* following two checks make this function exit in case of
5903	* spurious invocations, for which there is nothing to do.
5904	*
5905	* First, check whether rq has nothing to do with an elevator.
5906	*/
5907	if (unlikely(!(rq->rq_flags & RQF_ELVPRIV)))
5908	return;
5909
5910	/*	5898	/*
5911	* rq either is not associated with any icq, or is an already	5899	* rq either is not associated with any icq, or is an already
5912	* requeued request that has not (yet) been re-inserted into	5900	* requeued request that has not (yet) been re-inserted into

block/bio.c+3−1

 		struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt - 1];
 		if (page_is_mergeable(bv, page, len, off, same_page)) {
-			if (bio->bi_iter.bi_size > UINT_MAX - len)
+			if (bio->bi_iter.bi_size > UINT_MAX - len) {
+				*same_page = false;
 				return false;
+			}
 			bv->bv_len += len;
 			bio->bi_iter.bi_size += len;
 			return true;

block/blk-core.c+1−0

@@ -539,6 +539,7 @@ struct request_queue *blk_alloc_queue(int node_id) · 538 unmodified lines
539	goto fail_stats;	539	goto fail_stats;
540		540
541	q->backing_dev_info->ra_pages = VM_READAHEAD_PAGES;	541	q->backing_dev_info->ra_pages = VM_READAHEAD_PAGES;
		542	q->backing_dev_info->io_pages = VM_READAHEAD_PAGES;
542	q->backing_dev_info->capabilities = BDI_CAP_CGROUP_WRITEBACK;	543	q->backing_dev_info->capabilities = BDI_CAP_CGROUP_WRITEBACK;
543	q->node = node_id;	544	q->node = node_id;
544		545

block/blk-iocost.c+3−2

 {
 	struct ioc_gq *iocg = pd_to_iocg(pd);
 	struct ioc *ioc = iocg->ioc;
+	unsigned long flags;
 	if (ioc) {
-		spin_lock(&ioc->lock);
+		spin_lock_irqsave(&ioc->lock, flags);
 		if (!list_empty(&iocg->active_list)) {
 			propagate_active_weight(iocg, 0, 0);
 			list_del_init(&iocg->active_list);
 		}
-		spin_unlock(&ioc->lock);
+		spin_unlock_irqrestore(&ioc->lock, flags);
 		hrtimer_cancel(&iocg->waitq_timer);
 		hrtimer_cancel(&iocg->delay_timer);

block/blk-mq-sched.h+1−1

@@ -66,7 +66,7 @@ static inline void blk_mq_sched_requeue_request(struct request *rq) · 65 unmodified lines
66	struct request_queue *q = rq->q;	66	struct request_queue *q = rq->q;
67	struct elevator_queue *e = q->elevator;	67	struct elevator_queue *e = q->elevator;
68		68
69	if (e && e->type->ops.requeue_request)	69	if ((rq->rq_flags & RQF_ELVPRIV) && e && e->type->ops.requeue_request)
70	e->type->ops.requeue_request(rq);	70	e->type->ops.requeue_request(rq);
71	}	71	}
72		72

block/blk-stat.c+11−6

 			   struct blk_stat_callback *cb)
 {
 	unsigned int bucket;
+	unsigned long flags;
 	int cpu;
 	for_each_possible_cpu(cpu) {
 			blk_rq_stat_init(&cpu_stat[bucket]);
 	}
-	spin_lock(&q->stats->lock);
+	spin_lock_irqsave(&q->stats->lock, flags);
 	list_add_tail_rcu(&cb->list, &q->stats->callbacks);
 	blk_queue_flag_set(QUEUE_FLAG_STATS, q);
-	spin_unlock(&q->stats->lock);
+	spin_unlock_irqrestore(&q->stats->lock, flags);
 }
 void blk_stat_remove_callback(struct request_queue *q,
 			      struct blk_stat_callback *cb)
 {
-	spin_lock(&q->stats->lock);
+	unsigned long flags;
+	spin_lock_irqsave(&q->stats->lock, flags);
 	list_del_rcu(&cb->list);
 	if (list_empty(&q->stats->callbacks) && !q->stats->enable_accounting)
 		blk_queue_flag_clear(QUEUE_FLAG_STATS, q);
-	spin_unlock(&q->stats->lock);
+	spin_unlock_irqrestore(&q->stats->lock, flags);
 	del_timer_sync(&cb->timer);
 }
 void blk_stat_enable_accounting(struct request_queue *q)
 {
-	spin_lock(&q->stats->lock);
+	unsigned long flags;
+	spin_lock_irqsave(&q->stats->lock, flags);
 	q->stats->enable_accounting = true;
 	blk_queue_flag_set(QUEUE_FLAG_STATS, q);
-	spin_unlock(&q->stats->lock);
+	spin_unlock_irqrestore(&q->stats->lock, flags);
 }
 EXPORT_SYMBOL_GPL(blk_stat_enable_accounting);

block/partitions/core.c+22−15

 {
 	struct hd_struct *part =
 		container_of(to_rcu_work(work), struct hd_struct, rcu_work);
+	struct gendisk *disk = part_to_disk(part);
+	/*
+	 * Release the disk reference acquired in delete_partition here.
+	 * We can't release it in hd_struct_free because the final put_device
+	 * needs process context and thus can't be run directly from a
+	 * percpu_ref ->release handler.
+	 */
+	put_device(disk_to_dev(disk));
 	part->start_sect = 0;
 	part->nr_sects = 0;
 		rcu_dereference_protected(disk->part_tbl, 1);
 	rcu_assign_pointer(ptbl->last_lookup, NULL);
-	put_device(disk_to_dev(disk));
 	INIT_RCU_WORK(&part->rcu_work, hd_struct_free_work);
 	queue_rcu_work(system_wq, &part->rcu_work);
 int bdev_del_partition(struct block_device *bdev, int partno)
 {
 	struct block_device *bdevp;
-	struct hd_struct *part;
+	struct hd_struct *part = NULL;
-	int ret = 0;
+	int ret;
-	part = disk_get_part(bdev->bd_disk, partno);
+	bdevp = bdget_disk(bdev->bd_disk, partno);
-	if (!part)
-		return -ENXIO;
-	ret = -ENOMEM;
-	bdevp = bdget(part_devt(part));
 	if (!bdevp)
-		goto out_put_part;
+		return -ENXIO;
 	mutex_lock(&bdevp->bd_mutex);
+	mutex_lock_nested(&bdev->bd_mutex, 1);
+	ret = -ENXIO;
+	part = disk_get_part(bdev->bd_disk, partno);
+	if (!part)
+		goto out_unlock;
 	ret = -EBUSY;
 	if (bdevp->bd_openers)
 	sync_blockdev(bdevp);
 	invalidate_bdev(bdevp);
-	mutex_lock_nested(&bdev->bd_mutex, 1);
 	delete_partition(bdev->bd_disk, part);
-	mutex_unlock(&bdev->bd_mutex);
 	ret = 0;
 out_unlock:
+	mutex_unlock(&bdev->bd_mutex);
 	mutex_unlock(&bdevp->bd_mutex);
 	bdput(bdevp);
-out_put_part:
+	if (part)
-	disk_put_part(part);
+		disk_put_part(part);
 	return ret;
 }

drivers/ata/ahci.c+1−2

@@ -807,8 +807,7 @@ static int ahci_avn_hardreset(struct ata_link link, unsigned int class, · 806 unmodified lines
807	(sstatus & 0xf) != 1)	807	(sstatus & 0xf) != 1)
808	break;	808	break;
809		809
810	ata_link_printk(link, KERN_INFO, "avn bounce port%d\n",	810	ata_link_info(link, "avn bounce port%d\n", port);
811	port);
812		811
813	pci_read_config_word(pdev, 0x92, &val);	812	pci_read_config_word(pdev, 0x92, &val);
814	val &= ~(1 << port);	813	val &= ~(1 << port);

drivers/ata/libata-core.c+2−3

@@ -3868,9 +3868,8 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { · 3867 unmodified lines
3868	/* https://bugzilla.kernel.org/show_bug.cgi?id=15573 */	3868	/* https://bugzilla.kernel.org/show_bug.cgi?id=15573 */
3869	{ "C300-CTFDDAC128MAG", "0001", ATA_HORKAGE_NONCQ, },	3869	{ "C300-CTFDDAC128MAG", "0001", ATA_HORKAGE_NONCQ, },
3870		3870
3871	/* Some Sandisk SSDs lock up hard with NCQ enabled. Reported on	3871	/* Sandisk SD7/8/9s lock up hard on large trims */
3872	SD7SN6S256G and SD8SN8U256G */	3872	{ "SanDisk SD[789]*", NULL, ATA_HORKAGE_MAX_TRIM_128M, },
3873	{ "SanDisk SD[78]SN*G", NULL, ATA_HORKAGE_NONCQ, },
3874		3873
3875	/* devices which puke on READ_NATIVE_MAX */	3874	/* devices which puke on READ_NATIVE_MAX */
3876	{ "HDS724040KLSA80", "KFAOA20N", ATA_HORKAGE_BROKEN_HPA, },	3875	{ "HDS724040KLSA80", "KFAOA20N", ATA_HORKAGE_BROKEN_HPA, },

drivers/ata/libata-scsi.c+7−1

 static unsigned int ata_scsiop_inq_b0(struct ata_scsi_args *args, u8 *rbuf)
 {
+	struct ata_device *dev = args->dev;
 	u16 min_io_sectors;
 	rbuf[1] = 0xb0;
 	 * with the unmap bit set.
 	 */
 	if (ata_id_has_trim(args->id)) {
-		put_unaligned_be64(65535 * ATA_MAX_TRIM_RNUM, &rbuf[36]);
+		u64 max_blocks = 65535 * ATA_MAX_TRIM_RNUM;
+		if (dev->horkage & ATA_HORKAGE_MAX_TRIM_128M)
+			max_blocks = 128 << (20 - SECTOR_SHIFT);
+		put_unaligned_be64(max_blocks, &rbuf[36]);
 		put_unaligned_be32(1, &rbuf[28]);
 	}

drivers/atm/firestream.c+1−0

@@ -998,6 +998,7 @@ static int fs_open(struct atm_vcc *atm_vcc) · 997 unmodified lines
998	error = make_rate (pcr, r, &tmc0, NULL);	998	error = make_rate (pcr, r, &tmc0, NULL);
999	if (error) {	999	if (error) {
1000	kfree(tc);	1000	kfree(tc);
		1001	kfree(vcc);
1001	return error;	1002	return error;
1002	}	1003	}
1003	}	1004	}

drivers/auxdisplay/arm-charlcd.c+1−1

@@ -2,7 +2,7 @@ · 1 unmodified line
2	/*	2	/*
3	* Driver for the on-board character LCD found on some ARM reference boards	3	* Driver for the on-board character LCD found on some ARM reference boards
4	* This is basically an Hitachi HD44780 LCD with a custom IP block to drive it	4	* This is basically an Hitachi HD44780 LCD with a custom IP block to drive it
5	* http://en.wikipedia.org/wiki/HD44780_Character_LCD	5	* https://en.wikipedia.org/wiki/HD44780_Character_LCD
6	* Currently it will just display the text "ARM Linux" and the linux version	6	* Currently it will just display the text "ARM Linux" and the linux version
7	*	7	*
8	* Author: Linus Walleij <triad@df.lth.se>	8	* Author: Linus Walleij <triad@df.lth.se>

drivers/base/core.c+2−6

 void device_link_del(struct device_link *link)
 {
 	device_links_write_lock();
-	device_pm_lock();
 	device_link_put_kref(link);
-	device_pm_unlock();
 	device_links_write_unlock();
 }
 EXPORT_SYMBOL_GPL(device_link_del);
 		return;
 	device_links_write_lock();
-	device_pm_lock();
 	list_for_each_entry(link, &supplier->links.consumers, s_node) {
 		if (link->consumer == consumer) {
 		}
 	}
-	device_pm_unlock();
 	device_links_write_unlock();
 }
 EXPORT_SYMBOL_GPL(device_link_remove);
 	vaf.va = &args;
 	if (err != -EPROBE_DEFER) {
-		dev_err(dev, "error %d: %pV", err, &vaf);
+		dev_err(dev, "error %pe: %pV", ERR_PTR(err), &vaf);
 	} else {
 		device_set_deferred_probe_reason(dev, &vaf);
-		dev_dbg(dev, "error %d: %pV", err, &vaf);
+		dev_dbg(dev, "error %pe: %pV", ERR_PTR(err), &vaf);
 	}
 	va_end(args);

drivers/base/firmware_loader/firmware.h+2−0

 void fw_free_paged_buf(struct fw_priv *fw_priv);
 int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed);
 int fw_map_paged_buf(struct fw_priv *fw_priv);
+bool fw_is_paged_buf(struct fw_priv *fw_priv);
 #else
 static inline void fw_free_paged_buf(struct fw_priv *fw_priv) {}
 static inline int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed) { return -ENXIO; }
 static inline int fw_map_paged_buf(struct fw_priv *fw_priv) { return -ENXIO; }
+static inline bool fw_is_paged_buf(struct fw_priv *fw_priv) { return false; }
 #endif
 #endif /* __FIRMWARE_LOADER_H */

drivers/base/firmware_loader/main.c+11−6

 	list_del(&fw_priv->list);
 	spin_unlock(&fwc->lock);
-	fw_free_paged_buf(fw_priv); /* free leftover pages */
+	if (fw_is_paged_buf(fw_priv))
-	if (!fw_priv->allocated_size)
+		fw_free_paged_buf(fw_priv);
+	else if (!fw_priv->allocated_size)
 		vfree(fw_priv->data);
 	kfree_const(fw_priv->fw_name);
 	kfree(fw_priv);
 }
 }
 #ifdef CONFIG_FW_LOADER_PAGED_BUF
+bool fw_is_paged_buf(struct fw_priv *fw_priv)
+{
+	return fw_priv->is_paged_buf;
+}
 void fw_free_paged_buf(struct fw_priv *fw_priv)
 {
 	int i;
 	if (!fw_priv->pages)
 		return;
+	vunmap(fw_priv->data);
 	for (i = 0; i < fw_priv->nr_pages; i++)
 		__free_page(fw_priv->pages[i]);
 	kvfree(fw_priv->pages);
 	if (!fw_priv->data)
 		return -ENOMEM;
-	/* page table is no longer needed after mapping, let's free */
-	kvfree(fw_priv->pages);
-	fw_priv->pages = NULL;
 	return 0;
 }
 #endif

drivers/block/rbd.c+12−0

 {
 	struct rbd_device *rbd_dev = dev_to_rbd_dev(dev);
+	if (!capable(CAP_SYS_ADMIN))
+		return -EPERM;
 	return sprintf(buf, "%s\n", rbd_dev->config_info);
 }
 	struct rbd_device *rbd_dev = dev_to_rbd_dev(dev);
 	int ret;
+	if (!capable(CAP_SYS_ADMIN))
+		return -EPERM;
 	ret = rbd_dev_refresh(rbd_dev);
 	if (ret)
 		return ret;
 	struct rbd_client *rbdc;
 	int rc;
+	if (!capable(CAP_SYS_ADMIN))
+		return -EPERM;
 	if (!try_module_get(THIS_MODULE))
 		return -ENODEV;
 	bool force = false;
 	int ret;
+	if (!capable(CAP_SYS_ADMIN))
+		return -EPERM;
 	dev_id = -1;
 	opt_buf[0] = '\0';
 	sscanf(buf, "%d %5s", &dev_id, opt_buf);

drivers/counter/microchip-tcb-capture.c+2−2

@@ -320,8 +320,8 @@ static int mchp_tc_probe(struct platform_device *pdev) · 319 unmodified lines
320	}	320	}
321		321
322	regmap = syscon_node_to_regmap(np->parent);	322	regmap = syscon_node_to_regmap(np->parent);
323	if (IS_ERR(priv->regmap))	323	if (IS_ERR(regmap))
324	return PTR_ERR(priv->regmap);	324	return PTR_ERR(regmap);
325		325
326	/* max. channels number is 2 when in QDEC mode */	326	/* max. channels number is 2 when in QDEC mode */
327	priv->num_channels = of_property_count_u32_elems(np, "reg");	327	priv->num_channels = of_property_count_u32_elems(np, "reg");

drivers/cpufreq/intel_pstate.c+148−88

  * @epp_policy:		Last saved policy used to set EPP/EPB
  * @epp_default:	Power on default HWP energy performance
  *			preference/bias
- * @epp_saved:		Saved EPP/EPB during system suspend or CPU offline
- *			operation
  * @epp_cached		Cached HWP energy-performance preference value
  * @hwp_req_cached:	Cached value of the last HWP Request MSR
  * @hwp_cap_cached:	Cached value of the last HWP Capabilities MSR
  * @last_io_update:	Last time when IO wake flag was set
  * @sched_flags:	Store scheduler flags for possible cross CPU update
  * @hwp_boost_min:	Last HWP boosted min performance
+ * @suspended:		Whether or not the driver has been suspended.
  *
  * This structure stores per CPU instance data for all CPUs.
  */
 	s16 epp_powersave;
 	s16 epp_policy;
 	s16 epp_default;
-	s16 epp_saved;
 	s16 epp_cached;
 	u64 hwp_req_cached;
 	u64 hwp_cap_cached;
 	u64 last_io_update;
 	unsigned int sched_flags;
 	u32 hwp_boost_min;
+	bool suspended;
 };
 static struct cpudata **all_cpu_data;
 static int intel_pstate_set_epp(struct cpudata *cpu, u32 epp)
 {
+	int ret;
 	/*
 	 * Use the cached HWP Request MSR value, because in the active mode the
 	 * register itself may be updated by intel_pstate_hwp_boost_up() or
 	 * function, so it cannot run in parallel with the update below.
 	 */
 	WRITE_ONCE(cpu->hwp_req_cached, value);
-	return wrmsrl_on_cpu(cpu->cpu, MSR_HWP_REQUEST, value);
+	ret = wrmsrl_on_cpu(cpu->cpu, MSR_HWP_REQUEST, value);
+	if (!ret)
+		cpu->epp_cached = epp;
+	return ret;
 }
 static int intel_pstate_set_energy_pref_index(struct cpudata *cpu_data,
 		else if (epp == -EINVAL)
 			epp = epp_values[pref_index - 1];
+		/*
+		 * To avoid confusion, refuse to set EPP to any values different
+		 * from 0 (performance) if the current policy is "performance",
+		 * because those values would be overridden.
+		 */
+		if (epp > 0 && cpu_data->policy == CPUFREQ_POLICY_PERFORMANCE)
+			return -EBUSY;
 		ret = intel_pstate_set_epp(cpu_data, epp);
 	} else {
 		if (epp == -EINVAL)
 			cpufreq_stop_governor(policy);
 			ret = intel_pstate_set_epp(cpu, epp);
 			err = cpufreq_start_governor(policy);
-			if (!ret) {
+			if (!ret)
-				cpu->epp_cached = epp;
 				ret = err;
-			}
 		}
 	}
 	rdmsrl_on_cpu(cpu, MSR_HWP_CAPABILITIES, &cap);
 	WRITE_ONCE(all_cpu_data[cpu]->hwp_cap_cached, cap);
-	if (global.no_turbo)
+	if (global.no_turbo || global.turbo_disabled)
 		*current_max = HWP_GUARANTEED_PERF(cap);
 	else
 		*current_max = HWP_HIGHEST_PERF(cap);
 	cpu_data->epp_policy = cpu_data->policy;
-	if (cpu_data->epp_saved >= 0) {
-		epp = cpu_data->epp_saved;
-		cpu_data->epp_saved = -EINVAL;
-		goto update_epp;
-	}
 	if (cpu_data->policy == CPUFREQ_POLICY_PERFORMANCE) {
 		epp = intel_pstate_get_epp(cpu_data, value);
 		cpu_data->epp_powersave = epp;
 		epp = cpu_data->epp_powersave;
 	}
-update_epp:
 	if (boot_cpu_has(X86_FEATURE_HWP_EPP)) {
 		value &= ~GENMASK_ULL(31, 24);
 		value |= (u64)epp << 24;
 	wrmsrl_on_cpu(cpu, MSR_HWP_REQUEST, value);
 }
-static void intel_pstate_hwp_force_min_perf(int cpu)
+static void intel_pstate_hwp_offline(struct cpudata *cpu)
 {
-	u64 value;
+	u64 value = READ_ONCE(cpu->hwp_req_cached);
 	int min_perf;
-	value = all_cpu_data[cpu]->hwp_req_cached;
+	if (boot_cpu_has(X86_FEATURE_HWP_EPP)) {
+		/*
+		 * In case the EPP has been set to "performance" by the
+		 * active mode "performance" scaling algorithm, replace that
+		 * temporary value with the cached EPP one.
+		 */
+		value &= ~GENMASK_ULL(31, 24);
+		value |= HWP_ENERGY_PERF_PREFERENCE(cpu->epp_cached);
+		WRITE_ONCE(cpu->hwp_req_cached, value);
+	}
 	value &= ~GENMASK_ULL(31, 0);
-	min_perf = HWP_LOWEST_PERF(all_cpu_data[cpu]->hwp_cap_cached);
+	min_perf = HWP_LOWEST_PERF(cpu->hwp_cap_cached);
 	/* Set hwp_max = hwp_min */
 	value |= HWP_MAX_PERF(min_perf);
 	if (boot_cpu_has(X86_FEATURE_HWP_EPP))
 		value |= HWP_ENERGY_PERF_PREFERENCE(HWP_EPP_POWERSAVE);
-	wrmsrl_on_cpu(cpu, MSR_HWP_REQUEST, value);
+	wrmsrl_on_cpu(cpu->cpu, MSR_HWP_REQUEST, value);
-}
-static int intel_pstate_hwp_save_state(struct cpufreq_policy *policy)
-{
-	struct cpudata *cpu_data = all_cpu_data[policy->cpu];
-	if (!hwp_active)
-		return 0;
-	cpu_data->epp_saved = intel_pstate_get_epp(cpu_data, 0);
-	return 0;
 }
 #define POWER_CTL_EE_ENABLE	1
 static void intel_pstate_hwp_enable(struct cpudata *cpudata);
+static void intel_pstate_hwp_reenable(struct cpudata *cpu)
+{
+	intel_pstate_hwp_enable(cpu);
+	wrmsrl_on_cpu(cpu->cpu, MSR_HWP_REQUEST, READ_ONCE(cpu->hwp_req_cached));
+}
+static int intel_pstate_suspend(struct cpufreq_policy *policy)
+{
+	struct cpudata *cpu = all_cpu_data[policy->cpu];
+	pr_debug("CPU %d suspending\n", cpu->cpu);
+	cpu->suspended = true;
+	return 0;
+}
 static int intel_pstate_resume(struct cpufreq_policy *policy)
 {
+	struct cpudata *cpu = all_cpu_data[policy->cpu];
+	pr_debug("CPU %d resuming\n", cpu->cpu);
 	/* Only restore if the system default is changed */
 	if (power_ctl_ee_state == POWER_CTL_EE_ENABLE)
 	else if (power_ctl_ee_state == POWER_CTL_EE_DISABLE)
 		set_power_ctl_ee_state(false);
-	if (!hwp_active)
+	if (cpu->suspended && hwp_active) {
-		return 0;
+		mutex_lock(&intel_pstate_limits_lock);
-	mutex_lock(&intel_pstate_limits_lock);
+		/* Re-enable HWP, because "online" has not done that. */
+		intel_pstate_hwp_reenable(cpu);
-	if (policy->cpu == 0)
+		mutex_unlock(&intel_pstate_limits_lock);
-		intel_pstate_hwp_enable(all_cpu_data[policy->cpu]);
+	}
-	all_cpu_data[policy->cpu]->epp_policy = 0;
+	cpu->suspended = false;
-	intel_pstate_hwp_set(policy->cpu);
-	mutex_unlock(&intel_pstate_limits_lock);
 	return 0;
 }
 		wrmsrl_on_cpu(cpudata->cpu, MSR_HWP_INTERRUPT, 0x00);
 	wrmsrl_on_cpu(cpudata->cpu, MSR_PM_ENABLE, 0x1);
-	cpudata->epp_policy = 0;
 	if (cpudata->epp_default == -EINVAL)
 		cpudata->epp_default = intel_pstate_get_epp(cpudata, 0);
 }
 		all_cpu_data[cpunum] = cpu;
-		cpu->epp_default = -EINVAL;
+		cpu->cpu = cpunum;
-		cpu->epp_powersave = -EINVAL;
-		cpu->epp_saved = -EINVAL;
-	}
-	cpu = all_cpu_data[cpunum];
-	cpu->cpu = cpunum;
+		cpu->epp_default = -EINVAL;
-	if (hwp_active) {
+		if (hwp_active) {
-		const struct x86_cpu_id *id;
+			const struct x86_cpu_id *id;
-		intel_pstate_hwp_enable(cpu);
+			intel_pstate_hwp_enable(cpu);
-		id = x86_match_cpu(intel_pstate_hwp_boost_ids);
+			id = x86_match_cpu(intel_pstate_hwp_boost_ids);
-		if (id && intel_pstate_acpi_pm_profile_server())
+			if (id && intel_pstate_acpi_pm_profile_server())
-			hwp_boost = true;
+				hwp_boost = true;
+		}
+	} else if (hwp_active) {
+		/*
+		 * Re-enable HWP in case this happens after a resume from ACPI
+		 * S3 if the CPU was offline during the whole system/resume
+		 * cycle.
+		 */
+		intel_pstate_hwp_reenable(cpu);
 	}
+	cpu->epp_powersave = -EINVAL;
+	cpu->epp_policy = 0;
 	intel_pstate_get_cpu_pstates(cpu);
 	pr_debug("controlling: cpu %d\n", cpunum);
 	return 0;
 }
-static void intel_cpufreq_stop_cpu(struct cpufreq_policy *policy)
+static int intel_pstate_cpu_offline(struct cpufreq_policy *policy)
 {
+	struct cpudata *cpu = all_cpu_data[policy->cpu];
+	pr_debug("CPU %d going offline\n", cpu->cpu);
+	if (cpu->suspended)
+		return 0;
+	/*
+	 * If the CPU is an SMT thread and it goes offline with the performance
+	 * settings different from the minimum, it will prevent its sibling
+	 * from getting to lower performance levels, so force the minimum
+	 * performance on CPU offline to prevent that from happening.
+	 */
 	if (hwp_active)
-		intel_pstate_hwp_force_min_perf(policy->cpu);
+		intel_pstate_hwp_offline(cpu);
 	else
-		intel_pstate_set_min_pstate(all_cpu_data[policy->cpu]);
+		intel_pstate_set_min_pstate(cpu);
+	intel_pstate_exit_perf_limits(policy);
+	return 0;
+}
+static int intel_pstate_cpu_online(struct cpufreq_policy *policy)
+{
+	struct cpudata *cpu = all_cpu_data[policy->cpu];
+	pr_debug("CPU %d going online\n", cpu->cpu);
+	intel_pstate_init_acpi_perf_limits(policy);
+	if (hwp_active) {
+		/*
+		 * Re-enable HWP and clear the "suspended" flag to let "resume"
+		 * know that it need not do that.
+		 */
+		intel_pstate_hwp_reenable(cpu);
+		cpu->suspended = false;
+	}
+	return 0;
 }
 static void intel_pstate_stop_cpu(struct cpufreq_policy *policy)
 {
-	pr_debug("CPU %d exiting\n", policy->cpu);
+	pr_debug("CPU %d stopping\n", policy->cpu);
 	intel_pstate_clear_update_util_hook(policy->cpu);
-	if (hwp_active)
-		intel_pstate_hwp_save_state(policy);
-	intel_cpufreq_stop_cpu(policy);
 }
 static int intel_pstate_cpu_exit(struct cpufreq_policy *policy)
 {
-	intel_pstate_exit_perf_limits(policy);
+	pr_debug("CPU %d exiting\n", policy->cpu);
 	policy->fast_switch_possible = false;
 	 */
 	policy->policy = CPUFREQ_POLICY_POWERSAVE;
+	if (hwp_active) {
+		struct cpudata *cpu = all_cpu_data[policy->cpu];
+		cpu->epp_cached = intel_pstate_get_epp(cpu, 0);
+	}
 	return 0;
 }
 	.flags		= CPUFREQ_CONST_LOOPS,
 	.verify		= intel_pstate_verify_policy,
 	.setpolicy	= intel_pstate_set_policy,
-	.suspend	= intel_pstate_hwp_save_state,
+	.suspend	= intel_pstate_suspend,
 	.resume		= intel_pstate_resume,
 	.init		= intel_pstate_cpu_init,
 	.exit		= intel_pstate_cpu_exit,
 	.stop_cpu	= intel_pstate_stop_cpu,
+	.offline	= intel_pstate_cpu_offline,
+	.online		= intel_pstate_cpu_online,
 	.update_limits	= intel_pstate_update_limits,
 	.name		= "intel_pstate",
 };
 		policy->transition_delay_us = INTEL_CPUFREQ_TRANSITION_DELAY_HWP;
 		rdmsrl_on_cpu(cpu->cpu, MSR_HWP_REQUEST, &value);
 		WRITE_ONCE(cpu->hwp_req_cached, value);
-		cpu->epp_cached = (value & GENMASK_ULL(31, 24)) >> 24;
+		cpu->epp_cached = intel_pstate_get_epp(cpu, value);
 	} else {
 		turbo_max = cpu->pstate.turbo_pstate;
 		policy->transition_delay_us = INTEL_CPUFREQ_TRANSITION_DELAY;
 	.fast_switch	= intel_cpufreq_fast_switch,
 	.init		= intel_cpufreq_cpu_init,
 	.exit		= intel_cpufreq_cpu_exit,
-	.stop_cpu	= intel_cpufreq_stop_cpu,
+	.offline	= intel_pstate_cpu_offline,
+	.online		= intel_pstate_cpu_online,
+	.suspend	= intel_pstate_suspend,
+	.resume		= intel_pstate_resume,
 	.update_limits	= intel_pstate_update_limits,
 	.name		= "intel_cpufreq",
 };
 	}
 	put_online_cpus();
-	if (intel_pstate_driver == &intel_pstate)
-		intel_pstate_sysfs_hide_hwp_dynamic_boost();
 	intel_pstate_driver = NULL;
 }
 	return 0;
 }
-static int intel_pstate_unregister_driver(void)
-{
-	cpufreq_unregister_driver(intel_pstate_driver);
-	intel_pstate_driver_cleanup();
-	return 0;
-}
 static ssize_t intel_pstate_show_status(char *buf)
 {
 	if (!intel_pstate_driver)
 static int intel_pstate_update_status(const char *buf, size_t size)
 {
-	int ret;
+	if (size == 3 && !strncmp(buf, "off", size)) {
+		if (!intel_pstate_driver)
+			return -EINVAL;
+		if (hwp_active)
+			return -EBUSY;
-	if (size == 3 && !strncmp(buf, "off", size))
+		cpufreq_unregister_driver(intel_pstate_driver);
-		return intel_pstate_driver ?
+		intel_pstate_driver_cleanup();
-			intel_pstate_unregister_driver() : -EINVAL;
+	}
 	if (size == 6 && !strncmp(buf, "active", size)) {
 		if (intel_pstate_driver) {
 			if (intel_pstate_driver == &intel_pstate)
 				return 0;
-			ret = intel_pstate_unregister_driver();
+			cpufreq_unregister_driver(intel_pstate_driver);
-			if (ret)
-				return ret;
 		}
 		return intel_pstate_register_driver(&intel_pstate);
 			if (intel_pstate_driver == &intel_cpufreq)
 				return 0;
-			ret = intel_pstate_unregister_driver();
+			cpufreq_unregister_driver(intel_pstate_driver);
-			if (ret)
+			intel_pstate_sysfs_hide_hwp_dynamic_boost();
-				return ret;
 		}
 		return intel_pstate_register_driver(&intel_cpufreq);

drivers/dax/device.c+1−1

@@ -429,7 +429,7 @@ int dev_dax_probe(struct device *dev) · 428 unmodified lines
429	return -EBUSY;	429	return -EBUSY;
430	}	430	}
431		431
432	dev_dax->pgmap.type = MEMORY_DEVICE_DEVDAX;	432	dev_dax->pgmap.type = MEMORY_DEVICE_GENERIC;
433	addr = devm_memremap_pages(dev, &dev_dax->pgmap);	433	addr = devm_memremap_pages(dev, &dev_dax->pgmap);
434	if (IS_ERR(addr))	434	if (IS_ERR(addr))
435	return PTR_ERR(addr);	435	return PTR_ERR(addr);

drivers/dax/super.c+1−1

@@ -100,7 +100,7 @@ bool __generic_fsdax_supported(struct dax_device *dax_dev, · 99 unmodified lines
100	return false;	100	return false;
101	}	101	}
102		102
103	if (!dax_dev && !bdev_dax_supported(bdev, blocksize)) {	103	if (!dax_dev \|\| !bdev_dax_supported(bdev, blocksize)) {
104	pr_debug("%s: error: dax unsupported by block device\n",	104	pr_debug("%s: error: dax unsupported by block device\n",
105	bdevname(bdev, buf));	105	bdevname(bdev, buf));
106	return false;	106	return false;

drivers/dma-buf/dma-buf.c+3−3

@@ -316,9 +316,9 @@ out: · 315 unmodified lines
316	* name of the dma-buf if the same piece of memory is used for multiple	316	* name of the dma-buf if the same piece of memory is used for multiple
317	* purpose between different devices.	317	* purpose between different devices.
318	*	318	*
319	* @dmabuf [in] dmabuf buffer that will be renamed.	319	* @dmabuf: [in] dmabuf buffer that will be renamed.
320	* @buf: [in] A piece of userspace memory that contains the name of	320	* @buf: [in] A piece of userspace memory that contains the name of
321	* the dma-buf.	321	* the dma-buf.
322	*	322	*
323	* Returns 0 on success. If the dma-buf buffer is already attached to	323	* Returns 0 on success. If the dma-buf buffer is already attached to
324	* devices, return -EBUSY.	324	* devices, return -EBUSY.

drivers/dma-buf/dma-fence-chain.c+1−0

@@ -222,6 +222,7 @@ EXPORT_SYMBOL(dma_fence_chain_ops); · 221 unmodified lines
222	* @chain: the chain node to initialize	222	* @chain: the chain node to initialize
223	* @prev: the previous fence	223	* @prev: the previous fence
224	* @fence: the current fence	224	* @fence: the current fence
		225	* @seqno: the sequence number to use for the fence chain
225	*	226	*
226	* Initialize a new chain node and either start a new chain or add the node to	227	* Initialize a new chain node and either start a new chain or add the node to
227	* the existing chain of the previous fence.	228	* the existing chain of the previous fence.

drivers/dma/acpi-dma.c+3−1

 		if (ret < 0) {
 			dev_warn(&adev->dev,
 				 "error in parsing resource group\n");
-			return;
+			break;
 		}
 		grp = (struct acpi_csrt_group *)((void *)grp + grp->length);
 	}
+	acpi_put_table((struct acpi_table_header *)csrt);
 }
 /**

drivers/dma/at_hdmac.c+9−2

 		return NULL;
 	dmac_pdev = of_find_device_by_node(dma_spec->np);
+	if (!dmac_pdev)
+		return NULL;
 	dma_cap_zero(mask);
 	dma_cap_set(DMA_SLAVE, mask);
 	atslave = kmalloc(sizeof(*atslave), GFP_KERNEL);
-	if (!atslave)
+	if (!atslave) {
+		put_device(&dmac_pdev->dev);
 		return NULL;
+	}
 	atslave->cfg = ATC_DST_H2SEL_HW | ATC_SRC_H2SEL_HW;
 	/*
 	atslave->dma_dev = &dmac_pdev->dev;
 	chan = dma_request_channel(mask, at_dma_filter, atslave);
-	if (!chan)
+	if (!chan) {
+		put_device(&dmac_pdev->dev);
+		kfree(atslave);
 		return NULL;
+	}
 	atchan = to_at_dma_chan(chan);
 	atchan->per_if = dma_spec->args[0] & 0xff;

drivers/dma/dma-jz4780.c+19−19

 		return -EINVAL;
 	}
-	ret = platform_get_irq(pdev, 0);
-	if (ret < 0)
-		return ret;
-	jzdma->irq = ret;
-	ret = request_irq(jzdma->irq, jz4780_dma_irq_handler, 0, dev_name(dev),
-			  jzdma);
-	if (ret) {
-		dev_err(dev, "failed to request IRQ %u!\n", jzdma->irq);
-		return ret;
-	}
 	jzdma->clk = devm_clk_get(dev, NULL);
 	if (IS_ERR(jzdma->clk)) {
 		dev_err(dev, "failed to get clock\n");
 		ret = PTR_ERR(jzdma->clk);
-		goto err_free_irq;
+		return ret;
 	}
 	clk_prepare_enable(jzdma->clk);
 		jzchan->vchan.desc_free = jz4780_dma_desc_free;
 	}
+	ret = platform_get_irq(pdev, 0);
+	if (ret < 0)
+		goto err_disable_clk;
+	jzdma->irq = ret;
+	ret = request_irq(jzdma->irq, jz4780_dma_irq_handler, 0, dev_name(dev),
+			  jzdma);
+	if (ret) {
+		dev_err(dev, "failed to request IRQ %u!\n", jzdma->irq);
+		goto err_disable_clk;
+	}
 	ret = dmaenginem_async_device_register(dd);
 	if (ret) {
 		dev_err(dev, "failed to register device\n");
-		goto err_disable_clk;
+		goto err_free_irq;
 	}
 	/* Register with OF DMA helpers. */
 					 jzdma);
 	if (ret) {
 		dev_err(dev, "failed to register OF DMA controller\n");
-		goto err_disable_clk;
+		goto err_free_irq;
 	}
 	dev_info(dev, "JZ4780 DMA controller initialised\n");
 	return 0;
-err_disable_clk:
-	clk_disable_unprepare(jzdma->clk);
 err_free_irq:
 	free_irq(jzdma->irq, jzdma);
+err_disable_clk:
+	clk_disable_unprepare(jzdma->clk);
 	return ret;
 }

drivers/dma/dw-edma/dw-edma-core.c+6−5

 			if (xfer->cyclic) {
 				burst->dar = xfer->xfer.cyclic.paddr;
 			} else {
-				burst->dar = sg_dma_address(sg);
+				burst->dar = dst_addr;
 				/* Unlike the typical assumption by other
 				 * drivers/IPs the peripheral memory isn't
 				 * a FIFO memory, in this case, it's a
 				 * and destination addresses are increased
 				 * by the same portion (data length)
 				 */
-				src_addr += sg_dma_len(sg);
 			}
 		} else {
 			burst->dar = dst_addr;
 			if (xfer->cyclic) {
 				burst->sar = xfer->xfer.cyclic.paddr;
 			} else {
-				burst->sar = sg_dma_address(sg);
+				burst->sar = src_addr;
 				/* Unlike the typical assumption by other
 				 * drivers/IPs the peripheral memory isn't
 				 * a FIFO memory, in this case, it's a
 				 * and destination addresses are increased
 				 * by the same portion (data length)
 				 */
-				dst_addr += sg_dma_len(sg);
 			}
 		}
-		if (!xfer->cyclic)
+		if (!xfer->cyclic) {
+			src_addr += sg_dma_len(sg);
+			dst_addr += sg_dma_len(sg);
 			sg = sg_next(sg);
+		}
 	}
 	return vchan_tx_prep(&chan->vc, &desc->vd, xfer->flags);

drivers/dma/idxd/device.c+26−0

@@ -410,10 +410,27 @@ int idxd_device_enable(struct idxd_device *idxd) · 409 unmodified lines
410	return 0;	410	return 0;
411	}	411	}
412		412
		413	void idxd_device_wqs_clear_state(struct idxd_device *idxd)
		414	{
		415	int i;
		416
		417	lockdep_assert_held(&idxd->dev_lock);
		418
		419	for (i = 0; i < idxd->max_wqs; i++) {
		420	struct idxd_wq *wq = &idxd->wqs[i];
		421
		422	if (wq->state == IDXD_WQ_ENABLED) {
		423	idxd_wq_disable_cleanup(wq);
		424	wq->state = IDXD_WQ_DISABLED;
		425	}
		426	}
		427	}
		428
413	int idxd_device_disable(struct idxd_device *idxd)	429	int idxd_device_disable(struct idxd_device *idxd)
414	{	430	{
415	struct device *dev = &idxd->pdev->dev;	431	struct device *dev = &idxd->pdev->dev;
416	u32 status;	432	u32 status;
		433	unsigned long flags;
417		434
418	if (!idxd_is_enabled(idxd)) {	435	if (!idxd_is_enabled(idxd)) {
419	dev_dbg(dev, "Device is not enabled\n");	436	dev_dbg(dev, "Device is not enabled\n");
@@ -429,13 +446,22 @@ int idxd_device_disable(struct idxd_device *idxd) · 9 unmodified lines
429	return -ENXIO;	446	return -ENXIO;
430	}	447	}
431		448
		449	spin_lock_irqsave(&idxd->dev_lock, flags);
		450	idxd_device_wqs_clear_state(idxd);
432	idxd->state = IDXD_DEV_CONF_READY;	451	idxd->state = IDXD_DEV_CONF_READY;
		452	spin_unlock_irqrestore(&idxd->dev_lock, flags);
433	return 0;	453	return 0;
434	}	454	}
435		455
436	void idxd_device_reset(struct idxd_device *idxd)	456	void idxd_device_reset(struct idxd_device *idxd)
437	{	457	{
		458	unsigned long flags;
		459
438	idxd_cmd_exec(idxd, IDXD_CMD_RESET_DEVICE, 0, NULL);	460	idxd_cmd_exec(idxd, IDXD_CMD_RESET_DEVICE, 0, NULL);
		461	spin_lock_irqsave(&idxd->dev_lock, flags);
		462	idxd_device_wqs_clear_state(idxd);
		463	idxd->state = IDXD_DEV_CONF_READY;
		464	spin_unlock_irqrestore(&idxd->dev_lock, flags);
439	}	465	}
440		466
441	/* Device configuration bits */	467	/* Device configuration bits */

drivers/dma/idxd/irq.c+0−12

@@ -11,18 +11,6 @@ · 10 unmodified lines
11	#include "idxd.h"	11	#include "idxd.h"
12	#include "registers.h"	12	#include "registers.h"
13		13
14	void idxd_device_wqs_clear_state(struct idxd_device *idxd)
15	{
16	int i;
17
18	lockdep_assert_held(&idxd->dev_lock);
19	for (i = 0; i < idxd->max_wqs; i++) {
20	struct idxd_wq *wq = &idxd->wqs[i];
21
22	wq->state = IDXD_WQ_DISABLED;
23	}
24	}
25
26	static void idxd_device_reinit(struct work_struct *work)	14	static void idxd_device_reinit(struct work_struct *work)
27	{	15	{
28	struct idxd_device *idxd = container_of(work, struct idxd_device, work);	16	struct idxd_device *idxd = container_of(work, struct idxd_device, work);

drivers/dma/of-dma.c+4−4

 		return NULL;
 	chan = ofdma_target->of_dma_xlate(&dma_spec_target, ofdma_target);
-	if (chan) {
+	if (IS_ERR_OR_NULL(chan)) {
-		chan->router = ofdma->dma_router;
-		chan->route_data = route_data;
-	} else {
 		ofdma->dma_router->route_free(ofdma->dma_router->dev,
 					      route_data);
+	} else {
+		chan->router = ofdma->dma_router;
+		chan->route_data = route_data;
 	}
 	/*

drivers/dma/pl330.c+1−1

 	while (burst != (1 << desc->rqcfg.brst_size))
 		desc->rqcfg.brst_size++;
+	desc->rqcfg.brst_len = get_burst_len(desc, len);
 	/*
 	 * If burst size is smaller than bus width then make sure we only
 	 * transfer one at a time to avoid a burst stradling an MFIFO entry.
 	if (desc->rqcfg.brst_size * 8 < pl330->pcfg.data_bus_width)
 		desc->rqcfg.brst_len = 1;
-	desc->rqcfg.brst_len = get_burst_len(desc, len);
 	desc->bytes_requested = len;
 	desc->txd.flags = flags;

drivers/dma/ti/k3-udma.c+5−5

@@ -2059,9 +2059,9 @@ udma_prep_slave_sg_tr(struct udma_chan uc, struct scatterlist sgl, · 2058 unmodified lines
2059	return NULL;	2059	return NULL;
2060	}	2060	}
2061		2061
2062	cppi5_tr_init(&tr_req[i].flags, CPPI5_TR_TYPE1, false, false,	2062	cppi5_tr_init(&tr_req[tr_idx].flags, CPPI5_TR_TYPE1, false,
2063	CPPI5_TR_EVENT_SIZE_COMPLETION, 0);	2063	false, CPPI5_TR_EVENT_SIZE_COMPLETION, 0);
2064	cppi5_tr_csf_set(&tr_req[i].flags, CPPI5_TR_CSF_SUPR_EVT);	2064	cppi5_tr_csf_set(&tr_req[tr_idx].flags, CPPI5_TR_CSF_SUPR_EVT);
2065		2065
2066	tr_req[tr_idx].addr = sg_addr;	2066	tr_req[tr_idx].addr = sg_addr;
2067	tr_req[tr_idx].icnt0 = tr0_cnt0;	2067	tr_req[tr_idx].icnt0 = tr0_cnt0;
@@ -3101,14 +3101,14 @@ static struct udma_match_data am654_main_data = { · 1033 unmodified lines
3101	.psil_base = 0x1000,	3101	.psil_base = 0x1000,
3102	.enable_memcpy_support = true,	3102	.enable_memcpy_support = true,
3103	.statictr_z_mask = GENMASK(11, 0),	3103	.statictr_z_mask = GENMASK(11, 0),
3104	.rchan_oes_offset = 0x2000,	3104	.rchan_oes_offset = 0x200,
3105	};	3105	};
3106		3106
3107	static struct udma_match_data am654_mcu_data = {	3107	static struct udma_match_data am654_mcu_data = {
3108	.psil_base = 0x6000,	3108	.psil_base = 0x6000,
3109	.enable_memcpy_support = false,	3109	.enable_memcpy_support = false,
3110	.statictr_z_mask = GENMASK(11, 0),	3110	.statictr_z_mask = GENMASK(11, 0),
3111	.rchan_oes_offset = 0x2000,	3111	.rchan_oes_offset = 0x200,
3112	};	3112	};
3113		3113
3114	static struct udma_match_data j721e_main_data = {	3114	static struct udma_match_data j721e_main_data = {

drivers/firmware/efi/embedded-firmware.c+5−5

@@ -16,9 +16,9 @@ · 15 unmodified lines
16		16
17	/* Exported for use by lib/test_firmware.c only */	17	/* Exported for use by lib/test_firmware.c only */
18	LIST_HEAD(efi_embedded_fw_list);	18	LIST_HEAD(efi_embedded_fw_list);
19	EXPORT_SYMBOL_GPL(efi_embedded_fw_list);	19	EXPORT_SYMBOL_NS_GPL(efi_embedded_fw_list, TEST_FIRMWARE);
20		20	bool efi_embedded_fw_checked;
21	static bool checked_for_fw;	21	EXPORT_SYMBOL_NS_GPL(efi_embedded_fw_checked, TEST_FIRMWARE);
22		22
23	static const struct dmi_system_id * const embedded_fw_table[] = {	23	static const struct dmi_system_id * const embedded_fw_table[] = {
24	#ifdef CONFIG_TOUCHSCREEN_DMI	24	#ifdef CONFIG_TOUCHSCREEN_DMI
@@ -116,14 +116,14 @@ void __init efi_check_for_embedded_firmwares(void) · 91 unmodified lines
116	}	116	}
117	}	117	}
118		118
119	checked_for_fw = true;	119	efi_embedded_fw_checked = true;
120	}	120	}
121		121
122	int efi_get_embedded_fw(const char name, const u8 data, size_t size)	122	int efi_get_embedded_fw(const char name, const u8 data, size_t size)
123	{	123	{
124	struct efi_embedded_fw iter, fw = NULL;	124	struct efi_embedded_fw iter, fw = NULL;
125		125
126	if (!checked_for_fw) {	126	if (!efi_embedded_fw_checked) {
127	pr_warn("Warning %s called while we did not check for embedded fw\n",	127	pr_warn("Warning %s called while we did not check for embedded fw\n",
128	__func__);	128	__func__);
129	return -ENOENT;	129	return -ENOENT;

drivers/gpu/drm/amd/powerplay/arcturus_ppt.c+7−3

 {
 	int ret = 0;
 	uint32_t feature_mask[2];
-	unsigned long feature_enabled;
+	uint64_t feature_enabled;
 	ret = smu_cmn_get_enabled_mask(smu, feature_mask, 2);
-	feature_enabled = (unsigned long)((uint64_t)feature_mask[0] |
+	if (ret)
-			   ((uint64_t)feature_mask[1] << 32));
+		return false;
+	feature_enabled = (uint64_t)feature_mask[1] << 32 | feature_mask[0];
 	return !!(feature_enabled & SMC_DPM_FEATURE);
 }

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

 	case AMDGPU_PP_SENSOR_GPU_POWER:
 		return smu7_get_gpu_power(hwmgr, (uint32_t *)value);
 	case AMDGPU_PP_SENSOR_VDDGFX:
-		if ((data->vr_config & 0xff) == 0x2)
+		if ((data->vr_config & VRCONF_VDDGFX_MASK) ==
+		    (VR_SVI2_PLANE_2 << VRCONF_VDDGFX_SHIFT))
 			val_vid = PHM_READ_INDIRECT_FIELD(hwmgr->device,
 					CGS_IND_REG__SMC, PWR_SVI2_STATUS, PLANE2_VID);
 		else

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c+12−2

@@ -374,8 +374,18 @@ static int vega10_thermal_set_temperature_range(struct pp_hwmgr *hwmgr, · 373 unmodified lines
374	/* compare them in unit celsius degree */	374	/* compare them in unit celsius degree */
375	if (low < range->min / PP_TEMPERATURE_UNITS_PER_CENTIGRADES)	375	if (low < range->min / PP_TEMPERATURE_UNITS_PER_CENTIGRADES)
376	low = range->min / PP_TEMPERATURE_UNITS_PER_CENTIGRADES;	376	low = range->min / PP_TEMPERATURE_UNITS_PER_CENTIGRADES;
377	if (high > tdp_table->usSoftwareShutdownTemp)	377
378	high = tdp_table->usSoftwareShutdownTemp;	378	/*
		379	* As a common sense, usSoftwareShutdownTemp should be bigger
		380	* than ThotspotLimit. For any invalid usSoftwareShutdownTemp,
		381	* we will just use the max possible setting VEGA10_THERMAL_MAXIMUM_ALERT_TEMP
		382	* to avoid false alarms.
		383	*/
		384	if ((tdp_table->usSoftwareShutdownTemp >
		385	range->hotspot_crit_max / PP_TEMPERATURE_UNITS_PER_CENTIGRADES)) {
		386	if (high > tdp_table->usSoftwareShutdownTemp)
		387	high = tdp_table->usSoftwareShutdownTemp;
		388	}
379		389
380	if (low > high)	390	if (low > high)
381	return -EINVAL;	391	return -EINVAL;

drivers/gpu/drm/amd/powerplay/navi10_ppt.c+7−3

 {
 	int ret = 0;
 	uint32_t feature_mask[2];
-	unsigned long feature_enabled;
+	uint64_t feature_enabled;
 	ret = smu_cmn_get_enabled_mask(smu, feature_mask, 2);
-	feature_enabled = (unsigned long)((uint64_t)feature_mask[0] |
+	if (ret)
-			   ((uint64_t)feature_mask[1] << 32));
+		return false;
+	feature_enabled = (uint64_t)feature_mask[1] << 32 | feature_mask[0];
 	return !!(feature_enabled & SMC_DPM_FEATURE);
 }

drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c+10−4

 	FEATURE_MASK(FEATURE_DPM_LINK_BIT)       | \
 	FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT)     | \
 	FEATURE_MASK(FEATURE_DPM_FCLK_BIT)	 | \
-	FEATURE_MASK(FEATURE_DPM_DCEFCLK_BIT))
+	FEATURE_MASK(FEATURE_DPM_DCEFCLK_BIT)	 | \
+	FEATURE_MASK(FEATURE_DPM_MP0CLK_BIT))
 #define SMU_11_0_7_GFX_BUSY_THRESHOLD 15
 	*(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_DPM_PREFETCHER_BIT)
 				| FEATURE_MASK(FEATURE_DPM_FCLK_BIT)
+				| FEATURE_MASK(FEATURE_DPM_MP0CLK_BIT)
 				| FEATURE_MASK(FEATURE_DS_SOCCLK_BIT)
 				| FEATURE_MASK(FEATURE_DS_DCEFCLK_BIT)
 				| FEATURE_MASK(FEATURE_DS_FCLK_BIT)
 {
 	int ret = 0;
 	uint32_t feature_mask[2];
-	unsigned long feature_enabled;
+	uint64_t feature_enabled;
 	ret = smu_cmn_get_enabled_mask(smu, feature_mask, 2);
-	feature_enabled = (unsigned long)((uint64_t)feature_mask[0] |
+	if (ret)
-			   ((uint64_t)feature_mask[1] << 32));
+		return false;
+	feature_enabled = (uint64_t)feature_mask[1] << 32 | feature_mask[0];
 	return !!(feature_enabled & SMC_DPM_FEATURE);
 }

drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c+2−0

 #include "cgs_common.h"
 #include "atombios.h"
 #include "pppcielanes.h"
+#include "smu7_smumgr.h"
 #include "smu/smu_7_0_1_d.h"
 #include "smu/smu_7_0_1_sh_mask.h"
 	.request_smu_load_specific_fw = NULL,
 	.send_msg_to_smc = ci_send_msg_to_smc,
 	.send_msg_to_smc_with_parameter = ci_send_msg_to_smc_with_parameter,
+	.get_argument = smu7_get_argument,
 	.download_pptable_settings = NULL,
 	.upload_pptable_settings = NULL,
 	.get_offsetof = ci_get_offsetof,

drivers/gpu/drm/i915/display/intel_combo_phy.c+2−2

@@ -258,7 +258,7 @@ static bool phy_is_master(struct drm_i915_private *dev_priv, enum phy phy) · 257 unmodified lines
258	static bool icl_combo_phy_verify_state(struct drm_i915_private *dev_priv,	258	static bool icl_combo_phy_verify_state(struct drm_i915_private *dev_priv,
259	enum phy phy)	259	enum phy phy)
260	{	260	{
261	bool ret;	261	bool ret = true;
262	u32 expected_val = 0;	262	u32 expected_val = 0;
263		263
264	if (!icl_combo_phy_enabled(dev_priv, phy))	264	if (!icl_combo_phy_enabled(dev_priv, phy))
@@ -276,7 +276,7 @@ static bool icl_combo_phy_verify_state(struct drm_i915_private *dev_priv, · 11 unmodified lines
276	DCC_MODE_SELECT_CONTINUOSLY);	276	DCC_MODE_SELECT_CONTINUOSLY);
277	}	277	}
278		278
279	ret = cnl_verify_procmon_ref_values(dev_priv, phy);	279	ret &= cnl_verify_procmon_ref_values(dev_priv, phy);
280		280
281	if (phy_is_master(dev_priv, phy)) {	281	if (phy_is_master(dev_priv, phy)) {
282	ret &= check_phy_reg(dev_priv, phy, ICL_PORT_COMP_DW8(phy),	282	ret &= check_phy_reg(dev_priv, phy, ICL_PORT_COMP_DW8(phy),

drivers/gpu/drm/i915/display/intel_display.c+4−6

 	if (dev_priv->wm.distrust_bios_wm)
 		any_ms = true;
-	if (any_ms) {
-		ret = intel_modeset_checks(state);
-		if (ret)
-			goto fail;
-	}
 	intel_fbc_choose_crtc(dev_priv, state);
 	ret = calc_watermark_data(state);
 	if (ret)
 		goto fail;
 	if (any_ms) {
+		ret = intel_modeset_checks(state);
+		if (ret)
+			goto fail;
 		ret = intel_modeset_calc_cdclk(state);
 		if (ret)
 			return ret;

drivers/gpu/drm/i915/display/intel_hdcp.c+26−6

 		/* Fill up the empty slots in sha_text and write it out */
 		sha_empty = sizeof(sha_text) - sha_leftovers;
-		for (j = 0; j < sha_empty; j++)
+		for (j = 0; j < sha_empty; j++) {
-			sha_text |= ksv[j] << ((sizeof(sha_text) - j - 1) * 8);
+			u8 off = ((sizeof(sha_text) - j - 1 - sha_leftovers) * 8);
+			sha_text |= ksv[j] << off;
+		}
 		ret = intel_write_sha_text(dev_priv, sha_text);
 		if (ret < 0)
 		/* Write 32 bits of text */
 		intel_de_write(dev_priv, HDCP_REP_CTL,
 			       rep_ctl | HDCP_SHA1_TEXT_32);
-		sha_text |= bstatus[0] << 24 | bstatus[1] << 16;
+		sha_text |= bstatus[0] << 8 | bstatus[1];
 		ret = intel_write_sha_text(dev_priv, sha_text);
 		if (ret < 0)
 			return ret;
 				return ret;
 			sha_idx += sizeof(sha_text);
 		}
+		/*
+		 * Terminate the SHA-1 stream by hand. For the other leftover
+		 * cases this is appended by the hardware.
+		 */
+		intel_de_write(dev_priv, HDCP_REP_CTL,
+			       rep_ctl | HDCP_SHA1_TEXT_32);
+		sha_text = DRM_HDCP_SHA1_TERMINATOR << 24;
+		ret = intel_write_sha_text(dev_priv, sha_text);
+		if (ret < 0)
+			return ret;
+		sha_idx += sizeof(sha_text);
 	} else if (sha_leftovers == 3) {
-		/* Write 32 bits of text */
+		/* Write 32 bits of text (filled from LSB) */
 		intel_de_write(dev_priv, HDCP_REP_CTL,
 			       rep_ctl | HDCP_SHA1_TEXT_32);
-		sha_text |= bstatus[0] << 24;
+		sha_text |= bstatus[0];
 		ret = intel_write_sha_text(dev_priv, sha_text);
 		if (ret < 0)
 			return ret;
 		sha_idx += sizeof(sha_text);
-		/* Write 8 bits of text, 24 bits of M0 */
+		/* Write 8 bits of text (filled from LSB), 24 bits of M0 */
 		intel_de_write(dev_priv, HDCP_REP_CTL,
 			       rep_ctl | HDCP_SHA1_TEXT_8);
 		ret = intel_write_sha_text(dev_priv, bstatus[1]);
 	struct intel_hdcp *hdcp = &connector->hdcp;
 	enum port port = dig_port->base.port;
 	enum transcoder cpu_transcoder = hdcp->cpu_transcoder;
+	u32 repeater_ctl;
 	int ret;
 	drm_dbg_kms(&dev_priv->drm, "[%s:%d] HDCP is being disabled...\n",
 		return -ETIMEDOUT;
 	}
+	repeater_ctl = intel_hdcp_get_repeater_ctl(dev_priv, cpu_transcoder,
+						   port);
+	intel_de_write(dev_priv, HDCP_REP_CTL,
+		       intel_de_read(dev_priv, HDCP_REP_CTL) & ~repeater_ctl);
 	ret = hdcp->shim->toggle_signalling(dig_port, false);
 	if (ret) {
 		drm_err(&dev_priv->drm, "Failed to disable HDCP signalling\n");

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c+293−21

@@ -45,6 +45,13 @@ struct eb_vma_array { · 44 unmodified lines
45	struct eb_vma vma[];	45	struct eb_vma vma[];
46	};	46	};
47		47
		48	enum {
		49	FORCE_CPU_RELOC = 1,
		50	FORCE_GTT_RELOC,
		51	FORCE_GPU_RELOC,
		52	#define DBG_FORCE_RELOC 0 /* choose one of the above! */
		53	};
		54
48	#define __EXEC_OBJECT_HAS_PIN BIT(31)	55	#define __EXEC_OBJECT_HAS_PIN BIT(31)
49	#define __EXEC_OBJECT_HAS_FENCE BIT(30)	56	#define __EXEC_OBJECT_HAS_FENCE BIT(30)
50	#define __EXEC_OBJECT_NEEDS_MAP BIT(29)	57	#define __EXEC_OBJECT_NEEDS_MAP BIT(29)
@@ -253,6 +260,8 @@ struct i915_execbuffer { · 202 unmodified lines
253	*/	260	*/
254	struct reloc_cache {	261	struct reloc_cache {
255	struct drm_mm_node node; /** temporary GTT binding */	262	struct drm_mm_node node; /** temporary GTT binding */
		263	unsigned long vaddr; /** Current kmap address */
		264	unsigned long page; /** Currently mapped page index */
256	unsigned int gen; /** Cached value of INTEL_GEN */	265	unsigned int gen; /** Cached value of INTEL_GEN */
257	bool use_64bit_reloc : 1;	266	bool use_64bit_reloc : 1;
258	bool has_llc : 1;	267	bool has_llc : 1;
@@ -596,6 +605,23 @@ eb_add_vma(struct i915_execbuffer *eb, · 337 unmodified lines
596	}	605	}
597	}	606	}
598		607
		608	static inline int use_cpu_reloc(const struct reloc_cache *cache,
		609	const struct drm_i915_gem_object *obj)
		610	{
		611	if (!i915_gem_object_has_struct_page(obj))
		612	return false;
		613
		614	if (DBG_FORCE_RELOC == FORCE_CPU_RELOC)
		615	return true;
		616
		617	if (DBG_FORCE_RELOC == FORCE_GTT_RELOC)
		618	return false;
		619
		620	return (cache->has_llc \|\|
		621	obj->cache_dirty \|\|
		622	obj->cache_level != I915_CACHE_NONE);
		623	}
		624
599	static int eb_reserve_vma(const struct i915_execbuffer *eb,	625	static int eb_reserve_vma(const struct i915_execbuffer *eb,
600	struct eb_vma *ev,	626	struct eb_vma *ev,
601	u64 pin_flags)	627	u64 pin_flags)
@@ -926,6 +952,8 @@ relocation_target(const struct drm_i915_gem_relocation_entry *reloc, · 324 unmodified lines
926	static void reloc_cache_init(struct reloc_cache *cache,	952	static void reloc_cache_init(struct reloc_cache *cache,
927	struct drm_i915_private *i915)	953	struct drm_i915_private *i915)
928	{	954	{
		955	cache->page = -1;
		956	cache->vaddr = 0;
929	/* Must be a variable in the struct to allow GCC to unroll. */	957	/* Must be a variable in the struct to allow GCC to unroll. */
930	cache->gen = INTEL_GEN(i915);	958	cache->gen = INTEL_GEN(i915);
931	cache->has_llc = HAS_LLC(i915);	959	cache->has_llc = HAS_LLC(i915);
@@ -937,6 +965,25 @@ static void reloc_cache_init(struct reloc_cache *cache, · 5 unmodified lines
937	cache->target = NULL;	965	cache->target = NULL;
938	}	966	}
939		967
		968	static inline void *unmask_page(unsigned long p)
		969	{
		970	return (void *)(uintptr_t)(p & PAGE_MASK);
		971	}
		972
		973	static inline unsigned int unmask_flags(unsigned long p)
		974	{
		975	return p & ~PAGE_MASK;
		976	}
		977
		978	#define KMAP 0x4 /* after CLFLUSH_FLAGS */
		979
		980	static inline struct i915_ggtt cache_to_ggtt(struct reloc_cache cache)
		981	{
		982	struct drm_i915_private *i915 =
		983	container_of(cache, struct i915_execbuffer, reloc_cache)->i915;
		984	return &i915->ggtt;
		985	}
		986
940	#define RELOC_TAIL 4	987	#define RELOC_TAIL 4
941		988
942	static int reloc_gpu_chain(struct reloc_cache *cache)	989	static int reloc_gpu_chain(struct reloc_cache *cache)
@@ -1049,6 +1096,181 @@ static int reloc_gpu_flush(struct reloc_cache *cache) · 106 unmodified lines
1049	return err;	1096	return err;
1050	}	1097	}
1051		1098
		1099	static void reloc_cache_reset(struct reloc_cache *cache)
		1100	{
		1101	void *vaddr;
		1102
		1103	if (!cache->vaddr)
		1104	return;
		1105
		1106	vaddr = unmask_page(cache->vaddr);
		1107	if (cache->vaddr & KMAP) {
		1108	if (cache->vaddr & CLFLUSH_AFTER)
		1109	mb();
		1110
		1111	kunmap_atomic(vaddr);
		1112	i915_gem_object_finish_access((struct drm_i915_gem_object *)cache->node.mm);
		1113	} else {
		1114	struct i915_ggtt *ggtt = cache_to_ggtt(cache);
		1115
		1116	intel_gt_flush_ggtt_writes(ggtt->vm.gt);
		1117	io_mapping_unmap_atomic((void __iomem *)vaddr);
		1118
		1119	if (drm_mm_node_allocated(&cache->node)) {
		1120	ggtt->vm.clear_range(&ggtt->vm,
		1121	cache->node.start,
		1122	cache->node.size);
		1123	mutex_lock(&ggtt->vm.mutex);
		1124	drm_mm_remove_node(&cache->node);
		1125	mutex_unlock(&ggtt->vm.mutex);
		1126	} else {
		1127	i915_vma_unpin((struct i915_vma *)cache->node.mm);
		1128	}
		1129	}
		1130
		1131	cache->vaddr = 0;
		1132	cache->page = -1;
		1133	}
		1134
		1135	static void reloc_kmap(struct drm_i915_gem_object obj,
		1136	struct reloc_cache *cache,
		1137	unsigned long page)
		1138	{
		1139	void *vaddr;
		1140
		1141	if (cache->vaddr) {
		1142	kunmap_atomic(unmask_page(cache->vaddr));
		1143	} else {
		1144	unsigned int flushes;
		1145	int err;
		1146
		1147	err = i915_gem_object_prepare_write(obj, &flushes);
		1148	if (err)
		1149	return ERR_PTR(err);
		1150
		1151	BUILD_BUG_ON(KMAP & CLFLUSH_FLAGS);
		1152	BUILD_BUG_ON((KMAP \| CLFLUSH_FLAGS) & PAGE_MASK);
		1153
		1154	cache->vaddr = flushes \| KMAP;
		1155	cache->node.mm = (void *)obj;
		1156	if (flushes)
		1157	mb();
		1158	}
		1159
		1160	vaddr = kmap_atomic(i915_gem_object_get_dirty_page(obj, page));
		1161	cache->vaddr = unmask_flags(cache->vaddr) \| (unsigned long)vaddr;
		1162	cache->page = page;
		1163
		1164	return vaddr;
		1165	}
		1166
		1167	static void reloc_iomap(struct drm_i915_gem_object obj,
		1168	struct reloc_cache *cache,
		1169	unsigned long page)
		1170	{
		1171	struct i915_ggtt *ggtt = cache_to_ggtt(cache);
		1172	unsigned long offset;
		1173	void *vaddr;
		1174
		1175	if (cache->vaddr) {
		1176	intel_gt_flush_ggtt_writes(ggtt->vm.gt);
		1177	io_mapping_unmap_atomic((void __force __iomem *) unmask_page(cache->vaddr));
		1178	} else {
		1179	struct i915_vma *vma;
		1180	int err;
		1181
		1182	if (i915_gem_object_is_tiled(obj))
		1183	return ERR_PTR(-EINVAL);
		1184
		1185	if (use_cpu_reloc(cache, obj))
		1186	return NULL;
		1187
		1188	i915_gem_object_lock(obj);
		1189	err = i915_gem_object_set_to_gtt_domain(obj, true);
		1190	i915_gem_object_unlock(obj);
		1191	if (err)
		1192	return ERR_PTR(err);
		1193
		1194	vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0,
		1195	PIN_MAPPABLE \|
		1196	PIN_NONBLOCK /* NOWARN */ \|
		1197	PIN_NOEVICT);
		1198	if (IS_ERR(vma)) {
		1199	memset(&cache->node, 0, sizeof(cache->node));
		1200	mutex_lock(&ggtt->vm.mutex);
		1201	err = drm_mm_insert_node_in_range
		1202	(&ggtt->vm.mm, &cache->node,
		1203	PAGE_SIZE, 0, I915_COLOR_UNEVICTABLE,
		1204	0, ggtt->mappable_end,
		1205	DRM_MM_INSERT_LOW);
		1206	mutex_unlock(&ggtt->vm.mutex);
		1207	if (err) /* no inactive aperture space, use cpu reloc */
		1208	return NULL;
		1209	} else {
		1210	cache->node.start = vma->node.start;
		1211	cache->node.mm = (void *)vma;
		1212	}
		1213	}
		1214
		1215	offset = cache->node.start;
		1216	if (drm_mm_node_allocated(&cache->node)) {
		1217	ggtt->vm.insert_page(&ggtt->vm,
		1218	i915_gem_object_get_dma_address(obj, page),
		1219	offset, I915_CACHE_NONE, 0);
		1220	} else {
		1221	offset += page << PAGE_SHIFT;
		1222	}
		1223
		1224	vaddr = (void __force *)io_mapping_map_atomic_wc(&ggtt->iomap,
		1225	offset);
		1226	cache->page = page;
		1227	cache->vaddr = (unsigned long)vaddr;
		1228
		1229	return vaddr;
		1230	}
		1231
		1232	static void reloc_vaddr(struct drm_i915_gem_object obj,
		1233	struct reloc_cache *cache,
		1234	unsigned long page)
		1235	{
		1236	void *vaddr;
		1237
		1238	if (cache->page == page) {
		1239	vaddr = unmask_page(cache->vaddr);
		1240	} else {
		1241	vaddr = NULL;
		1242	if ((cache->vaddr & KMAP) == 0)
		1243	vaddr = reloc_iomap(obj, cache, page);
		1244	if (!vaddr)
		1245	vaddr = reloc_kmap(obj, cache, page);
		1246	}
		1247
		1248	return vaddr;
		1249	}
		1250
		1251	static void clflush_write32(u32 *addr, u32 value, unsigned int flushes)
		1252	{
		1253	if (unlikely(flushes & (CLFLUSH_BEFORE \| CLFLUSH_AFTER))) {
		1254	if (flushes & CLFLUSH_BEFORE) {
		1255	clflushopt(addr);
		1256	mb();
		1257	}
		1258
		1259	*addr = value;
		1260
		1261	/*
		1262	* Writes to the same cacheline are serialised by the CPU
		1263	* (including clflush). On the write path, we only require
		1264	* that it hits memory in an orderly fashion and place
		1265	* mb barriers at the start and end of the relocation phase
		1266	* to ensure ordering of clflush wrt to the system.
		1267	*/
		1268	if (flushes & CLFLUSH_AFTER)
		1269	clflushopt(addr);
		1270	} else
		1271	*addr = value;
		1272	}
		1273
1052	static int reloc_move_to_gpu(struct i915_request rq, struct i915_vma vma)	1274	static int reloc_move_to_gpu(struct i915_request rq, struct i915_vma vma)
1053	{	1275	{
1054	struct drm_i915_gem_object *obj = vma->obj;	1276	struct drm_i915_gem_object *obj = vma->obj;
@@ -1214,6 +1436,17 @@ static u32 reloc_gpu(struct i915_execbuffer eb, · 159 unmodified lines
1214	return cmd;	1436	return cmd;
1215	}	1437	}
1216		1438
		1439	static inline bool use_reloc_gpu(struct i915_vma *vma)
		1440	{
		1441	if (DBG_FORCE_RELOC == FORCE_GPU_RELOC)
		1442	return true;
		1443
		1444	if (DBG_FORCE_RELOC)
		1445	return false;
		1446
		1447	return !dma_resv_test_signaled_rcu(vma->resv, true);
		1448	}
		1449
1217	static unsigned long vma_phys_addr(struct i915_vma *vma, u32 offset)	1450	static unsigned long vma_phys_addr(struct i915_vma *vma, u32 offset)
1218	{	1451	{
1219	struct page *page;	1452	struct page *page;
@@ -1228,10 +1461,10 @@ static unsigned long vma_phys_addr(struct i915_vma *vma, u32 offset) · 8 unmodified lines
1228	return addr + offset_in_page(offset);	1461	return addr + offset_in_page(offset);
1229	}	1462	}
1230		1463
1231	static int __reloc_entry_gpu(struct i915_execbuffer *eb,	1464	static bool __reloc_entry_gpu(struct i915_execbuffer *eb,
1232	struct i915_vma *vma,	1465	struct i915_vma *vma,
1233	u64 offset,	1466	u64 offset,
1234	u64 target_addr)	1467	u64 target_addr)
1235	{	1468	{
1236	const unsigned int gen = eb->reloc_cache.gen;	1469	const unsigned int gen = eb->reloc_cache.gen;
1237	unsigned int len;	1470	unsigned int len;
@@ -1247,7 +1480,7 @@ static int __reloc_entry_gpu(struct i915_execbuffer *eb, · 9 unmodified lines
1247		1480
1248	batch = reloc_gpu(eb, vma, len);	1481	batch = reloc_gpu(eb, vma, len);
1249	if (IS_ERR(batch))	1482	if (IS_ERR(batch))
1250	return PTR_ERR(batch);	1483	return false;
1251		1484
1252	addr = gen8_canonical_addr(vma->node.start + offset);	1485	addr = gen8_canonical_addr(vma->node.start + offset);
1253	if (gen >= 8) {	1486	if (gen >= 8) {
@@ -1296,21 +1529,55 @@ static int __reloc_entry_gpu(struct i915_execbuffer *eb, · 42 unmodified lines
1296	*batch++ = target_addr;	1529	*batch++ = target_addr;
1297	}	1530	}
1298		1531
1299	return 0;	1532	return true;
		1533	}
		1534
		1535	static bool reloc_entry_gpu(struct i915_execbuffer *eb,
		1536	struct i915_vma *vma,
		1537	u64 offset,
		1538	u64 target_addr)
		1539	{
		1540	if (eb->reloc_cache.vaddr)
		1541	return false;
		1542
		1543	if (!use_reloc_gpu(vma))
		1544	return false;
		1545
		1546	return __reloc_entry_gpu(eb, vma, offset, target_addr);
1300	}	1547	}
1301		1548
1302	static u64	1549	static u64
1303	relocate_entry(struct i915_execbuffer *eb,	1550	relocate_entry(struct i915_vma *vma,
1304	struct i915_vma *vma,
1305	const struct drm_i915_gem_relocation_entry *reloc,	1551	const struct drm_i915_gem_relocation_entry *reloc,
		1552	struct i915_execbuffer *eb,
1306	const struct i915_vma *target)	1553	const struct i915_vma *target)
1307	{	1554	{
1308	u64 target_addr = relocation_target(reloc, target);	1555	u64 target_addr = relocation_target(reloc, target);
1309	int err;	1556	u64 offset = reloc->offset;
1310		1557
1311	err = __reloc_entry_gpu(eb, vma, reloc->offset, target_addr);	1558	if (!reloc_entry_gpu(eb, vma, offset, target_addr)) {
1312	if (err)	1559	bool wide = eb->reloc_cache.use_64bit_reloc;
1313	return err;	1560	void *vaddr;
		1561
		1562	repeat:
		1563	vaddr = reloc_vaddr(vma->obj,
		1564	&eb->reloc_cache,
		1565	offset >> PAGE_SHIFT);
		1566	if (IS_ERR(vaddr))
		1567	return PTR_ERR(vaddr);
		1568
		1569	GEM_BUG_ON(!IS_ALIGNED(offset, sizeof(u32)));
		1570	clflush_write32(vaddr + offset_in_page(offset),
		1571	lower_32_bits(target_addr),
		1572	eb->reloc_cache.vaddr);
		1573
		1574	if (wide) {
		1575	offset += sizeof(u32);
		1576	target_addr >>= 32;
		1577	wide = false;
		1578	goto repeat;
		1579	}
		1580	}
1314		1581
1315	return target->node.start \| UPDATE;	1582	return target->node.start \| UPDATE;
1316	}	1583	}
@@ -1375,7 +1642,8 @@ eb_relocate_entry(struct i915_execbuffer *eb, · 58 unmodified lines
1375	* If the relocation already has the right value in it, no	1642	* If the relocation already has the right value in it, no
1376	* more work needs to be done.	1643	* more work needs to be done.
1377	*/	1644	*/
1378	if (gen8_canonical_addr(target->vma->node.start) == reloc->presumed_offset)	1645	if (!DBG_FORCE_RELOC &&
		1646	gen8_canonical_addr(target->vma->node.start) == reloc->presumed_offset)
1379	return 0;	1647	return 0;
1380		1648
1381	/* Check that the relocation address is valid... */	1649	/* Check that the relocation address is valid... */
@@ -1407,7 +1675,7 @@ eb_relocate_entry(struct i915_execbuffer *eb, · 25 unmodified lines
1407	ev->flags &= ~EXEC_OBJECT_ASYNC;	1675	ev->flags &= ~EXEC_OBJECT_ASYNC;
1408		1676
1409	/* and update the user's relocation entry */	1677	/* and update the user's relocation entry */
1410	return relocate_entry(eb, ev->vma, reloc, target->vma);	1678	return relocate_entry(ev->vma, reloc, eb, target->vma);
1411	}	1679	}
1412		1680
1413	static int eb_relocate_vma(struct i915_execbuffer eb, struct eb_vma ev)	1681	static int eb_relocate_vma(struct i915_execbuffer eb, struct eb_vma ev)
@@ -1445,8 +1713,10 @@ static int eb_relocate_vma(struct i915_execbuffer eb, struct eb_vma ev) · 31 unmodified lines
1445	* this is bad and so lockdep complains vehemently.	1713	* this is bad and so lockdep complains vehemently.
1446	*/	1714	*/
1447	copied = __copy_from_user(r, urelocs, count * sizeof(r[0]));	1715	copied = __copy_from_user(r, urelocs, count * sizeof(r[0]));
1448	if (unlikely(copied))	1716	if (unlikely(copied)) {
1449	return -EFAULT;	1717	remain = -EFAULT;
		1718	goto out;
		1719	}
1450		1720
1451	remain -= count;	1721	remain -= count;
1452	do {	1722	do {
@@ -1454,7 +1724,8 @@ static int eb_relocate_vma(struct i915_execbuffer eb, struct eb_vma ev) · 1 unmodified line
1454		1724
1455	if (likely(offset == 0)) {	1725	if (likely(offset == 0)) {
1456	} else if ((s64)offset < 0) {	1726	} else if ((s64)offset < 0) {
1457	return (int)offset;	1727	remain = (int)offset;
		1728	goto out;
1458	} else {	1729	} else {
1459	/*	1730	/*
1460	* Note that reporting an error now	1731	* Note that reporting an error now
@@ -1484,8 +1755,9 @@ static int eb_relocate_vma(struct i915_execbuffer eb, struct eb_vma ev) · 23 unmodified lines
1484	} while (r++, --count);	1755	} while (r++, --count);
1485	urelocs += ARRAY_SIZE(stack);	1756	urelocs += ARRAY_SIZE(stack);
1486	} while (remain);	1757	} while (remain);
1487		1758	out:
1488	return 0;	1759	reloc_cache_reset(&eb->reloc_cache);
		1760	return remain;
1489	}	1761	}
1490		1762
1491	static int eb_relocate(struct i915_execbuffer *eb)	1763	static int eb_relocate(struct i915_execbuffer *eb)
@@ -2392,7 +2664,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, · 900 unmodified lines
2392	eb.i915 = i915;	2664	eb.i915 = i915;
2393	eb.file = file;	2665	eb.file = file;
2394	eb.args = args;	2666	eb.args = args;
2395	if (!(args->flags & I915_EXEC_NO_RELOC))	2667	if (DBG_FORCE_RELOC \|\| !(args->flags & I915_EXEC_NO_RELOC))
2396	args->flags \|= __EXEC_HAS_RELOC;	2668	args->flags \|= __EXEC_HAS_RELOC;
2397		2669
2398	eb.exec = exec;	2670	eb.exec = exec;

drivers/gpu/drm/i915/gem/i915_gem_object.h+4−0

 i915_gem_object_get_page(struct drm_i915_gem_object *obj,
 			 unsigned int n);
+struct page *
+i915_gem_object_get_dirty_page(struct drm_i915_gem_object *obj,
+			       unsigned int n);
 dma_addr_t
 i915_gem_object_get_dma_address_len(struct drm_i915_gem_object *obj,
 				    unsigned long n,

drivers/gpu/drm/i915/gem/i915_gem_pages.c+14−0

@@ -548,6 +548,20 @@ i915_gem_object_get_page(struct drm_i915_gem_object *obj, unsigned int n) · 547 unmodified lines
548	return nth_page(sg_page(sg), offset);	548	return nth_page(sg_page(sg), offset);
549	}	549	}
550		550
		551	/* Like i915_gem_object_get_page(), but mark the returned page dirty */
		552	struct page *
		553	i915_gem_object_get_dirty_page(struct drm_i915_gem_object *obj,
		554	unsigned int n)
		555	{
		556	struct page *page;
		557
		558	page = i915_gem_object_get_page(obj, n);
		559	if (!obj->mm.dirty)
		560	set_page_dirty(page);
		561
		562	return page;
		563	}
		564
551	dma_addr_t	565	dma_addr_t
552	i915_gem_object_get_dma_address_len(struct drm_i915_gem_object *obj,	566	i915_gem_object_get_dma_address_len(struct drm_i915_gem_object *obj,
553	unsigned long n,	567	unsigned long n,

drivers/gpu/drm/i915/gem/i915_gem_userptr.c+0−8

@@ -596,14 +596,6 @@ static int i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj) · 595 unmodified lines
596	GFP_KERNEL \|	596	GFP_KERNEL \|
597	__GFP_NORETRY \|	597	__GFP_NORETRY \|
598	__GFP_NOWARN);	598	__GFP_NOWARN);
599	/*
600	* Using __get_user_pages_fast() with a read-only
601	* access is questionable. A read-only page may be
602	* COW-broken, and then this might end up giving
603	* the wrong side of the COW..
604	*
605	* We may or may not care.
606	*/
607	if (pvec) {	599	if (pvec) {
608	/* defer to worker if malloc fails */	600	/* defer to worker if malloc fails */
609	if (!i915_gem_object_is_readonly(obj))	601	if (!i915_gem_object_is_readonly(obj))

drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c+15−6

 		return err;
 	/* 8-Byte aligned */
-	err = __reloc_entry_gpu(eb, vma, offsets[0] * sizeof(u32), 0);
+	if (!__reloc_entry_gpu(eb, vma,
-	if (err)
+			       offsets[0] * sizeof(u32),
+			       0)) {
+		err = -EIO;
 		goto unpin_vma;
+	}
 	/* !8-Byte aligned */
-	err = __reloc_entry_gpu(eb, vma, offsets[1] * sizeof(u32), 1);
+	if (!__reloc_entry_gpu(eb, vma,
-	if (err)
+			       offsets[1] * sizeof(u32),
+			       1)) {
+		err = -EIO;
 		goto unpin_vma;
+	}
 	/* Skip to the end of the cmd page */
 	i = PAGE_SIZE / sizeof(u32) - RELOC_TAIL - 1;
 	eb->reloc_cache.rq_size += i;
 	/* Force batch chaining */
-	err = __reloc_entry_gpu(eb, vma, offsets[2] * sizeof(u32), 2);
+	if (!__reloc_entry_gpu(eb, vma,
-	if (err)
+			       offsets[2] * sizeof(u32),
+			       2)) {
+		err = -EIO;
 		goto unpin_vma;
+	}
 	GEM_BUG_ON(!eb->reloc_cache.rq);
 	rq = i915_request_get(eb->reloc_cache.rq);

drivers/gpu/drm/ingenic/ingenic-drm-drv.c+12−8

 	component_unbind_all(priv->dev, &priv->drm);
 }
-static int ingenic_drm_bind(struct device *dev)
+static int ingenic_drm_bind(struct device *dev, bool has_components)
 {
 	struct platform_device *pdev = to_platform_device(dev);
 	const struct jz_soc_info *soc_info;
 			return ret;
 		}
-		if (IS_ENABLED(CONFIG_DRM_INGENIC_IPU)) {
+		if (IS_ENABLED(CONFIG_DRM_INGENIC_IPU) && has_components) {
 			ret = component_bind_all(dev, drm);
 			if (ret) {
 				if (ret != -EPROBE_DEFER)
 	return ret;
 }
+static int ingenic_drm_bind_with_components(struct device *dev)
+{
+	return ingenic_drm_bind(dev, true);
+}
 static int compare_of(struct device *dev, void *data)
 {
 	return dev->of_node == data;
 }
 static const struct component_master_ops ingenic_master_ops = {
-	.bind = ingenic_drm_bind,
+	.bind = ingenic_drm_bind_with_components,
 	.unbind = ingenic_drm_unbind,
 };
 	struct device_node *np;
 	if (!IS_ENABLED(CONFIG_DRM_INGENIC_IPU))
-		return ingenic_drm_bind(dev);
+		return ingenic_drm_bind(dev, false);
 	/* IPU is at port address 8 */
 	np = of_graph_get_remote_node(dev->of_node, 8, 0);
-	if (!np) {
+	if (!np)
-		dev_err(dev, "Unable to get IPU node\n");
+		return ingenic_drm_bind(dev, false);
-		return -EINVAL;
-	}
 	drm_of_component_match_add(dev, &match, compare_of, np);
+	of_node_put(np);
 	return component_master_add_with_match(dev, &ingenic_master_ops, match);
 }

drivers/gpu/drm/msm/adreno/a2xx_gpu.c+5−0

 	if (ret)
 		return ret;
+	gpu_write(gpu, REG_AXXX_CP_RB_CNTL,
+		MSM_GPU_RB_CNTL_DEFAULT | AXXX_CP_RB_CNTL_NO_UPDATE);
+	gpu_write(gpu, REG_AXXX_CP_RB_BASE, lower_32_bits(gpu->rb[0]->iova));
 	/* NOTE: PM4/micro-engine firmware registers look to be the same
 	 * for a2xx and a3xx.. we could possibly push that part down to
 	 * adreno_gpu base class.  Or push both PM4 and PFP but

drivers/gpu/drm/msm/adreno/a3xx_gpu.c+10−0

@@ -211,6 +211,16 @@ static int a3xx_hw_init(struct msm_gpu *gpu) · 210 unmodified lines
211	if (ret)	211	if (ret)
212	return ret;	212	return ret;
213		213
		214	/*
		215	* Use the default ringbuffer size and block size but disable the RPTR
		216	* shadow
		217	*/
		218	gpu_write(gpu, REG_AXXX_CP_RB_CNTL,
		219	MSM_GPU_RB_CNTL_DEFAULT \| AXXX_CP_RB_CNTL_NO_UPDATE);
		220
		221	/* Set the ringbuffer address */
		222	gpu_write(gpu, REG_AXXX_CP_RB_BASE, lower_32_bits(gpu->rb[0]->iova));
		223
214	/* setup access protection: */	224	/* setup access protection: */
215	gpu_write(gpu, REG_A3XX_CP_PROTECT_CTRL, 0x00000007);	225	gpu_write(gpu, REG_A3XX_CP_PROTECT_CTRL, 0x00000007);
216		226

drivers/gpu/drm/msm/adreno/a4xx_gpu.c+10−0

@@ -267,6 +267,16 @@ static int a4xx_hw_init(struct msm_gpu *gpu) · 266 unmodified lines
267	if (ret)	267	if (ret)
268	return ret;	268	return ret;
269		269
		270	/*
		271	* Use the default ringbuffer size and block size but disable the RPTR
		272	* shadow
		273	*/
		274	gpu_write(gpu, REG_A4XX_CP_RB_CNTL,
		275	MSM_GPU_RB_CNTL_DEFAULT \| AXXX_CP_RB_CNTL_NO_UPDATE);
		276
		277	/* Set the ringbuffer address */
		278	gpu_write(gpu, REG_A4XX_CP_RB_BASE, lower_32_bits(gpu->rb[0]->iova));
		279
270	/* Load PM4: */	280	/* Load PM4: */
271	ptr = (uint32_t *)(adreno_gpu->fw[ADRENO_FW_PM4]->data);	281	ptr = (uint32_t *)(adreno_gpu->fw[ADRENO_FW_PM4]->data);
272	len = adreno_gpu->fw[ADRENO_FW_PM4]->size / 4;	282	len = adreno_gpu->fw[ADRENO_FW_PM4]->size / 4;

drivers/gpu/drm/msm/adreno/a5xx_gpu.c+11−3

 	if (ret)
 		return ret;
-	a5xx_preempt_hw_init(gpu);
 	if (!adreno_is_a510(adreno_gpu))
 		a5xx_gpmu_ucode_init(gpu);
 	if (ret)
 		return ret;
+	/* Set the ringbuffer address */
+	gpu_write64(gpu, REG_A5XX_CP_RB_BASE, REG_A5XX_CP_RB_BASE_HI,
+		gpu->rb[0]->iova);
+	gpu_write(gpu, REG_A5XX_CP_RB_CNTL,
+		MSM_GPU_RB_CNTL_DEFAULT | AXXX_CP_RB_CNTL_NO_UPDATE);
+	a5xx_preempt_hw_init(gpu);
 	/* Disable the interrupts through the initial bringup stage */
 	gpu_write(gpu, REG_A5XX_RBBM_INT_0_MASK, A5XX_INT_MASK);
 	check_speed_bin(&pdev->dev);
-	ret = adreno_gpu_init(dev, pdev, adreno_gpu, &funcs, 4);
+	/* Restricting nr_rings to 1 to temporarily disable preemption */
+	ret = adreno_gpu_init(dev, pdev, adreno_gpu, &funcs, 1);
 	if (ret) {
 		a5xx_destroy(&(a5xx_gpu->base.base));
 		return ERR_PTR(ret);

drivers/gpu/drm/msm/adreno/a5xx_gpu.h+1−0

@@ -31,6 +31,7 @@ struct a5xx_gpu { · 30 unmodified lines
31	struct msm_ringbuffer *next_ring;	31	struct msm_ringbuffer *next_ring;
32		32
33	struct drm_gem_object *preempt_bo[MSM_GPU_MAX_RINGS];	33	struct drm_gem_object *preempt_bo[MSM_GPU_MAX_RINGS];
		34	struct drm_gem_object *preempt_counters_bo[MSM_GPU_MAX_RINGS];
34	struct a5xx_preempt_record *preempt[MSM_GPU_MAX_RINGS];	35	struct a5xx_preempt_record *preempt[MSM_GPU_MAX_RINGS];
35	uint64_t preempt_iova[MSM_GPU_MAX_RINGS];	36	uint64_t preempt_iova[MSM_GPU_MAX_RINGS];
36		37

drivers/gpu/drm/msm/adreno/a5xx_preempt.c+20−5

 	struct adreno_gpu *adreno_gpu = &a5xx_gpu->base;
 	struct msm_gpu *gpu = &adreno_gpu->base;
 	struct a5xx_preempt_record *ptr;
-	struct drm_gem_object *bo = NULL;
+	void *counters;
-	u64 iova = 0;
+	struct drm_gem_object *bo = NULL, *counters_bo = NULL;
+	u64 iova = 0, counters_iova = 0;
 	ptr = msm_gem_kernel_new(gpu->dev,
 		A5XX_PREEMPT_RECORD_SIZE + A5XX_PREEMPT_COUNTER_SIZE,
-		MSM_BO_UNCACHED, gpu->aspace, &bo, &iova);
+		MSM_BO_UNCACHED | MSM_BO_MAP_PRIV, gpu->aspace, &bo, &iova);
 	if (IS_ERR(ptr))
 		return PTR_ERR(ptr);
+	/* The buffer to store counters needs to be unprivileged */
+	counters = msm_gem_kernel_new(gpu->dev,
+		A5XX_PREEMPT_COUNTER_SIZE,
+		MSM_BO_UNCACHED, gpu->aspace, &counters_bo, &counters_iova);
+	if (IS_ERR(counters)) {
+		msm_gem_kernel_put(bo, gpu->aspace, true);
+		return PTR_ERR(counters);
+	}
 	msm_gem_object_set_name(bo, "preempt");
+	msm_gem_object_set_name(counters_bo, "preempt_counters");
 	a5xx_gpu->preempt_bo[ring->id] = bo;
+	a5xx_gpu->preempt_counters_bo[ring->id] = counters_bo;
 	a5xx_gpu->preempt_iova[ring->id] = iova;
 	a5xx_gpu->preempt[ring->id] = ptr;
 	ptr->data = 0;
 	ptr->cntl = MSM_GPU_RB_CNTL_DEFAULT;
 	ptr->rptr_addr = rbmemptr(ring, rptr);
-	ptr->counter = iova + A5XX_PREEMPT_RECORD_SIZE;
+	ptr->counter = counters_iova;
 	return 0;
 }
 	struct a5xx_gpu *a5xx_gpu = to_a5xx_gpu(adreno_gpu);
 	int i;
-	for (i = 0; i < gpu->nr_rings; i++)
+	for (i = 0; i < gpu->nr_rings; i++) {
 		msm_gem_kernel_put(a5xx_gpu->preempt_bo[i], gpu->aspace, true);
+		msm_gem_kernel_put(a5xx_gpu->preempt_counters_bo[i],
+			gpu->aspace, true);
+	}
 }
 void a5xx_preempt_init(struct msm_gpu *gpu)

drivers/gpu/drm/msm/adreno/a6xx_gpu.c+12−1

 			A6XX_PROTECT_RDONLY(0x980, 0x4));
 	gpu_write(gpu, REG_A6XX_CP_PROTECT(25), A6XX_PROTECT_RW(0xa630, 0x0));
-	if (adreno_is_a650(adreno_gpu)) {
+	/* Enable expanded apriv for targets that support it */
+	if (gpu->hw_apriv) {
 		gpu_write(gpu, REG_A6XX_CP_APRIV_CNTL,
 			(1 << 6) | (1 << 5) | (1 << 3) | (1 << 2) | (1 << 1));
 	}
 	if (ret)
 		goto out;
+	/* Set the ringbuffer address */
+	gpu_write64(gpu, REG_A6XX_CP_RB_BASE, REG_A6XX_CP_RB_BASE_HI,
+		gpu->rb[0]->iova);
+	gpu_write(gpu, REG_A6XX_CP_RB_CNTL,
+		MSM_GPU_RB_CNTL_DEFAULT | AXXX_CP_RB_CNTL_NO_UPDATE);
 	/* Always come up on rb 0 */
 	a6xx_gpu->cur_ring = gpu->rb[0];
 	adreno_gpu->registers = NULL;
 	adreno_gpu->reg_offsets = a6xx_register_offsets;
+	if (adreno_is_a650(adreno_gpu))
+		adreno_gpu->base.hw_apriv = true;
 	ret = adreno_gpu_init(dev, pdev, adreno_gpu, &funcs, 1);
 	if (ret) {
 		a6xx_destroy(&(a6xx_gpu->base.base));

drivers/gpu/drm/msm/adreno/adreno_gpu.c+2−25

@@ -400,26 +400,6 @@ int adreno_hw_init(struct msm_gpu *gpu) · 399 unmodified lines
400	ring->memptrs->rptr = 0;	400	ring->memptrs->rptr = 0;
401	}	401	}
402		402
403	/*
404	* Setup REG_CP_RB_CNTL. The same value is used across targets (with
405	* the excpetion of A430 that disables the RPTR shadow) - the cacluation
406	* for the ringbuffer size and block size is moved to msm_gpu.h for the
407	* pre-processor to deal with and the A430 variant is ORed in here
408	*/
409	adreno_gpu_write(adreno_gpu, REG_ADRENO_CP_RB_CNTL,
410	MSM_GPU_RB_CNTL_DEFAULT \|
411	(adreno_is_a430(adreno_gpu) ? AXXX_CP_RB_CNTL_NO_UPDATE : 0));
412
413	/* Setup ringbuffer address - use ringbuffer[0] for GPU init */
414	adreno_gpu_write64(adreno_gpu, REG_ADRENO_CP_RB_BASE,
415	REG_ADRENO_CP_RB_BASE_HI, gpu->rb[0]->iova);
416
417	if (!adreno_is_a430(adreno_gpu)) {
418	adreno_gpu_write64(adreno_gpu, REG_ADRENO_CP_RB_RPTR_ADDR,
419	REG_ADRENO_CP_RB_RPTR_ADDR_HI,
420	rbmemptr(gpu->rb[0], rptr));
421	}
422
423	return 0;	403	return 0;
424	}	404	}
425		405
@@ -427,11 +407,8 @@ int adreno_hw_init(struct msm_gpu *gpu) · 1 unmodified line
427	static uint32_t get_rptr(struct adreno_gpu *adreno_gpu,	407	static uint32_t get_rptr(struct adreno_gpu *adreno_gpu,
428	struct msm_ringbuffer *ring)	408	struct msm_ringbuffer *ring)
429	{	409	{
430	if (adreno_is_a430(adreno_gpu))	410	return ring->memptrs->rptr = adreno_gpu_read(
431	return ring->memptrs->rptr = adreno_gpu_read(	411	adreno_gpu, REG_ADRENO_CP_RB_RPTR);
432	adreno_gpu, REG_ADRENO_CP_RB_RPTR);
433	else
434	return ring->memptrs->rptr;
435	}	412	}
436		413
437	struct msm_ringbuffer adreno_active_ring(struct msm_gpu gpu)	414	struct msm_ringbuffer adreno_active_ring(struct msm_gpu gpu)

drivers/gpu/drm/msm/msm_gpu.c+1−1

@@ -908,7 +908,7 @@ int msm_gpu_init(struct drm_device drm, struct platform_device pdev, · 907 unmodified lines
908		908
909	memptrs = msm_gem_kernel_new(drm,	909	memptrs = msm_gem_kernel_new(drm,
910	sizeof(struct msm_rbmemptrs) * nr_rings,	910	sizeof(struct msm_rbmemptrs) * nr_rings,
911	MSM_BO_UNCACHED, gpu->aspace, &gpu->memptrs_bo,	911	check_apriv(gpu, MSM_BO_UNCACHED), gpu->aspace, &gpu->memptrs_bo,
912	&memptrs_iova);	912	&memptrs_iova);
913		913
914	if (IS_ERR(memptrs)) {	914	if (IS_ERR(memptrs)) {

drivers/gpu/drm/msm/msm_gpu.h+11−0

 #include "msm_drv.h"
 #include "msm_fence.h"
 #include "msm_ringbuffer.h"
+#include "msm_gem.h"
 struct msm_gem_submit;
 struct msm_gpu_perfcntr;
 	} devfreq;
 	struct msm_gpu_state *crashstate;
+	/* True if the hardware supports expanded apriv (a650 and newer) */
+	bool hw_apriv;
 };
 /* It turns out that all targets use the same ringbuffer size */
 	mutex_unlock(&gpu->dev->struct_mutex);
 }
+/*
+ * Simple macro to semi-cleanly add the MAP_PRIV flag for targets that can
+ * support expanded privileges
+ */
+#define check_apriv(gpu, flags) \
+	(((gpu)->hw_apriv ? MSM_BO_MAP_PRIV : 0) | (flags))
 #endif /* __MSM_GPU_H__ */

drivers/gpu/drm/msm/msm_ringbuffer.c+2−2

@@ -27,8 +27,8 @@ struct msm_ringbuffer msm_ringbuffer_new(struct msm_gpu gpu, int id, · 26 unmodified lines
27	ring->id = id;	27	ring->id = id;
28		28
29	ring->start = msm_gem_kernel_new(gpu->dev, MSM_GPU_RINGBUFFER_SZ,	29	ring->start = msm_gem_kernel_new(gpu->dev, MSM_GPU_RINGBUFFER_SZ,
30	MSM_BO_WC \| MSM_BO_GPU_READONLY, gpu->aspace, &ring->bo,	30	check_apriv(gpu, MSM_BO_WC \| MSM_BO_GPU_READONLY),
31	&ring->iova);	31	gpu->aspace, &ring->bo, &ring->iova);
32		32
33	if (IS_ERR(ring->start)) {	33	if (IS_ERR(ring->start)) {
34	ret = PTR_ERR(ring->start);	34	ret = PTR_ERR(ring->start);

drivers/gpu/drm/nouveau/dispnv50/core507d.c+4−1

 					interlock[NV50_DISP_INTERLOCK_OVLY] |
 		  NVDEF(NV507D, UPDATE, NOT_DRIVER_FRIENDLY, FALSE) |
 		  NVDEF(NV507D, UPDATE, NOT_DRIVER_UNFRIENDLY, FALSE) |
-		  NVDEF(NV507D, UPDATE, INHIBIT_INTERRUPTS, FALSE));
+		  NVDEF(NV507D, UPDATE, INHIBIT_INTERRUPTS, FALSE),
+				SET_NOTIFIER_CONTROL,
+		  NVDEF(NV507D, SET_NOTIFIER_CONTROL, NOTIFY, DISABLE));
 	return PUSH_KICK(push);
 }

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

@@ -6,7 +6,7 @@ · 5 unmodified lines
6	#include "disp.h"	6	#include "disp.h"
7	#include "head.h"	7	#include "head.h"
8		8
9	#include <nvif/push507c.h>	9	#include <nvif/pushc37b.h>
10		10
11	#include <nvhw/class/clc37d.h>	11	#include <nvhw/class/clc37d.h>
12		12

drivers/gpu/drm/nouveau/dispnv50/disp.c+6−0

 	dmac->push->end = dmac->push->bgn;
 	dmac->max = 0x1000/4 - 1;
+	/* EVO channels are affected by a HW bug where the last 12 DWORDs
+	 * of the push buffer aren't able to be used safely.
+	 */
+	if (disp->oclass < GV100_DISP)
+		dmac->max -= 12;
 	args->pushbuf = nvif_handle(&dmac->_push.mem.object);
 	ret = nv50_chan_create(device, disp, oclass, head, data, size,

drivers/gpu/drm/nouveau/include/nvif/push507c.h+1−1

@@ -20,6 +20,6 @@ · 19 unmodified lines
20	PUSH_ASSERT(!((o) & ~DRF_SMASK(NV507C_DMA_JUMP_OFFSET)), "offset"); \	20	PUSH_ASSERT(!((o) & ~DRF_SMASK(NV507C_DMA_JUMP_OFFSET)), "offset"); \
21	PUSH_DATA__((p), NVDEF(NV507C, DMA, OPCODE, JUMP) \| \	21	PUSH_DATA__((p), NVDEF(NV507C, DMA, OPCODE, JUMP) \| \
22	NVVAL(NV507C, DMA, JUMP_OFFSET, (o) >> 2), \	22	NVVAL(NV507C, DMA, JUMP_OFFSET, (o) >> 2), \
23	"jump 0x%08x - %s", (u32)(o), __func__); \	23	" jump 0x%08x - %s", (u32)(o), __func__); \
24	} while(0)	24	} while(0)
25	#endif	25	#endif

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

@@ -933,7 +933,7 @@ static void avivo_get_fb_ref_div(unsigned nom, unsigned den, unsigned post_div, · 932 unmodified lines
933		933
934	/* get matching reference and feedback divider */	934	/* get matching reference and feedback divider */
935	*ref_div = min(max(den/post_div, 1u), ref_div_max);	935	*ref_div = min(max(den/post_div, 1u), ref_div_max);
936	fb_div = DIV_ROUND_CLOSEST(nom ref_div post_div, den);	936	fb_div = max(nom ref_div post_div / den, 1u);
937		937
938	/* limit fb divider to its maximum */	938	/* limit fb divider to its maximum */
939	if (*fb_div > fb_div_max) {	939	if (*fb_div > fb_div_max) {

drivers/gpu/drm/sun4i/sun4i_backend.c+1−3

 	/* We can't have an alpha plane at the lowest position */
 	if (!backend->quirks->supports_lowest_plane_alpha &&
-	    (plane_states[0]->fb->format->has_alpha ||
+	    (plane_states[0]->alpha != DRM_BLEND_ALPHA_OPAQUE))
-	    (plane_states[0]->alpha != DRM_BLEND_ALPHA_OPAQUE)))
 		return -EINVAL;
 	for (i = 1; i < num_planes; i++) {
 static const struct sun4i_backend_quirks sun7i_backend_quirks = {
 	.needs_output_muxing = true,
-	.supports_lowest_plane_alpha = true,
 };
 static const struct sun4i_backend_quirks sun8i_a33_backend_quirks = {

drivers/gpu/drm/sun4i/sun4i_tcon.c+6−2

 	if (IS_ENABLED(CONFIG_DRM_SUN8I_TCON_TOP) &&
 	    encoder->encoder_type == DRM_MODE_ENCODER_TMDS) {
 		ret = sun8i_tcon_top_set_hdmi_src(&pdev->dev, id);
-		if (ret)
+		if (ret) {
+			put_device(&pdev->dev);
 			return ret;
+		}
 	}
 	if (IS_ENABLED(CONFIG_DRM_SUN8I_TCON_TOP)) {
 		ret = sun8i_tcon_top_de_config(&pdev->dev, tcon->id, id);
-		if (ret)
+		if (ret) {
+			put_device(&pdev->dev);
 			return ret;
+		}
 	}
 	return 0;

drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c+2−2

@@ -889,7 +889,7 @@ static int sun6i_dsi_dcs_write_long(struct sun6i_dsi *dsi, · 888 unmodified lines
889	regmap_write(dsi->regs, SUN6I_DSI_CMD_TX_REG(0),	889	regmap_write(dsi->regs, SUN6I_DSI_CMD_TX_REG(0),
890	sun6i_dsi_dcs_build_pkt_hdr(dsi, msg));	890	sun6i_dsi_dcs_build_pkt_hdr(dsi, msg));
891		891
892	bounce = kzalloc(msg->tx_len + sizeof(crc), GFP_KERNEL);	892	bounce = kzalloc(ALIGN(msg->tx_len + sizeof(crc), 4), GFP_KERNEL);
893	if (!bounce)	893	if (!bounce)
894	return -ENOMEM;	894	return -ENOMEM;
895		895
@@ -900,7 +900,7 @@ static int sun6i_dsi_dcs_write_long(struct sun6i_dsi *dsi, · 4 unmodified lines
900	memcpy((u8 *)bounce + msg->tx_len, &crc, sizeof(crc));	900	memcpy((u8 *)bounce + msg->tx_len, &crc, sizeof(crc));
901	len += sizeof(crc);	901	len += sizeof(crc);
902		902
903	regmap_bulk_write(dsi->regs, SUN6I_DSI_CMD_TX_REG(1), bounce, len);	903	regmap_bulk_write(dsi->regs, SUN6I_DSI_CMD_TX_REG(1), bounce, DIV_ROUND_UP(len, 4));
904	regmap_write(dsi->regs, SUN6I_DSI_CMD_CTL_REG, len + 4 - 1);	904	regmap_write(dsi->regs, SUN6I_DSI_CMD_CTL_REG, len + 4 - 1);
905	kfree(bounce);	905	kfree(bounce);
906		906

drivers/gpu/drm/sun4i/sun8i_vi_layer.c+1−1

@@ -211,7 +211,7 @@ static int sun8i_vi_layer_update_coord(struct sun8i_mixer *mixer, int channel, · 210 unmodified lines
211	return 0;	211	return 0;
212	}	212	}
213		213
214	static bool sun8i_vi_layer_get_csc_mode(const struct drm_format_info *format)	214	static u32 sun8i_vi_layer_get_csc_mode(const struct drm_format_info *format)
215	{	215	{
216	if (!format->is_yuv)	216	if (!format->is_yuv)
217	return SUN8I_CSC_MODE_OFF;	217	return SUN8I_CSC_MODE_OFF;

drivers/gpu/drm/tve200/tve200_display.c+21−1

 #include <linux/version.h>
 #include <linux/dma-buf.h>
 #include <linux/of_graph.h>
+#include <linux/delay.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_fourcc.h>
 	struct drm_connector *connector = priv->connector;
 	u32 format = fb->format->format;
 	u32 ctrl1 = 0;
+	int retries;
 	clk_prepare_enable(priv->clk);
+	/* Reset the TVE200 and wait for it to come back online */
+	writel(TVE200_CTRL_4_RESET, priv->regs + TVE200_CTRL_4);
+	for (retries = 0; retries < 5; retries++) {
+		usleep_range(30000, 50000);
+		if (readl(priv->regs + TVE200_CTRL_4) & TVE200_CTRL_4_RESET)
+			continue;
+		else
+			break;
+	}
+	if (retries == 5 &&
+	    readl(priv->regs + TVE200_CTRL_4) & TVE200_CTRL_4_RESET) {
+		dev_err(drm->dev, "can't get hardware out of reset\n");
+		return;
+	}
 	/* Function 1 */
 	ctrl1 |= TVE200_CTRL_CSMODE;
 	/* Interlace mode for CCIR656: parameterize? */
 	drm_crtc_vblank_off(crtc);
-	/* Disable and Power Down */
+	/* Disable put into reset and Power Down */
 	writel(0, priv->regs + TVE200_CTRL);
+	writel(TVE200_CTRL_4_RESET, priv->regs + TVE200_CTRL_4);
 	clk_disable_unprepare(priv->clk);
 }
 	struct drm_device *drm = crtc->dev;
 	struct tve200_drm_dev_private *priv = drm->dev_private;
+	/* Clear any IRQs and enable */
+	writel(0xFF, priv->regs + TVE200_INT_CLR);
 	writel(TVE200_INT_V_STATUS, priv->regs + TVE200_INT_EN);
 	return 0;
 }

drivers/gpu/drm/virtio/virtgpu_display.c+11−4

 static void virtio_gpu_crtc_atomic_enable(struct drm_crtc *crtc,
 					  struct drm_crtc_state *old_state)
 {
-	struct virtio_gpu_output *output = drm_crtc_to_virtio_gpu_output(crtc);
-	output->enabled = true;
 }
 static void virtio_gpu_crtc_atomic_disable(struct drm_crtc *crtc,
 	virtio_gpu_cmd_set_scanout(vgdev, output->index, 0, 0, 0, 0, 0);
 	virtio_gpu_notify(vgdev);
-	output->enabled = false;
 }
 static int virtio_gpu_crtc_atomic_check(struct drm_crtc *crtc,
 static void virtio_gpu_crtc_atomic_flush(struct drm_crtc *crtc,
 					 struct drm_crtc_state *old_state)
 {
+	struct virtio_gpu_output *output = drm_crtc_to_virtio_gpu_output(crtc);
+	/*
+	 * virtio-gpu can't do modeset and plane update operations
+	 * independent from each other.  So the actual modeset happens
+	 * in the plane update callback, and here we just check
+	 * whenever we must force the modeset.
+	 */
+	if (drm_atomic_crtc_needs_modeset(crtc->state)) {
+		output->needs_modeset = true;
+	}
 }
 static const struct drm_crtc_helper_funcs virtio_gpu_crtc_helper_funcs = {

drivers/gpu/drm/virtio/virtgpu_drv.h+1−1

@@ -137,7 +137,7 @@ struct virtio_gpu_output { · 136 unmodified lines
137	struct edid *edid;	137	struct edid *edid;
138	int cur_x;	138	int cur_x;
139	int cur_y;	139	int cur_y;
140	bool enabled;	140	bool needs_modeset;
141	};	141	};
142	#define drm_crtc_to_virtio_gpu_output(x) \	142	#define drm_crtc_to_virtio_gpu_output(x) \
143	container_of(x, struct virtio_gpu_output, crtc)	143	container_of(x, struct virtio_gpu_output, crtc)

drivers/gpu/drm/virtio/virtgpu_object.c+7−1

 	if (ret < 0)
 		return -EINVAL;
-	shmem->pages = drm_gem_shmem_get_pages_sgt(&bo->base.base);
+	/*
+	 * virtio_gpu uses drm_gem_shmem_get_sg_table instead of
+	 * drm_gem_shmem_get_pages_sgt because virtio has it's own set of
+	 * dma-ops. This is discouraged for other drivers, but should be fine
+	 * since virtio_gpu doesn't support dma-buf import from other devices.
+	 */
+	shmem->pages = drm_gem_shmem_get_sg_table(&bo->base.base);
 	if (!shmem->pages) {
 		drm_gem_shmem_unpin(&bo->base.base);
 		return -EINVAL;

drivers/gpu/drm/virtio/virtgpu_plane.c+4−2

 	if (WARN_ON(!output))
 		return;
-	if (!plane->state->fb || !output->enabled) {
+	if (!plane->state->fb || !output->crtc.state->active) {
 		DRM_DEBUG("nofb\n");
 		virtio_gpu_cmd_set_scanout(vgdev, output->index, 0,
 					   plane->state->src_w >> 16,
 	    plane->state->src_w != old_state->src_w ||
 	    plane->state->src_h != old_state->src_h ||
 	    plane->state->src_x != old_state->src_x ||
-	    plane->state->src_y != old_state->src_y) {
+	    plane->state->src_y != old_state->src_y ||
+	    output->needs_modeset) {
+		output->needs_modeset = false;
 		DRM_DEBUG("handle 0x%x, crtc %dx%d+%d+%d, src %dx%d+%d+%d\n",
 			  bo->hw_res_handle,
 			  plane->state->crtc_w, plane->state->crtc_h,

drivers/gpu/drm/xen/xen_drm_front_gem.c+5−4

 #include <drm/drm_probe_helper.h>
 #include <xen/balloon.h>
+#include <xen/xen.h>
 #include "xen_drm_front.h"
 #include "xen_drm_front_gem.h"
 		 * allocate ballooned pages which will be used to map
 		 * grant references provided by the backend
 		 */
-		ret = alloc_xenballooned_pages(xen_obj->num_pages,
+		ret = xen_alloc_unpopulated_pages(xen_obj->num_pages,
-					       xen_obj->pages);
+					          xen_obj->pages);
 		if (ret < 0) {
 			DRM_ERROR("Cannot allocate %zu ballooned pages: %d\n",
 				  xen_obj->num_pages, ret);
 	} else {
 		if (xen_obj->pages) {
 			if (xen_obj->be_alloc) {
-				free_xenballooned_pages(xen_obj->num_pages,
+				xen_free_unpopulated_pages(xen_obj->num_pages,
-							xen_obj->pages);
+							   xen_obj->pages);
 				gem_free_pages_array(xen_obj);
 			} else {
 				drm_gem_put_pages(&xen_obj->base,

drivers/gpu/drm/xlnx/Kconfig+1−0

@@ -2,6 +2,7 @@ config DRM_ZYNQMP_DPSUB · 1 unmodified line
2	tristate "ZynqMP DisplayPort Controller Driver"	2	tristate "ZynqMP DisplayPort Controller Driver"
3	depends on ARCH_ZYNQMP \|\| COMPILE_TEST	3	depends on ARCH_ZYNQMP \|\| COMPILE_TEST
4	depends on COMMON_CLK && DRM && OF	4	depends on COMMON_CLK && DRM && OF
		5	depends on DMADEVICES
5	select DMA_ENGINE	6	select DMA_ENGINE
6	select DRM_GEM_CMA_HELPER	7	select DRM_GEM_CMA_HELPER
7	select DRM_KMS_CMA_HELPER	8	select DRM_KMS_CMA_HELPER

drivers/hid/hid-core.c+13−2

 	}
 }
+/*
+ * Compute the size of a report.
+ */
+static size_t hid_compute_report_size(struct hid_report *report)
+{
+	if (report->size)
+		return ((report->size - 1) >> 3) + 1;
+	return 0;
+}
 /*
  * Create a report. 'data' has to be allocated using
  * hid_alloc_report_buf() so that it has proper size.
 	if (report->id > 0)
 		*data++ = report->id;
-	memset(data, 0, ((report->size - 1) >> 3) + 1);
+	memset(data, 0, hid_compute_report_size(report));
 	for (n = 0; n < report->maxfield; n++)
 		hid_output_field(report->device, report->field[n], data);
 }
 		csize--;
 	}
-	rsize = ((report->size - 1) >> 3) + 1;
+	rsize = hid_compute_report_size(report);
 	if (report_enum->numbered && rsize >= HID_MAX_BUFFER_SIZE)
 		rsize = HID_MAX_BUFFER_SIZE - 1;

drivers/hid/hid-elan.c+2−0

 	ret = input_mt_init_slots(input, ELAN_MAX_FINGERS, INPUT_MT_POINTER);
 	if (ret) {
 		hid_err(hdev, "Failed to init elan MT slots: %d\n", ret);
+		input_free_device(input);
 		return ret;
 	}
 	if (ret) {
 		hid_err(hdev, "Failed to register elan input device: %d\n",
 			ret);
+		input_mt_destroy_slots(input);
 		input_free_device(input);
 		return ret;
 	}

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

 #define USB_DEVICE_ID_MS_POWER_COVER     0x07da
 #define USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER	0x02fd
 #define USB_DEVICE_ID_MS_PIXART_MOUSE    0x00cb
+#define USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS      0x02e0
 #define USB_VENDOR_ID_MOJO		0x8282
 #define USB_DEVICE_ID_RETRO_ADAPTER	0x3201
 #define USB_DEVICE_ID_SAITEK_RAT9	0x0cfa
 #define USB_DEVICE_ID_SAITEK_MMO7	0x0cd0
 #define USB_DEVICE_ID_SAITEK_X52	0x075c
+#define USB_DEVICE_ID_SAITEK_X52_2	0x0255
+#define USB_DEVICE_ID_SAITEK_X52_PRO	0x0762
 #define USB_VENDOR_ID_SAMSUNG		0x0419
 #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE	0x0001

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

 	}
 mapped:
+	/* Mapping failed, bail out */
+	if (!bit)
+		return;
 	if (device->driver->input_mapped &&
 	    device->driver->input_mapped(device, hidinput, field, usage,
 					 &bit, &max) < 0) {

drivers/hid/hid-microsoft.c+2−0

 		.driver_data = MS_SURFACE_DIAL },
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER),
 		.driver_data = MS_QUIRK_FF },
+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS),
+		.driver_data = MS_QUIRK_FF },
 	{ }
 };
 MODULE_DEVICE_TABLE(hid, ms_devices);

drivers/hid/hid-multitouch.c+2−0

@@ -856,6 +856,8 @@ static int mt_touch_input_mapping(struct hid_device hdev, struct hid_input hi, · 855 unmodified lines
856	code = BTN_0 + ((usage->hid - 1) & HID_USAGE);	856	code = BTN_0 + ((usage->hid - 1) & HID_USAGE);
857		857
858	hid_map_usage(hi, usage, bit, max, EV_KEY, code);	858	hid_map_usage(hi, usage, bit, max, EV_KEY, code);
		859	if (!*bit)
		860	return -1;
859	input_set_capability(hi->input, EV_KEY, code);	861	input_set_capability(hi->input, EV_KEY, code);
860	return 1;	862	return 1;
861		863

drivers/hid/hid-quirks.c+2−0

 	{ HID_USB_DEVICE(USB_VENDOR_ID_RETROUSB, USB_DEVICE_ID_RETROUSB_SNES_RETROPORT), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RUMBLEPAD), HID_QUIRK_BADPAD },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_X52), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_X52_2), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_X52_PRO), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SEMICO, USB_DEVICE_ID_SEMICO_USB_KEYKOARD2), HID_QUIRK_NO_INIT_REPORTS },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SEMICO, USB_DEVICE_ID_SEMICO_USB_KEYKOARD), HID_QUIRK_NO_INIT_REPORTS },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB), HID_QUIRK_NOGET },

drivers/i2c/algos/i2c-algo-pca.c+23−12

 		pca_outw(adap, I2C_PCA_INDPTR, I2C_PCA_IPRESET);
 		pca_outw(adap, I2C_PCA_IND, 0xA5);
 		pca_outw(adap, I2C_PCA_IND, 0x5A);
+		/*
+		 * After a reset we need to re-apply any configuration
+		 * (calculated in pca_init) to get the bus in a working state.
+		 */
+		pca_outw(adap, I2C_PCA_INDPTR, I2C_PCA_IMODE);
+		pca_outw(adap, I2C_PCA_IND, adap->bus_settings.mode);
+		pca_outw(adap, I2C_PCA_INDPTR, I2C_PCA_ISCLL);
+		pca_outw(adap, I2C_PCA_IND, adap->bus_settings.tlow);
+		pca_outw(adap, I2C_PCA_INDPTR, I2C_PCA_ISCLH);
+		pca_outw(adap, I2C_PCA_IND, adap->bus_settings.thi);
+		pca_set_con(adap, I2C_PCA_CON_ENSIO);
 	} else {
 		adap->reset_chip(adap->data);
+		pca_set_con(adap, I2C_PCA_CON_ENSIO | adap->bus_settings.clock_freq);
 	}
 }
 				" Use the nominal frequency.\n", adap->name);
 		}
-		pca_reset(pca_data);
 		clock = pca_clock(pca_data);
 		printk(KERN_INFO "%s: Clock frequency is %dkHz\n",
 		     adap->name, freqs[clock]);
-		pca_set_con(pca_data, I2C_PCA_CON_ENSIO | clock);
+		/* Store settings as these will be needed when the PCA chip is reset */
+		pca_data->bus_settings.clock_freq = clock;
+		pca_reset(pca_data);
 	} else {
 		int clock;
 		int mode;
 			thi = tlow * min_thi / min_tlow;
 		}
+		/* Store settings as these will be needed when the PCA chip is reset */
+		pca_data->bus_settings.mode = mode;
+		pca_data->bus_settings.tlow = tlow;
+		pca_data->bus_settings.thi = thi;
 		pca_reset(pca_data);
 		printk(KERN_INFO
 		     "%s: Clock frequency is %dHz\n", adap->name, clock * 100);
-		pca_outw(pca_data, I2C_PCA_INDPTR, I2C_PCA_IMODE);
-		pca_outw(pca_data, I2C_PCA_IND, mode);
-		pca_outw(pca_data, I2C_PCA_INDPTR, I2C_PCA_ISCLL);
-		pca_outw(pca_data, I2C_PCA_IND, tlow);
-		pca_outw(pca_data, I2C_PCA_INDPTR, I2C_PCA_ISCLH);
-		pca_outw(pca_data, I2C_PCA_IND, thi);
-		pca_set_con(pca_data, I2C_PCA_CON_ENSIO);
 	}
 	udelay(500); /* 500 us for oscillator to stabilise */

drivers/i2c/busses/i2c-npcm7xx.c+6−2

 		}
 	}
-	/* Adaptive TimeOut: astimated time in usec + 100% margin */
+	/*
-	timeout_usec = (2 * 10000 / bus->bus_freq) * (2 + nread + nwrite);
+	 * Adaptive TimeOut: estimated time in usec + 100% margin:
+	 * 2: double the timeout for clock stretching case
+	 * 9: bits per transaction (including the ack/nack)
+	 */
+	timeout_usec = (2 * 9 * USEC_PER_SEC / bus->bus_freq) * (2 + nread + nwrite);
 	timeout = max(msecs_to_jiffies(35), usecs_to_jiffies(timeout_usec));
 	if (nwrite >= 32 * 1024 || nread >= 32 * 1024) {
 		dev_err(bus->dev, "i2c%d buffer too big\n", bus->num);

drivers/iio/accel/bmc150-accel-core.c+12−3

 	struct mutex mutex;
 	u8 fifo_mode, watermark;
 	s16 buffer[8];
+	/*
+	 * Ensure there is sufficient space and correct alignment for
+	 * the timestamp if enabled
+	 */
+	struct {
+		__le16 channels[3];
+		s64 ts __aligned(8);
+	} scan;
 	u8 bw_bits;
 	u32 slope_dur;
 	u32 slope_thres;
 	 * now.
 	 */
 	for (i = 0; i < count; i++) {
-		u16 sample[8];
 		int j, bit;
 		j = 0;
 		for_each_set_bit(bit, indio_dev->active_scan_mask,
 				 indio_dev->masklength)
-			memcpy(&sample[j++], &buffer[i * 3 + bit], 2);
+			memcpy(&data->scan.channels[j++], &buffer[i * 3 + bit],
+			       sizeof(data->scan.channels[0]));
-		iio_push_to_buffers_with_timestamp(indio_dev, sample, tstamp);
+		iio_push_to_buffers_with_timestamp(indio_dev, &data->scan,
+						   tstamp);
 		tstamp += sample_period;
 	}

drivers/iio/accel/kxsd9.c+11−5

 	const struct iio_poll_func *pf = p;
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct kxsd9_state *st = iio_priv(indio_dev);
+	/*
+	 * Ensure correct positioning and alignment of timestamp.
+	 * No need to zero initialize as all elements written.
+	 */
+	struct {
+		__be16 chan[4];
+		s64 ts __aligned(8);
+	} hw_values;
 	int ret;
-	/* 4 * 16bit values AND timestamp */
-	__be16 hw_values[8];
 	ret = regmap_bulk_read(st->map,
 			       KXSD9_REG_X,
-			       &hw_values,
+			       hw_values.chan,
-			       8);
+			       sizeof(hw_values.chan));
 	if (ret) {
 		dev_err(st->dev,
 			"error reading data\n");
 	}
 	iio_push_to_buffers_with_timestamp(indio_dev,
-					   hw_values,
+					   &hw_values,
 					   iio_get_time_ns(indio_dev));
 	iio_trigger_notify_done(indio_dev->trig);

drivers/iio/accel/mma7455_core.c+12−4

 struct mma7455_data {
 	struct regmap *regmap;
+	/*
+	 * Used to reorganize data.  Will ensure correct alignment of
+	 * the timestamp if present
+	 */
+	struct {
+		__le16 channels[3];
+		s64 ts __aligned(8);
+	} scan;
 };
 static int mma7455_drdy(struct mma7455_data *mma7455)
 	struct iio_poll_func *pf = p;
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct mma7455_data *mma7455 = iio_priv(indio_dev);
-	u8 buf[16]; /* 3 x 16-bit channels + padding + ts */
 	int ret;
 	ret = mma7455_drdy(mma7455);
 	if (ret)
 		goto done;
-	ret = regmap_bulk_read(mma7455->regmap, MMA7455_REG_XOUTL, buf,
+	ret = regmap_bulk_read(mma7455->regmap, MMA7455_REG_XOUTL,
-			       sizeof(__le16) * 3);
+			       mma7455->scan.channels,
+			       sizeof(mma7455->scan.channels));
 	if (ret)
 		goto done;
-	iio_push_to_buffers_with_timestamp(indio_dev, buf,
+	iio_push_to_buffers_with_timestamp(indio_dev, &mma7455->scan,
 					   iio_get_time_ns(indio_dev));
 done:

drivers/iio/accel/mma8452.c+8−3

 	int sleep_val;
 	struct regulator *vdd_reg;
 	struct regulator *vddio_reg;
+	/* Ensure correct alignment of time stamp when present */
+	struct {
+		__be16 channels[3];
+		s64 ts __aligned(8);
+	} buffer;
 };
  /**
 	struct iio_poll_func *pf = p;
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct mma8452_data *data = iio_priv(indio_dev);
-	u8 buffer[16]; /* 3 16-bit channels + padding + ts */
 	int ret;
-	ret = mma8452_read(data, (__be16 *)buffer);
+	ret = mma8452_read(data, data->buffer.channels);
 	if (ret < 0)
 		goto done;
-	iio_push_to_buffers_with_timestamp(indio_dev, buffer,
+	iio_push_to_buffers_with_timestamp(indio_dev, &data->buffer,
 					   iio_get_time_ns(indio_dev));
 done:

drivers/iio/adc/Kconfig+2−0

 	tristate "Rockchip SARADC driver"
 	depends on ARCH_ROCKCHIP || (ARM && COMPILE_TEST)
 	depends on RESET_CONTROLLER
+	select IIO_BUFFER
+	select IIO_TRIGGERED_BUFFER
 	help
 	  Say yes here to build support for the SARADC found in SoCs from
 	  Rockchip.

drivers/iio/adc/ina2xx-adc.c+7−4

 	int range_vbus; /* Bus voltage maximum in V */
 	int pga_gain_vshunt; /* Shunt voltage PGA gain */
 	bool allow_async_readout;
+	/* data buffer needs space for channel data and timestamp */
+	struct {
+		u16 chan[4];
+		u64 ts __aligned(8);
+	} scan;
 };
 static const struct ina2xx_config ina2xx_config[] = {
 static int ina2xx_work_buffer(struct iio_dev *indio_dev)
 {
 	struct ina2xx_chip_info *chip = iio_priv(indio_dev);
-	/* data buffer needs space for channel data and timestap */
-	unsigned short data[4 + sizeof(s64)/sizeof(short)];
 	int bit, ret, i = 0;
 	s64 time;
 		if (ret < 0)
 			return ret;
-		data[i++] = val;
+		chip->scan.chan[i++] = val;
 	}
-	iio_push_to_buffers_with_timestamp(indio_dev, data, time);
+	iio_push_to_buffers_with_timestamp(indio_dev, &chip->scan, time);
 	return 0;
 };

drivers/iio/adc/max1118.c+7−3

 	struct spi_device *spi;
 	struct mutex lock;
 	struct regulator *reg;
+	/* Ensure natural alignment of buffer elements */
+	struct {
+		u8 channels[2];
+		s64 ts __aligned(8);
+	} scan;
 	u8 data ____cacheline_aligned;
 };
 	struct iio_poll_func *pf = p;
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct max1118 *adc = iio_priv(indio_dev);
-	u8 data[16] = { }; /* 2x 8-bit ADC data + padding + 8 bytes timestamp */
 	int scan_index;
 	int i = 0;
 			goto out;
 		}
-		data[i] = ret;
+		adc->scan.channels[i] = ret;
 		i++;
 	}
-	iio_push_to_buffers_with_timestamp(indio_dev, data,
+	iio_push_to_buffers_with_timestamp(indio_dev, &adc->scan,
 					   iio_get_time_ns(indio_dev));
 out:
 	mutex_unlock(&adc->lock);

drivers/iio/adc/mcp3422.c+10−6

 {
 	int ret;
-	mutex_lock(&adc->lock);
 	ret = i2c_master_send(adc->i2c, &newconfig, 1);
 	if (ret > 0) {
 		adc->config = newconfig;
 		ret = 0;
 	}
-	mutex_unlock(&adc->lock);
 	return ret;
 }
 	u8 config;
 	u8 req_channel = channel->channel;
+	mutex_lock(&adc->lock);
 	if (req_channel != MCP3422_CHANNEL(adc->config)) {
 		config = adc->config;
 		config &= ~MCP3422_CHANNEL_MASK;
 		config &= ~MCP3422_PGA_MASK;
 		config |= MCP3422_PGA_VALUE(adc->pga[req_channel]);
 		ret = mcp3422_update_config(adc, config);
-		if (ret < 0)
+		if (ret < 0) {
+			mutex_unlock(&adc->lock);
 			return ret;
+		}
 		msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]);
 	}
-	return mcp3422_read(adc, value, &config);
+	ret = mcp3422_read(adc, value, &config);
+	mutex_unlock(&adc->lock);
+	return ret;
 }
 static int mcp3422_read_raw(struct iio_dev *iio,

drivers/iio/adc/meson_saradc.c+1−1

@@ -707,7 +707,7 @@ static int meson_sar_adc_temp_sensor_init(struct iio_dev *indio_dev) · 706 unmodified lines
707	size_t read_len;	707	size_t read_len;
708	int ret;	708	int ret;
709		709
710	temperature_calib = devm_nvmem_cell_get(&indio_dev->dev,	710	temperature_calib = devm_nvmem_cell_get(indio_dev->dev.parent,
711	"temperature_calib");	711	"temperature_calib");
712	if (IS_ERR(temperature_calib)) {	712	if (IS_ERR(temperature_calib)) {
713	ret = PTR_ERR(temperature_calib);	713	ret = PTR_ERR(temperature_calib);

drivers/iio/adc/ti-adc081c.c+8−3

 	/* 8, 10 or 12 */
 	int bits;
+	/* Ensure natural alignment of buffer elements */
+	struct {
+		u16 channel;
+		s64 ts __aligned(8);
+	} scan;
 };
 #define REG_CONV_RES 0x00
 	struct iio_poll_func *pf = p;
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct adc081c *data = iio_priv(indio_dev);
-	u16 buf[8]; /* 2 bytes data + 6 bytes padding + 8 bytes timestamp */
 	int ret;
 	ret = i2c_smbus_read_word_swapped(data->i2c, REG_CONV_RES);
 	if (ret < 0)
 		goto out;
-	buf[0] = ret;
+	data->scan.channel = ret;
-	iio_push_to_buffers_with_timestamp(indio_dev, buf,
+	iio_push_to_buffers_with_timestamp(indio_dev, &data->scan,
 					   iio_get_time_ns(indio_dev));
 out:
 	iio_trigger_notify_done(indio_dev->trig);

drivers/iio/adc/ti-adc084s021.c+7−3

 	struct spi_transfer spi_trans;
 	struct regulator *reg;
 	struct mutex lock;
+	/* Buffer used to align data */
+	struct {
+		__be16 channels[4];
+		s64 ts __aligned(8);
+	} scan;
 	/*
 	 * DMA (thus cache coherency maintenance) requires the
 	 * transfer buffers to live in their own cache line.
 	struct iio_poll_func *pf = pollfunc;
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct adc084s021 *adc = iio_priv(indio_dev);
-	__be16 data[8] = {0}; /* 4 * 16-bit words of data + 8 bytes timestamp */
 	mutex_lock(&adc->lock);
-	if (adc084s021_adc_conversion(adc, &data) < 0)
+	if (adc084s021_adc_conversion(adc, adc->scan.channels) < 0)
 		dev_err(&adc->spi->dev, "Failed to read data\n");
-	iio_push_to_buffers_with_timestamp(indio_dev, data,
+	iio_push_to_buffers_with_timestamp(indio_dev, &adc->scan,
 					   iio_get_time_ns(indio_dev));
 	mutex_unlock(&adc->lock);
 	iio_trigger_notify_done(indio_dev->trig);

drivers/iio/adc/ti-ads1015.c+10−0

 	IIO_CHAN_SOFT_TIMESTAMP(ADS1015_TIMESTAMP),
 };
+#ifdef CONFIG_PM
 static int ads1015_set_power_state(struct ads1015_data *data, bool on)
 {
 	int ret;
 	return ret < 0 ? ret : 0;
 }
+#else /* !CONFIG_PM */
+static int ads1015_set_power_state(struct ads1015_data *data, bool on)
+{
+	return 0;
+}
+#endif /* !CONFIG_PM */
 static
 int ads1015_get_adc_result(struct ads1015_data *data, int chan, int *val)
 {

drivers/iio/chemical/ccs811.c+9−4

 	struct iio_trigger *drdy_trig;
 	struct gpio_desc *wakeup_gpio;
 	bool drdy_trig_on;
+	/* Ensures correct alignment of timestamp if present */
+	struct {
+		s16 channels[2];
+		s64 ts __aligned(8);
+	} scan;
 };
 static const struct iio_chan_spec ccs811_channels[] = {
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct ccs811_data *data = iio_priv(indio_dev);
 	struct i2c_client *client = data->client;
-	s16 buf[8]; /* s16 eCO2 + s16 TVOC + padding + 8 byte timestamp */
 	int ret;
-	ret = i2c_smbus_read_i2c_block_data(client, CCS811_ALG_RESULT_DATA, 4,
+	ret = i2c_smbus_read_i2c_block_data(client, CCS811_ALG_RESULT_DATA,
-					    (u8 *)&buf);
+					    sizeof(data->scan.channels),
+					    (u8 *)data->scan.channels);
 	if (ret != 4) {
 		dev_err(&client->dev, "cannot read sensor data\n");
 		goto err;
 	}
-	iio_push_to_buffers_with_timestamp(indio_dev, buf,
+	iio_push_to_buffers_with_timestamp(indio_dev, &data->scan,
 					   iio_get_time_ns(indio_dev));
 err:

drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c+4−1

 	switch (type) {
 	case MOTIONSENSE_TYPE_ACCEL:
-	case MOTIONSENSE_TYPE_GYRO:
 		*min_freq = 12500;
 		*max_freq = 100000;
 		break;
+	case MOTIONSENSE_TYPE_GYRO:
+		*min_freq = 25000;
+		*max_freq = 100000;
+		break;
 	case MOTIONSENSE_TYPE_MAG:
 		*min_freq = 5000;
 		*max_freq = 25000;

drivers/iio/light/ltr501.c+9−6

 	struct iio_poll_func *pf = p;
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct ltr501_data *data = iio_priv(indio_dev);
-	u16 buf[8];
+	struct {
+		u16 channels[3];
+		s64 ts __aligned(8);
+	} scan;
 	__le16 als_buf[2];
 	u8 mask = 0;
 	int j = 0;
 	int ret, psdata;
-	memset(buf, 0, sizeof(buf));
+	memset(&scan, 0, sizeof(scan));
 	/* figure out which data needs to be ready */
 	if (test_bit(0, indio_dev->active_scan_mask) ||
 		if (ret < 0)
 			return ret;
 		if (test_bit(0, indio_dev->active_scan_mask))
-			buf[j++] = le16_to_cpu(als_buf[1]);
+			scan.channels[j++] = le16_to_cpu(als_buf[1]);
 		if (test_bit(1, indio_dev->active_scan_mask))
-			buf[j++] = le16_to_cpu(als_buf[0]);
+			scan.channels[j++] = le16_to_cpu(als_buf[0]);
 	}
 	if (mask & LTR501_STATUS_PS_RDY) {
 				       &psdata, 2);
 		if (ret < 0)
 			goto done;
-		buf[j++] = psdata & LTR501_PS_DATA_MASK;
+		scan.channels[j++] = psdata & LTR501_PS_DATA_MASK;
 	}
-	iio_push_to_buffers_with_timestamp(indio_dev, buf,
+	iio_push_to_buffers_with_timestamp(indio_dev, &scan,
 					   iio_get_time_ns(indio_dev));
 done:

drivers/iio/light/max44000.c+8−4

 struct max44000_data {
 	struct mutex lock;
 	struct regmap *regmap;
+	/* Ensure naturally aligned timestamp */
+	struct {
+		u16 channels[2];
+		s64 ts __aligned(8);
+	} scan;
 };
 /* Default scale is set to the minimum of 0.03125 or 1 / (1 << 5) lux */
 	struct iio_poll_func *pf = p;
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct max44000_data *data = iio_priv(indio_dev);
-	u16 buf[8]; /* 2x u16 + padding + 8 bytes timestamp */
 	int index = 0;
 	unsigned int regval;
 	int ret;
 		ret = max44000_read_alsval(data);
 		if (ret < 0)
 			goto out_unlock;
-		buf[index++] = ret;
+		data->scan.channels[index++] = ret;
 	}
 	if (test_bit(MAX44000_SCAN_INDEX_PRX, indio_dev->active_scan_mask)) {
 		ret = regmap_read(data->regmap, MAX44000_REG_PRX_DATA, &regval);
 		if (ret < 0)
 			goto out_unlock;
-		buf[index] = regval;
+		data->scan.channels[index] = regval;
 	}
 	mutex_unlock(&data->lock);
-	iio_push_to_buffers_with_timestamp(indio_dev, buf,
+	iio_push_to_buffers_with_timestamp(indio_dev, &data->scan,
 					   iio_get_time_ns(indio_dev));
 	iio_trigger_notify_done(indio_dev->trig);
 	return IRQ_HANDLED;

drivers/iio/magnetometer/ak8975.c+11−5

 	struct iio_mount_matrix orientation;
 	struct regulator	*vdd;
 	struct regulator	*vid;
+	/* Ensure natural alignment of timestamp */
+	struct {
+		s16 channels[3];
+		s64 ts __aligned(8);
+	} scan;
 };
 /* Enable attached power regulator if any. */
 	const struct i2c_client *client = data->client;
 	const struct ak_def *def = data->def;
 	int ret;
-	s16 buff[8]; /* 3 x 16 bits axis values + 1 aligned 64 bits timestamp */
 	__le16 fval[3];
 	mutex_lock(&data->lock);
 	mutex_unlock(&data->lock);
 	/* Clamp to valid range. */
-	buff[0] = clamp_t(s16, le16_to_cpu(fval[0]), -def->range, def->range);
+	data->scan.channels[0] = clamp_t(s16, le16_to_cpu(fval[0]), -def->range, def->range);
-	buff[1] = clamp_t(s16, le16_to_cpu(fval[1]), -def->range, def->range);
+	data->scan.channels[1] = clamp_t(s16, le16_to_cpu(fval[1]), -def->range, def->range);
-	buff[2] = clamp_t(s16, le16_to_cpu(fval[2]), -def->range, def->range);
+	data->scan.channels[2] = clamp_t(s16, le16_to_cpu(fval[2]), -def->range, def->range);
-	iio_push_to_buffers_with_timestamp(indio_dev, buff,
+	iio_push_to_buffers_with_timestamp(indio_dev, &data->scan,
 					   iio_get_time_ns(indio_dev));
 	return;
 unlock:

drivers/iio/proximity/mb1232.c+9−8

 	 */
 	struct completion	ranging;
 	int			irqnr;
+	/* Ensure correct alignment of data to push to IIO buffer */
+	struct {
+		s16 distance;
+		s64 ts __aligned(8);
+	} scan;
 };
 static irqreturn_t mb1232_handle_irq(int irq, void *dev_id)
 	struct iio_poll_func *pf = p;
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct mb1232_data *data = iio_priv(indio_dev);
-	/*
-	 * triggered buffer
-	 * 16-bit channel + 48-bit padding + 64-bit timestamp
-	 */
-	s16 buffer[8] = { 0 };
-	buffer[0] = mb1232_read_distance(data);
+	data->scan.distance = mb1232_read_distance(data);
-	if (buffer[0] < 0)
+	if (data->scan.distance < 0)
 		goto err;
-	iio_push_to_buffers_with_timestamp(indio_dev, buffer, pf->timestamp);
+	iio_push_to_buffers_with_timestamp(indio_dev, &data->scan,
+					   pf->timestamp);
 err:
 	iio_trigger_notify_done(indio_dev->trig);

drivers/infiniband/core/cq.c+2−2

@@ -379,7 +379,7 @@ static int ib_alloc_cqs(struct ib_device *dev, unsigned int nr_cqes, · 378 unmodified lines
379	{	379	{
380	LIST_HEAD(tmp_list);	380	LIST_HEAD(tmp_list);
381	unsigned int nr_cqs, i;	381	unsigned int nr_cqs, i;
382	struct ib_cq *cq;	382	struct ib_cq cq, n;
383	int ret;	383	int ret;
384		384
385	if (poll_ctx > IB_POLL_LAST_POOL_TYPE) {	385	if (poll_ctx > IB_POLL_LAST_POOL_TYPE) {
@@ -412,7 +412,7 @@ static int ib_alloc_cqs(struct ib_device *dev, unsigned int nr_cqes, · 26 unmodified lines
412	return 0;	412	return 0;
413		413
414	out_free_cqs:	414	out_free_cqs:
415	list_for_each_entry(cq, &tmp_list, pool_entry) {	415	list_for_each_entry_safe(cq, n, &tmp_list, pool_entry) {
416	cq->shared = false;	416	cq->shared = false;
417	ib_free_cq(cq);	417	ib_free_cq(cq);
418	}	418	}

drivers/infiniband/core/verbs.c+1−1

@@ -1801,7 +1801,7 @@ int ib_get_eth_speed(struct ib_device dev, u8 port_num, u8 speed, u8 *width) · 1800 unmodified lines
1801		1801
1802	dev_put(netdev);	1802	dev_put(netdev);
1803		1803
1804	if (!rc) {	1804	if (!rc && lksettings.base.speed != (u32)SPEED_UNKNOWN) {
1805	netdev_speed = lksettings.base.speed;	1805	netdev_speed = lksettings.base.speed;
1806	} else {	1806	} else {
1807	netdev_speed = SPEED_1000;	1807	netdev_speed = SPEED_1000;

drivers/infiniband/hw/bnxt_re/ib_verbs.c+29−14

 	gsi_sqp = rdev->gsi_ctx.gsi_sqp;
 	gsi_sah = rdev->gsi_ctx.gsi_sah;
-	/* remove from active qp list */
-	mutex_lock(&rdev->qp_lock);
-	list_del(&gsi_sqp->list);
-	mutex_unlock(&rdev->qp_lock);
-	atomic_dec(&rdev->qp_count);
 	ibdev_dbg(&rdev->ibdev, "Destroy the shadow AH\n");
 	bnxt_qplib_destroy_ah(&rdev->qplib_res,
 			      &gsi_sah->qplib_ah,
 	}
 	bnxt_qplib_free_qp_res(&rdev->qplib_res, &gsi_sqp->qplib_qp);
+	/* remove from active qp list */
+	mutex_lock(&rdev->qp_lock);
+	list_del(&gsi_sqp->list);
+	mutex_unlock(&rdev->qp_lock);
+	atomic_dec(&rdev->qp_count);
 	kfree(rdev->gsi_ctx.sqp_tbl);
 	kfree(gsi_sah);
 	kfree(gsi_sqp);
 	unsigned int flags;
 	int rc;
-	mutex_lock(&rdev->qp_lock);
-	list_del(&qp->list);
-	mutex_unlock(&rdev->qp_lock);
-	atomic_dec(&rdev->qp_count);
 	bnxt_qplib_flush_cqn_wq(&qp->qplib_qp);
 	rc = bnxt_qplib_destroy_qp(&rdev->qplib_res, &qp->qplib_qp);
 			goto sh_fail;
 	}
+	mutex_lock(&rdev->qp_lock);
+	list_del(&qp->list);
+	mutex_unlock(&rdev->qp_lock);
+	atomic_dec(&rdev->qp_count);
 	ib_umem_release(qp->rumem);
 	ib_umem_release(qp->sumem);
 	wc->wc_flags |= IB_WC_GRH;
 }
+static bool bnxt_re_check_if_vlan_valid(struct bnxt_re_dev *rdev,
+					u16 vlan_id)
+{
+	/*
+	 * Check if the vlan is configured in the host.  If not configured, it
+	 * can be a transparent VLAN. So dont report the vlan id.
+	 */
+	if (!__vlan_find_dev_deep_rcu(rdev->netdev,
+				      htons(ETH_P_8021Q), vlan_id))
+		return false;
+	return true;
+}
 static bool bnxt_re_is_vlan_pkt(struct bnxt_qplib_cqe *orig_cqe,
 				u16 *vid, u8 *sl)
 {
 	wc->src_qp = orig_cqe->src_qp;
 	memcpy(wc->smac, orig_cqe->smac, ETH_ALEN);
 	if (bnxt_re_is_vlan_pkt(orig_cqe, &vlan_id, &sl)) {
-		wc->vlan_id = vlan_id;
+		if (bnxt_re_check_if_vlan_valid(rdev, vlan_id)) {
-		wc->sl = sl;
+			wc->vlan_id = vlan_id;
-		wc->wc_flags |= IB_WC_WITH_VLAN;
+			wc->sl = sl;
+			wc->wc_flags |= IB_WC_WITH_VLAN;
+		}
 	}
 	wc->port_num = 1;
 	wc->vendor_err = orig_cqe->status;

drivers/infiniband/hw/bnxt_re/main.c+1−4

 static int bnxt_re_alloc_res(struct bnxt_re_dev *rdev)
 {
 	struct bnxt_re_ring_attr rattr = {};
-	struct bnxt_qplib_ctx *qplib_ctx;
 	int num_vec_created = 0;
 	int rc = 0, i;
 	u8 type;
 	if (rc)
 		goto dealloc_res;
-	qplib_ctx = &rdev->qplib_ctx;
 	for (i = 0; i < rdev->num_msix - 1; i++) {
 		struct bnxt_qplib_nq *nq;
 		nq = &rdev->nq[i];
-		nq->hwq.max_elements = (qplib_ctx->cq_count +
+		nq->hwq.max_elements = BNXT_QPLIB_NQE_MAX_CNT;
-					qplib_ctx->srqc_count + 2);
 		rc = bnxt_qplib_alloc_nq(&rdev->qplib_res, &rdev->nq[i]);
 		if (rc) {
 			ibdev_err(&rdev->ibdev, "Alloc Failed NQ%d rc:%#x",

drivers/infiniband/hw/bnxt_re/qplib_fp.c+16−10

 	u16 cmd_flags = 0;
 	u32 qp_flags = 0;
 	u8 pg_sz_lvl;
+	u32 tbl_indx;
 	int rc;
 	RCFW_CMD_PREP(req, CREATE_QP1, cmd_flags);
 		rq->dbinfo.db = qp->dpi->dbr;
 		rq->dbinfo.max_slot = bnxt_qplib_set_rq_max_slot(rq->wqe_size);
 	}
-	rcfw->qp_tbl[qp->id].qp_id = qp->id;
+	tbl_indx = map_qp_id_to_tbl_indx(qp->id, rcfw);
-	rcfw->qp_tbl[qp->id].qp_handle = (void *)qp;
+	rcfw->qp_tbl[tbl_indx].qp_id = qp->id;
+	rcfw->qp_tbl[tbl_indx].qp_handle = (void *)qp;
 	return 0;
 	sq = &qp->sq;
 	hwq = &sq->hwq;
+	/* First psn entry */
 	fpsne = (u64)bnxt_qplib_get_qe(hwq, hwq->depth, &psn_pg);
 	if (!IS_ALIGNED(fpsne, PAGE_SIZE))
-		indx_pad = ALIGN(fpsne, PAGE_SIZE) / size;
+		indx_pad = (fpsne & ~PAGE_MASK) / size;
 	hwq->pad_pgofft = indx_pad;
 	hwq->pad_pg = (u64 *)psn_pg;
 	hwq->pad_stride = size;
 	u16 cmd_flags = 0;
 	u32 qp_flags = 0;
 	u8 pg_sz_lvl;
+	u32 tbl_indx;
 	u16 nsge;
 	RCFW_CMD_PREP(req, CREATE_QP, cmd_flags);
 		rq->dbinfo.db = qp->dpi->dbr;
 		rq->dbinfo.max_slot = bnxt_qplib_set_rq_max_slot(rq->wqe_size);
 	}
-	rcfw->qp_tbl[qp->id].qp_id = qp->id;
+	tbl_indx = map_qp_id_to_tbl_indx(qp->id, rcfw);
-	rcfw->qp_tbl[qp->id].qp_handle = (void *)qp;
+	rcfw->qp_tbl[tbl_indx].qp_id = qp->id;
+	rcfw->qp_tbl[tbl_indx].qp_handle = (void *)qp;
 	return 0;
 fail:
 	struct cmdq_destroy_qp req;
 	struct creq_destroy_qp_resp resp;
 	u16 cmd_flags = 0;
+	u32 tbl_indx;
 	int rc;
-	rcfw->qp_tbl[qp->id].qp_id = BNXT_QPLIB_QP_ID_INVALID;
+	tbl_indx = map_qp_id_to_tbl_indx(qp->id, rcfw);
-	rcfw->qp_tbl[qp->id].qp_handle = NULL;
+	rcfw->qp_tbl[tbl_indx].qp_id = BNXT_QPLIB_QP_ID_INVALID;
+	rcfw->qp_tbl[tbl_indx].qp_handle = NULL;
 	RCFW_CMD_PREP(req, DESTROY_QP, cmd_flags);
 	rc = bnxt_qplib_rcfw_send_message(rcfw, (void *)&req,
 					  (void *)&resp, NULL, 0);
 	if (rc) {
-		rcfw->qp_tbl[qp->id].qp_id = qp->id;
+		rcfw->qp_tbl[tbl_indx].qp_id = qp->id;
-		rcfw->qp_tbl[qp->id].qp_handle = qp;
+		rcfw->qp_tbl[tbl_indx].qp_handle = qp;
 		return rc;
 	}

drivers/infiniband/hw/bnxt_re/qplib_rcfw.c+6−4

 	__le16  mcookie;
 	u16 cookie;
 	int rc = 0;
-	u32 qp_id;
+	u32 qp_id, tbl_indx;
 	pdev = rcfw->pdev;
 	switch (qp_event->event) {
 	case CREQ_QP_EVENT_EVENT_QP_ERROR_NOTIFICATION:
 		err_event = (struct creq_qp_error_notification *)qp_event;
 		qp_id = le32_to_cpu(err_event->xid);
-		qp = rcfw->qp_tbl[qp_id].qp_handle;
+		tbl_indx = map_qp_id_to_tbl_indx(qp_id, rcfw);
+		qp = rcfw->qp_tbl[tbl_indx].qp_handle;
 		dev_dbg(&pdev->dev, "Received QP error notification\n");
 		dev_dbg(&pdev->dev,
 			"qpid 0x%x, req_err=0x%x, resp_err=0x%x\n",
 	cmdq->bmap_size = bmap_size;
-	rcfw->qp_tbl_size = qp_tbl_sz;
+	/* Allocate one extra to hold the QP1 entries */
-	rcfw->qp_tbl = kcalloc(qp_tbl_sz, sizeof(struct bnxt_qplib_qp_node),
+	rcfw->qp_tbl_size = qp_tbl_sz + 1;
+	rcfw->qp_tbl = kcalloc(rcfw->qp_tbl_size, sizeof(struct bnxt_qplib_qp_node),
 			       GFP_KERNEL);
 	if (!rcfw->qp_tbl)
 		goto fail;

drivers/infiniband/hw/bnxt_re/qplib_rcfw.h+5−0

@@ -216,4 +216,9 @@ int bnxt_qplib_deinit_rcfw(struct bnxt_qplib_rcfw *rcfw); · 215 unmodified lines
216	int bnxt_qplib_init_rcfw(struct bnxt_qplib_rcfw *rcfw,	216	int bnxt_qplib_init_rcfw(struct bnxt_qplib_rcfw *rcfw,
217	struct bnxt_qplib_ctx *ctx, int is_virtfn);	217	struct bnxt_qplib_ctx *ctx, int is_virtfn);
218	void bnxt_qplib_mark_qp_error(void *qp_handle);	218	void bnxt_qplib_mark_qp_error(void *qp_handle);
		219	static inline u32 map_qp_id_to_tbl_indx(u32 qid, struct bnxt_qplib_rcfw *rcfw)
		220	{
		221	/* Last index of the qp_tbl is for QP1 ie. qp_tbl_size - 1*/
		222	return (qid == 1) ? rcfw->qp_tbl_size - 1 : qid % rcfw->qp_tbl_size - 2;
		223	}
219	#endif /* __BNXT_QPLIB_RCFW_H__ */	224	#endif /* __BNXT_QPLIB_RCFW_H__ */

drivers/infiniband/hw/bnxt_re/qplib_sp.c+1−1

@@ -149,7 +149,7 @@ int bnxt_qplib_get_dev_attr(struct bnxt_qplib_rcfw *rcfw, · 148 unmodified lines
149	attr->max_inline_data = le32_to_cpu(sb->max_inline_data);	149	attr->max_inline_data = le32_to_cpu(sb->max_inline_data);
150	attr->l2_db_size = (sb->l2_db_space_size + 1) *	150	attr->l2_db_size = (sb->l2_db_space_size + 1) *
151	(0x01 << RCFW_DBR_BASE_PAGE_SHIFT);	151	(0x01 << RCFW_DBR_BASE_PAGE_SHIFT);
152	attr->max_sgid = le32_to_cpu(sb->max_gid);	152	attr->max_sgid = BNXT_QPLIB_NUM_GIDS_SUPPORTED;
153		153
154	bnxt_qplib_query_version(rcfw, attr->fw_ver);	154	bnxt_qplib_query_version(rcfw, attr->fw_ver);
155		155

drivers/infiniband/hw/bnxt_re/qplib_sp.h+1−0

@@ -47,6 +47,7 @@ · 46 unmodified lines
47	struct bnxt_qplib_dev_attr {	47	struct bnxt_qplib_dev_attr {
48	#define FW_VER_ARR_LEN 4	48	#define FW_VER_ARR_LEN 4
49	u8 fw_ver[FW_VER_ARR_LEN];	49	u8 fw_ver[FW_VER_ARR_LEN];
		50	#define BNXT_QPLIB_NUM_GIDS_SUPPORTED 256
50	u16 max_sgid;	51	u16 max_sgid;
51	u16 max_mrw;	52	u16 max_mrw;
52	u32 max_qp;	53	u32 max_qp;

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

 	props->ip_gids = true;
 	props->gid_tbl_len	= mdev->dev->caps.gid_table_len[port];
 	props->max_msg_sz	= mdev->dev->caps.max_msg_sz;
-	props->pkey_tbl_len	= 1;
+	if (mdev->dev->caps.pkey_table_len[port])
+		props->pkey_tbl_len = 1;
 	props->max_mtu		= IB_MTU_4096;
 	props->max_vl_num	= 2;
 	props->state		= IB_PORT_DOWN;

drivers/infiniband/sw/rxe/rxe.c+4−0

 MODULE_DESCRIPTION("Soft RDMA transport");
 MODULE_LICENSE("Dual BSD/GPL");
+bool rxe_initialized;
 /* free resources for a rxe device all objects created for this device must
  * have been destroyed
  */
 		return err;
 	rdma_link_register(&rxe_link_ops);
+	rxe_initialized = true;
 	pr_info("loaded\n");
 	return 0;
 }
 	rxe_net_exit();
 	rxe_cache_exit();
+	rxe_initialized = false;
 	pr_info("unloaded\n");
 }

drivers/infiniband/sw/rxe/rxe.h+2−0

@@ -67,6 +67,8 @@ · 66 unmodified lines
67		67
68	#define RXE_ROCE_V2_SPORT (0xc000)	68	#define RXE_ROCE_V2_SPORT (0xc000)
69		69
		70	extern bool rxe_initialized;
		71
70	static inline u32 rxe_crc32(struct rxe_dev *rxe,	72	static inline u32 rxe_crc32(struct rxe_dev *rxe,
71	u32 crc, void *next, size_t len)	73	u32 crc, void *next, size_t len)
72	{	74	{

drivers/infiniband/sw/rxe/rxe_mr.c+1−0

@@ -205,6 +205,7 @@ int rxe_mem_init_user(struct rxe_pd *pd, u64 start, · 204 unmodified lines
205	vaddr = page_address(sg_page_iter_page(&sg_iter));	205	vaddr = page_address(sg_page_iter_page(&sg_iter));
206	if (!vaddr) {	206	if (!vaddr) {
207	pr_warn("null vaddr\n");	207	pr_warn("null vaddr\n");
		208	ib_umem_release(umem);
208	err = -ENOMEM;	209	err = -ENOMEM;
209	goto err1;	210	goto err1;
210	}	211	}

drivers/infiniband/sw/rxe/rxe_sysfs.c+5−0

 	struct net_device *ndev;
 	struct rxe_dev *exists;
+	if (!rxe_initialized) {
+		pr_err("Module parameters are not supported, use rdma link add or rxe_cfg\n");
+		return -EAGAIN;
+	}
 	len = sanitize_arg(val, intf, sizeof(intf));
 	if (!len) {
 		pr_err("add: invalid interface name\n");

drivers/infiniband/sw/rxe/rxe_verbs.c+1−1

@@ -1056,7 +1056,7 @@ static ssize_t parent_show(struct device *device, · 1055 unmodified lines
1056	struct rxe_dev *rxe =	1056	struct rxe_dev *rxe =
1057	rdma_device_to_drv_device(device, struct rxe_dev, ib_dev);	1057	rdma_device_to_drv_device(device, struct rxe_dev, ib_dev);
1058		1058
1059	return snprintf(buf, 16, "%s\n", rxe_parent_name(rxe, 1));	1059	return scnprintf(buf, PAGE_SIZE, "%s\n", rxe_parent_name(rxe, 1));
1060	}	1060	}
1061		1061
1062	static DEVICE_ATTR_RO(parent);	1062	static DEVICE_ATTR_RO(parent);

drivers/infiniband/ulp/isert/ib_isert.c+47−46

 	rx_desc = isert_conn->rx_descs;
 	for (i = 0; i < ISERT_QP_MAX_RECV_DTOS; i++, rx_desc++)  {
-		dma_addr = ib_dma_map_single(ib_dev, (void *)rx_desc,
+		dma_addr = ib_dma_map_single(ib_dev, rx_desc->buf,
-					ISER_RX_PAYLOAD_SIZE, DMA_FROM_DEVICE);
+					ISER_RX_SIZE, DMA_FROM_DEVICE);
 		if (ib_dma_mapping_error(ib_dev, dma_addr))
 			goto dma_map_fail;
 		rx_desc->dma_addr = dma_addr;
 		rx_sg = &rx_desc->rx_sg;
-		rx_sg->addr = rx_desc->dma_addr;
+		rx_sg->addr = rx_desc->dma_addr + isert_get_hdr_offset(rx_desc);
 		rx_sg->length = ISER_RX_PAYLOAD_SIZE;
 		rx_sg->lkey = device->pd->local_dma_lkey;
 		rx_desc->rx_cqe.done = isert_recv_done;
 	rx_desc = isert_conn->rx_descs;
 	for (j = 0; j < i; j++, rx_desc++) {
 		ib_dma_unmap_single(ib_dev, rx_desc->dma_addr,
-				    ISER_RX_PAYLOAD_SIZE, DMA_FROM_DEVICE);
+				    ISER_RX_SIZE, DMA_FROM_DEVICE);
 	}
 	kfree(isert_conn->rx_descs);
 	isert_conn->rx_descs = NULL;
 	rx_desc = isert_conn->rx_descs;
 	for (i = 0; i < ISERT_QP_MAX_RECV_DTOS; i++, rx_desc++)  {
 		ib_dma_unmap_single(ib_dev, rx_desc->dma_addr,
-				    ISER_RX_PAYLOAD_SIZE, DMA_FROM_DEVICE);
+				    ISER_RX_SIZE, DMA_FROM_DEVICE);
 	}
 	kfree(isert_conn->rx_descs);
 			    ISER_RX_PAYLOAD_SIZE, DMA_TO_DEVICE);
 	kfree(isert_conn->login_rsp_buf);
-	ib_dma_unmap_single(ib_dev, isert_conn->login_req_dma,
+	ib_dma_unmap_single(ib_dev, isert_conn->login_desc->dma_addr,
-			    ISER_RX_PAYLOAD_SIZE,
+			    ISER_RX_SIZE, DMA_FROM_DEVICE);
-			    DMA_FROM_DEVICE);
+	kfree(isert_conn->login_desc);
-	kfree(isert_conn->login_req_buf);
 }
 static int
 {
 	int ret;
-	isert_conn->login_req_buf = kzalloc(sizeof(*isert_conn->login_req_buf),
+	isert_conn->login_desc = kzalloc(sizeof(*isert_conn->login_desc),
 			GFP_KERNEL);
-	if (!isert_conn->login_req_buf)
+	if (!isert_conn->login_desc)
 		return -ENOMEM;
-	isert_conn->login_req_dma = ib_dma_map_single(ib_dev,
+	isert_conn->login_desc->dma_addr = ib_dma_map_single(ib_dev,
-				isert_conn->login_req_buf,
+				isert_conn->login_desc->buf,
-				ISER_RX_PAYLOAD_SIZE, DMA_FROM_DEVICE);
+				ISER_RX_SIZE, DMA_FROM_DEVICE);
-	ret = ib_dma_mapping_error(ib_dev, isert_conn->login_req_dma);
+	ret = ib_dma_mapping_error(ib_dev, isert_conn->login_desc->dma_addr);
 	if (ret) {
-		isert_err("login_req_dma mapping error: %d\n", ret);
+		isert_err("login_desc dma mapping error: %d\n", ret);
-		isert_conn->login_req_dma = 0;
+		isert_conn->login_desc->dma_addr = 0;
-		goto out_free_login_req_buf;
+		goto out_free_login_desc;
 	}
 	isert_conn->login_rsp_buf = kzalloc(ISER_RX_PAYLOAD_SIZE, GFP_KERNEL);
 	if (!isert_conn->login_rsp_buf) {
 		ret = -ENOMEM;
-		goto out_unmap_login_req_buf;
+		goto out_unmap_login_desc;
 	}
 	isert_conn->login_rsp_dma = ib_dma_map_single(ib_dev,
 out_free_login_rsp_buf:
 	kfree(isert_conn->login_rsp_buf);
-out_unmap_login_req_buf:
+out_unmap_login_desc:
-	ib_dma_unmap_single(ib_dev, isert_conn->login_req_dma,
+	ib_dma_unmap_single(ib_dev, isert_conn->login_desc->dma_addr,
-			    ISER_RX_PAYLOAD_SIZE, DMA_FROM_DEVICE);
+			    ISER_RX_SIZE, DMA_FROM_DEVICE);
-out_free_login_req_buf:
+out_free_login_desc:
-	kfree(isert_conn->login_req_buf);
+	kfree(isert_conn->login_desc);
 	return ret;
 }
 	if (isert_conn->qp)
 		isert_destroy_qp(isert_conn);
-	if (isert_conn->login_req_buf)
+	if (isert_conn->login_desc)
 		isert_free_login_buf(isert_conn);
 	isert_device_put(device);
 	int ret;
 	memset(&sge, 0, sizeof(struct ib_sge));
-	sge.addr = isert_conn->login_req_dma;
+	sge.addr = isert_conn->login_desc->dma_addr +
+		isert_get_hdr_offset(isert_conn->login_desc);
 	sge.length = ISER_RX_PAYLOAD_SIZE;
 	sge.lkey = isert_conn->device->pd->local_dma_lkey;
 	isert_dbg("Setup sge: addr: %llx length: %d 0x%08x\n",
 		sge.addr, sge.length, sge.lkey);
-	isert_conn->login_req_buf->rx_cqe.done = isert_login_recv_done;
+	isert_conn->login_desc->rx_cqe.done = isert_login_recv_done;
 	memset(&rx_wr, 0, sizeof(struct ib_recv_wr));
-	rx_wr.wr_cqe = &isert_conn->login_req_buf->rx_cqe;
+	rx_wr.wr_cqe = &isert_conn->login_desc->rx_cqe;
 	rx_wr.sg_list = &sge;
 	rx_wr.num_sge = 1;
 static void
 isert_rx_login_req(struct isert_conn *isert_conn)
 {
-	struct iser_rx_desc *rx_desc = isert_conn->login_req_buf;
+	struct iser_rx_desc *rx_desc = isert_conn->login_desc;
 	int rx_buflen = isert_conn->login_req_len;
 	struct iscsi_conn *conn = isert_conn->conn;
 	struct iscsi_login *login = conn->conn_login;
 	if (login->first_request) {
 		struct iscsi_login_req *login_req =
-			(struct iscsi_login_req *)&rx_desc->iscsi_header;
+			(struct iscsi_login_req *)isert_get_iscsi_hdr(rx_desc);
 		/*
 		 * Setup the initial iscsi_login values from the leading
 		 * login request PDU.
 		login->tsih		= be16_to_cpu(login_req->tsih);
 	}
-	memcpy(&login->req[0], (void *)&rx_desc->iscsi_header, ISCSI_HDR_LEN);
+	memcpy(&login->req[0], isert_get_iscsi_hdr(rx_desc), ISCSI_HDR_LEN);
 	size = min(rx_buflen, MAX_KEY_VALUE_PAIRS);
 	isert_dbg("Using login payload size: %d, rx_buflen: %d "
 		  "MAX_KEY_VALUE_PAIRS: %d\n", size, rx_buflen,
 		  MAX_KEY_VALUE_PAIRS);
-	memcpy(login->req_buf, &rx_desc->data[0], size);
+	memcpy(login->req_buf, isert_get_data(rx_desc), size);
 	if (login->first_request) {
 		complete(&isert_conn->login_comp);
 	if (imm_data_len != data_len) {
 		sg_nents = max(1UL, DIV_ROUND_UP(imm_data_len, PAGE_SIZE));
 		sg_copy_from_buffer(cmd->se_cmd.t_data_sg, sg_nents,
-				    &rx_desc->data[0], imm_data_len);
+				    isert_get_data(rx_desc), imm_data_len);
 		isert_dbg("Copy Immediate sg_nents: %u imm_data_len: %d\n",
 			  sg_nents, imm_data_len);
 	} else {
 		sg_init_table(&isert_cmd->sg, 1);
 		cmd->se_cmd.t_data_sg = &isert_cmd->sg;
 		cmd->se_cmd.t_data_nents = 1;
-		sg_set_buf(&isert_cmd->sg, &rx_desc->data[0], imm_data_len);
+		sg_set_buf(&isert_cmd->sg, isert_get_data(rx_desc),
+				imm_data_len);
 		isert_dbg("Transfer Immediate imm_data_len: %d\n",
 			  imm_data_len);
 	}
 	}
 	isert_dbg("Copying DataOut: sg_start: %p, sg_off: %u "
 		  "sg_nents: %u from %p %u\n", sg_start, sg_off,
-		  sg_nents, &rx_desc->data[0], unsol_data_len);
+		  sg_nents, isert_get_data(rx_desc), unsol_data_len);
-	sg_copy_from_buffer(sg_start, sg_nents, &rx_desc->data[0],
+	sg_copy_from_buffer(sg_start, sg_nents, isert_get_data(rx_desc),
 			    unsol_data_len);
 	rc = iscsit_check_dataout_payload(cmd, hdr, false);
 	}
 	cmd->text_in_ptr = text_in;
-	memcpy(cmd->text_in_ptr, &rx_desc->data[0], payload_length);
+	memcpy(cmd->text_in_ptr, isert_get_data(rx_desc), payload_length);
 	return iscsit_process_text_cmd(conn, cmd, hdr);
 }
 		uint32_t read_stag, uint64_t read_va,
 		uint32_t write_stag, uint64_t write_va)
 {
-	struct iscsi_hdr *hdr = &rx_desc->iscsi_header;
+	struct iscsi_hdr *hdr = isert_get_iscsi_hdr(rx_desc);
 	struct iscsi_conn *conn = isert_conn->conn;
 	struct iscsi_cmd *cmd;
 	struct isert_cmd *isert_cmd;
 	struct isert_conn *isert_conn = wc->qp->qp_context;
 	struct ib_device *ib_dev = isert_conn->cm_id->device;
 	struct iser_rx_desc *rx_desc = cqe_to_rx_desc(wc->wr_cqe);
-	struct iscsi_hdr *hdr = &rx_desc->iscsi_header;
+	struct iscsi_hdr *hdr = isert_get_iscsi_hdr(rx_desc);
-	struct iser_ctrl *iser_ctrl = &rx_desc->iser_header;
+	struct iser_ctrl *iser_ctrl = isert_get_iser_hdr(rx_desc);
 	uint64_t read_va = 0, write_va = 0;
 	uint32_t read_stag = 0, write_stag = 0;
 	rx_desc->in_use = true;
 	ib_dma_sync_single_for_cpu(ib_dev, rx_desc->dma_addr,
-			ISER_RX_PAYLOAD_SIZE, DMA_FROM_DEVICE);
+			ISER_RX_SIZE, DMA_FROM_DEVICE);
 	isert_dbg("DMA: 0x%llx, iSCSI opcode: 0x%02x, ITT: 0x%08x, flags: 0x%02x dlen: %d\n",
 		 rx_desc->dma_addr, hdr->opcode, hdr->itt, hdr->flags,
 			read_stag, read_va, write_stag, write_va);
 	ib_dma_sync_single_for_device(ib_dev, rx_desc->dma_addr,
-			ISER_RX_PAYLOAD_SIZE, DMA_FROM_DEVICE);
+			ISER_RX_SIZE, DMA_FROM_DEVICE);
 }
 static void
 		return;
 	}
-	ib_dma_sync_single_for_cpu(ib_dev, isert_conn->login_req_dma,
+	ib_dma_sync_single_for_cpu(ib_dev, isert_conn->login_desc->dma_addr,
-			ISER_RX_PAYLOAD_SIZE, DMA_FROM_DEVICE);
+			ISER_RX_SIZE, DMA_FROM_DEVICE);
 	isert_conn->login_req_len = wc->byte_len - ISER_HEADERS_LEN;
 	complete(&isert_conn->login_req_comp);
 	mutex_unlock(&isert_conn->mutex);
-	ib_dma_sync_single_for_device(ib_dev, isert_conn->login_req_dma,
+	ib_dma_sync_single_for_device(ib_dev, isert_conn->login_desc->dma_addr,
-				ISER_RX_PAYLOAD_SIZE, DMA_FROM_DEVICE);
+				ISER_RX_SIZE, DMA_FROM_DEVICE);
 }
 static void

drivers/infiniband/ulp/isert/ib_isert.h+31−10

 				ISERT_MAX_TX_MISC_PDUS	+ \
 				ISERT_MAX_RX_MISC_PDUS)
-#define ISER_RX_PAD_SIZE	(ISCSI_DEF_MAX_RECV_SEG_LEN + 4096 - \
+/*
-		(ISER_RX_PAYLOAD_SIZE + sizeof(u64) + sizeof(struct ib_sge) + \
+ * RX size is default of 8k plus headers, but data needs to align to
-		 sizeof(struct ib_cqe) + sizeof(bool)))
+ * 512 boundary, so use 1024 to have the extra space for alignment.
+ */
+#define ISER_RX_SIZE		(ISCSI_DEF_MAX_RECV_SEG_LEN + 1024)
 /* Maximum support is 16MB I/O size */
 #define ISCSI_ISER_MAX_SG_TABLESIZE	4096
 };
 struct iser_rx_desc {
-	struct iser_ctrl iser_header;
+	char		buf[ISER_RX_SIZE];
-	struct iscsi_hdr iscsi_header;
-	char		data[ISCSI_DEF_MAX_RECV_SEG_LEN];
 	u64		dma_addr;
 	struct ib_sge	rx_sg;
 	struct ib_cqe	rx_cqe;
 	bool		in_use;
-	char		pad[ISER_RX_PAD_SIZE];
+};
-} __packed;
 static inline struct iser_rx_desc *cqe_to_rx_desc(struct ib_cqe *cqe)
 {
 	return container_of(cqe, struct iser_rx_desc, rx_cqe);
 }
+static void *isert_get_iser_hdr(struct iser_rx_desc *desc)
+{
+	return PTR_ALIGN(desc->buf + ISER_HEADERS_LEN, 512) - ISER_HEADERS_LEN;
+}
+static size_t isert_get_hdr_offset(struct iser_rx_desc *desc)
+{
+	return isert_get_iser_hdr(desc) - (void *)desc->buf;
+}
+static void *isert_get_iscsi_hdr(struct iser_rx_desc *desc)
+{
+	return isert_get_iser_hdr(desc) + sizeof(struct iser_ctrl);
+}
+static void *isert_get_data(struct iser_rx_desc *desc)
+{
+	void *data = isert_get_iser_hdr(desc) + ISER_HEADERS_LEN;
+	WARN_ON((uintptr_t)data & 511);
+	return data;
+}
 struct iser_tx_desc {
 	struct iser_ctrl iser_header;
 	struct iscsi_hdr iscsi_header;
 	u32			responder_resources;
 	u32			initiator_depth;
 	bool			pi_support;
-	struct iser_rx_desc	*login_req_buf;
+	struct iser_rx_desc	*login_desc;
 	char			*login_rsp_buf;
-	u64			login_req_dma;
 	int			login_req_len;
 	u64			login_rsp_dma;
 	struct iser_rx_desc	*rx_descs;

drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c+4−12

 	.attrs = rtrs_srv_stats_attrs,
 };
-static void rtrs_srv_dev_release(struct device *dev)
-{
-	struct rtrs_srv *srv = container_of(dev, struct rtrs_srv, dev);
-	kfree(srv);
-}
 static int rtrs_srv_create_once_sysfs_root_folders(struct rtrs_srv_sess *sess)
 {
 	struct rtrs_srv *srv = sess->srv;
 		goto unlock;
 	}
 	srv->dev.class = rtrs_dev_class;
-	srv->dev.release = rtrs_srv_dev_release;
 	err = dev_set_name(&srv->dev, "%s", sess->s.sessname);
 	if (err)
 		goto unlock;
 	 * sysfs files are created
 	 */
 	dev_set_uevent_suppress(&srv->dev, true);
-	err = device_register(&srv->dev);
+	err = device_add(&srv->dev);
 	if (err) {
-		pr_err("device_register(): %d\n", err);
+		pr_err("device_add(): %d\n", err);
 		goto put;
 	}
 	srv->kobj_paths = kobject_create_and_add("paths", &srv->dev.kobj);
 	if (!srv->kobj_paths) {
 		err = -ENOMEM;
 		pr_err("kobject_create_and_add(): %d\n", err);
-		device_unregister(&srv->dev);
+		device_del(&srv->dev);
 		goto unlock;
 	}
 	dev_set_uevent_suppress(&srv->dev, false);
 		kobject_del(srv->kobj_paths);
 		kobject_put(srv->kobj_paths);
 		mutex_unlock(&srv->paths_mutex);
-		device_unregister(&srv->dev);
+		device_del(&srv->dev);
 	} else {
 		mutex_unlock(&srv->paths_mutex);
 	}

drivers/infiniband/ulp/rtrs/rtrs-srv.c+9−0

 	return sess->cur_cq_vector;
 }
+static void rtrs_srv_dev_release(struct device *dev)
+{
+	struct rtrs_srv *srv = container_of(dev, struct rtrs_srv, dev);
+	kfree(srv);
+}
 static struct rtrs_srv *__alloc_srv(struct rtrs_srv_ctx *ctx,
 				     const uuid_t *paths_uuid)
 {
 	uuid_copy(&srv->paths_uuid, paths_uuid);
 	srv->queue_depth = sess_queue_depth;
 	srv->ctx = ctx;
+	device_initialize(&srv->dev);
+	srv->dev.release = rtrs_srv_dev_release;
 	srv->chunks = kcalloc(srv->queue_depth, sizeof(*srv->chunks),
 			      GFP_KERNEL);

drivers/interconnect/core.c+8−2

 			icc_summary_show_one(s, n);
 			hlist_for_each_entry(r, &n->req_list, req_node) {
+				u32 avg_bw = 0, peak_bw = 0;
 				if (!r->dev)
 					continue;
+				if (r->enabled) {
+					avg_bw = r->avg_bw;
+					peak_bw = r->peak_bw;
+				}
 				seq_printf(s, "  %-27s %12u %12u %12u\n",
-					   dev_name(r->dev), r->tag, r->avg_bw,
+					   dev_name(r->dev), r->tag, avg_bw, peak_bw);
-					   r->peak_bw);
 			}
 		}
 	}

drivers/interconnect/qcom/bcm-voter.c+19−8

 		return 1;
 }
+static u64 bcm_div(u64 num, u32 base)
+{
+	/* Ensure that small votes aren't lost. */
+	if (num && num < base)
+		return 1;
+	do_div(num, base);
+	return num;
+}
 static void bcm_aggregate(struct qcom_icc_bcm *bcm)
 {
+	struct qcom_icc_node *node;
 	size_t i, bucket;
 	u64 agg_avg[QCOM_ICC_NUM_BUCKETS] = {0};
 	u64 agg_peak[QCOM_ICC_NUM_BUCKETS] = {0};
 	for (bucket = 0; bucket < QCOM_ICC_NUM_BUCKETS; bucket++) {
 		for (i = 0; i < bcm->num_nodes; i++) {
-			temp = bcm->nodes[i]->sum_avg[bucket] * bcm->aux_data.width;
+			node = bcm->nodes[i];
-			do_div(temp, bcm->nodes[i]->buswidth * bcm->nodes[i]->channels);
+			temp = bcm_div(node->sum_avg[bucket] * bcm->aux_data.width,
+				       node->buswidth * node->channels);
 			agg_avg[bucket] = max(agg_avg[bucket], temp);
-			temp = bcm->nodes[i]->max_peak[bucket] * bcm->aux_data.width;
+			temp = bcm_div(node->max_peak[bucket] * bcm->aux_data.width,
-			do_div(temp, bcm->nodes[i]->buswidth);
+				       node->buswidth);
 			agg_peak[bucket] = max(agg_peak[bucket], temp);
 		}
 		temp = agg_avg[bucket] * 1000ULL;
-		do_div(temp, bcm->aux_data.unit);
+		bcm->vote_x[bucket] = bcm_div(temp, bcm->aux_data.unit);
-		bcm->vote_x[bucket] = temp;
 		temp = agg_peak[bucket] * 1000ULL;
-		do_div(temp, bcm->aux_data.unit);
+		bcm->vote_y[bucket] = bcm_div(temp, bcm->aux_data.unit);
-		bcm->vote_y[bucket] = temp;
 	}
 	if (bcm->keepalive && bcm->vote_x[QCOM_ICC_BUCKET_AMC] == 0 &&

drivers/iommu/amd/Kconfig+1−1

@@ -10,7 +10,7 @@ config AMD_IOMMU · 9 unmodified lines
10	select IOMMU_API	10	select IOMMU_API
11	select IOMMU_IOVA	11	select IOMMU_IOVA
12	select IOMMU_DMA	12	select IOMMU_DMA
13	depends on X86_64 && PCI && ACPI	13	depends on X86_64 && PCI && ACPI && HAVE_CMPXCHG_DOUBLE
14	help	14	help
15	With this option you can enable support for AMD IOMMU hardware in	15	With this option you can enable support for AMD IOMMU hardware in
16	your system. An IOMMU is a hardware component which provides	16	your system. An IOMMU is a hardware component which provides

drivers/iommu/amd/init.c+19−2

@@ -1511,7 +1511,14 @@ static int __init init_iommu_one(struct amd_iommu iommu, struct ivhd_header h) · 1510 unmodified lines
1511	iommu->mmio_phys_end = MMIO_REG_END_OFFSET;	1511	iommu->mmio_phys_end = MMIO_REG_END_OFFSET;
1512	else	1512	else
1513	iommu->mmio_phys_end = MMIO_CNTR_CONF_OFFSET;	1513	iommu->mmio_phys_end = MMIO_CNTR_CONF_OFFSET;
1514	if (((h->efr_attr & (0x1 << IOMMU_FEAT_GASUP_SHIFT)) == 0))	1514
		1515	/*
		1516	* Note: GA (128-bit IRTE) mode requires cmpxchg16b supports.
		1517	* GAM also requires GA mode. Therefore, we need to
		1518	* check cmpxchg16b support before enabling it.
		1519	*/
		1520	if (!boot_cpu_has(X86_FEATURE_CX16) \|\|
		1521	((h->efr_attr & (0x1 << IOMMU_FEAT_GASUP_SHIFT)) == 0))
1515	amd_iommu_guest_ir = AMD_IOMMU_GUEST_IR_LEGACY;	1522	amd_iommu_guest_ir = AMD_IOMMU_GUEST_IR_LEGACY;
1516	break;	1523	break;
1517	case 0x11:	1524	case 0x11:
@@ -1520,8 +1527,18 @@ static int __init init_iommu_one(struct amd_iommu iommu, struct ivhd_header h) · 2 unmodified lines
1520	iommu->mmio_phys_end = MMIO_REG_END_OFFSET;	1527	iommu->mmio_phys_end = MMIO_REG_END_OFFSET;
1521	else	1528	else
1522	iommu->mmio_phys_end = MMIO_CNTR_CONF_OFFSET;	1529	iommu->mmio_phys_end = MMIO_CNTR_CONF_OFFSET;
1523	if (((h->efr_reg & (0x1 << IOMMU_EFR_GASUP_SHIFT)) == 0))	1530
		1531	/*
		1532	* Note: GA (128-bit IRTE) mode requires cmpxchg16b supports.
		1533	* XT, GAM also requires GA mode. Therefore, we need to
		1534	* check cmpxchg16b support before enabling them.
		1535	*/
		1536	if (!boot_cpu_has(X86_FEATURE_CX16) \|\|
		1537	((h->efr_reg & (0x1 << IOMMU_EFR_GASUP_SHIFT)) == 0)) {
1524	amd_iommu_guest_ir = AMD_IOMMU_GUEST_IR_LEGACY;	1538	amd_iommu_guest_ir = AMD_IOMMU_GUEST_IR_LEGACY;
		1539	break;
		1540	}
		1541
1525	/*	1542	/*
1526	* Note: Since iommu_update_intcapxt() leverages	1543	* Note: Since iommu_update_intcapxt() leverages
1527	* the IOMMU MMIO access to MSI capability block registers	1544	* the IOMMU MMIO access to MSI capability block registers

drivers/iommu/amd/iommu.c+21−5

@@ -2659,7 +2659,12 @@ static int amd_iommu_def_domain_type(struct device *dev) · 2658 unmodified lines
2659	if (!dev_data)	2659	if (!dev_data)
2660	return 0;	2660	return 0;
2661		2661
2662	if (dev_data->iommu_v2)	2662	/*
		2663	* Do not identity map IOMMUv2 capable devices when memory encryption is
		2664	* active, because some of those devices (AMD GPUs) don't have the
		2665	* encryption bit in their DMA-mask and require remapping.
		2666	*/
		2667	if (!mem_encrypt_active() && dev_data->iommu_v2)
2663	return IOMMU_DOMAIN_IDENTITY;	2668	return IOMMU_DOMAIN_IDENTITY;
2664		2669
2665	return 0;	2670	return 0;
@@ -3292,6 +3297,7 @@ out: · 626 unmodified lines
3292	static int modify_irte_ga(u16 devid, int index, struct irte_ga *irte,	3297	static int modify_irte_ga(u16 devid, int index, struct irte_ga *irte,
3293	struct amd_ir_data *data)	3298	struct amd_ir_data *data)
3294	{	3299	{
		3300	bool ret;
3295	struct irq_remap_table *table;	3301	struct irq_remap_table *table;
3296	struct amd_iommu *iommu;	3302	struct amd_iommu *iommu;
3297	unsigned long flags;	3303	unsigned long flags;
@@ -3309,10 +3315,18 @@ static int modify_irte_ga(u16 devid, int index, struct irte_ga *irte, · 11 unmodified lines
3309		3315
3310	entry = (struct irte_ga *)table->table;	3316	entry = (struct irte_ga *)table->table;
3311	entry = &entry[index];	3317	entry = &entry[index];
3312	entry->lo.fields_remap.valid = 0;	3318
3313	entry->hi.val = irte->hi.val;	3319	ret = cmpxchg_double(&entry->lo.val, &entry->hi.val,
3314	entry->lo.val = irte->lo.val;	3320	entry->lo.val, entry->hi.val,
3315	entry->lo.fields_remap.valid = 1;	3321	irte->lo.val, irte->hi.val);
		3322	/*
		3323	* We use cmpxchg16 to atomically update the 128-bit IRTE,
		3324	* and it cannot be updated by the hardware or other processors
		3325	* behind us, so the return value of cmpxchg16 should be the
		3326	* same as the old value.
		3327	*/
		3328	WARN_ON(!ret);
		3329
3316	if (data)	3330	if (data)
3317	data->ref = entry;	3331	data->ref = entry;
3318		3332
@@ -3850,6 +3864,7 @@ int amd_iommu_deactivate_guest_mode(void *data) · 531 unmodified lines
3850	struct amd_ir_data ir_data = (struct amd_ir_data )data;	3864	struct amd_ir_data ir_data = (struct amd_ir_data )data;
3851	struct irte_ga entry = (struct irte_ga ) ir_data->entry;	3865	struct irte_ga entry = (struct irte_ga ) ir_data->entry;
3852	struct irq_cfg *cfg = ir_data->cfg;	3866	struct irq_cfg *cfg = ir_data->cfg;
		3867	u64 valid = entry->lo.fields_remap.valid;
3853		3868
3854	if (!AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir) \|\|	3869	if (!AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir) \|\|
3855	!entry \|\| !entry->lo.fields_vapic.guest_mode)	3870	!entry \|\| !entry->lo.fields_vapic.guest_mode)
@@ -3858,6 +3873,7 @@ int amd_iommu_deactivate_guest_mode(void *data) · 2 unmodified lines
3858	entry->lo.val = 0;	3873	entry->lo.val = 0;
3859	entry->hi.val = 0;	3874	entry->hi.val = 0;
3860		3875
		3876	entry->lo.fields_remap.valid = valid;
3861	entry->lo.fields_remap.dm = apic->irq_dest_mode;	3877	entry->lo.fields_remap.dm = apic->irq_dest_mode;
3862	entry->lo.fields_remap.int_type = apic->irq_delivery_mode;	3878	entry->lo.fields_remap.int_type = apic->irq_delivery_mode;
3863	entry->hi.fields.vector = cfg->vector;	3879	entry->hi.fields.vector = cfg->vector;

drivers/iommu/amd/iommu_v2.c+7−0

@@ -737,6 +737,13 @@ int amd_iommu_init_device(struct pci_dev *pdev, int pasids) · 736 unmodified lines
737		737
738	might_sleep();	738	might_sleep();
739		739
		740	/*
		741	* When memory encryption is active the device is likely not in a
		742	* direct-mapped domain. Forbid using IOMMUv2 functionality for now.
		743	*/
		744	if (mem_encrypt_active())
		745	return -ENODEV;
		746
740	if (!amd_iommu_v2_supported())	747	if (!amd_iommu_v2_supported())
741	return -ENODEV;	748	return -ENODEV;
742		749

drivers/iommu/intel/iommu.c+62−52

 	return (level - 1) * LEVEL_STRIDE;
 }
-static inline int pfn_level_offset(unsigned long pfn, int level)
+static inline int pfn_level_offset(u64 pfn, int level)
 {
 	return (pfn >> level_to_offset_bits(level)) & LEVEL_MASK;
 }
-static inline unsigned long level_mask(int level)
+static inline u64 level_mask(int level)
 {
-	return -1UL << level_to_offset_bits(level);
+	return -1ULL << level_to_offset_bits(level);
 }
-static inline unsigned long level_size(int level)
+static inline u64 level_size(int level)
 {
-	return 1UL << level_to_offset_bits(level);
+	return 1ULL << level_to_offset_bits(level);
 }
-static inline unsigned long align_to_level(unsigned long pfn, int level)
+static inline u64 align_to_level(u64 pfn, int level)
 {
 	return (pfn + level_size(level) - 1) & level_mask(level);
 }
 static inline unsigned long lvl_to_nr_pages(unsigned int lvl)
 {
-	return  1 << min_t(int, (lvl - 1) * LEVEL_STRIDE, MAX_AGAW_PFN_WIDTH);
+	return 1UL << min_t(int, (lvl - 1) * LEVEL_STRIDE, MAX_AGAW_PFN_WIDTH);
 }
 /* VT-d pages must always be _smaller_ than MM pages. Otherwise things
 int intel_iommu_gfx_mapped;
 EXPORT_SYMBOL_GPL(intel_iommu_gfx_mapped);
-#define DUMMY_DEVICE_DOMAIN_INFO ((struct device_domain_info *)(-1))
 #define DEFER_DEVICE_DOMAIN_INFO ((struct device_domain_info *)(-2))
 struct device_domain_info *get_domain_info(struct device *dev)
 {
 		return NULL;
 	info = dev_iommu_priv_get(dev);
-	if (unlikely(info == DUMMY_DEVICE_DOMAIN_INFO ||
+	if (unlikely(info == DEFER_DEVICE_DOMAIN_INFO))
-		     info == DEFER_DEVICE_DOMAIN_INFO))
 		return NULL;
 	return info;
 	return &context[devfn];
 }
-static int iommu_dummy(struct device *dev)
-{
-	return dev_iommu_priv_get(dev) == DUMMY_DEVICE_DOMAIN_INFO;
-}
 static bool attach_deferred(struct device *dev)
 {
 	return dev_iommu_priv_get(dev) == DEFER_DEVICE_DOMAIN_INFO;
 	return false;
 }
+static bool quirk_ioat_snb_local_iommu(struct pci_dev *pdev)
+{
+	struct dmar_drhd_unit *drhd;
+	u32 vtbar;
+	int rc;
+	/* We know that this device on this chipset has its own IOMMU.
+	 * If we find it under a different IOMMU, then the BIOS is lying
+	 * to us. Hope that the IOMMU for this device is actually
+	 * disabled, and it needs no translation...
+	 */
+	rc = pci_bus_read_config_dword(pdev->bus, PCI_DEVFN(0, 0), 0xb0, &vtbar);
+	if (rc) {
+		/* "can't" happen */
+		dev_info(&pdev->dev, "failed to run vt-d quirk\n");
+		return false;
+	}
+	vtbar &= 0xffff0000;
+	/* we know that the this iommu should be at offset 0xa000 from vtbar */
+	drhd = dmar_find_matched_drhd_unit(pdev);
+	if (!drhd || drhd->reg_base_addr - vtbar != 0xa000) {
+		pr_warn_once(FW_BUG "BIOS assigned incorrect VT-d unit for Intel(R) QuickData Technology device\n");
+		add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_STILL_OK);
+		return true;
+	}
+	return false;
+}
+static bool iommu_is_dummy(struct intel_iommu *iommu, struct device *dev)
+{
+	if (!iommu || iommu->drhd->ignored)
+		return true;
+	if (dev_is_pci(dev)) {
+		struct pci_dev *pdev = to_pci_dev(dev);
+		if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
+		    pdev->device == PCI_DEVICE_ID_INTEL_IOAT_SNB &&
+		    quirk_ioat_snb_local_iommu(pdev))
+			return true;
+	}
+	return false;
+}
 struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devfn)
 {
 	struct dmar_drhd_unit *drhd = NULL;
 	u16 segment = 0;
 	int i;
-	if (!dev || iommu_dummy(dev))
+	if (!dev)
 		return NULL;
 	if (dev_is_pci(dev)) {
 		dev = &ACPI_COMPANION(dev)->dev;
 	rcu_read_lock();
-	for_each_active_iommu(iommu, drhd) {
+	for_each_iommu(iommu, drhd) {
 		if (pdev && segment != drhd->segment)
 			continue;
 	}
 	iommu = NULL;
  out:
+	if (iommu_is_dummy(iommu, dev))
+		iommu = NULL;
 	rcu_read_unlock();
 	return iommu;
 {
 	struct device_domain_info *info;
-	if (unlikely(attach_deferred(dev) || iommu_dummy(dev)))
+	if (unlikely(attach_deferred(dev)))
 		return NULL;
 	/* No lock here, assumes no domain exit in normal case */
 	iova_cache_put();
 }
-static void quirk_ioat_snb_local_iommu(struct pci_dev *pdev)
-{
-	struct dmar_drhd_unit *drhd;
-	u32 vtbar;
-	int rc;
-	/* We know that this device on this chipset has its own IOMMU.
-	 * If we find it under a different IOMMU, then the BIOS is lying
-	 * to us. Hope that the IOMMU for this device is actually
-	 * disabled, and it needs no translation...
-	 */
-	rc = pci_bus_read_config_dword(pdev->bus, PCI_DEVFN(0, 0), 0xb0, &vtbar);
-	if (rc) {
-		/* "can't" happen */
-		dev_info(&pdev->dev, "failed to run vt-d quirk\n");
-		return;
-	}
-	vtbar &= 0xffff0000;
-	/* we know that the this iommu should be at offset 0xa000 from vtbar */
-	drhd = dmar_find_matched_drhd_unit(pdev);
-	if (!drhd || drhd->reg_base_addr - vtbar != 0xa000) {
-		pr_warn_once(FW_BUG "BIOS assigned incorrect VT-d unit for Intel(R) QuickData Technology device\n");
-		add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_STILL_OK);
-		dev_iommu_priv_set(&pdev->dev, DUMMY_DEVICE_DOMAIN_INFO);
-	}
-}
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB, quirk_ioat_snb_local_iommu);
 static void __init init_no_remapping_devices(void)
 {
 	struct dmar_drhd_unit *drhd;
 		/* This IOMMU has *only* gfx devices. Either bypass it or
 		   set the gfx_mapped flag, as appropriate */
 		drhd->gfx_dedicated = 1;
-		if (!dmar_map_gfx) {
+		if (!dmar_map_gfx)
 			drhd->ignored = 1;
-			for_each_active_dev_scope(drhd->devices,
-						  drhd->devices_cnt, i, dev)
-				dev_iommu_priv_set(dev, DUMMY_DEVICE_DOMAIN_INFO);
-		}
 	}
 }

drivers/iommu/intel/irq_remapping.c+8−2

 	/* Enable interrupt-remapping */
 	iommu->gcmd |= DMA_GCMD_IRE;
-	iommu->gcmd &= ~DMA_GCMD_CFI;  /* Block compatibility-format MSIs */
 	writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);
 	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG,
 		      readl, (sts & DMA_GSTS_IRES), sts);
+	/* Block compatibility-format MSIs */
+	if (sts & DMA_GSTS_CFIS) {
+		iommu->gcmd &= ~DMA_GCMD_CFI;
+		writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);
+		IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG,
+			      readl, !(sts & DMA_GSTS_CFIS), sts);
+	}
 	/*
 	 * With CFI clear in the Global Command register, we should be
 	 * protected from dangerous (i.e. compatibility) interrupts

drivers/md/dm-cache-metadata.c+6−2

 					  CACHE_MAX_CONCURRENT_LOCKS);
 	if (IS_ERR(cmd->bm)) {
 		DMERR("could not create block manager");
-		return PTR_ERR(cmd->bm);
+		r = PTR_ERR(cmd->bm);
+		cmd->bm = NULL;
+		return r;
 	}
 	r = __open_or_format_metadata(cmd, may_format_device);
-	if (r)
+	if (r) {
 		dm_block_manager_destroy(cmd->bm);
+		cmd->bm = NULL;
+	}
 	return r;
 }

drivers/md/dm-crypt.c+2−2

@@ -739,7 +739,7 @@ static int crypt_iv_eboiv_gen(struct crypt_config cc, u8 iv, · 738 unmodified lines
739	u8 buf[MAX_CIPHER_BLOCKSIZE] __aligned(__alignof__(__le64));	739	u8 buf[MAX_CIPHER_BLOCKSIZE] __aligned(__alignof__(__le64));
740	struct skcipher_request *req;	740	struct skcipher_request *req;
741	struct scatterlist src, dst;	741	struct scatterlist src, dst;
742	struct crypto_wait wait;	742	DECLARE_CRYPTO_WAIT(wait);
743	int err;	743	int err;
744		744
745	req = skcipher_request_alloc(any_tfm(cc), GFP_NOIO);	745	req = skcipher_request_alloc(any_tfm(cc), GFP_NOIO);
@@ -936,7 +936,7 @@ static int crypt_iv_elephant(struct crypt_config cc, struct dm_crypt_request d · 190 unmodified lines
936	u8 es, ks, data, data2, *data_offset;	936	u8 es, ks, data, data2, *data_offset;
937	struct skcipher_request *req;	937	struct skcipher_request *req;
938	struct scatterlist sg, sg2, src, dst;	938	struct scatterlist sg, sg2, src, dst;
939	struct crypto_wait wait;	939	DECLARE_CRYPTO_WAIT(wait);
940	int i, r;	940	int i, r;
941		941
942	req = skcipher_request_alloc(elephant->tfm, GFP_NOIO);	942	req = skcipher_request_alloc(elephant->tfm, GFP_NOIO);

drivers/md/dm-integrity.c+12−0

 	range.logical_sector = le64_to_cpu(ic->sb->recalc_sector);
 	if (unlikely(range.logical_sector >= ic->provided_data_sectors)) {
 		if (ic->mode == 'B') {
+			block_bitmap_op(ic, ic->recalc_bitmap, 0, ic->provided_data_sectors, BITMAP_OP_CLEAR);
 			DEBUG_print("queue_delayed_work: bitmap_flush_work\n");
 			queue_delayed_work(ic->commit_wq, &ic->bitmap_flush_work, 0);
 		}
 		goto err;
 	}
+	if (ic->mode == 'B') {
+		sector_t start, end;
+		start = (range.logical_sector >>
+			 (ic->sb->log2_sectors_per_block + ic->log2_blocks_per_bitmap_bit)) <<
+			(ic->sb->log2_sectors_per_block + ic->log2_blocks_per_bitmap_bit);
+		end = ((range.logical_sector + range.n_sectors) >>
+		       (ic->sb->log2_sectors_per_block + ic->log2_blocks_per_bitmap_bit)) <<
+			(ic->sb->log2_sectors_per_block + ic->log2_blocks_per_bitmap_bit);
+		block_bitmap_op(ic, ic->recalc_bitmap, start, end - start, BITMAP_OP_CLEAR);
+	}
 advance_and_next:
 	cond_resched();

drivers/md/dm-mpath.c+15−7

@@ -1287,17 +1287,25 @@ static void multipath_wait_for_pg_init_completion(struct multipath *m) · 1286 unmodified lines
1287	static void flush_multipath_work(struct multipath *m)	1287	static void flush_multipath_work(struct multipath *m)
1288	{	1288	{
1289	if (m->hw_handler_name) {	1289	if (m->hw_handler_name) {
1290	set_bit(MPATHF_PG_INIT_DISABLED, &m->flags);	1290	unsigned long flags;
1291	smp_mb__after_atomic();	1291
		1292	if (!atomic_read(&m->pg_init_in_progress))
		1293	goto skip;
		1294
		1295	spin_lock_irqsave(&m->lock, flags);
		1296	if (atomic_read(&m->pg_init_in_progress) &&
		1297	!test_and_set_bit(MPATHF_PG_INIT_DISABLED, &m->flags)) {
		1298	spin_unlock_irqrestore(&m->lock, flags);
1292		1299
1293	if (atomic_read(&m->pg_init_in_progress))
1294	flush_workqueue(kmpath_handlerd);	1300	flush_workqueue(kmpath_handlerd);
1295	multipath_wait_for_pg_init_completion(m);	1301	multipath_wait_for_pg_init_completion(m);
1296		1302
1297	clear_bit(MPATHF_PG_INIT_DISABLED, &m->flags);	1303	spin_lock_irqsave(&m->lock, flags);
1298	smp_mb__after_atomic();	1304	clear_bit(MPATHF_PG_INIT_DISABLED, &m->flags);
		1305	}
		1306	spin_unlock_irqrestore(&m->lock, flags);
1299	}	1307	}
1300		1308	skip:
1301	if (m->queue_mode == DM_TYPE_BIO_BASED)	1309	if (m->queue_mode == DM_TYPE_BIO_BASED)
1302	flush_work(&m->process_queued_bios);	1310	flush_work(&m->process_queued_bios);
1303	flush_work(&m->trigger_event);	1311	flush_work(&m->trigger_event);

drivers/md/dm-thin-metadata.c+7−3

 					  THIN_MAX_CONCURRENT_LOCKS);
 	if (IS_ERR(pmd->bm)) {
 		DMERR("could not create block manager");
-		return PTR_ERR(pmd->bm);
+		r = PTR_ERR(pmd->bm);
+		pmd->bm = NULL;
+		return r;
 	}
 	r = __open_or_format_metadata(pmd, format_device);
-	if (r)
+	if (r) {
 		dm_block_manager_destroy(pmd->bm);
+		pmd->bm = NULL;
+	}
 	return r;
 }
 	}
 	pmd_write_lock_in_core(pmd);
-	if (!dm_bm_is_read_only(pmd->bm) && !pmd->fail_io) {
+	if (!pmd->fail_io && !dm_bm_is_read_only(pmd->bm)) {
 		r = __commit_transaction(pmd);
 		if (r < 0)
 			DMWARN("%s: __commit_transaction() failed, error = %d",

drivers/md/dm-writecache.c+10−2

 	pfn_t pfn;
 	int id;
 	struct page **pages;
+	sector_t offset;
 	wc->memory_vmapped = false;
 		goto err1;
 	}
+	offset = get_start_sect(wc->ssd_dev->bdev);
+	if (offset & (PAGE_SIZE / 512 - 1)) {
+		r = -EINVAL;
+		goto err1;
+	}
+	offset >>= PAGE_SHIFT - 9;
 	id = dax_read_lock();
-	da = dax_direct_access(wc->ssd_dev->dax_dev, 0, p, &wc->memory_map, &pfn);
+	da = dax_direct_access(wc->ssd_dev->dax_dev, offset, p, &wc->memory_map, &pfn);
 	if (da < 0) {
 		wc->memory_map = NULL;
 		r = da;
 		i = 0;
 		do {
 			long daa;
-			daa = dax_direct_access(wc->ssd_dev->dax_dev, i, p - i,
+			daa = dax_direct_access(wc->ssd_dev->dax_dev, offset + i, p - i,
 						NULL, &pfn);
 			if (daa <= 0) {
 				r = daa ? daa : -EINVAL;

drivers/md/persistent-data/dm-block-manager.c+8−6

 	void *p;
 	int r;
-	if (bm->read_only)
+	if (dm_bm_is_read_only(bm))
 		return -EPERM;
 	p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result);
 	struct buffer_aux *aux;
 	void *p;
-	if (bm->read_only)
+	if (dm_bm_is_read_only(bm))
 		return -EPERM;
 	p = dm_bufio_new(bm->bufio, b, (struct dm_buffer **) result);
 int dm_bm_flush(struct dm_block_manager *bm)
 {
-	if (bm->read_only)
+	if (dm_bm_is_read_only(bm))
 		return -EPERM;
 	return dm_bufio_write_dirty_buffers(bm->bufio);
 bool dm_bm_is_read_only(struct dm_block_manager *bm)
 {
-	return bm->read_only;
+	return (bm ? bm->read_only : true);
 }
 EXPORT_SYMBOL_GPL(dm_bm_is_read_only);
 void dm_bm_set_read_only(struct dm_block_manager *bm)
 {
-	bm->read_only = true;
+	if (bm)
+		bm->read_only = true;
 }
 EXPORT_SYMBOL_GPL(dm_bm_set_read_only);
 void dm_bm_set_read_write(struct dm_block_manager *bm)
 {
-	bm->read_only = false;
+	if (bm)
+		bm->read_only = false;
 }
 EXPORT_SYMBOL_GPL(dm_bm_set_read_write);

drivers/media/i2c/Kconfig+2−2

@@ -467,7 +467,7 @@ config VIDEO_VPX3220 · 466 unmodified lines
467	config VIDEO_MAX9286	467	config VIDEO_MAX9286
468	tristate "Maxim MAX9286 GMSL deserializer support"	468	tristate "Maxim MAX9286 GMSL deserializer support"
469	depends on I2C && I2C_MUX	469	depends on I2C && I2C_MUX
470	depends on OF	470	depends on OF_GPIO
471	select V4L2_FWNODE	471	select V4L2_FWNODE
472	select VIDEO_V4L2_SUBDEV_API	472	select VIDEO_V4L2_SUBDEV_API
473	select MEDIA_CONTROLLER	473	select MEDIA_CONTROLLER
@@ -741,7 +741,7 @@ config VIDEO_HI556 · 267 unmodified lines
741	config VIDEO_IMX214	741	config VIDEO_IMX214
742	tristate "Sony IMX214 sensor support"	742	tristate "Sony IMX214 sensor support"
743	depends on GPIOLIB && I2C && VIDEO_V4L2	743	depends on GPIOLIB && I2C && VIDEO_V4L2
744	depends on V4L2_FWNODE	744	select V4L2_FWNODE
745	select MEDIA_CONTROLLER	745	select MEDIA_CONTROLLER
746	select VIDEO_V4L2_SUBDEV_API	746	select VIDEO_V4L2_SUBDEV_API
747	select REGMAP_I2C	747	select REGMAP_I2C

drivers/media/platform/ti-vpe/cal.h+1−1

@@ -226,7 +226,7 @@ static inline void cal_write_field(struct cal_dev *cal, u32 offset, u32 value, · 225 unmodified lines
226	u32 val = cal_read(cal, offset);	226	u32 val = cal_read(cal, offset);
227		227
228	val &= ~mask;	228	val &= ~mask;
229	val \|= FIELD_PREP(mask, value);	229	val \|= (value << __ffs(mask)) & mask;
230	cal_write(cal, offset, val);	230	cal_write(cal, offset, val);
231	}	231	}
232		232

drivers/media/rc/gpio-ir-tx.c+5−11

 	struct gpio_desc *gpio;
 	unsigned int carrier;
 	unsigned int duty_cycle;
-	/* we need a spinlock to hold the cpu while transmitting */
-	spinlock_t lock;
 };
 static const struct of_device_id gpio_ir_tx_of_match[] = {
 static void gpio_ir_tx_unmodulated(struct gpio_ir *gpio_ir, uint *txbuf,
 				   uint count)
 {
-	unsigned long flags;
 	ktime_t edge;
 	s32 delta;
 	int i;
-	spin_lock_irqsave(&gpio_ir->lock, flags);
+	local_irq_disable();
 	edge = ktime_get();
 	}
 	gpiod_set_value(gpio_ir->gpio, 0);
-	spin_unlock_irqrestore(&gpio_ir->lock, flags);
 }
 static void gpio_ir_tx_modulated(struct gpio_ir *gpio_ir, uint *txbuf,
 				 uint count)
 {
-	unsigned long flags;
 	ktime_t edge;
 	/*
 	 * delta should never exceed 0.5 seconds (IR_MAX_DURATION) and on
 	space = DIV_ROUND_CLOSEST((100 - gpio_ir->duty_cycle) *
 				  (NSEC_PER_SEC / 100), gpio_ir->carrier);
-	spin_lock_irqsave(&gpio_ir->lock, flags);
+	local_irq_disable();
 	edge = ktime_get();
 			edge = last;
 		}
 	}
-	spin_unlock_irqrestore(&gpio_ir->lock, flags);
 }
 static int gpio_ir_tx(struct rc_dev *dev, unsigned int *txbuf,
 		      unsigned int count)
 {
 	struct gpio_ir *gpio_ir = dev->priv;
+	unsigned long flags;
+	local_irq_save(flags);
 	if (gpio_ir->carrier)
 		gpio_ir_tx_modulated(gpio_ir, txbuf, count);
 	else
 		gpio_ir_tx_unmodulated(gpio_ir, txbuf, count);
+	local_irq_restore(flags);
 	return count;
 }
 	gpio_ir->carrier = 38000;
 	gpio_ir->duty_cycle = 50;
-	spin_lock_init(&gpio_ir->lock);
 	rc = devm_rc_register_device(&pdev->dev, rcdev);
 	if (rc < 0)

drivers/media/rc/mceusb.c+1−1

@@ -1726,7 +1726,7 @@ static int mceusb_dev_probe(struct usb_interface *intf, · 1725 unmodified lines
1726	goto mem_alloc_fail;	1726	goto mem_alloc_fail;
1727		1727
1728	ir->pipe_in = pipe;	1728	ir->pipe_in = pipe;
1729	ir->buf_in = usb_alloc_coherent(dev, maxp, GFP_ATOMIC, &ir->dma_in);	1729	ir->buf_in = usb_alloc_coherent(dev, maxp, GFP_KERNEL, &ir->dma_in);
1730	if (!ir->buf_in)	1730	if (!ir->buf_in)
1731	goto buf_in_alloc_fail;	1731	goto buf_in_alloc_fail;
1732		1732

drivers/media/rc/rc-main.c+28−16

 	}
 	mutex_lock(&dev->lock);
+	if (!dev->registered) {
+		mutex_unlock(&dev->lock);
+		return -ENODEV;
+	}
 	old_protocols = *current_protocols;
 	new_protocols = old_protocols;
 		return -EINVAL;
 	mutex_lock(&dev->lock);
+	if (!dev->registered) {
+		mutex_unlock(&dev->lock);
+		return -ENODEV;
+	}
 	new_filter = *filter;
 	if (fattr->mask)
 	int i;
 	mutex_lock(&dev->lock);
+	if (!dev->registered) {
+		mutex_unlock(&dev->lock);
+		return -ENODEV;
+	}
 	allowed = dev->allowed_wakeup_protocols;
 	kfree(dev);
 }
-#define ADD_HOTPLUG_VAR(fmt, val...)					\
-	do {								\
-		int err = add_uevent_var(env, fmt, val);		\
-		if (err)						\
-			return err;					\
-	} while (0)
 static int rc_dev_uevent(struct device *device, struct kobj_uevent_env *env)
 {
 	struct rc_dev *dev = to_rc_dev(device);
+	int ret = 0;
-	if (dev->rc_map.name)
+	mutex_lock(&dev->lock);
-		ADD_HOTPLUG_VAR("NAME=%s", dev->rc_map.name);
-	if (dev->driver_name)
-		ADD_HOTPLUG_VAR("DRV_NAME=%s", dev->driver_name);
-	if (dev->device_name)
-		ADD_HOTPLUG_VAR("DEV_NAME=%s", dev->device_name);
-	return 0;
+	if (!dev->registered)
+		ret = -ENODEV;
+	if (ret == 0 && dev->rc_map.name)
+		ret = add_uevent_var(env, "NAME=%s", dev->rc_map.name);
+	if (ret == 0 && dev->driver_name)
+		ret = add_uevent_var(env, "DRV_NAME=%s", dev->driver_name);
+	if (ret == 0 && dev->device_name)
+		ret = add_uevent_var(env, "DEV_NAME=%s", dev->device_name);
+	mutex_unlock(&dev->lock);
+	return ret;
 }
 /*
 	del_timer_sync(&dev->timer_keyup);
 	del_timer_sync(&dev->timer_repeat);
-	rc_free_rx_device(dev);
 	mutex_lock(&dev->lock);
 	if (dev->users && dev->close)
 		dev->close(dev);
 	dev->registered = false;
 	mutex_unlock(&dev->lock);
+	rc_free_rx_device(dev);
 	/*
 	 * lirc device should be freed with dev->registered = false, so
 	 * that userspace polling will get notified.

drivers/media/test-drivers/vicodec/vicodec-core.c+1−0

@@ -1994,6 +1994,7 @@ static int vicodec_request_validate(struct media_request *req) · 1993 unmodified lines
1994	}	1994	}
1995	ctrl = v4l2_ctrl_request_hdl_ctrl_find(hdl,	1995	ctrl = v4l2_ctrl_request_hdl_ctrl_find(hdl,
1996	vicodec_ctrl_stateless_state.id);	1996	vicodec_ctrl_stateless_state.id);
		1997	v4l2_ctrl_request_hdl_put(hdl);
1997	if (!ctrl) {	1998	if (!ctrl) {
1998	v4l2_info(&ctx->dev->v4l2_dev,	1999	v4l2_info(&ctx->dev->v4l2_dev,
1999	"Missing required codec control\n");	2000	"Missing required codec control\n");

drivers/media/v4l2-core/v4l2-ioctl.c+27−23

@@ -3187,14 +3187,16 @@ static int video_put_user(void __user arg, void parg, unsigned int cmd) · 3186 unmodified lines
3187	#ifdef CONFIG_COMPAT_32BIT_TIME	3187	#ifdef CONFIG_COMPAT_32BIT_TIME
3188	case VIDIOC_DQEVENT_TIME32: {	3188	case VIDIOC_DQEVENT_TIME32: {
3189	struct v4l2_event *ev = parg;	3189	struct v4l2_event *ev = parg;
3190	struct v4l2_event_time32 ev32 = {	3190	struct v4l2_event_time32 ev32;
3191	.type = ev->type,	3191
3192	.pending = ev->pending,	3192	memset(&ev32, 0, sizeof(ev32));
3193	.sequence = ev->sequence,	3193
3194	.timestamp.tv_sec = ev->timestamp.tv_sec,	3194	ev32.type = ev->type;
3195	.timestamp.tv_nsec = ev->timestamp.tv_nsec,	3195	ev32.pending = ev->pending;
3196	.id = ev->id,	3196	ev32.sequence = ev->sequence;
3197	};	3197	ev32.timestamp.tv_sec = ev->timestamp.tv_sec;
		3198	ev32.timestamp.tv_nsec = ev->timestamp.tv_nsec;
		3199	ev32.id = ev->id;
3198		3200
3199	memcpy(&ev32.u, &ev->u, sizeof(ev->u));	3201	memcpy(&ev32.u, &ev->u, sizeof(ev->u));
3200	memcpy(&ev32.reserved, &ev->reserved, sizeof(ev->reserved));	3202	memcpy(&ev32.reserved, &ev->reserved, sizeof(ev->reserved));
@@ -3208,21 +3210,23 @@ static int video_put_user(void __user arg, void parg, unsigned int cmd) · 7 unmodified lines
3208	case VIDIOC_DQBUF_TIME32:	3210	case VIDIOC_DQBUF_TIME32:
3209	case VIDIOC_PREPARE_BUF_TIME32: {	3211	case VIDIOC_PREPARE_BUF_TIME32: {
3210	struct v4l2_buffer *vb = parg;	3212	struct v4l2_buffer *vb = parg;
3211	struct v4l2_buffer_time32 vb32 = {	3213	struct v4l2_buffer_time32 vb32;
3212	.index = vb->index,	3214
3213	.type = vb->type,	3215	memset(&vb32, 0, sizeof(vb32));
3214	.bytesused = vb->bytesused,	3216
3215	.flags = vb->flags,	3217	vb32.index = vb->index;
3216	.field = vb->field,	3218	vb32.type = vb->type;
3217	.timestamp.tv_sec = vb->timestamp.tv_sec,	3219	vb32.bytesused = vb->bytesused;
3218	.timestamp.tv_usec = vb->timestamp.tv_usec,	3220	vb32.flags = vb->flags;
3219	.timecode = vb->timecode,	3221	vb32.field = vb->field;
3220	.sequence = vb->sequence,	3222	vb32.timestamp.tv_sec = vb->timestamp.tv_sec;
3221	.memory = vb->memory,	3223	vb32.timestamp.tv_usec = vb->timestamp.tv_usec;
3222	.m.userptr = vb->m.userptr,	3224	vb32.timecode = vb->timecode;
3223	.length = vb->length,	3225	vb32.sequence = vb->sequence;
3224	.request_fd = vb->request_fd,	3226	vb32.memory = vb->memory;
3225	};	3227	vb32.m.userptr = vb->m.userptr;
		3228	vb32.length = vb->length;
		3229	vb32.request_fd = vb->request_fd;
3226		3230
3227	if (copy_to_user(arg, &vb32, sizeof(vb32)))	3231	if (copy_to_user(arg, &vb32, sizeof(vb32)))
3228	return -EFAULT;	3232	return -EFAULT;

drivers/misc/eeprom/at24.c+7−4

 	nvmem_config.word_size = 1;
 	nvmem_config.size = byte_len;
-	at24->nvmem = devm_nvmem_register(dev, &nvmem_config);
-	if (IS_ERR(at24->nvmem))
-		return PTR_ERR(at24->nvmem);
 	i2c_set_clientdata(client, at24);
 	err = regulator_enable(at24->vcc_reg);
 	pm_runtime_set_active(dev);
 	pm_runtime_enable(dev);
+	at24->nvmem = devm_nvmem_register(dev, &nvmem_config);
+	if (IS_ERR(at24->nvmem)) {
+		pm_runtime_disable(dev);
+		regulator_disable(at24->vcc_reg);
+		return PTR_ERR(at24->nvmem);
+	}
 	/*
 	 * Perform a one-byte test read to verify that the
 	 * chip is functional.

drivers/misc/habanalabs/common/debugfs.c+1−1

@@ -982,7 +982,7 @@ static ssize_t hl_clk_gate_read(struct file f, char __user buf, · 981 unmodified lines
982	return 0;	982	return 0;
983		983
984	sprintf(tmp_buf, "0x%llx\n", hdev->clock_gating_mask);	984	sprintf(tmp_buf, "0x%llx\n", hdev->clock_gating_mask);
985	rc = simple_read_from_buffer(buf, strlen(tmp_buf) + 1, ppos, tmp_buf,	985	rc = simple_read_from_buffer(buf, count, ppos, tmp_buf,
986	strlen(tmp_buf) + 1);	986	strlen(tmp_buf) + 1);
987		987
988	return rc;	988	return rc;

drivers/misc/habanalabs/include/gaudi/gaudi_masks.h+16−16

drivers/mmc/core/sdio_ops.c+22−17

@@ -121,6 +121,7 @@ int mmc_io_rw_extended(struct mmc_card *card, int write, unsigned fn, · 120 unmodified lines
121	struct sg_table sgtable;	121	struct sg_table sgtable;
122	unsigned int nents, left_size, i;	122	unsigned int nents, left_size, i;
123	unsigned int seg_size = card->host->max_seg_size;	123	unsigned int seg_size = card->host->max_seg_size;
		124	int err;
124		125
125	WARN_ON(blksz == 0);	126	WARN_ON(blksz == 0);
126		127
@@ -170,28 +171,32 @@ int mmc_io_rw_extended(struct mmc_card *card, int write, unsigned fn, · 43 unmodified lines
170		171
171	mmc_set_data_timeout(&data, card);	172	mmc_set_data_timeout(&data, card);
172		173
173	mmc_wait_for_req(card->host, &mrq);	174	mmc_pre_req(card->host, &mrq);
174		175
175	if (nents > 1)	176	mmc_wait_for_req(card->host, &mrq);
176	sg_free_table(&sgtable);
177		177
178	if (cmd.error)	178	if (cmd.error)
179	return cmd.error;	179	err = cmd.error;
180	if (data.error)	180	else if (data.error)
181	return data.error;	181	err = data.error;
182		182	else if (mmc_host_is_spi(card->host))
183	if (mmc_host_is_spi(card->host)) {
184	/* host driver already reported errors */	183	/* host driver already reported errors */
185	} else {	184	err = 0;
186	if (cmd.resp[0] & R5_ERROR)	185	else if (cmd.resp[0] & R5_ERROR)
187	return -EIO;	186	err = -EIO;
188	if (cmd.resp[0] & R5_FUNCTION_NUMBER)	187	else if (cmd.resp[0] & R5_FUNCTION_NUMBER)
189	return -EINVAL;	188	err = -EINVAL;
190	if (cmd.resp[0] & R5_OUT_OF_RANGE)	189	else if (cmd.resp[0] & R5_OUT_OF_RANGE)
191	return -ERANGE;	190	err = -ERANGE;
192	}	191	else
		192	err = 0;
193		193
194	return 0;	194	mmc_post_req(card->host, &mrq, err);
		195
		196	if (nents > 1)
		197	sg_free_table(&sgtable);
		198
		199	return err;
195	}	200	}
196		201
197	int sdio_reset(struct mmc_host *host)	202	int sdio_reset(struct mmc_host *host)

drivers/mmc/host/Kconfig+1−1

@@ -602,7 +602,7 @@ config MMC_GOLDFISH · 601 unmodified lines
602		602
603	config MMC_SPI	603	config MMC_SPI
604	tristate "MMC/SD/SDIO over SPI"	604	tristate "MMC/SD/SDIO over SPI"
605	depends on SPI_MASTER && HAS_DMA	605	depends on SPI_MASTER
606	select CRC7	606	select CRC7
607	select CRC_ITU_T	607	select CRC_ITU_T
608	help	608	help

drivers/mmc/host/mmc_spi.c+52−34

@@ -1278,6 +1278,52 @@ mmc_spi_detect_irq(int irq, void *mmc) · 1277 unmodified lines
1278	return IRQ_HANDLED;	1278	return IRQ_HANDLED;
1279	}	1279	}
1280		1280
		1281	#ifdef CONFIG_HAS_DMA
		1282	static int mmc_spi_dma_alloc(struct mmc_spi_host *host)
		1283	{
		1284	struct spi_device *spi = host->spi;
		1285	struct device *dev;
		1286
		1287	if (!spi->master->dev.parent->dma_mask)
		1288	return 0;
		1289
		1290	dev = spi->master->dev.parent;
		1291
		1292	host->ones_dma = dma_map_single(dev, host->ones, MMC_SPI_BLOCKSIZE,
		1293	DMA_TO_DEVICE);
		1294	if (dma_mapping_error(dev, host->ones_dma))
		1295	return -ENOMEM;
		1296
		1297	host->data_dma = dma_map_single(dev, host->data, sizeof(*host->data),
		1298	DMA_BIDIRECTIONAL);
		1299	if (dma_mapping_error(dev, host->data_dma)) {
		1300	dma_unmap_single(dev, host->ones_dma, MMC_SPI_BLOCKSIZE,
		1301	DMA_TO_DEVICE);
		1302	return -ENOMEM;
		1303	}
		1304
		1305	dma_sync_single_for_cpu(dev, host->data_dma, sizeof(*host->data),
		1306	DMA_BIDIRECTIONAL);
		1307
		1308	host->dma_dev = dev;
		1309	return 0;
		1310	}
		1311
		1312	static void mmc_spi_dma_free(struct mmc_spi_host *host)
		1313	{
		1314	if (!host->dma_dev)
		1315	return;
		1316
		1317	dma_unmap_single(host->dma_dev, host->ones_dma, MMC_SPI_BLOCKSIZE,
		1318	DMA_TO_DEVICE);
		1319	dma_unmap_single(host->dma_dev, host->data_dma, sizeof(*host->data),
		1320	DMA_BIDIRECTIONAL);
		1321	}
		1322	#else
		1323	static inline mmc_spi_dma_alloc(struct mmc_spi_host *host) { return 0; }
		1324	static inline void mmc_spi_dma_free(struct mmc_spi_host *host) {}
		1325	#endif
		1326
1281	static int mmc_spi_probe(struct spi_device *spi)	1327	static int mmc_spi_probe(struct spi_device *spi)
1282	{	1328	{
1283	void *ones;	1329	void *ones;
@@ -1374,23 +1420,9 @@ static int mmc_spi_probe(struct spi_device *spi) · 90 unmodified lines
1374	if (!host->data)	1420	if (!host->data)
1375	goto fail_nobuf1;	1421	goto fail_nobuf1;
1376		1422
1377	if (spi->master->dev.parent->dma_mask) {	1423	status = mmc_spi_dma_alloc(host);
1378	struct device *dev = spi->master->dev.parent;	1424	if (status)
1379		1425	goto fail_dma;
1380	host->dma_dev = dev;
1381	host->ones_dma = dma_map_single(dev, ones,
1382	MMC_SPI_BLOCKSIZE, DMA_TO_DEVICE);
1383	if (dma_mapping_error(dev, host->ones_dma))
1384	goto fail_ones_dma;
1385	host->data_dma = dma_map_single(dev, host->data,
1386	sizeof(*host->data), DMA_BIDIRECTIONAL);
1387	if (dma_mapping_error(dev, host->data_dma))
1388	goto fail_data_dma;
1389
1390	dma_sync_single_for_cpu(host->dma_dev,
1391	host->data_dma, sizeof(*host->data),
1392	DMA_BIDIRECTIONAL);
1393	}
1394		1426
1395	/* setup message for status/busy readback */	1427	/* setup message for status/busy readback */
1396	spi_message_init(&host->readback);	1428	spi_message_init(&host->readback);
@@ -1458,20 +1490,12 @@ static int mmc_spi_probe(struct spi_device *spi) · 61 unmodified lines
1458	fail_add_host:	1490	fail_add_host:
1459	mmc_remove_host(mmc);	1491	mmc_remove_host(mmc);
1460	fail_glue_init:	1492	fail_glue_init:
1461	if (host->dma_dev)	1493	mmc_spi_dma_free(host);
1462	dma_unmap_single(host->dma_dev, host->data_dma,	1494	fail_dma:
1463	sizeof(*host->data), DMA_BIDIRECTIONAL);
1464	fail_data_dma:
1465	if (host->dma_dev)
1466	dma_unmap_single(host->dma_dev, host->ones_dma,
1467	MMC_SPI_BLOCKSIZE, DMA_TO_DEVICE);
1468	fail_ones_dma:
1469	kfree(host->data);	1495	kfree(host->data);
1470
1471	fail_nobuf1:	1496	fail_nobuf1:
1472	mmc_free_host(mmc);	1497	mmc_free_host(mmc);
1473	mmc_spi_put_pdata(spi);	1498	mmc_spi_put_pdata(spi);
1474
1475	nomem:	1499	nomem:
1476	kfree(ones);	1500	kfree(ones);
1477	return status;	1501	return status;
@@ -1489,13 +1513,7 @@ static int mmc_spi_remove(struct spi_device *spi) · 11 unmodified lines
1489		1513
1490	mmc_remove_host(mmc);	1514	mmc_remove_host(mmc);
1491		1515
1492	if (host->dma_dev) {	1516	mmc_spi_dma_free(host);
1493	dma_unmap_single(host->dma_dev, host->ones_dma,
1494	MMC_SPI_BLOCKSIZE, DMA_TO_DEVICE);
1495	dma_unmap_single(host->dma_dev, host->data_dma,
1496	sizeof(*host->data), DMA_BIDIRECTIONAL);
1497	}
1498
1499	kfree(host->data);	1517	kfree(host->data);
1500	kfree(host->ones);	1518	kfree(host->ones);
1501		1519

drivers/mmc/host/mtk-sd.c+13−0

 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
+#include <linux/reset.h>
 #include <linux/mmc/card.h>
 #include <linux/mmc/core.h>
 	struct pinctrl_state *pins_uhs;
 	struct delayed_work req_timeout;
 	int irq;		/* host interrupt */
+	struct reset_control *reset;
 	struct clk *src_clk;	/* msdc source clock */
 	struct clk *h_clk;      /* msdc h_clk */
 	u32 val;
 	u32 tune_reg = host->dev_comp->pad_tune_reg;
+	if (host->reset) {
+		reset_control_assert(host->reset);
+		usleep_range(10, 50);
+		reset_control_deassert(host->reset);
+	}
 	/* Configure to MMC/SD mode, clock free running */
 	sdr_set_bits(host->base + MSDC_CFG, MSDC_CFG_MODE | MSDC_CFG_CKPDN);
 	if (IS_ERR(host->src_clk_cg))
 		host->src_clk_cg = NULL;
+	host->reset = devm_reset_control_get_optional_exclusive(&pdev->dev,
+								"hrst");
+	if (IS_ERR(host->reset))
+		return PTR_ERR(host->reset);
 	host->irq = platform_get_irq(pdev, 0);
 	if (host->irq < 0) {
 		ret = -EINVAL;

drivers/mmc/host/sdhci-acpi.c+77−13

@@ -535,6 +535,11 @@ static const struct sdhci_acpi_slot sdhci_acpi_slot_qcom_sd = { · 534 unmodified lines
535	.caps = MMC_CAP_NONREMOVABLE,	535	.caps = MMC_CAP_NONREMOVABLE,
536	};	536	};
537		537
		538	struct amd_sdhci_host {
		539	bool tuned_clock;
		540	bool dll_enabled;
		541	};
		542
538	/* AMD sdhci reset dll register. */	543	/* AMD sdhci reset dll register. */
539	#define SDHCI_AMD_RESET_DLL_REGISTER 0x908	544	#define SDHCI_AMD_RESET_DLL_REGISTER 0x908
540		545
@@ -546,39 +551,96 @@ static int amd_select_drive_strength(struct mmc_card *card, · 5 unmodified lines
546	return MMC_SET_DRIVER_TYPE_A;	551	return MMC_SET_DRIVER_TYPE_A;
547	}	552	}
548		553
549	static void sdhci_acpi_amd_hs400_dll(struct sdhci_host *host)	554	static void sdhci_acpi_amd_hs400_dll(struct sdhci_host *host, bool enable)
550	{	555	{
		556	struct sdhci_acpi_host *acpi_host = sdhci_priv(host);
		557	struct amd_sdhci_host *amd_host = sdhci_acpi_priv(acpi_host);
		558
551	/* AMD Platform requires dll setting */	559	/* AMD Platform requires dll setting */
552	sdhci_writel(host, 0x40003210, SDHCI_AMD_RESET_DLL_REGISTER);	560	sdhci_writel(host, 0x40003210, SDHCI_AMD_RESET_DLL_REGISTER);
553	usleep_range(10, 20);	561	usleep_range(10, 20);
554	sdhci_writel(host, 0x40033210, SDHCI_AMD_RESET_DLL_REGISTER);	562	if (enable)
		563	sdhci_writel(host, 0x40033210, SDHCI_AMD_RESET_DLL_REGISTER);
		564
		565	amd_host->dll_enabled = enable;
555	}	566	}
556		567
557	/*	568	/*
558	* For AMD Platform it is required to disable the tuning	569	* The initialization sequence for HS400 is:
559	* bit first controller to bring to HS Mode from HS200	570	* HS->HS200->Perform Tuning->HS->HS400
560	* mode, later enable to tune to HS400 mode.	571	*
		572	* The re-tuning sequence is:
		573	* HS400->DDR52->HS->HS200->Perform Tuning->HS->HS400
		574	*
		575	* The AMD eMMC Controller can only use the tuned clock while in HS200 and HS400
		576	* mode. If we switch to a different mode, we need to disable the tuned clock.
		577	* If we have previously performed tuning and switch back to HS200 or
		578	* HS400, we can re-enable the tuned clock.
		579	*
561	*/	580	*/
562	static void amd_set_ios(struct mmc_host mmc, struct mmc_ios ios)	581	static void amd_set_ios(struct mmc_host mmc, struct mmc_ios ios)
563	{	582	{
564	struct sdhci_host *host = mmc_priv(mmc);	583	struct sdhci_host *host = mmc_priv(mmc);
		584	struct sdhci_acpi_host *acpi_host = sdhci_priv(host);
		585	struct amd_sdhci_host *amd_host = sdhci_acpi_priv(acpi_host);
565	unsigned int old_timing = host->timing;	586	unsigned int old_timing = host->timing;
		587	u16 val;
566		588
567	sdhci_set_ios(mmc, ios);	589	sdhci_set_ios(mmc, ios);
568	if (old_timing == MMC_TIMING_MMC_HS200 &&	590
569	ios->timing == MMC_TIMING_MMC_HS)	591	if (old_timing != host->timing && amd_host->tuned_clock) {
570	sdhci_writew(host, 0x9, SDHCI_HOST_CONTROL2);	592	if (host->timing == MMC_TIMING_MMC_HS400 \|\|
571	if (old_timing != MMC_TIMING_MMC_HS400 &&	593	host->timing == MMC_TIMING_MMC_HS200) {
572	ios->timing == MMC_TIMING_MMC_HS400) {	594	val = sdhci_readw(host, SDHCI_HOST_CONTROL2);
573	sdhci_writew(host, 0x80, SDHCI_HOST_CONTROL2);	595	val \|= SDHCI_CTRL_TUNED_CLK;
574	sdhci_acpi_amd_hs400_dll(host);	596	sdhci_writew(host, val, SDHCI_HOST_CONTROL2);
		597	} else {
		598	val = sdhci_readw(host, SDHCI_HOST_CONTROL2);
		599	val &= ~SDHCI_CTRL_TUNED_CLK;
		600	sdhci_writew(host, val, SDHCI_HOST_CONTROL2);
		601	}
		602
		603	/* DLL is only required for HS400 */
		604	if (host->timing == MMC_TIMING_MMC_HS400 &&
		605	!amd_host->dll_enabled)
		606	sdhci_acpi_amd_hs400_dll(host, true);
		607	}
		608	}
		609
		610	static int amd_sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
		611	{
		612	int err;
		613	struct sdhci_host *host = mmc_priv(mmc);
		614	struct sdhci_acpi_host *acpi_host = sdhci_priv(host);
		615	struct amd_sdhci_host *amd_host = sdhci_acpi_priv(acpi_host);
		616
		617	amd_host->tuned_clock = false;
		618
		619	err = sdhci_execute_tuning(mmc, opcode);
		620
		621	if (!err && !host->tuning_err)
		622	amd_host->tuned_clock = true;
		623
		624	return err;
		625	}
		626
		627	static void amd_sdhci_reset(struct sdhci_host *host, u8 mask)
		628	{
		629	struct sdhci_acpi_host *acpi_host = sdhci_priv(host);
		630	struct amd_sdhci_host *amd_host = sdhci_acpi_priv(acpi_host);
		631
		632	if (mask & SDHCI_RESET_ALL) {
		633	amd_host->tuned_clock = false;
		634	sdhci_acpi_amd_hs400_dll(host, false);
575	}	635	}
		636
		637	sdhci_reset(host, mask);
576	}	638	}
577		639
578	static const struct sdhci_ops sdhci_acpi_ops_amd = {	640	static const struct sdhci_ops sdhci_acpi_ops_amd = {
579	.set_clock = sdhci_set_clock,	641	.set_clock = sdhci_set_clock,
580	.set_bus_width = sdhci_set_bus_width,	642	.set_bus_width = sdhci_set_bus_width,
581	.reset = sdhci_reset,	643	.reset = amd_sdhci_reset,
582	.set_uhs_signaling = sdhci_set_uhs_signaling,	644	.set_uhs_signaling = sdhci_set_uhs_signaling,
583	};	645	};
584		646
@@ -602,6 +664,7 @@ static int sdhci_acpi_emmc_amd_probe_slot(struct platform_device *pdev, · 17 unmodified lines
602		664
603	host->mmc_host_ops.select_drive_strength = amd_select_drive_strength;	665	host->mmc_host_ops.select_drive_strength = amd_select_drive_strength;
604	host->mmc_host_ops.set_ios = amd_set_ios;	666	host->mmc_host_ops.set_ios = amd_set_ios;
		667	host->mmc_host_ops.execute_tuning = amd_sdhci_execute_tuning;
605	return 0;	668	return 0;
606	}	669	}
607		670
@@ -613,6 +676,7 @@ static const struct sdhci_acpi_slot sdhci_acpi_slot_amd_emmc = { · 5 unmodified lines
613	SDHCI_QUIRK_32BIT_ADMA_SIZE,	676	SDHCI_QUIRK_32BIT_ADMA_SIZE,
614	.quirks2 = SDHCI_QUIRK2_BROKEN_64_BIT_DMA,	677	.quirks2 = SDHCI_QUIRK2_BROKEN_64_BIT_DMA,
615	.probe_slot = sdhci_acpi_emmc_amd_probe_slot,	678	.probe_slot = sdhci_acpi_emmc_amd_probe_slot,
		679	.priv_size = sizeof(struct amd_sdhci_host),
616	};	680	};
617		681
618	struct sdhci_acpi_uid_slot {	682	struct sdhci_acpi_uid_slot {

drivers/mmc/host/sdhci-msm.c+17−1

@@ -1166,7 +1166,7 @@ static void sdhci_msm_set_cdr(struct sdhci_host *host, bool enable) · 1165 unmodified lines
1166	static int sdhci_msm_execute_tuning(struct mmc_host *mmc, u32 opcode)	1166	static int sdhci_msm_execute_tuning(struct mmc_host *mmc, u32 opcode)
1167	{	1167	{
1168	struct sdhci_host *host = mmc_priv(mmc);	1168	struct sdhci_host *host = mmc_priv(mmc);
1169	int tuning_seq_cnt = 3;	1169	int tuning_seq_cnt = 10;
1170	u8 phase, tuned_phases[16], tuned_phase_cnt = 0;	1170	u8 phase, tuned_phases[16], tuned_phase_cnt = 0;
1171	int rc;	1171	int rc;
1172	struct mmc_ios ios = host->mmc->ios;	1172	struct mmc_ios ios = host->mmc->ios;
@@ -1222,6 +1222,22 @@ retry: · 49 unmodified lines
1222	} while (++phase < ARRAY_SIZE(tuned_phases));	1222	} while (++phase < ARRAY_SIZE(tuned_phases));
1223		1223
1224	if (tuned_phase_cnt) {	1224	if (tuned_phase_cnt) {
		1225	if (tuned_phase_cnt == ARRAY_SIZE(tuned_phases)) {
		1226	/*
		1227	* All phases valid is _almost_ as bad as no phases
		1228	* valid. Probably all phases are not really reliable
		1229	* but we didn't detect where the unreliable place is.
		1230	* That means we'll essentially be guessing and hoping
		1231	* we get a good phase. Better to try a few times.
		1232	*/
		1233	dev_dbg(mmc_dev(mmc), "%s: All phases valid; try again\n",
		1234	mmc_hostname(mmc));
		1235	if (--tuning_seq_cnt) {
		1236	tuned_phase_cnt = 0;
		1237	goto retry;
		1238	}
		1239	}
		1240
1225	rc = msm_find_most_appropriate_phase(host, tuned_phases,	1241	rc = msm_find_most_appropriate_phase(host, tuned_phases,
1226	tuned_phase_cnt);	1242	tuned_phase_cnt);
1227	if (rc < 0)	1243	if (rc < 0)

drivers/mmc/host/sdhci-of-esdhc.c+7−3

 	bool quirk_tuning_erratum_type2;
 	bool quirk_ignore_data_inhibit;
 	bool quirk_delay_before_data_reset;
+	bool quirk_trans_complete_erratum;
 	bool in_sw_tuning;
 	unsigned int peripheral_clock;
 	const struct esdhc_clk_fixup *clk_fixup;
 static u32 esdhc_irq(struct sdhci_host *host, u32 intmask)
 {
+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+	struct sdhci_esdhc *esdhc = sdhci_pltfm_priv(pltfm_host);
 	u32 command;
-	if (of_find_compatible_node(NULL, NULL,
+	if (esdhc->quirk_trans_complete_erratum) {
-				"fsl,p2020-esdhc")) {
 		command = SDHCI_GET_CMD(sdhci_readw(host,
 					SDHCI_COMMAND));
 		if (command == MMC_WRITE_MULTIPLE_BLOCK &&
 		esdhc->clk_fixup = match->data;
 	np = pdev->dev.of_node;
-	if (of_device_is_compatible(np, "fsl,p2020-esdhc"))
+	if (of_device_is_compatible(np, "fsl,p2020-esdhc")) {
 		esdhc->quirk_delay_before_data_reset = true;
+		esdhc->quirk_trans_complete_erratum = true;
+	}
 	clk = of_clk_get(np, 0);
 	if (!IS_ERR(clk)) {

drivers/mmc/host/sdhci-pci-core.c+9−1

 	sdhci_dumpregs(mmc_priv(mmc));
 }
+static void sdhci_cqhci_reset(struct sdhci_host *host, u8 mask)
+{
+	if ((host->mmc->caps2 & MMC_CAP2_CQE) && (mask & SDHCI_RESET_ALL) &&
+	    host->mmc->cqe_private)
+		cqhci_deactivate(host->mmc);
+	sdhci_reset(host, mask);
+}
 /*****************************************************************************\
  *                                                                           *
  * Hardware specific quirk handling                                          *
 	.set_power		= sdhci_intel_set_power,
 	.enable_dma		= sdhci_pci_enable_dma,
 	.set_bus_width		= sdhci_set_bus_width,
-	.reset			= sdhci_reset,
+	.reset			= sdhci_cqhci_reset,
 	.set_uhs_signaling	= sdhci_set_uhs_signaling,
 	.hw_reset		= sdhci_pci_hw_reset,
 	.irq			= sdhci_cqhci_irq,

drivers/mmc/host/sdhci-tegra.c+51−4

 #define NVQUIRK_DIS_CARD_CLK_CONFIG_TAP			BIT(8)
 #define NVQUIRK_CQHCI_DCMD_R1B_CMD_TIMING		BIT(9)
+/*
+ * NVQUIRK_HAS_TMCLK is for SoC's having separate timeout clock for Tegra
+ * SDMMC hardware data timeout.
+ */
+#define NVQUIRK_HAS_TMCLK				BIT(10)
 /* SDMMC CQE Base Address for Tegra Host Ver 4.1 and Higher */
 #define SDHCI_TEGRA_CQE_BASE_ADDR			0xF000
 struct sdhci_tegra {
 	const struct sdhci_tegra_soc_data *soc_data;
 	struct gpio_desc *power_gpio;
+	struct clk *tmclk;
 	bool ddr_signaling;
 	bool pad_calib_required;
 	bool pad_control_available;
 static const struct sdhci_pltfm_data sdhci_tegra210_pdata = {
 	.quirks = SDHCI_QUIRK_BROKEN_TIMEOUT_VAL |
-		  SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |
 		  SDHCI_QUIRK_SINGLE_POWER_WRITE |
 		  SDHCI_QUIRK_NO_HISPD_BIT |
 		  SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC |
 		    NVQUIRK_HAS_PADCALIB |
 		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
 		    NVQUIRK_ENABLE_SDR50 |
-		    NVQUIRK_ENABLE_SDR104,
+		    NVQUIRK_ENABLE_SDR104 |
+		    NVQUIRK_HAS_TMCLK,
 	.min_tap_delay = 106,
 	.max_tap_delay = 185,
 };
 static const struct sdhci_pltfm_data sdhci_tegra186_pdata = {
 	.quirks = SDHCI_QUIRK_BROKEN_TIMEOUT_VAL |
-		  SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |
 		  SDHCI_QUIRK_SINGLE_POWER_WRITE |
 		  SDHCI_QUIRK_NO_HISPD_BIT |
 		  SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC |
 		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
 		    NVQUIRK_ENABLE_SDR50 |
 		    NVQUIRK_ENABLE_SDR104 |
+		    NVQUIRK_HAS_TMCLK |
 		    NVQUIRK_CQHCI_DCMD_R1B_CMD_TIMING,
 	.min_tap_delay = 84,
 	.max_tap_delay = 136,
 		    NVQUIRK_HAS_PADCALIB |
 		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
 		    NVQUIRK_ENABLE_SDR50 |
-		    NVQUIRK_ENABLE_SDR104,
+		    NVQUIRK_ENABLE_SDR104 |
+		    NVQUIRK_HAS_TMCLK,
 	.min_tap_delay = 96,
 	.max_tap_delay = 139,
 };
 		goto err_power_req;
 	}
+	/*
+	 * Tegra210 has a separate SDMMC_LEGACY_TM clock used for host
+	 * timeout clock and SW can choose TMCLK or SDCLK for hardware
+	 * data timeout through the bit USE_TMCLK_FOR_DATA_TIMEOUT of
+	 * the register SDHCI_TEGRA_VENDOR_SYS_SW_CTRL.
+	 *
+	 * USE_TMCLK_FOR_DATA_TIMEOUT bit default is set to 1 and SDMMC uses
+	 * 12Mhz TMCLK which is advertised in host capability register.
+	 * With TMCLK of 12Mhz provides maximum data timeout period that can
+	 * be achieved is 11s better than using SDCLK for data timeout.
+	 *
+	 * So, TMCLK is set to 12Mhz and kept enabled all the time on SoC's
+	 * supporting separate TMCLK.
+	 */
+	if (soc_data->nvquirks & NVQUIRK_HAS_TMCLK) {
+		clk = devm_clk_get(&pdev->dev, "tmclk");
+		if (IS_ERR(clk)) {
+			rc = PTR_ERR(clk);
+			if (rc == -EPROBE_DEFER)
+				goto err_power_req;
+			dev_warn(&pdev->dev, "failed to get tmclk: %d\n", rc);
+			clk = NULL;
+		}
+		clk_set_rate(clk, 12000000);
+		rc = clk_prepare_enable(clk);
+		if (rc) {
+			dev_err(&pdev->dev,
+				"failed to enable tmclk: %d\n", rc);
+			goto err_power_req;
+		}
+		tegra_host->tmclk = clk;
+	}
 	clk = devm_clk_get(mmc_dev(host->mmc), NULL);
 	if (IS_ERR(clk)) {
 		rc = PTR_ERR(clk);
 err_rst_get:
 	clk_disable_unprepare(pltfm_host->clk);
 err_clk_get:
+	clk_disable_unprepare(tegra_host->tmclk);
 err_power_req:
 err_parse_dt:
 	sdhci_pltfm_free(pdev);
 	reset_control_assert(tegra_host->rst);
 	usleep_range(2000, 4000);
 	clk_disable_unprepare(pltfm_host->clk);
+	clk_disable_unprepare(tegra_host->tmclk);
 	sdhci_pltfm_free(pdev);

drivers/net/dsa/mt7530.c+5−2

 			if (phy_node->parent == priv->dev->of_node->parent) {
 				ret = of_get_phy_mode(mac_np, &interface);
-				if (ret && ret != -ENODEV)
+				if (ret && ret != -ENODEV) {
+					of_node_put(mac_np);
 					return ret;
+				}
 				id = of_mdio_parse_addr(ds->dev, phy_node);
 				if (id == 0)
 					priv->p5_intf_sel = P5_INTF_SEL_PHY_P0;
 				if (id == 4)
 					priv->p5_intf_sel = P5_INTF_SEL_PHY_P4;
 			}
+			of_node_put(mac_np);
 			of_node_put(phy_node);
 			break;
 		}
 		phylink_set(mask, 100baseT_Full);
 		if (state->interface != PHY_INTERFACE_MODE_MII) {
-			phylink_set(mask, 1000baseT_Half);
+			/* This switch only supports 1G full-duplex. */
 			phylink_set(mask, 1000baseT_Full);
 			if (port == 5)
 				phylink_set(mask, 1000baseX_Full);

drivers/net/dsa/ocelot/felix.c+1−0

@@ -400,6 +400,7 @@ static int felix_parse_ports_node(struct felix *felix, · 399 unmodified lines
400	if (err < 0) {	400	if (err < 0) {
401	dev_err(dev, "Unsupported PHY mode %s on port %d\n",	401	dev_err(dev, "Unsupported PHY mode %s on port %d\n",
402	phy_modes(phy_mode), port);	402	phy_modes(phy_mode), port);
		403	of_node_put(child);
403	return err;	404	return err;
404	}	405	}
405		406

drivers/net/dsa/sja1105/sja1105_main.c+1−1

@@ -3415,7 +3415,7 @@ static int sja1105_check_device_id(struct sja1105_private *priv) · 3414 unmodified lines
3415		3415
3416	sja1105_unpack(prod_id, &part_no, 19, 4, SJA1105_SIZE_DEVICE_ID);	3416	sja1105_unpack(prod_id, &part_no, 19, 4, SJA1105_SIZE_DEVICE_ID);
3417		3417
3418	for (match = sja1105_dt_ids; match->compatible; match++) {	3418	for (match = sja1105_dt_ids; match->compatible[0]; match++) {
3419	const struct sja1105_info *info = match->data;	3419	const struct sja1105_info *info = match->data;
3420		3420
3421	/* Is what's been probed in our match table at all? */	3421	/* Is what's been probed in our match table at all? */

drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c+13−0

 	XGBE_PORT_MODE_10GBASE_T,
 	XGBE_PORT_MODE_10GBASE_R,
 	XGBE_PORT_MODE_SFP,
+	XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG,
 	XGBE_PORT_MODE_MAX,
 };
 	if (ad_reg & 0x80) {
 		switch (phy_data->port_mode) {
 		case XGBE_PORT_MODE_BACKPLANE:
+		case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:
 			mode = XGBE_MODE_KR;
 			break;
 		default:
 	} else if (ad_reg & 0x20) {
 		switch (phy_data->port_mode) {
 		case XGBE_PORT_MODE_BACKPLANE:
+		case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:
 			mode = XGBE_MODE_KX_1000;
 			break;
 		case XGBE_PORT_MODE_1000BASE_X:
 	switch (phy_data->port_mode) {
 	case XGBE_PORT_MODE_BACKPLANE:
+	case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:
 		XGBE_SET_ADV(dlks, 10000baseKR_Full);
 		break;
 	case XGBE_PORT_MODE_BACKPLANE_2500:
 	switch (phy_data->port_mode) {
 	case XGBE_PORT_MODE_BACKPLANE:
 		return XGBE_AN_MODE_CL73;
+	case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:
 	case XGBE_PORT_MODE_BACKPLANE_2500:
 		return XGBE_AN_MODE_NONE;
 	case XGBE_PORT_MODE_1000BASE_T:
 	switch (phy_data->port_mode) {
 	case XGBE_PORT_MODE_BACKPLANE:
+	case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:
 		return xgbe_phy_switch_bp_mode(pdata);
 	case XGBE_PORT_MODE_BACKPLANE_2500:
 		return xgbe_phy_switch_bp_2500_mode(pdata);
 	switch (phy_data->port_mode) {
 	case XGBE_PORT_MODE_BACKPLANE:
+	case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:
 		return xgbe_phy_get_bp_mode(speed);
 	case XGBE_PORT_MODE_BACKPLANE_2500:
 		return xgbe_phy_get_bp_2500_mode(speed);
 	switch (phy_data->port_mode) {
 	case XGBE_PORT_MODE_BACKPLANE:
+	case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:
 		return xgbe_phy_use_bp_mode(pdata, mode);
 	case XGBE_PORT_MODE_BACKPLANE_2500:
 		return xgbe_phy_use_bp_2500_mode(pdata, mode);
 	switch (phy_data->port_mode) {
 	case XGBE_PORT_MODE_BACKPLANE:
+	case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:
 		return xgbe_phy_valid_speed_bp_mode(speed);
 	case XGBE_PORT_MODE_BACKPLANE_2500:
 		return xgbe_phy_valid_speed_bp_2500_mode(speed);
 	switch (phy_data->port_mode) {
 	case XGBE_PORT_MODE_BACKPLANE:
+	case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:
 		if ((phy_data->port_speeds & XGBE_PHY_PORT_SPEED_1000) ||
 		    (phy_data->port_speeds & XGBE_PHY_PORT_SPEED_10000))
 			return false;
 	switch (phy_data->port_mode) {
 	case XGBE_PORT_MODE_BACKPLANE:
+	case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:
 	case XGBE_PORT_MODE_BACKPLANE_2500:
 		if (phy_data->conn_type == XGBE_CONN_TYPE_BACKPLANE)
 			return false;
 	/* Backplane support */
 	case XGBE_PORT_MODE_BACKPLANE:
 		XGBE_SET_SUP(lks, Autoneg);
+		fallthrough;
+	case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:
 		XGBE_SET_SUP(lks, Pause);
 		XGBE_SET_SUP(lks, Asym_Pause);
 		XGBE_SET_SUP(lks, Backplane);

drivers/net/ethernet/arc/emac_mdio.c+1−0

@@ -153,6 +153,7 @@ int arc_mdio_probe(struct arc_emac_priv *priv) · 152 unmodified lines
153	if (IS_ERR(data->reset_gpio)) {	153	if (IS_ERR(data->reset_gpio)) {
154	error = PTR_ERR(data->reset_gpio);	154	error = PTR_ERR(data->reset_gpio);
155	dev_err(priv->dev, "Failed to request gpio: %d\n", error);	155	dev_err(priv->dev, "Failed to request gpio: %d\n", error);
		156	mdiobus_free(bus);
156	return error;	157	return error;
157	}	158	}
158		159

drivers/net/ethernet/broadcom/bcmsysport.c+4−2

 	priv->tx_rings = devm_kcalloc(&pdev->dev, txq,
 				      sizeof(struct bcm_sysport_tx_ring),
 				      GFP_KERNEL);
-	if (!priv->tx_rings)
+	if (!priv->tx_rings) {
-		return -ENOMEM;
+		ret = -ENOMEM;
+		goto err_free_netdev;
+	}
 	priv->is_lite = params->is_lite;
 	priv->num_rx_desc_words = params->num_rx_desc_words;

drivers/net/ethernet/broadcom/bnxt/bnxt.c+59−31

 static void bnxt_queue_fw_reset_work(struct bnxt *bp, unsigned long delay)
 {
+	if (!(test_bit(BNXT_STATE_IN_FW_RESET, &bp->state)))
+		return;
 	if (BNXT_PF(bp))
 		queue_delayed_work(bnxt_pf_wq, &bp->fw_reset_task, delay);
 	else
 static void bnxt_cancel_sp_work(struct bnxt *bp)
 {
-	if (BNXT_PF(bp))
+	if (BNXT_PF(bp)) {
 		flush_workqueue(bnxt_pf_wq);
-	else
+	} else {
 		cancel_work_sync(&bp->sp_task);
+		cancel_delayed_work_sync(&bp->fw_reset_task);
+	}
 }
 static void bnxt_sched_reset(struct bnxt *bp, struct bnxt_rx_ring_info *rxr)
 	return cp + ulp_stat;
 }
+/* Check if a default RSS map needs to be setup.  This function is only
+ * used on older firmware that does not require reserving RX rings.
+ */
+static void bnxt_check_rss_tbl_no_rmgr(struct bnxt *bp)
+{
+	struct bnxt_hw_resc *hw_resc = &bp->hw_resc;
+	/* The RSS map is valid for RX rings set to resv_rx_rings */
+	if (hw_resc->resv_rx_rings != bp->rx_nr_rings) {
+		hw_resc->resv_rx_rings = bp->rx_nr_rings;
+		if (!netif_is_rxfh_configured(bp->dev))
+			bnxt_set_dflt_rss_indir_tbl(bp);
+	}
+}
 static bool bnxt_need_reserve_rings(struct bnxt *bp)
 {
 	struct bnxt_hw_resc *hw_resc = &bp->hw_resc;
 	int rx = bp->rx_nr_rings, stat;
 	int vnic = 1, grp = rx;
-	if (bp->hwrm_spec_code < 0x10601)
+	if (hw_resc->resv_tx_rings != bp->tx_nr_rings &&
-		return false;
+	    bp->hwrm_spec_code >= 0x10601)
-	if (hw_resc->resv_tx_rings != bp->tx_nr_rings)
 		return true;
+	/* Old firmware does not need RX ring reservations but we still
+	 * need to setup a default RSS map when needed.  With new firmware
+	 * we go through RX ring reservations first and then set up the
+	 * RSS map for the successfully reserved RX rings when needed.
+	 */
+	if (!BNXT_NEW_RM(bp)) {
+		bnxt_check_rss_tbl_no_rmgr(bp);
+		return false;
+	}
 	if ((bp->flags & BNXT_FLAG_RFS) && !(bp->flags & BNXT_FLAG_CHIP_P5))
 		vnic = rx + 1;
 	if (bp->flags & BNXT_FLAG_AGG_RINGS)
 		rx <<= 1;
 	stat = bnxt_get_func_stat_ctxs(bp);
-	if (BNXT_NEW_RM(bp) &&
+	if (hw_resc->resv_rx_rings != rx || hw_resc->resv_cp_rings != cp ||
-	    (hw_resc->resv_rx_rings != rx || hw_resc->resv_cp_rings != cp ||
+	    hw_resc->resv_vnics != vnic || hw_resc->resv_stat_ctxs != stat ||
-	     hw_resc->resv_vnics != vnic || hw_resc->resv_stat_ctxs != stat ||
+	    (hw_resc->resv_hw_ring_grps != grp &&
-	     (hw_resc->resv_hw_ring_grps != grp &&
+	     !(bp->flags & BNXT_FLAG_CHIP_P5)))
-	      !(bp->flags & BNXT_FLAG_CHIP_P5))))
 		return true;
 	if ((bp->flags & BNXT_FLAG_CHIP_P5) && BNXT_PF(bp) &&
 	    hw_resc->resv_irqs != nq)
 	if (!tx || !rx || !cp || !grp || !vnic || !stat)
 		return -ENOMEM;
+	if (!netif_is_rxfh_configured(bp->dev))
+		bnxt_set_dflt_rss_indir_tbl(bp);
 	return rc;
 }
 			rc = bnxt_init_int_mode(bp);
 		bnxt_ulp_irq_restart(bp, rc);
 	}
-	if (!netif_is_rxfh_configured(bp->dev))
-		bnxt_set_dflt_rss_indir_tbl(bp);
 	if (rc) {
 		netdev_err(bp->dev, "ring reservation/IRQ init failure rc: %d\n", rc);
 		return rc;
 	struct hwrm_temp_monitor_query_input req = {0};
 	struct hwrm_temp_monitor_query_output *resp;
 	struct bnxt *bp = dev_get_drvdata(dev);
-	u32 temp = 0;
+	u32 len = 0;
 	resp = bp->hwrm_cmd_resp_addr;
 	bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_TEMP_MONITOR_QUERY, -1, -1);
 	mutex_lock(&bp->hwrm_cmd_lock);
-	if (!_hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT))
+	if (!_hwrm_send_message_silent(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT))
-		temp = resp->temp * 1000; /* display millidegree */
+		len = sprintf(buf, "%u\n", resp->temp * 1000); /* display millidegree */
 	mutex_unlock(&bp->hwrm_cmd_lock);
-	return sprintf(buf, "%u\n", temp);
+	if (len)
+		return len;
+	return sprintf(buf, "unknown\n");
 }
 static SENSOR_DEVICE_ATTR(temp1_input, 0444, bnxt_show_temp, NULL, 0);
 		}
 	}
-	bnxt_enable_napi(bp);
-	bnxt_debug_dev_init(bp);
 	rc = bnxt_init_nic(bp, irq_re_init);
 	if (rc) {
 		netdev_err(bp->dev, "bnxt_init_nic err: %x\n", rc);
-		goto open_err;
+		goto open_err_irq;
 	}
+	bnxt_enable_napi(bp);
+	bnxt_debug_dev_init(bp);
 	if (link_re_init) {
 		mutex_lock(&bp->link_lock);
 		rc = bnxt_update_phy_setting(bp);
 		bnxt_vf_reps_open(bp);
 	return 0;
-open_err:
-	bnxt_debug_dev_exit(bp);
-	bnxt_disable_napi(bp);
 open_err_irq:
 	bnxt_del_napi(bp);
 	unregister_netdev(dev);
 	bnxt_dl_unregister(bp);
 	bnxt_shutdown_tc(bp);
+	clear_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
 	bnxt_cancel_sp_work(bp);
 	bp->sp_event = 0;
 	if (BNXT_CHIP_P5(bp))
 		bp->flags |= BNXT_FLAG_CHIP_P5;
+	rc = bnxt_alloc_rss_indir_tbl(bp);
+	if (rc)
+		goto init_err_pci_clean;
 	rc = bnxt_fw_init_one_p2(bp);
 	if (rc)
 		goto init_err_pci_clean;
 	 */
 	bp->tx_nr_rings_per_tc = bp->tx_nr_rings;
-	rc = bnxt_alloc_rss_indir_tbl(bp);
-	if (rc)
-		goto init_err_pci_clean;
-	bnxt_set_dflt_rss_indir_tbl(bp);
 	if (BNXT_PF(bp)) {
 		if (!bnxt_pf_wq) {
 			bnxt_pf_wq =
 		    (long)pci_resource_start(pdev, 0), dev->dev_addr);
 	pcie_print_link_status(pdev);
+	pci_save_state(pdev);
 	return 0;
 init_err_cleanup:
 			"Cannot re-enable PCI device after reset.\n");
 	} else {
 		pci_set_master(pdev);
+		pci_restore_state(pdev);
+		pci_save_state(pdev);
 		err = bnxt_hwrm_func_reset(bp);
 		if (!err) {

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c+6−10

 static int bnxt_get_num_ring_stats(struct bnxt *bp)
 {
 	int rx, tx, cmn;
-	bool sh = false;
-	if (bp->flags & BNXT_FLAG_SHARED_RINGS)
-		sh = true;
 	rx = NUM_RING_RX_HW_STATS + NUM_RING_RX_SW_STATS +
 	     bnxt_get_num_tpa_ring_stats(bp);
 	tx = NUM_RING_TX_HW_STATS;
 	cmn = NUM_RING_CMN_SW_STATS;
-	if (sh)
+	return rx * bp->rx_nr_rings + tx * bp->tx_nr_rings +
-		return (rx + tx + cmn) * bp->cp_nr_rings;
+	       cmn * bp->cp_nr_rings;
-	else
-		return rx * bp->rx_nr_rings + tx * bp->tx_nr_rings +
-		       cmn * bp->cp_nr_rings;
 }
 static int bnxt_get_num_stats(struct bnxt *bp)
 	int max_tx_sch_inputs;
 	/* Get the most up-to-date max_tx_sch_inputs. */
-	if (BNXT_NEW_RM(bp))
+	if (netif_running(dev) && BNXT_NEW_RM(bp))
 		bnxt_hwrm_func_resc_qcaps(bp, false);
 	max_tx_sch_inputs = hw_resc->max_tx_sch_inputs;
 	if (rc != 0)
 		return rc;
+	if (!dir_entries || !entry_length)
+		return -EIO;
 	/* Insert 2 bytes of directory info (count and size of entries) */
 	if (len < 2)
 		return -EINVAL;

drivers/net/ethernet/broadcom/genet/bcmgenet.c+1−1

@@ -1364,7 +1364,7 @@ static int bcmgenet_validate_flow(struct net_device *dev, · 1363 unmodified lines
1364	case ETHER_FLOW:	1364	case ETHER_FLOW:
1365	eth_mask = &cmd->fs.m_u.ether_spec;	1365	eth_mask = &cmd->fs.m_u.ether_spec;
1366	/* don't allow mask which isn't valid */	1366	/* don't allow mask which isn't valid */
1367	if (VALIDATE_MASK(eth_mask->h_source) \|\|	1367	if (VALIDATE_MASK(eth_mask->h_dest) \|\|
1368	VALIDATE_MASK(eth_mask->h_source) \|\|	1368	VALIDATE_MASK(eth_mask->h_source) \|\|
1369	VALIDATE_MASK(eth_mask->h_proto)) {	1369	VALIDATE_MASK(eth_mask->h_proto)) {
1370	netdev_err(dev, "rxnfc: Unsupported mask\n");	1370	netdev_err(dev, "rxnfc: Unsupported mask\n");

drivers/net/ethernet/broadcom/tg3.c+13−4

 static inline void tg3_reset_task_cancel(struct tg3 *tp)
 {
-	cancel_work_sync(&tp->reset_task);
+	if (test_and_clear_bit(TG3_FLAG_RESET_TASK_PENDING, tp->tg3_flags))
-	tg3_flag_clear(tp, RESET_TASK_PENDING);
+		cancel_work_sync(&tp->reset_task);
 	tg3_flag_clear(tp, TX_RECOVERY_PENDING);
 }
 	tg3_halt(tp, RESET_KIND_SHUTDOWN, 0);
 	err = tg3_init_hw(tp, true);
-	if (err)
+	if (err) {
+		tg3_full_unlock(tp);
+		tp->irq_sync = 0;
+		tg3_napi_enable(tp);
+		/* Clear this flag so that tg3_reset_task_cancel() will not
+		 * call cancel_work_sync() and wait forever.
+		 */
+		tg3_flag_clear(tp, RESET_TASK_PENDING);
+		dev_close(tp->dev);
 		goto out;
+	}
 	tg3_netif_start(tp);
-out:
 	tg3_full_unlock(tp);
 	if (!err)
 		tg3_phy_start(tp);
 	tg3_flag_clear(tp, RESET_TASK_PENDING);
+out:
 	rtnl_unlock();
 }

drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c+6−2

 int cxgb4_thermal_init(struct adapter *adap)
 {
 	struct ch_thermal *ch_thermal = &adap->ch_thermal;
+	char ch_tz_name[THERMAL_NAME_LENGTH];
 	int num_trip = CXGB4_NUM_TRIPS;
 	u32 param, val;
 	int ret;
 		ch_thermal->trip_type = THERMAL_TRIP_CRITICAL;
 	}
-	ch_thermal->tzdev = thermal_zone_device_register("cxgb4", num_trip,
+	snprintf(ch_tz_name, sizeof(ch_tz_name), "cxgb4_%s", adap->name);
+	ch_thermal->tzdev = thermal_zone_device_register(ch_tz_name, num_trip,
 							 0, adap,
 							 &cxgb4_thermal_ops,
 							 NULL, 0, 0);
 int cxgb4_thermal_remove(struct adapter *adap)
 {
-	if (adap->ch_thermal.tzdev)
+	if (adap->ch_thermal.tzdev) {
 		thermal_zone_device_unregister(adap->ch_thermal.tzdev);
+		adap->ch_thermal.tzdev = NULL;
+	}
 	return 0;
 }

drivers/net/ethernet/cortina/gemini.c+17−17

 	port->reset = devm_reset_control_get_exclusive(dev, NULL);
 	if (IS_ERR(port->reset)) {
 		dev_err(dev, "no reset\n");
-		clk_disable_unprepare(port->pclk);
+		ret = PTR_ERR(port->reset);
-		return PTR_ERR(port->reset);
+		goto unprepare;
 	}
 	reset_control_reset(port->reset);
 	usleep_range(100, 500);
 					IRQF_SHARED,
 					port_names[port->id],
 					port);
-	if (ret) {
+	if (ret)
-		clk_disable_unprepare(port->pclk);
+		goto unprepare;
-		return ret;
-	}
 	ret = register_netdev(netdev);
-	if (!ret) {
+	if (ret)
+		goto unprepare;
+	netdev_info(netdev,
+		    "irq %d, DMA @ 0x%pap, GMAC @ 0x%pap\n",
+		    port->irq, &dmares->start,
+		    &gmacres->start);
+	ret = gmac_setup_phy(netdev);
+	if (ret)
 		netdev_info(netdev,
-			    "irq %d, DMA @ 0x%pap, GMAC @ 0x%pap\n",
+			    "PHY init failed, deferring to ifup time\n");
-			    port->irq, &dmares->start,
+	return 0;
-			    &gmacres->start);
-		ret = gmac_setup_phy(netdev);
-		if (ret)
-			netdev_info(netdev,
-				    "PHY init failed, deferring to ifup time\n");
-		return 0;
-	}
-	port->netdev = NULL;
+unprepare:
+	clk_disable_unprepare(port->pclk);
 	return ret;
 }

drivers/net/ethernet/hisilicon/hns/hns_enet.c+6−3

 			priv->enet_ver = AE_VERSION_1;
 		else if (acpi_dev_found(hns_enet_acpi_match[1].id))
 			priv->enet_ver = AE_VERSION_2;
-		else
+		else {
-			return -ENXIO;
+			ret = -ENXIO;
+			goto out_read_prop_fail;
+		}
 		/* try to find port-idx-in-ae first */
 		ret = acpi_node_get_property_reference(dev->fwnode,
 		priv->fwnode = args.fwnode;
 	} else {
 		dev_err(dev, "cannot read cfg data from OF or acpi\n");
-		return -ENXIO;
+		ret = -ENXIO;
+		goto out_read_prop_fail;
 	}
 	ret = device_property_read_u32(dev, "port-idx-in-ae", &port_id);

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c+4−2

 #include <net/pkt_cls.h>
 #include <net/tcp.h>
 #include <net/vxlan.h>
+#include <net/geneve.h>
 #include "hnae3.h"
 #include "hns3_enet.h"
  * and it is udp packet, which has a dest port as the IANA assigned.
  * the hardware is expected to do the checksum offload, but the
  * hardware will not do the checksum offload when udp dest port is
- * 4789.
+ * 4789 or 6081.
  */
 static bool hns3_tunnel_csum_bug(struct sk_buff *skb)
 {
 	l4.hdr = skb_transport_header(skb);
 	if (!(!skb->encapsulation &&
-	      l4.udp->dest == htons(IANA_VXLAN_UDP_PORT)))
+	      (l4.udp->dest == htons(IANA_VXLAN_UDP_PORT) ||
+	      l4.udp->dest == htons(GENEVE_UDP_PORT))))
 		return false;
 	skb_checksum_help(skb);

drivers/net/ethernet/ibm/ibmvnic.c+14−1

 	int i, j, rc;
 	u64 *size_array;
+	if (!adapter->rx_pool)
+		return -1;
 	size_array = (u64 *)((u8 *)(adapter->login_rsp_buf) +
 		be32_to_cpu(adapter->login_rsp_buf->off_rxadd_buff_size));
 	int tx_scrqs;
 	int i, rc;
+	if (!adapter->tx_pool)
+		return -1;
 	tx_scrqs = be32_to_cpu(adapter->login_rsp_buf->num_txsubm_subcrqs);
 	for (i = 0; i < tx_scrqs; i++) {
 		rc = reset_one_tx_pool(adapter, &adapter->tso_pool[i]);
 		    adapter->req_rx_add_entries_per_subcrq !=
 		    old_num_rx_slots ||
 		    adapter->req_tx_entries_per_subcrq !=
-		    old_num_tx_slots) {
+		    old_num_tx_slots ||
+		    !adapter->rx_pool ||
+		    !adapter->tso_pool ||
+		    !adapter->tx_pool) {
 			release_rx_pools(adapter);
 			release_tx_pools(adapter);
 			release_napi(adapter);
 		} else {
 			rc = reset_tx_pools(adapter);
 			if (rc)
+				netdev_dbg(adapter->netdev, "reset tx pools failed (%d)\n",
+						rc);
 				goto out;
 			rc = reset_rx_pools(adapter);
 			if (rc)
+				netdev_dbg(adapter->netdev, "reset rx pools failed (%d)\n",
+						rc);
 				goto out;
 		}
 		ibmvnic_disable_irqs(adapter);

drivers/net/ethernet/mellanox/mlx4/mr.c+1−1

@@ -114,7 +114,7 @@ static int mlx4_buddy_init(struct mlx4_buddy *buddy, int max_order) · 113 unmodified lines
114	goto err_out;	114	goto err_out;
115		115
116	for (i = 0; i <= buddy->max_order; ++i) {	116	for (i = 0; i <= buddy->max_order; ++i) {
117	s = BITS_TO_LONGS(1 << (buddy->max_order - i));	117	s = BITS_TO_LONGS(1UL << (buddy->max_order - i));
118	buddy->bits[i] = kvmalloc_array(s, sizeof(long), GFP_KERNEL \| __GFP_ZERO);	118	buddy->bits[i] = kvmalloc_array(s, sizeof(long), GFP_KERNEL \| __GFP_ZERO);
119	if (!buddy->bits[i])	119	if (!buddy->bits[i])
120	goto err_out_free;	120	goto err_out_free;

drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c+2−0

  * @flags:		options part of the request
  * @tun_info.ipv6:		dest IPv6 address of active route
  * @tun_info.egress_port:	port the encapsulated packet egressed
+ * @tun_info.extra:		reserved for future use
  * @tun_info:		tunnels that have sent traffic in reported period
  */
 struct nfp_tun_active_tuns_v6 {
 	struct route_ip_info_v6 {
 		struct in6_addr ipv6;
 		__be32 egress_port;
+		__be32 extra[2];
 	} tun_info[];
 };

drivers/net/ethernet/pensando/ionic/ionic_txrx.c+3−10

 	struct ionic_cq *txcq;
 	u32 rx_work_done = 0;
 	u32 tx_work_done = 0;
-	u32 work_done = 0;
 	u32 flags = 0;
-	bool unmask;
 	lif = rxcq->bound_q->lif;
 	idev = &lif->ionic->idev;
 	if (rx_work_done)
 		ionic_rx_fill_cb(rxcq->bound_q);
-	unmask = (rx_work_done < budget) && (tx_work_done < lif->tx_budget);
+	if (rx_work_done < budget && napi_complete_done(napi, rx_work_done)) {
-	if (unmask && napi_complete_done(napi, rx_work_done)) {
 		flags |= IONIC_INTR_CRED_UNMASK;
 		DEBUG_STATS_INTR_REARM(rxcq->bound_intr);
-		work_done = rx_work_done;
-	} else {
-		work_done = budget;
 	}
-	if (work_done || flags) {
+	if (rx_work_done || flags) {
 		flags |= IONIC_INTR_CRED_RESET_COALESCE;
 		ionic_intr_credits(idev->intr_ctrl, rxcq->bound_intr->index,
 				   tx_work_done + rx_work_done, flags);
 	DEBUG_STATS_NAPI_POLL(qcq, rx_work_done);
 	DEBUG_STATS_NAPI_POLL(qcq, tx_work_done);
-	return work_done;
+	return rx_work_done;
 }
 static dma_addr_t ionic_tx_map_single(struct ionic_queue *q,

drivers/net/ethernet/renesas/ravb_main.c+55−55

 	return error;
 }
+/* MDIO bus init function */
+static int ravb_mdio_init(struct ravb_private *priv)
+{
+	struct platform_device *pdev = priv->pdev;
+	struct device *dev = &pdev->dev;
+	int error;
+	/* Bitbang init */
+	priv->mdiobb.ops = &bb_ops;
+	/* MII controller setting */
+	priv->mii_bus = alloc_mdio_bitbang(&priv->mdiobb);
+	if (!priv->mii_bus)
+		return -ENOMEM;
+	/* Hook up MII support for ethtool */
+	priv->mii_bus->name = "ravb_mii";
+	priv->mii_bus->parent = dev;
+	snprintf(priv->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+		 pdev->name, pdev->id);
+	/* Register MDIO bus */
+	error = of_mdiobus_register(priv->mii_bus, dev->of_node);
+	if (error)
+		goto out_free_bus;
+	return 0;
+out_free_bus:
+	free_mdio_bitbang(priv->mii_bus);
+	return error;
+}
+/* MDIO bus release function */
+static int ravb_mdio_release(struct ravb_private *priv)
+{
+	/* Unregister mdio bus */
+	mdiobus_unregister(priv->mii_bus);
+	/* Free bitbang info */
+	free_mdio_bitbang(priv->mii_bus);
+	return 0;
+}
 /* Network device open function for Ethernet AVB */
 static int ravb_open(struct net_device *ndev)
 {
 	struct device *dev = &pdev->dev;
 	int error;
+	/* MDIO bus init */
+	error = ravb_mdio_init(priv);
+	if (error) {
+		netdev_err(ndev, "failed to initialize MDIO\n");
+		return error;
+	}
 	napi_enable(&priv->napi[RAVB_BE]);
 	napi_enable(&priv->napi[RAVB_NC]);
 out_napi_off:
 	napi_disable(&priv->napi[RAVB_NC]);
 	napi_disable(&priv->napi[RAVB_BE]);
+	ravb_mdio_release(priv);
 	return error;
 }
 	ravb_ring_free(ndev, RAVB_BE);
 	ravb_ring_free(ndev, RAVB_NC);
+	ravb_mdio_release(priv);
 	return 0;
 }
 	.ndo_set_features	= ravb_set_features,
 };
-/* MDIO bus init function */
-static int ravb_mdio_init(struct ravb_private *priv)
-{
-	struct platform_device *pdev = priv->pdev;
-	struct device *dev = &pdev->dev;
-	int error;
-	/* Bitbang init */
-	priv->mdiobb.ops = &bb_ops;
-	/* MII controller setting */
-	priv->mii_bus = alloc_mdio_bitbang(&priv->mdiobb);
-	if (!priv->mii_bus)
-		return -ENOMEM;
-	/* Hook up MII support for ethtool */
-	priv->mii_bus->name = "ravb_mii";
-	priv->mii_bus->parent = dev;
-	snprintf(priv->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
-		 pdev->name, pdev->id);
-	/* Register MDIO bus */
-	error = of_mdiobus_register(priv->mii_bus, dev->of_node);
-	if (error)
-		goto out_free_bus;
-	return 0;
-out_free_bus:
-	free_mdio_bitbang(priv->mii_bus);
-	return error;
-}
-/* MDIO bus release function */
-static int ravb_mdio_release(struct ravb_private *priv)
-{
-	/* Unregister mdio bus */
-	mdiobus_unregister(priv->mii_bus);
-	/* Free bitbang info */
-	free_mdio_bitbang(priv->mii_bus);
-	return 0;
-}
 static const struct of_device_id ravb_match_table[] = {
 	{ .compatible = "renesas,etheravb-r8a7790", .data = (void *)RCAR_GEN2 },
 	{ .compatible = "renesas,etheravb-r8a7794", .data = (void *)RCAR_GEN2 },
 		eth_hw_addr_random(ndev);
 	}
-	/* MDIO bus init */
-	error = ravb_mdio_init(priv);
-	if (error) {
-		dev_err(&pdev->dev, "failed to initialize MDIO\n");
-		goto out_dma_free;
-	}
 	netif_napi_add(ndev, &priv->napi[RAVB_BE], ravb_poll, 64);
 	netif_napi_add(ndev, &priv->napi[RAVB_NC], ravb_poll, 64);
 out_napi_del:
 	netif_napi_del(&priv->napi[RAVB_NC]);
 	netif_napi_del(&priv->napi[RAVB_BE]);
-	ravb_mdio_release(priv);
-out_dma_free:
 	dma_free_coherent(ndev->dev.parent, priv->desc_bat_size, priv->desc_bat,
 			  priv->desc_bat_dma);
 	unregister_netdev(ndev);
 	netif_napi_del(&priv->napi[RAVB_NC]);
 	netif_napi_del(&priv->napi[RAVB_BE]);
-	ravb_mdio_release(priv);
 	pm_runtime_disable(&pdev->dev);
 	free_netdev(ndev);
 	platform_set_drvdata(pdev, NULL);

drivers/net/ethernet/sfc/ef100_rx.c+4−4

@@ -36,7 +36,7 @@ bool ef100_rx_buf_hash_valid(const u8 *prefix) · 35 unmodified lines
36	return PREFIX_FIELD(prefix, RSS_HASH_VALID);	36	return PREFIX_FIELD(prefix, RSS_HASH_VALID);
37	}	37	}
38		38
39	static bool check_fcs(struct efx_channel channel, u32 prefix)	39	static bool ef100_has_fcs_error(struct efx_channel channel, u32 prefix)
40	{	40	{
41	u16 rxclass;	41	u16 rxclass;
42	u8 l2status;	42	u8 l2status;
@@ -46,11 +46,11 @@ static bool check_fcs(struct efx_channel channel, u32 prefix) · 3 unmodified lines
46		46
47	if (likely(l2status == ESE_GZ_RH_HCLASS_L2_STATUS_OK))	47	if (likely(l2status == ESE_GZ_RH_HCLASS_L2_STATUS_OK))
48	/* Everything is ok */	48	/* Everything is ok */
49	return 0;	49	return false;
50		50
51	if (l2status == ESE_GZ_RH_HCLASS_L2_STATUS_FCS_ERR)	51	if (l2status == ESE_GZ_RH_HCLASS_L2_STATUS_FCS_ERR)
52	channel->n_rx_eth_crc_err++;	52	channel->n_rx_eth_crc_err++;
53	return 1;	53	return true;
54	}	54	}
55		55
56	void __ef100_rx_packet(struct efx_channel *channel)	56	void __ef100_rx_packet(struct efx_channel *channel)
@@ -63,7 +63,7 @@ void __ef100_rx_packet(struct efx_channel *channel) · 6 unmodified lines
63		63
64	prefix = (u32 *)(eh - ESE_GZ_RX_PKT_PREFIX_LEN);	64	prefix = (u32 *)(eh - ESE_GZ_RX_PKT_PREFIX_LEN);
65		65
66	if (check_fcs(channel, prefix) &&	66	if (ef100_has_fcs_error(channel, prefix) &&
67	unlikely(!(efx->net_dev->features & NETIF_F_RXALL)))	67	unlikely(!(efx->net_dev->features & NETIF_F_RXALL)))
68	goto out;	68	goto out;
69		69

drivers/net/ethernet/ti/am65-cpsw-nuss.c+2−0

@@ -174,6 +174,8 @@ void am65_cpsw_nuss_adjust_link(struct net_device *ndev) · 173 unmodified lines
174	if (phy->speed == 10 && phy_interface_is_rgmii(phy))	174	if (phy->speed == 10 && phy_interface_is_rgmii(phy))
175	/* Can be used with in band mode only */	175	/* Can be used with in band mode only */
176	mac_control \|= CPSW_SL_CTL_EXT_EN;	176	mac_control \|= CPSW_SL_CTL_EXT_EN;
		177	if (phy->speed == 100 && phy->interface == PHY_INTERFACE_MODE_RMII)
		178	mac_control \|= CPSW_SL_CTL_IFCTL_A;
177	if (phy->duplex)	179	if (phy->duplex)
178	mac_control \|= CPSW_SL_CTL_FULLDUPLEX;	180	mac_control \|= CPSW_SL_CTL_FULLDUPLEX;
179		181

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

@@ -1116,7 +1116,7 @@ static int cpsw_ndo_vlan_rx_kill_vid(struct net_device *ndev, · 1115 unmodified lines
1116	HOST_PORT_NUM, ALE_VLAN, vid);	1116	HOST_PORT_NUM, ALE_VLAN, vid);
1117	ret \|= cpsw_ale_del_mcast(cpsw->ale, priv->ndev->broadcast,	1117	ret \|= cpsw_ale_del_mcast(cpsw->ale, priv->ndev->broadcast,
1118	0, ALE_VLAN, vid);	1118	0, ALE_VLAN, vid);
1119	ret \|= cpsw_ale_flush_multicast(cpsw->ale, 0, vid);	1119	ret \|= cpsw_ale_flush_multicast(cpsw->ale, ALE_PORT_HOST, vid);
1120	err:	1120	err:
1121	pm_runtime_put(cpsw->dev);	1121	pm_runtime_put(cpsw->dev);
1122	return ret;	1122	return ret;

drivers/net/ethernet/ti/cpsw_new.c+22−7

 		return ret;
 	}
+	/* reset the return code as pm_runtime_get_sync() can return
+	 * non zero values as well.
+	 */
+	ret = 0;
 	for (i = 0; i < cpsw->data.slaves; i++) {
 		if (cpsw->slaves[i].ndev &&
-		    vid == cpsw->slaves[i].port_vlan)
+		    vid == cpsw->slaves[i].port_vlan) {
+			ret = -EINVAL;
 			goto err;
+		}
 	}
 	dev_dbg(priv->dev, "removing vlanid %d from vlan filter\n", vid);
-	cpsw_ale_del_vlan(cpsw->ale, vid, 0);
+	ret = cpsw_ale_del_vlan(cpsw->ale, vid, 0);
-	cpsw_ale_del_ucast(cpsw->ale, priv->mac_addr,
+	if (ret)
-			   HOST_PORT_NUM, ALE_VLAN, vid);
+		dev_err(priv->dev, "cpsw_ale_del_vlan() failed: ret %d\n", ret);
-	cpsw_ale_del_mcast(cpsw->ale, priv->ndev->broadcast,
+	ret = cpsw_ale_del_ucast(cpsw->ale, priv->mac_addr,
-			   0, ALE_VLAN, vid);
+				 HOST_PORT_NUM, ALE_VLAN, vid);
-	cpsw_ale_flush_multicast(cpsw->ale, 0, vid);
+	if (ret)
+		dev_err(priv->dev, "cpsw_ale_del_ucast() failed: ret %d\n",
+			ret);
+	ret = cpsw_ale_del_mcast(cpsw->ale, priv->ndev->broadcast,
+				 0, ALE_VLAN, vid);
+	if (ret)
+		dev_err(priv->dev, "cpsw_ale_del_mcast failed. ret %d\n",
+			ret);
+	cpsw_ale_flush_multicast(cpsw->ale, ALE_PORT_HOST, vid);
+	ret = 0;
 err:
 	pm_runtime_put(cpsw->dev);
 	return ret;

drivers/net/gtp.c+1−0

@@ -1179,6 +1179,7 @@ static int gtp_genl_fill_info(struct sk_buff *skb, u32 snd_portid, u32 snd_seq, · 1178 unmodified lines
1179	goto nlmsg_failure;	1179	goto nlmsg_failure;
1180		1180
1181	if (nla_put_u32(skb, GTPA_VERSION, pctx->gtp_version) \|\|	1181	if (nla_put_u32(skb, GTPA_VERSION, pctx->gtp_version) \|\|
		1182	nla_put_u32(skb, GTPA_LINK, pctx->dev->ifindex) \|\|
1182	nla_put_be32(skb, GTPA_PEER_ADDRESS, pctx->peer_addr_ip4.s_addr) \|\|	1183	nla_put_be32(skb, GTPA_PEER_ADDRESS, pctx->peer_addr_ip4.s_addr) \|\|
1183	nla_put_be32(skb, GTPA_MS_ADDRESS, pctx->ms_addr_ip4.s_addr))	1184	nla_put_be32(skb, GTPA_MS_ADDRESS, pctx->ms_addr_ip4.s_addr))
1184	goto nla_put_failure;	1185	goto nla_put_failure;

drivers/net/phy/dp83867.c+2−2

@@ -215,9 +215,9 @@ static int dp83867_set_wol(struct phy_device *phydev, · 214 unmodified lines
215	if (wol->wolopts & WAKE_MAGICSECURE) {	215	if (wol->wolopts & WAKE_MAGICSECURE) {
216	phy_write_mmd(phydev, DP83867_DEVADDR, DP83867_RXFSOP1,	216	phy_write_mmd(phydev, DP83867_DEVADDR, DP83867_RXFSOP1,
217	(wol->sopass[1] << 8) \| wol->sopass[0]);	217	(wol->sopass[1] << 8) \| wol->sopass[0]);
218	phy_write_mmd(phydev, DP83867_DEVADDR, DP83867_RXFSOP1,	218	phy_write_mmd(phydev, DP83867_DEVADDR, DP83867_RXFSOP2,
219	(wol->sopass[3] << 8) \| wol->sopass[2]);	219	(wol->sopass[3] << 8) \| wol->sopass[2]);
220	phy_write_mmd(phydev, DP83867_DEVADDR, DP83867_RXFSOP1,	220	phy_write_mmd(phydev, DP83867_DEVADDR, DP83867_RXFSOP3,
221	(wol->sopass[5] << 8) \| wol->sopass[4]);	221	(wol->sopass[5] << 8) \| wol->sopass[4]);
222		222
223	val_rxcfg \|= DP83867_WOL_SEC_EN;	223	val_rxcfg \|= DP83867_WOL_SEC_EN;

drivers/net/phy/dp83869.c+6−6

@@ -427,18 +427,18 @@ static int dp83869_config_init(struct phy_device *phydev) · 426 unmodified lines
427	return ret;	427	return ret;
428		428
429	val = phy_read_mmd(phydev, DP83869_DEVADDR, DP83869_RGMIICTL);	429	val = phy_read_mmd(phydev, DP83869_DEVADDR, DP83869_RGMIICTL);
430	val &= ~(DP83869_RGMII_TX_CLK_DELAY_EN \|	430	val \|= (DP83869_RGMII_TX_CLK_DELAY_EN \|
431	DP83869_RGMII_RX_CLK_DELAY_EN);	431	DP83869_RGMII_RX_CLK_DELAY_EN);
432		432
433	if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)	433	if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
434	val \|= (DP83869_RGMII_TX_CLK_DELAY_EN \|	434	val &= ~(DP83869_RGMII_TX_CLK_DELAY_EN \|
435	DP83869_RGMII_RX_CLK_DELAY_EN);	435	DP83869_RGMII_RX_CLK_DELAY_EN);
436		436
437	if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)	437	if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
438	val \|= DP83869_RGMII_TX_CLK_DELAY_EN;	438	val &= ~DP83869_RGMII_TX_CLK_DELAY_EN;
439		439
440	if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)	440	if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
441	val \|= DP83869_RGMII_RX_CLK_DELAY_EN;	441	val &= ~DP83869_RGMII_RX_CLK_DELAY_EN;
442		442
443	ret = phy_write_mmd(phydev, DP83869_DEVADDR, DP83869_RGMIICTL,	443	ret = phy_write_mmd(phydev, DP83869_DEVADDR, DP83869_RGMIICTL,
444	val);	444	val);

drivers/net/usb/Kconfig+1−0

@@ -252,6 +252,7 @@ config USB_NET_CDC_EEM · 251 unmodified lines
252	config USB_NET_CDC_NCM	252	config USB_NET_CDC_NCM
253	tristate "CDC NCM support"	253	tristate "CDC NCM support"
254	depends on USB_USBNET	254	depends on USB_USBNET
		255	select USB_NET_CDCETHER
255	default y	256	default y
256	help	257	help
257	This driver provides support for CDC NCM (Network Control Model	258	This driver provides support for CDC NCM (Network Control Model

drivers/net/usb/asix_common.c+1−1

@@ -296,7 +296,7 @@ int asix_read_phy_addr(struct usbnet *dev, int internal) · 295 unmodified lines
296		296
297	netdev_dbg(dev->net, "asix_get_phy_addr()\n");	297	netdev_dbg(dev->net, "asix_get_phy_addr()\n");
298		298
299	if (ret < 0) {	299	if (ret < 2) {
300	netdev_err(dev->net, "Error reading PHYID register: %02x\n", ret);	300	netdev_err(dev->net, "Error reading PHYID register: %02x\n", ret);
301	goto out;	301	goto out;
302	}	302	}

drivers/net/usb/dm9601.c+4−0

 	 USB_DEVICE(0x0a46, 0x1269),	/* DM9621A USB to Fast Ethernet Adapter */
 	 .driver_info = (unsigned long)&dm9601_info,
 	},
+	{
+	 USB_DEVICE(0x0586, 0x3427),	/* ZyXEL Keenetic Plus DSL xDSL modem */
+	 .driver_info = (unsigned long)&dm9601_info,
+	},
 	{},			// END
 };

drivers/net/wan/hdlc.c+1−1

@@ -229,7 +229,7 @@ static void hdlc_setup_dev(struct net_device *dev) · 228 unmodified lines
229	dev->min_mtu = 68;	229	dev->min_mtu = 68;
230	dev->max_mtu = HDLC_MAX_MTU;	230	dev->max_mtu = HDLC_MAX_MTU;
231	dev->type = ARPHRD_RAWHDLC;	231	dev->type = ARPHRD_RAWHDLC;
232	dev->hard_header_len = 16;	232	dev->hard_header_len = 0;
233	dev->needed_headroom = 0;	233	dev->needed_headroom = 0;
234	dev->addr_len = 0;	234	dev->addr_len = 0;
235	dev->header_ops = &hdlc_null_ops;	235	dev->header_ops = &hdlc_null_ops;

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

@@ -370,6 +370,7 @@ static int cisco_ioctl(struct net_device dev, struct ifreq ifr) · 369 unmodified lines
370	memcpy(&state(hdlc)->settings, &new_settings, size);	370	memcpy(&state(hdlc)->settings, &new_settings, size);
371	spin_lock_init(&state(hdlc)->lock);	371	spin_lock_init(&state(hdlc)->lock);
372	dev->header_ops = &cisco_header_ops;	372	dev->header_ops = &cisco_header_ops;
		373	dev->hard_header_len = sizeof(struct hdlc_header);
373	dev->type = ARPHRD_CISCO;	374	dev->type = ARPHRD_CISCO;
374	call_netdevice_notifiers(NETDEV_POST_TYPE_CHANGE, dev);	375	call_netdevice_notifiers(NETDEV_POST_TYPE_CHANGE, dev);
375	netif_dormant_on(dev);	376	netif_dormant_on(dev);

drivers/net/wan/lapbether.c+3−0

 	skb->dev = dev = lapbeth->ethdev;
+	skb_reset_network_header(skb);
 	dev_hard_header(skb, dev, ETH_P_DEC, bcast_addr, NULL, 0);
 	dev_queue_xmit(skb);
 	 */
 	ndev->needed_headroom = -1 + 3 + 2 + dev->hard_header_len
 					   + dev->needed_headroom;
+	ndev->needed_tailroom = dev->needed_tailroom;
 	lapbeth = netdev_priv(ndev);
 	lapbeth->axdev = ndev;

drivers/nfc/st95hf/core.c+1−1

@@ -966,7 +966,7 @@ static int st95hf_in_send_cmd(struct nfc_digital_dev *ddev, · 965 unmodified lines
966	rc = down_killable(&stcontext->exchange_lock);	966	rc = down_killable(&stcontext->exchange_lock);
967	if (rc) {	967	if (rc) {
968	WARN(1, "Semaphore is not found up in st95hf_in_send_cmd\n");	968	WARN(1, "Semaphore is not found up in st95hf_in_send_cmd\n");
969	return rc;	969	goto free_skb_resp;
970	}	970	}
971		971
972	rc = st95hf_spi_send(&stcontext->spicontext, skb->data,	972	rc = st95hf_spi_send(&stcontext->spicontext, skb->data,

drivers/nvme/host/core.c+45−16

 	blk_mq_unfreeze_queue(disk->queue);
 }
+static inline bool nvme_first_scan(struct gendisk *disk)
+{
+	/* nvme_alloc_ns() scans the disk prior to adding it */
+	return !(disk->flags & GENHD_FL_UP);
+}
+static void nvme_set_chunk_sectors(struct nvme_ns *ns, struct nvme_id_ns *id)
+{
+	struct nvme_ctrl *ctrl = ns->ctrl;
+	u32 iob;
+	if ((ctrl->quirks & NVME_QUIRK_STRIPE_SIZE) &&
+	    is_power_of_2(ctrl->max_hw_sectors))
+		iob = ctrl->max_hw_sectors;
+	else
+		iob = nvme_lba_to_sect(ns, le16_to_cpu(id->noiob));
+	if (!iob)
+		return;
+	if (!is_power_of_2(iob)) {
+		if (nvme_first_scan(ns->disk))
+			pr_warn("%s: ignoring unaligned IO boundary:%u\n",
+				ns->disk->disk_name, iob);
+		return;
+	}
+	if (blk_queue_is_zoned(ns->disk->queue)) {
+		if (nvme_first_scan(ns->disk))
+			pr_warn("%s: ignoring zoned namespace IO boundary\n",
+				ns->disk->disk_name);
+		return;
+	}
+	blk_queue_chunk_sectors(ns->queue, iob);
+}
 static int __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)
 {
 	unsigned lbaf = id->flbas & NVME_NS_FLBAS_LBA_MASK;
 	struct nvme_ns *ns = disk->private_data;
 	struct nvme_ctrl *ctrl = ns->ctrl;
 	int ret;
-	u32 iob;
 	/*
 	 * If identify namespace failed, use default 512 byte block size so
 		return -ENODEV;
 	}
-	if ((ctrl->quirks & NVME_QUIRK_STRIPE_SIZE) &&
-	    is_power_of_2(ctrl->max_hw_sectors))
-		iob = ctrl->max_hw_sectors;
-	else
-		iob = nvme_lba_to_sect(ns, le16_to_cpu(id->noiob));
 	ns->features = 0;
 	ns->ms = le16_to_cpu(id->lbaf[lbaf].ms);
 	/* the PI implementation requires metadata equal t10 pi tuple size */
 		}
 	}
-	if (iob && !blk_queue_is_zoned(ns->queue))
+	nvme_set_chunk_sectors(ns, id);
-		blk_queue_chunk_sectors(ns->queue, rounddown_pow_of_two(iob));
 	nvme_update_disk_info(disk, ns, id);
 #ifdef CONFIG_NVME_MULTIPATH
 	if (ns->head->disk) {
 {
 	struct nvme_ctrl *ctrl = dev_get_drvdata(dev);
-	/* Can't delete non-created controllers */
-	if (!ctrl->created)
-		return -EBUSY;
 	if (device_remove_file_self(dev, attr))
 		nvme_delete_ctrl_sync(ctrl);
 	return count;
 		return 0;
 	if (a == &dev_attr_hostid.attr && !ctrl->opts)
 		return 0;
+	if (a == &dev_attr_ctrl_loss_tmo.attr && !ctrl->opts)
+		return 0;
+	if (a == &dev_attr_reconnect_delay.attr && !ctrl->opts)
+		return 0;
 	return a->mode;
 }
 		nvme_queue_scan(ctrl);
 		nvme_start_queues(ctrl);
 	}
-	ctrl->created = true;
 }
 EXPORT_SYMBOL_GPL(nvme_start_ctrl);
 	struct nvme_subsystem *subsys = ctrl->subsys;
 	struct nvme_cel *cel, *next;
-	if (subsys && ctrl->instance != subsys->instance)
+	if (!subsys || ctrl->instance != subsys->instance)
 		ida_simple_remove(&nvme_instance_ida, ctrl->instance);
 	list_for_each_entry_safe(cel, next, &ctrl->cels, entry) {
 }
 EXPORT_SYMBOL_GPL(nvme_unfreeze);
-void nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl, long timeout)
+int nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl, long timeout)
 {
 	struct nvme_ns *ns;
 			break;
 	}
 	up_read(&ctrl->namespaces_rwsem);
+	return timeout;
 }
 EXPORT_SYMBOL_GPL(nvme_wait_freeze_timeout);

drivers/nvme/host/fabrics.c+8−5

 	struct nvme_request *req = nvme_req(rq);
 	/*
-	 * If we are in some state of setup or teardown only allow
+	 * currently we have a problem sending passthru commands
-	 * internally generated commands.
+	 * on the admin_q if the controller is not LIVE because we can't
+	 * make sure that they are going out after the admin connect,
+	 * controller enable and/or other commands in the initialization
+	 * sequence. until the controller will be LIVE, fail with
+	 * BLK_STS_RESOURCE so that they will be rescheduled.
 	 */
-	if (!blk_rq_is_passthrough(rq) || (req->flags & NVME_REQ_USERCMD))
+	if (rq->q == ctrl->admin_q && (req->flags & NVME_REQ_USERCMD))
 		return false;
 	/*
 	 * which is require to set the queue live in the appropinquate states.
 	 */
 	switch (ctrl->state) {
-	case NVME_CTRL_NEW:
 	case NVME_CTRL_CONNECTING:
-		if (nvme_is_fabrics(req->cmd) &&
+		if (blk_rq_is_passthrough(rq) && nvme_is_fabrics(req->cmd) &&
 		    req->cmd->fabrics.fctype == nvme_fabrics_type_connect)
 			return true;
 		break;

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

@@ -2160,6 +2160,7 @@ nvme_fc_term_aen_ops(struct nvme_fc_ctrl *ctrl) · 2159 unmodified lines
2160	struct nvme_fc_fcp_op *aen_op;	2160	struct nvme_fc_fcp_op *aen_op;
2161	int i;	2161	int i;
2162		2162
		2163	cancel_work_sync(&ctrl->ctrl.async_event_work);
2163	aen_op = ctrl->aen_ops;	2164	aen_op = ctrl->aen_ops;
2164	for (i = 0; i < NVME_NR_AEN_COMMANDS; i++, aen_op++) {	2165	for (i = 0; i < NVME_NR_AEN_COMMANDS; i++, aen_op++) {
2165	__nvme_fc_exit_request(ctrl, aen_op);	2166	__nvme_fc_exit_request(ctrl, aen_op);

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

 	struct nvme_command ka_cmd;
 	struct work_struct fw_act_work;
 	unsigned long events;
-	bool created;
 #ifdef CONFIG_NVME_MULTIPATH
 	/* asymmetric namespace access: */
 void nvme_sync_queues(struct nvme_ctrl *ctrl);
 void nvme_unfreeze(struct nvme_ctrl *ctrl);
 void nvme_wait_freeze(struct nvme_ctrl *ctrl);
-void nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl, long timeout);
+int nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl, long timeout);
 void nvme_start_freeze(struct nvme_ctrl *ctrl);
 #define NVME_QID_ANY -1

drivers/nvme/host/pci.c+2−2

 		dev_warn_ratelimited(dev->ctrl.device,
 			 "I/O %d QID %d timeout, disable controller\n",
 			 req->tag, nvmeq->qid);
-		nvme_dev_disable(dev, true);
 		nvme_req(req)->flags |= NVME_REQ_CANCELLED;
+		nvme_dev_disable(dev, true);
 		return BLK_EH_DONE;
 	case NVME_CTRL_RESETTING:
 		return BLK_EH_RESET_TIMER;
 		dev_warn(dev->ctrl.device,
 			 "I/O %d QID %d timeout, reset controller\n",
 			 req->tag, nvmeq->qid);
+		nvme_req(req)->flags |= NVME_REQ_CANCELLED;
 		nvme_dev_disable(dev, false);
 		nvme_reset_ctrl(&dev->ctrl);
-		nvme_req(req)->flags |= NVME_REQ_CANCELLED;
 		return BLK_EH_DONE;
 	}

drivers/nvme/host/rdma.c+52−17

 	struct sockaddr_storage src_addr;
 	struct nvme_ctrl	ctrl;
+	struct mutex		teardown_lock;
 	bool			use_inline_data;
 	u32			io_queues[HCTX_MAX_TYPES];
 };
 		blk_mq_free_tag_set(ctrl->ctrl.admin_tagset);
 	}
 	if (ctrl->async_event_sqe.data) {
+		cancel_work_sync(&ctrl->ctrl.async_event_work);
 		nvme_rdma_free_qe(ctrl->device->dev, &ctrl->async_event_sqe,
 				sizeof(struct nvme_command), DMA_TO_DEVICE);
 		ctrl->async_event_sqe.data = NULL;
 	if (!new) {
 		nvme_start_queues(&ctrl->ctrl);
-		nvme_wait_freeze(&ctrl->ctrl);
+		if (!nvme_wait_freeze_timeout(&ctrl->ctrl, NVME_IO_TIMEOUT)) {
+			/*
+			 * If we timed out waiting for freeze we are likely to
+			 * be stuck.  Fail the controller initialization just
+			 * to be safe.
+			 */
+			ret = -ENODEV;
+			goto out_wait_freeze_timed_out;
+		}
 		blk_mq_update_nr_hw_queues(ctrl->ctrl.tagset,
 			ctrl->ctrl.queue_count - 1);
 		nvme_unfreeze(&ctrl->ctrl);
 	return 0;
+out_wait_freeze_timed_out:
+	nvme_stop_queues(&ctrl->ctrl);
+	nvme_rdma_stop_io_queues(ctrl);
 out_cleanup_connect_q:
 	if (new)
 		blk_cleanup_queue(ctrl->ctrl.connect_q);
 static void nvme_rdma_teardown_admin_queue(struct nvme_rdma_ctrl *ctrl,
 		bool remove)
 {
+	mutex_lock(&ctrl->teardown_lock);
 	blk_mq_quiesce_queue(ctrl->ctrl.admin_q);
 	nvme_rdma_stop_queue(&ctrl->queues[0]);
 	if (ctrl->ctrl.admin_tagset) {
 	if (remove)
 		blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);
 	nvme_rdma_destroy_admin_queue(ctrl, remove);
+	mutex_unlock(&ctrl->teardown_lock);
 }
 static void nvme_rdma_teardown_io_queues(struct nvme_rdma_ctrl *ctrl,
 		bool remove)
 {
+	mutex_lock(&ctrl->teardown_lock);
 	if (ctrl->ctrl.queue_count > 1) {
 		nvme_start_freeze(&ctrl->ctrl);
 		nvme_stop_queues(&ctrl->ctrl);
 			nvme_start_queues(&ctrl->ctrl);
 		nvme_rdma_destroy_io_queues(ctrl, remove);
 	}
+	mutex_unlock(&ctrl->teardown_lock);
 }
 static void nvme_rdma_free_ctrl(struct nvme_ctrl *nctrl)
 	if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_RESETTING))
 		return;
+	dev_warn(ctrl->ctrl.device, "starting error recovery\n");
 	queue_work(nvme_reset_wq, &ctrl->err_work);
 }
 	return 0;
 }
+static void nvme_rdma_complete_timed_out(struct request *rq)
+{
+	struct nvme_rdma_request *req = blk_mq_rq_to_pdu(rq);
+	struct nvme_rdma_queue *queue = req->queue;
+	struct nvme_rdma_ctrl *ctrl = queue->ctrl;
+	/* fence other contexts that may complete the command */
+	mutex_lock(&ctrl->teardown_lock);
+	nvme_rdma_stop_queue(queue);
+	if (!blk_mq_request_completed(rq)) {
+		nvme_req(rq)->status = NVME_SC_HOST_ABORTED_CMD;
+		blk_mq_complete_request(rq);
+	}
+	mutex_unlock(&ctrl->teardown_lock);
+}
 static enum blk_eh_timer_return
 nvme_rdma_timeout(struct request *rq, bool reserved)
 {
 	dev_warn(ctrl->ctrl.device, "I/O %d QID %d timeout\n",
 		 rq->tag, nvme_rdma_queue_idx(queue));
-	/*
-	 * Restart the timer if a controller reset is already scheduled. Any
-	 * timed out commands would be handled before entering the connecting
-	 * state.
-	 */
-	if (ctrl->ctrl.state == NVME_CTRL_RESETTING)
-		return BLK_EH_RESET_TIMER;
 	if (ctrl->ctrl.state != NVME_CTRL_LIVE) {
 		/*
-		 * Teardown immediately if controller times out while starting
+		 * If we are resetting, connecting or deleting we should
-		 * or we are already started error recovery. all outstanding
+		 * complete immediately because we may block controller
-		 * requests are completed on shutdown, so we return BLK_EH_DONE.
+		 * teardown or setup sequence
+		 * - ctrl disable/shutdown fabrics requests
+		 * - connect requests
+		 * - initialization admin requests
+		 * - I/O requests that entered after unquiescing and
+		 *   the controller stopped responding
+		 *
+		 * All other requests should be cancelled by the error
+		 * recovery work, so it's fine that we fail it here.
 		 */
-		flush_work(&ctrl->err_work);
+		nvme_rdma_complete_timed_out(rq);
-		nvme_rdma_teardown_io_queues(ctrl, false);
-		nvme_rdma_teardown_admin_queue(ctrl, false);
 		return BLK_EH_DONE;
 	}
-	dev_warn(ctrl->ctrl.device, "starting error recovery\n");
+	/*
+	 * LIVE state should trigger the normal error recovery which will
+	 * handle completing this request.
+	 */
 	nvme_rdma_error_recovery(ctrl);
 	return BLK_EH_RESET_TIMER;
 }
 		return ERR_PTR(-ENOMEM);
 	ctrl->ctrl.opts = opts;
 	INIT_LIST_HEAD(&ctrl->list);
+	mutex_init(&ctrl->teardown_lock);
 	if (!(opts->mask & NVMF_OPT_TRSVCID)) {
 		opts->trsvcid =

drivers/nvme/host/tcp.c+58−23

@@ -124,6 +124,7 @@ struct nvme_tcp_ctrl { · 123 unmodified lines
124	struct sockaddr_storage src_addr;	124	struct sockaddr_storage src_addr;
125	struct nvme_ctrl ctrl;	125	struct nvme_ctrl ctrl;
126		126
		127	struct mutex teardown_lock;
127	struct work_struct err_work;	128	struct work_struct err_work;
128	struct delayed_work connect_work;	129	struct delayed_work connect_work;
129	struct nvme_tcp_request async_req;	130	struct nvme_tcp_request async_req;
@@ -464,6 +465,7 @@ static void nvme_tcp_error_recovery(struct nvme_ctrl *ctrl) · 334 unmodified lines
464	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING))	465	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING))
465	return;	466	return;
466		467
		468	dev_warn(ctrl->device, "starting error recovery\n");
467	queue_work(nvme_reset_wq, &to_tcp_ctrl(ctrl)->err_work);	469	queue_work(nvme_reset_wq, &to_tcp_ctrl(ctrl)->err_work);
468	}	470	}
469		471
@@ -1526,7 +1528,6 @@ static void nvme_tcp_stop_queue(struct nvme_ctrl *nctrl, int qid) · 1056 unmodified lines
1526		1528
1527	if (!test_and_clear_bit(NVME_TCP_Q_LIVE, &queue->flags))	1529	if (!test_and_clear_bit(NVME_TCP_Q_LIVE, &queue->flags))
1528	return;	1530	return;
1529
1530	__nvme_tcp_stop_queue(queue);	1531	__nvme_tcp_stop_queue(queue);
1531	}	1532	}
1532		1533
@@ -1595,6 +1596,7 @@ static struct blk_mq_tag_set nvme_tcp_alloc_tagset(struct nvme_ctrl nctrl, · 62 unmodified lines
1595	static void nvme_tcp_free_admin_queue(struct nvme_ctrl *ctrl)	1596	static void nvme_tcp_free_admin_queue(struct nvme_ctrl *ctrl)
1596	{	1597	{
1597	if (to_tcp_ctrl(ctrl)->async_req.pdu) {	1598	if (to_tcp_ctrl(ctrl)->async_req.pdu) {
		1599	cancel_work_sync(&ctrl->async_event_work);
1598	nvme_tcp_free_async_req(to_tcp_ctrl(ctrl));	1600	nvme_tcp_free_async_req(to_tcp_ctrl(ctrl));
1599	to_tcp_ctrl(ctrl)->async_req.pdu = NULL;	1601	to_tcp_ctrl(ctrl)->async_req.pdu = NULL;
1600	}	1602	}
@@ -1781,7 +1783,15 @@ static int nvme_tcp_configure_io_queues(struct nvme_ctrl *ctrl, bool new) · 180 unmodified lines
1781		1783
1782	if (!new) {	1784	if (!new) {
1783	nvme_start_queues(ctrl);	1785	nvme_start_queues(ctrl);
1784	nvme_wait_freeze(ctrl);	1786	if (!nvme_wait_freeze_timeout(ctrl, NVME_IO_TIMEOUT)) {
		1787	/*
		1788	* If we timed out waiting for freeze we are likely to
		1789	* be stuck. Fail the controller initialization just
		1790	* to be safe.
		1791	*/
		1792	ret = -ENODEV;
		1793	goto out_wait_freeze_timed_out;
		1794	}
1785	blk_mq_update_nr_hw_queues(ctrl->tagset,	1795	blk_mq_update_nr_hw_queues(ctrl->tagset,
1786	ctrl->queue_count - 1);	1796	ctrl->queue_count - 1);
1787	nvme_unfreeze(ctrl);	1797	nvme_unfreeze(ctrl);
@@ -1789,6 +1799,9 @@ static int nvme_tcp_configure_io_queues(struct nvme_ctrl *ctrl, bool new) · 1 unmodified line
1789		1799
1790	return 0;	1800	return 0;
1791		1801
		1802	out_wait_freeze_timed_out:
		1803	nvme_stop_queues(ctrl);
		1804	nvme_tcp_stop_io_queues(ctrl);
1792	out_cleanup_connect_q:	1805	out_cleanup_connect_q:
1793	if (new)	1806	if (new)
1794	blk_cleanup_queue(ctrl->connect_q);	1807	blk_cleanup_queue(ctrl->connect_q);
@@ -1874,6 +1887,7 @@ out_free_queue: · 79 unmodified lines
1874	static void nvme_tcp_teardown_admin_queue(struct nvme_ctrl *ctrl,	1887	static void nvme_tcp_teardown_admin_queue(struct nvme_ctrl *ctrl,
1875	bool remove)	1888	bool remove)
1876	{	1889	{
		1890	mutex_lock(&to_tcp_ctrl(ctrl)->teardown_lock);
1877	blk_mq_quiesce_queue(ctrl->admin_q);	1891	blk_mq_quiesce_queue(ctrl->admin_q);
1878	nvme_tcp_stop_queue(ctrl, 0);	1892	nvme_tcp_stop_queue(ctrl, 0);
1879	if (ctrl->admin_tagset) {	1893	if (ctrl->admin_tagset) {
@@ -1884,13 +1898,16 @@ static void nvme_tcp_teardown_admin_queue(struct nvme_ctrl *ctrl, · 4 unmodified lines
1884	if (remove)	1898	if (remove)
1885	blk_mq_unquiesce_queue(ctrl->admin_q);	1899	blk_mq_unquiesce_queue(ctrl->admin_q);
1886	nvme_tcp_destroy_admin_queue(ctrl, remove);	1900	nvme_tcp_destroy_admin_queue(ctrl, remove);
		1901	mutex_unlock(&to_tcp_ctrl(ctrl)->teardown_lock);
1887	}	1902	}
1888		1903
1889	static void nvme_tcp_teardown_io_queues(struct nvme_ctrl *ctrl,	1904	static void nvme_tcp_teardown_io_queues(struct nvme_ctrl *ctrl,
1890	bool remove)	1905	bool remove)
1891	{	1906	{
		1907	mutex_lock(&to_tcp_ctrl(ctrl)->teardown_lock);
1892	if (ctrl->queue_count <= 1)	1908	if (ctrl->queue_count <= 1)
1893	return;	1909	goto out;
		1910	blk_mq_quiesce_queue(ctrl->admin_q);
1894	nvme_start_freeze(ctrl);	1911	nvme_start_freeze(ctrl);
1895	nvme_stop_queues(ctrl);	1912	nvme_stop_queues(ctrl);
1896	nvme_tcp_stop_io_queues(ctrl);	1913	nvme_tcp_stop_io_queues(ctrl);
@@ -1902,6 +1919,8 @@ static void nvme_tcp_teardown_io_queues(struct nvme_ctrl *ctrl, · 5 unmodified lines
1902	if (remove)	1919	if (remove)
1903	nvme_start_queues(ctrl);	1920	nvme_start_queues(ctrl);
1904	nvme_tcp_destroy_io_queues(ctrl, remove);	1921	nvme_tcp_destroy_io_queues(ctrl, remove);
		1922	out:
		1923	mutex_unlock(&to_tcp_ctrl(ctrl)->teardown_lock);
1905	}	1924	}
1906		1925
1907	static void nvme_tcp_reconnect_or_remove(struct nvme_ctrl *ctrl)	1926	static void nvme_tcp_reconnect_or_remove(struct nvme_ctrl *ctrl)
@@ -2148,40 +2167,55 @@ static void nvme_tcp_submit_async_event(struct nvme_ctrl *arg) · 240 unmodified lines
2148	nvme_tcp_queue_request(&ctrl->async_req, true, true);	2167	nvme_tcp_queue_request(&ctrl->async_req, true, true);
2149	}	2168	}
2150		2169
		2170	static void nvme_tcp_complete_timed_out(struct request *rq)
		2171	{
		2172	struct nvme_tcp_request *req = blk_mq_rq_to_pdu(rq);
		2173	struct nvme_ctrl *ctrl = &req->queue->ctrl->ctrl;
		2174
		2175	/* fence other contexts that may complete the command */
		2176	mutex_lock(&to_tcp_ctrl(ctrl)->teardown_lock);
		2177	nvme_tcp_stop_queue(ctrl, nvme_tcp_queue_id(req->queue));
		2178	if (!blk_mq_request_completed(rq)) {
		2179	nvme_req(rq)->status = NVME_SC_HOST_ABORTED_CMD;
		2180	blk_mq_complete_request(rq);
		2181	}
		2182	mutex_unlock(&to_tcp_ctrl(ctrl)->teardown_lock);
		2183	}
		2184
2151	static enum blk_eh_timer_return	2185	static enum blk_eh_timer_return
2152	nvme_tcp_timeout(struct request *rq, bool reserved)	2186	nvme_tcp_timeout(struct request *rq, bool reserved)
2153	{	2187	{
2154	struct nvme_tcp_request *req = blk_mq_rq_to_pdu(rq);	2188	struct nvme_tcp_request *req = blk_mq_rq_to_pdu(rq);
2155	struct nvme_tcp_ctrl *ctrl = req->queue->ctrl;	2189	struct nvme_ctrl *ctrl = &req->queue->ctrl->ctrl;
2156	struct nvme_tcp_cmd_pdu *pdu = req->pdu;	2190	struct nvme_tcp_cmd_pdu *pdu = req->pdu;
2157		2191
2158	/*	2192	dev_warn(ctrl->device,
2159	* Restart the timer if a controller reset is already scheduled. Any
2160	* timed out commands would be handled before entering the connecting
2161	* state.
2162	*/
2163	if (ctrl->ctrl.state == NVME_CTRL_RESETTING)
2164	return BLK_EH_RESET_TIMER;
2165
2166	dev_warn(ctrl->ctrl.device,
2167	"queue %d: timeout request %#x type %d\n",	2193	"queue %d: timeout request %#x type %d\n",
2168	nvme_tcp_queue_id(req->queue), rq->tag, pdu->hdr.type);	2194	nvme_tcp_queue_id(req->queue), rq->tag, pdu->hdr.type);
2169		2195
2170	if (ctrl->ctrl.state != NVME_CTRL_LIVE) {	2196	if (ctrl->state != NVME_CTRL_LIVE) {
2171	/*	2197	/*
2172	* Teardown immediately if controller times out while starting	2198	* If we are resetting, connecting or deleting we should
2173	* or we are already started error recovery. all outstanding	2199	* complete immediately because we may block controller
2174	* requests are completed on shutdown, so we return BLK_EH_DONE.	2200	* teardown or setup sequence
		2201	* - ctrl disable/shutdown fabrics requests
		2202	* - connect requests
		2203	* - initialization admin requests
		2204	* - I/O requests that entered after unquiescing and
		2205	* the controller stopped responding
		2206	*
		2207	* All other requests should be cancelled by the error
		2208	* recovery work, so it's fine that we fail it here.
2175	*/	2209	*/
2176	flush_work(&ctrl->err_work);	2210	nvme_tcp_complete_timed_out(rq);
2177	nvme_tcp_teardown_io_queues(&ctrl->ctrl, false);
2178	nvme_tcp_teardown_admin_queue(&ctrl->ctrl, false);
2179	return BLK_EH_DONE;	2211	return BLK_EH_DONE;
2180	}	2212	}
2181		2213
2182	dev_warn(ctrl->ctrl.device, "starting error recovery\n");	2214	/*
2183	nvme_tcp_error_recovery(&ctrl->ctrl);	2215	* LIVE state should trigger the normal error recovery which will
2184		2216	* handle completing this request.
		2217	*/
		2218	nvme_tcp_error_recovery(ctrl);
2185	return BLK_EH_RESET_TIMER;	2219	return BLK_EH_RESET_TIMER;
2186	}	2220	}
2187		2221
@@ -2422,6 +2456,7 @@ static struct nvme_ctrl nvme_tcp_create_ctrl(struct device dev, · 234 unmodified lines
2422	nvme_tcp_reconnect_ctrl_work);	2456	nvme_tcp_reconnect_ctrl_work);
2423	INIT_WORK(&ctrl->err_work, nvme_tcp_error_recovery_work);	2457	INIT_WORK(&ctrl->err_work, nvme_tcp_error_recovery_work);
2424	INIT_WORK(&ctrl->ctrl.reset_work, nvme_reset_ctrl_work);	2458	INIT_WORK(&ctrl->ctrl.reset_work, nvme_reset_ctrl_work);
		2459	mutex_init(&ctrl->teardown_lock);
2425		2460
2426	if (!(opts->mask & NVMF_OPT_TRSVCID)) {	2461	if (!(opts->mask & NVMF_OPT_TRSVCID)) {
2427	opts->trsvcid =	2462	opts->trsvcid =

drivers/nvme/target/fc.c+2−2

@@ -2342,9 +2342,9 @@ nvmet_fc_fod_op_done(struct nvmet_fc_fcp_iod *fod) · 2341 unmodified lines
2342	return;	2342	return;
2343	if (fcpreq->fcp_error \|\|	2343	if (fcpreq->fcp_error \|\|
2344	fcpreq->transferred_length != fcpreq->transfer_length) {	2344	fcpreq->transferred_length != fcpreq->transfer_length) {
2345	spin_lock(&fod->flock);	2345	spin_lock_irqsave(&fod->flock, flags);
2346	fod->abort = true;	2346	fod->abort = true;
2347	spin_unlock(&fod->flock);	2347	spin_unlock_irqrestore(&fod->flock, flags);
2348		2348
2349	nvmet_req_complete(&fod->req, NVME_SC_INTERNAL);	2349	nvmet_req_complete(&fod->req, NVME_SC_INTERNAL);
2350	return;	2350	return;

drivers/nvme/target/tcp.c+9−1

 static inline u16 nvmet_tcp_cmd_tag(struct nvmet_tcp_queue *queue,
 		struct nvmet_tcp_cmd *cmd)
 {
+	if (unlikely(!queue->nr_cmds)) {
+		/* We didn't allocate cmds yet, send 0xffff */
+		return USHRT_MAX;
+	}
 	return cmd - queue->cmds;
 }
 	struct nvme_tcp_data_pdu *data = &queue->pdu.data;
 	struct nvmet_tcp_cmd *cmd;
-	cmd = &queue->cmds[data->ttag];
+	if (likely(queue->nr_cmds))
+		cmd = &queue->cmds[data->ttag];
+	else
+		cmd = &queue->connect;
 	if (le32_to_cpu(data->data_offset) != cmd->rbytes_done) {
 		pr_err("ttag %u unexpected data offset %u (expected %u)\n",

drivers/opp/core.c+16−6

 }
 EXPORT_SYMBOL_GPL(dev_pm_opp_remove);
-void _opp_remove_all_static(struct opp_table *opp_table)
+bool _opp_remove_all_static(struct opp_table *opp_table)
 {
 	struct dev_pm_opp *opp, *tmp;
+	bool ret = true;
 	mutex_lock(&opp_table->lock);
-	if (!opp_table->parsed_static_opps || --opp_table->parsed_static_opps)
+	if (!opp_table->parsed_static_opps) {
+		ret = false;
+		goto unlock;
+	}
+	if (--opp_table->parsed_static_opps)
 		goto unlock;
 	list_for_each_entry_safe(opp, tmp, &opp_table->opp_list, node) {
 unlock:
 	mutex_unlock(&opp_table->lock);
+	return ret;
 }
 /**
 		return;
 	}
-	_opp_remove_all_static(opp_table);
+	/*
+	 * Drop the extra reference only if the OPP table was successfully added
+	 * with dev_pm_opp_of_add_table() earlier.
+	 **/
+	if (_opp_remove_all_static(opp_table))
+		dev_pm_opp_put_opp_table(opp_table);
 	/* Drop reference taken by _find_opp_table() */
 	dev_pm_opp_put_opp_table(opp_table);
-	/* Drop reference taken while the OPP table was added */
-	dev_pm_opp_put_opp_table(opp_table);
 }
 /**

drivers/opp/opp.h+1−1

@@ -212,7 +212,7 @@ struct opp_table { · 211 unmodified lines
212		212
213	/* Routines internal to opp core */	213	/* Routines internal to opp core */
214	void dev_pm_opp_get(struct dev_pm_opp *opp);	214	void dev_pm_opp_get(struct dev_pm_opp *opp);
215	void _opp_remove_all_static(struct opp_table *opp_table);	215	bool _opp_remove_all_static(struct opp_table *opp_table);
216	void _get_opp_table_kref(struct opp_table *opp_table);	216	void _get_opp_table_kref(struct opp_table *opp_table);
217	int _get_opp_count(struct opp_table *opp_table);	217	int _get_opp_count(struct opp_table *opp_table);
218	struct opp_table _find_opp_table(struct device dev);	218	struct opp_table _find_opp_table(struct device dev);

drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c+2−3

 	size = resource_size(res);
 	phy_dwc3->base = devm_ioremap(phy_dwc3->dev, res->start, size);
-	if (IS_ERR(phy_dwc3->base)) {
+	if (!phy_dwc3->base) {
 		dev_err(phy_dwc3->dev, "failed to map reg\n");
-		return PTR_ERR(phy_dwc3->base);
+		return -ENOMEM;
 	}
 	phy_dwc3->ref_clk = devm_clk_get(phy_dwc3->dev, "ref");
 	.probe		= qcom_ipq806x_usb_phy_probe,
 	.driver		= {
 		.name	= "qcom-ipq806x-usb-phy",
-		.owner	= THIS_MODULE,
 		.of_match_table = qcom_ipq806x_usb_phy_table,
 	},
 };

drivers/phy/qualcomm/phy-qcom-qmp.c+9−7

 	QMP_PHY_INIT_CFG(QSERDES_COM_BG_TRIM, 0xf),
 	QMP_PHY_INIT_CFG(QSERDES_COM_LOCK_CMP_EN, 0x1),
 	QMP_PHY_INIT_CFG(QSERDES_COM_VCO_TUNE_MAP, 0x0),
-	QMP_PHY_INIT_CFG(QSERDES_COM_VCO_TUNE_TIMER1, 0x1f),
+	QMP_PHY_INIT_CFG(QSERDES_COM_VCO_TUNE_TIMER1, 0xff),
-	QMP_PHY_INIT_CFG(QSERDES_COM_VCO_TUNE_TIMER2, 0x3f),
+	QMP_PHY_INIT_CFG(QSERDES_COM_VCO_TUNE_TIMER2, 0x1f),
 	QMP_PHY_INIT_CFG(QSERDES_COM_CMN_CONFIG, 0x6),
 	QMP_PHY_INIT_CFG(QSERDES_COM_PLL_IVCO, 0xf),
 	QMP_PHY_INIT_CFG(QSERDES_COM_HSCLK_SEL, 0x0),
 	QMP_PHY_INIT_CFG(QSERDES_COM_INTEGLOOP_GAIN1_MODE0, 0x0),
 	QMP_PHY_INIT_CFG(QSERDES_COM_INTEGLOOP_GAIN0_MODE0, 0x80),
 	QMP_PHY_INIT_CFG(QSERDES_COM_BIAS_EN_CTRL_BY_PSM, 0x1),
-	QMP_PHY_INIT_CFG(QSERDES_COM_VCO_TUNE_CTRL, 0xa),
 	QMP_PHY_INIT_CFG(QSERDES_COM_SSC_EN_CENTER, 0x1),
 	QMP_PHY_INIT_CFG(QSERDES_COM_SSC_PER1, 0x31),
 	QMP_PHY_INIT_CFG(QSERDES_COM_SSC_PER2, 0x1),
 	QMP_PHY_INIT_CFG(QSERDES_COM_SSC_STEP_SIZE1, 0x2f),
 	QMP_PHY_INIT_CFG(QSERDES_COM_SSC_STEP_SIZE2, 0x19),
 	QMP_PHY_INIT_CFG(QSERDES_COM_CLK_EP_DIV, 0x19),
-	QMP_PHY_INIT_CFG(QSERDES_RX_SIGDET_CNTRL, 0x7),
 };
 static const struct qmp_phy_init_tbl ipq8074_pcie_tx_tbl[] = {
 	QMP_PHY_INIT_CFG(QSERDES_TX_LANE_MODE, 0x6),
 	QMP_PHY_INIT_CFG(QSERDES_TX_RES_CODE_LANE_OFFSET, 0x2),
 	QMP_PHY_INIT_CFG(QSERDES_TX_RCV_DETECT_LVL_2, 0x12),
+	QMP_PHY_INIT_CFG(QSERDES_TX_EMP_POST1_LVL, 0x36),
+	QMP_PHY_INIT_CFG(QSERDES_TX_SLEW_CNTL, 0x0a),
 };
 static const struct qmp_phy_init_tbl ipq8074_pcie_rx_tbl[] = {
 	QMP_PHY_INIT_CFG(QSERDES_RX_RX_EQU_ADAPTOR_CNTRL4, 0xdb),
 	QMP_PHY_INIT_CFG(QSERDES_RX_UCDR_SO_SATURATION_AND_ENABLE, 0x4b),
 	QMP_PHY_INIT_CFG(QSERDES_RX_UCDR_SO_GAIN, 0x4),
-	QMP_PHY_INIT_CFG(QSERDES_RX_UCDR_SO_GAIN_HALF, 0x4),
 };
 static const struct qmp_phy_init_tbl ipq8074_pcie_pcs_tbl[] = {
 	.pwrdn_ctrl		= SW_PWRDN,
 };
+static const char * const ipq8074_pciephy_clk_l[] = {
+	"aux", "cfg_ahb",
+};
 /* list of resets */
 static const char * const ipq8074_pciephy_reset_l[] = {
 	"phy", "common",
 	.rx_tbl_num		= ARRAY_SIZE(ipq8074_pcie_rx_tbl),
 	.pcs_tbl		= ipq8074_pcie_pcs_tbl,
 	.pcs_tbl_num		= ARRAY_SIZE(ipq8074_pcie_pcs_tbl),
-	.clk_list		= NULL,
+	.clk_list		= ipq8074_pciephy_clk_l,
-	.num_clks		= 0,
+	.num_clks		= ARRAY_SIZE(ipq8074_pciephy_clk_l),
 	.reset_list		= ipq8074_pciephy_reset_l,
 	.num_resets		= ARRAY_SIZE(ipq8074_pciephy_reset_l),
 	.vreg_list		= NULL,

drivers/phy/qualcomm/phy-qcom-qmp.h+2−0

@@ -77,6 +77,8 @@ · 76 unmodified lines
77	#define QSERDES_COM_CORECLK_DIV_MODE1 0x1bc	77	#define QSERDES_COM_CORECLK_DIV_MODE1 0x1bc
78		78
79	/* Only for QMP V2 PHY - TX registers */	79	/* Only for QMP V2 PHY - TX registers */
		80	#define QSERDES_TX_EMP_POST1_LVL 0x018
		81	#define QSERDES_TX_SLEW_CNTL 0x040
80	#define QSERDES_TX_RES_CODE_LANE_OFFSET 0x054	82	#define QSERDES_TX_RES_CODE_LANE_OFFSET 0x054
81	#define QSERDES_TX_DEBUG_BUS_SEL 0x064	83	#define QSERDES_TX_DEBUG_BUS_SEL 0x064
82	#define QSERDES_TX_HIGHZ_TRANSCEIVEREN_BIAS_DRVR_EN 0x068	84	#define QSERDES_TX_HIGHZ_TRANSCEIVEREN_BIAS_DRVR_EN 0x068

drivers/phy/ti/phy-omap-usb2.c+40−7

@@ -22,10 +22,15 @@ · 21 unmodified lines
22	#include <linux/mfd/syscon.h>	22	#include <linux/mfd/syscon.h>
23	#include <linux/regmap.h>	23	#include <linux/regmap.h>
24	#include <linux/of_platform.h>	24	#include <linux/of_platform.h>
		25	#include <linux/sys_soc.h>
25		26
26	#define USB2PHY_ANA_CONFIG1 0x4c	27	#define USB2PHY_ANA_CONFIG1 0x4c
27	#define USB2PHY_DISCON_BYP_LATCH BIT(31)	28	#define USB2PHY_DISCON_BYP_LATCH BIT(31)
28		29
		30	#define USB2PHY_CHRG_DET 0x14
		31	#define USB2PHY_CHRG_DET_USE_CHG_DET_REG BIT(29)
		32	#define USB2PHY_CHRG_DET_DIS_CHG_DET BIT(28)
		33
29	/* SoC Specific USB2_OTG register definitions */	34	/* SoC Specific USB2_OTG register definitions */
30	#define AM654_USB2_OTG_PD BIT(8)	35	#define AM654_USB2_OTG_PD BIT(8)
31	#define AM654_USB2_VBUS_DET_EN BIT(5)	36	#define AM654_USB2_VBUS_DET_EN BIT(5)
@@ -43,6 +48,7 @@ · 11 unmodified lines
43	#define OMAP_USB2_HAS_START_SRP BIT(0)	48	#define OMAP_USB2_HAS_START_SRP BIT(0)
44	#define OMAP_USB2_HAS_SET_VBUS BIT(1)	49	#define OMAP_USB2_HAS_SET_VBUS BIT(1)
45	#define OMAP_USB2_CALIBRATE_FALSE_DISCONNECT BIT(2)	50	#define OMAP_USB2_CALIBRATE_FALSE_DISCONNECT BIT(2)
		51	#define OMAP_USB2_DISABLE_CHRG_DET BIT(3)
46		52
47	struct omap_usb {	53	struct omap_usb {
48	struct usb_phy phy;	54	struct usb_phy phy;
@@ -236,6 +242,13 @@ static int omap_usb_init(struct phy *x) · 187 unmodified lines
236	omap_usb_writel(phy->phy_base, USB2PHY_ANA_CONFIG1, val);	242	omap_usb_writel(phy->phy_base, USB2PHY_ANA_CONFIG1, val);
237	}	243	}
238		244
		245	if (phy->flags & OMAP_USB2_DISABLE_CHRG_DET) {
		246	val = omap_usb_readl(phy->phy_base, USB2PHY_CHRG_DET);
		247	val \|= USB2PHY_CHRG_DET_USE_CHG_DET_REG \|
		248	USB2PHY_CHRG_DET_DIS_CHG_DET;
		249	omap_usb_writel(phy->phy_base, USB2PHY_CHRG_DET, val);
		250	}
		251
239	return 0;	252	return 0;
240	}	253	}
241		254
@@ -329,6 +342,26 @@ static const struct of_device_id omap_usb2_id_table[] = { · 87 unmodified lines
329	};	342	};
330	MODULE_DEVICE_TABLE(of, omap_usb2_id_table);	343	MODULE_DEVICE_TABLE(of, omap_usb2_id_table);
331		344
		345	static void omap_usb2_init_errata(struct omap_usb *phy)
		346	{
		347	static const struct soc_device_attribute am65x_sr10_soc_devices[] = {
		348	{ .family = "AM65X", .revision = "SR1.0" },
		349	{ /* sentinel */ }
		350	};
		351
		352	/*
		353	* Errata i2075: USB2PHY: USB2PHY Charger Detect is Enabled by
		354	* Default Without VBUS Presence.
		355	*
		356	* AM654x SR1.0 has a silicon bug due to which D+ is pulled high after
		357	* POR, which could cause enumeration failure with some USB hubs.
		358	* Disabling the USB2_PHY Charger Detect function will put D+
		359	* into the normal state.
		360	*/
		361	if (soc_device_match(am65x_sr10_soc_devices))
		362	phy->flags \|= OMAP_USB2_DISABLE_CHRG_DET;
		363	}
		364
332	static int omap_usb2_probe(struct platform_device *pdev)	365	static int omap_usb2_probe(struct platform_device *pdev)
333	{	366	{
334	struct omap_usb *phy;	367	struct omap_usb *phy;
@@ -366,14 +399,14 @@ static int omap_usb2_probe(struct platform_device *pdev) · 31 unmodified lines
366	phy->mask = phy_data->mask;	399	phy->mask = phy_data->mask;
367	phy->power_on = phy_data->power_on;	400	phy->power_on = phy_data->power_on;
368	phy->power_off = phy_data->power_off;	401	phy->power_off = phy_data->power_off;
		402	phy->flags = phy_data->flags;
369		403
370	if (phy_data->flags & OMAP_USB2_CALIBRATE_FALSE_DISCONNECT) {	404	omap_usb2_init_errata(phy);
371	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);	405
372	phy->phy_base = devm_ioremap_resource(&pdev->dev, res);	406	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
373	if (IS_ERR(phy->phy_base))	407	phy->phy_base = devm_ioremap_resource(&pdev->dev, res);
374	return PTR_ERR(phy->phy_base);	408	if (IS_ERR(phy->phy_base))
375	phy->flags \|= OMAP_USB2_CALIBRATE_FALSE_DISCONNECT;	409	return PTR_ERR(phy->phy_base);
376	}
377		410
378	phy->syscon_phy_power = syscon_regmap_lookup_by_phandle(node,	411	phy->syscon_phy_power = syscon_regmap_lookup_by_phandle(node,
379	"syscon-phy-power");	412	"syscon-phy-power");

drivers/powercap/intel_rapl_common.c+3−0

 	X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L,		&rapl_defaults_core),
 	X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE,		&rapl_defaults_core),
 	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L,		&rapl_defaults_core),
+	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE,		&rapl_defaults_core),
+	X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE,		&rapl_defaults_core),
+	X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE,		&rapl_defaults_core),
 	X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,	&rapl_defaults_spr_server),
 	X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT,	&rapl_defaults_byt),

drivers/rapidio/Kconfig+1−1

@@ -37,7 +37,7 @@ config RAPIDIO_ENABLE_RX_TX_PORTS · 36 unmodified lines
37	config RAPIDIO_DMA_ENGINE	37	config RAPIDIO_DMA_ENGINE
38	bool "DMA Engine support for RapidIO"	38	bool "DMA Engine support for RapidIO"
39	depends on RAPIDIO	39	depends on RAPIDIO
40	select DMADEVICES	40	depends on DMADEVICES
41	select DMA_ENGINE	41	select DMA_ENGINE
42	help	42	help
43	Say Y here if you want to use DMA Engine frameork for RapidIO data	43	Say Y here if you want to use DMA Engine frameork for RapidIO data

drivers/regulator/core.c+96−83

@@ -236,8 +236,8 @@ static bool regulator_supply_is_couple(struct regulator_dev *rdev) · 235 unmodified lines
236	static void regulator_unlock_recursive(struct regulator_dev *rdev,	236	static void regulator_unlock_recursive(struct regulator_dev *rdev,
237	unsigned int n_coupled)	237	unsigned int n_coupled)
238	{	238	{
239	struct regulator_dev *c_rdev;	239	struct regulator_dev c_rdev, supply_rdev;
240	int i;	240	int i, supply_n_coupled;
241		241
242	for (i = n_coupled; i > 0; i--) {	242	for (i = n_coupled; i > 0; i--) {
243	c_rdev = rdev->coupling_desc.coupled_rdevs[i - 1];	243	c_rdev = rdev->coupling_desc.coupled_rdevs[i - 1];
@@ -245,10 +245,13 @@ static void regulator_unlock_recursive(struct regulator_dev *rdev, · 1 unmodified line
245	if (!c_rdev)	245	if (!c_rdev)
246	continue;	246	continue;
247		247
248	if (c_rdev->supply && !regulator_supply_is_couple(c_rdev))	248	if (c_rdev->supply && !regulator_supply_is_couple(c_rdev)) {
249	regulator_unlock_recursive(	249	supply_rdev = c_rdev->supply->rdev;
250	c_rdev->supply->rdev,	250	supply_n_coupled = supply_rdev->coupling_desc.n_coupled;
251	c_rdev->coupling_desc.n_coupled);	251
		252	regulator_unlock_recursive(supply_rdev,
		253	supply_n_coupled);
		254	}
252		255
253	regulator_unlock(c_rdev);	256	regulator_unlock(c_rdev);
254	}	257	}
@@ -1461,7 +1464,7 @@ static int set_consumer_device_supply(struct regulator_dev *rdev, · 1206 unmodified lines
1461	const char *consumer_dev_name,	1464	const char *consumer_dev_name,
1462	const char *supply)	1465	const char *supply)
1463	{	1466	{
1464	struct regulator_map *node;	1467	struct regulator_map node, new_node;
1465	int has_dev;	1468	int has_dev;
1466		1469
1467	if (supply == NULL)	1470	if (supply == NULL)
@@ -1472,6 +1475,22 @@ static int set_consumer_device_supply(struct regulator_dev *rdev, · 4 unmodified lines
1472	else	1475	else
1473	has_dev = 0;	1476	has_dev = 0;
1474		1477
		1478	new_node = kzalloc(sizeof(struct regulator_map), GFP_KERNEL);
		1479	if (new_node == NULL)
		1480	return -ENOMEM;
		1481
		1482	new_node->regulator = rdev;
		1483	new_node->supply = supply;
		1484
		1485	if (has_dev) {
		1486	new_node->dev_name = kstrdup(consumer_dev_name, GFP_KERNEL);
		1487	if (new_node->dev_name == NULL) {
		1488	kfree(new_node);
		1489	return -ENOMEM;
		1490	}
		1491	}
		1492
		1493	mutex_lock(&regulator_list_mutex);
1475	list_for_each_entry(node, &regulator_map_list, list) {	1494	list_for_each_entry(node, &regulator_map_list, list) {
1476	if (node->dev_name && consumer_dev_name) {	1495	if (node->dev_name && consumer_dev_name) {
1477	if (strcmp(node->dev_name, consumer_dev_name) != 0)	1496	if (strcmp(node->dev_name, consumer_dev_name) != 0)
@@ -1489,26 +1508,19 @@ static int set_consumer_device_supply(struct regulator_dev *rdev, · 11 unmodified lines
1489	node->regulator->desc->name,	1508	node->regulator->desc->name,
1490	supply,	1509	supply,
1491	dev_name(&rdev->dev), rdev_get_name(rdev));	1510	dev_name(&rdev->dev), rdev_get_name(rdev));
1492	return -EBUSY;	1511	goto fail;
1493	}	1512	}
1494		1513
1495	node = kzalloc(sizeof(struct regulator_map), GFP_KERNEL);	1514	list_add(&new_node->list, &regulator_map_list);
1496	if (node == NULL)	1515	mutex_unlock(&regulator_list_mutex);
1497	return -ENOMEM;
1498
1499	node->regulator = rdev;
1500	node->supply = supply;
1501
1502	if (has_dev) {
1503	node->dev_name = kstrdup(consumer_dev_name, GFP_KERNEL);
1504	if (node->dev_name == NULL) {
1505	kfree(node);
1506	return -ENOMEM;
1507	}
1508	}
1509		1516
1510	list_add(&node->list, &regulator_map_list);
1511	return 0;	1517	return 0;
		1518
		1519	fail:
		1520	mutex_unlock(&regulator_list_mutex);
		1521	kfree(new_node->dev_name);
		1522	kfree(new_node);
		1523	return -EBUSY;
1512	}	1524	}
1513		1525
1514	static void unset_regulator_supplies(struct regulator_dev *rdev)	1526	static void unset_regulator_supplies(struct regulator_dev *rdev)
@@ -1580,44 +1592,53 @@ static struct regulator create_regulator(struct regulator_dev rdev, · 65 unmodified lines
1580	const char *supply_name)	1592	const char *supply_name)
1581	{	1593	{
1582	struct regulator *regulator;	1594	struct regulator *regulator;
1583	char buf[REG_STR_SIZE];	1595	int err;
1584	int err, size;	1596
		1597	if (dev) {
		1598	char buf[REG_STR_SIZE];
		1599	int size;
		1600
		1601	size = snprintf(buf, REG_STR_SIZE, "%s-%s",
		1602	dev->kobj.name, supply_name);
		1603	if (size >= REG_STR_SIZE)
		1604	return NULL;
		1605
		1606	supply_name = kstrdup(buf, GFP_KERNEL);
		1607	if (supply_name == NULL)
		1608	return NULL;
		1609	} else {
		1610	supply_name = kstrdup_const(supply_name, GFP_KERNEL);
		1611	if (supply_name == NULL)
		1612	return NULL;
		1613	}
1585		1614
1586	regulator = kzalloc(sizeof(*regulator), GFP_KERNEL);	1615	regulator = kzalloc(sizeof(*regulator), GFP_KERNEL);
1587	if (regulator == NULL)	1616	if (regulator == NULL) {
		1617	kfree(supply_name);
1588	return NULL;	1618	return NULL;
		1619	}
1589		1620
1590	regulator_lock(rdev);
1591	regulator->rdev = rdev;	1621	regulator->rdev = rdev;
		1622	regulator->supply_name = supply_name;
		1623
		1624	regulator_lock(rdev);
1592	list_add(&regulator->list, &rdev->consumer_list);	1625	list_add(&regulator->list, &rdev->consumer_list);
		1626	regulator_unlock(rdev);
1593		1627
1594	if (dev) {	1628	if (dev) {
1595	regulator->dev = dev;	1629	regulator->dev = dev;
1596		1630
1597	/* Add a link to the device sysfs entry */	1631	/* Add a link to the device sysfs entry */
1598	size = snprintf(buf, REG_STR_SIZE, "%s-%s",
1599	dev->kobj.name, supply_name);
1600	if (size >= REG_STR_SIZE)
1601	goto overflow_err;
1602
1603	regulator->supply_name = kstrdup(buf, GFP_KERNEL);
1604	if (regulator->supply_name == NULL)
1605	goto overflow_err;
1606
1607	err = sysfs_create_link_nowarn(&rdev->dev.kobj, &dev->kobj,	1632	err = sysfs_create_link_nowarn(&rdev->dev.kobj, &dev->kobj,
1608	buf);	1633	supply_name);
1609	if (err) {	1634	if (err) {
1610	rdev_dbg(rdev, "could not add device link %s err %d\n",	1635	rdev_dbg(rdev, "could not add device link %s err %d\n",
1611	dev->kobj.name, err);	1636	dev->kobj.name, err);
1612	/* non-fatal */	1637	/* non-fatal */
1613	}	1638	}
1614	} else {
1615	regulator->supply_name = kstrdup_const(supply_name, GFP_KERNEL);
1616	if (regulator->supply_name == NULL)
1617	goto overflow_err;
1618	}	1639	}
1619		1640
1620	regulator->debugfs = debugfs_create_dir(regulator->supply_name,	1641	regulator->debugfs = debugfs_create_dir(supply_name,
1621	rdev->debugfs);	1642	rdev->debugfs);
1622	if (!regulator->debugfs) {	1643	if (!regulator->debugfs) {
1623	rdev_dbg(rdev, "Failed to create debugfs directory\n");	1644	rdev_dbg(rdev, "Failed to create debugfs directory\n");
@@ -1642,13 +1663,7 @@ static struct regulator create_regulator(struct regulator_dev rdev, · 18 unmodified lines
1642	_regulator_is_enabled(rdev))	1663	_regulator_is_enabled(rdev))
1643	regulator->always_on = true;	1664	regulator->always_on = true;
1644		1665
1645	regulator_unlock(rdev);
1646	return regulator;	1666	return regulator;
1647	overflow_err:
1648	list_del(&regulator->list);
1649	kfree(regulator);
1650	regulator_unlock(rdev);
1651	return NULL;
1652	}	1667	}
1653		1668
1654	static int _regulator_get_enable_time(struct regulator_dev *rdev)	1669	static int _regulator_get_enable_time(struct regulator_dev *rdev)
@@ -2230,10 +2245,13 @@ EXPORT_SYMBOL_GPL(regulator_bulk_unregister_supply_alias); · 575 unmodified lines
2230	static int regulator_ena_gpio_request(struct regulator_dev *rdev,	2245	static int regulator_ena_gpio_request(struct regulator_dev *rdev,
2231	const struct regulator_config *config)	2246	const struct regulator_config *config)
2232	{	2247	{
2233	struct regulator_enable_gpio *pin;	2248	struct regulator_enable_gpio pin, new_pin;
2234	struct gpio_desc *gpiod;	2249	struct gpio_desc *gpiod;
2235		2250
2236	gpiod = config->ena_gpiod;	2251	gpiod = config->ena_gpiod;
		2252	new_pin = kzalloc(sizeof(*new_pin), GFP_KERNEL);
		2253
		2254	mutex_lock(&regulator_list_mutex);
2237		2255
2238	list_for_each_entry(pin, &regulator_ena_gpio_list, list) {	2256	list_for_each_entry(pin, &regulator_ena_gpio_list, list) {
2239	if (pin->gpiod == gpiod) {	2257	if (pin->gpiod == gpiod) {
@@ -2242,9 +2260,13 @@ static int regulator_ena_gpio_request(struct regulator_dev *rdev, · 2 unmodified lines
2242	}	2260	}
2243	}	2261	}
2244		2262
2245	pin = kzalloc(sizeof(struct regulator_enable_gpio), GFP_KERNEL);	2263	if (new_pin == NULL) {
2246	if (pin == NULL)	2264	mutex_unlock(&regulator_list_mutex);
2247	return -ENOMEM;	2265	return -ENOMEM;
		2266	}
		2267
		2268	pin = new_pin;
		2269	new_pin = NULL;
2248		2270
2249	pin->gpiod = gpiod;	2271	pin->gpiod = gpiod;
2250	list_add(&pin->list, &regulator_ena_gpio_list);	2272	list_add(&pin->list, &regulator_ena_gpio_list);
@@ -2252,6 +2274,10 @@ static int regulator_ena_gpio_request(struct regulator_dev *rdev, · 1 unmodified line
2252	update_ena_gpio_to_rdev:	2274	update_ena_gpio_to_rdev:
2253	pin->request_count++;	2275	pin->request_count++;
2254	rdev->ena_pin = pin;	2276	rdev->ena_pin = pin;
		2277
		2278	mutex_unlock(&regulator_list_mutex);
		2279	kfree(new_pin);
		2280
2255	return 0;	2281	return 0;
2256	}	2282	}
2257		2283
@@ -2264,19 +2290,19 @@ static void regulator_ena_gpio_free(struct regulator_dev *rdev) · 6 unmodified lines
2264		2290
2265	/* Free the GPIO only in case of no use */	2291	/* Free the GPIO only in case of no use */
2266	list_for_each_entry_safe(pin, n, &regulator_ena_gpio_list, list) {	2292	list_for_each_entry_safe(pin, n, &regulator_ena_gpio_list, list) {
2267	if (pin->gpiod == rdev->ena_pin->gpiod) {	2293	if (pin != rdev->ena_pin)
2268	if (pin->request_count <= 1) {	2294	continue;
2269	pin->request_count = 0;	2295
2270	gpiod_put(pin->gpiod);	2296	if (--pin->request_count)
2271	list_del(&pin->list);	2297	break;
2272	kfree(pin);	2298
2273	rdev->ena_pin = NULL;	2299	gpiod_put(pin->gpiod);
2274	return;	2300	list_del(&pin->list);
2275	} else {	2301	kfree(pin);
2276	pin->request_count--;	2302	break;
2277	}
2278	}
2279	}	2303	}
		2304
		2305	rdev->ena_pin = NULL;
2280	}	2306	}
2281		2307
2282	/**	2308	/**
@@ -4949,13 +4975,9 @@ static void regulator_resolve_coupling(struct regulator_dev *rdev) · 2666 unmodified lines
4949	return;	4975	return;
4950	}	4976	}
4951		4977
4952	regulator_lock(c_rdev);
4953
4954	c_desc->coupled_rdevs[i] = c_rdev;	4978	c_desc->coupled_rdevs[i] = c_rdev;
4955	c_desc->n_resolved++;	4979	c_desc->n_resolved++;
4956		4980
4957	regulator_unlock(c_rdev);
4958
4959	regulator_resolve_coupling(c_rdev);	4981	regulator_resolve_coupling(c_rdev);
4960	}	4982	}
4961	}	4983	}
@@ -5040,7 +5062,10 @@ static int regulator_init_coupling(struct regulator_dev *rdev) · 78 unmodified lines
5040	if (!of_check_coupling_data(rdev))	5062	if (!of_check_coupling_data(rdev))
5041	return -EPERM;	5063	return -EPERM;
5042		5064
		5065	mutex_lock(&regulator_list_mutex);
5043	rdev->coupling_desc.coupler = regulator_find_coupler(rdev);	5066	rdev->coupling_desc.coupler = regulator_find_coupler(rdev);
		5067	mutex_unlock(&regulator_list_mutex);
		5068
5044	if (IS_ERR(rdev->coupling_desc.coupler)) {	5069	if (IS_ERR(rdev->coupling_desc.coupler)) {
5045	err = PTR_ERR(rdev->coupling_desc.coupler);	5070	err = PTR_ERR(rdev->coupling_desc.coupler);
5046	rdev_err(rdev, "failed to get coupler: %d\n", err);	5071	rdev_err(rdev, "failed to get coupler: %d\n", err);
@@ -5141,6 +5166,7 @@ regulator_register(const struct regulator_desc *regulator_desc, · 94 unmodified lines
5141	ret = -ENOMEM;	5166	ret = -ENOMEM;
5142	goto rinse;	5167	goto rinse;
5143	}	5168	}
		5169	device_initialize(&rdev->dev);
5144		5170
5145	/*	5171	/*
5146	* Duplicate the config so the driver could override it after	5172	* Duplicate the config so the driver could override it after
@@ -5148,9 +5174,8 @@ regulator_register(const struct regulator_desc *regulator_desc, · 1 unmodified line
5148	*/	5174	*/
5149	config = kmemdup(cfg, sizeof(*cfg), GFP_KERNEL);	5175	config = kmemdup(cfg, sizeof(*cfg), GFP_KERNEL);
5150	if (config == NULL) {	5176	if (config == NULL) {
5151	kfree(rdev);
5152	ret = -ENOMEM;	5177	ret = -ENOMEM;
5153	goto rinse;	5178	goto clean;
5154	}	5179	}
5155		5180
5156	init_data = regulator_of_get_init_data(dev, regulator_desc, config,	5181	init_data = regulator_of_get_init_data(dev, regulator_desc, config,
@@ -5162,10 +5187,8 @@ regulator_register(const struct regulator_desc *regulator_desc, · 5 unmodified lines
5162	* from a gpio extender or something else.	5187	* from a gpio extender or something else.
5163	*/	5188	*/
5164	if (PTR_ERR(init_data) == -EPROBE_DEFER) {	5189	if (PTR_ERR(init_data) == -EPROBE_DEFER) {
5165	kfree(config);
5166	kfree(rdev);
5167	ret = -EPROBE_DEFER;	5190	ret = -EPROBE_DEFER;
5168	goto rinse;	5191	goto clean;
5169	}	5192	}
5170		5193
5171	/*	5194	/*
@@ -5206,9 +5229,7 @@ regulator_register(const struct regulator_desc *regulator_desc, · 34 unmodified lines
5206	}	5229	}
5207		5230
5208	if (config->ena_gpiod) {	5231	if (config->ena_gpiod) {
5209	mutex_lock(&regulator_list_mutex);
5210	ret = regulator_ena_gpio_request(rdev, config);	5232	ret = regulator_ena_gpio_request(rdev, config);
5211	mutex_unlock(&regulator_list_mutex);
5212	if (ret != 0) {	5233	if (ret != 0) {
5213	rdev_err(rdev, "Failed to request enable GPIO: %d\n",	5234	rdev_err(rdev, "Failed to request enable GPIO: %d\n",
5214	ret);	5235	ret);
@@ -5220,7 +5241,6 @@ regulator_register(const struct regulator_desc *regulator_desc, · 5 unmodified lines
5220	}	5241	}
5221		5242
5222	/* register with sysfs */	5243	/* register with sysfs */
5223	device_initialize(&rdev->dev);
5224	rdev->dev.class = &regulator_class;	5244	rdev->dev.class = &regulator_class;
5225	rdev->dev.parent = dev;	5245	rdev->dev.parent = dev;
5226	dev_set_name(&rdev->dev, "regulator.%lu",	5246	dev_set_name(&rdev->dev, "regulator.%lu",
@@ -5248,27 +5268,22 @@ regulator_register(const struct regulator_desc *regulator_desc, · 21 unmodified lines
5248	if (ret < 0)	5268	if (ret < 0)
5249	goto wash;	5269	goto wash;
5250		5270
5251	mutex_lock(&regulator_list_mutex);
5252	ret = regulator_init_coupling(rdev);	5271	ret = regulator_init_coupling(rdev);
5253	mutex_unlock(&regulator_list_mutex);
5254	if (ret < 0)	5272	if (ret < 0)
5255	goto wash;	5273	goto wash;
5256		5274
5257	/* add consumers devices */	5275	/* add consumers devices */
5258	if (init_data) {	5276	if (init_data) {
5259	mutex_lock(&regulator_list_mutex);
5260	for (i = 0; i < init_data->num_consumer_supplies; i++) {	5277	for (i = 0; i < init_data->num_consumer_supplies; i++) {
5261	ret = set_consumer_device_supply(rdev,	5278	ret = set_consumer_device_supply(rdev,
5262	init_data->consumer_supplies[i].dev_name,	5279	init_data->consumer_supplies[i].dev_name,
5263	init_data->consumer_supplies[i].supply);	5280	init_data->consumer_supplies[i].supply);
5264	if (ret < 0) {	5281	if (ret < 0) {
5265	mutex_unlock(&regulator_list_mutex);
5266	dev_err(dev, "Failed to set supply %s\n",	5282	dev_err(dev, "Failed to set supply %s\n",
5267	init_data->consumer_supplies[i].supply);	5283	init_data->consumer_supplies[i].supply);
5268	goto unset_supplies;	5284	goto unset_supplies;
5269	}	5285	}
5270	}	5286	}
5271	mutex_unlock(&regulator_list_mutex);
5272	}	5287	}
5273		5288
5274	if (!rdev->desc->ops->get_voltage &&	5289	if (!rdev->desc->ops->get_voltage &&
@@ -5303,13 +5318,11 @@ wash: · 28 unmodified lines
5303	mutex_lock(&regulator_list_mutex);	5318	mutex_lock(&regulator_list_mutex);
5304	regulator_ena_gpio_free(rdev);	5319	regulator_ena_gpio_free(rdev);
5305	mutex_unlock(&regulator_list_mutex);	5320	mutex_unlock(&regulator_list_mutex);
5306	put_device(&rdev->dev);
5307	rdev = NULL;
5308	clean:	5321	clean:
5309	if (dangling_of_gpiod)	5322	if (dangling_of_gpiod)
5310	gpiod_put(config->ena_gpiod);	5323	gpiod_put(config->ena_gpiod);
5311	kfree(rdev);
5312	kfree(config);	5324	kfree(config);
		5325	put_device(&rdev->dev);
5313	rinse:	5326	rinse:
5314	if (dangling_cfg_gpiod)	5327	if (dangling_cfg_gpiod)
5315	gpiod_put(cfg->ena_gpiod);	5328	gpiod_put(cfg->ena_gpiod);

drivers/regulator/cros-ec-regulator.c+3−0

@@ -170,6 +170,9 @@ static int cros_ec_regulator_init_info(struct device *dev, · 169 unmodified lines
170	data->voltages_mV =	170	data->voltages_mV =
171	devm_kmemdup(dev, resp.voltages_mv,	171	devm_kmemdup(dev, resp.voltages_mv,
172	sizeof(u16) * data->num_voltages, GFP_KERNEL);	172	sizeof(u16) * data->num_voltages, GFP_KERNEL);
		173	if (!data->voltages_mV)
		174	return -ENOMEM;
		175
173	data->desc.n_voltages = data->num_voltages;	176	data->desc.n_voltages = data->num_voltages;
174		177
175	/* Make sure the returned name is always a valid string */	178	/* Make sure the returned name is always a valid string */

drivers/regulator/fixed.c+1−1

@@ -182,7 +182,7 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev) · 181 unmodified lines
182		182
183	drvdata->enable_clock = devm_clk_get(dev, NULL);	183	drvdata->enable_clock = devm_clk_get(dev, NULL);
184	if (IS_ERR(drvdata->enable_clock)) {	184	if (IS_ERR(drvdata->enable_clock)) {
185	dev_err(dev, "Cant get enable-clock from devicetree\n");	185	dev_err(dev, "Can't get enable-clock from devicetree\n");
186	return -ENOENT;	186	return -ENOENT;
187	}	187	}
188	} else {	188	} else {

drivers/regulator/pwm-regulator.c+1−1

@@ -279,7 +279,7 @@ static int pwm_regulator_init_table(struct platform_device *pdev, · 278 unmodified lines
279	return ret;	279	return ret;
280	}	280	}
281		281
282	drvdata->state = -EINVAL;	282	drvdata->state = -ENOTRECOVERABLE;
283	drvdata->duty_cycle_table = duty_cycle_table;	283	drvdata->duty_cycle_table = duty_cycle_table;
284	drvdata->desc.ops = &pwm_regulator_voltage_table_ops;	284	drvdata->desc.ops = &pwm_regulator_voltage_table_ops;
285	drvdata->desc.n_voltages = length / sizeof(*duty_cycle_table);	285	drvdata->desc.n_voltages = length / sizeof(*duty_cycle_table);

drivers/scsi/cxgbi/libcxgbi.c+1−1

 		return err;
 	}
-	__kfree_skb(skb);
 	log_debug(1 << CXGBI_DBG_ISCSI | 1 << CXGBI_DBG_PDU_TX,
 		  "itt 0x%x, skb 0x%p, len %u/%u, xmit err %d.\n",
 		  task->itt, skb, skb->len, skb->data_len, err);
+	__kfree_skb(skb);
 	iscsi_conn_printk(KERN_ERR, task->conn, "xmit err %d.\n", err);
 	iscsi_conn_failure(task->conn, ISCSI_ERR_XMIT_FAILED);
 	return err;

drivers/scsi/libfc/fc_disc.c+0−2

@@ -634,8 +634,6 @@ free_fp: · 633 unmodified lines
634	fc_frame_free(fp);	634	fc_frame_free(fp);
635	out:	635	out:
636	kref_put(&rdata->kref, fc_rport_destroy);	636	kref_put(&rdata->kref, fc_rport_destroy);
637	if (!IS_ERR(fp))
638	fc_frame_free(fp);
639	}	637	}
640		638
641	/**	639	/**

drivers/scsi/libsas/sas_ata.c+4−1

 		task->num_scatter = si;
 	}
-	task->data_dir = qc->dma_dir;
+	if (qc->tf.protocol == ATA_PROT_NODATA)
+		task->data_dir = DMA_NONE;
+	else
+		task->data_dir = qc->dma_dir;
 	task->scatter = qc->sg;
 	task->ata_task.retry_count = 1;
 	task->task_state_flags = SAS_TASK_STATE_PENDING;

drivers/scsi/lpfc/lpfc_els.c+6−1

 				FC_TLV_DESC_LENGTH_FROM_SZ(prdf->reg_d1));
 	prdf->reg_d1.reg_desc.count = cpu_to_be32(ELS_RDF_REG_TAG_CNT);
 	prdf->reg_d1.desc_tags[0] = cpu_to_be32(ELS_DTAG_LNK_INTEGRITY);
+	prdf->reg_d1.desc_tags[1] = cpu_to_be32(ELS_DTAG_DELIVERY);
+	prdf->reg_d1.desc_tags[2] = cpu_to_be32(ELS_DTAG_PEER_CONGEST);
+	prdf->reg_d1.desc_tags[3] = cpu_to_be32(ELS_DTAG_CONGESTION);
 	lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_CMD,
 			      "Issue RDF:       did:x%x",
 out:
 	if (ndlp && NLP_CHK_NODE_ACT(ndlp) && shost) {
 		spin_lock_irq(shost->host_lock);
-		ndlp->nlp_flag &= ~(NLP_ACC_REGLOGIN | NLP_RM_DFLT_RPI);
+		if (mbox)
+			ndlp->nlp_flag &= ~NLP_ACC_REGLOGIN;
+		ndlp->nlp_flag &= ~NLP_RM_DFLT_RPI;
 		spin_unlock_irq(shost->host_lock);
 		/* If the node is not being used by another discovery thread,

drivers/scsi/lpfc/lpfc_hw4.h+1−1

@@ -4800,7 +4800,7 @@ struct send_frame_wqe { · 4799 unmodified lines
4800	uint32_t fc_hdr_wd5; /* word 15 */	4800	uint32_t fc_hdr_wd5; /* word 15 */
4801	};	4801	};
4802		4802
4803	#define ELS_RDF_REG_TAG_CNT 1	4803	#define ELS_RDF_REG_TAG_CNT 4
4804	struct lpfc_els_rdf_reg_desc {	4804	struct lpfc_els_rdf_reg_desc {
4805	struct fc_df_desc_fpin_reg reg_desc; /* descriptor header */	4805	struct fc_df_desc_fpin_reg reg_desc; /* descriptor header */
4806	__be32 desc_tags[ELS_RDF_REG_TAG_CNT];	4806	__be32 desc_tags[ELS_RDF_REG_TAG_CNT];

drivers/scsi/lpfc/lpfc_init.c+0−1

@@ -11376,7 +11376,6 @@ lpfc_irq_clear_aff(struct lpfc_hba_eq_hdl *eqhdl) · 11375 unmodified lines
11376	{	11376	{
11377	cpumask_clear(&eqhdl->aff_mask);	11377	cpumask_clear(&eqhdl->aff_mask);
11378	irq_clear_status_flags(eqhdl->irq, IRQ_NO_BALANCING);	11378	irq_clear_status_flags(eqhdl->irq, IRQ_NO_BALANCING);
11379	irq_set_affinity_hint(eqhdl->irq, &eqhdl->aff_mask);
11380	}	11379	}
11381		11380
11382	/**	11381	/**

drivers/scsi/lpfc/lpfc_version.h+1−1

@@ -20,7 +20,7 @@ · 19 unmodified lines
20	* included with this package. *	20	* included with this package. *
21	*******************************************************************/	21	*******************************************************************/
22		22
23	#define LPFC_DRIVER_VERSION "12.8.0.3"	23	#define LPFC_DRIVER_VERSION "12.8.0.4"
24	#define LPFC_DRIVER_NAME "lpfc"	24	#define LPFC_DRIVER_NAME "lpfc"
25		25
26	/* Used for SLI 2/3 */	26	/* Used for SLI 2/3 */

drivers/scsi/megaraid/megaraid_sas_fusion.c+1−1

@@ -3689,7 +3689,7 @@ int megasas_irqpoll(struct irq_poll *irqpoll, int budget) · 3688 unmodified lines
3689	instance = irq_ctx->instance;	3689	instance = irq_ctx->instance;
3690		3690
3691	if (irq_ctx->irq_line_enable) {	3691	if (irq_ctx->irq_line_enable) {
3692	disable_irq(irq_ctx->os_irq);	3692	disable_irq_nosync(irq_ctx->os_irq);
3693	irq_ctx->irq_line_enable = false;	3693	irq_ctx->irq_line_enable = false;
3694	}	3694	}
3695		3695

drivers/scsi/mpt3sas/mpt3sas_base.c+1−1

@@ -1733,7 +1733,7 @@ _base_irqpoll(struct irq_poll *irqpoll, int budget) · 1732 unmodified lines
1733	reply_q = container_of(irqpoll, struct adapter_reply_queue,	1733	reply_q = container_of(irqpoll, struct adapter_reply_queue,
1734	irqpoll);	1734	irqpoll);
1735	if (reply_q->irq_line_enable) {	1735	if (reply_q->irq_line_enable) {
1736	disable_irq(reply_q->os_irq);	1736	disable_irq_nosync(reply_q->os_irq);
1737	reply_q->irq_line_enable = false;	1737	reply_q->irq_line_enable = false;
1738	}	1738	}
1739	num_entries = _base_process_reply_queue(reply_q);	1739	num_entries = _base_process_reply_queue(reply_q);

drivers/scsi/pm8001/pm8001_sas.c+1−1

@@ -818,7 +818,7 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha, · 817 unmodified lines
818		818
819	res = pm8001_tag_alloc(pm8001_ha, &ccb_tag);	819	res = pm8001_tag_alloc(pm8001_ha, &ccb_tag);
820	if (res)	820	if (res)
821	return res;	821	goto ex_err;
822	ccb = &pm8001_ha->ccb_info[ccb_tag];	822	ccb = &pm8001_ha->ccb_info[ccb_tag];
823	ccb->device = pm8001_dev;	823	ccb->device = pm8001_dev;
824	ccb->ccb_tag = ccb_tag;	824	ccb->ccb_tag = ccb_tag;

drivers/scsi/qedf/qedf_main.c+1−1

@@ -3863,7 +3863,7 @@ void qedf_stag_change_work(struct work_struct *work) · 3862 unmodified lines
3863	container_of(work, struct qedf_ctx, stag_work.work);	3863	container_of(work, struct qedf_ctx, stag_work.work);
3864		3864
3865	if (!qedf) {	3865	if (!qedf) {
3866	QEDF_ERR(&qedf->dbg_ctx, "qedf is NULL");	3866	QEDF_ERR(NULL, "qedf is NULL");
3867	return;	3867	return;
3868	}	3868	}
3869	QEDF_ERR(&qedf->dbg_ctx, "Performing software context reset.\n");	3869	QEDF_ERR(&qedf->dbg_ctx, "Performing software context reset.\n");

drivers/scsi/qla2xxx/qla_def.h+1−1

@@ -1626,7 +1626,7 @@ typedef struct { · 1625 unmodified lines
1626	*/	1626	*/
1627	uint8_t firmware_options[2];	1627	uint8_t firmware_options[2];
1628		1628
1629	uint16_t frame_payload_size;	1629	__le16 frame_payload_size;
1630	__le16 max_iocb_allocation;	1630	__le16 max_iocb_allocation;
1631	__le16 execution_throttle;	1631	__le16 execution_throttle;
1632	uint8_t retry_count;	1632	uint8_t retry_count;

drivers/scsi/qla2xxx/qla_init.c+3−3

drivers/scsi/scsi_debug.c+0−2

@@ -4482,8 +4482,6 @@ static int resp_open_zone(struct scsi_cmnd scp, struct sdebug_dev_info devip) · 4481 unmodified lines
4482	goto fini;	4482	goto fini;
4483	}	4483	}
4484		4484
4485	if (zc == ZC2_IMPLICIT_OPEN)
4486	zbc_close_zone(devip, zsp);
4487	zbc_open_zone(devip, zsp, true);	4485	zbc_open_zone(devip, zsp, true);
4488	fini:	4486	fini:
4489	write_unlock(macc_lckp);	4487	write_unlock(macc_lckp);

drivers/soundwire/bus.c+1−1

@@ -1372,7 +1372,7 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave) · 1371 unmodified lines
1372	return ret;	1372	return ret;
1373	}	1373	}
1374		1374
1375	/* Read Instat 1, Instat 2 and Instat 3 registers */	1375	/* Read Intstat 1, Intstat 2 and Intstat 3 registers */
1376	ret = sdw_read(slave, SDW_SCP_INT1);	1376	ret = sdw_read(slave, SDW_SCP_INT1);
1377	if (ret < 0) {	1377	if (ret < 0) {
1378	dev_err(slave->bus->dev,	1378	dev_err(slave->bus->dev,

drivers/soundwire/stream.c+5−3

@@ -717,6 +717,7 @@ error: · 716 unmodified lines
717	kfree(wbuf);	717	kfree(wbuf);
718	error_1:	718	error_1:
719	kfree(wr_msg);	719	kfree(wr_msg);
		720	bus->defer_msg.msg = NULL;
720	return ret;	721	return ret;
721	}	722	}
722		723
@@ -840,9 +841,10 @@ static int do_bank_switch(struct sdw_stream_runtime *stream) · 117 unmodified lines
840	error:	841	error:
841	list_for_each_entry(m_rt, &stream->master_list, stream_node) {	842	list_for_each_entry(m_rt, &stream->master_list, stream_node) {
842	bus = m_rt->bus;	843	bus = m_rt->bus;
843		844	if (bus->defer_msg.msg) {
844	kfree(bus->defer_msg.msg->buf);	845	kfree(bus->defer_msg.msg->buf);
845	kfree(bus->defer_msg.msg);	846	kfree(bus->defer_msg.msg);
		847	}
846	}	848	}
847		849
848	msg_unlock:	850	msg_unlock:

drivers/spi/spi-cadence-quadspi.c+14−3

 	struct dma_async_tx_descriptor *tx;
 	dma_cookie_t cookie;
 	dma_addr_t dma_dst;
+	struct device *ddev;
 	if (!cqspi->rx_chan || !virt_addr_valid(buf)) {
 		memcpy_fromio(buf, cqspi->ahb_base + from, len);
 		return 0;
 	}
-	dma_dst = dma_map_single(dev, buf, len, DMA_FROM_DEVICE);
+	ddev = cqspi->rx_chan->device->dev;
-	if (dma_mapping_error(dev, dma_dst)) {
+	dma_dst = dma_map_single(ddev, buf, len, DMA_FROM_DEVICE);
+	if (dma_mapping_error(ddev, dma_dst)) {
 		dev_err(dev, "dma mapping failed\n");
 		return -ENOMEM;
 	}
 	}
 err_unmap:
-	dma_unmap_single(dev, dma_dst, len, DMA_FROM_DEVICE);
+	dma_unmap_single(ddev, dma_dst, len, DMA_FROM_DEVICE);
 	return ret;
 }
 	return 0;
 }
+static const char *cqspi_get_name(struct spi_mem *mem)
+{
+	struct cqspi_st *cqspi = spi_master_get_devdata(mem->spi->master);
+	struct device *dev = &cqspi->pdev->dev;
+	return devm_kasprintf(dev, GFP_KERNEL, "%s.%d", dev_name(dev), mem->spi->chip_select);
+}
 static const struct spi_controller_mem_ops cqspi_mem_ops = {
 	.exec_op = cqspi_exec_mem_op,
+	.get_name = cqspi_get_name,
 };
 static int cqspi_setup_flash(struct cqspi_st *cqspi)

drivers/spi/spi-loopback-test.c+1−1

@@ -90,7 +90,7 @@ static struct spi_test spi_tests[] = { · 89 unmodified lines
90	{	90	{
91	.description = "tx/rx-transfer - crossing PAGE_SIZE",	91	.description = "tx/rx-transfer - crossing PAGE_SIZE",
92	.fill_option = FILL_COUNT_8,	92	.fill_option = FILL_COUNT_8,
93	.iterate_len = { ITERATE_MAX_LEN },	93	.iterate_len = { ITERATE_LEN },
94	.iterate_tx_align = ITERATE_ALIGN,	94	.iterate_tx_align = ITERATE_ALIGN,
95	.iterate_rx_align = ITERATE_ALIGN,	95	.iterate_rx_align = ITERATE_ALIGN,
96	.transfer_count = 1,	96	.transfer_count = 1,

drivers/spi/spi-stm32.c+6−2

 	}
 	if (sr & STM32H7_SPI_SR_SUSP) {
-		dev_warn(spi->dev, "Communication suspended\n");
+		static DEFINE_RATELIMIT_STATE(rs,
+					      DEFAULT_RATELIMIT_INTERVAL * 10,
+					      1);
+		if (__ratelimit(&rs))
+			dev_dbg_ratelimited(spi->dev, "Communication suspended\n");
 		if (!spi->cur_usedma && (spi->rx_buf && (spi->rx_len > 0)))
 			stm32h7_spi_read_rxfifo(spi, false);
 		/*
 	}
 	ret = pm_runtime_get_sync(dev);
-	if (ret) {
+	if (ret < 0) {
 		dev_err(dev, "Unable to power device:%d\n", ret);
 		return ret;
 	}

drivers/spi/spi.c+7−2

 	if (msg->status && ctlr->handle_err)
 		ctlr->handle_err(ctlr, msg);
-	spi_res_release(ctlr, msg);
 	spi_finalize_current_message(ctlr);
 	return ret;
 	spi_unmap_msg(ctlr, mesg);
+	/* In the prepare_messages callback the spi bus has the opportunity to
+	 * split a transfer to smaller chunks.
+	 * Release splited transfers here since spi_map_msg is done on the
+	 * splited transfers.
+	 */
+	spi_res_release(ctlr, mesg);
 	if (ctlr->cur_msg_prepared && ctlr->unprepare_message) {
 		ret = ctlr->unprepare_message(ctlr, mesg);
 		if (ret) {

drivers/staging/greybus/audio_helper.c+1−2

 		id.index = control->index;
 		kctl = snd_ctl_find_id(card, &id);
 		if (!kctl) {
-			dev_err(dev, "%d: Failed to find %s\n", err,
+			dev_err(dev, "Failed to find %s\n", control->name);
-				control->name);
 			continue;
 		}
 		err = snd_ctl_remove(card, kctl);

drivers/staging/greybus/audio_topology.c+15−14

 	val = ucontrol->value.integer.value[0] & mask;
 	connect = !!val;
+	ret = gb_pm_runtime_get_sync(bundle);
+	if (ret)
+		return ret;
+	ret = gb_audio_gb_get_control(module->mgmt_connection, data->ctl_id,
+				      GB_AUDIO_INVALID_INDEX, &gbvalue);
+	if (ret)
+		goto exit;
 	/* update ucontrol */
 	if (gbvalue.value.integer_value[0] != val) {
 		for (wi = 0; wi < wlist->num_widgets; wi++) {
 		gbvalue.value.integer_value[0] =
 			cpu_to_le32(ucontrol->value.integer.value[0]);
-		ret = gb_pm_runtime_get_sync(bundle);
-		if (ret)
-			return ret;
 		ret = gb_audio_gb_set_control(module->mgmt_connection,
 					      data->ctl_id,
 					      GB_AUDIO_INVALID_INDEX, &gbvalue);
-		gb_pm_runtime_put_autosuspend(bundle);
-		if (ret) {
-			dev_err_ratelimited(codec_dev,
-					    "%d:Error in %s for %s\n", ret,
-					    __func__, kcontrol->id.name);
-			return ret;
-		}
 	}
-	return 0;
+exit:
+	gb_pm_runtime_put_autosuspend(bundle);
+	if (ret)
+		dev_err_ratelimited(codec_dev, "%d:Error in %s for %s\n", ret,
+				    __func__, kcontrol->id.name);
+	return ret;
 }
 #define SOC_DAPM_MIXER_GB(xname, kcount, data) \

drivers/staging/media/sunxi/cedrus/cedrus.c+6−1

 	struct v4l2_ctrl *ctrl_test;
 	unsigned int count;
 	unsigned int i;
+	int ret = 0;
 	list_for_each_entry(obj, &req->objects, list) {
 		struct vb2_buffer *vb;
 		if (!ctrl_test) {
 			v4l2_info(&ctx->dev->v4l2_dev,
 				  "Missing required codec control\n");
-			return -ENOENT;
+			ret = -ENOENT;
+			break;
 		}
 	}
 	v4l2_ctrl_request_hdl_put(hdl);
+	if (ret)
+		return ret;
 	return vb2_request_validate(req);
 }

drivers/staging/wlan-ng/hfa384x_usb.c+0−5

  */
 void hfa384x_create(struct hfa384x *hw, struct usb_device *usb)
 {
-	memset(hw, 0, sizeof(*hw));
 	hw->usb = usb;
-	/* set up the endpoints */
-	hw->endp_in = usb_rcvbulkpipe(usb, 1);
-	hw->endp_out = usb_sndbulkpipe(usb, 2);
 	/* Set up the waitq */
 	init_waitqueue_head(&hw->cmdq);

drivers/staging/wlan-ng/prism2usb.c+6−13

 			       const struct usb_device_id *id)
 {
 	struct usb_device *dev;
-	const struct usb_endpoint_descriptor *epd;
+	struct usb_endpoint_descriptor *bulk_in, *bulk_out;
-	const struct usb_host_interface *iface_desc = interface->cur_altsetting;
+	struct usb_host_interface *iface_desc = interface->cur_altsetting;
 	struct wlandevice *wlandev = NULL;
 	struct hfa384x *hw = NULL;
 	int result = 0;
-	if (iface_desc->desc.bNumEndpoints != 2) {
+	result = usb_find_common_endpoints(iface_desc, &bulk_in, &bulk_out, NULL, NULL);
-		result = -ENODEV;
+	if (result)
-		goto failed;
-	}
-	result = -EINVAL;
-	epd = &iface_desc->endpoint[1].desc;
-	if (!usb_endpoint_is_bulk_in(epd))
-		goto failed;
-	epd = &iface_desc->endpoint[2].desc;
-	if (!usb_endpoint_is_bulk_out(epd))
 		goto failed;
 	dev = interface_to_usbdev(interface);
 	}
 	/* Initialize the hw data */
+	hw->endp_in = usb_rcvbulkpipe(dev, bulk_in->bEndpointAddress);
+	hw->endp_out = usb_sndbulkpipe(dev, bulk_out->bEndpointAddress);
 	hfa384x_create(hw, dev);
 	hw->wlandev = wlandev;

drivers/target/iscsi/iscsi_target.c+15−2

 	sg = cmd->first_data_sg;
 	page_off = cmd->first_data_sg_off;
+	if (data_length && page_off) {
+		struct scatterlist first_sg;
+		u32 len = min_t(u32, data_length, sg->length - page_off);
+		sg_init_table(&first_sg, 1);
+		sg_set_page(&first_sg, sg_page(sg), len, sg->offset + page_off);
+		ahash_request_set_crypt(hash, &first_sg, NULL, len);
+		crypto_ahash_update(hash);
+		data_length -= len;
+		sg = sg_next(sg);
+	}
 	while (data_length) {
-		u32 cur_len = min_t(u32, data_length, (sg->length - page_off));
+		u32 cur_len = min_t(u32, data_length, sg->length);
 		ahash_request_set_crypt(hash, sg, NULL, cur_len);
 		crypto_ahash_update(hash);
 		data_length -= cur_len;
-		page_off = 0;
 		/* iscsit_map_iovec has already checked for invalid sg pointers */
 		sg = sg_next(sg);
 	}

drivers/target/iscsi/iscsi_target_login.c+3−3

 }
 void iscsi_target_login_sess_out(struct iscsi_conn *conn,
-		struct iscsi_np *np, bool zero_tsih, bool new_sess)
+				 bool zero_tsih, bool new_sess)
 {
 	if (!new_sess)
 		goto old_sess_out;
 	conn->sess = NULL;
 old_sess_out:
-	iscsi_stop_login_thread_timer(np);
 	/*
 	 * If login negotiation fails check if the Time2Retain timer
 	 * needs to be restarted.
 new_sess_out:
 	new_sess = true;
 old_sess_out:
+	iscsi_stop_login_thread_timer(np);
 	tpg_np = conn->tpg_np;
-	iscsi_target_login_sess_out(conn, np, zero_tsih, new_sess);
+	iscsi_target_login_sess_out(conn, zero_tsih, new_sess);
 	new_sess = false;
 	if (tpg) {

drivers/target/iscsi/iscsi_target_login.h+1−2

@@ -22,8 +22,7 @@ extern int iscsit_put_login_tx(struct iscsi_conn , struct iscsi_login , u32); · 21 unmodified lines
22	extern void iscsit_free_conn(struct iscsi_conn *);	22	extern void iscsit_free_conn(struct iscsi_conn *);
23	extern int iscsit_start_kthreads(struct iscsi_conn *);	23	extern int iscsit_start_kthreads(struct iscsi_conn *);
24	extern void iscsi_post_login_handler(struct iscsi_np , struct iscsi_conn , u8);	24	extern void iscsi_post_login_handler(struct iscsi_np , struct iscsi_conn , u8);
25	extern void iscsi_target_login_sess_out(struct iscsi_conn , struct iscsi_np ,	25	extern void iscsi_target_login_sess_out(struct iscsi_conn *, bool, bool);
26	bool, bool);
27	extern int iscsi_target_login_thread(void *);	26	extern int iscsi_target_login_thread(void *);
28	extern void iscsi_handle_login_thread_timeout(struct timer_list *t);	27	extern void iscsi_handle_login_thread_timeout(struct timer_list *t);
29		28

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

 static void iscsi_target_login_drop(struct iscsi_conn *conn, struct iscsi_login *login)
 {
-	struct iscsi_np *np = login->np;
 	bool zero_tsih = login->zero_tsih;
 	iscsi_remove_failed_auth_entry(conn);
 	iscsi_target_nego_release(conn);
-	iscsi_target_login_sess_out(conn, np, zero_tsih, true);
+	iscsi_target_login_sess_out(conn, zero_tsih, true);
 }
 struct conn_timeout {

drivers/thermal/qcom/qcom-spmi-temp-alarm.c+2−2

@@ -1,6 +1,6 @@
1	// SPDX-License-Identifier: GPL-2.0-only	1	// SPDX-License-Identifier: GPL-2.0-only
2	/*	2	/*
3	* Copyright (c) 2011-2015, 2017, The Linux Foundation. All rights reserved.	3	* Copyright (c) 2011-2015, 2017, 2020, The Linux Foundation. All rights reserved.
4	*/	4	*/
5		5
6	#include <linux/bitops.h>	6	#include <linux/bitops.h>
@@ -191,7 +191,7 @@ static int qpnp_tm_get_temp(void data, int temp) · 184 unmodified lines
191	chip->temp = mili_celsius;	191	chip->temp = mili_celsius;
192	}	192	}
193		193
194	*temp = chip->temp < 0 ? 0 : chip->temp;	194	*temp = chip->temp;
195		195
196	return 0;	196	return 0;
197	}	197	}

drivers/thermal/thermal_core.c+3−2

  */
 void thermal_zone_device_unregister(struct thermal_zone_device *tz)
 {
-	int i;
+	int i, tz_id;
 	const struct thermal_zone_params *tzp;
 	struct thermal_cooling_device *cdev;
 	struct thermal_zone_device *pos = NULL;
 		return;
 	tzp = tz->tzp;
+	tz_id = tz->id;
 	mutex_lock(&thermal_list_lock);
 	list_for_each_entry(pos, &thermal_tz_list, node)
 	mutex_destroy(&tz->lock);
 	device_unregister(&tz->device);
-	thermal_notify_tz_delete(tz->id);
+	thermal_notify_tz_delete(tz_id);
 }
 EXPORT_SYMBOL_GPL(thermal_zone_device_unregister);

drivers/thermal/ti-soc-thermal/omap4-thermal-data.c+12−11

@@ -37,20 +37,21 @@ static struct temp_sensor_data omap4430_mpu_temp_sensor_data = { · 36 unmodified lines
37		37
38	/*	38	/*
39	* Temperature values in milli degree celsius	39	* Temperature values in milli degree celsius
40	* ADC code values from 530 to 923	40	* ADC code values from 13 to 107, see TRM
		41	* "18.4.10.2.3 ADC Codes Versus Temperature".
41	*/	42	*/
42	static const int	43	static const int
43	omap4430_adc_to_temp[OMAP4430_ADC_END_VALUE - OMAP4430_ADC_START_VALUE + 1] = {	44	omap4430_adc_to_temp[OMAP4430_ADC_END_VALUE - OMAP4430_ADC_START_VALUE + 1] = {
44	-38000, -35000, -34000, -32000, -30000, -28000, -26000, -24000, -22000,	45	-40000, -38000, -35000, -34000, -32000, -30000, -28000, -26000, -24000,
45	-20000, -18000, -17000, -15000, -13000, -12000, -10000, -8000, -6000,	46	-22000, -20000, -18500, -17000, -15000, -13500, -12000, -10000, -8000,
46	-5000, -3000, -1000, 0, 2000, 3000, 5000, 6000, 8000, 10000, 12000,	47	-6500, -5000, -3500, -1500, 0, 2000, 3500, 5000, 6500, 8500, 10000,
47	13000, 15000, 17000, 19000, 21000, 23000, 25000, 27000, 28000, 30000,	48	12000, 13500, 15000, 17000, 19000, 21000, 23000, 25000, 27000, 28500,
48	32000, 33000, 35000, 37000, 38000, 40000, 42000, 43000, 45000, 47000,	49	30000, 32000, 33500, 35000, 37000, 38500, 40000, 42000, 43500, 45000,
49	48000, 50000, 52000, 53000, 55000, 57000, 58000, 60000, 62000, 64000,	50	47000, 48500, 50000, 52000, 53500, 55000, 57000, 58500, 60000, 62000,
50	66000, 68000, 70000, 71000, 73000, 75000, 77000, 78000, 80000, 82000,	51	64000, 66000, 68000, 70000, 71500, 73500, 75000, 77000, 78500, 80000,
51	83000, 85000, 87000, 88000, 90000, 92000, 93000, 95000, 97000, 98000,	52	82000, 83500, 85000, 87000, 88500, 90000, 92000, 93500, 95000, 97000,
52	100000, 102000, 103000, 105000, 107000, 109000, 111000, 113000, 115000,	53	98500, 100000, 102000, 103500, 105000, 107000, 109000, 111000, 113000,
53	117000, 118000, 120000, 122000, 123000,	54	115000, 117000, 118500, 120000, 122000, 123500, 125000,
54	};	55	};
55		56
56	/* OMAP4430 data */	57	/* OMAP4430 data */

drivers/thermal/ti-soc-thermal/omap4xxx-bandgap.h+7−3

  * and thresholds for OMAP4430.
  */
-/* ADC conversion table limits */
+/*
-#define OMAP4430_ADC_START_VALUE			0
+ * ADC conversion table limits. Ignore values outside the TRM listed
-#define OMAP4430_ADC_END_VALUE				127
+ * range to avoid bogus thermal shutdowns. See omap4430 TRM chapter
+ * "18.4.10.2.3 ADC Codes Versus Temperature".
+ */
+#define OMAP4430_ADC_START_VALUE			13
+#define OMAP4430_ADC_END_VALUE				107
 /* bandgap clock limits (no control on 4430) */
 #define OMAP4430_MAX_FREQ				32768
 #define OMAP4430_MIN_FREQ				32768

drivers/thunderbolt/switch.c+1−0

@@ -684,6 +684,7 @@ static int tb_init_port(struct tb_port *port) · 683 unmodified lines
684	if (res == -ENODEV) {	684	if (res == -ENODEV) {
685	tb_dbg(port->sw->tb, " Port %d: not implemented\n",	685	tb_dbg(port->sw->tb, " Port %d: not implemented\n",
686	port->port);	686	port->port);
		687	port->disabled = true;
687	return 0;	688	return 0;
688	}	689	}
689	return res;	690	return res;

drivers/thunderbolt/tb.h+1−1

@@ -186,7 +186,7 @@ struct tb_switch { · 185 unmodified lines
186	* @cap_adap: Offset of the adapter specific capability (%0 if not present)	186	* @cap_adap: Offset of the adapter specific capability (%0 if not present)
187	* @cap_usb4: Offset to the USB4 port capability (%0 if not present)	187	* @cap_usb4: Offset to the USB4 port capability (%0 if not present)
188	* @port: Port number on switch	188	* @port: Port number on switch
189	* @disabled: Disabled by eeprom	189	* @disabled: Disabled by eeprom or enabled but not implemented
190	* @bonded: true if the port is bonded (two lanes combined as one)	190	* @bonded: true if the port is bonded (two lanes combined as one)
191	* @dual_link_port: If the switch is connected using two ports, points	191	* @dual_link_port: If the switch is connected using two ports, points
192	* to the other port.	192	* to the other port.

drivers/thunderbolt/tunnel.c+10−2

 	int ret, max_rate, allocate_up, allocate_down;
 	ret = usb4_usb3_port_actual_link_rate(tunnel->src_port);
-	if (ret <= 0) {
+	if (ret < 0) {
-		tb_tunnel_warn(tunnel, "tunnel is not up\n");
+		tb_tunnel_warn(tunnel, "failed to read actual link rate\n");
 		return;
+	} else if (!ret) {
+		/* Use maximum link rate if the link valid is not set */
+		ret = usb4_usb3_port_max_link_rate(tunnel->src_port);
+		if (ret < 0) {
+			tb_tunnel_warn(tunnel, "failed to read maximum link rate\n");
+			return;
+		}
 	}
 	/*
 	 * 90% of the max rate can be allocated for isochronous
 	 * transfers.

drivers/usb/core/message.c+42−49

@@ -1205,6 +1205,34 @@ void usb_disable_interface(struct usb_device dev, struct usb_interface intf, · 1204 unmodified lines
1205	}	1205	}
1206	}	1206	}
1207		1207
		1208	/*
		1209	* usb_disable_device_endpoints -- Disable all endpoints for a device
		1210	* @dev: the device whose endpoints are being disabled
		1211	* @skip_ep0: 0 to disable endpoint 0, 1 to skip it.
		1212	*/
		1213	static void usb_disable_device_endpoints(struct usb_device *dev, int skip_ep0)
		1214	{
		1215	struct usb_hcd *hcd = bus_to_hcd(dev->bus);
		1216	int i;
		1217
		1218	if (hcd->driver->check_bandwidth) {
		1219	/* First pass: Cancel URBs, leave endpoint pointers intact. */
		1220	for (i = skip_ep0; i < 16; ++i) {
		1221	usb_disable_endpoint(dev, i, false);
		1222	usb_disable_endpoint(dev, i + USB_DIR_IN, false);
		1223	}
		1224	/* Remove endpoints from the host controller internal state */
		1225	mutex_lock(hcd->bandwidth_mutex);
		1226	usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL);
		1227	mutex_unlock(hcd->bandwidth_mutex);
		1228	}
		1229	/* Second pass: remove endpoint pointers */
		1230	for (i = skip_ep0; i < 16; ++i) {
		1231	usb_disable_endpoint(dev, i, true);
		1232	usb_disable_endpoint(dev, i + USB_DIR_IN, true);
		1233	}
		1234	}
		1235
1208	/**	1236	/**
1209	* usb_disable_device - Disable all the endpoints for a USB device	1237	* usb_disable_device - Disable all the endpoints for a USB device
1210	* @dev: the device whose endpoints are being disabled	1238	* @dev: the device whose endpoints are being disabled
@@ -1218,7 +1246,6 @@ void usb_disable_interface(struct usb_device dev, struct usb_interface intf, · 7 unmodified lines
1218	void usb_disable_device(struct usb_device *dev, int skip_ep0)	1246	void usb_disable_device(struct usb_device *dev, int skip_ep0)
1219	{	1247	{
1220	int i;	1248	int i;
1221	struct usb_hcd *hcd = bus_to_hcd(dev->bus);
1222		1249
1223	/* getting rid of interfaces will disconnect	1250	/* getting rid of interfaces will disconnect
1224	* any drivers bound to them (a key side effect)	1251	* any drivers bound to them (a key side effect)
@@ -1264,22 +1291,8 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0) · 39 unmodified lines
1264		1291
1265	dev_dbg(&dev->dev, "%s nuking %s URBs\n", __func__,	1292	dev_dbg(&dev->dev, "%s nuking %s URBs\n", __func__,
1266	skip_ep0 ? "non-ep0" : "all");	1293	skip_ep0 ? "non-ep0" : "all");
1267	if (hcd->driver->check_bandwidth) {	1294
1268	/* First pass: Cancel URBs, leave endpoint pointers intact. */	1295	usb_disable_device_endpoints(dev, skip_ep0);
1269	for (i = skip_ep0; i < 16; ++i) {
1270	usb_disable_endpoint(dev, i, false);
1271	usb_disable_endpoint(dev, i + USB_DIR_IN, false);
1272	}
1273	/* Remove endpoints from the host controller internal state */
1274	mutex_lock(hcd->bandwidth_mutex);
1275	usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL);
1276	mutex_unlock(hcd->bandwidth_mutex);
1277	/* Second pass: remove endpoint pointers */
1278	}
1279	for (i = skip_ep0; i < 16; ++i) {
1280	usb_disable_endpoint(dev, i, true);
1281	usb_disable_endpoint(dev, i + USB_DIR_IN, true);
1282	}
1283	}	1296	}
1284		1297
1285	/**	1298	/**
@@ -1522,6 +1535,9 @@ EXPORT_SYMBOL_GPL(usb_set_interface); · 236 unmodified lines
1522	* The caller must own the device lock.	1535	* The caller must own the device lock.
1523	*	1536	*
1524	* Return: Zero on success, else a negative error code.	1537	* Return: Zero on success, else a negative error code.
		1538	*
		1539	* If this routine fails the device will probably be in an unusable state
		1540	* with endpoints disabled, and interfaces only partially enabled.
1525	*/	1541	*/
1526	int usb_reset_configuration(struct usb_device *dev)	1542	int usb_reset_configuration(struct usb_device *dev)
1527	{	1543	{
@@ -1537,10 +1553,7 @@ int usb_reset_configuration(struct usb_device *dev) · 9 unmodified lines
1537	* calls during probe() are fine	1553	* calls during probe() are fine
1538	*/	1554	*/
1539		1555
1540	for (i = 1; i < 16; ++i) {	1556	usb_disable_device_endpoints(dev, 1); /* skip ep0*/
1541	usb_disable_endpoint(dev, i, true);
1542	usb_disable_endpoint(dev, i + USB_DIR_IN, true);
1543	}
1544		1557
1545	config = dev->actconfig;	1558	config = dev->actconfig;
1546	retval = 0;	1559	retval = 0;
@@ -1553,34 +1566,10 @@ int usb_reset_configuration(struct usb_device *dev) · 6 unmodified lines
1553	mutex_unlock(hcd->bandwidth_mutex);	1566	mutex_unlock(hcd->bandwidth_mutex);
1554	return -ENOMEM;	1567	return -ENOMEM;
1555	}	1568	}
1556	/* Make sure we have enough bandwidth for each alternate setting 0 */
1557	for (i = 0; i < config->desc.bNumInterfaces; i++) {
1558	struct usb_interface *intf = config->interface[i];
1559	struct usb_host_interface *alt;
1560		1569
1561	alt = usb_altnum_to_altsetting(intf, 0);	1570	/* xHCI adds all endpoints in usb_hcd_alloc_bandwidth */
1562	if (!alt)	1571	retval = usb_hcd_alloc_bandwidth(dev, config, NULL, NULL);
1563	alt = &intf->altsetting[0];
1564	if (alt != intf->cur_altsetting)
1565	retval = usb_hcd_alloc_bandwidth(dev, NULL,
1566	intf->cur_altsetting, alt);
1567	if (retval < 0)
1568	break;
1569	}
1570	/* If not, reinstate the old alternate settings */
1571	if (retval < 0) {	1572	if (retval < 0) {
1572	reset_old_alts:
1573	for (i--; i >= 0; i--) {
1574	struct usb_interface *intf = config->interface[i];
1575	struct usb_host_interface *alt;
1576
1577	alt = usb_altnum_to_altsetting(intf, 0);
1578	if (!alt)
1579	alt = &intf->altsetting[0];
1580	if (alt != intf->cur_altsetting)
1581	usb_hcd_alloc_bandwidth(dev, NULL,
1582	alt, intf->cur_altsetting);
1583	}
1584	usb_enable_lpm(dev);	1573	usb_enable_lpm(dev);
1585	mutex_unlock(hcd->bandwidth_mutex);	1574	mutex_unlock(hcd->bandwidth_mutex);
1586	return retval;	1575	return retval;
@@ -1589,8 +1578,12 @@ reset_old_alts: · 2 unmodified lines
1589	USB_REQ_SET_CONFIGURATION, 0,	1578	USB_REQ_SET_CONFIGURATION, 0,
1590	config->desc.bConfigurationValue, 0,	1579	config->desc.bConfigurationValue, 0,
1591	NULL, 0, USB_CTRL_SET_TIMEOUT);	1580	NULL, 0, USB_CTRL_SET_TIMEOUT);
1592	if (retval < 0)	1581	if (retval < 0) {
1593	goto reset_old_alts;	1582	usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL);
		1583	usb_enable_lpm(dev);
		1584	mutex_unlock(hcd->bandwidth_mutex);
		1585	return retval;
		1586	}
1594	mutex_unlock(hcd->bandwidth_mutex);	1587	mutex_unlock(hcd->bandwidth_mutex);
1595		1588
1596	/* re-init hc/hcd interface/endpoint state */	1589	/* re-init hc/hcd interface/endpoint state */

drivers/usb/core/sysfs.c+5−0

 	size_t srclen, n;
 	int cfgno;
 	void *src;
+	int retval;
+	retval = usb_lock_device_interruptible(udev);
+	if (retval < 0)
+		return -EINTR;
 	/* The binary attribute begins with the device descriptor.
 	 * Following that are the raw descriptor entries for all the
 	 * configurations (config plus subsidiary descriptors).
 			off -= srclen;
 		}
 	}
+	usb_unlock_device(udev);
 	return count - nleft;
 }

drivers/usb/dwc3/dwc3-meson-g12a.c+6−9

 		goto err_disable_clks;
 	}
-	ret = reset_control_deassert(priv->reset);
+	ret = reset_control_reset(priv->reset);
 	if (ret)
-		goto err_assert_reset;
+		goto err_disable_clks;
 	ret = dwc3_meson_g12a_get_phys(priv);
 	if (ret)
-		goto err_assert_reset;
+		goto err_disable_clks;
 	ret = priv->drvdata->setup_regmaps(priv, base);
 	if (ret)
 	if (priv->vbus) {
 		ret = regulator_enable(priv->vbus);
 		if (ret)
-			goto err_assert_reset;
+			goto err_disable_clks;
 	}
 	/* Get dr_mode */
 	ret = priv->drvdata->usb_init(priv);
 	if (ret)
-		goto err_assert_reset;
+		goto err_disable_clks;
 	/* Init PHYs */
 	for (i = 0 ; i < PHY_COUNT ; ++i) {
 		ret = phy_init(priv->phys[i]);
 		if (ret)
-			goto err_assert_reset;
+			goto err_disable_clks;
 	}
 	/* Set PHY Power */
 	for (i = 0 ; i < PHY_COUNT ; ++i)
 		phy_exit(priv->phys[i]);
-err_assert_reset:
-	reset_control_assert(priv->reset);
 err_disable_clks:
 	clk_bulk_disable_unprepare(priv->drvdata->num_clks,
 				   priv->drvdata->clks);

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

@@ -713,6 +713,7 @@ static const struct usb_device_id id_table_combined[] = { · 712 unmodified lines
713	{ USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) },	713	{ USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) },
714	{ USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) },	714	{ USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) },
715	{ USB_DEVICE(XSENS_VID, XSENS_MTDEVBOARD_PID) },	715	{ USB_DEVICE(XSENS_VID, XSENS_MTDEVBOARD_PID) },
		716	{ USB_DEVICE(XSENS_VID, XSENS_MTIUSBCONVERTER_PID) },
716	{ USB_DEVICE(XSENS_VID, XSENS_MTW_PID) },	717	{ USB_DEVICE(XSENS_VID, XSENS_MTW_PID) },
717	{ USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },	718	{ USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },
718	{ USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },	719	{ USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },

drivers/usb/serial/ftdi_sio_ids.h+1−0

@@ -160,6 +160,7 @@ · 159 unmodified lines
160	#define XSENS_AWINDA_DONGLE_PID 0x0102	160	#define XSENS_AWINDA_DONGLE_PID 0x0102
161	#define XSENS_MTW_PID 0x0200 /* Xsens MTw */	161	#define XSENS_MTW_PID 0x0200 /* Xsens MTw */
162	#define XSENS_MTDEVBOARD_PID 0x0300 /* Motion Tracker Development Board */	162	#define XSENS_MTDEVBOARD_PID 0x0300 /* Motion Tracker Development Board */
		163	#define XSENS_MTIUSBCONVERTER_PID 0x0301 /* MTi USB converter */
163	#define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */	164	#define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
164		165
165	/* Xsens devices using FTDI VID */	166	/* Xsens devices using FTDI VID */

drivers/usb/serial/option.c+14−8

 	{ USB_DEVICE(QUALCOMM_VENDOR_ID, UBLOX_PRODUCT_R410M),
 	  .driver_info = RSVD(1) | RSVD(3) },
 	/* Quectel products using Quectel vendor ID */
-	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21),
+	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21, 0xff, 0xff, 0xff),
-	  .driver_info = RSVD(4) },
+	  .driver_info = NUMEP2 },
-	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC25),
+	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21, 0xff, 0, 0) },
-	  .driver_info = RSVD(4) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC25, 0xff, 0xff, 0xff),
-	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95),
+	  .driver_info = NUMEP2 },
-	  .driver_info = RSVD(4) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC25, 0xff, 0, 0) },
-	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
+	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0xff, 0xff),
-	  .driver_info = RSVD(4) },
+	  .driver_info = NUMEP2 },
+	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96, 0xff, 0xff, 0xff),
+	  .driver_info = NUMEP2 },
+	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96, 0xff, 0, 0) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0xff, 0xff),
 	  .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 },
 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0, 0) },
 	{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9003, 0xff) },	/* Simcom SIM7500/SIM7600 MBIM mode */
 	{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9011, 0xff),	/* Simcom SIM7500/SIM7600 RNDIS mode */
 	  .driver_info = RSVD(7) },
+	{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9205, 0xff) },	/* Simcom SIM7070/SIM7080/SIM7090 AT+ECM mode */
+	{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9206, 0xff) },	/* Simcom SIM7070/SIM7080/SIM7090 AT-only mode */
 	{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200),
 	  .driver_info = NCTRL(0) | NCTRL(1) | RSVD(4) },
 	{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D),

drivers/usb/typec/mux/intel_pmc_mux.c+2−12

 #define PMC_USB_ALTMODE_ORI_SHIFT	1
 #define PMC_USB_ALTMODE_UFP_SHIFT	3
-#define PMC_USB_ALTMODE_ORI_AUX_SHIFT	4
-#define PMC_USB_ALTMODE_ORI_HSL_SHIFT	5
 /* DP specific Mode Data bits */
 #define PMC_USB_ALTMODE_DP_MODE_SHIFT	8
 /* TBT specific Mode Data bits */
-#define PMC_USB_ALTMODE_HPD_HIGH	BIT(14)
 #define PMC_USB_ALTMODE_TBT_TYPE	BIT(17)
 #define PMC_USB_ALTMODE_CABLE_TYPE	BIT(18)
 #define PMC_USB_ALTMODE_ACTIVE_LINK	BIT(20)
 	req.mode_data = (port->orientation - 1) << PMC_USB_ALTMODE_ORI_SHIFT;
 	req.mode_data |= (port->role - 1) << PMC_USB_ALTMODE_UFP_SHIFT;
-	req.mode_data |= sbu_orientation(port) << PMC_USB_ALTMODE_ORI_AUX_SHIFT;
-	req.mode_data |= hsl_orientation(port) << PMC_USB_ALTMODE_ORI_HSL_SHIFT;
 	req.mode_data |= (state->mode - TYPEC_STATE_MODAL) <<
 			 PMC_USB_ALTMODE_DP_MODE_SHIFT;
-	if (data->status & DP_STATUS_HPD_STATE)
-		req.mode_data |= PMC_USB_ALTMODE_HPD_HIGH;
 	ret = pmc_usb_command(port, (void *)&req, sizeof(req));
 	if (ret)
 		return ret;
 	req.mode_data = (port->orientation - 1) << PMC_USB_ALTMODE_ORI_SHIFT;
 	req.mode_data |= (port->role - 1) << PMC_USB_ALTMODE_UFP_SHIFT;
-	req.mode_data |= sbu_orientation(port) << PMC_USB_ALTMODE_ORI_AUX_SHIFT;
-	req.mode_data |= hsl_orientation(port) << PMC_USB_ALTMODE_ORI_HSL_SHIFT;
 	if (TBT_ADAPTER(data->device_mode) == TBT_ADAPTER_TBT3)
 		req.mode_data |= PMC_USB_ALTMODE_TBT_TYPE;
 	for (i = 0; i < pmc->num_ports; i++) {
 		typec_switch_unregister(pmc->port[i].typec_sw);
 		typec_mux_unregister(pmc->port[i].typec_mux);
+		usb_role_switch_unregister(pmc->port[i].usb_sw);
 	}
 	return ret;
 	for (i = 0; i < pmc->num_ports; i++) {
 		typec_switch_unregister(pmc->port[i].typec_sw);
 		typec_mux_unregister(pmc->port[i].typec_mux);
+		usb_role_switch_unregister(pmc->port[i].usb_sw);
 	}
 	return 0;

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

 static int ucsi_acpi_probe(struct platform_device *pdev)
 {
+	struct acpi_device *adev = ACPI_COMPANION(&pdev->dev);
 	struct ucsi_acpi *ua;
 	struct resource *res;
 	acpi_status status;
 	int ret;
+	if (adev->dep_unmet)
+		return -EPROBE_DEFER;
 	ua = devm_kzalloc(&pdev->dev, sizeof(*ua), GFP_KERNEL);
 	if (!ua)
 		return -ENOMEM;

drivers/vhost/vhost.c+1−1

@@ -2537,7 +2537,7 @@ void vhost_disable_notify(struct vhost_dev dev, struct vhost_virtqueue vq) · 2536 unmodified lines
2537	if (!vhost_has_feature(vq, VIRTIO_RING_F_EVENT_IDX)) {	2537	if (!vhost_has_feature(vq, VIRTIO_RING_F_EVENT_IDX)) {
2538	r = vhost_update_used_flags(vq);	2538	r = vhost_update_used_flags(vq);
2539	if (r)	2539	if (r)
2540	vq_err(vq, "Failed to enable notification at %p: %d\n",	2540	vq_err(vq, "Failed to disable notification at %p: %d\n",
2541	&vq->used->flags, r);	2541	&vq->used->flags, r);
2542	}	2542	}
2543	}	2543	}

drivers/video/fbdev/vga16fb.c+1−1

@@ -1121,7 +1121,7 @@ static void vga_8planes_imageblit(struct fb_info info, const struct fb_image i · 1120 unmodified lines
1121	char oldop = setop(0);	1121	char oldop = setop(0);
1122	char oldsr = setsr(0);	1122	char oldsr = setsr(0);
1123	char oldmask = selectmask();	1123	char oldmask = selectmask();
1124	const char *cdat = image->data;	1124	const unsigned char *cdat = image->data;
1125	u32 dx = image->dx;	1125	u32 dx = image->dx;
1126	char __iomem *where;	1126	char __iomem *where;
1127	int y;	1127	int y;

drivers/xen/Kconfig+10−0

@@ -325,4 +325,14 @@ config XEN_HAVE_VPMU · 324 unmodified lines
325	config XEN_FRONT_PGDIR_SHBUF	325	config XEN_FRONT_PGDIR_SHBUF
326	tristate	326	tristate
327		327
		328	config XEN_UNPOPULATED_ALLOC
		329	bool "Use unpopulated memory ranges for guest mappings"
		330	depends on X86 && ZONE_DEVICE
		331	default XEN_BACKEND \|\| XEN_GNTDEV \|\| XEN_DOM0
		332	help
		333	Use unpopulated memory ranges in order to create mappings for guest
		334	memory regions, including grant maps and foreign pages. This avoids
		335	having to balloon out RAM regions in order to obtain physical memory
		336	space to create such mappings.
		337
328	endmenu	338	endmenu

drivers/xen/Makefile+1−0

@@ -41,3 +41,4 @@ xen-gntdev-$(CONFIG_XEN_GNTDEV_DMABUF) += gntdev-dmabuf.o · 40 unmodified lines
41	xen-gntalloc-y := gntalloc.o	41	xen-gntalloc-y := gntalloc.o
42	xen-privcmd-y := privcmd.o privcmd-buf.o	42	xen-privcmd-y := privcmd.o privcmd-buf.o
43	obj-$(CONFIG_XEN_FRONT_PGDIR_SHBUF) += xen-front-pgdir-shbuf.o	43	obj-$(CONFIG_XEN_FRONT_PGDIR_SHBUF) += xen-front-pgdir-shbuf.o
		44	obj-$(CONFIG_XEN_UNPOPULATED_ALLOC) += unpopulated-alloc.o

drivers/xen/balloon.c+2−2

@@ -653,7 +653,7 @@ void free_xenballooned_pages(int nr_pages, struct page **pages) · 652 unmodified lines
653	}	653	}
654	EXPORT_SYMBOL(free_xenballooned_pages);	654	EXPORT_SYMBOL(free_xenballooned_pages);
655		655
656	#ifdef CONFIG_XEN_PV	656	#if defined(CONFIG_XEN_PV) && !defined(CONFIG_XEN_UNPOPULATED_ALLOC)
657	static void __init balloon_add_region(unsigned long start_pfn,	657	static void __init balloon_add_region(unsigned long start_pfn,
658	unsigned long pages)	658	unsigned long pages)
659	{	659	{
@@ -707,7 +707,7 @@ static int __init balloon_init(void) · 47 unmodified lines
707	register_sysctl_table(xen_root);	707	register_sysctl_table(xen_root);
708	#endif	708	#endif
709		709
710	#ifdef CONFIG_XEN_PV	710	#if defined(CONFIG_XEN_PV) && !defined(CONFIG_XEN_UNPOPULATED_ALLOC)
711	{	711	{
712	int i;	712	int i;
713		713

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

@@ -801,7 +801,7 @@ int gnttab_alloc_pages(int nr_pages, struct page **pages) · 800 unmodified lines
801	{	801	{
802	int ret;	802	int ret;
803		803
804	ret = alloc_xenballooned_pages(nr_pages, pages);	804	ret = xen_alloc_unpopulated_pages(nr_pages, pages);
805	if (ret < 0)	805	if (ret < 0)
806	return ret;	806	return ret;
807		807
@@ -836,7 +836,7 @@ EXPORT_SYMBOL_GPL(gnttab_pages_clear_private); · 28 unmodified lines
836	void gnttab_free_pages(int nr_pages, struct page **pages)	836	void gnttab_free_pages(int nr_pages, struct page **pages)
837	{	837	{
838	gnttab_pages_clear_private(nr_pages, pages);	838	gnttab_pages_clear_private(nr_pages, pages);
839	free_xenballooned_pages(nr_pages, pages);	839	xen_free_unpopulated_pages(nr_pages, pages);
840	}	840	}
841	EXPORT_SYMBOL_GPL(gnttab_free_pages);	841	EXPORT_SYMBOL_GPL(gnttab_free_pages);
842		842

drivers/xen/privcmd.c+2−2

@@ -424,7 +424,7 @@ static int alloc_empty_pages(struct vm_area_struct *vma, int numpgs) · 423 unmodified lines
424	if (pages == NULL)	424	if (pages == NULL)
425	return -ENOMEM;	425	return -ENOMEM;
426		426
427	rc = alloc_xenballooned_pages(numpgs, pages);	427	rc = xen_alloc_unpopulated_pages(numpgs, pages);
428	if (rc != 0) {	428	if (rc != 0) {
429	pr_warn("%s Could not alloc %d pfns rc:%d\n", __func__,	429	pr_warn("%s Could not alloc %d pfns rc:%d\n", __func__,
430	numpgs, rc);	430	numpgs, rc);
@@ -895,7 +895,7 @@ static void privcmd_close(struct vm_area_struct *vma) · 464 unmodified lines
895		895
896	rc = xen_unmap_domain_gfn_range(vma, numgfns, pages);	896	rc = xen_unmap_domain_gfn_range(vma, numgfns, pages);
897	if (rc == 0)	897	if (rc == 0)
898	free_xenballooned_pages(numpgs, pages);	898	xen_free_unpopulated_pages(numpgs, pages);
899	else	899	else
900	pr_crit("unable to unmap MFN range: leaking %d pages. rc=%d\n",	900	pr_crit("unable to unmap MFN range: leaking %d pages. rc=%d\n",
901	numpgs, rc);	901	numpgs, rc);

drivers/xen/unpopulated-alloc.c+183−0

@@ -0,0 +1,183 @@
	1	// SPDX-License-Identifier: GPL-2.0
	2	#include <linux/errno.h>
	3	#include <linux/gfp.h>
	4	#include <linux/kernel.h>
	5	#include <linux/mm.h>
	6	#include <linux/memremap.h>
	7	#include <linux/slab.h>
	8
	9	#include <asm/page.h>
	10
	11	#include <xen/page.h>
	12	#include <xen/xen.h>
	13
	14	static DEFINE_MUTEX(list_lock);
	15	static LIST_HEAD(page_list);
	16	static unsigned int list_count;
	17
	18	static int fill_list(unsigned int nr_pages)
	19	{
	20	struct dev_pagemap *pgmap;
	21	void *vaddr;
	22	unsigned int i, alloc_pages = round_up(nr_pages, PAGES_PER_SECTION);
	23	int ret;
	24
	25	pgmap = kzalloc(sizeof(*pgmap), GFP_KERNEL);
	26	if (!pgmap)
	27	return -ENOMEM;
	28
	29	pgmap->type = MEMORY_DEVICE_GENERIC;
	30	pgmap->res.name = "Xen scratch";
	31	pgmap->res.flags = IORESOURCE_MEM \| IORESOURCE_BUSY;
	32
	33	ret = allocate_resource(&iomem_resource, &pgmap->res,
	34	alloc_pages * PAGE_SIZE, 0, -1,
	35	PAGES_PER_SECTION * PAGE_SIZE, NULL, NULL);
	36	if (ret < 0) {
	37	pr_err("Cannot allocate new IOMEM resource\n");
	38	kfree(pgmap);
	39	return ret;
	40	}
	41
	42	#ifdef CONFIG_XEN_HAVE_PVMMU
	43	/*
	44	* memremap will build page tables for the new memory so
	45	* the p2m must contain invalid entries so the correct
	46	* non-present PTEs will be written.
	47	*
	48	* If a failure occurs, the original (identity) p2m entries
	49	* are not restored since this region is now known not to
	50	* conflict with any devices.
	51	*/
	52	if (!xen_feature(XENFEAT_auto_translated_physmap)) {
	53	xen_pfn_t pfn = PFN_DOWN(pgmap->res.start);
	54
	55	for (i = 0; i < alloc_pages; i++) {
	56	if (!set_phys_to_machine(pfn + i, INVALID_P2M_ENTRY)) {
	57	pr_warn("set_phys_to_machine() failed, no memory added\n");
	58	release_resource(&pgmap->res);
	59	kfree(pgmap);
	60	return -ENOMEM;
	61	}
	62	}
	63	}
	64	#endif
	65
	66	vaddr = memremap_pages(pgmap, NUMA_NO_NODE);
	67	if (IS_ERR(vaddr)) {
	68	pr_err("Cannot remap memory range\n");
	69	release_resource(&pgmap->res);
	70	kfree(pgmap);
	71	return PTR_ERR(vaddr);
	72	}
	73
	74	for (i = 0; i < alloc_pages; i++) {
	75	struct page pg = virt_to_page(vaddr + PAGE_SIZE i);
	76
	77	BUG_ON(!virt_addr_valid(vaddr + PAGE_SIZE * i));
	78	list_add(&pg->lru, &page_list);
	79	list_count++;
	80	}
	81
	82	return 0;
	83	}
	84
	85	/**
	86	* xen_alloc_unpopulated_pages - alloc unpopulated pages
	87	* @nr_pages: Number of pages
	88	* @pages: pages returned
	89	* @return 0 on success, error otherwise
	90	*/
	91	int xen_alloc_unpopulated_pages(unsigned int nr_pages, struct page **pages)
	92	{
	93	unsigned int i;
	94	int ret = 0;
	95
	96	mutex_lock(&list_lock);
	97	if (list_count < nr_pages) {
	98	ret = fill_list(nr_pages - list_count);
	99	if (ret)
	100	goto out;
	101	}
	102
	103	for (i = 0; i < nr_pages; i++) {
	104	struct page *pg = list_first_entry_or_null(&page_list,
	105	struct page,
	106	lru);
	107
	108	BUG_ON(!pg);
	109	list_del(&pg->lru);
	110	list_count--;
	111	pages[i] = pg;
	112
	113	#ifdef CONFIG_XEN_HAVE_PVMMU
	114	if (!xen_feature(XENFEAT_auto_translated_physmap)) {
	115	ret = xen_alloc_p2m_entry(page_to_pfn(pg));
	116	if (ret < 0) {
	117	unsigned int j;
	118
	119	for (j = 0; j <= i; j++) {
	120	list_add(&pages[j]->lru, &page_list);
	121	list_count++;
	122	}
	123	goto out;
	124	}
	125	}
	126	#endif
	127	}
	128
	129	out:
	130	mutex_unlock(&list_lock);
	131	return ret;
	132	}
	133	EXPORT_SYMBOL(xen_alloc_unpopulated_pages);
	134
	135	/**
	136	* xen_free_unpopulated_pages - return unpopulated pages
	137	* @nr_pages: Number of pages
	138	* @pages: pages to return
	139	*/
	140	void xen_free_unpopulated_pages(unsigned int nr_pages, struct page **pages)
	141	{
	142	unsigned int i;
	143
	144	mutex_lock(&list_lock);
	145	for (i = 0; i < nr_pages; i++) {
	146	list_add(&pages[i]->lru, &page_list);
	147	list_count++;
	148	}
	149	mutex_unlock(&list_lock);
	150	}
	151	EXPORT_SYMBOL(xen_free_unpopulated_pages);
	152
	153	#ifdef CONFIG_XEN_PV
	154	static int __init init(void)
	155	{
	156	unsigned int i;
	157
	158	if (!xen_domain())
	159	return -ENODEV;
	160
	161	if (!xen_pv_domain())
	162	return 0;
	163
	164	/*
	165	* Initialize with pages from the extra memory regions (see
	166	* arch/x86/xen/setup.c).
	167	*/
	168	for (i = 0; i < XEN_EXTRA_MEM_MAX_REGIONS; i++) {
	169	unsigned int j;
	170
	171	for (j = 0; j < xen_extra_mem[i].n_pfns; j++) {
	172	struct page *pg =
	173	pfn_to_page(xen_extra_mem[i].start_pfn + j);
	174
	175	list_add(&pg->lru, &page_list);
	176	list_count++;
	177	}
	178	}
	179
	180	return 0;
	181	}
	182	subsys_initcall(init);
	183	#endif

drivers/xen/xenbus/xenbus_client.c+3−3

@@ -621,7 +621,7 @@ static int xenbus_map_ring_hvm(struct xenbus_device *dev, · 620 unmodified lines
621	bool leaked = false;	621	bool leaked = false;
622	unsigned int nr_pages = XENBUS_PAGES(nr_grefs);	622	unsigned int nr_pages = XENBUS_PAGES(nr_grefs);
623		623
624	err = alloc_xenballooned_pages(nr_pages, node->hvm.pages);	624	err = xen_alloc_unpopulated_pages(nr_pages, node->hvm.pages);
625	if (err)	625	if (err)
626	goto out_err;	626	goto out_err;
627		627
@@ -662,7 +662,7 @@ static int xenbus_map_ring_hvm(struct xenbus_device *dev, · 34 unmodified lines
662	addr, nr_pages);	662	addr, nr_pages);
663	out_free_ballooned_pages:	663	out_free_ballooned_pages:
664	if (!leaked)	664	if (!leaked)
665	free_xenballooned_pages(nr_pages, node->hvm.pages);	665	xen_free_unpopulated_pages(nr_pages, node->hvm.pages);
666	out_err:	666	out_err:
667	return err;	667	return err;
668	}	668	}
@@ -858,7 +858,7 @@ static int xenbus_unmap_ring_hvm(struct xenbus_device dev, void vaddr) · 189 unmodified lines
858	info.addrs);	858	info.addrs);
859	if (!rv) {	859	if (!rv) {
860	vunmap(vaddr);	860	vunmap(vaddr);
861	free_xenballooned_pages(nr_pages, node->hvm.pages);	861	xen_free_unpopulated_pages(nr_pages, node->hvm.pages);
862	}	862	}
863	else	863	else
864	WARN(1, "Leaking %p, size %u page(s)\n", vaddr, nr_pages);	864	WARN(1, "Leaking %p, size %u page(s)\n", vaddr, nr_pages);

drivers/xen/xlate_mmu.c+2−2

@@ -232,7 +232,7 @@ int __init xen_xlate_map_ballooned_pages(xen_pfn_t gfns, void virt, · 231 unmodified lines
232	kfree(pages);	232	kfree(pages);
233	return -ENOMEM;	233	return -ENOMEM;
234	}	234	}
235	rc = alloc_xenballooned_pages(nr_pages, pages);	235	rc = xen_alloc_unpopulated_pages(nr_pages, pages);
236	if (rc) {	236	if (rc) {
237	pr_warn("%s Couldn't balloon alloc %ld pages rc:%d\n", __func__,	237	pr_warn("%s Couldn't balloon alloc %ld pages rc:%d\n", __func__,
238	nr_pages, rc);	238	nr_pages, rc);
@@ -249,7 +249,7 @@ int __init xen_xlate_map_ballooned_pages(xen_pfn_t gfns, void virt, · 10 unmodified lines
249	if (!vaddr) {	249	if (!vaddr) {
250	pr_warn("%s Couldn't map %ld pages rc:%d\n", __func__,	250	pr_warn("%s Couldn't map %ld pages rc:%d\n", __func__,
251	nr_pages, rc);	251	nr_pages, rc);
252	free_xenballooned_pages(nr_pages, pages);	252	xen_free_unpopulated_pages(nr_pages, pages);
253	kfree(pages);	253	kfree(pages);
254	kfree(pfns);	254	kfree(pfns);
255	return -ENOMEM;	255	return -ENOMEM;

fs/affs/amigaffs.c+27−0

@@ -420,24 +420,51 @@ affs_mode_to_prot(struct inode *inode) · 419 unmodified lines
420	u32 prot = AFFS_I(inode)->i_protect;	420	u32 prot = AFFS_I(inode)->i_protect;
421	umode_t mode = inode->i_mode;	421	umode_t mode = inode->i_mode;
422		422
		423	/*
		424	* First, clear all RWED bits for owner, group, other.
		425	* Then, recalculate them afresh.
		426	*
		427	* We'll always clear the delete-inhibit bit for the owner, as that is
		428	* the classic single-user mode AmigaOS protection bit and we need to
		429	* stay compatible with all scenarios.
		430	*
		431	* Since multi-user AmigaOS is an extension, we'll only set the
		432	* delete-allow bit if any of the other bits in the same user class
		433	* (group/other) are used.
		434	*/
		435	prot &= ~(FIBF_NOEXECUTE \| FIBF_NOREAD
		436	\| FIBF_NOWRITE \| FIBF_NODELETE
		437	\| FIBF_GRP_EXECUTE \| FIBF_GRP_READ
		438	\| FIBF_GRP_WRITE \| FIBF_GRP_DELETE
		439	\| FIBF_OTR_EXECUTE \| FIBF_OTR_READ
		440	\| FIBF_OTR_WRITE \| FIBF_OTR_DELETE);
		441
		442	/* Classic single-user AmigaOS flags. These are inverted. */
423	if (!(mode & 0100))	443	if (!(mode & 0100))
424	prot \|= FIBF_NOEXECUTE;	444	prot \|= FIBF_NOEXECUTE;
425	if (!(mode & 0400))	445	if (!(mode & 0400))
426	prot \|= FIBF_NOREAD;	446	prot \|= FIBF_NOREAD;
427	if (!(mode & 0200))	447	if (!(mode & 0200))
428	prot \|= FIBF_NOWRITE;	448	prot \|= FIBF_NOWRITE;
		449
		450	/* Multi-user extended flags. Not inverted. */
429	if (mode & 0010)	451	if (mode & 0010)
430	prot \|= FIBF_GRP_EXECUTE;	452	prot \|= FIBF_GRP_EXECUTE;
431	if (mode & 0040)	453	if (mode & 0040)
432	prot \|= FIBF_GRP_READ;	454	prot \|= FIBF_GRP_READ;
433	if (mode & 0020)	455	if (mode & 0020)
434	prot \|= FIBF_GRP_WRITE;	456	prot \|= FIBF_GRP_WRITE;
		457	if (mode & 0070)
		458	prot \|= FIBF_GRP_DELETE;
		459
435	if (mode & 0001)	460	if (mode & 0001)
436	prot \|= FIBF_OTR_EXECUTE;	461	prot \|= FIBF_OTR_EXECUTE;
437	if (mode & 0004)	462	if (mode & 0004)
438	prot \|= FIBF_OTR_READ;	463	prot \|= FIBF_OTR_READ;
439	if (mode & 0002)	464	if (mode & 0002)
440	prot \|= FIBF_OTR_WRITE;	465	prot \|= FIBF_OTR_WRITE;
		466	if (mode & 0007)
		467	prot \|= FIBF_OTR_DELETE;
441		468
442	AFFS_I(inode)->i_protect = prot;	469	AFFS_I(inode)->i_protect = prot;
443	}	470	}

fs/affs/file.c+25−1

@@ -429,6 +429,24 @@ static int affs_write_begin(struct file file, struct address_space mapping, · 428 unmodified lines
429	return ret;	429	return ret;
430	}	430	}
431		431
		432	static int affs_write_end(struct file file, struct address_space mapping,
		433	loff_t pos, unsigned int len, unsigned int copied,
		434	struct page page, void fsdata)
		435	{
		436	struct inode *inode = mapping->host;
		437	int ret;
		438
		439	ret = generic_write_end(file, mapping, pos, len, copied, page, fsdata);
		440
		441	/* Clear Archived bit on file writes, as AmigaOS would do */
		442	if (AFFS_I(inode)->i_protect & FIBF_ARCHIVED) {
		443	AFFS_I(inode)->i_protect &= ~FIBF_ARCHIVED;
		444	mark_inode_dirty(inode);
		445	}
		446
		447	return ret;
		448	}
		449
432	static sector_t _affs_bmap(struct address_space *mapping, sector_t block)	450	static sector_t _affs_bmap(struct address_space *mapping, sector_t block)
433	{	451	{
434	return generic_block_bmap(mapping,block,affs_get_block);	452	return generic_block_bmap(mapping,block,affs_get_block);
@@ -438,7 +456,7 @@ const struct address_space_operations affs_aops = { · 3 unmodified lines
438	.readpage = affs_readpage,	456	.readpage = affs_readpage,
439	.writepage = affs_writepage,	457	.writepage = affs_writepage,
440	.write_begin = affs_write_begin,	458	.write_begin = affs_write_begin,
441	.write_end = generic_write_end,	459	.write_end = affs_write_end,
442	.direct_IO = affs_direct_IO,	460	.direct_IO = affs_direct_IO,
443	.bmap = _affs_bmap	461	.bmap = _affs_bmap
444	};	462	};
@@ -795,6 +813,12 @@ done: · 350 unmodified lines
795	if (tmp > inode->i_size)	813	if (tmp > inode->i_size)
796	inode->i_size = AFFS_I(inode)->mmu_private = tmp;	814	inode->i_size = AFFS_I(inode)->mmu_private = tmp;
797		815
		816	/* Clear Archived bit on file writes, as AmigaOS would do */
		817	if (AFFS_I(inode)->i_protect & FIBF_ARCHIVED) {
		818	AFFS_I(inode)->i_protect &= ~FIBF_ARCHIVED;
		819	mark_inode_dirty(inode);
		820	}
		821
798	err_first_bh:	822	err_first_bh:
799	unlock_page(page);	823	unlock_page(page);
800	put_page(page);	824	put_page(page);

fs/afs/fs_probe.c+2−2

@@ -161,8 +161,8 @@ responded: · 160 unmodified lines
161	}	161	}
162	}	162	}
163		163
164	rtt_us = rxrpc_kernel_get_srtt(call->net->socket, call->rxcall);	164	if (rxrpc_kernel_get_srtt(call->net->socket, call->rxcall, &rtt_us) &&
165	if (rtt_us < server->probe.rtt) {	165	rtt_us < server->probe.rtt) {
166	server->probe.rtt = rtt_us;	166	server->probe.rtt = rtt_us;
167	server->rtt = rtt_us;	167	server->rtt = rtt_us;
168	alist->preferred = index;	168	alist->preferred = index;

fs/afs/internal.h+8−6

 #define AFS_VLSERVER_FL_PROBED	0		/* The VL server has been probed */
 #define AFS_VLSERVER_FL_PROBING	1		/* VL server is being probed */
 #define AFS_VLSERVER_FL_IS_YFS	2		/* Server is YFS not AFS */
+#define AFS_VLSERVER_FL_RESPONDING 3		/* VL server is responding */
 	rwlock_t		lock;		/* Lock on addresses */
 	atomic_t		usage;
+	unsigned int		rtt;		/* Server's current RTT in uS */
 	/* Probe state */
 	wait_queue_head_t	probe_wq;
 	atomic_t		probe_outstanding;
 	spinlock_t		probe_lock;
 	struct {
-		unsigned int	rtt;		/* RTT as ktime/64 */
+		unsigned int	rtt;		/* RTT in uS */
 		u32		abort_code;
 		short		error;
-		bool		have_result;
+		unsigned short	flags;
-		bool		responded:1;
+#define AFS_VLSERVER_PROBE_RESPONDED		0x01 /* At least once response (may be abort) */
-		bool		is_yfs:1;
+#define AFS_VLSERVER_PROBE_IS_YFS		0x02 /* The peer appears to be YFS */
-		bool		not_yfs:1;
+#define AFS_VLSERVER_PROBE_NOT_YFS		0x04 /* The peer appears not to be YFS */
-		bool		local_failure:1;
+#define AFS_VLSERVER_PROBE_LOCAL_FAILURE	0x08 /* A local failure prevented a probe */
 	} probe;
 	u16			port;

fs/afs/proc.c+5−0

 				   alist->preferred == i ? '>' : '-',
 				   &alist->addrs[i].transport);
 	}
+	seq_printf(m, " info: fl=%lx rtt=%d\n", vlserver->flags, vlserver->rtt);
+	seq_printf(m, " probe: fl=%x e=%d ac=%d out=%d\n",
+		   vlserver->probe.flags, vlserver->probe.error,
+		   vlserver->probe.abort_code,
+		   atomic_read(&vlserver->probe_outstanding));
 	return 0;
 }

fs/afs/vl_list.c+1−0

@@ -21,6 +21,7 @@ struct afs_vlserver afs_alloc_vlserver(const char name, size_t name_len, · 20 unmodified lines
21	rwlock_init(&vlserver->lock);	21	rwlock_init(&vlserver->lock);
22	init_waitqueue_head(&vlserver->probe_wq);	22	init_waitqueue_head(&vlserver->probe_wq);
23	spin_lock_init(&vlserver->probe_lock);	23	spin_lock_init(&vlserver->probe_lock);
		24	vlserver->rtt = UINT_MAX;
24	vlserver->name_len = name_len;	25	vlserver->name_len = name_len;
25	vlserver->port = port;	26	vlserver->port = port;
26	memcpy(vlserver->name, name, name_len);	27	memcpy(vlserver->name, name, name_len);

fs/afs/vl_probe.c+51−31

@@ -11,15 +11,33 @@ · 10 unmodified lines
11	#include "internal.h"	11	#include "internal.h"
12	#include "protocol_yfs.h"	12	#include "protocol_yfs.h"
13		13
14	static bool afs_vl_probe_done(struct afs_vlserver *server)	14
		15	/*
		16	* Handle the completion of a set of probes.
		17	*/
		18	static void afs_finished_vl_probe(struct afs_vlserver *server)
15	{	19	{
16	if (!atomic_dec_and_test(&server->probe_outstanding))	20	if (!(server->probe.flags & AFS_VLSERVER_PROBE_RESPONDED)) {
17	return false;	21	server->rtt = UINT_MAX;
		22	clear_bit(AFS_VLSERVER_FL_RESPONDING, &server->flags);
		23	}
18		24
19	wake_up_var(&server->probe_outstanding);
20	clear_bit_unlock(AFS_VLSERVER_FL_PROBING, &server->flags);	25	clear_bit_unlock(AFS_VLSERVER_FL_PROBING, &server->flags);
21	wake_up_bit(&server->flags, AFS_VLSERVER_FL_PROBING);	26	wake_up_bit(&server->flags, AFS_VLSERVER_FL_PROBING);
22	return true;	27	}
		28
		29	/*
		30	* Handle the completion of a probe RPC call.
		31	*/
		32	static void afs_done_one_vl_probe(struct afs_vlserver *server, bool wake_up)
		33	{
		34	if (atomic_dec_and_test(&server->probe_outstanding)) {
		35	afs_finished_vl_probe(server);
		36	wake_up = true;
		37	}
		38
		39	if (wake_up)
		40	wake_up_all(&server->probe_wq);
23	}	41	}
24		42
25	/*	43	/*
@@ -45,15 +63,20 @@ void afs_vlserver_probe_result(struct afs_call *call) · 19 unmodified lines
45	server->probe.error = 0;	63	server->probe.error = 0;
46	goto responded;	64	goto responded;
47	case -ECONNABORTED:	65	case -ECONNABORTED:
48	if (!server->probe.responded) {	66	if (!(server->probe.flags & AFS_VLSERVER_PROBE_RESPONDED)) {
49	server->probe.abort_code = call->abort_code;	67	server->probe.abort_code = call->abort_code;
50	server->probe.error = ret;	68	server->probe.error = ret;
51	}	69	}
52	goto responded;	70	goto responded;
53	case -ENOMEM:	71	case -ENOMEM:
54	case -ENONET:	72	case -ENONET:
55	server->probe.local_failure = true;	73	case -EKEYEXPIRED:
56	afs_io_error(call, afs_io_error_vl_probe_fail);	74	case -EKEYREVOKED:
		75	case -EKEYREJECTED:
		76	server->probe.flags \|= AFS_VLSERVER_PROBE_LOCAL_FAILURE;
		77	if (server->probe.error == 0)
		78	server->probe.error = ret;
		79	trace_afs_io_error(call->debug_id, ret, afs_io_error_vl_probe_fail);
57	goto out;	80	goto out;
58	case -ECONNRESET: /* Responded, but call expired. */	81	case -ECONNRESET: /* Responded, but call expired. */
59	case -ERFKILL:	82	case -ERFKILL:
@@ -67,12 +90,12 @@ void afs_vlserver_probe_result(struct afs_call *call) · 7 unmodified lines
67	default:	90	default:
68	clear_bit(index, &alist->responded);	91	clear_bit(index, &alist->responded);
69	set_bit(index, &alist->failed);	92	set_bit(index, &alist->failed);
70	if (!server->probe.responded &&	93	if (!(server->probe.flags & AFS_VLSERVER_PROBE_RESPONDED) &&
71	(server->probe.error == 0 \|\|	94	(server->probe.error == 0 \|\|
72	server->probe.error == -ETIMEDOUT \|\|	95	server->probe.error == -ETIMEDOUT \|\|
73	server->probe.error == -ETIME))	96	server->probe.error == -ETIME))
74	server->probe.error = ret;	97	server->probe.error = ret;
75	afs_io_error(call, afs_io_error_vl_probe_fail);	98	trace_afs_io_error(call->debug_id, ret, afs_io_error_vl_probe_fail);
76	goto out;	99	goto out;
77	}	100	}
78		101
@@ -81,39 +104,36 @@ responded: · 2 unmodified lines
81	clear_bit(index, &alist->failed);	104	clear_bit(index, &alist->failed);
82		105
83	if (call->service_id == YFS_VL_SERVICE) {	106	if (call->service_id == YFS_VL_SERVICE) {
84	server->probe.is_yfs = true;	107	server->probe.flags \|= AFS_VLSERVER_PROBE_IS_YFS;
85	set_bit(AFS_VLSERVER_FL_IS_YFS, &server->flags);	108	set_bit(AFS_VLSERVER_FL_IS_YFS, &server->flags);
86	alist->addrs[index].srx_service = call->service_id;	109	alist->addrs[index].srx_service = call->service_id;
87	} else {	110	} else {
88	server->probe.not_yfs = true;	111	server->probe.flags \|= AFS_VLSERVER_PROBE_NOT_YFS;
89	if (!server->probe.is_yfs) {	112	if (!(server->probe.flags & AFS_VLSERVER_PROBE_IS_YFS)) {
90	clear_bit(AFS_VLSERVER_FL_IS_YFS, &server->flags);	113	clear_bit(AFS_VLSERVER_FL_IS_YFS, &server->flags);
91	alist->addrs[index].srx_service = call->service_id;	114	alist->addrs[index].srx_service = call->service_id;
92	}	115	}
93	}	116	}
94		117
95	rtt_us = rxrpc_kernel_get_srtt(call->net->socket, call->rxcall);	118	if (rxrpc_kernel_get_srtt(call->net->socket, call->rxcall, &rtt_us) &&
96	if (rtt_us < server->probe.rtt) {	119	rtt_us < server->probe.rtt) {
97	server->probe.rtt = rtt_us;	120	server->probe.rtt = rtt_us;
		121	server->rtt = rtt_us;
98	alist->preferred = index;	122	alist->preferred = index;
99	have_result = true;
100	}	123	}
101		124
102	smp_wmb(); /* Set rtt before responded. */	125	smp_wmb(); /* Set rtt before responded. */
103	server->probe.responded = true;	126	server->probe.flags \|= AFS_VLSERVER_PROBE_RESPONDED;
104	set_bit(AFS_VLSERVER_FL_PROBED, &server->flags);	127	set_bit(AFS_VLSERVER_FL_PROBED, &server->flags);
		128	set_bit(AFS_VLSERVER_FL_RESPONDING, &server->flags);
		129	have_result = true;
105	out:	130	out:
106	spin_unlock(&server->probe_lock);	131	spin_unlock(&server->probe_lock);
107		132
108	_debug("probe [%u][%u] %pISpc rtt=%u ret=%d",	133	_debug("probe [%u][%u] %pISpc rtt=%u ret=%d",
109	server_index, index, &alist->addrs[index].transport, rtt_us, ret);	134	server_index, index, &alist->addrs[index].transport, rtt_us, ret);
110		135
111	have_result \|= afs_vl_probe_done(server);	136	afs_done_one_vl_probe(server, have_result);
112	if (have_result) {
113	server->probe.have_result = true;
114	wake_up_var(&server->probe.have_result);
115	wake_up_all(&server->probe_wq);
116	}
117	}	137	}
118		138
119	/*	139	/*
@@ -151,11 +171,10 @@ static bool afs_do_probe_vlserver(struct afs_net *net, · 31 unmodified lines
151	in_progress = true;	171	in_progress = true;
152	} else {	172	} else {
153	afs_prioritise_error(_e, PTR_ERR(call), ac.abort_code);	173	afs_prioritise_error(_e, PTR_ERR(call), ac.abort_code);
		174	afs_done_one_vl_probe(server, false);
154	}	175	}
155	}	176	}
156		177
157	if (!in_progress)
158	afs_vl_probe_done(server);
159	return in_progress;	178	return in_progress;
160	}	179	}
161		180
@@ -193,7 +212,7 @@ int afs_wait_for_vl_probes(struct afs_vlserver_list *vllist, · 31 unmodified lines
193	{	212	{
194	struct wait_queue_entry *waits;	213	struct wait_queue_entry *waits;
195	struct afs_vlserver *server;	214	struct afs_vlserver *server;
196	unsigned int rtt = UINT_MAX;	215	unsigned int rtt = UINT_MAX, rtt_s;
197	bool have_responders = false;	216	bool have_responders = false;
198	int pref = -1, i;	217	int pref = -1, i;
199		218
@@ -205,7 +224,7 @@ int afs_wait_for_vl_probes(struct afs_vlserver_list *vllist, · 5 unmodified lines
205	server = vllist->servers[i].server;	224	server = vllist->servers[i].server;
206	if (!test_bit(AFS_VLSERVER_FL_PROBING, &server->flags))	225	if (!test_bit(AFS_VLSERVER_FL_PROBING, &server->flags))
207	__clear_bit(i, &untried);	226	__clear_bit(i, &untried);
208	if (server->probe.responded)	227	if (server->probe.flags & AFS_VLSERVER_PROBE_RESPONDED)
209	have_responders = true;	228	have_responders = true;
210	}	229	}
211	}	230	}
@@ -231,7 +250,7 @@ int afs_wait_for_vl_probes(struct afs_vlserver_list *vllist, · 19 unmodified lines
231	for (i = 0; i < vllist->nr_servers; i++) {	250	for (i = 0; i < vllist->nr_servers; i++) {
232	if (test_bit(i, &untried)) {	251	if (test_bit(i, &untried)) {
233	server = vllist->servers[i].server;	252	server = vllist->servers[i].server;
234	if (server->probe.responded)	253	if (server->probe.flags & AFS_VLSERVER_PROBE_RESPONDED)
235	goto stop;	254	goto stop;
236	if (test_bit(AFS_VLSERVER_FL_PROBING, &server->flags))	255	if (test_bit(AFS_VLSERVER_FL_PROBING, &server->flags))
237	still_probing = true;	256	still_probing = true;
@@ -249,10 +268,11 @@ stop: · 11 unmodified lines
249	for (i = 0; i < vllist->nr_servers; i++) {	268	for (i = 0; i < vllist->nr_servers; i++) {
250	if (test_bit(i, &untried)) {	269	if (test_bit(i, &untried)) {
251	server = vllist->servers[i].server;	270	server = vllist->servers[i].server;
252	if (server->probe.responded &&	271	rtt_s = READ_ONCE(server->rtt);
253	server->probe.rtt < rtt) {	272	if (test_bit(AFS_VLSERVER_FL_RESPONDING, &server->flags) &&
		273	rtt_s < rtt) {
254	pref = i;	274	pref = i;
255	rtt = server->probe.rtt;	275	rtt = rtt_s;
256	}	276	}
257		277
258	remove_wait_queue(&server->probe_wq, &waits[i]);	278	remove_wait_queue(&server->probe_wq, &waits[i]);

fs/afs/vl_rotate.c+6−1

 	for (i = 0; i < vc->server_list->nr_servers; i++) {
 		struct afs_vlserver *s = vc->server_list->servers[i].server;
-		if (!test_bit(i, &vc->untried) || !s->probe.responded)
+		if (!test_bit(i, &vc->untried) ||
+		    !test_bit(AFS_VLSERVER_FL_RESPONDING, &s->flags))
 			continue;
 		if (s->probe.rtt < rtt) {
 			vc->index = i;
 	for (i = 0; i < vc->server_list->nr_servers; i++) {
 		struct afs_vlserver *s = vc->server_list->servers[i].server;
+		if (test_bit(AFS_VLSERVER_FL_RESPONDING, &s->flags))
+			e.responded = true;
 		afs_prioritise_error(&e, READ_ONCE(s->probe.error),
 				     s->probe.abort_code);
 	}
+	error = e.error;
 failed_set_error:
 	vc->error = error;
 failed:

fs/btrfs/block-group.c+3−1

 	cache->fs_info = fs_info;
 	cache->full_stripe_len = btrfs_full_stripe_len(fs_info, start);
-	set_free_space_tree_thresholds(cache);
 	cache->discard_index = BTRFS_DISCARD_INDEX_UNUSED;
 	if (ret < 0)
 		goto error;
+	set_free_space_tree_thresholds(cache);
 	if (need_clear) {
 		/*
 		 * When we mount with old space cache, we need to
 		return -ENOMEM;
 	cache->length = size;
+	set_free_space_tree_thresholds(cache);
 	cache->used = bytes_used;
 	cache->flags = type;
 	cache->last_byte_to_unpin = (u64)-1;

fs/btrfs/ctree.c+5−1

 	btrfs_tree_read_unlock_blocking(eb);
 	free_extent_buffer(eb);
+	btrfs_set_buffer_lockdep_class(btrfs_header_owner(eb_rewin),
+				       eb_rewin, btrfs_header_level(eb_rewin));
 	btrfs_tree_read_lock(eb_rewin);
 	__tree_mod_log_rewind(fs_info, eb_rewin, time_seq, tm);
 	WARN_ON(btrfs_header_nritems(eb_rewin) >
 	if (!eb)
 		return NULL;
-	btrfs_tree_read_lock(eb);
 	if (old_root) {
 		btrfs_set_header_bytenr(eb, eb->start);
 		btrfs_set_header_backref_rev(eb, BTRFS_MIXED_BACKREF_REV);
 		btrfs_set_header_level(eb, old_root->level);
 		btrfs_set_header_generation(eb, old_generation);
 	}
+	btrfs_set_buffer_lockdep_class(btrfs_header_owner(eb), eb,
+				       btrfs_header_level(eb));
+	btrfs_tree_read_lock(eb);
 	if (tm)
 		__tree_mod_log_rewind(fs_info, eb, time_seq, tm);
 	else

fs/btrfs/disk-io.c+2−0

@@ -3418,6 +3418,8 @@ fail_block_groups: · 3417 unmodified lines
3418	btrfs_put_block_group_cache(fs_info);	3418	btrfs_put_block_group_cache(fs_info);
3419		3419
3420	fail_tree_roots:	3420	fail_tree_roots:
		3421	if (fs_info->data_reloc_root)
		3422	btrfs_drop_and_free_fs_root(fs_info, fs_info->data_reloc_root);
3421	free_root_pointers(fs_info, true);	3423	free_root_pointers(fs_info, true);
3422	invalidate_inode_pages2(fs_info->btree_inode->i_mapping);	3424	invalidate_inode_pages2(fs_info->btree_inode->i_mapping);
3423		3425

fs/btrfs/extent-tree.c+10−11

 			if (type == BTRFS_SHARED_BLOCK_REF_KEY) {
 				ASSERT(eb->fs_info);
 				/*
-				 * Every shared one has parent tree
+				 * Every shared one has parent tree block,
-				 * block, which must be aligned to
+				 * which must be aligned to sector size.
-				 * nodesize.
 				 */
 				if (offset &&
-				    IS_ALIGNED(offset, eb->fs_info->nodesize))
+				    IS_ALIGNED(offset, eb->fs_info->sectorsize))
 					return type;
 			}
 		} else if (is_data == BTRFS_REF_TYPE_DATA) {
 			if (type == BTRFS_SHARED_DATA_REF_KEY) {
 				ASSERT(eb->fs_info);
 				/*
-				 * Every shared one has parent tree
+				 * Every shared one has parent tree block,
-				 * block, which must be aligned to
+				 * which must be aligned to sector size.
-				 * nodesize.
 				 */
 				if (offset &&
-				    IS_ALIGNED(offset, eb->fs_info->nodesize))
+				    IS_ALIGNED(offset, eb->fs_info->sectorsize))
 					return type;
 			}
 		} else {
 	}
 	btrfs_print_leaf((struct extent_buffer *)eb);
-	btrfs_err(eb->fs_info, "eb %llu invalid extent inline ref type %d",
+	btrfs_err(eb->fs_info,
-		  eb->start, type);
+		  "eb %llu iref 0x%lx invalid extent inline ref type %d",
+		  eb->start, (unsigned long)iref, type);
 	WARN_ON(1);
 	return BTRFS_REF_TYPE_INVALID;
 		return ERR_PTR(-EUCLEAN);
 	}
-	btrfs_set_buffer_lockdep_class(root->root_key.objectid, buf, level);
+	btrfs_set_buffer_lockdep_class(owner, buf, level);
 	btrfs_tree_lock(buf);
 	btrfs_clean_tree_block(buf);
 	clear_bit(EXTENT_BUFFER_STALE, &buf->bflags);

fs/btrfs/extent_io.c+4−4

@@ -5655,9 +5655,9 @@ void read_extent_buffer(const struct extent_buffer eb, void dstv, · 5654 unmodified lines
5655	}	5655	}
5656	}	5656	}
5657		5657
5658	int read_extent_buffer_to_user(const struct extent_buffer *eb,	5658	int read_extent_buffer_to_user_nofault(const struct extent_buffer *eb,
5659	void __user *dstv,	5659	void __user *dstv,
5660	unsigned long start, unsigned long len)	5660	unsigned long start, unsigned long len)
5661	{	5661	{
5662	size_t cur;	5662	size_t cur;
5663	size_t offset;	5663	size_t offset;
@@ -5677,7 +5677,7 @@ int read_extent_buffer_to_user(const struct extent_buffer *eb, · 13 unmodified lines
5677		5677
5678	cur = min(len, (PAGE_SIZE - offset));	5678	cur = min(len, (PAGE_SIZE - offset));
5679	kaddr = page_address(page);	5679	kaddr = page_address(page);
5680	if (copy_to_user(dst, kaddr + offset, cur)) {	5680	if (copy_to_user_nofault(dst, kaddr + offset, cur)) {
5681	ret = -EFAULT;	5681	ret = -EFAULT;
5682	break;	5682	break;
5683	}	5683	}

fs/btrfs/extent_io.h+3−3

@@ -241,9 +241,9 @@ int memcmp_extent_buffer(const struct extent_buffer eb, const void ptrv, · 240 unmodified lines
241	void read_extent_buffer(const struct extent_buffer eb, void dst,	241	void read_extent_buffer(const struct extent_buffer eb, void dst,
242	unsigned long start,	242	unsigned long start,
243	unsigned long len);	243	unsigned long len);
244	int read_extent_buffer_to_user(const struct extent_buffer *eb,	244	int read_extent_buffer_to_user_nofault(const struct extent_buffer *eb,
245	void __user *dst, unsigned long start,	245	void __user *dst, unsigned long start,
246	unsigned long len);	246	unsigned long len);
247	void write_extent_buffer_fsid(const struct extent_buffer eb, const void src);	247	void write_extent_buffer_fsid(const struct extent_buffer eb, const void src);
248	void write_extent_buffer_chunk_tree_uuid(const struct extent_buffer *eb,	248	void write_extent_buffer_chunk_tree_uuid(const struct extent_buffer *eb,
249	const void *src);	249	const void *src);

fs/btrfs/free-space-tree.c+4−0

 	size_t bitmap_size;
 	u64 num_bitmaps, total_bitmap_size;
+	if (WARN_ON(cache->length == 0))
+		btrfs_warn(cache->fs_info, "block group %llu length is zero",
+			   cache->start);
 	/*
 	 * We convert to bitmaps when the disk space required for using extents
 	 * exceeds that required for using bitmaps.

fs/btrfs/ioctl.c+20−7

 		sh.len = item_len;
 		sh.transid = found_transid;
-		/* copy search result header */
+		/*
-		if (copy_to_user(ubuf + *sk_offset, &sh, sizeof(sh))) {
+		 * Copy search result header. If we fault then loop again so we
-			ret = -EFAULT;
+		 * can fault in the pages and -EFAULT there if there's a
+		 * problem. Otherwise we'll fault and then copy the buffer in
+		 * properly this next time through
+		 */
+		if (copy_to_user_nofault(ubuf + *sk_offset, &sh, sizeof(sh))) {
+			ret = 0;
 			goto out;
 		}
 		if (item_len) {
 			char __user *up = ubuf + *sk_offset;
-			/* copy the item */
+			/*
-			if (read_extent_buffer_to_user(leaf, up,
+			 * Copy the item, same behavior as above, but reset the
-						       item_off, item_len)) {
+			 * * sk_offset so we copy the full thing again.
-				ret = -EFAULT;
+			 */
+			if (read_extent_buffer_to_user_nofault(leaf, up,
+						item_off, item_len)) {
+				ret = 0;
+				*sk_offset -= sizeof(sh);
 				goto out;
 			}
 	key.offset = sk->min_offset;
 	while (1) {
+		ret = fault_in_pages_writeable(ubuf, *buf_size - sk_offset);
+		if (ret)
+			break;
 		ret = btrfs_search_forward(root, &key, path, sk->min_transid);
 		if (ret != 0) {
 			if (ret > 0)

fs/btrfs/print-tree.c+7−5

 			 * offset is supposed to be a tree block which
 			 * must be aligned to nodesize.
 			 */
-			if (!IS_ALIGNED(offset, eb->fs_info->nodesize))
+			if (!IS_ALIGNED(offset, eb->fs_info->sectorsize))
-				pr_info("\t\t\t(parent %llu is NOT ALIGNED to nodesize %llu)\n",
+				pr_info(
-					offset, (unsigned long long)eb->fs_info->nodesize);
+			"\t\t\t(parent %llu not aligned to sectorsize %u)\n",
+					offset, eb->fs_info->sectorsize);
 			break;
 		case BTRFS_EXTENT_DATA_REF_KEY:
 			dref = (struct btrfs_extent_data_ref *)(&iref->offset);
 			 * must be aligned to nodesize.
 			 */
 			if (!IS_ALIGNED(offset, eb->fs_info->nodesize))
-				pr_info("\t\t\t(parent %llu is NOT ALIGNED to nodesize %llu)\n",
+				pr_info(
-				     offset, (unsigned long long)eb->fs_info->nodesize);
+			"\t\t\t(parent %llu not aligned to sectorsize %u)\n",
+				     offset, eb->fs_info->sectorsize);
 			break;
 		default:
 			pr_cont("(extent %llu has INVALID ref type %d)\n",

fs/btrfs/scrub.c+70−52

@@ -3716,50 +3716,84 @@ static noinline_for_stack int scrub_supers(struct scrub_ctx *sctx, · 3715 unmodified lines
3716	return 0;	3716	return 0;
3717	}	3717	}
3718		3718
		3719	static void scrub_workers_put(struct btrfs_fs_info *fs_info)
		3720	{
		3721	if (refcount_dec_and_mutex_lock(&fs_info->scrub_workers_refcnt,
		3722	&fs_info->scrub_lock)) {
		3723	struct btrfs_workqueue *scrub_workers = NULL;
		3724	struct btrfs_workqueue *scrub_wr_comp = NULL;
		3725	struct btrfs_workqueue *scrub_parity = NULL;
		3726
		3727	scrub_workers = fs_info->scrub_workers;
		3728	scrub_wr_comp = fs_info->scrub_wr_completion_workers;
		3729	scrub_parity = fs_info->scrub_parity_workers;
		3730
		3731	fs_info->scrub_workers = NULL;
		3732	fs_info->scrub_wr_completion_workers = NULL;
		3733	fs_info->scrub_parity_workers = NULL;
		3734	mutex_unlock(&fs_info->scrub_lock);
		3735
		3736	btrfs_destroy_workqueue(scrub_workers);
		3737	btrfs_destroy_workqueue(scrub_wr_comp);
		3738	btrfs_destroy_workqueue(scrub_parity);
		3739	}
		3740	}
		3741
3719	/*	3742	/*
3720	* get a reference count on fs_info->scrub_workers. start worker if necessary	3743	* get a reference count on fs_info->scrub_workers. start worker if necessary
3721	*/	3744	*/
3722	static noinline_for_stack int scrub_workers_get(struct btrfs_fs_info *fs_info,	3745	static noinline_for_stack int scrub_workers_get(struct btrfs_fs_info *fs_info,
3723	int is_dev_replace)	3746	int is_dev_replace)
3724	{	3747	{
		3748	struct btrfs_workqueue *scrub_workers = NULL;
		3749	struct btrfs_workqueue *scrub_wr_comp = NULL;
		3750	struct btrfs_workqueue *scrub_parity = NULL;
3725	unsigned int flags = WQ_FREEZABLE \| WQ_UNBOUND;	3751	unsigned int flags = WQ_FREEZABLE \| WQ_UNBOUND;
3726	int max_active = fs_info->thread_pool_size;	3752	int max_active = fs_info->thread_pool_size;
		3753	int ret = -ENOMEM;
3727		3754
3728	lockdep_assert_held(&fs_info->scrub_lock);	3755	if (refcount_inc_not_zero(&fs_info->scrub_workers_refcnt))
		3756	return 0;
3729		3757
3730	if (refcount_read(&fs_info->scrub_workers_refcnt) == 0) {	3758	scrub_workers = btrfs_alloc_workqueue(fs_info, "scrub", flags,
3731	ASSERT(fs_info->scrub_workers == NULL);	3759	is_dev_replace ? 1 : max_active, 4);
3732	fs_info->scrub_workers = btrfs_alloc_workqueue(fs_info, "scrub",	3760	if (!scrub_workers)
3733	flags, is_dev_replace ? 1 : max_active, 4);	3761	goto fail_scrub_workers;
3734	if (!fs_info->scrub_workers)
3735	goto fail_scrub_workers;
3736
3737	ASSERT(fs_info->scrub_wr_completion_workers == NULL);
3738	fs_info->scrub_wr_completion_workers =
3739	btrfs_alloc_workqueue(fs_info, "scrubwrc", flags,
3740	max_active, 2);
3741	if (!fs_info->scrub_wr_completion_workers)
3742	goto fail_scrub_wr_completion_workers;
3743		3762
3744	ASSERT(fs_info->scrub_parity_workers == NULL);	3763	scrub_wr_comp = btrfs_alloc_workqueue(fs_info, "scrubwrc", flags,
3745	fs_info->scrub_parity_workers =
3746	btrfs_alloc_workqueue(fs_info, "scrubparity", flags,
3747	max_active, 2);	3764	max_active, 2);
3748	if (!fs_info->scrub_parity_workers)	3765	if (!scrub_wr_comp)
3749	goto fail_scrub_parity_workers;	3766	goto fail_scrub_wr_completion_workers;
3750		3767
		3768	scrub_parity = btrfs_alloc_workqueue(fs_info, "scrubparity", flags,
		3769	max_active, 2);
		3770	if (!scrub_parity)
		3771	goto fail_scrub_parity_workers;
		3772
		3773	mutex_lock(&fs_info->scrub_lock);
		3774	if (refcount_read(&fs_info->scrub_workers_refcnt) == 0) {
		3775	ASSERT(fs_info->scrub_workers == NULL &&
		3776	fs_info->scrub_wr_completion_workers == NULL &&
		3777	fs_info->scrub_parity_workers == NULL);
		3778	fs_info->scrub_workers = scrub_workers;
		3779	fs_info->scrub_wr_completion_workers = scrub_wr_comp;
		3780	fs_info->scrub_parity_workers = scrub_parity;
3751	refcount_set(&fs_info->scrub_workers_refcnt, 1);	3781	refcount_set(&fs_info->scrub_workers_refcnt, 1);
3752	} else {	3782	mutex_unlock(&fs_info->scrub_lock);
3753	refcount_inc(&fs_info->scrub_workers_refcnt);	3783	return 0;
3754	}	3784	}
3755	return 0;	3785	/* Other thread raced in and created the workers for us */
		3786	refcount_inc(&fs_info->scrub_workers_refcnt);
		3787	mutex_unlock(&fs_info->scrub_lock);
3756		3788
		3789	ret = 0;
		3790	btrfs_destroy_workqueue(scrub_parity);
3757	fail_scrub_parity_workers:	3791	fail_scrub_parity_workers:
3758	btrfs_destroy_workqueue(fs_info->scrub_wr_completion_workers);	3792	btrfs_destroy_workqueue(scrub_wr_comp);
3759	fail_scrub_wr_completion_workers:	3793	fail_scrub_wr_completion_workers:
3760	btrfs_destroy_workqueue(fs_info->scrub_workers);	3794	btrfs_destroy_workqueue(scrub_workers);
3761	fail_scrub_workers:	3795	fail_scrub_workers:
3762	return -ENOMEM;	3796	return ret;
3763	}	3797	}
3764		3798
3765	int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,	3799	int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,
@@ -3770,9 +3804,6 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, · 4 unmodified lines
3770	int ret;	3804	int ret;
3771	struct btrfs_device *dev;	3805	struct btrfs_device *dev;
3772	unsigned int nofs_flag;	3806	unsigned int nofs_flag;
3773	struct btrfs_workqueue *scrub_workers = NULL;
3774	struct btrfs_workqueue *scrub_wr_comp = NULL;
3775	struct btrfs_workqueue *scrub_parity = NULL;
3776		3807
3777	if (btrfs_fs_closing(fs_info))	3808	if (btrfs_fs_closing(fs_info))
3778	return -EAGAIN;	3809	return -EAGAIN;
@@ -3819,13 +3850,17 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, · 40 unmodified lines
3819	if (IS_ERR(sctx))	3850	if (IS_ERR(sctx))
3820	return PTR_ERR(sctx);	3851	return PTR_ERR(sctx);
3821		3852
		3853	ret = scrub_workers_get(fs_info, is_dev_replace);
		3854	if (ret)
		3855	goto out_free_ctx;
		3856
3822	mutex_lock(&fs_info->fs_devices->device_list_mutex);	3857	mutex_lock(&fs_info->fs_devices->device_list_mutex);
3823	dev = btrfs_find_device(fs_info->fs_devices, devid, NULL, NULL, true);	3858	dev = btrfs_find_device(fs_info->fs_devices, devid, NULL, NULL, true);
3824	if (!dev \|\| (test_bit(BTRFS_DEV_STATE_MISSING, &dev->dev_state) &&	3859	if (!dev \|\| (test_bit(BTRFS_DEV_STATE_MISSING, &dev->dev_state) &&
3825	!is_dev_replace)) {	3860	!is_dev_replace)) {
3826	mutex_unlock(&fs_info->fs_devices->device_list_mutex);	3861	mutex_unlock(&fs_info->fs_devices->device_list_mutex);
3827	ret = -ENODEV;	3862	ret = -ENODEV;
3828	goto out_free_ctx;	3863	goto out;
3829	}	3864	}
3830		3865
3831	if (!is_dev_replace && !readonly &&	3866	if (!is_dev_replace && !readonly &&
@@ -3834,7 +3869,7 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, · 2 unmodified lines
3834	btrfs_err_in_rcu(fs_info, "scrub: device %s is not writable",	3869	btrfs_err_in_rcu(fs_info, "scrub: device %s is not writable",
3835	rcu_str_deref(dev->name));	3870	rcu_str_deref(dev->name));
3836	ret = -EROFS;	3871	ret = -EROFS;
3837	goto out_free_ctx;	3872	goto out;
3838	}	3873	}
3839		3874
3840	mutex_lock(&fs_info->scrub_lock);	3875	mutex_lock(&fs_info->scrub_lock);
@@ -3843,7 +3878,7 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, · 2 unmodified lines
3843	mutex_unlock(&fs_info->scrub_lock);	3878	mutex_unlock(&fs_info->scrub_lock);
3844	mutex_unlock(&fs_info->fs_devices->device_list_mutex);	3879	mutex_unlock(&fs_info->fs_devices->device_list_mutex);
3845	ret = -EIO;	3880	ret = -EIO;
3846	goto out_free_ctx;	3881	goto out;
3847	}	3882	}
3848		3883
3849	down_read(&fs_info->dev_replace.rwsem);	3884	down_read(&fs_info->dev_replace.rwsem);
@@ -3854,17 +3889,10 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, · 4 unmodified lines
3854	mutex_unlock(&fs_info->scrub_lock);	3889	mutex_unlock(&fs_info->scrub_lock);
3855	mutex_unlock(&fs_info->fs_devices->device_list_mutex);	3890	mutex_unlock(&fs_info->fs_devices->device_list_mutex);
3856	ret = -EINPROGRESS;	3891	ret = -EINPROGRESS;
3857	goto out_free_ctx;	3892	goto out;
3858	}	3893	}
3859	up_read(&fs_info->dev_replace.rwsem);	3894	up_read(&fs_info->dev_replace.rwsem);
3860		3895
3861	ret = scrub_workers_get(fs_info, is_dev_replace);
3862	if (ret) {
3863	mutex_unlock(&fs_info->scrub_lock);
3864	mutex_unlock(&fs_info->fs_devices->device_list_mutex);
3865	goto out_free_ctx;
3866	}
3867
3868	sctx->readonly = readonly;	3896	sctx->readonly = readonly;
3869	dev->scrub_ctx = sctx;	3897	dev->scrub_ctx = sctx;
3870	mutex_unlock(&fs_info->fs_devices->device_list_mutex);	3898	mutex_unlock(&fs_info->fs_devices->device_list_mutex);
@@ -3917,24 +3945,14 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, · 46 unmodified lines
3917		3945
3918	mutex_lock(&fs_info->scrub_lock);	3946	mutex_lock(&fs_info->scrub_lock);
3919	dev->scrub_ctx = NULL;	3947	dev->scrub_ctx = NULL;
3920	if (refcount_dec_and_test(&fs_info->scrub_workers_refcnt)) {
3921	scrub_workers = fs_info->scrub_workers;
3922	scrub_wr_comp = fs_info->scrub_wr_completion_workers;
3923	scrub_parity = fs_info->scrub_parity_workers;
3924
3925	fs_info->scrub_workers = NULL;
3926	fs_info->scrub_wr_completion_workers = NULL;
3927	fs_info->scrub_parity_workers = NULL;
3928	}
3929	mutex_unlock(&fs_info->scrub_lock);	3948	mutex_unlock(&fs_info->scrub_lock);
3930		3949
3931	btrfs_destroy_workqueue(scrub_workers);	3950	scrub_workers_put(fs_info);
3932	btrfs_destroy_workqueue(scrub_wr_comp);
3933	btrfs_destroy_workqueue(scrub_parity);
3934	scrub_put_ctx(sctx);	3951	scrub_put_ctx(sctx);
3935		3952
3936	return ret;	3953	return ret;
3937		3954	out:
		3955	scrub_workers_put(fs_info);
3938	out_free_ctx:	3956	out_free_ctx:
3939	scrub_free_ctx(sctx);	3957	scrub_free_ctx(sctx);
3940		3958

fs/btrfs/transaction.c+1−0

@@ -1636,6 +1636,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, · 1635 unmodified lines
1636	pending->snap = btrfs_get_new_fs_root(fs_info, objectid, pending->anon_dev);	1636	pending->snap = btrfs_get_new_fs_root(fs_info, objectid, pending->anon_dev);
1637	if (IS_ERR(pending->snap)) {	1637	if (IS_ERR(pending->snap)) {
1638	ret = PTR_ERR(pending->snap);	1638	ret = PTR_ERR(pending->snap);
		1639	pending->snap = NULL;
1639	btrfs_abort_transaction(trans, ret);	1640	btrfs_abort_transaction(trans, ret);
1640	goto fail;	1641	goto fail;
1641	}	1642	}

fs/btrfs/tree-checker.c+1−1

@@ -984,7 +984,7 @@ static int check_inode_item(struct extent_buffer *leaf, · 983 unmodified lines
984	/* Note for ROOT_TREE_DIR_ITEM, mkfs could set its transid 0 */	984	/* Note for ROOT_TREE_DIR_ITEM, mkfs could set its transid 0 */
985	if (btrfs_inode_transid(leaf, iitem) > super_gen + 1) {	985	if (btrfs_inode_transid(leaf, iitem) > super_gen + 1) {
986	inode_item_err(leaf, slot,	986	inode_item_err(leaf, slot,
987	"invalid inode generation: has %llu expect [0, %llu]",	987	"invalid inode transid: has %llu expect [0, %llu]",
988	btrfs_inode_transid(leaf, iitem), super_gen + 1);	988	btrfs_inode_transid(leaf, iitem), super_gen + 1);
989	return -EUCLEAN;	989	return -EUCLEAN;
990	}	990	}

fs/btrfs/volumes.c+12−1

  */
 #include <linux/sched.h>
+#include <linux/sched/mm.h>
 #include <linux/bio.h>
 #include <linux/slab.h>
 #include <linux/blkdev.h>
 			goto skip;
 		}
 update_tree:
+		btrfs_release_path(path);
 		if (!btrfs_is_empty_uuid(root_item.uuid)) {
 			ret = btrfs_uuid_tree_add(trans, root_item.uuid,
 						  BTRFS_UUID_KEY_SUBVOL,
 		}
 skip:
+		btrfs_release_path(path);
 		if (trans) {
 			ret = btrfs_end_transaction(trans);
 			trans = NULL;
 				break;
 		}
-		btrfs_release_path(path);
 		if (key.offset < (u64)-1) {
 			key.offset++;
 		} else if (key.type < BTRFS_ROOT_ITEM_KEY) {
 					    u64 devid, u8 *dev_uuid)
 {
 	struct btrfs_device *device;
+	unsigned int nofs_flag;
+	/*
+	 * We call this under the chunk_mutex, so we want to use NOFS for this
+	 * allocation, however we don't want to change btrfs_alloc_device() to
+	 * always do NOFS because we use it in a lot of other GFP_KERNEL safe
+	 * places.
+	 */
+	nofs_flag = memalloc_nofs_save();
 	device = btrfs_alloc_device(NULL, &devid, dev_uuid);
+	memalloc_nofs_restore(nofs_flag);
 	if (IS_ERR(device))
 		return device;

fs/cifs/inode.c+4−0

 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MODE_FROM_SID) {
 		rc = cifs_acl_to_fattr(cifs_sb, &fattr, *inode, true,
 				       full_path, fid);
+		if (rc == -EREMOTE)
+			rc = 0;
 		if (rc) {
 			cifs_dbg(FYI, "%s: Get mode from SID failed. rc=%d\n",
 				 __func__, rc);
 	} else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) {
 		rc = cifs_acl_to_fattr(cifs_sb, &fattr, *inode, false,
 				       full_path, fid);
+		if (rc == -EREMOTE)
+			rc = 0;
 		if (rc) {
 			cifs_dbg(FYI, "%s: Getting ACL failed with error: %d\n",
 				 __func__, rc);

fs/debugfs/file.c+2−2

@@ -177,7 +177,7 @@ static int open_proxy_open(struct inode inode, struct file filp) · 176 unmodified lines
177	goto out;	177	goto out;
178		178
179	if (!fops_get(real_fops)) {	179	if (!fops_get(real_fops)) {
180	#ifdef MODULE	180	#ifdef CONFIG_MODULES
181	if (real_fops->owner &&	181	if (real_fops->owner &&
182	real_fops->owner->state == MODULE_STATE_GOING)	182	real_fops->owner->state == MODULE_STATE_GOING)
183	goto out;	183	goto out;
@@ -312,7 +312,7 @@ static int full_proxy_open(struct inode inode, struct file filp) · 128 unmodified lines
312	goto out;	312	goto out;
313		313
314	if (!fops_get(real_fops)) {	314	if (!fops_get(real_fops)) {
315	#ifdef MODULE	315	#ifdef CONFIG_MODULES
316	if (real_fops->owner &&	316	if (real_fops->owner &&
317	real_fops->owner->state == MODULE_STATE_GOING)	317	real_fops->owner->state == MODULE_STATE_GOING)
318	goto out;	318	goto out;

fs/eventpoll.c+3−3

@@ -1995,9 +1995,9 @@ static int ep_loop_check_proc(void priv, void cookie, int call_nests) · 1994 unmodified lines
1995	* during ep_insert().	1995	* during ep_insert().
1996	*/	1996	*/
1997	if (list_empty(&epi->ffd.file->f_tfile_llink)) {	1997	if (list_empty(&epi->ffd.file->f_tfile_llink)) {
1998	get_file(epi->ffd.file);	1998	if (get_file_rcu(epi->ffd.file))
1999	list_add(&epi->ffd.file->f_tfile_llink,	1999	list_add(&epi->ffd.file->f_tfile_llink,
2000	&tfile_check_list);	2000	&tfile_check_list);
2001	}	2001	}
2002	}	2002	}
2003	}	2003	}

fs/ext2/file.c+4−2

 	struct inode *inode = file_inode(vmf->vma->vm_file);
 	struct ext2_inode_info *ei = EXT2_I(inode);
 	vm_fault_t ret;
+	bool write = (vmf->flags & FAULT_FLAG_WRITE) &&
+		(vmf->vma->vm_flags & VM_SHARED);
-	if (vmf->flags & FAULT_FLAG_WRITE) {
+	if (write) {
 		sb_start_pagefault(inode->i_sb);
 		file_update_time(vmf->vma->vm_file);
 	}
 	ret = dax_iomap_fault(vmf, PE_SIZE_PTE, NULL, NULL, &ext2_iomap_ops);
 	up_read(&ei->dax_sem);
-	if (vmf->flags & FAULT_FLAG_WRITE)
+	if (write)
 		sb_end_pagefault(inode->i_sb);
 	return ret;
 }

fs/f2fs/data.c+3−0

@@ -3550,6 +3550,9 @@ static int check_direct_IO(struct inode inode, struct iov_iter iter, · 3549 unmodified lines
3550	unsigned long align = offset \| iov_iter_alignment(iter);	3550	unsigned long align = offset \| iov_iter_alignment(iter);
3551	struct block_device *bdev = inode->i_sb->s_bdev;	3551	struct block_device *bdev = inode->i_sb->s_bdev;
3552		3552
		3553	if (iov_iter_rw(iter) == READ && offset >= i_size_read(inode))
		3554	return 1;
		3555
3553	if (align & blocksize_mask) {	3556	if (align & blocksize_mask) {
3554	if (bdev)	3557	if (bdev)
3555	blkbits = blksize_bits(bdev_logical_block_size(bdev));	3558	blkbits = blksize_bits(bdev_logical_block_size(bdev));

fs/f2fs/node.c+3−0

@@ -2373,6 +2373,9 @@ static int __f2fs_build_free_nids(struct f2fs_sb_info *sbi, · 2372 unmodified lines
2373	if (unlikely(nid >= nm_i->max_nid))	2373	if (unlikely(nid >= nm_i->max_nid))
2374	nid = 0;	2374	nid = 0;
2375		2375
		2376	if (unlikely(nid % NAT_ENTRY_PER_BLOCK))
		2377	nid = NAT_BLOCK_OFFSET(nid) * NAT_ENTRY_PER_BLOCK;
		2378
2376	/* Enough entries */	2379	/* Enough entries */
2377	if (nm_i->nid_cnt[FREE_NID] >= NAT_ENTRY_PER_BLOCK)	2380	if (nm_i->nid_cnt[FREE_NID] >= NAT_ENTRY_PER_BLOCK)
2378	return 0;	2381	return 0;

fs/f2fs/segment.c+4−4

@@ -799,7 +799,7 @@ static void __locate_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno, · 798 unmodified lines
799		799
800	if (__is_large_section(sbi)) {	800	if (__is_large_section(sbi)) {
801	unsigned int secno = GET_SEC_FROM_SEG(sbi, segno);	801	unsigned int secno = GET_SEC_FROM_SEG(sbi, segno);
802	unsigned short valid_blocks =	802	block_t valid_blocks =
803	get_valid_blocks(sbi, segno, true);	803	get_valid_blocks(sbi, segno, true);
804		804
805	f2fs_bug_on(sbi, unlikely(!valid_blocks \|\|	805	f2fs_bug_on(sbi, unlikely(!valid_blocks \|\|
@@ -815,7 +815,7 @@ static void __remove_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno, · 9 unmodified lines
815	enum dirty_type dirty_type)	815	enum dirty_type dirty_type)
816	{	816	{
817	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);	817	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
818	unsigned short valid_blocks;	818	block_t valid_blocks;
819		819
820	if (test_and_clear_bit(segno, dirty_i->dirty_segmap[dirty_type]))	820	if (test_and_clear_bit(segno, dirty_i->dirty_segmap[dirty_type]))
821	dirty_i->nr_dirty[dirty_type]--;	821	dirty_i->nr_dirty[dirty_type]--;
@@ -4316,8 +4316,8 @@ static void init_dirty_segmap(struct f2fs_sb_info *sbi) · 3494 unmodified lines
4316	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);	4316	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
4317	struct free_segmap_info *free_i = FREE_I(sbi);	4317	struct free_segmap_info *free_i = FREE_I(sbi);
4318	unsigned int segno = 0, offset = 0, secno;	4318	unsigned int segno = 0, offset = 0, secno;
4319	unsigned short valid_blocks;	4319	block_t valid_blocks;
4320	unsigned short blks_per_sec = BLKS_PER_SEC(sbi);	4320	block_t blks_per_sec = BLKS_PER_SEC(sbi);
4321		4321
4322	while (1) {	4322	while (1) {
4323	/* find dirty segment based on free segmap */	4323	/* find dirty segment based on free segmap */

fs/io_uring.c+64−4

 static bool io_rw_reissue(struct io_kiocb *req, long res)
 {
 #ifdef CONFIG_BLOCK
+	umode_t mode = file_inode(req->file)->i_mode;
 	int ret;
+	if (!S_ISBLK(mode) && !S_ISREG(mode))
+		return false;
 	if ((res != -EAGAIN && res != -EOPNOTSUPP) || io_wq_current_is_worker())
 		return false;
 				   bool force_nonblock)
 {
 	struct io_async_rw *iorw = &req->io->rw;
+	struct iovec *iov;
 	ssize_t ret;
-	iorw->iter.iov = iorw->fast_iov;
+	iorw->iter.iov = iov = iorw->fast_iov;
-	ret = __io_import_iovec(rw, req, (struct iovec **) &iorw->iter.iov,
+	ret = __io_import_iovec(rw, req, &iov, &iorw->iter, !force_nonblock);
-				&iorw->iter, !force_nonblock);
 	if (unlikely(ret < 0))
 		return ret;
+	iorw->iter.iov = iov;
 	io_req_map_rw(req, iorw->iter.iov, iorw->fast_iov, &iorw->iter);
 	return 0;
 }
 		/* IOPOLL retry should happen for io-wq threads */
 		if (!force_nonblock && !(req->ctx->flags & IORING_SETUP_IOPOLL))
 			goto done;
+		/* no retry on NONBLOCK marked file */
+		if (req->file->f_flags & O_NONBLOCK)
+			goto done;
 		/* some cases will consume bytes even on error returns */
 		iov_iter_revert(iter, iov_count - iov_iter_count(iter));
 		ret = io_setup_async_rw(req, iovec, inline_vecs, iter, false);
 	 */
 	if (ret2 == -EOPNOTSUPP && (kiocb->ki_flags & IOCB_NOWAIT))
 		ret2 = -EAGAIN;
+	/* no retry on NONBLOCK marked file */
+	if (ret2 == -EAGAIN && (req->file->f_flags & O_NONBLOCK))
+		goto done;
 	if (!force_nonblock || ret2 != -EAGAIN) {
 		/* IOPOLL retry should happen for io-wq threads */
 		if ((req->ctx->flags & IORING_SETUP_IOPOLL) && ret2 == -EAGAIN)
 			goto copy_iov;
+done:
 		kiocb_done(kiocb, ret2, cs);
 	} else {
 copy_iov:
 		table = &ctx->file_data->table[i >> IORING_FILE_TABLE_SHIFT];
 		index = i & IORING_FILE_TABLE_MASK;
 		if (table->files[index]) {
-			file = io_file_from_index(ctx, index);
+			file = table->files[index];
 			err = io_queue_file_removal(data, file);
 			if (err)
 				break;
 			table->files[index] = file;
 			err = io_sqe_file_register(ctx, file, i);
 			if (err) {
+				table->files[index] = NULL;
 				fput(file);
 				break;
 			}
 	return false;
 }
+static inline bool io_match_files(struct io_kiocb *req,
+				       struct files_struct *files)
+{
+	return (req->flags & REQ_F_WORK_INITIALIZED) && req->work.files == files;
+}
+static bool io_match_link_files(struct io_kiocb *req,
+				struct files_struct *files)
+{
+	struct io_kiocb *link;
+	if (io_match_files(req, files))
+		return true;
+	if (req->flags & REQ_F_LINK_HEAD) {
+		list_for_each_entry(link, &req->link_list, link_list) {
+			if (io_match_files(link, files))
+				return true;
+		}
+	}
+	return false;
+}
 /*
  * We're looking to cancel 'req' because it's holding on to our files, but
  * 'req' could be a link to another request. See if it is, and cancel that
 	io_timeout_remove_link(ctx, req);
 }
+static void io_cancel_defer_files(struct io_ring_ctx *ctx,
+				  struct files_struct *files)
+{
+	struct io_defer_entry *de = NULL;
+	LIST_HEAD(list);
+	spin_lock_irq(&ctx->completion_lock);
+	list_for_each_entry_reverse(de, &ctx->defer_list, list) {
+		if (io_match_link_files(de->req, files)) {
+			list_cut_position(&list, &ctx->defer_list, &de->list);
+			break;
+		}
+	}
+	spin_unlock_irq(&ctx->completion_lock);
+	while (!list_empty(&list)) {
+		de = list_first_entry(&list, struct io_defer_entry, list);
+		list_del_init(&de->list);
+		req_set_fail_links(de->req);
+		io_put_req(de->req);
+		io_req_complete(de->req, -ECANCELED);
+		kfree(de);
+	}
+}
 static void io_uring_cancel_files(struct io_ring_ctx *ctx,
 				  struct files_struct *files)
 {
 	if (list_empty_careful(&ctx->inflight_list))
 		return;
+	io_cancel_defer_files(ctx, files);
 	/* cancel all at once, should be faster than doing it one by one*/
 	io_wq_cancel_cb(ctx->io_wq, io_wq_files_match, files, true);

fs/nfs/nfs4proc.c+9−2

 	/* Servers should only apply open mode checks for file size changes */
 	truncate = (arg->iap->ia_valid & ATTR_SIZE) ? true : false;
-	if (!truncate)
+	if (!truncate) {
+		nfs4_inode_make_writeable(inode);
 		goto zero_stateid;
+	}
 	if (nfs4_copy_delegation_stateid(inode, FMODE_WRITE, &arg->stateid, &delegation_cred)) {
 		/* Use that stateid */
 	err = nfs4_set_lock_state(state, fl);
 	if (err != 0)
 		return err;
-	err = _nfs4_do_setlk(state, F_SETLK, fl, NFS_LOCK_NEW);
+	do {
+		err = _nfs4_do_setlk(state, F_SETLK, fl, NFS_LOCK_NEW);
+		if (err != -NFS4ERR_DELAY)
+			break;
+		ssleep(1);
+	} while (err == -NFS4ERR_DELAY);
 	return nfs4_handle_delegation_recall_error(server, state, stateid, fl, err);
 }

fs/xfs/libxfs/xfs_attr_leaf.c+5−3

 		ASSERT(ifp->if_flags & XFS_IFINLINE);
 	}
 	xfs_idata_realloc(dp, sizeof(*hdr), XFS_ATTR_FORK);
-	hdr = (xfs_attr_sf_hdr_t *)ifp->if_u1.if_data;
+	hdr = (struct xfs_attr_sf_hdr *)ifp->if_u1.if_data;
-	hdr->count = 0;
+	memset(hdr, 0, sizeof(*hdr));
 	hdr->totsize = cpu_to_be16(sizeof(*hdr));
 	xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE | XFS_ILOG_ADATA);
 }
 		 * struct xfs_attr_sf_entry has a variable length.
 		 * Check the fixed-offset parts of the structure are
 		 * within the data buffer.
+		 * xfs_attr_sf_entry is defined with a 1-byte variable
+		 * array at the end, so we must subtract that off.
 		 */
-		if (((char *)sfep + sizeof(*sfep)) >= endp)
+		if (((char *)sfep + sizeof(*sfep) - 1) >= endp)
 			return __this_address;
 		/* Don't allow names with known bad length. */

fs/xfs/libxfs/xfs_bmap.c+1−1

@@ -6226,7 +6226,7 @@ xfs_bmap_validate_extent( · 6225 unmodified lines
6226		6226
6227	isrt = XFS_IS_REALTIME_INODE(ip);	6227	isrt = XFS_IS_REALTIME_INODE(ip);
6228	endfsb = irec->br_startblock + irec->br_blockcount - 1;	6228	endfsb = irec->br_startblock + irec->br_blockcount - 1;
6229	if (isrt) {	6229	if (isrt && whichfork == XFS_DATA_FORK) {
6230	if (!xfs_verify_rtbno(mp, irec->br_startblock))	6230	if (!xfs_verify_rtbno(mp, irec->br_startblock))
6231	return __this_address;	6231	return __this_address;
6232	if (!xfs_verify_rtbno(mp, endfsb))	6232	if (!xfs_verify_rtbno(mp, endfsb))

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

@@ -688,7 +688,7 @@ xfs_ialloc_ag_alloc( · 687 unmodified lines
688	args.minalignslop = igeo->cluster_align - 1;	688	args.minalignslop = igeo->cluster_align - 1;
689		689
690	/* Allow space for the inode btree to split. */	690	/* Allow space for the inode btree to split. */
691	args.minleft = igeo->inobt_maxlevels - 1;	691	args.minleft = igeo->inobt_maxlevels;
692	if ((error = xfs_alloc_vextent(&args)))	692	if ((error = xfs_alloc_vextent(&args)))
693	return error;	693	return error;
694		694
@@ -736,7 +736,7 @@ xfs_ialloc_ag_alloc( · 41 unmodified lines
736	/*	736	/*
737	* Allow space for the inode btree to split.	737	* Allow space for the inode btree to split.
738	*/	738	*/
739	args.minleft = igeo->inobt_maxlevels - 1;	739	args.minleft = igeo->inobt_maxlevels;
740	if ((error = xfs_alloc_vextent(&args)))	740	if ((error = xfs_alloc_vextent(&args)))
741	return error;	741	return error;
742	}	742	}

fs/xfs/libxfs/xfs_trans_space.h+1−1

@@ -58,7 +58,7 @@ · 57 unmodified lines
58	#define XFS_IALLOC_SPACE_RES(mp) \	58	#define XFS_IALLOC_SPACE_RES(mp) \
59	(M_IGEO(mp)->ialloc_blks + \	59	(M_IGEO(mp)->ialloc_blks + \
60	((xfs_sb_version_hasfinobt(&mp->m_sb) ? 2 : 1) * \	60	((xfs_sb_version_hasfinobt(&mp->m_sb) ? 2 : 1) * \
61	(M_IGEO(mp)->inobt_maxlevels - 1)))	61	M_IGEO(mp)->inobt_maxlevels))
62		62
63	/*	63	/*
64	* Space reservation values for various transactions.	64	* Space reservation values for various transactions.

fs/xfs/xfs_bmap_util.c+1−1

@@ -1165,7 +1165,7 @@ xfs_insert_file_space( · 1164 unmodified lines
1165	goto out_trans_cancel;	1165	goto out_trans_cancel;
1166		1166
1167	do {	1167	do {
1168	error = xfs_trans_roll_inode(&tp, ip);	1168	error = xfs_defer_finish(&tp);
1169	if (error)	1169	if (error)
1170	goto out_trans_cancel;	1170	goto out_trans_cancel;
1171		1171

fs/xfs/xfs_file.c+10−2

 	return ret;
 }
+static inline bool
+xfs_is_write_fault(
+	struct vm_fault		*vmf)
+{
+	return (vmf->flags & FAULT_FLAG_WRITE) &&
+	       (vmf->vma->vm_flags & VM_SHARED);
+}
 static vm_fault_t
 xfs_filemap_fault(
 	struct vm_fault		*vmf)
 	/* DAX can shortcut the normal fault path on write faults! */
 	return __xfs_filemap_fault(vmf, PE_SIZE_PTE,
 			IS_DAX(file_inode(vmf->vma->vm_file)) &&
-			(vmf->flags & FAULT_FLAG_WRITE));
+			xfs_is_write_fault(vmf));
 }
 static vm_fault_t
 	/* DAX can shortcut the normal fault path on write faults! */
 	return __xfs_filemap_fault(vmf, pe_size,
-			(vmf->flags & FAULT_FLAG_WRITE));
+			xfs_is_write_fault(vmf));
 }
 static vm_fault_t

include/drm/drm_hdcp.h+3−0

@@ -29,6 +29,9 @@ · 28 unmodified lines
29	/* Slave address for the HDCP registers in the receiver */	29	/* Slave address for the HDCP registers in the receiver */
30	#define DRM_HDCP_DDC_ADDR 0x3A	30	#define DRM_HDCP_DDC_ADDR 0x3A
31		31
		32	/* Value to use at the end of the SHA-1 bytestream used for repeaters */
		33	#define DRM_HDCP_SHA1_TERMINATOR 0x80
		34
32	/* HDCP register offsets for HDMI/DVI devices */	35	/* HDCP register offsets for HDMI/DVI devices */
33	#define DRM_HDCP_DDC_BKSV 0x00	36	#define DRM_HDCP_DDC_BKSV 0x00
34	#define DRM_HDCP_DDC_RI_PRIME 0x08	37	#define DRM_HDCP_DDC_RI_PRIME 0x08

include/linux/bvec.h+8−1

 	return true;
 }
+static inline void bvec_iter_skip_zero_bvec(struct bvec_iter *iter)
+{
+	iter->bi_bvec_done = 0;
+	iter->bi_idx++;
+}
 #define for_each_bvec(bvl, bio_vec, iter, start)			\
 	for (iter = (start);						\
 	     (iter).bi_size &&						\
 		((bvl = bvec_iter_bvec((bio_vec), (iter))), 1);	\
-	     bvec_iter_advance((bio_vec), &(iter), (bvl).bv_len))
+	     (bvl).bv_len ? (void)bvec_iter_advance((bio_vec), &(iter),	\
+		     (bvl).bv_len) : bvec_iter_skip_zero_bvec(&(iter)))
 /* for iterating one bio from start to end */
 #define BVEC_ITER_ALL_INIT (struct bvec_iter)				\

include/linux/compiler_attributes.h+1−7

 /*
  * __has_attribute is supported on gcc >= 5, clang >= 2.9 and icc >= 17.
- * In the meantime, to support 4.6 <= gcc < 5, we implement __has_attribute
+ * In the meantime, to support gcc < 5, we implement __has_attribute
  * by hand.
- *
- * sparse does not support __has_attribute (yet) and defines __GNUC_MINOR__
- * depending on the compiler used to build it; however, these attributes have
- * no semantic effects for sparse, so it does not matter. Also note that,
- * in order to avoid sparse's warnings, even the unsupported ones must be
- * defined to 0.
  */
 #ifndef __has_attribute
 # define __has_attribute(x) __GCC4_has_attribute_##x

include/linux/compiler_types.h+2−2

@@ -11,8 +11,8 @@ · 10 unmodified lines
11	# define __iomem __attribute__((noderef, address_space(__iomem)))	11	# define __iomem __attribute__((noderef, address_space(__iomem)))
12	# define __percpu __attribute__((noderef, address_space(__percpu)))	12	# define __percpu __attribute__((noderef, address_space(__percpu)))
13	# define __rcu __attribute__((noderef, address_space(__rcu)))	13	# define __rcu __attribute__((noderef, address_space(__rcu)))
14	extern void __chk_user_ptr(const volatile void __user *);	14	static inline void __chk_user_ptr(const volatile void __user *ptr) { }
15	extern void __chk_io_ptr(const volatile void __iomem *);	15	static inline void __chk_io_ptr(const volatile void __iomem *ptr) { }
16	/* context/locking */	16	/* context/locking */
17	# define __must_hold(x) __attribute__((context(x,1,1)))	17	# define __must_hold(x) __attribute__((context(x,1,1)))
18	# define __acquires(x) __attribute__((context(x,0,1)))	18	# define __acquires(x) __attribute__((context(x,0,1)))

include/linux/device.h+1−0

@@ -454,6 +454,7 @@ struct dev_links_info { · 453 unmodified lines
454	* @pm_domain: Provide callbacks that are executed during system suspend,	454	* @pm_domain: Provide callbacks that are executed during system suspend,
455	* hibernation, system resume and during runtime PM transitions	455	* hibernation, system resume and during runtime PM transitions
456	* along with subsystem-level and driver-level callbacks.	456	* along with subsystem-level and driver-level callbacks.
		457	* @em_pd: device's energy model performance domain
457	* @pins: For device pin management.	458	* @pins: For device pin management.
458	* See Documentation/driver-api/pinctl.rst for details.	459	* See Documentation/driver-api/pinctl.rst for details.
459	* @msi_list: Hosts MSI descriptors	460	* @msi_list: Hosts MSI descriptors

include/linux/dynamic_debug.h+16−4

@@ -49,6 +49,10 @@ struct _ddebug { · 48 unmodified lines
49		49
50		50
51	#if defined(CONFIG_DYNAMIC_DEBUG_CORE)	51	#if defined(CONFIG_DYNAMIC_DEBUG_CORE)
		52
		53	/* exported for module authors to exercise >control */
		54	int dynamic_debug_exec_queries(const char query, const char modname);
		55
52	int ddebug_add_module(struct _ddebug *tab, unsigned int n,	56	int ddebug_add_module(struct _ddebug *tab, unsigned int n,
53	const char *modname);	57	const char *modname);
54	extern int ddebug_remove_module(const char *mod_name);	58	extern int ddebug_remove_module(const char *mod_name);
@@ -105,7 +109,7 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, · 50 unmodified lines
105	static_branch_unlikely(&descriptor.key.dd_key_false)	109	static_branch_unlikely(&descriptor.key.dd_key_false)
106	#endif	110	#endif
107		111
108	#else /* !HAVE_JUMP_LABEL */	112	#else /* !CONFIG_JUMP_LABEL */
109		113
110	#define _DPRINTK_KEY_INIT	114	#define _DPRINTK_KEY_INIT
111		115
@@ -117,7 +121,7 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, · 5 unmodified lines
117	unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT)	121	unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT)
118	#endif	122	#endif
119		123
120	#endif	124	#endif /* CONFIG_JUMP_LABEL */
121		125
122	#define __dynamic_func_call(id, fmt, func, ...) do { \	126	#define __dynamic_func_call(id, fmt, func, ...) do { \
123	DEFINE_DYNAMIC_DEBUG_METADATA(id, fmt); \	127	DEFINE_DYNAMIC_DEBUG_METADATA(id, fmt); \
@@ -172,10 +176,11 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, · 48 unmodified lines
172	KERN_DEBUG, prefix_str, prefix_type, \	176	KERN_DEBUG, prefix_str, prefix_type, \
173	rowsize, groupsize, buf, len, ascii)	177	rowsize, groupsize, buf, len, ascii)
174		178
175	#else	179	#else /* !CONFIG_DYNAMIC_DEBUG_CORE */
176		180
177	#include <linux/string.h>	181	#include <linux/string.h>
178	#include <linux/errno.h>	182	#include <linux/errno.h>
		183	#include <linux/printk.h>
179		184
180	static inline int ddebug_add_module(struct _ddebug *tab, unsigned int n,	185	static inline int ddebug_add_module(struct _ddebug *tab, unsigned int n,
181	const char *modname)	186	const char *modname)
@@ -210,6 +215,13 @@ static inline int ddebug_dyndbg_module_param_cb(char param, char val, · 28 unmodified lines
210	print_hex_dump(KERN_DEBUG, prefix_str, prefix_type, \	215	print_hex_dump(KERN_DEBUG, prefix_str, prefix_type, \
211	rowsize, groupsize, buf, len, ascii); \	216	rowsize, groupsize, buf, len, ascii); \
212	} while (0)	217	} while (0)
213	#endif	218
		219	static inline int dynamic_debug_exec_queries(const char query, const char modname)
		220	{
		221	pr_warn("kernel not built with CONFIG_DYNAMIC_DEBUG_CORE\n");
		222	return 0;
		223	}
		224
		225	#endif /* !CONFIG_DYNAMIC_DEBUG_CORE */
214		226
215	#endif	227	#endif

include/linux/efi_embedded_fw.h+2−4

 #define EFI_EMBEDDED_FW_PREFIX_LEN		8
 /*
- * This struct and efi_embedded_fw_list are private to the efi-embedded fw
+ * This struct is private to the efi-embedded fw implementation.
- * implementation they are in this header for use by lib/test_firmware.c only!
+ * They are in this header for use by lib/test_firmware.c only!
  */
 struct efi_embedded_fw {
 	struct list_head list;
 	size_t length;
 };
-extern struct list_head efi_embedded_fw_list;
 /**
  * struct efi_embedded_fw_desc - This struct is used by the EFI embedded-fw
  *                               code to search for embedded firmwares.

include/linux/entry-common.h+42−9

@@ -110,15 +110,30 @@ static inline __must_check int arch_syscall_enter_tracehook(struct pt_regs *regs · 109 unmodified lines
110	#endif	110	#endif
111		111
112	/**	112	/**
113	* syscall_enter_from_user_mode - Check and handle work before invoking	113	* syscall_enter_from_user_mode_prepare - Establish state and enable interrupts
114	* a syscall
115	* @regs: Pointer to currents pt_regs	114	* @regs: Pointer to currents pt_regs
116	* @syscall: The syscall number
117	*	115	*
118	* Invoked from architecture specific syscall entry code with interrupts	116	* Invoked from architecture specific syscall entry code with interrupts
119	* disabled. The calling code has to be non-instrumentable. When the	117	* disabled. The calling code has to be non-instrumentable. When the
120	* function returns all state is correct and the subsequent functions can be	118	* function returns all state is correct, interrupts are enabled and the
121	* instrumented.	119	* subsequent functions can be instrumented.
		120	*
		121	* This handles lockdep, RCU (context tracking) and tracing state.
		122	*
		123	* This is invoked when there is extra architecture specific functionality
		124	* to be done between establishing state and handling user mode entry work.
		125	*/
		126	void syscall_enter_from_user_mode_prepare(struct pt_regs *regs);
		127
		128	/**
		129	* syscall_enter_from_user_mode_work - Check and handle work before invoking
		130	* a syscall
		131	* @regs: Pointer to currents pt_regs
		132	* @syscall: The syscall number
		133	*
		134	* Invoked from architecture specific syscall entry code with interrupts
		135	* enabled after invoking syscall_enter_from_user_mode_prepare() and extra
		136	* architecture specific work.
122	*	137	*
123	* Returns: The original or a modified syscall number	138	* Returns: The original or a modified syscall number
124	*	139	*
@@ -127,12 +142,30 @@ static inline __must_check int arch_syscall_enter_tracehook(struct pt_regs *regs · 2 unmodified lines
127	* syscall_set_return_value() first. If neither of those are called and -1	142	* syscall_set_return_value() first. If neither of those are called and -1
128	* is returned, then the syscall will fail with ENOSYS.	143	* is returned, then the syscall will fail with ENOSYS.
129	*	144	*
130	* The following functionality is handled here:	145	* It handles the following work items:
131	*	146	*
132	* 1) Establish state (lockdep, RCU (context tracking), tracing)	147	* 1) TIF flag dependent invocations of arch_syscall_enter_tracehook(),
133	* 2) TIF flag dependent invocations of arch_syscall_enter_tracehook(),
134	* __secure_computing(), trace_sys_enter()	148	* __secure_computing(), trace_sys_enter()
135	* 3) Invocation of audit_syscall_entry()	149	* 2) Invocation of audit_syscall_entry()
		150	*/
		151	long syscall_enter_from_user_mode_work(struct pt_regs *regs, long syscall);
		152
		153	/**
		154	* syscall_enter_from_user_mode - Establish state and check and handle work
		155	* before invoking a syscall
		156	* @regs: Pointer to currents pt_regs
		157	* @syscall: The syscall number
		158	*
		159	* Invoked from architecture specific syscall entry code with interrupts
		160	* disabled. The calling code has to be non-instrumentable. When the
		161	* function returns all state is correct, interrupts are enabled and the
		162	* subsequent functions can be instrumented.
		163	*
		164	* This is combination of syscall_enter_from_user_mode_prepare() and
		165	* syscall_enter_from_user_mode_work().
		166	*
		167	* Returns: The original or a modified syscall number. See
		168	* syscall_enter_from_user_mode_work() for further explanation.
136	*/	169	*/
137	long syscall_enter_from_user_mode(struct pt_regs *regs, long syscall);	170	long syscall_enter_from_user_mode(struct pt_regs *regs, long syscall);
138		171

include/linux/hid.h+29−13

@@ -959,34 +959,49 @@ static inline void hid_device_io_stop(struct hid_device *hid) { · 958 unmodified lines
959	* @max: maximal valid usage->code to consider later (out parameter)	959	* @max: maximal valid usage->code to consider later (out parameter)
960	* @type: input event type (EV_KEY, EV_REL, ...)	960	* @type: input event type (EV_KEY, EV_REL, ...)
961	* @c: code which corresponds to this usage and type	961	* @c: code which corresponds to this usage and type
		962	*
		963	* The value pointed to by @bit will be set to NULL if either @type is
		964	* an unhandled event type, or if @c is out of range for @type. This
		965	* can be used as an error condition.
962	*/	966	*/
963	static inline void hid_map_usage(struct hid_input *hidinput,	967	static inline void hid_map_usage(struct hid_input *hidinput,
964	struct hid_usage usage, unsigned long bit, int max,	968	struct hid_usage usage, unsigned long bit, int max,
965	__u8 type, __u16 c)	969	__u8 type, unsigned int c)
966	{	970	{
967	struct input_dev *input = hidinput->input;	971	struct input_dev *input = hidinput->input;
968		972	unsigned long *bmap = NULL;
969	usage->type = type;	973	unsigned int limit = 0;
970	usage->code = c;
971		974
972	switch (type) {	975	switch (type) {
973	case EV_ABS:	976	case EV_ABS:
974	*bit = input->absbit;	977	bmap = input->absbit;
975	*max = ABS_MAX;	978	limit = ABS_MAX;
976	break;	979	break;
977	case EV_REL:	980	case EV_REL:
978	*bit = input->relbit;	981	bmap = input->relbit;
979	*max = REL_MAX;	982	limit = REL_MAX;
980	break;	983	break;
981	case EV_KEY:	984	case EV_KEY:
982	*bit = input->keybit;	985	bmap = input->keybit;
983	*max = KEY_MAX;	986	limit = KEY_MAX;
984	break;	987	break;
985	case EV_LED:	988	case EV_LED:
986	*bit = input->ledbit;	989	bmap = input->ledbit;
987	*max = LED_MAX;	990	limit = LED_MAX;
988	break;	991	break;
989	}	992	}
		993
		994	if (unlikely(c > limit \|\| !bmap)) {
		995	pr_warn_ratelimited("%s: Invalid code %d type %d\n",
		996	input->name, c, type);
		997	*bit = NULL;
		998	return;
		999	}
		1000
		1001	usage->type = type;
		1002	usage->code = c;
		1003	*max = limit;
		1004	*bit = bmap;
990	}	1005	}
991		1006
992	/**	1007	/**
@@ -1000,7 +1015,8 @@ static inline void hid_map_usage_clear(struct hid_input *hidinput, · 7 unmodified lines
1000	__u8 type, __u16 c)	1015	__u8 type, __u16 c)
1001	{	1016	{
1002	hid_map_usage(hidinput, usage, bit, max, type, c);	1017	hid_map_usage(hidinput, usage, bit, max, type, c);
1003	clear_bit(c, *bit);	1018	if (*bit)
		1019	clear_bit(usage->code, *bit);
1004	}	1020	}
1005		1021
1006	/**	1022	/**

include/linux/i2c-algo-pca.h+15−0

@@ -53,6 +53,20 @@ · 52 unmodified lines
53	#define I2C_PCA_CON_SI 0x08 /* Serial Interrupt */	53	#define I2C_PCA_CON_SI 0x08 /* Serial Interrupt */
54	#define I2C_PCA_CON_CR 0x07 /* Clock Rate (MASK) */	54	#define I2C_PCA_CON_CR 0x07 /* Clock Rate (MASK) */
55		55
		56	/**
		57	* struct pca_i2c_bus_settings - The configured PCA i2c bus settings
		58	* @mode: Configured i2c bus mode
		59	* @tlow: Configured SCL LOW period
		60	* @thi: Configured SCL HIGH period
		61	* @clock_freq: The configured clock frequency
		62	*/
		63	struct pca_i2c_bus_settings {
		64	int mode;
		65	int tlow;
		66	int thi;
		67	int clock_freq;
		68	};
		69
56	struct i2c_algo_pca_data {	70	struct i2c_algo_pca_data {
57	void data; / private low level data */	71	void data; / private low level data */
58	void (write_byte) (void data, int reg, int val);	72	void (write_byte) (void data, int reg, int val);
@@ -64,6 +78,7 @@ struct i2c_algo_pca_data { · 5 unmodified lines
64	* For PCA9665, use the frequency you want here. */	78	* For PCA9665, use the frequency you want here. */
65	unsigned int i2c_clock;	79	unsigned int i2c_clock;
66	unsigned int chip;	80	unsigned int chip;
		81	struct pca_i2c_bus_settings bus_settings;
67	};	82	};
68		83
69	int i2c_pca_add_bus(struct i2c_adapter *);	84	int i2c_pca_add_bus(struct i2c_adapter *);

include/linux/ksm.h+0−7

 void rmap_walk_ksm(struct page *page, struct rmap_walk_control *rwc);
 void ksm_migrate_page(struct page *newpage, struct page *oldpage);
-bool reuse_ksm_page(struct page *page,
-			struct vm_area_struct *vma, unsigned long address);
 #else  /* !CONFIG_KSM */
 static inline void ksm_migrate_page(struct page *newpage, struct page *oldpage)
 {
 }
-static inline bool reuse_ksm_page(struct page *page,
-			struct vm_area_struct *vma, unsigned long address)
-{
-	return false;
-}
 #endif /* CONFIG_MMU */
 #endif /* !CONFIG_KSM */

include/linux/kvm_host.h+26−5

 int kvm_gfn_to_hva_cache_init(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
 			      gpa_t gpa, unsigned long len);
-#define __kvm_put_guest(kvm, gfn, offset, value, type)			\
+#define __kvm_get_guest(kvm, gfn, offset, v)				\
 ({									\
 	unsigned long __addr = gfn_to_hva(kvm, gfn);			\
-	type __user *__uaddr = (type __user *)(__addr + offset);	\
+	typeof(v) __user *__uaddr = (typeof(__uaddr))(__addr + offset);	\
 	int __ret = -EFAULT;						\
 									\
 	if (!kvm_is_error_hva(__addr))					\
-		__ret = put_user(value, __uaddr);			\
+		__ret = get_user(v, __uaddr);				\
+	__ret;								\
+})
+#define kvm_get_guest(kvm, gpa, v)					\
+({									\
+	gpa_t __gpa = gpa;						\
+	struct kvm *__kvm = kvm;					\
+									\
+	__kvm_get_guest(__kvm, __gpa >> PAGE_SHIFT,			\
+			offset_in_page(__gpa), v);			\
+})
+#define __kvm_put_guest(kvm, gfn, offset, v)				\
+({									\
+	unsigned long __addr = gfn_to_hva(kvm, gfn);			\
+	typeof(v) __user *__uaddr = (typeof(__uaddr))(__addr + offset);	\
+	int __ret = -EFAULT;						\
+									\
+	if (!kvm_is_error_hva(__addr))					\
+		__ret = put_user(v, __uaddr);				\
 	if (!__ret)							\
 		mark_page_dirty(kvm, gfn);				\
 	__ret;								\
 })
-#define kvm_put_guest(kvm, gpa, value, type)				\
+#define kvm_put_guest(kvm, gpa, v)					\
 ({									\
 	gpa_t __gpa = gpa;						\
 	struct kvm *__kvm = kvm;					\
+									\
 	__kvm_put_guest(__kvm, __gpa >> PAGE_SHIFT,			\
-			offset_in_page(__gpa), (value), type);		\
+			offset_in_page(__gpa), v);			\
 })
 int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len);

include/linux/libata.h+1−0

@@ -421,6 +421,7 @@ enum { · 420 unmodified lines
421	ATA_HORKAGE_NO_DMA_LOG = (1 << 23), /* don't use DMA for log read */	421	ATA_HORKAGE_NO_DMA_LOG = (1 << 23), /* don't use DMA for log read */
422	ATA_HORKAGE_NOTRIM = (1 << 24), /* don't use TRIM */	422	ATA_HORKAGE_NOTRIM = (1 << 24), /* don't use TRIM */
423	ATA_HORKAGE_MAX_SEC_1024 = (1 << 25), /* Limit max sects to 1024 */	423	ATA_HORKAGE_MAX_SEC_1024 = (1 << 25), /* Limit max sects to 1024 */
		424	ATA_HORKAGE_MAX_TRIM_128M = (1 << 26), /* Limit max trim size to 128M */
424		425
425	/* DMA mask for user DMA control: User visible values; DO NOT	426	/* DMA mask for user DMA control: User visible values; DO NOT
426	renumber */	427	renumber */

include/linux/log2.h+1−1

@@ -173,7 +173,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n) · 172 unmodified lines
173	#define roundup_pow_of_two(n) \	173	#define roundup_pow_of_two(n) \
174	( \	174	( \
175	__builtin_constant_p(n) ? ( \	175	__builtin_constant_p(n) ? ( \
176	(n == 1) ? 1 : \	176	((n) == 1) ? 1 : \
177	(1UL << (ilog2((n) - 1) + 1)) \	177	(1UL << (ilog2((n) - 1) + 1)) \
178	) : \	178	) : \
179	__roundup_pow_of_two(n) \	179	__roundup_pow_of_two(n) \

include/linux/memremap.h+4−5

  * wakeup is used to coordinate physical address space management (ex:
  * fs truncate/hole punch) vs pinned pages (ex: device dma).
  *
- * MEMORY_DEVICE_DEVDAX:
+ * MEMORY_DEVICE_GENERIC:
  * Host memory that has similar access semantics as System RAM i.e. DMA
- * coherent and supports page pinning. In contrast to
+ * coherent and supports page pinning. This is for example used by DAX devices
- * MEMORY_DEVICE_FS_DAX, this memory is access via a device-dax
+ * that expose memory using a character device.
- * character device.
  *
  * MEMORY_DEVICE_PCI_P2PDMA:
  * Device memory residing in a PCI BAR intended for use with Peer-to-Peer
 	/* 0 is reserved to catch uninitialized type fields */
 	MEMORY_DEVICE_PRIVATE = 1,
 	MEMORY_DEVICE_FS_DAX,
-	MEMORY_DEVICE_DEVDAX,
+	MEMORY_DEVICE_GENERIC,
 	MEMORY_DEVICE_PCI_P2PDMA,
 };

include/linux/netfilter/nf_conntrack_sctp.h+2−0

@@ -9,6 +9,8 @@ struct ip_ct_sctp { · 8 unmodified lines
9	enum sctp_conntrack state;	9	enum sctp_conntrack state;
10		10
11	__be32 vtag[IP_CT_DIR_MAX];	11	__be32 vtag[IP_CT_DIR_MAX];
		12	u8 last_dir;
		13	u8 flags;
12	};	14	};
13		15
14	#endif /* _NF_CONNTRACK_SCTP_H */	16	#endif /* _NF_CONNTRACK_SCTP_H */

include/linux/netfilter/nfnetlink.h+1−2

@@ -43,8 +43,7 @@ int nfnetlink_has_listeners(struct net *net, unsigned int group); · 42 unmodified lines
43	int nfnetlink_send(struct sk_buff skb, struct net net, u32 portid,	43	int nfnetlink_send(struct sk_buff skb, struct net net, u32 portid,
44	unsigned int group, int echo, gfp_t flags);	44	unsigned int group, int echo, gfp_t flags);
45	int nfnetlink_set_err(struct net *net, u32 portid, u32 group, int error);	45	int nfnetlink_set_err(struct net *net, u32 portid, u32 group, int error);
46	int nfnetlink_unicast(struct sk_buff skb, struct net net, u32 portid,	46	int nfnetlink_unicast(struct sk_buff skb, struct net net, u32 portid);
47	int flags);
48		47
49	static inline u16 nfnl_msg_type(u8 subsys, u8 msg_type)	48	static inline u16 nfnl_msg_type(u8 subsys, u8 msg_type)
50	{	49	{

include/linux/powercap.h+5−6

 };
 /**
- * struct powercap_control_type- Defines a powercap control_type
+ * struct powercap_control_type - Defines a powercap control_type
- * @name:		name of control_type
  * @dev:		device for this control_type
  * @idr:		idr to have unique id for its child
- * @root_node:		Root holding power zones for this control_type
+ * @nr_zones:		counter for number of zones of this type
  * @ops:		Pointer to callback struct
- * @node_lock:		mutex for control type
+ * @lock:		mutex for control type
  * @allocated:		This is possible that client owns the memory
  *			used by this structure. In this case
  *			this flag is set to false by framework to
  *			prevent deallocation during release process.
  *			Otherwise this flag is set to true.
- * @ctrl_inst:		link to the control_type list
+ * @node:		linked-list node
  *
  * Defines powercap control_type. This acts as a container for power
  * zones, which use same method to control power. E.g. RAPL, RAPL-PCI etc.
  *			this flag is set to false by framework to
  *			prevent deallocation during release process.
  *			Otherwise this flag is set to true.
- * @constraint_ptr:	List of constraints for this zone.
+ * @constraints:	List of constraints for this zone.
  *
  * This defines a power zone instance. The fields of this structure are
  * private, and should not be used by client drivers.

include/linux/skbuff.h+11−2

  *	NETIF_F_IPV6_CSUM - Driver (device) is only able to checksum plain
  *			  TCP or UDP packets over IPv6. These are specifically
  *			  unencapsulated packets of the form IPv6|TCP or
- *			  IPv4|UDP where the Next Header field in the IPv6
+ *			  IPv6|UDP where the Next Header field in the IPv6
  *			  header is either TCP or UDP. IPv6 extension headers
  *			  are not supported with this feature. This feature
  *			  cannot be set in features for a device with
 void kfree_skb_list(struct sk_buff *segs);
 void skb_dump(const char *level, const struct sk_buff *skb, bool full_pkt);
 void skb_tx_error(struct sk_buff *skb);
+#ifdef CONFIG_TRACEPOINTS
 void consume_skb(struct sk_buff *skb);
+#else
+static inline void consume_skb(struct sk_buff *skb)
+{
+	return kfree_skb(skb);
+}
+#endif
 void __consume_stateless_skb(struct sk_buff *skb);
 void  __kfree_skb(struct sk_buff *skb);
 extern struct kmem_cache *skbuff_head_cache;
  *
  * Using max(32, L1_CACHE_BYTES) makes sense (especially with RPS)
  * to reduce average number of cache lines per packet.
- * get_rps_cpus() for example only access one 64 bytes aligned block :
+ * get_rps_cpu() for example only access one 64 bytes aligned block :
  * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
  */
 #ifndef NET_SKB_PAD

include/linux/vm_event_item.h+1−0

@@ -30,6 +30,7 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, · 29 unmodified lines
30	PGFAULT, PGMAJFAULT,	30	PGFAULT, PGMAJFAULT,
31	PGLAZYFREED,	31	PGLAZYFREED,
32	PGREFILL,	32	PGREFILL,
		33	PGREUSE,
33	PGSTEAL_KSWAPD,	34	PGSTEAL_KSWAPD,
34	PGSTEAL_DIRECT,	35	PGSTEAL_DIRECT,
35	PGSCAN_KSWAPD,	36	PGSCAN_KSWAPD,

include/net/af_rxrpc.h+1−1

@@ -59,7 +59,7 @@ bool rxrpc_kernel_abort_call(struct socket , struct rxrpc_call , · 58 unmodified lines
59	void rxrpc_kernel_end_call(struct socket , struct rxrpc_call );	59	void rxrpc_kernel_end_call(struct socket , struct rxrpc_call );
60	void rxrpc_kernel_get_peer(struct socket , struct rxrpc_call ,	60	void rxrpc_kernel_get_peer(struct socket , struct rxrpc_call ,
61	struct sockaddr_rxrpc *);	61	struct sockaddr_rxrpc *);
62	u32 rxrpc_kernel_get_srtt(struct socket , struct rxrpc_call );	62	bool rxrpc_kernel_get_srtt(struct socket , struct rxrpc_call , u32 *);
63	int rxrpc_kernel_charge_accept(struct socket *, rxrpc_notify_rx_t,	63	int rxrpc_kernel_charge_accept(struct socket *, rxrpc_notify_rx_t,
64	rxrpc_user_attach_call_t, unsigned long, gfp_t,	64	rxrpc_user_attach_call_t, unsigned long, gfp_t,
65	unsigned int);	65	unsigned int);

include/net/ndisc.h+1−1

@@ -494,7 +494,7 @@ int igmp6_event_report(struct sk_buff *skb); · 493 unmodified lines
494		494
495	#ifdef CONFIG_SYSCTL	495	#ifdef CONFIG_SYSCTL
496	int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write,	496	int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write,
497	void __user buffer, size_t lenp, loff_t *ppos);	497	void buffer, size_t lenp, loff_t *ppos);
498	int ndisc_ifinfo_sysctl_strategy(struct ctl_table *ctl,	498	int ndisc_ifinfo_sysctl_strategy(struct ctl_table *ctl,
499	void __user oldval, size_t __user oldlenp,	499	void __user oldval, size_t __user oldlenp,
500	void __user *newval, size_t newlen);	500	void __user *newval, size_t newlen);

include/net/netfilter/nf_tables.h+2−0

@@ -143,6 +143,8 @@ static inline u64 nft_reg_load64(const u32 *sreg) · 142 unmodified lines
143	static inline void nft_data_copy(u32 dst, const struct nft_data src,	143	static inline void nft_data_copy(u32 dst, const struct nft_data src,
144	unsigned int len)	144	unsigned int len)
145	{	145	{
		146	if (len % NFT_REG32_SIZE)
		147	dst[len / NFT_REG32_SIZE] = 0;
146	memcpy(dst, src, len);	148	memcpy(dst, src, len);
147	}	149	}
148		150

include/soc/nps/common.h+6−0

 #define CTOP_INST_MOV2B_FLIP_R3_B1_B2_INST	0x5B60
 #define CTOP_INST_MOV2B_FLIP_R3_B1_B2_LIMM	0x00010422
+#ifndef AUX_IENABLE
+#define AUX_IENABLE				0x40c
+#endif
+#define CTOP_AUX_IACK				(0xFFFFF800 + 0x088)
 #ifndef __ASSEMBLY__
 /* In order to increase compilation test coverage */

include/trace/events/rxrpc.h+22−5

 };
 enum rxrpc_rtt_tx_trace {
+	rxrpc_rtt_tx_cancel,
 	rxrpc_rtt_tx_data,
+	rxrpc_rtt_tx_no_slot,
 	rxrpc_rtt_tx_ping,
 };
 enum rxrpc_rtt_rx_trace {
+	rxrpc_rtt_rx_cancel,
+	rxrpc_rtt_rx_lost,
+	rxrpc_rtt_rx_obsolete,
 	rxrpc_rtt_rx_ping_response,
 	rxrpc_rtt_rx_requested_ack,
 };
 	E_(rxrpc_recvmsg_wait,			"WAIT")
 #define rxrpc_rtt_tx_traces \
+	EM(rxrpc_rtt_tx_cancel,			"CNCE") \
 	EM(rxrpc_rtt_tx_data,			"DATA") \
+	EM(rxrpc_rtt_tx_no_slot,		"FULL") \
 	E_(rxrpc_rtt_tx_ping,			"PING")
 #define rxrpc_rtt_rx_traces \
+	EM(rxrpc_rtt_rx_cancel,			"CNCL") \
+	EM(rxrpc_rtt_rx_obsolete,		"OBSL") \
+	EM(rxrpc_rtt_rx_lost,			"LOST") \
 	EM(rxrpc_rtt_rx_ping_response,		"PONG") \
 	E_(rxrpc_rtt_rx_requested_ack,		"RACK")
 TRACE_EVENT(rxrpc_rtt_tx,
 	    TP_PROTO(struct rxrpc_call *call, enum rxrpc_rtt_tx_trace why,
-		     rxrpc_serial_t send_serial),
+		     int slot, rxrpc_serial_t send_serial),
-	    TP_ARGS(call, why, send_serial),
+	    TP_ARGS(call, why, slot, send_serial),
 	    TP_STRUCT__entry(
 		    __field(unsigned int,		call		)
 		    __field(enum rxrpc_rtt_tx_trace,	why		)
+		    __field(int,			slot		)
 		    __field(rxrpc_serial_t,		send_serial	)
 			     ),
 	    TP_fast_assign(
 		    __entry->call = call->debug_id;
 		    __entry->why = why;
+		    __entry->slot = slot;
 		    __entry->send_serial = send_serial;
 			   ),
-	    TP_printk("c=%08x %s sr=%08x",
+	    TP_printk("c=%08x [%d] %s sr=%08x",
 		      __entry->call,
+		      __entry->slot,
 		      __print_symbolic(__entry->why, rxrpc_rtt_tx_traces),
 		      __entry->send_serial)
 	    );
 TRACE_EVENT(rxrpc_rtt_rx,
 	    TP_PROTO(struct rxrpc_call *call, enum rxrpc_rtt_rx_trace why,
+		     int slot,
 		     rxrpc_serial_t send_serial, rxrpc_serial_t resp_serial,
 		     u32 rtt, u32 rto),
-	    TP_ARGS(call, why, send_serial, resp_serial, rtt, rto),
+	    TP_ARGS(call, why, slot, send_serial, resp_serial, rtt, rto),
 	    TP_STRUCT__entry(
 		    __field(unsigned int,		call		)
 		    __field(enum rxrpc_rtt_rx_trace,	why		)
+		    __field(int,			slot		)
 		    __field(rxrpc_serial_t,		send_serial	)
 		    __field(rxrpc_serial_t,		resp_serial	)
 		    __field(u32,			rtt		)
 	    TP_fast_assign(
 		    __entry->call = call->debug_id;
 		    __entry->why = why;
+		    __entry->slot = slot;
 		    __entry->send_serial = send_serial;
 		    __entry->resp_serial = resp_serial;
 		    __entry->rtt = rtt;
 		    __entry->rto = rto;
 			   ),
-	    TP_printk("c=%08x %s sr=%08x rr=%08x rtt=%u rto=%u",
+	    TP_printk("c=%08x [%d] %s sr=%08x rr=%08x rtt=%u rto=%u",
 		      __entry->call,
+		      __entry->slot,
 		      __print_symbolic(__entry->why, rxrpc_rtt_rx_traces),
 		      __entry->send_serial,
 		      __entry->resp_serial,

include/uapi/linux/in.h+1−1

@@ -135,7 +135,7 @@ struct in_addr { · 134 unmodified lines
135	* this socket to prevent accepting spoofed ones.	135	* this socket to prevent accepting spoofed ones.
136	*/	136	*/
137	#define IP_PMTUDISC_INTERFACE 4	137	#define IP_PMTUDISC_INTERFACE 4
138	/* weaker version of IP_PMTUDISC_INTERFACE, which allos packets to get	138	/* weaker version of IP_PMTUDISC_INTERFACE, which allows packets to get
139	* fragmented if they exeed the interface mtu	139	* fragmented if they exeed the interface mtu
140	*/	140	*/
141	#define IP_PMTUDISC_OMIT 5	141	#define IP_PMTUDISC_OMIT 5

include/uapi/linux/kvm.h+4−2

 #define KVM_VM_PPC_HV 1
 #define KVM_VM_PPC_PR 2
-/* on MIPS, 0 forces trap & emulate, 1 forces VZ ASE */
+/* on MIPS, 0 indicates auto, 1 forces VZ ASE, 2 forces trap & emulate */
-#define KVM_VM_MIPS_TE		0
+#define KVM_VM_MIPS_AUTO	0
 #define KVM_VM_MIPS_VZ		1
+#define KVM_VM_MIPS_TE		2
 #define KVM_S390_SIE_PAGE_OFFSET 1
 #define KVM_CAP_LAST_CPU 184
 #define KVM_CAP_SMALLER_MAXPHYADDR 185
 #define KVM_CAP_S390_DIAG318 186
+#define KVM_CAP_STEAL_TIME 187
 #ifdef KVM_CAP_IRQ_ROUTING

include/uapi/linux/netfilter/nf_tables.h+1−1

@@ -133,7 +133,7 @@ enum nf_tables_msg_types { · 132 unmodified lines
133	* @NFTA_LIST_ELEM: list element (NLA_NESTED)	133	* @NFTA_LIST_ELEM: list element (NLA_NESTED)
134	*/	134	*/
135	enum nft_list_attributes {	135	enum nft_list_attributes {
136	NFTA_LIST_UNPEC,	136	NFTA_LIST_UNSPEC,
137	NFTA_LIST_ELEM,	137	NFTA_LIST_ELEM,
138	__NFTA_LIST_MAX	138	__NFTA_LIST_MAX
139	};	139	};

include/xen/balloon.h+4−0

 /******************************************************************************
  * Xen balloon functionality
  */
+#ifndef _XEN_BALLOON_H
+#define _XEN_BALLOON_H
 #define RETRY_UNLIMITED	0
 {
 }
 #endif
+#endif	/* _XEN_BALLOON_H */

include/xen/xen.h+9−0

@@ -52,4 +52,13 @@ bool xen_biovec_phys_mergeable(const struct bio_vec *vec1, · 51 unmodified lines
52	extern u64 xen_saved_max_mem_size;	52	extern u64 xen_saved_max_mem_size;
53	#endif	53	#endif
54		54
		55	#ifdef CONFIG_XEN_UNPOPULATED_ALLOC
		56	int xen_alloc_unpopulated_pages(unsigned int nr_pages, struct page **pages);
		57	void xen_free_unpopulated_pages(unsigned int nr_pages, struct page **pages);
		58	#else
		59	#define xen_alloc_unpopulated_pages alloc_xenballooned_pages
		60	#define xen_free_unpopulated_pages free_xenballooned_pages
		61	#include <xen/balloon.h>
		62	#endif
		63
55	#endif /* _XEN_XEN_H */	64	#endif /* _XEN_XEN_H */

init/initramfs.c+1−1

@@ -297,7 +297,7 @@ static void __init clean_path(char *path, umode_t fmode) · 296 unmodified lines
297	{	297	{
298	struct kstat st;	298	struct kstat st;
299		299
300	if (init_stat(path, &st, AT_SYMLINK_NOFOLLOW) &&	300	if (!init_stat(path, &st, AT_SYMLINK_NOFOLLOW) &&
301	(st.mode ^ fmode) & S_IFMT) {	301	(st.mode ^ fmode) & S_IFMT) {
302	if (S_ISDIR(st.mode))	302	if (S_ISDIR(st.mode))
303	init_rmdir(path);	303	init_rmdir(path);

ipc/ipc_sysctl.c+1−1

@@ -85,7 +85,7 @@ static int proc_ipc_auto_msgmni(struct ctl_table *table, int write, · 84 unmodified lines
85	}	85	}
86		86
87	static int proc_ipc_sem_dointvec(struct ctl_table *table, int write,	87	static int proc_ipc_sem_dointvec(struct ctl_table *table, int write,
88	void __user buffer, size_t lenp, loff_t *ppos)	88	void buffer, size_t lenp, loff_t *ppos)
89	{	89	{
90	int ret, semmni;	90	int ret, semmni;
91	struct ipc_namespace *ns = current->nsproxy->ipc_ns;	91	struct ipc_namespace *ns = current->nsproxy->ipc_ns;

kernel/bpf/syscall.c+1−1

@@ -2634,7 +2634,7 @@ static int bpf_raw_tp_link_fill_link_info(const struct bpf_link *link, · 2633 unmodified lines
2634	u32 ulen = info->raw_tracepoint.tp_name_len;	2634	u32 ulen = info->raw_tracepoint.tp_name_len;
2635	size_t tp_len = strlen(tp_name);	2635	size_t tp_len = strlen(tp_name);
2636		2636
2637	if (ulen && !ubuf)	2637	if (!ulen ^ !ubuf)
2638	return -EINVAL;	2638	return -EINVAL;
2639		2639
2640	info->raw_tracepoint.tp_name_len = tp_len + 1;	2640	info->raw_tracepoint.tp_name_len = tp_len + 1;

kernel/entry/common.c+29−6

@@ -69,22 +69,45 @@ static long syscall_trace_enter(struct pt_regs *regs, long syscall, · 68 unmodified lines
69	return ret ? : syscall_get_nr(current, regs);	69	return ret ? : syscall_get_nr(current, regs);
70	}	70	}
71		71
72	noinstr long syscall_enter_from_user_mode(struct pt_regs *regs, long syscall)	72	static __always_inline long
		73	__syscall_enter_from_user_work(struct pt_regs *regs, long syscall)
73	{	74	{
74	unsigned long ti_work;	75	unsigned long ti_work;
75		76
76	enter_from_user_mode(regs);
77	instrumentation_begin();
78
79	local_irq_enable();
80	ti_work = READ_ONCE(current_thread_info()->flags);	77	ti_work = READ_ONCE(current_thread_info()->flags);
81	if (ti_work & SYSCALL_ENTER_WORK)	78	if (ti_work & SYSCALL_ENTER_WORK)
82	syscall = syscall_trace_enter(regs, syscall, ti_work);	79	syscall = syscall_trace_enter(regs, syscall, ti_work);
83	instrumentation_end();
84		80
85	return syscall;	81	return syscall;
86	}	82	}
87		83
		84	long syscall_enter_from_user_mode_work(struct pt_regs *regs, long syscall)
		85	{
		86	return __syscall_enter_from_user_work(regs, syscall);
		87	}
		88
		89	noinstr long syscall_enter_from_user_mode(struct pt_regs *regs, long syscall)
		90	{
		91	long ret;
		92
		93	enter_from_user_mode(regs);
		94
		95	instrumentation_begin();
		96	local_irq_enable();
		97	ret = __syscall_enter_from_user_work(regs, syscall);
		98	instrumentation_end();
		99
		100	return ret;
		101	}
		102
		103	noinstr void syscall_enter_from_user_mode_prepare(struct pt_regs *regs)
		104	{
		105	enter_from_user_mode(regs);
		106	instrumentation_begin();
		107	local_irq_enable();
		108	instrumentation_end();
		109	}
		110
88	/**	111	/**
89	* exit_to_user_mode - Fixup state when exiting to user mode	112	* exit_to_user_mode - Fixup state when exiting to user mode
90	*	113	*

kernel/fork.c+1−1

@@ -3014,7 +3014,7 @@ int unshare_files(struct files_struct **displaced) · 3013 unmodified lines
3014	}	3014	}
3015		3015
3016	int sysctl_max_threads(struct ctl_table *table, int write,	3016	int sysctl_max_threads(struct ctl_table *table, int write,
3017	void __user buffer, size_t lenp, loff_t *ppos)	3017	void buffer, size_t lenp, loff_t *ppos)
3018	{	3018	{
3019	struct ctl_table t;	3019	struct ctl_table t;
3020	int ret;	3020	int ret;

kernel/gcov/gcc_4_7.c+3−1

 #include <linux/vmalloc.h>
 #include "gcov.h"
-#if (__GNUC__ >= 7)
+#if (__GNUC__ >= 10)
+#define GCOV_COUNTERS			8
+#elif (__GNUC__ >= 7)
 #define GCOV_COUNTERS			9
 #elif (__GNUC__ > 5) || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
 #define GCOV_COUNTERS			10

kernel/padata.c+3−2

 	padata->pd = pd;
 	padata->cb_cpu = *cb_cpu;
-	rcu_read_unlock_bh();
 	spin_lock(&padata_works_lock);
 	padata->seq_nr = ++pd->seq_nr;
 	pw = padata_work_alloc();
 	spin_unlock(&padata_works_lock);
+	rcu_read_unlock_bh();
 	if (pw) {
 		padata_work_init(pw, padata_parallel_worker, padata, 0);
 		queue_work(pinst->parallel_wq, &pw->pw_work);

kernel/seccomp.c+18−6

 }
 #ifdef CONFIG_SECCOMP_FILTER
-static int seccomp_notify_release(struct inode *inode, struct file *file)
+static void seccomp_notify_free(struct seccomp_filter *filter)
+{
+	kfree(filter->notif);
+	filter->notif = NULL;
+}
+static void seccomp_notify_detach(struct seccomp_filter *filter)
 {
-	struct seccomp_filter *filter = file->private_data;
 	struct seccomp_knotif *knotif;
 	if (!filter)
-		return 0;
+		return;
 	mutex_lock(&filter->notify_lock);
 		complete(&knotif->ready);
 	}
-	kfree(filter->notif);
+	seccomp_notify_free(filter);
-	filter->notif = NULL;
 	mutex_unlock(&filter->notify_lock);
+}
+static int seccomp_notify_release(struct inode *inode, struct file *file)
+{
+	struct seccomp_filter *filter = file->private_data;
+	seccomp_notify_detach(filter);
 	__put_seccomp_filter(filter);
 	return 0;
 }
 out_notif:
 	if (IS_ERR(ret))
-		kfree(filter->notif);
+		seccomp_notify_free(filter);
 out:
 	return ret;
 }
 			listener_f->private_data = NULL;
 			fput(listener_f);
 			put_unused_fd(listener);
+			seccomp_notify_detach(prepared);
 		} else {
 			fd_install(listener, listener_f);
 			ret = listener;

kernel/sysctl.c+1−2

@@ -204,8 +204,7 @@ static int max_extfrag_threshold = 1000; · 203 unmodified lines
204		204
205	#if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_SYSCTL)	205	#if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_SYSCTL)
206	static int bpf_stats_handler(struct ctl_table *table, int write,	206	static int bpf_stats_handler(struct ctl_table *table, int write,
207	void __user buffer, size_t lenp,	207	void buffer, size_t lenp, loff_t *ppos)
208	loff_t *ppos)
209	{	208	{
210	struct static_key key = (struct static_key )table->data;	209	struct static_key key = (struct static_key )table->data;
211	static int saved_val;	210	static int saved_val;

lib/dynamic_debug.c+46−36

@@ -353,8 +353,7 @@ static int check_set(const char *dest, char src, char *name) · 352 unmodified lines
353		353
354	/*	354	/*
355	* Parse words[] as a ddebug query specification, which is a series	355	* Parse words[] as a ddebug query specification, which is a series
356	* of (keyword, value) pairs or combined keyword=value terms,	356	* of (keyword, value) pairs chosen from these possibilities:
357	* chosen from these possibilities:
358	*	357	*
359	* func <function-name>	358	* func <function-name>
360	* file <full-pathname>	359	* file <full-pathname>
@@ -373,34 +372,22 @@ static int ddebug_parse_query(char *words[], int nwords, · 12 unmodified lines
373	unsigned int i;	372	unsigned int i;
374	int rc = 0;	373	int rc = 0;
375	char *fline;	374	char *fline;
376	char keyword, arg;	375
		376	/* check we have an even number of words */
		377	if (nwords % 2 != 0) {
		378	pr_err("expecting pairs of match-spec <value>\n");
		379	return -EINVAL;
		380	}
377		381
378	if (modname)	382	if (modname)
379	/* support $modname.dyndbg=<multiple queries> */	383	/* support $modname.dyndbg=<multiple queries> */
380	query->module = modname;	384	query->module = modname;
381		385
382	for (i = 0; i < nwords; i++) {	386	for (i = 0; i < nwords; i += 2) {
383	/* accept keyword=arg */	387	if (!strcmp(words[i], "func")) {
384	vpr_info("%d w:%s\n", i, words[i]);	388	rc = check_set(&query->function, words[i+1], "func");
385		389	} else if (!strcmp(words[i], "file")) {
386	keyword = words[i];	390	if (check_set(&query->filename, words[i+1], "file"))
387	arg = strchr(keyword, '=');
388	if (arg) {
389	*arg++ = '\0';
390	} else {
391	i++; /* next word is arg */
392	if (!(i < nwords)) {
393	pr_err("missing arg to keyword: %s\n", keyword);
394	return -EINVAL;
395	}
396	arg = words[i];
397	}
398	vpr_info("%d key:%s arg:%s\n", i, keyword, arg);
399
400	if (!strcmp(keyword, "func")) {
401	rc = check_set(&query->function, arg, "func");
402	} else if (!strcmp(keyword, "file")) {
403	if (check_set(&query->filename, arg, "file"))
404	return -EINVAL;	391	return -EINVAL;
405		392
406	/* tail :$info is function or line-range */	393	/* tail :$info is function or line-range */
@@ -416,18 +403,18 @@ static int ddebug_parse_query(char *words[], int nwords, · 9 unmodified lines
416	if (parse_linerange(query, fline))	403	if (parse_linerange(query, fline))
417	return -EINVAL;	404	return -EINVAL;
418	}	405	}
419	} else if (!strcmp(keyword, "module")) {	406	} else if (!strcmp(words[i], "module")) {
420	rc = check_set(&query->module, arg, "module");	407	rc = check_set(&query->module, words[i+1], "module");
421	} else if (!strcmp(keyword, "format")) {	408	} else if (!strcmp(words[i], "format")) {
422	string_unescape_inplace(arg, UNESCAPE_SPACE \|	409	string_unescape_inplace(words[i+1], UNESCAPE_SPACE \|
423	UNESCAPE_OCTAL \|	410	UNESCAPE_OCTAL \|
424	UNESCAPE_SPECIAL);	411	UNESCAPE_SPECIAL);
425	rc = check_set(&query->format, arg, "format");	412	rc = check_set(&query->format, words[i+1], "format");
426	} else if (!strcmp(keyword, "line")) {	413	} else if (!strcmp(words[i], "line")) {
427	if (parse_linerange(query, arg))	414	if (parse_linerange(query, words[i+1]))
428	return -EINVAL;	415	return -EINVAL;
429	} else {	416	} else {
430	pr_err("unknown keyword \"%s\"\n", keyword);	417	pr_err("unknown keyword \"%s\"\n", words[i]);
431	return -EINVAL;	418	return -EINVAL;
432	}	419	}
433	if (rc)	420	if (rc)
@@ -525,7 +512,7 @@ static int ddebug_exec_query(char query_string, const char modname) · 91 unmodified lines
525	last error or number of matching callsites. Module name is either	512	last error or number of matching callsites. Module name is either
526	in param (for boot arg) or perhaps in query string.	513	in param (for boot arg) or perhaps in query string.
527	*/	514	*/
528	int ddebug_exec_queries(char query, const char modname)	515	static int ddebug_exec_queries(char query, const char modname)
529	{	516	{
530	char *split;	517	char *split;
531	int i, errs = 0, exitcode = 0, rc, nfound = 0;	518	int i, errs = 0, exitcode = 0, rc, nfound = 0;
@@ -557,7 +544,30 @@ int ddebug_exec_queries(char query, const char modname) · 25 unmodified lines
557	return exitcode;	544	return exitcode;
558	return nfound;	545	return nfound;
559	}	546	}
560	EXPORT_SYMBOL_GPL(ddebug_exec_queries);	547
		548	/**
		549	* dynamic_debug_exec_queries - select and change dynamic-debug prints
		550	* @query: query-string described in admin-guide/dynamic-debug-howto
		551	* @modname: string containing module name, usually &module.mod_name
		552	*
		553	* This uses the >/proc/dynamic_debug/control reader, allowing module
		554	* authors to modify their dynamic-debug callsites. The modname is
		555	* canonically struct module.mod_name, but can also be null or a
		556	* module-wildcard, for example: "drm*".
		557	*/
		558	int dynamic_debug_exec_queries(const char query, const char modname)
		559	{
		560	int rc;
		561	char *qry = kstrndup(query, PAGE_SIZE, GFP_KERNEL);
		562
		563	if (!query)
		564	return -ENOMEM;
		565
		566	rc = ddebug_exec_queries(qry, modname);
		567	kfree(qry);
		568	return rc;
		569	}
		570	EXPORT_SYMBOL_GPL(dynamic_debug_exec_queries);
561		571
562	#define PREFIX_SIZE 64	572	#define PREFIX_SIZE 64
563		573
@@ -947,7 +957,7 @@ int ddebug_add_module(struct _ddebug *tab, unsigned int n, · 383 unmodified lines
947	list_add(&dt->link, &ddebug_tables);	957	list_add(&dt->link, &ddebug_tables);
948	mutex_unlock(&ddebug_lock);	958	mutex_unlock(&ddebug_lock);
949		959
950	v2pr_info("%u debug prints in module %s\n", n, dt->mod_name);	960	v2pr_info("%3u debug prints in module %s\n", n, dt->mod_name);
951	return 0;	961	return 0;
952	}	962	}
953		963

lib/kobject.c+5−4

 	struct kernfs_node *sd;
 	const struct kobj_type *ktype;
-	if (!kobj)
-		return;
 	sd = kobj->sd;
 	ktype = get_ktype(kobj);
  */
 void kobject_del(struct kobject *kobj)
 {
-	struct kobject *parent = kobj->parent;
+	struct kobject *parent;
+	if (!kobj)
+		return;
+	parent = kobj->parent;
 	__kobject_del(kobj);
 	kobject_put(parent);
 }

lib/test_firmware.c+9−0

 #include <linux/vmalloc.h>
 #include <linux/efi_embedded_fw.h>
+MODULE_IMPORT_NS(TEST_FIRMWARE);
 #define TEST_FIRMWARE_NAME	"test-firmware.bin"
 #define TEST_FIRMWARE_NUM_REQS	4
 #define TEST_FIRMWARE_BUF_SIZE	SZ_1K
 static DEVICE_ATTR_WO(trigger_request);
 #ifdef CONFIG_EFI_EMBEDDED_FIRMWARE
+extern struct list_head efi_embedded_fw_list;
+extern bool efi_embedded_fw_checked;
 static ssize_t trigger_request_platform_store(struct device *dev,
 					      struct device_attribute *attr,
 					      const char *buf, size_t count)
 	};
 	struct efi_embedded_fw efi_embedded_fw;
 	const struct firmware *firmware = NULL;
+	bool saved_efi_embedded_fw_checked;
 	char *name;
 	int rc;
 	efi_embedded_fw.data = (void *)test_data;
 	efi_embedded_fw.length = sizeof(test_data);
 	list_add(&efi_embedded_fw.list, &efi_embedded_fw_list);
+	saved_efi_embedded_fw_checked = efi_embedded_fw_checked;
+	efi_embedded_fw_checked = true;
 	pr_info("loading '%s'\n", name);
 	rc = firmware_request_platform(&firmware, name, dev);
 	rc = count;
 out:
+	efi_embedded_fw_checked = saved_efi_embedded_fw_checked;
 	release_firmware(firmware);
 	list_del(&efi_embedded_fw.list);
 	kfree(name);

mm/gup.c+6−36

 }
 /*
- * FOLL_FORCE or a forced COW break can write even to unwritable pte's,
+ * FOLL_FORCE can write to even unwritable pte's, but only
- * but only after we've gone through a COW cycle and they are dirty.
+ * after we've gone through a COW cycle and they are dirty.
  */
 static inline bool can_follow_write_pte(pte_t pte, unsigned int flags)
 {
-	return pte_write(pte) || ((flags & FOLL_COW) && pte_dirty(pte));
+	return pte_write(pte) ||
-}
+		((flags & FOLL_FORCE) && (flags & FOLL_COW) && pte_dirty(pte));
-/*
- * A (separate) COW fault might break the page the other way and
- * get_user_pages() would return the page from what is now the wrong
- * VM. So we need to force a COW break at GUP time even for reads.
- */
-static inline bool should_force_cow_break(struct vm_area_struct *vma, unsigned int flags)
-{
-	return is_cow_mapping(vma->vm_flags) && (flags & (FOLL_GET | FOLL_PIN));
 }
 static struct page *follow_page_pte(struct vm_area_struct *vma,
 			goto unmap;
 		*page = pte_page(*pte);
 	}
-	if (unlikely(!try_get_page(*page))) {
+	if (unlikely(!try_grab_page(*page, gup_flags))) {
 		ret = -ENOMEM;
 		goto unmap;
 	}
 				goto out;
 			}
 			if (is_vm_hugetlb_page(vma)) {
-				if (should_force_cow_break(vma, foll_flags))
-					foll_flags |= FOLL_WRITE;
 				i = follow_hugetlb_page(mm, vma, pages, vmas,
 						&start, &nr_pages, i,
-						foll_flags, locked);
+						gup_flags, locked);
 				if (locked && *locked == 0) {
 					/*
 					 * We've got a VM_FAULT_RETRY
 				continue;
 			}
 		}
-		if (should_force_cow_break(vma, foll_flags))
-			foll_flags |= FOLL_WRITE;
 retry:
 		/*
 		 * If we have a pending SIGKILL, don't keep faulting pages and
 		return -EFAULT;
 	/*
-	 * The FAST_GUP case requires FOLL_WRITE even for pure reads,
-	 * because get_user_pages() may need to cause an early COW in
-	 * order to avoid confusing the normal COW routines. So only
-	 * targets that are already writable are safe to do by just
-	 * looking at the page tables.
-	 *
-	 * NOTE! With FOLL_FAST_ONLY we allow read-only gup_fast() here,
-	 * because there is no slow path to fall back on. But you'd
-	 * better be careful about possible COW pages - you'll get _a_
-	 * COW page, but not necessarily the one you intended to get
-	 * depending on what COW event happens after this. COW may break
-	 * the page copy in a random direction.
-	 *
 	 * Disable interrupts. The nested form is used, in order to allow
 	 * full, general purpose use of this routine.
 	 *
 	 */
 	if (IS_ENABLED(CONFIG_HAVE_FAST_GUP) && gup_fast_permitted(start, end)) {
 		unsigned long fast_flags = gup_flags;
-		if (!(gup_flags & FOLL_FAST_ONLY))
-			fast_flags |= FOLL_WRITE;
 		local_irq_save(flags);
 		gup_pgd_range(addr, end, fast_flags, pages, &nr_pinned);

mm/huge_memory.c+4−3

 }
 /*
- * FOLL_FORCE or a forced COW break can write even to unwritable pmd's,
+ * FOLL_FORCE can write to even unwritable pmd's, but only
- * but only after we've gone through a COW cycle and they are dirty.
+ * after we've gone through a COW cycle and they are dirty.
  */
 static inline bool can_follow_write_pmd(pmd_t pmd, unsigned int flags)
 {
-	return pmd_write(pmd) || ((flags & FOLL_COW) && pmd_dirty(pmd));
+	return pmd_write(pmd) ||
+	       ((flags & FOLL_FORCE) && (flags & FOLL_COW) && pmd_dirty(pmd));
 }
 struct page *follow_trans_huge_pmd(struct vm_area_struct *vma,

mm/hugetlb.c+37−12

 		int nid, nodemask_t *nodemask)
 {
 	unsigned long nr_pages = 1UL << huge_page_order(h);
+	if (nid == NUMA_NO_NODE)
+		nid = numa_mem_id();
 #ifdef CONFIG_CMA
 	{
 		struct page *page;
 		int node;
-		for_each_node_mask(node, *nodemask) {
+		if (hugetlb_cma[nid]) {
-			if (!hugetlb_cma[node])
+			page = cma_alloc(hugetlb_cma[nid], nr_pages,
-				continue;
+					huge_page_order(h), true);
-			page = cma_alloc(hugetlb_cma[node], nr_pages,
-					 huge_page_order(h), true);
 			if (page)
 				return page;
 		}
+		if (!(gfp_mask & __GFP_THISNODE)) {
+			for_each_node_mask(node, *nodemask) {
+				if (node == nid || !hugetlb_cma[node])
+					continue;
+				page = cma_alloc(hugetlb_cma[node], nr_pages,
+						huge_page_order(h), true);
+				if (page)
+					return page;
+			}
+		}
 	}
 #endif
 }
 #ifdef CONFIG_SYSCTL
+static int proc_hugetlb_doulongvec_minmax(struct ctl_table *table, int write,
+					  void *buffer, size_t *length,
+					  loff_t *ppos, unsigned long *out)
+{
+	struct ctl_table dup_table;
+	/*
+	 * In order to avoid races with __do_proc_doulongvec_minmax(), we
+	 * can duplicate the @table and alter the duplicate of it.
+	 */
+	dup_table = *table;
+	dup_table.data = out;
+	return proc_doulongvec_minmax(&dup_table, write, buffer, length, ppos);
+}
 static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
 			 struct ctl_table *table, int write,
 			 void *buffer, size_t *length, loff_t *ppos)
 	if (!hugepages_supported())
 		return -EOPNOTSUPP;
-	table->data = &tmp;
+	ret = proc_hugetlb_doulongvec_minmax(table, write, buffer, length, ppos,
-	table->maxlen = sizeof(unsigned long);
+					     &tmp);
-	ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
 	if (ret)
 		goto out;
 	if (write && hstate_is_gigantic(h))
 		return -EINVAL;
-	table->data = &tmp;
+	ret = proc_hugetlb_doulongvec_minmax(table, write, buffer, length, ppos,
-	table->maxlen = sizeof(unsigned long);
+					     &tmp);
-	ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
 	if (ret)
 		goto out;

mm/khugepaged.c+1−1

@@ -1709,7 +1709,7 @@ static void collapse_file(struct mm_struct *mm, · 1708 unmodified lines
1709	xas_unlock_irq(&xas);	1709	xas_unlock_irq(&xas);
1710	page_cache_sync_readahead(mapping, &file->f_ra,	1710	page_cache_sync_readahead(mapping, &file->f_ra,
1711	file, index,	1711	file, index,
1712	PAGE_SIZE);	1712	end - index);
1713	/* drain pagevecs to help isolate_lru_page() */	1713	/* drain pagevecs to help isolate_lru_page() */
1714	lru_add_drain();	1714	lru_add_drain();
1715	page = find_lock_page(mapping, index);	1715	page = find_lock_page(mapping, index);

mm/ksm.c+0−25

@@ -2661,31 +2661,6 @@ again: · 2660 unmodified lines
2661	goto again;	2661	goto again;
2662	}	2662	}
2663		2663
2664	bool reuse_ksm_page(struct page *page,
2665	struct vm_area_struct *vma,
2666	unsigned long address)
2667	{
2668	#ifdef CONFIG_DEBUG_VM
2669	if (WARN_ON(is_zero_pfn(page_to_pfn(page))) \|\|
2670	WARN_ON(!page_mapped(page)) \|\|
2671	WARN_ON(!PageLocked(page))) {
2672	dump_page(page, "reuse_ksm_page");
2673	return false;
2674	}
2675	#endif
2676
2677	if (PageSwapCache(page) \|\| !page_stable_node(page))
2678	return false;
2679	/* Prohibit parallel get_ksm_page() */
2680	if (!page_ref_freeze(page, 1))
2681	return false;
2682
2683	page_move_anon_rmap(page, vma);
2684	page->index = linear_page_index(vma, address);
2685	page_ref_unfreeze(page, 1);
2686
2687	return true;
2688	}
2689	#ifdef CONFIG_MIGRATION	2664	#ifdef CONFIG_MIGRATION
2690	void ksm_migrate_page(struct page newpage, struct page oldpage)	2665	void ksm_migrate_page(struct page newpage, struct page oldpage)
2691	{	2666	{

mm/madvise.c+1−1

 	 */
 	*prev = NULL;	/* tell sys_madvise we drop mmap_lock */
 	get_file(file);
-	mmap_read_unlock(current->mm);
 	offset = (loff_t)(start - vma->vm_start)
 			+ ((loff_t)vma->vm_pgoff << PAGE_SHIFT);
+	mmap_read_unlock(current->mm);
 	vfs_fadvise(file, offset, end - start, POSIX_FADV_WILLNEED);
 	fput(file);
 	mmap_read_lock(current->mm);

mm/memcontrol.c+6−0

 	__this_cpu_add(ug->memcg->vmstats_percpu->nr_page_events, ug->nr_pages);
 	memcg_check_events(ug->memcg, ug->dummy_page);
 	local_irq_restore(flags);
+	/* drop reference from uncharge_page */
+	css_put(&ug->memcg->css);
 }
 static void uncharge_page(struct page *page, struct uncharge_gather *ug)
 			uncharge_gather_clear(ug);
 		}
 		ug->memcg = page->mem_cgroup;
+		/* pairs with css_put in uncharge_batch */
+		css_get(&ug->memcg->css);
 	}
 	nr_pages = compound_nr(page);

mm/memory.c+42−55

@@ -73,6 +73,7 @@ · 72 unmodified lines
73	#include <linux/numa.h>	73	#include <linux/numa.h>
74	#include <linux/perf_event.h>	74	#include <linux/perf_event.h>
75	#include <linux/ptrace.h>	75	#include <linux/ptrace.h>
		76	#include <linux/vmalloc.h>
76		77
77	#include <trace/events/kmem.h>	78	#include <trace/events/kmem.h>
78		79
@@ -83,6 +84,7 @@ · 4 unmodified lines
83	#include <asm/tlb.h>	84	#include <asm/tlb.h>
84	#include <asm/tlbflush.h>	85	#include <asm/tlbflush.h>
85		86
		87	#include "pgalloc-track.h"
86	#include "internal.h"	88	#include "internal.h"
87		89
88	#if defined(LAST_CPUPID_NOT_IN_PAGE_FLAGS) && !defined(CONFIG_COMPILE_TEST)	90	#if defined(LAST_CPUPID_NOT_IN_PAGE_FLAGS) && !defined(CONFIG_COMPILE_TEST)
@@ -2206,7 +2208,8 @@ EXPORT_SYMBOL(vm_iomap_memory); · 2117 unmodified lines
2206		2208
2207	static int apply_to_pte_range(struct mm_struct mm, pmd_t pmd,	2209	static int apply_to_pte_range(struct mm_struct mm, pmd_t pmd,
2208	unsigned long addr, unsigned long end,	2210	unsigned long addr, unsigned long end,
2209	pte_fn_t fn, void *data, bool create)	2211	pte_fn_t fn, void *data, bool create,
		2212	pgtbl_mod_mask *mask)
2210	{	2213	{
2211	pte_t *pte;	2214	pte_t *pte;
2212	int err = 0;	2215	int err = 0;
@@ -2214,7 +2217,7 @@ static int apply_to_pte_range(struct mm_struct mm, pmd_t pmd, · 1 unmodified line
2214		2217
2215	if (create) {	2218	if (create) {
2216	pte = (mm == &init_mm) ?	2219	pte = (mm == &init_mm) ?
2217	pte_alloc_kernel(pmd, addr) :	2220	pte_alloc_kernel_track(pmd, addr, mask) :
2218	pte_alloc_map_lock(mm, pmd, addr, &ptl);	2221	pte_alloc_map_lock(mm, pmd, addr, &ptl);
2219	if (!pte)	2222	if (!pte)
2220	return -ENOMEM;	2223	return -ENOMEM;
@@ -2235,6 +2238,7 @@ static int apply_to_pte_range(struct mm_struct mm, pmd_t pmd, · 14 unmodified lines
2235	break;	2238	break;
2236	}	2239	}
2237	} while (addr += PAGE_SIZE, addr != end);	2240	} while (addr += PAGE_SIZE, addr != end);
		2241	*mask \|= PGTBL_PTE_MODIFIED;
2238		2242
2239	arch_leave_lazy_mmu_mode();	2243	arch_leave_lazy_mmu_mode();
2240		2244
@@ -2245,7 +2249,8 @@ static int apply_to_pte_range(struct mm_struct mm, pmd_t pmd, · 4 unmodified lines
2245		2249
2246	static int apply_to_pmd_range(struct mm_struct mm, pud_t pud,	2250	static int apply_to_pmd_range(struct mm_struct mm, pud_t pud,
2247	unsigned long addr, unsigned long end,	2251	unsigned long addr, unsigned long end,
2248	pte_fn_t fn, void *data, bool create)	2252	pte_fn_t fn, void *data, bool create,
		2253	pgtbl_mod_mask *mask)
2249	{	2254	{
2250	pmd_t *pmd;	2255	pmd_t *pmd;
2251	unsigned long next;	2256	unsigned long next;
@@ -2254,7 +2259,7 @@ static int apply_to_pmd_range(struct mm_struct mm, pud_t pud, · 2 unmodified lines
2254	BUG_ON(pud_huge(*pud));	2259	BUG_ON(pud_huge(*pud));
2255		2260
2256	if (create) {	2261	if (create) {
2257	pmd = pmd_alloc(mm, pud, addr);	2262	pmd = pmd_alloc_track(mm, pud, addr, mask);
2258	if (!pmd)	2263	if (!pmd)
2259	return -ENOMEM;	2264	return -ENOMEM;
2260	} else {	2265	} else {
@@ -2264,7 +2269,7 @@ static int apply_to_pmd_range(struct mm_struct mm, pud_t pud, · 3 unmodified lines
2264	next = pmd_addr_end(addr, end);	2269	next = pmd_addr_end(addr, end);
2265	if (create \|\| !pmd_none_or_clear_bad(pmd)) {	2270	if (create \|\| !pmd_none_or_clear_bad(pmd)) {
2266	err = apply_to_pte_range(mm, pmd, addr, next, fn, data,	2271	err = apply_to_pte_range(mm, pmd, addr, next, fn, data,
2267	create);	2272	create, mask);
2268	if (err)	2273	if (err)
2269	break;	2274	break;
2270	}	2275	}
@@ -2274,14 +2279,15 @@ static int apply_to_pmd_range(struct mm_struct mm, pud_t pud, · 3 unmodified lines
2274		2279
2275	static int apply_to_pud_range(struct mm_struct mm, p4d_t p4d,	2280	static int apply_to_pud_range(struct mm_struct mm, p4d_t p4d,
2276	unsigned long addr, unsigned long end,	2281	unsigned long addr, unsigned long end,
2277	pte_fn_t fn, void *data, bool create)	2282	pte_fn_t fn, void *data, bool create,
		2283	pgtbl_mod_mask *mask)
2278	{	2284	{
2279	pud_t *pud;	2285	pud_t *pud;
2280	unsigned long next;	2286	unsigned long next;
2281	int err = 0;	2287	int err = 0;
2282		2288
2283	if (create) {	2289	if (create) {
2284	pud = pud_alloc(mm, p4d, addr);	2290	pud = pud_alloc_track(mm, p4d, addr, mask);
2285	if (!pud)	2291	if (!pud)
2286	return -ENOMEM;	2292	return -ENOMEM;
2287	} else {	2293	} else {
@@ -2291,7 +2297,7 @@ static int apply_to_pud_range(struct mm_struct mm, p4d_t p4d, · 3 unmodified lines
2291	next = pud_addr_end(addr, end);	2297	next = pud_addr_end(addr, end);
2292	if (create \|\| !pud_none_or_clear_bad(pud)) {	2298	if (create \|\| !pud_none_or_clear_bad(pud)) {
2293	err = apply_to_pmd_range(mm, pud, addr, next, fn, data,	2299	err = apply_to_pmd_range(mm, pud, addr, next, fn, data,
2294	create);	2300	create, mask);
2295	if (err)	2301	if (err)
2296	break;	2302	break;
2297	}	2303	}
@@ -2301,14 +2307,15 @@ static int apply_to_pud_range(struct mm_struct mm, p4d_t p4d, · 3 unmodified lines
2301		2307
2302	static int apply_to_p4d_range(struct mm_struct mm, pgd_t pgd,	2308	static int apply_to_p4d_range(struct mm_struct mm, pgd_t pgd,
2303	unsigned long addr, unsigned long end,	2309	unsigned long addr, unsigned long end,
2304	pte_fn_t fn, void *data, bool create)	2310	pte_fn_t fn, void *data, bool create,
		2311	pgtbl_mod_mask *mask)
2305	{	2312	{
2306	p4d_t *p4d;	2313	p4d_t *p4d;
2307	unsigned long next;	2314	unsigned long next;
2308	int err = 0;	2315	int err = 0;
2309		2316
2310	if (create) {	2317	if (create) {
2311	p4d = p4d_alloc(mm, pgd, addr);	2318	p4d = p4d_alloc_track(mm, pgd, addr, mask);
2312	if (!p4d)	2319	if (!p4d)
2313	return -ENOMEM;	2320	return -ENOMEM;
2314	} else {	2321	} else {
@@ -2318,7 +2325,7 @@ static int apply_to_p4d_range(struct mm_struct mm, pgd_t pgd, · 3 unmodified lines
2318	next = p4d_addr_end(addr, end);	2325	next = p4d_addr_end(addr, end);
2319	if (create \|\| !p4d_none_or_clear_bad(p4d)) {	2326	if (create \|\| !p4d_none_or_clear_bad(p4d)) {
2320	err = apply_to_pud_range(mm, p4d, addr, next, fn, data,	2327	err = apply_to_pud_range(mm, p4d, addr, next, fn, data,
2321	create);	2328	create, mask);
2322	if (err)	2329	if (err)
2323	break;	2330	break;
2324	}	2331	}
@@ -2331,8 +2338,9 @@ static int __apply_to_page_range(struct mm_struct *mm, unsigned long addr, · 6 unmodified lines
2331	void *data, bool create)	2338	void *data, bool create)
2332	{	2339	{
2333	pgd_t *pgd;	2340	pgd_t *pgd;
2334	unsigned long next;	2341	unsigned long start = addr, next;
2335	unsigned long end = addr + size;	2342	unsigned long end = addr + size;
		2343	pgtbl_mod_mask mask = 0;
2336	int err = 0;	2344	int err = 0;
2337		2345
2338	if (WARN_ON(addr >= end))	2346	if (WARN_ON(addr >= end))
@@ -2343,11 +2351,14 @@ static int __apply_to_page_range(struct mm_struct *mm, unsigned long addr, · 4 unmodified lines
2343	next = pgd_addr_end(addr, end);	2351	next = pgd_addr_end(addr, end);
2344	if (!create && pgd_none_or_clear_bad(pgd))	2352	if (!create && pgd_none_or_clear_bad(pgd))
2345	continue;	2353	continue;
2346	err = apply_to_p4d_range(mm, pgd, addr, next, fn, data, create);	2354	err = apply_to_p4d_range(mm, pgd, addr, next, fn, data, create, &mask);
2347	if (err)	2355	if (err)
2348	break;	2356	break;
2349	} while (pgd++, addr = next, addr != end);	2357	} while (pgd++, addr = next, addr != end);
2350		2358
		2359	if (mask & ARCH_PAGE_TABLE_SYNC_MASK)
		2360	arch_sync_kernel_mappings(start, start + size);
		2361
2351	return err;	2362	return err;
2352	}	2363	}
2353		2364
@@ -2622,6 +2633,7 @@ static inline void wp_page_reuse(struct vm_fault *vmf) · 268 unmodified lines
2622	if (ptep_set_access_flags(vma, vmf->address, vmf->pte, entry, 1))	2633	if (ptep_set_access_flags(vma, vmf->address, vmf->pte, entry, 1))
2623	update_mmu_cache(vma, vmf->address, vmf->pte);	2634	update_mmu_cache(vma, vmf->address, vmf->pte);
2624	pte_unmap_unlock(vmf->pte, vmf->ptl);	2635	pte_unmap_unlock(vmf->pte, vmf->ptl);
		2636	count_vm_event(PGREUSE);
2625	}	2637	}
2626		2638
2627	/*	2639	/*
@@ -2927,50 +2939,25 @@ static vm_fault_t do_wp_page(struct vm_fault *vmf) · 299 unmodified lines
2927	* not dirty accountable.	2939	* not dirty accountable.
2928	*/	2940	*/
2929	if (PageAnon(vmf->page)) {	2941	if (PageAnon(vmf->page)) {
2930	int total_map_swapcount;	2942	struct page *page = vmf->page;
2931	if (PageKsm(vmf->page) && (PageSwapCache(vmf->page) \|\|	2943
2932	page_count(vmf->page) != 1))	2944	/* PageKsm() doesn't necessarily raise the page refcount */
		2945	if (PageKsm(page) \|\| page_count(page) != 1)
		2946	goto copy;
		2947	if (!trylock_page(page))
		2948	goto copy;
		2949	if (PageKsm(page) \|\| page_mapcount(page) != 1 \|\| page_count(page) != 1) {
		2950	unlock_page(page);
2933	goto copy;	2951	goto copy;
2934	if (!trylock_page(vmf->page)) {
2935	get_page(vmf->page);
2936	pte_unmap_unlock(vmf->pte, vmf->ptl);
2937	lock_page(vmf->page);
2938	vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd,
2939	vmf->address, &vmf->ptl);
2940	if (!pte_same(*vmf->pte, vmf->orig_pte)) {
2941	update_mmu_tlb(vma, vmf->address, vmf->pte);
2942	unlock_page(vmf->page);
2943	pte_unmap_unlock(vmf->pte, vmf->ptl);
2944	put_page(vmf->page);
2945	return 0;
2946	}
2947	put_page(vmf->page);
2948	}
2949	if (PageKsm(vmf->page)) {
2950	bool reused = reuse_ksm_page(vmf->page, vmf->vma,
2951	vmf->address);
2952	unlock_page(vmf->page);
2953	if (!reused)
2954	goto copy;
2955	wp_page_reuse(vmf);
2956	return VM_FAULT_WRITE;
2957	}
2958	if (reuse_swap_page(vmf->page, &total_map_swapcount)) {
2959	if (total_map_swapcount == 1) {
2960	/*
2961	* The page is all ours. Move it to
2962	* our anon_vma so the rmap code will
2963	* not search our parent or siblings.
2964	* Protected against the rmap code by
2965	* the page lock.
2966	*/
2967	page_move_anon_rmap(vmf->page, vma);
2968	}
2969	unlock_page(vmf->page);
2970	wp_page_reuse(vmf);
2971	return VM_FAULT_WRITE;
2972	}	2952	}
2973	unlock_page(vmf->page);	2953	/*
		2954	* Ok, we've got the only map reference, and the only
		2955	* page count reference, and the page is locked,
		2956	* it's dark out, and we're wearing sunglasses. Hit it.
		2957	*/
		2958	wp_page_reuse(vmf);
		2959	unlock_page(page);
		2960	return VM_FAULT_WRITE;
2974	} else if (unlikely((vma->vm_flags & (VM_WRITE\|VM_SHARED)) ==	2961	} else if (unlikely((vma->vm_flags & (VM_WRITE\|VM_SHARED)) ==
2975	(VM_WRITE\|VM_SHARED))) {	2962	(VM_WRITE\|VM_SHARED))) {
2976	return wp_page_shared(vmf);	2963	return wp_page_shared(vmf);

mm/memremap.c+1−1

@@ -216,7 +216,7 @@ void memremap_pages(struct dev_pagemap pgmap, int nid) · 215 unmodified lines
216	return ERR_PTR(-EINVAL);	216	return ERR_PTR(-EINVAL);
217	}	217	}
218	break;	218	break;
219	case MEMORY_DEVICE_DEVDAX:	219	case MEMORY_DEVICE_GENERIC:
220	need_devmap_managed = false;	220	need_devmap_managed = false;
221	break;	221	break;
222	case MEMORY_DEVICE_PCI_P2PDMA:	222	case MEMORY_DEVICE_PCI_P2PDMA:

mm/migrate.c+18−11

@@ -246,13 +246,13 @@ static bool remove_migration_pte(struct page page, struct vm_area_struct vma, · 245 unmodified lines
246	else if (pte_swp_uffd_wp(*pvmw.pte))	246	else if (pte_swp_uffd_wp(*pvmw.pte))
247	pte = pte_mkuffd_wp(pte);	247	pte = pte_mkuffd_wp(pte);
248		248
249	if (unlikely(is_zone_device_page(new))) {	249	if (unlikely(is_device_private_page(new))) {
250	if (is_device_private_page(new)) {	250	entry = make_device_private_entry(new, pte_write(pte));
251	entry = make_device_private_entry(new, pte_write(pte));	251	pte = swp_entry_to_pte(entry);
252	pte = swp_entry_to_pte(entry);	252	if (pte_swp_soft_dirty(*pvmw.pte))
253	if (pte_swp_uffd_wp(*pvmw.pte))	253	pte = pte_swp_mksoft_dirty(pte);
254	pte = pte_mkuffd_wp(pte);	254	if (pte_swp_uffd_wp(*pvmw.pte))
255	}	255	pte = pte_swp_mkuffd_wp(pte);
256	}	256	}
257		257
258	#ifdef CONFIG_HUGETLB_PAGE	258	#ifdef CONFIG_HUGETLB_PAGE
@@ -2427,10 +2427,17 @@ again: · 2168 unmodified lines
2427	entry = make_migration_entry(page, mpfn &	2427	entry = make_migration_entry(page, mpfn &
2428	MIGRATE_PFN_WRITE);	2428	MIGRATE_PFN_WRITE);
2429	swp_pte = swp_entry_to_pte(entry);	2429	swp_pte = swp_entry_to_pte(entry);
2430	if (pte_soft_dirty(pte))	2430	if (pte_present(pte)) {
2431	swp_pte = pte_swp_mksoft_dirty(swp_pte);	2431	if (pte_soft_dirty(pte))
2432	if (pte_uffd_wp(pte))	2432	swp_pte = pte_swp_mksoft_dirty(swp_pte);
2433	swp_pte = pte_swp_mkuffd_wp(swp_pte);	2433	if (pte_uffd_wp(pte))
		2434	swp_pte = pte_swp_mkuffd_wp(swp_pte);
		2435	} else {
		2436	if (pte_swp_soft_dirty(pte))
		2437	swp_pte = pte_swp_mksoft_dirty(swp_pte);
		2438	if (pte_swp_uffd_wp(pte))
		2439	swp_pte = pte_swp_mkuffd_wp(swp_pte);
		2440	}
2434	set_pte_at(mm, addr, ptep, swp_pte);	2441	set_pte_at(mm, addr, ptep, swp_pte);
2435		2442
2436	/*	2443	/*

mm/rmap.c+7−2

@@ -1511,9 +1511,14 @@ static bool try_to_unmap_one(struct page page, struct vm_area_struct vma, · 1510 unmodified lines
1511	*/	1511	*/
1512	entry = make_migration_entry(page, 0);	1512	entry = make_migration_entry(page, 0);
1513	swp_pte = swp_entry_to_pte(entry);	1513	swp_pte = swp_entry_to_pte(entry);
1514	if (pte_soft_dirty(pteval))	1514
		1515	/*
		1516	* pteval maps a zone device page and is therefore
		1517	* a swap pte.
		1518	*/
		1519	if (pte_swp_soft_dirty(pteval))
1515	swp_pte = pte_swp_mksoft_dirty(swp_pte);	1520	swp_pte = pte_swp_mksoft_dirty(swp_pte);
1516	if (pte_uffd_wp(pteval))	1521	if (pte_swp_uffd_wp(pteval))
1517	swp_pte = pte_swp_mkuffd_wp(swp_pte);	1522	swp_pte = pte_swp_mkuffd_wp(swp_pte);
1518	set_pte_at(mm, pvmw.address, pvmw.pte, swp_pte);	1523	set_pte_at(mm, pvmw.address, pvmw.pte, swp_pte);
1519	/*	1524	/*

mm/slub.c+6−6

@@ -672,12 +672,12 @@ static void slab_fix(struct kmem_cache s, char fmt, ...) · 671 unmodified lines
672	}	672	}
673		673
674	static bool freelist_corrupted(struct kmem_cache s, struct page page,	674	static bool freelist_corrupted(struct kmem_cache s, struct page page,
675	void freelist, void nextfree)	675	void *freelist, void nextfree)
676	{	676	{
677	if ((s->flags & SLAB_CONSISTENCY_CHECKS) &&	677	if ((s->flags & SLAB_CONSISTENCY_CHECKS) &&
678	!check_valid_pointer(s, page, nextfree)) {	678	!check_valid_pointer(s, page, nextfree) && freelist) {
679	object_err(s, page, freelist, "Freechain corrupt");	679	object_err(s, page, *freelist, "Freechain corrupt");
680	freelist = NULL;	680	*freelist = NULL;
681	slab_fix(s, "Isolate corrupted freechain");	681	slab_fix(s, "Isolate corrupted freechain");
682	return true;	682	return true;
683	}	683	}
@@ -1494,7 +1494,7 @@ static inline void dec_slabs_node(struct kmem_cache *s, int node, · 810 unmodified lines
1494	int objects) {}	1494	int objects) {}
1495		1495
1496	static bool freelist_corrupted(struct kmem_cache s, struct page page,	1496	static bool freelist_corrupted(struct kmem_cache s, struct page page,
1497	void freelist, void nextfree)	1497	void *freelist, void nextfree)
1498	{	1498	{
1499	return false;	1499	return false;
1500	}	1500	}
@@ -2184,7 +2184,7 @@ static void deactivate_slab(struct kmem_cache s, struct page page, · 683 unmodified lines
2184	* 'freelist' is already corrupted. So isolate all objects	2184	* 'freelist' is already corrupted. So isolate all objects
2185	* starting at 'freelist'.	2185	* starting at 'freelist'.
2186	*/	2186	*/
2187	if (freelist_corrupted(s, page, freelist, nextfree))	2187	if (freelist_corrupted(s, page, &freelist, nextfree))
2188	break;	2188	break;
2189		2189
2190	do {	2190	do {

mm/vmscan.c+8−0

@@ -2615,6 +2615,14 @@ static void shrink_node_memcgs(pg_data_t pgdat, struct scan_control sc) · 2614 unmodified lines
2615	unsigned long reclaimed;	2615	unsigned long reclaimed;
2616	unsigned long scanned;	2616	unsigned long scanned;
2617		2617
		2618	/*
		2619	* This loop can become CPU-bound when target memcgs
		2620	* aren't eligible for reclaim - either because they
		2621	* don't have any reclaimable pages, or because their
		2622	* memory is explicitly protected. Avoid soft lockups.
		2623	*/
		2624	cond_resched();
		2625
2618	mem_cgroup_calculate_protection(target_memcg, memcg);	2626	mem_cgroup_calculate_protection(target_memcg, memcg);
2619		2627
2620	if (mem_cgroup_below_min(memcg)) {	2628	if (mem_cgroup_below_min(memcg)) {

mm/vmstat.c+1−0

@@ -1241,6 +1241,7 @@ const char * const vmstat_text[] = { · 1240 unmodified lines
1241	"pglazyfreed",	1241	"pglazyfreed",
1242		1242
1243	"pgrefill",	1243	"pgrefill",
		1244	"pgreuse",
1244	"pgsteal_kswapd",	1245	"pgsteal_kswapd",
1245	"pgsteal_direct",	1246	"pgsteal_direct",
1246	"pgscan_kswapd",	1247	"pgscan_kswapd",

net/batman-adv/bat_v_ogm.c+6−5

 		   ntohl(ogm_packet->seqno), ogm_throughput, ogm_packet->ttl,
 		   ogm_packet->version, ntohs(ogm_packet->tvlv_len));
+	if (batadv_is_my_mac(bat_priv, ogm_packet->orig)) {
+		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+			   "Drop packet: originator packet from ourself\n");
+		return;
+	}
 	/* If the throughput metric is 0, immediately drop the packet. No need
 	 * to create orig_node / neigh_node for an unusable route.
 	 */
 	if (batadv_is_my_mac(bat_priv, ethhdr->h_source))
 		goto free_skb;
-	ogm_packet = (struct batadv_ogm2_packet *)skb->data;
-	if (batadv_is_my_mac(bat_priv, ogm_packet->orig))
-		goto free_skb;
 	batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_RX);
 	batadv_add_counter(bat_priv, BATADV_CNT_MGMT_RX_BYTES,
 			   skb->len + ETH_HLEN);

net/batman-adv/bridge_loop_avoidance.c+4−1

 	batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES,
 			   skb->len + ETH_HLEN);
-	netif_rx(skb);
+	if (in_interrupt())
+		netif_rx(skb);
+	else
+		netif_rx_ni(skb);
 out:
 	if (primary_if)
 		batadv_hardif_put(primary_if);

net/batman-adv/gateway_client.c+4−2

 	chaddr_offset = *header_len + BATADV_DHCP_CHADDR_OFFSET;
 	/* store the client address if the message is going to a client */
-	if (ret == BATADV_DHCP_TO_CLIENT &&
+	if (ret == BATADV_DHCP_TO_CLIENT) {
-	    pskb_may_pull(skb, chaddr_offset + ETH_ALEN)) {
+		if (!pskb_may_pull(skb, chaddr_offset + ETH_ALEN))
+			return BATADV_DHCP_NO;
 		/* check if the DHCP packet carries an Ethernet DHCP */
 		p = skb->data + *header_len + BATADV_DHCP_HTYPE_OFFSET;
 		if (*p != BATADV_DHCP_HTYPE_ETHERNET)

net/caif/cfrfml.c+2−2

@@ -116,7 +116,7 @@ static int cfrfml_receive(struct cflayer layr, struct cfpkt pkt) · 115 unmodified lines
116	if (segmented) {	116	if (segmented) {
117	if (rfml->incomplete_frm == NULL) {	117	if (rfml->incomplete_frm == NULL) {
118	/* Initial Segment */	118	/* Initial Segment */
119	if (cfpkt_peek_head(pkt, rfml->seghead, 6) < 0)	119	if (cfpkt_peek_head(pkt, rfml->seghead, 6) != 0)
120	goto out;	120	goto out;
121		121
122	rfml->pdu_size = get_unaligned_le16(rfml->seghead+4);	122	rfml->pdu_size = get_unaligned_le16(rfml->seghead+4);
@@ -233,7 +233,7 @@ static int cfrfml_transmit(struct cflayer layr, struct cfpkt pkt) · 110 unmodified lines
233	if (cfpkt_getlen(pkt) > rfml->fragment_size + RFM_HEAD_SIZE)	233	if (cfpkt_getlen(pkt) > rfml->fragment_size + RFM_HEAD_SIZE)
234	err = cfpkt_peek_head(pkt, head, 6);	234	err = cfpkt_peek_head(pkt, head, 6);
235		235
236	if (err < 0)	236	if (err != 0)
237	goto out;	237	goto out;
238		238
239	while (cfpkt_getlen(frontpkt) > rfml->fragment_size + RFM_HEAD_SIZE) {	239	while (cfpkt_getlen(frontpkt) > rfml->fragment_size + RFM_HEAD_SIZE) {

net/core/dev.c+2−1

 		netdev_err_once(dev, "%s() called with weight %d\n", __func__,
 				weight);
 	napi->weight = weight;
-	list_add(&napi->dev_list, &dev->napi_list);
 	napi->dev = dev;
 #ifdef CONFIG_NETPOLL
 	napi->poll_owner = -1;
 #endif
 	set_bit(NAPI_STATE_SCHED, &napi->state);
+	set_bit(NAPI_STATE_NPSVC, &napi->state);
+	list_add_rcu(&napi->dev_list, &dev->napi_list);
 	napi_hash_add(napi);
 }
 EXPORT_SYMBOL(netif_napi_add);

net/core/netpoll.c+1−1

@@ -162,7 +162,7 @@ static void poll_napi(struct net_device *dev) · 161 unmodified lines
162	struct napi_struct *napi;	162	struct napi_struct *napi;
163	int cpu = smp_processor_id();	163	int cpu = smp_processor_id();
164		164
165	list_for_each_entry(napi, &dev->napi_list, dev_list) {	165	list_for_each_entry_rcu(napi, &dev->napi_list, dev_list) {
166	if (cmpxchg(&napi->poll_owner, -1, cpu) == -1) {	166	if (cmpxchg(&napi->poll_owner, -1, cpu) == -1) {
167	poll_one_napi(napi);	167	poll_one_napi(napi);
168	smp_store_release(&napi->poll_owner, -1);	168	smp_store_release(&napi->poll_owner, -1);

net/core/pktgen.c+1−1

@@ -3699,7 +3699,7 @@ static int __net_init pktgen_create_thread(int cpu, struct pktgen_net *pn) · 3698 unmodified lines
3699	cpu_to_node(cpu),	3699	cpu_to_node(cpu),
3700	"kpktgend_%d", cpu);	3700	"kpktgend_%d", cpu);
3701	if (IS_ERR(p)) {	3701	if (IS_ERR(p)) {
3702	pr_err("kernel_thread() failed for cpu %d\n", t->cpu);	3702	pr_err("kthread_create_on_node() failed for cpu %d\n", t->cpu);
3703	list_del(&t->th_list);	3703	list_del(&t->th_list);
3704	kfree(t);	3704	kfree(t);
3705	return PTR_ERR(p);	3705	return PTR_ERR(p);

net/core/skbuff.c+2−0

 }
 EXPORT_SYMBOL(skb_tx_error);
+#ifdef CONFIG_TRACEPOINTS
 /**
  *	consume_skb - free an skbuff
  *	@skb: buffer to free
 	__kfree_skb(skb);
 }
 EXPORT_SYMBOL(consume_skb);
+#endif
 /**
  *	consume_stateless_skb - free an skbuff, assuming it is stateless

net/core/sock.c+1−1

@@ -3254,7 +3254,7 @@ void sk_common_release(struct sock *sk) · 3253 unmodified lines
3254	sk->sk_prot->destroy(sk);	3254	sk->sk_prot->destroy(sk);
3255		3255
3256	/*	3256	/*
3257	* Observation: when sock_common_release is called, processes have	3257	* Observation: when sk_common_release is called, processes have
3258	* no access to socket. But net still has.	3258	* no access to socket. But net still has.
3259	* Step one, detach it from networking:	3259	* Step one, detach it from networking:
3260	*	3260	*

net/ipv4/fib_trie.c+2−1

@@ -2121,7 +2121,8 @@ void fib_info_notify_update(struct net net, struct nl_info info) · 2120 unmodified lines
2121	struct hlist_head *head = &net->ipv4.fib_table_hash[h];	2121	struct hlist_head *head = &net->ipv4.fib_table_hash[h];
2122	struct fib_table *tb;	2122	struct fib_table *tb;
2123		2123
2124	hlist_for_each_entry_rcu(tb, head, tb_hlist)	2124	hlist_for_each_entry_rcu(tb, head, tb_hlist,
		2125	lockdep_rtnl_is_held())
2125	__fib_info_notify_update(net, tb, info);	2126	__fib_info_notify_update(net, tb, info);
2126	}	2127	}
2127	}	2128	}

net/ipv4/netfilter/nf_nat_pptp.c+1−1

@@ -3,7 +3,7 @@ · 2 unmodified lines
3	* nf_nat_pptp.c	3	* nf_nat_pptp.c
4	*	4	*
5	* NAT support for PPTP (Point to Point Tunneling Protocol).	5	* NAT support for PPTP (Point to Point Tunneling Protocol).
6	* PPTP is a a protocol for creating virtual private networks.	6	* PPTP is a protocol for creating virtual private networks.
7	* It is a specification defined by Microsoft and some vendors	7	* It is a specification defined by Microsoft and some vendors
8	* working with Microsoft. PPTP is built on top of a modified	8	* working with Microsoft. PPTP is built on top of a modified
9	* version of the Internet Generic Routing Encapsulation Protocol.	9	* version of the Internet Generic Routing Encapsulation Protocol.

net/ipv4/raw.c+1−1

@@ -610,7 +610,7 @@ static int raw_sendmsg(struct sock sk, struct msghdr msg, size_t len) · 609 unmodified lines
610	} else if (!ipc.oif) {	610	} else if (!ipc.oif) {
611	ipc.oif = inet->uc_index;	611	ipc.oif = inet->uc_index;
612	} else if (ipv4_is_lbcast(daddr) && inet->uc_index) {	612	} else if (ipv4_is_lbcast(daddr) && inet->uc_index) {
613	/* oif is set, packet is to local broadcast and	613	/* oif is set, packet is to local broadcast
614	* and uc_index is set. oif is most likely set	614	* and uc_index is set. oif is most likely set
615	* by sk_bound_dev_if. If uc_index != oif check if the	615	* by sk_bound_dev_if. If uc_index != oif check if the
616	* oif is an L3 master and uc_index is an L3 slave.	616	* oif is an L3 master and uc_index is an L3 slave.

net/ipv6/sysctl_net_ipv6.c+2−1

 #include <net/calipso.h>
 #endif
+static int two = 2;
 static int flowlabel_reflect_max = 0x7;
 static int auto_flowlabels_min;
 static int auto_flowlabels_max = IP6_AUTO_FLOW_LABEL_MAX;
 		.mode		= 0644,
 		.proc_handler   = proc_rt6_multipath_hash_policy,
 		.extra1		= SYSCTL_ZERO,
-		.extra2		= SYSCTL_ONE,
+		.extra2		= &two,
 	},
 	{
 		.procname	= "seg6_flowlabel",

net/l3mdev/l3mdev.c+1−1

@@ -154,7 +154,7 @@ int l3mdev_master_upper_ifindex_by_index_rcu(struct net *net, int ifindex) · 153 unmodified lines
154	EXPORT_SYMBOL_GPL(l3mdev_master_upper_ifindex_by_index_rcu);	154	EXPORT_SYMBOL_GPL(l3mdev_master_upper_ifindex_by_index_rcu);
155		155
156	/**	156	/**
157	* l3mdev_fib_table - get FIB table id associated with an L3	157	* l3mdev_fib_table_rcu - get FIB table id associated with an L3
158	* master interface	158	* master interface
159	* @dev: targeted interface	159	* @dev: targeted interface
160	*/	160	*/

net/mac80211/airtime.c+146−56

@@ -405,18 +405,14 @@ ieee80211_calc_legacy_rate_duration(u16 bitrate, bool short_pre, · 404 unmodified lines
405	return duration;	405	return duration;
406	}	406	}
407		407
408	u32 ieee80211_calc_rx_airtime(struct ieee80211_hw *hw,	408	static u32 ieee80211_get_rate_duration(struct ieee80211_hw *hw,
409	struct ieee80211_rx_status *status,	409	struct ieee80211_rx_status *status,
410	int len)	410	u32 *overhead)
411	{	411	{
412	struct ieee80211_supported_band *sband;
413	const struct ieee80211_rate *rate;
414	bool sgi = status->enc_flags & RX_ENC_FLAG_SHORT_GI;	412	bool sgi = status->enc_flags & RX_ENC_FLAG_SHORT_GI;
415	bool sp = status->enc_flags & RX_ENC_FLAG_SHORTPRE;
416	int bw, streams;	413	int bw, streams;
417	int group, idx;	414	int group, idx;
418	u32 duration;	415	u32 duration;
419	bool cck;
420		416
421	switch (status->bw) {	417	switch (status->bw) {
422	case RATE_INFO_BW_20:	418	case RATE_INFO_BW_20:
@@ -437,20 +433,6 @@ u32 ieee80211_calc_rx_airtime(struct ieee80211_hw *hw, · 14 unmodified lines
437	}	433	}
438		434
439	switch (status->encoding) {	435	switch (status->encoding) {
440	case RX_ENC_LEGACY:
441	if (WARN_ON_ONCE(status->band > NL80211_BAND_5GHZ))
442	return 0;
443
444	sband = hw->wiphy->bands[status->band];
445	if (!sband \|\| status->rate_idx >= sband->n_bitrates)
446	return 0;
447
448	rate = &sband->bitrates[status->rate_idx];
449	cck = rate->flags & IEEE80211_RATE_MANDATORY_B;
450
451	return ieee80211_calc_legacy_rate_duration(rate->bitrate, sp,
452	cck, len);
453
454	case RX_ENC_VHT:	436	case RX_ENC_VHT:
455	streams = status->nss;	437	streams = status->nss;
456	idx = status->rate_idx;	438	idx = status->rate_idx;
@@ -477,51 +459,144 @@ u32 ieee80211_calc_rx_airtime(struct ieee80211_hw *hw, · 20 unmodified lines
477		459
478	duration = airtime_mcs_groups[group].duration[idx];	460	duration = airtime_mcs_groups[group].duration[idx];
479	duration <<= airtime_mcs_groups[group].shift;	461	duration <<= airtime_mcs_groups[group].shift;
		462	*overhead = 36 + (streams << 2);
		463
		464	return duration;
		465	}
		466
		467
		468	u32 ieee80211_calc_rx_airtime(struct ieee80211_hw *hw,
		469	struct ieee80211_rx_status *status,
		470	int len)
		471	{
		472	struct ieee80211_supported_band *sband;
		473	u32 duration, overhead = 0;
		474
		475	if (status->encoding == RX_ENC_LEGACY) {
		476	const struct ieee80211_rate *rate;
		477	bool sp = status->enc_flags & RX_ENC_FLAG_SHORTPRE;
		478	bool cck;
		479
		480	if (WARN_ON_ONCE(status->band > NL80211_BAND_5GHZ))
		481	return 0;
		482
		483	sband = hw->wiphy->bands[status->band];
		484	if (!sband \|\| status->rate_idx >= sband->n_bitrates)
		485	return 0;
		486
		487	rate = &sband->bitrates[status->rate_idx];
		488	cck = rate->flags & IEEE80211_RATE_MANDATORY_B;
		489
		490	return ieee80211_calc_legacy_rate_duration(rate->bitrate, sp,
		491	cck, len);
		492	}
		493
		494	duration = ieee80211_get_rate_duration(hw, status, &overhead);
		495	if (!duration)
		496	return 0;
		497
480	duration *= len;	498	duration *= len;
481	duration /= AVG_PKT_SIZE;	499	duration /= AVG_PKT_SIZE;
482	duration /= 1024;	500	duration /= 1024;
483		501
484	duration += 36 + (streams << 2);	502	return duration + overhead;
485
486	return duration;
487	}	503	}
488	EXPORT_SYMBOL_GPL(ieee80211_calc_rx_airtime);	504	EXPORT_SYMBOL_GPL(ieee80211_calc_rx_airtime);
489		505
490	static u32 ieee80211_calc_tx_airtime_rate(struct ieee80211_hw *hw,	506	static bool ieee80211_fill_rate_info(struct ieee80211_hw *hw,
491	struct ieee80211_tx_rate *rate,	507	struct ieee80211_rx_status *stat, u8 band,
492	u8 band, int len)	508	struct rate_info *ri)
493	{	509	{
494	struct ieee80211_rx_status stat = {	510	struct ieee80211_supported_band *sband = hw->wiphy->bands[band];
495	.band = band,	511	int i;
496	};
497		512
498	if (rate->idx < 0 \|\| !rate->count)	513	if (!ri \|\| !sband)
		514	return false;
		515
		516	stat->bw = ri->bw;
		517	stat->nss = ri->nss;
		518	stat->rate_idx = ri->mcs;
		519
		520	if (ri->flags & RATE_INFO_FLAGS_HE_MCS)
		521	stat->encoding = RX_ENC_HE;
		522	else if (ri->flags & RATE_INFO_FLAGS_VHT_MCS)
		523	stat->encoding = RX_ENC_VHT;
		524	else if (ri->flags & RATE_INFO_FLAGS_MCS)
		525	stat->encoding = RX_ENC_HT;
		526	else
		527	stat->encoding = RX_ENC_LEGACY;
		528
		529	if (ri->flags & RATE_INFO_FLAGS_SHORT_GI)
		530	stat->enc_flags \|= RX_ENC_FLAG_SHORT_GI;
		531
		532	stat->he_gi = ri->he_gi;
		533
		534	if (stat->encoding != RX_ENC_LEGACY)
		535	return true;
		536
		537	stat->rate_idx = 0;
		538	for (i = 0; i < sband->n_bitrates; i++) {
		539	if (ri->legacy != sband->bitrates[i].bitrate)
		540	continue;
		541
		542	stat->rate_idx = i;
		543	return true;
		544	}
		545
		546	return false;
		547	}
		548
		549	static int ieee80211_fill_rx_status(struct ieee80211_rx_status *stat,
		550	struct ieee80211_hw *hw,
		551	struct ieee80211_tx_rate *rate,
		552	struct rate_info *ri, u8 band, int len)
		553	{
		554	memset(stat, 0, sizeof(*stat));
		555	stat->band = band;
		556
		557	if (ieee80211_fill_rate_info(hw, stat, band, ri))
499	return 0;	558	return 0;
500		559
		560	if (rate->idx < 0 \|\| !rate->count)
		561	return -1;
		562
501	if (rate->flags & IEEE80211_TX_RC_80_MHZ_WIDTH)	563	if (rate->flags & IEEE80211_TX_RC_80_MHZ_WIDTH)
502	stat.bw = RATE_INFO_BW_80;	564	stat->bw = RATE_INFO_BW_80;
503	else if (rate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH)	565	else if (rate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
504	stat.bw = RATE_INFO_BW_40;	566	stat->bw = RATE_INFO_BW_40;
505	else	567	else
506	stat.bw = RATE_INFO_BW_20;	568	stat->bw = RATE_INFO_BW_20;
507		569
508	stat.enc_flags = 0;	570	stat->enc_flags = 0;
509	if (rate->flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)	571	if (rate->flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)
510	stat.enc_flags \|= RX_ENC_FLAG_SHORTPRE;	572	stat->enc_flags \|= RX_ENC_FLAG_SHORTPRE;
511	if (rate->flags & IEEE80211_TX_RC_SHORT_GI)	573	if (rate->flags & IEEE80211_TX_RC_SHORT_GI)
512	stat.enc_flags \|= RX_ENC_FLAG_SHORT_GI;	574	stat->enc_flags \|= RX_ENC_FLAG_SHORT_GI;
513		575
514	stat.rate_idx = rate->idx;	576	stat->rate_idx = rate->idx;
515	if (rate->flags & IEEE80211_TX_RC_VHT_MCS) {	577	if (rate->flags & IEEE80211_TX_RC_VHT_MCS) {
516	stat.encoding = RX_ENC_VHT;	578	stat->encoding = RX_ENC_VHT;
517	stat.rate_idx = ieee80211_rate_get_vht_mcs(rate);	579	stat->rate_idx = ieee80211_rate_get_vht_mcs(rate);
518	stat.nss = ieee80211_rate_get_vht_nss(rate);	580	stat->nss = ieee80211_rate_get_vht_nss(rate);
519	} else if (rate->flags & IEEE80211_TX_RC_MCS) {	581	} else if (rate->flags & IEEE80211_TX_RC_MCS) {
520	stat.encoding = RX_ENC_HT;	582	stat->encoding = RX_ENC_HT;
521	} else {	583	} else {
522	stat.encoding = RX_ENC_LEGACY;	584	stat->encoding = RX_ENC_LEGACY;
523	}	585	}
524		586
		587	return 0;
		588	}
		589
		590	static u32 ieee80211_calc_tx_airtime_rate(struct ieee80211_hw *hw,
		591	struct ieee80211_tx_rate *rate,
		592	struct rate_info *ri,
		593	u8 band, int len)
		594	{
		595	struct ieee80211_rx_status stat;
		596
		597	if (ieee80211_fill_rx_status(&stat, hw, rate, ri, band, len))
		598	return 0;
		599
525	return ieee80211_calc_rx_airtime(hw, &stat, len);	600	return ieee80211_calc_rx_airtime(hw, &stat, len);
526	}	601	}
527		602
@@ -536,7 +611,7 @@ u32 ieee80211_calc_tx_airtime(struct ieee80211_hw *hw, · 8 unmodified lines
536	struct ieee80211_tx_rate *rate = &info->status.rates[i];	611	struct ieee80211_tx_rate *rate = &info->status.rates[i];
537	u32 cur_duration;	612	u32 cur_duration;
538		613
539	cur_duration = ieee80211_calc_tx_airtime_rate(hw, rate,	614	cur_duration = ieee80211_calc_tx_airtime_rate(hw, rate, NULL,
540	info->band, len);	615	info->band, len);
541	if (!cur_duration)	616	if (!cur_duration)
542	break;	617	break;
@@ -572,26 +647,41 @@ u32 ieee80211_calc_expected_tx_airtime(struct ieee80211_hw *hw, · 29 unmodified lines
572	if (pubsta) {	647	if (pubsta) {
573	struct sta_info *sta = container_of(pubsta, struct sta_info,	648	struct sta_info *sta = container_of(pubsta, struct sta_info,
574	sta);	649	sta);
		650	struct ieee80211_rx_status stat;
575	struct ieee80211_tx_rate *rate = &sta->tx_stats.last_rate;	651	struct ieee80211_tx_rate *rate = &sta->tx_stats.last_rate;
576	u32 airtime;	652	struct rate_info *ri = &sta->tx_stats.last_rate_info;
		653	u32 duration, overhead;
		654	u8 agg_shift;
577		655
578	if (!(rate->flags & (IEEE80211_TX_RC_VHT_MCS \|	656	if (ieee80211_fill_rx_status(&stat, hw, rate, ri, band, len))
579	IEEE80211_TX_RC_MCS)))	657	return 0;
580	ampdu = false;
581		658
		659	if (stat.encoding == RX_ENC_LEGACY \|\| !ampdu)
		660	return ieee80211_calc_rx_airtime(hw, &stat, len);
		661
		662	duration = ieee80211_get_rate_duration(hw, &stat, &overhead);
582	/*	663	/*
583	* Assume that HT/VHT transmission on any AC except VO will	664	* Assume that HT/VHT transmission on any AC except VO will
584	* use aggregation. Since we don't have reliable reporting	665	* use aggregation. Since we don't have reliable reporting
585	* of aggregation length, assume an average of 16.	666	* of aggregation length, assume an average size based on the
		667	* tx rate.
586	* This will not be very accurate, but much better than simply	668	* This will not be very accurate, but much better than simply
587	* assuming un-aggregated tx.	669	* assuming un-aggregated tx in all cases.
588	*/	670	*/
589	airtime = ieee80211_calc_tx_airtime_rate(hw, rate, band,	671	if (duration > 400) /* <= VHT20 MCS2 1S */
590	ampdu ? len * 16 : len);	672	agg_shift = 1;
591	if (ampdu)	673	else if (duration > 250) /* <= VHT20 MCS3 1S or MCS1 2S */
592	airtime /= 16;	674	agg_shift = 2;
593		675	else if (duration > 150) /* <= VHT20 MCS5 1S or MCS3 2S */
594	return airtime;	676	agg_shift = 3;
		677	else
		678	agg_shift = 4;
		679
		680	duration *= len;
		681	duration /= AVG_PKT_SIZE;
		682	duration /= 1024;
		683
		684	return duration + (overhead >> agg_shift);
595	}	685	}
596		686
597	if (!conf)	687	if (!conf)

net/mac80211/sta_info.h+3−2

  * @status_stats.retry_failed: # of frames that failed after retry
  * @status_stats.retry_count: # of retries attempted
  * @status_stats.lost_packets: # of lost packets
- * @status_stats.last_tdls_pkt_time: timestamp of last TDLS packet
+ * @status_stats.last_pkt_time: timestamp of last ACKed packet
  * @status_stats.msdu_retries: # of MSDU retries
  * @status_stats.msdu_failed: # of failed MSDUs
  * @status_stats.last_ack: last ack timestamp (jiffies)
 		unsigned long filtered;
 		unsigned long retry_failed, retry_count;
 		unsigned int lost_packets;
-		unsigned long last_tdls_pkt_time;
+		unsigned long last_pkt_time;
 		u64 msdu_retries[IEEE80211_NUM_TIDS + 1];
 		u64 msdu_failed[IEEE80211_NUM_TIDS + 1];
 		unsigned long last_ack;
 		u64 packets[IEEE80211_NUM_ACS];
 		u64 bytes[IEEE80211_NUM_ACS];
 		struct ieee80211_tx_rate last_rate;
+		struct rate_info last_rate_info;
 		u64 msdu[IEEE80211_NUM_TIDS + 1];
 	} tx_stats;
 	u16 tid_seq[IEEE80211_QOS_CTL_TID_MASK + 1];

net/mac80211/status.c+23−20

  *  - current throughput (higher value for higher tpt)?
  */
 #define STA_LOST_PKT_THRESHOLD	50
+#define STA_LOST_PKT_TIME	HZ		/* 1 sec since last ACK */
 #define STA_LOST_TDLS_PKT_THRESHOLD	10
 #define STA_LOST_TDLS_PKT_TIME		(10*HZ) /* 10secs since last ACK */
 static void ieee80211_lost_packet(struct sta_info *sta,
 				  struct ieee80211_tx_info *info)
 {
+	unsigned long pkt_time = STA_LOST_PKT_TIME;
+	unsigned int pkt_thr = STA_LOST_PKT_THRESHOLD;
 	/* If driver relies on its own algorithm for station kickout, skip
 	 * mac80211 packet loss mechanism.
 	 */
 		return;
 	sta->status_stats.lost_packets++;
-	if (!sta->sta.tdls &&
+	if (sta->sta.tdls) {
-	    sta->status_stats.lost_packets < STA_LOST_PKT_THRESHOLD)
+		pkt_time = STA_LOST_TDLS_PKT_TIME;
-		return;
+		pkt_thr = STA_LOST_PKT_THRESHOLD;
+	}
 	/*
 	 * If we're in TDLS mode, make sure that all STA_LOST_TDLS_PKT_THRESHOLD
 	 * of the last packets were lost, and that no ACK was received in the
 	 * last STA_LOST_TDLS_PKT_TIME ms, before triggering the CQM packet-loss
 	 * mechanism.
+	 * For non-TDLS, use STA_LOST_PKT_THRESHOLD and STA_LOST_PKT_TIME
 	 */
-	if (sta->sta.tdls &&
+	if (sta->status_stats.lost_packets < pkt_thr ||
-	    (sta->status_stats.lost_packets < STA_LOST_TDLS_PKT_THRESHOLD ||
+	    !time_after(jiffies, sta->status_stats.last_pkt_time + pkt_time))
-	     time_before(jiffies,
-			 sta->status_stats.last_tdls_pkt_time +
-			 STA_LOST_TDLS_PKT_TIME)))
 		return;
 	cfg80211_cqm_pktloss_notify(sta->sdata->dev, sta->sta.addr,
 					sta->status_stats.lost_packets = 0;
 				/* Track when last TDLS packet was ACKed */
-				if (test_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH))
+				sta->status_stats.last_pkt_time = jiffies;
-					sta->status_stats.last_tdls_pkt_time =
-						jiffies;
 			} else if (noack_success) {
 				/* nothing to do here, do not account as lost */
 			} else {
 	struct ieee80211_tx_info *info = status->info;
 	struct ieee80211_sta *pubsta = status->sta;
 	struct ieee80211_supported_band *sband;
+	struct sta_info *sta;
 	int retry_count;
 	bool acked, noack_success;
+	if (pubsta) {
+		sta = container_of(pubsta, struct sta_info, sta);
+		if (status->rate)
+			sta->tx_stats.last_rate_info = *status->rate;
+	}
 	if (status->skb)
 		return __ieee80211_tx_status(hw, status);
 	noack_success = !!(info->flags & IEEE80211_TX_STAT_NOACK_TRANSMITTED);
 	if (pubsta) {
-		struct sta_info *sta;
-		sta = container_of(pubsta, struct sta_info, sta);
 		if (!acked && !noack_success)
 			sta->status_stats.retry_failed++;
 		sta->status_stats.retry_count += retry_count;
 			if (sta->status_stats.lost_packets)
 				sta->status_stats.lost_packets = 0;
-			/* Track when last TDLS packet was ACKed */
+			/* Track when last packet was ACKed */
-			if (test_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH))
+			sta->status_stats.last_pkt_time = jiffies;
-				sta->status_stats.last_tdls_pkt_time = jiffies;
 		} else if (test_sta_flag(sta, WLAN_STA_PS_STA)) {
 			return;
 		} else if (noack_success) {
 			if (sta->status_stats.lost_packets)
 				sta->status_stats.lost_packets = 0;
-			if (test_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH))
+			sta->status_stats.last_pkt_time = jiffies;
-				sta->status_stats.last_tdls_pkt_time = jiffies;
 		} else {
 			ieee80211_lost_packet(sta, info);
 		}

net/mptcp/protocol.c+1−2

 		goto out;
 	}
-wait_for_sndbuf:
 	__mptcp_flush_join_list(msk);
 	ssk = mptcp_subflow_get_send(msk);
 	while (!sk_stream_memory_free(sk) ||
 				 */
 				mptcp_set_timeout(sk, ssk);
 				release_sock(ssk);
-				goto wait_for_sndbuf;
+				goto restart;
 			}
 		}
 	}

net/netfilter/nf_conntrack_pptp.c+1−1

@@ -1,7 +1,7 @@
1	// SPDX-License-Identifier: GPL-2.0-only	1	// SPDX-License-Identifier: GPL-2.0-only
2	/*	2	/*
3	* Connection tracking support for PPTP (Point to Point Tunneling Protocol).	3	* Connection tracking support for PPTP (Point to Point Tunneling Protocol).
4	* PPTP is a a protocol for creating virtual private networks.	4	* PPTP is a protocol for creating virtual private networks.
5	* It is a specification defined by Microsoft and some vendors	5	* It is a specification defined by Microsoft and some vendors
6	* working with Microsoft. PPTP is built on top of a modified	6	* working with Microsoft. PPTP is built on top of a modified
7	* version of the Internet Generic Routing Encapsulation Protocol.	7	* version of the Internet Generic Routing Encapsulation Protocol.

net/netfilter/nf_conntrack_proto_sctp.c+35−4

 	[SCTP_CONNTRACK_HEARTBEAT_ACKED]	= 210 SECS,
 };
+#define	SCTP_FLAG_HEARTBEAT_VTAG_FAILED	1
 #define sNO SCTP_CONNTRACK_NONE
 #define	sCL SCTP_CONNTRACK_CLOSED
 #define	sCW SCTP_CONNTRACK_COOKIE_WAIT
 	u_int32_t offset, count;
 	unsigned int *timeouts;
 	unsigned long map[256 / sizeof(unsigned long)] = { 0 };
+	bool ignore = false;
 	if (sctp_error(skb, dataoff, state))
 		return -NF_ACCEPT;
 			/* Sec 8.5.1 (D) */
 			if (sh->vtag != ct->proto.sctp.vtag[dir])
 				goto out_unlock;
-		} else if (sch->type == SCTP_CID_HEARTBEAT ||
+		} else if (sch->type == SCTP_CID_HEARTBEAT) {
-			   sch->type == SCTP_CID_HEARTBEAT_ACK) {
+			if (ct->proto.sctp.vtag[dir] == 0) {
+				pr_debug("Setting %d vtag %x for dir %d\n", sch->type, sh->vtag, dir);
+				ct->proto.sctp.vtag[dir] = sh->vtag;
+			} else if (sh->vtag != ct->proto.sctp.vtag[dir]) {
+				if (test_bit(SCTP_CID_DATA, map) || ignore)
+					goto out_unlock;
+				ct->proto.sctp.flags |= SCTP_FLAG_HEARTBEAT_VTAG_FAILED;
+				ct->proto.sctp.last_dir = dir;
+				ignore = true;
+				continue;
+			} else if (ct->proto.sctp.flags & SCTP_FLAG_HEARTBEAT_VTAG_FAILED) {
+				ct->proto.sctp.flags &= ~SCTP_FLAG_HEARTBEAT_VTAG_FAILED;
+			}
+		} else if (sch->type == SCTP_CID_HEARTBEAT_ACK) {
 			if (ct->proto.sctp.vtag[dir] == 0) {
 				pr_debug("Setting vtag %x for dir %d\n",
 					 sh->vtag, dir);
 				ct->proto.sctp.vtag[dir] = sh->vtag;
 			} else if (sh->vtag != ct->proto.sctp.vtag[dir]) {
-				pr_debug("Verification tag check failed\n");
+				if (test_bit(SCTP_CID_DATA, map) || ignore)
-				goto out_unlock;
+					goto out_unlock;
+				if ((ct->proto.sctp.flags & SCTP_FLAG_HEARTBEAT_VTAG_FAILED) == 0 ||
+				    ct->proto.sctp.last_dir == dir)
+					goto out_unlock;
+				ct->proto.sctp.flags &= ~SCTP_FLAG_HEARTBEAT_VTAG_FAILED;
+				ct->proto.sctp.vtag[dir] = sh->vtag;
+				ct->proto.sctp.vtag[!dir] = 0;
+			} else if (ct->proto.sctp.flags & SCTP_FLAG_HEARTBEAT_VTAG_FAILED) {
+				ct->proto.sctp.flags &= ~SCTP_FLAG_HEARTBEAT_VTAG_FAILED;
 			}
 		}
 	}
 	spin_unlock_bh(&ct->lock);
+	/* allow but do not refresh timeout */
+	if (ignore)
+		return NF_ACCEPT;
 	timeouts = nf_ct_timeout_lookup(ct);
 	if (!timeouts)
 		timeouts = nf_sctp_pernet(nf_ct_net(ct))->timeouts;

net/netfilter/nf_conntrack_proto_tcp.c+1−1

@@ -1152,7 +1152,7 @@ int nf_conntrack_tcp_packet(struct nf_conn *ct, · 1151 unmodified lines
1152	&& (old_state == TCP_CONNTRACK_SYN_RECV	1152	&& (old_state == TCP_CONNTRACK_SYN_RECV
1153	\|\| old_state == TCP_CONNTRACK_ESTABLISHED)	1153	\|\| old_state == TCP_CONNTRACK_ESTABLISHED)
1154	&& new_state == TCP_CONNTRACK_ESTABLISHED) {	1154	&& new_state == TCP_CONNTRACK_ESTABLISHED) {
1155	/* Set ASSURED if we see see valid ack in ESTABLISHED	1155	/* Set ASSURED if we see valid ack in ESTABLISHED
1156	after SYN_RECV or a valid answer for a picked up	1156	after SYN_RECV or a valid answer for a picked up
1157	connection. */	1157	connection. */
1158	set_bit(IPS_ASSURED_BIT, &ct->status);	1158	set_bit(IPS_ASSURED_BIT, &ct->status);

net/netfilter/nf_conntrack_proto_udp.c+10−16

 	return false;
 }
-static void nf_conntrack_udp_refresh_unreplied(struct nf_conn *ct,
-					       struct sk_buff *skb,
-					       enum ip_conntrack_info ctinfo,
-					       u32 extra_jiffies)
-{
-	if (unlikely(ctinfo == IP_CT_ESTABLISHED_REPLY &&
-		     ct->status & IPS_NAT_CLASH))
-		nf_ct_kill(ct);
-	else
-		nf_ct_refresh_acct(ct, ctinfo, skb, extra_jiffies);
-}
 /* Returns verdict for packet, and may modify conntracktype */
 int nf_conntrack_udp_packet(struct nf_conn *ct,
 			    struct sk_buff *skb,
 		nf_ct_refresh_acct(ct, ctinfo, skb, extra);
+		/* never set ASSURED for IPS_NAT_CLASH, they time out soon */
+		if (unlikely((ct->status & IPS_NAT_CLASH)))
+			return NF_ACCEPT;
 		/* Also, more likely to be important, and not a probe */
 		if (!test_and_set_bit(IPS_ASSURED_BIT, &ct->status))
 			nf_conntrack_event_cache(IPCT_ASSURED, ct);
 	} else {
-		nf_conntrack_udp_refresh_unreplied(ct, skb, ctinfo,
+		nf_ct_refresh_acct(ct, ctinfo, skb, timeouts[UDP_CT_UNREPLIED]);
-						   timeouts[UDP_CT_UNREPLIED]);
 	}
 	return NF_ACCEPT;
 }
 	if (test_bit(IPS_SEEN_REPLY_BIT, &ct->status)) {
 		nf_ct_refresh_acct(ct, ctinfo, skb,
 				   timeouts[UDP_CT_REPLIED]);
+		if (unlikely((ct->status & IPS_NAT_CLASH)))
+			return NF_ACCEPT;
 		/* Also, more likely to be important, and not a probe */
 		if (!test_and_set_bit(IPS_ASSURED_BIT, &ct->status))
 			nf_conntrack_event_cache(IPCT_ASSURED, ct);
 	} else {
-		nf_conntrack_udp_refresh_unreplied(ct, skb, ctinfo,
+		nf_ct_refresh_acct(ct, ctinfo, skb, timeouts[UDP_CT_UNREPLIED]);
-						   timeouts[UDP_CT_UNREPLIED]);
 	}
 	return NF_ACCEPT;
 }

net/netfilter/nf_tables_api.c+31−33

@@ -815,11 +815,11 @@ static int nf_tables_gettable(struct net net, struct sock nlsk, · 814 unmodified lines
815	nlh->nlmsg_seq, NFT_MSG_NEWTABLE, 0,	815	nlh->nlmsg_seq, NFT_MSG_NEWTABLE, 0,
816	family, table);	816	family, table);
817	if (err < 0)	817	if (err < 0)
818	goto err;	818	goto err_fill_table_info;
819		819
820	return nlmsg_unicast(nlsk, skb2, NETLINK_CB(skb).portid);	820	return nfnetlink_unicast(skb2, net, NETLINK_CB(skb).portid);
821		821
822	err:	822	err_fill_table_info:
823	kfree_skb(skb2);	823	kfree_skb(skb2);
824	return err;	824	return err;
825	}	825	}
@@ -1563,11 +1563,11 @@ static int nf_tables_getchain(struct net net, struct sock nlsk, · 737 unmodified lines
1563	nlh->nlmsg_seq, NFT_MSG_NEWCHAIN, 0,	1563	nlh->nlmsg_seq, NFT_MSG_NEWCHAIN, 0,
1564	family, table, chain);	1564	family, table, chain);
1565	if (err < 0)	1565	if (err < 0)
1566	goto err;	1566	goto err_fill_chain_info;
1567		1567
1568	return nlmsg_unicast(nlsk, skb2, NETLINK_CB(skb).portid);	1568	return nfnetlink_unicast(skb2, net, NETLINK_CB(skb).portid);
1569		1569
1570	err:	1570	err_fill_chain_info:
1571	kfree_skb(skb2);	1571	kfree_skb(skb2);
1572	return err;	1572	return err;
1573	}	1573	}
@@ -3008,11 +3008,11 @@ static int nf_tables_getrule(struct net net, struct sock nlsk, · 1434 unmodified lines
3008	nlh->nlmsg_seq, NFT_MSG_NEWRULE, 0,	3008	nlh->nlmsg_seq, NFT_MSG_NEWRULE, 0,
3009	family, table, chain, rule, NULL);	3009	family, table, chain, rule, NULL);
3010	if (err < 0)	3010	if (err < 0)
3011	goto err;	3011	goto err_fill_rule_info;
3012		3012
3013	return nlmsg_unicast(nlsk, skb2, NETLINK_CB(skb).portid);	3013	return nfnetlink_unicast(skb2, net, NETLINK_CB(skb).portid);
3014		3014
3015	err:	3015	err_fill_rule_info:
3016	kfree_skb(skb2);	3016	kfree_skb(skb2);
3017	return err;	3017	return err;
3018	}	3018	}
@@ -3770,7 +3770,8 @@ static int nf_tables_fill_set(struct sk_buff skb, const struct nft_ctx ctx, · 751 unmodified lines
3770	goto nla_put_failure;	3770	goto nla_put_failure;
3771	}	3771	}
3772		3772
3773	if (nla_put(skb, NFTA_SET_USERDATA, set->udlen, set->udata))	3773	if (set->udata &&
		3774	nla_put(skb, NFTA_SET_USERDATA, set->udlen, set->udata))
3774	goto nla_put_failure;	3775	goto nla_put_failure;
3775		3776
3776	nest = nla_nest_start_noflag(skb, NFTA_SET_DESC);	3777	nest = nla_nest_start_noflag(skb, NFTA_SET_DESC);
@@ -3967,11 +3968,11 @@ static int nf_tables_getset(struct net net, struct sock nlsk, · 190 unmodified lines
3967		3968
3968	err = nf_tables_fill_set(skb2, &ctx, set, NFT_MSG_NEWSET, 0);	3969	err = nf_tables_fill_set(skb2, &ctx, set, NFT_MSG_NEWSET, 0);
3969	if (err < 0)	3970	if (err < 0)
3970	goto err;	3971	goto err_fill_set_info;
3971		3972
3972	return nlmsg_unicast(nlsk, skb2, NETLINK_CB(skb).portid);	3973	return nfnetlink_unicast(skb2, net, NETLINK_CB(skb).portid);
3973		3974
3974	err:	3975	err_fill_set_info:
3975	kfree_skb(skb2);	3976	kfree_skb(skb2);
3976	return err;	3977	return err;
3977	}	3978	}
@@ -4859,24 +4860,18 @@ static int nft_get_set_elem(struct nft_ctx ctx, struct nft_set set, · 881 unmodified lines
4859	err = -ENOMEM;	4860	err = -ENOMEM;
4860	skb = nlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC);	4861	skb = nlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC);
4861	if (skb == NULL)	4862	if (skb == NULL)
4862	goto err1;	4863	return err;
4863		4864
4864	err = nf_tables_fill_setelem_info(skb, ctx, ctx->seq, ctx->portid,	4865	err = nf_tables_fill_setelem_info(skb, ctx, ctx->seq, ctx->portid,
4865	NFT_MSG_NEWSETELEM, 0, set, &elem);	4866	NFT_MSG_NEWSETELEM, 0, set, &elem);
4866	if (err < 0)	4867	if (err < 0)
4867	goto err2;	4868	goto err_fill_setelem;
4868		4869
4869	err = nfnetlink_unicast(skb, ctx->net, ctx->portid, MSG_DONTWAIT);	4870	return nfnetlink_unicast(skb, ctx->net, ctx->portid);
4870	/* This avoids a loop in nfnetlink. */
4871	if (err < 0)
4872	goto err1;
4873		4871
4874	return 0;	4872	err_fill_setelem:
4875	err2:
4876	kfree_skb(skb);	4873	kfree_skb(skb);
4877	err1:	4874	return err;
4878	/* this avoids a loop in nfnetlink. */
4879	return err == -EAGAIN ? -ENOBUFS : err;
4880	}	4875	}
4881		4876
4882	/* called with rcu_read_lock held */	4877	/* called with rcu_read_lock held */
@@ -6181,10 +6176,11 @@ static int nf_tables_getobj(struct net net, struct sock nlsk, · 1298 unmodified lines
6181	nlh->nlmsg_seq, NFT_MSG_NEWOBJ, 0,	6176	nlh->nlmsg_seq, NFT_MSG_NEWOBJ, 0,
6182	family, table, obj, reset);	6177	family, table, obj, reset);
6183	if (err < 0)	6178	if (err < 0)
6184	goto err;	6179	goto err_fill_obj_info;
6185		6180
6186	return nlmsg_unicast(nlsk, skb2, NETLINK_CB(skb).portid);	6181	return nfnetlink_unicast(skb2, net, NETLINK_CB(skb).portid);
6187	err:	6182
		6183	err_fill_obj_info:
6188	kfree_skb(skb2);	6184	kfree_skb(skb2);
6189	return err;	6185	return err;
6190	}	6186	}
@@ -7044,10 +7040,11 @@ static int nf_tables_getflowtable(struct net net, struct sock nlsk, · 853 unmodified lines
7044	NFT_MSG_NEWFLOWTABLE, 0, family,	7040	NFT_MSG_NEWFLOWTABLE, 0, family,
7045	flowtable, &flowtable->hook_list);	7041	flowtable, &flowtable->hook_list);
7046	if (err < 0)	7042	if (err < 0)
7047	goto err;	7043	goto err_fill_flowtable_info;
7048		7044
7049	return nlmsg_unicast(nlsk, skb2, NETLINK_CB(skb).portid);	7045	return nfnetlink_unicast(skb2, net, NETLINK_CB(skb).portid);
7050	err:	7046
		7047	err_fill_flowtable_info:
7051	kfree_skb(skb2);	7048	kfree_skb(skb2);
7052	return err;	7049	return err;
7053	}	7050	}
@@ -7233,10 +7230,11 @@ static int nf_tables_getgen(struct net net, struct sock nlsk, · 179 unmodified lines
7233	err = nf_tables_fill_gen_info(skb2, net, NETLINK_CB(skb).portid,	7230	err = nf_tables_fill_gen_info(skb2, net, NETLINK_CB(skb).portid,
7234	nlh->nlmsg_seq);	7231	nlh->nlmsg_seq);
7235	if (err < 0)	7232	if (err < 0)
7236	goto err;	7233	goto err_fill_gen_info;
7237		7234
7238	return nlmsg_unicast(nlsk, skb2, NETLINK_CB(skb).portid);	7235	return nfnetlink_unicast(skb2, net, NETLINK_CB(skb).portid);
7239	err:	7236
		7237	err_fill_gen_info:
7240	kfree_skb(skb2);	7238	kfree_skb(skb2);
7241	return err;	7239	return err;
7242	}	7240	}

net/netfilter/nfnetlink.c+8−3

 }
 EXPORT_SYMBOL_GPL(nfnetlink_set_err);
-int nfnetlink_unicast(struct sk_buff *skb, struct net *net, u32 portid,
+int nfnetlink_unicast(struct sk_buff *skb, struct net *net, u32 portid)
-		      int flags)
 {
-	return netlink_unicast(net->nfnl, skb, portid, flags);
+	int err;
+	err = nlmsg_unicast(net->nfnl, skb, portid);
+	if (err == -EAGAIN)
+		err = -ENOBUFS;
+	return err;
 }
 EXPORT_SYMBOL_GPL(nfnetlink_unicast);

net/netfilter/nfnetlink_log.c+1−2

 			goto out;
 		}
 	}
-	nfnetlink_unicast(inst->skb, inst->net, inst->peer_portid,
+	nfnetlink_unicast(inst->skb, inst->net, inst->peer_portid);
-			  MSG_DONTWAIT);
 out:
 	inst->qlen = 0;
 	inst->skb = NULL;

net/netfilter/nfnetlink_queue.c+1−1

@@ -681,7 +681,7 @@ __nfqnl_enqueue_packet(struct net net, struct nfqnl_instance queue, · 680 unmodified lines
681	*packet_id_ptr = htonl(entry->id);	681	*packet_id_ptr = htonl(entry->id);
682		682
683	/* nfnetlink_unicast will either free the nskb or add it to a socket */	683	/* nfnetlink_unicast will either free the nskb or add it to a socket */
684	err = nfnetlink_unicast(nskb, net, queue->peer_portid, MSG_DONTWAIT);	684	err = nfnetlink_unicast(nskb, net, queue->peer_portid);
685	if (err < 0) {	685	if (err < 0) {
686	if (queue->flags & NFQA_CFG_F_FAIL_OPEN) {	686	if (queue->flags & NFQA_CFG_F_FAIL_OPEN) {
687	failopen = 1;	687	failopen = 1;

net/netfilter/nft_flow_offload.c+1−1

@@ -102,7 +102,7 @@ static void nft_flow_offload_eval(const struct nft_expr *expr, · 101 unmodified lines
102	}	102	}
103		103
104	if (nf_ct_ext_exist(ct, NF_CT_EXT_HELPER) \|\|	104	if (nf_ct_ext_exist(ct, NF_CT_EXT_HELPER) \|\|
105	ct->status & IPS_SEQ_ADJUST)	105	ct->status & (IPS_SEQ_ADJUST \| IPS_NAT_CLASH))
106	goto out;	106	goto out;
107		107
108	if (!nf_ct_is_confirmed(ct))	108	if (!nf_ct_is_confirmed(ct))

net/netfilter/nft_payload.c+3−1

@@ -87,7 +87,9 @@ void nft_payload_eval(const struct nft_expr *expr, · 86 unmodified lines
87	u32 *dest = &regs->data[priv->dreg];	87	u32 *dest = &regs->data[priv->dreg];
88	int offset;	88	int offset;
89		89
90	dest[priv->len / NFT_REG32_SIZE] = 0;	90	if (priv->len % NFT_REG32_SIZE)
		91	dest[priv->len / NFT_REG32_SIZE] = 0;
		92
91	switch (priv->base) {	93	switch (priv->base) {
92	case NFT_PAYLOAD_LL_HEADER:	94	case NFT_PAYLOAD_LL_HEADER:
93	if (!skb_mac_header_was_set(skb))	95	if (!skb_mac_header_was_set(skb))

net/netfilter/nft_set_rbtree.c+47−10

@@ -218,11 +218,11 @@ static int __nft_rbtree_insert(const struct net net, const struct nft_set set, · 217 unmodified lines
218	struct nft_rbtree_elem *new,	218	struct nft_rbtree_elem *new,
219	struct nft_set_ext **ext)	219	struct nft_set_ext **ext)
220	{	220	{
		221	bool overlap = false, dup_end_left = false, dup_end_right = false;
221	struct nft_rbtree *priv = nft_set_priv(set);	222	struct nft_rbtree *priv = nft_set_priv(set);
222	u8 genmask = nft_genmask_next(net);	223	u8 genmask = nft_genmask_next(net);
223	struct nft_rbtree_elem *rbe;	224	struct nft_rbtree_elem *rbe;
224	struct rb_node parent, *p;	225	struct rb_node parent, *p;
225	bool overlap = false;
226	int d;	226	int d;
227		227
228	/* Detect overlaps as we descend the tree. Set the flag in these cases:	228	/* Detect overlaps as we descend the tree. Set the flag in these cases:
@@ -238,24 +238,44 @@ static int __nft_rbtree_insert(const struct net net, const struct nft_set set, · 9 unmodified lines
238	*	238	*
239	* b1. _ _ __>\| !_ _ __\| (insert end before existing start)	239	* b1. _ _ __>\| !_ _ __\| (insert end before existing start)
240	* b2. _ _ ___\| !_ _ _>\| (insert end after existing start)	240	* b2. _ _ ___\| !_ _ _>\| (insert end after existing start)
241	* b3. _ _ ___! >\|_ _ __\| (insert start after existing end)	241	* b3. _ _ ___! >\|_ _ __\| (insert start after existing end, as a leaf)
		242	* '--' no nodes falling in this range
		243	* b4. >\|_ _ ! (insert start before existing start)
242	*	244	*
243	* Case a3. resolves to b3.:	245	* Case a3. resolves to b3.:
244	* - if the inserted start element is the leftmost, because the '0'	246	* - if the inserted start element is the leftmost, because the '0'
245	* element in the tree serves as end element	247	* element in the tree serves as end element
246	* - otherwise, if an existing end is found. Note that end elements are	248	* - otherwise, if an existing end is found immediately to the left. If
247	* always inserted after corresponding start elements.	249	* there are existing nodes in between, we need to further descend the
		250	* tree before we can conclude the new start isn't causing an overlap
		251	*
		252	* or to b4., which, preceded by a3., means we already traversed one or
		253	* more existing intervals entirely, from the right.
248	*	254	*
249	* For a new, rightmost pair of elements, we'll hit cases b3. and b2.,	255	* For a new, rightmost pair of elements, we'll hit cases b3. and b2.,
250	* in that order.	256	* in that order.
251	*	257	*
252	* The flag is also cleared in two special cases:	258	* The flag is also cleared in two special cases:
253	*	259	*
254	* b4. \|__ _ _!\|<_ _ _ (insert start right before existing end)	260	* b5. \|__ _ _!\|<_ _ _ (insert start right before existing end)
255	* b5. \|__ _ >\|!__ _ _ (insert end right after existing start)	261	* b6. \|__ _ >\|!__ _ _ (insert end right after existing start)
256	*	262	*
257	* which always happen as last step and imply that no further	263	* which always happen as last step and imply that no further
258	* overlapping is possible.	264	* overlapping is possible.
		265	*
		266	* Another special case comes from the fact that start elements matching
		267	* an already existing start element are allowed: insertion is not
		268	* performed but we return -EEXIST in that case, and the error will be
		269	* cleared by the caller if NLM_F_EXCL is not present in the request.
		270	* This way, request for insertion of an exact overlap isn't reported as
		271	* error to userspace if not desired.
		272	*
		273	* However, if the existing start matches a pre-existing start, but the
		274	* end element doesn't match the corresponding pre-existing end element,
		275	* we need to report a partial overlap. This is a local condition that
		276	* can be noticed without need for a tracking flag, by checking for a
		277	* local duplicated end for a corresponding start, from left and right,
		278	* separately.
259	*/	279	*/
260		280
261	parent = NULL;	281	parent = NULL;
@@ -272,26 +292,41 @@ static int __nft_rbtree_insert(const struct net net, const struct nft_set set, · 10 unmodified lines
272	if (nft_rbtree_interval_start(new)) {	292	if (nft_rbtree_interval_start(new)) {
273	if (nft_rbtree_interval_end(rbe) &&	293	if (nft_rbtree_interval_end(rbe) &&
274	nft_set_elem_active(&rbe->ext, genmask) &&	294	nft_set_elem_active(&rbe->ext, genmask) &&
275	!nft_set_elem_expired(&rbe->ext))	295	!nft_set_elem_expired(&rbe->ext) && !*p)
276	overlap = false;	296	overlap = false;
277	} else {	297	} else {
		298	if (dup_end_left && !*p)
		299	return -ENOTEMPTY;
		300
278	overlap = nft_rbtree_interval_end(rbe) &&	301	overlap = nft_rbtree_interval_end(rbe) &&
279	nft_set_elem_active(&rbe->ext,	302	nft_set_elem_active(&rbe->ext,
280	genmask) &&	303	genmask) &&
281	!nft_set_elem_expired(&rbe->ext);	304	!nft_set_elem_expired(&rbe->ext);
		305
		306	if (overlap) {
		307	dup_end_right = true;
		308	continue;
		309	}
282	}	310	}
283	} else if (d > 0) {	311	} else if (d > 0) {
284	p = &parent->rb_right;	312	p = &parent->rb_right;
285		313
286	if (nft_rbtree_interval_end(new)) {	314	if (nft_rbtree_interval_end(new)) {
		315	if (dup_end_right && !*p)
		316	return -ENOTEMPTY;
		317
287	overlap = nft_rbtree_interval_end(rbe) &&	318	overlap = nft_rbtree_interval_end(rbe) &&
288	nft_set_elem_active(&rbe->ext,	319	nft_set_elem_active(&rbe->ext,
289	genmask) &&	320	genmask) &&
290	!nft_set_elem_expired(&rbe->ext);	321	!nft_set_elem_expired(&rbe->ext);
291	} else if (nft_rbtree_interval_end(rbe) &&	322
292	nft_set_elem_active(&rbe->ext, genmask) &&	323	if (overlap) {
		324	dup_end_left = true;
		325	continue;
		326	}
		327	} else if (nft_set_elem_active(&rbe->ext, genmask) &&
293	!nft_set_elem_expired(&rbe->ext)) {	328	!nft_set_elem_expired(&rbe->ext)) {
294	overlap = true;	329	overlap = nft_rbtree_interval_end(rbe);
295	}	330	}
296	} else {	331	} else {
297	if (nft_rbtree_interval_end(rbe) &&	332	if (nft_rbtree_interval_end(rbe) &&
@@ -316,6 +351,8 @@ static int __nft_rbtree_insert(const struct net net, const struct nft_set set, · 18 unmodified lines
316	p = &parent->rb_left;	351	p = &parent->rb_left;
317	}	352	}
318	}	353	}
		354
		355	dup_end_left = dup_end_right = false;
319	}	356	}
320		357
321	if (overlap)	358	if (overlap)

net/netfilter/xt_recent.c+1−1

@@ -640,7 +640,7 @@ static void __net_exit recent_proc_net_exit(struct net *net) · 639 unmodified lines
640	struct recent_table *t;	640	struct recent_table *t;
641		641
642	/* recent_net_exit() is called before recent_mt_destroy(). Make sure	642	/* recent_net_exit() is called before recent_mt_destroy(). Make sure
643	* that the parent xt_recent proc entry is is empty before trying to	643	* that the parent xt_recent proc entry is empty before trying to
644	* remove it.	644	* remove it.
645	*/	645	*/
646	spin_lock_bh(&recent_lock);	646	spin_lock_bh(&recent_lock);

net/netlabel/netlabel_domainhash.c+30−29

 			kfree(netlbl_domhsh_addr6_entry(iter6));
 		}
 #endif /* IPv6 */
+		kfree(ptr->def.addrsel);
 	}
 	kfree(ptr->domain);
 	kfree(ptr);
 				goto add_return;
 		}
 #endif /* IPv6 */
+		/* cleanup the new entry since we've moved everything over */
+		netlbl_domhsh_free_entry(&entry->rcu);
 	} else
 		ret_val = -EINVAL;
 {
 	int ret_val = 0;
 	struct audit_buffer *audit_buf;
+	struct netlbl_af4list *iter4;
+	struct netlbl_domaddr4_map *map4;
+#if IS_ENABLED(CONFIG_IPV6)
+	struct netlbl_af6list *iter6;
+	struct netlbl_domaddr6_map *map6;
+#endif /* IPv6 */
 	if (entry == NULL)
 		return -ENOENT;
 		ret_val = -ENOENT;
 	spin_unlock(&netlbl_domhsh_lock);
+	if (ret_val)
+		return ret_val;
 	audit_buf = netlbl_audit_start_common(AUDIT_MAC_MAP_DEL, audit_info);
 	if (audit_buf != NULL) {
 		audit_log_format(audit_buf,
 		audit_log_end(audit_buf);
 	}
-	if (ret_val == 0) {
+	switch (entry->def.type) {
-		struct netlbl_af4list *iter4;
+	case NETLBL_NLTYPE_ADDRSELECT:
-		struct netlbl_domaddr4_map *map4;
+		netlbl_af4list_foreach_rcu(iter4, &entry->def.addrsel->list4) {
-#if IS_ENABLED(CONFIG_IPV6)
+			map4 = netlbl_domhsh_addr4_entry(iter4);
-		struct netlbl_af6list *iter6;
+			cipso_v4_doi_putdef(map4->def.cipso);
-		struct netlbl_domaddr6_map *map6;
+		}
-#endif /* IPv6 */
-		switch (entry->def.type) {
-		case NETLBL_NLTYPE_ADDRSELECT:
-			netlbl_af4list_foreach_rcu(iter4,
-					     &entry->def.addrsel->list4) {
-				map4 = netlbl_domhsh_addr4_entry(iter4);
-				cipso_v4_doi_putdef(map4->def.cipso);
-			}
 #if IS_ENABLED(CONFIG_IPV6)
-			netlbl_af6list_foreach_rcu(iter6,
+		netlbl_af6list_foreach_rcu(iter6, &entry->def.addrsel->list6) {
-					     &entry->def.addrsel->list6) {
+			map6 = netlbl_domhsh_addr6_entry(iter6);
-				map6 = netlbl_domhsh_addr6_entry(iter6);
+			calipso_doi_putdef(map6->def.calipso);
-				calipso_doi_putdef(map6->def.calipso);
+		}
-			}
 #endif /* IPv6 */
-			break;
+		break;
-		case NETLBL_NLTYPE_CIPSOV4:
+	case NETLBL_NLTYPE_CIPSOV4:
-			cipso_v4_doi_putdef(entry->def.cipso);
+		cipso_v4_doi_putdef(entry->def.cipso);
-			break;
+		break;
 #if IS_ENABLED(CONFIG_IPV6)
-		case NETLBL_NLTYPE_CALIPSO:
+	case NETLBL_NLTYPE_CALIPSO:
-			calipso_doi_putdef(entry->def.calipso);
+		calipso_doi_putdef(entry->def.calipso);
-			break;
+		break;
 #endif /* IPv6 */
-		}
-		call_rcu(&entry->rcu, netlbl_domhsh_free_entry);
 	}
+	call_rcu(&entry->rcu, netlbl_domhsh_free_entry);
 	return ret_val;
 }

net/netlink/af_netlink.c+1−1

@@ -353,7 +353,7 @@ static void netlink_rcv_wake(struct sock *sk) · 352 unmodified lines
353	{	353	{
354	struct netlink_sock *nlk = nlk_sk(sk);	354	struct netlink_sock *nlk = nlk_sk(sk);
355		355
356	if (skb_queue_empty(&sk->sk_receive_queue))	356	if (skb_queue_empty_lockless(&sk->sk_receive_queue))
357	clear_bit(NETLINK_S_CONGESTED, &nlk->state);	357	clear_bit(NETLINK_S_CONGESTED, &nlk->state);
358	if (!test_bit(NETLINK_S_CONGESTED, &nlk->state))	358	if (!test_bit(NETLINK_S_CONGESTED, &nlk->state))
359	wake_up_interruptible(&nlk->wait);	359	wake_up_interruptible(&nlk->wait);

net/packet/af_packet.c+6−1

 	int skb_len = skb->len;
 	unsigned int snaplen, res;
 	unsigned long status = TP_STATUS_USER;
-	unsigned short macoff, netoff, hdrlen;
+	unsigned short macoff, hdrlen;
+	unsigned int netoff;
 	struct sk_buff *copy_skb = NULL;
 	struct timespec64 ts;
 	__u32 ts_status;
 		}
 		macoff = netoff - maclen;
 	}
+	if (netoff > USHRT_MAX) {
+		atomic_inc(&po->tp_drops);
+		goto drop_n_restore;
+	}
 	if (po->tp_version <= TPACKET_V2) {
 		if (macoff + snaplen > po->rx_ring.frame_size) {
 			if (po->copy_thresh &&

net/rxrpc/ar-internal.h+8−5

 	RXRPC_CALL_RX_LAST,		/* Received the last packet (at rxtx_top) */
 	RXRPC_CALL_TX_LAST,		/* Last packet in Tx buffer (at rxtx_top) */
 	RXRPC_CALL_SEND_PING,		/* A ping will need to be sent */
-	RXRPC_CALL_PINGING,		/* Ping in process */
 	RXRPC_CALL_RETRANS_TIMEOUT,	/* Retransmission due to timeout occurred */
 	RXRPC_CALL_BEGAN_RX_TIMER,	/* We began the expect_rx_by timer */
 	RXRPC_CALL_RX_HEARD,		/* The peer responded at least once to this call */
 	rxrpc_seq_t		ackr_consumed;	/* Highest packet shown consumed */
 	rxrpc_seq_t		ackr_seen;	/* Highest packet shown seen */
-	/* ping management */
+	/* RTT management */
-	rxrpc_serial_t		ping_serial;	/* Last ping sent */
+	rxrpc_serial_t		rtt_serial[4];	/* Serial number of DATA or PING sent */
-	ktime_t			ping_time;	/* Time last ping sent */
+	ktime_t			rtt_sent_at[4];	/* Time packet sent */
+	unsigned long		rtt_avail;	/* Mask of available slots in bits 0-3,
+						 * Mask of pending samples in 8-11 */
+#define RXRPC_CALL_RTT_AVAIL_MASK	0xf
+#define RXRPC_CALL_RTT_PEND_SHIFT	8
 	/* transmission-phase ACK management */
 	ktime_t			acks_latest_ts;	/* Timestamp of latest ACK received */
 /*
  * rtt.c
  */
-void rxrpc_peer_add_rtt(struct rxrpc_call *, enum rxrpc_rtt_rx_trace,
+void rxrpc_peer_add_rtt(struct rxrpc_call *, enum rxrpc_rtt_rx_trace, int,
 			rxrpc_serial_t, rxrpc_serial_t, ktime_t, ktime_t);
 unsigned long rxrpc_get_rto_backoff(struct rxrpc_peer *, bool);
 void rxrpc_peer_init_rtt(struct rxrpc_peer *);

net/rxrpc/call_object.c+1−0

@@ -153,6 +153,7 @@ struct rxrpc_call rxrpc_alloc_call(struct rxrpc_sock rx, gfp_t gfp, · 152 unmodified lines
153	call->cong_ssthresh = RXRPC_RXTX_BUFF_SIZE - 1;	153	call->cong_ssthresh = RXRPC_RXTX_BUFF_SIZE - 1;
154		154
155	call->rxnet = rxnet;	155	call->rxnet = rxnet;
		156	call->rtt_avail = RXRPC_CALL_RTT_AVAIL_MASK;
156	atomic_inc(&rxnet->nr_calls);	157	atomic_inc(&rxnet->nr_calls);
157	return call;	158	return call;
158		159

net/rxrpc/input.c+70−53

 }
 /*
- * Process a requested ACK.
+ * See if there's a cached RTT probe to complete.
  */
-static void rxrpc_input_requested_ack(struct rxrpc_call *call,
+static void rxrpc_complete_rtt_probe(struct rxrpc_call *call,
-				      ktime_t resp_time,
+				     ktime_t resp_time,
-				      rxrpc_serial_t orig_serial,
+				     rxrpc_serial_t acked_serial,
-				      rxrpc_serial_t ack_serial)
+				     rxrpc_serial_t ack_serial,
+				     enum rxrpc_rtt_rx_trace type)
 {
-	struct rxrpc_skb_priv *sp;
+	rxrpc_serial_t orig_serial;
-	struct sk_buff *skb;
+	unsigned long avail;
 	ktime_t sent_at;
-	int ix;
+	bool matched = false;
+	int i;
-	for (ix = 0; ix < RXRPC_RXTX_BUFF_SIZE; ix++) {
+	avail = READ_ONCE(call->rtt_avail);
-		skb = call->rxtx_buffer[ix];
+	smp_rmb(); /* Read avail bits before accessing data. */
-		if (!skb)
-			continue;
-		sent_at = skb->tstamp;
+	for (i = 0; i < ARRAY_SIZE(call->rtt_serial); i++) {
-		smp_rmb(); /* Read timestamp before serial. */
+		if (!test_bit(i + RXRPC_CALL_RTT_PEND_SHIFT, &avail))
-		sp = rxrpc_skb(skb);
-		if (sp->hdr.serial != orig_serial)
 			continue;
-		goto found;
-	}
-	return;
+		sent_at = call->rtt_sent_at[i];
+		orig_serial = call->rtt_serial[i];
+		if (orig_serial == acked_serial) {
+			clear_bit(i + RXRPC_CALL_RTT_PEND_SHIFT, &call->rtt_avail);
+			smp_mb(); /* Read data before setting avail bit */
+			set_bit(i, &call->rtt_avail);
+			if (type != rxrpc_rtt_rx_cancel)
+				rxrpc_peer_add_rtt(call, type, i, acked_serial, ack_serial,
+						   sent_at, resp_time);
+			else
+				trace_rxrpc_rtt_rx(call, rxrpc_rtt_rx_cancel, i,
+						   orig_serial, acked_serial, 0, 0);
+			matched = true;
+		}
+		/* If a later serial is being acked, then mark this slot as
+		 * being available.
+		 */
+		if (after(acked_serial, orig_serial)) {
+			trace_rxrpc_rtt_rx(call, rxrpc_rtt_rx_obsolete, i,
+					   orig_serial, acked_serial, 0, 0);
+			clear_bit(i + RXRPC_CALL_RTT_PEND_SHIFT, &call->rtt_avail);
+			smp_wmb();
+			set_bit(i, &call->rtt_avail);
+		}
+	}
-found:
+	if (!matched)
-	rxrpc_peer_add_rtt(call, rxrpc_rtt_rx_requested_ack,
+		trace_rxrpc_rtt_rx(call, rxrpc_rtt_rx_lost, 9, 0, acked_serial, 0, 0);
-			   orig_serial, ack_serial, sent_at, resp_time);
 }
 /*
  */
 static void rxrpc_input_ping_response(struct rxrpc_call *call,
 				      ktime_t resp_time,
-				      rxrpc_serial_t orig_serial,
+				      rxrpc_serial_t acked_serial,
 				      rxrpc_serial_t ack_serial)
 {
-	rxrpc_serial_t ping_serial;
+	if (acked_serial == call->acks_lost_ping)
-	ktime_t ping_time;
-	ping_time = call->ping_time;
-	smp_rmb();
-	ping_serial = READ_ONCE(call->ping_serial);
-	if (orig_serial == call->acks_lost_ping)
 		rxrpc_input_check_for_lost_ack(call);
-	if (before(orig_serial, ping_serial) ||
-	    !test_and_clear_bit(RXRPC_CALL_PINGING, &call->flags))
-		return;
-	if (after(orig_serial, ping_serial))
-		return;
-	rxrpc_peer_add_rtt(call, rxrpc_rtt_rx_ping_response,
-			   orig_serial, ack_serial, ping_time, resp_time);
 }
 /*
 		struct rxrpc_ackinfo info;
 		u8 acks[RXRPC_MAXACKS];
 	} buf;
-	rxrpc_serial_t acked_serial;
+	rxrpc_serial_t ack_serial, acked_serial;
 	rxrpc_seq_t first_soft_ack, hard_ack, prev_pkt;
 	int nr_acks, offset, ioffset;
 	}
 	offset += sizeof(buf.ack);
+	ack_serial = sp->hdr.serial;
 	acked_serial = ntohl(buf.ack.serial);
 	first_soft_ack = ntohl(buf.ack.firstPacket);
 	prev_pkt = ntohl(buf.ack.previousPacket);
 	summary.ack_reason = (buf.ack.reason < RXRPC_ACK__INVALID ?
 			      buf.ack.reason : RXRPC_ACK__INVALID);
-	trace_rxrpc_rx_ack(call, sp->hdr.serial, acked_serial,
+	trace_rxrpc_rx_ack(call, ack_serial, acked_serial,
 			   first_soft_ack, prev_pkt,
 			   summary.ack_reason, nr_acks);
-	if (buf.ack.reason == RXRPC_ACK_PING_RESPONSE)
+	switch (buf.ack.reason) {
+	case RXRPC_ACK_PING_RESPONSE:
 		rxrpc_input_ping_response(call, skb->tstamp, acked_serial,
-					  sp->hdr.serial);
+					  ack_serial);
-	if (buf.ack.reason == RXRPC_ACK_REQUESTED)
+		rxrpc_complete_rtt_probe(call, skb->tstamp, acked_serial, ack_serial,
-		rxrpc_input_requested_ack(call, skb->tstamp, acked_serial,
+					 rxrpc_rtt_rx_ping_response);
-					  sp->hdr.serial);
+		break;
+	case RXRPC_ACK_REQUESTED:
+		rxrpc_complete_rtt_probe(call, skb->tstamp, acked_serial, ack_serial,
+					 rxrpc_rtt_rx_requested_ack);
+		break;
+	default:
+		if (acked_serial != 0)
+			rxrpc_complete_rtt_probe(call, skb->tstamp, acked_serial, ack_serial,
+						 rxrpc_rtt_rx_cancel);
+		break;
+	}
 	if (buf.ack.reason == RXRPC_ACK_PING) {
-		_proto("Rx ACK %%%u PING Request", sp->hdr.serial);
+		_proto("Rx ACK %%%u PING Request", ack_serial);
 		rxrpc_propose_ACK(call, RXRPC_ACK_PING_RESPONSE,
-				  sp->hdr.serial, true, true,
+				  ack_serial, true, true,
 				  rxrpc_propose_ack_respond_to_ping);
 	} else if (sp->hdr.flags & RXRPC_REQUEST_ACK) {
 		rxrpc_propose_ACK(call, RXRPC_ACK_REQUESTED,
-				  sp->hdr.serial, true, true,
+				  ack_serial, true, true,
 				  rxrpc_propose_ack_respond_to_ack);
 	}
 	/* Discard any out-of-order or duplicate ACKs (outside lock). */
 	if (!rxrpc_is_ack_valid(call, first_soft_ack, prev_pkt)) {
-		trace_rxrpc_rx_discard_ack(call->debug_id, sp->hdr.serial,
+		trace_rxrpc_rx_discard_ack(call->debug_id, ack_serial,
 					   first_soft_ack, call->ackr_first_seq,
 					   prev_pkt, call->ackr_prev_seq);
 		return;
 	/* Discard any out-of-order or duplicate ACKs (inside lock). */
 	if (!rxrpc_is_ack_valid(call, first_soft_ack, prev_pkt)) {
-		trace_rxrpc_rx_discard_ack(call->debug_id, sp->hdr.serial,
+		trace_rxrpc_rx_discard_ack(call->debug_id, ack_serial,
 					   first_soft_ack, call->ackr_first_seq,
 					   prev_pkt, call->ackr_prev_seq);
 		goto out;
 	    RXRPC_TX_ANNO_LAST &&
 	    summary.nr_acks == call->tx_top - hard_ack &&
 	    rxrpc_is_client_call(call))
-		rxrpc_propose_ACK(call, RXRPC_ACK_PING, sp->hdr.serial,
+		rxrpc_propose_ACK(call, RXRPC_ACK_PING, ack_serial,
 				  false, true,
 				  rxrpc_propose_ack_ping_for_lost_reply);

net/rxrpc/output.c+61−21

 	return top - hard_ack + 3;
 }
+/*
+ * Record the beginning of an RTT probe.
+ */
+static int rxrpc_begin_rtt_probe(struct rxrpc_call *call, rxrpc_serial_t serial,
+				 enum rxrpc_rtt_tx_trace why)
+{
+	unsigned long avail = call->rtt_avail;
+	int rtt_slot = 9;
+	if (!(avail & RXRPC_CALL_RTT_AVAIL_MASK))
+		goto no_slot;
+	rtt_slot = __ffs(avail & RXRPC_CALL_RTT_AVAIL_MASK);
+	if (!test_and_clear_bit(rtt_slot, &call->rtt_avail))
+		goto no_slot;
+	call->rtt_serial[rtt_slot] = serial;
+	call->rtt_sent_at[rtt_slot] = ktime_get_real();
+	smp_wmb(); /* Write data before avail bit */
+	set_bit(rtt_slot + RXRPC_CALL_RTT_PEND_SHIFT, &call->rtt_avail);
+	trace_rxrpc_rtt_tx(call, why, rtt_slot, serial);
+	return rtt_slot;
+no_slot:
+	trace_rxrpc_rtt_tx(call, rxrpc_rtt_tx_no_slot, rtt_slot, serial);
+	return -1;
+}
+/*
+ * Cancel an RTT probe.
+ */
+static void rxrpc_cancel_rtt_probe(struct rxrpc_call *call,
+				   rxrpc_serial_t serial, int rtt_slot)
+{
+	if (rtt_slot != -1) {
+		clear_bit(rtt_slot + RXRPC_CALL_RTT_PEND_SHIFT, &call->rtt_avail);
+		smp_wmb(); /* Clear pending bit before setting slot */
+		set_bit(rtt_slot, &call->rtt_avail);
+		trace_rxrpc_rtt_tx(call, rxrpc_rtt_tx_cancel, rtt_slot, serial);
+	}
+}
 /*
  * Send an ACK call packet.
  */
 	rxrpc_serial_t serial;
 	rxrpc_seq_t hard_ack, top;
 	size_t len, n;
-	int ret;
+	int ret, rtt_slot = -1;
 	u8 reason;
 	if (test_bit(RXRPC_CALL_DISCONNECTED, &call->flags))
 	if (_serial)
 		*_serial = serial;
-	if (ping) {
+	if (ping)
-		call->ping_serial = serial;
+		rtt_slot = rxrpc_begin_rtt_probe(call, serial, rxrpc_rtt_tx_ping);
-		smp_wmb();
-		/* We need to stick a time in before we send the packet in case
-		 * the reply gets back before kernel_sendmsg() completes - but
-		 * asking UDP to send the packet can take a relatively long
-		 * time.
-		 */
-		call->ping_time = ktime_get_real();
-		set_bit(RXRPC_CALL_PINGING, &call->flags);
-		trace_rxrpc_rtt_tx(call, rxrpc_rtt_tx_ping, serial);
-	}
 	ret = kernel_sendmsg(conn->params.local->socket, &msg, iov, 2, len);
 	conn->params.peer->last_tx_at = ktime_get_seconds();
 	if (call->state < RXRPC_CALL_COMPLETE) {
 		if (ret < 0) {
-			if (ping)
+			rxrpc_cancel_rtt_probe(call, serial, rtt_slot);
-				clear_bit(RXRPC_CALL_PINGING, &call->flags);
 			rxrpc_propose_ACK(call, pkt->ack.reason,
 					  ntohl(pkt->ack.serial),
 					  false, true,
 	struct kvec iov[2];
 	rxrpc_serial_t serial;
 	size_t len;
-	int ret;
+	int ret, rtt_slot = -1;
 	_enter(",{%d}", skb->len);
 	sp->hdr.serial = serial;
 	smp_wmb(); /* Set serial before timestamp */
 	skb->tstamp = ktime_get_real();
+	if (whdr.flags & RXRPC_REQUEST_ACK)
+		rtt_slot = rxrpc_begin_rtt_probe(call, serial, rxrpc_rtt_tx_data);
 	/* send the packet by UDP
 	 * - returns -EMSGSIZE if UDP would have to fragment the packet
 	conn->params.peer->last_tx_at = ktime_get_seconds();
 	up_read(&conn->params.local->defrag_sem);
-	if (ret < 0)
+	if (ret < 0) {
+		rxrpc_cancel_rtt_probe(call, serial, rtt_slot);
 		trace_rxrpc_tx_fail(call->debug_id, serial, ret,
 				    rxrpc_tx_point_call_data_nofrag);
-	else
+	} else {
 		trace_rxrpc_tx_packet(call->debug_id, &whdr,
 				      rxrpc_tx_point_call_data_nofrag);
+	}
 	rxrpc_tx_backoff(call, ret);
 	if (ret == -EMSGSIZE)
 		goto send_fragmentable;
 	if (ret >= 0) {
 		if (whdr.flags & RXRPC_REQUEST_ACK) {
 			call->peer->rtt_last_req = skb->tstamp;
-			trace_rxrpc_rtt_tx(call, rxrpc_rtt_tx_data, serial);
 			if (call->peer->rtt_count > 1) {
 				unsigned long nowj = jiffies, ack_lost_at;
 	sp->hdr.serial = serial;
 	smp_wmb(); /* Set serial before timestamp */
 	skb->tstamp = ktime_get_real();
+	if (whdr.flags & RXRPC_REQUEST_ACK)
+		rtt_slot = rxrpc_begin_rtt_probe(call, serial, rxrpc_rtt_tx_data);
 	switch (conn->params.local->srx.transport.family) {
 	case AF_INET6:
 		BUG();
 	}
-	if (ret < 0)
+	if (ret < 0) {
+		rxrpc_cancel_rtt_probe(call, serial, rtt_slot);
 		trace_rxrpc_tx_fail(call->debug_id, serial, ret,
 				    rxrpc_tx_point_call_data_frag);
-	else
+	} else {
 		trace_rxrpc_tx_packet(call->debug_id, &whdr,
 				      rxrpc_tx_point_call_data_frag);
+	}
 	rxrpc_tx_backoff(call, ret);
 	up_write(&conn->params.local->defrag_sem);

net/rxrpc/peer_object.c+13−3

  * rxrpc_kernel_get_srtt - Get a call's peer smoothed RTT
  * @sock: The socket on which the call is in progress.
  * @call: The call to query
+ * @_srtt: Where to store the SRTT value.
  *
- * Get the call's peer smoothed RTT.
+ * Get the call's peer smoothed RTT in uS.
  */
-u32 rxrpc_kernel_get_srtt(struct socket *sock, struct rxrpc_call *call)
+bool rxrpc_kernel_get_srtt(struct socket *sock, struct rxrpc_call *call,
+			   u32 *_srtt)
 {
-	return call->peer->srtt_us >> 3;
+	struct rxrpc_peer *peer = call->peer;
+	if (peer->rtt_count == 0) {
+		*_srtt = 1000000; /* 1S */
+		return false;
+	}
+	*_srtt = call->peer->srtt_us >> 3;
+	return true;
 }
 EXPORT_SYMBOL(rxrpc_kernel_get_srtt);

net/rxrpc/rtt.c+2−1

  * exclusive access to the peer RTT data.
  */
 void rxrpc_peer_add_rtt(struct rxrpc_call *call, enum rxrpc_rtt_rx_trace why,
+			int rtt_slot,
 			rxrpc_serial_t send_serial, rxrpc_serial_t resp_serial,
 			ktime_t send_time, ktime_t resp_time)
 {
 		peer->rtt_count++;
 	spin_unlock(&peer->rtt_input_lock);
-	trace_rxrpc_rtt_rx(call, why, send_serial, resp_serial,
+	trace_rxrpc_rtt_rx(call, why, rtt_slot, send_serial, resp_serial,
 			   peer->srtt_us >> 3, peer->rto_j);
 }

net/rxrpc/rxkad.c+2−1

 	ret = -ENOMEM;
 	ticket = kmalloc(ticket_len, GFP_NOFS);
 	if (!ticket)
-		goto temporary_error;
+		goto temporary_error_free_resp;
 	eproto = tracepoint_string("rxkad_tkt_short");
 	abort_code = RXKADPACKETSHORT;
 temporary_error_free_ticket:
 	kfree(ticket);
+temporary_error_free_resp:
 	kfree(response);
 temporary_error:
 	/* Ignore the response packet if we got a temporary error such as

net/sched/sch_red.c+4−16

@@ -353,23 +353,11 @@ static int red_init(struct Qdisc sch, struct nlattr opt, · 352 unmodified lines
353	FLOW_BLOCK_BINDER_TYPE_RED_EARLY_DROP,	353	FLOW_BLOCK_BINDER_TYPE_RED_EARLY_DROP,
354	tb[TCA_RED_EARLY_DROP_BLOCK], extack);	354	tb[TCA_RED_EARLY_DROP_BLOCK], extack);
355	if (err)	355	if (err)
356	goto err_early_drop_init;	356	return err;
357
358	err = tcf_qevent_init(&q->qe_mark, sch,
359	FLOW_BLOCK_BINDER_TYPE_RED_MARK,
360	tb[TCA_RED_MARK_BLOCK], extack);
361	if (err)
362	goto err_mark_init;
363
364	return 0;
365		357
366	err_mark_init:	358	return tcf_qevent_init(&q->qe_mark, sch,
367	tcf_qevent_destroy(&q->qe_early_drop, sch);	359	FLOW_BLOCK_BINDER_TYPE_RED_MARK,
368	err_early_drop_init:	360	tb[TCA_RED_MARK_BLOCK], extack);
369	del_timer_sync(&q->adapt_timer);
370	red_offload(sch, false);
371	qdisc_put(q->qdisc);
372	return err;
373	}	361	}
374		362
375	static int red_change(struct Qdisc sch, struct nlattr opt,	363	static int red_change(struct Qdisc sch, struct nlattr opt,

net/sched/sch_taprio.c+24−6

 	spin_unlock(&q->current_entry_lock);
 }
-static void taprio_sched_to_offload(struct taprio_sched *q,
+static u32 tc_map_to_queue_mask(struct net_device *dev, u32 tc_mask)
+{
+	u32 i, queue_mask = 0;
+	for (i = 0; i < dev->num_tc; i++) {
+		u32 offset, count;
+		if (!(tc_mask & BIT(i)))
+			continue;
+		offset = dev->tc_to_txq[i].offset;
+		count = dev->tc_to_txq[i].count;
+		queue_mask |= GENMASK(offset + count - 1, offset);
+	}
+	return queue_mask;
+}
+static void taprio_sched_to_offload(struct net_device *dev,
 				    struct sched_gate_list *sched,
-				    const struct tc_mqprio_qopt *mqprio,
 				    struct tc_taprio_qopt_offload *offload)
 {
 	struct sched_entry *entry;
 		e->command = entry->command;
 		e->interval = entry->interval;
-		e->gate_mask = entry->gate_mask;
+		e->gate_mask = tc_map_to_queue_mask(dev, entry->gate_mask);
 		i++;
 	}
 }
 static int taprio_enable_offload(struct net_device *dev,
-				 struct tc_mqprio_qopt *mqprio,
 				 struct taprio_sched *q,
 				 struct sched_gate_list *sched,
 				 struct netlink_ext_ack *extack)
 		return -ENOMEM;
 	}
 	offload->enable = 1;
-	taprio_sched_to_offload(q, sched, mqprio, offload);
+	taprio_sched_to_offload(dev, sched, offload);
 	err = ops->ndo_setup_tc(dev, TC_SETUP_QDISC_TAPRIO, offload);
 	if (err < 0) {
 	}
 	if (FULL_OFFLOAD_IS_ENABLED(q->flags))
-		err = taprio_enable_offload(dev, mqprio, q, new_admin, extack);
+		err = taprio_enable_offload(dev, q, new_admin, extack);
 	else
 		err = taprio_disable_offload(dev, q, extack);
 	if (err)

net/sctp/socket.c+6−10

 	pr_debug("%s: begins, snum:%d\n", __func__, snum);
-	local_bh_disable();
 	if (snum == 0) {
 		/* Search for an available port. */
 		int low, high, remaining, index;
 				continue;
 			index = sctp_phashfn(net, rover);
 			head = &sctp_port_hashtable[index];
-			spin_lock(&head->lock);
+			spin_lock_bh(&head->lock);
 			sctp_for_each_hentry(pp, &head->chain)
 				if ((pp->port == rover) &&
 				    net_eq(net, pp->net))
 					goto next;
 			break;
 		next:
-			spin_unlock(&head->lock);
+			spin_unlock_bh(&head->lock);
+			cond_resched();
 		} while (--remaining > 0);
 		/* Exhausted local port range during search? */
 		ret = 1;
 		if (remaining <= 0)
-			goto fail;
+			return ret;
 		/* OK, here is the one we will use.  HEAD (the port
 		 * hash table list entry) is non-NULL and we hold it's
 		 * port iterator, pp being NULL.
 		 */
 		head = &sctp_port_hashtable[sctp_phashfn(net, snum)];
-		spin_lock(&head->lock);
+		spin_lock_bh(&head->lock);
 		sctp_for_each_hentry(pp, &head->chain) {
 			if ((pp->port == snum) && net_eq(pp->net, net))
 				goto pp_found;
 	ret = 0;
 fail_unlock:
-	spin_unlock(&head->lock);
+	spin_unlock_bh(&head->lock);
-fail:
-	local_bh_enable();
 	return ret;
 }

net/smc/smc_close.c+8−7

 	cancel_work_sync(&smc->conn.close_work);
 	cancel_delayed_work_sync(&smc->conn.tx_work);
 	lock_sock(sk);
-	sk->sk_state = SMC_CLOSED;
 }
 /* terminate smc socket abnormally - active abort
 	}
 	switch (sk->sk_state) {
 	case SMC_ACTIVE:
-		sk->sk_state = SMC_PEERABORTWAIT;
-		smc_close_cancel_work(smc);
-		sk->sk_state = SMC_CLOSED;
-		sock_put(sk); /* passive closing */
-		break;
 	case SMC_APPCLOSEWAIT1:
 	case SMC_APPCLOSEWAIT2:
+		sk->sk_state = SMC_PEERABORTWAIT;
 		smc_close_cancel_work(smc);
+		if (sk->sk_state != SMC_PEERABORTWAIT)
+			break;
 		sk->sk_state = SMC_CLOSED;
-		sock_put(sk); /* postponed passive closing */
+		sock_put(sk); /* (postponed) passive closing */
 		break;
 	case SMC_PEERCLOSEWAIT1:
 	case SMC_PEERCLOSEWAIT2:
 	case SMC_PEERFINCLOSEWAIT:
 		sk->sk_state = SMC_PEERABORTWAIT;
 		smc_close_cancel_work(smc);
+		if (sk->sk_state != SMC_PEERABORTWAIT)
+			break;
 		sk->sk_state = SMC_CLOSED;
 		smc_conn_free(&smc->conn);
 		release_clcsock = true;
 	case SMC_APPFINCLOSEWAIT:
 		sk->sk_state = SMC_PEERABORTWAIT;
 		smc_close_cancel_work(smc);
+		if (sk->sk_state != SMC_PEERABORTWAIT)
+			break;
 		sk->sk_state = SMC_CLOSED;
 		smc_conn_free(&smc->conn);
 		release_clcsock = true;

net/smc/smc_core.c+3−0

 	if (ini->is_smcd) {
 		conn->rx_off = sizeof(struct smcd_cdc_msg);
 		smcd_cdc_rx_init(conn); /* init tasklet for this conn */
+	} else {
+		conn->rx_off = 0;
 	}
 #ifndef KERNEL_HAS_ATOMIC64
 	spin_lock_init(&conn->acurs_lock);
 		list_del(&smc->conn.sndbuf_desc->list);
 		mutex_unlock(&smc->conn.lgr->sndbufs_lock);
 		smc_buf_free(smc->conn.lgr, false, smc->conn.sndbuf_desc);
+		smc->conn.sndbuf_desc = NULL;
 	}
 	return rc;
 }

net/smc/smc_llc.c+14−1

 	struct smc_init_info ini;
 	int lnk_idx, rc = 0;
+	if (!llc->qp_mtu)
+		goto out_reject;
 	ini.vlan_id = lgr->vlan_id;
 	smc_pnet_find_alt_roce(lgr, &ini, link->smcibdev);
 	if (!memcmp(llc->sender_gid, link->peer_gid, SMC_GID_SIZE) &&
 	kfree(qentry);
 }
+static bool smc_llc_is_empty_llc_message(union smc_llc_msg *llc)
+{
+	int i;
+	for (i = 0; i < ARRAY_SIZE(llc->raw.data); i++)
+		if (llc->raw.data[i])
+			return false;
+	return true;
+}
 static bool smc_llc_is_local_add_link(union smc_llc_msg *llc)
 {
 	if (llc->raw.hdr.common.type == SMC_LLC_ADD_LINK &&
-	    !llc->add_link.qp_mtu && !llc->add_link.link_num)
+	    smc_llc_is_empty_llc_message(llc))
 		return true;
 	return false;
 }

net/socket.c+2−2

@@ -3610,7 +3610,7 @@ int kernel_getsockname(struct socket sock, struct sockaddr addr) · 3609 unmodified lines
3610	EXPORT_SYMBOL(kernel_getsockname);	3610	EXPORT_SYMBOL(kernel_getsockname);
3611		3611
3612	/**	3612	/**
3613	* kernel_peername - get the address which the socket is connected (kernel space)	3613	* kernel_getpeername - get the address which the socket is connected (kernel space)
3614	* @sock: socket	3614	* @sock: socket
3615	* @addr: address holder	3615	* @addr: address holder
3616	*	3616	*
@@ -3671,7 +3671,7 @@ int kernel_sendpage_locked(struct sock sk, struct page page, int offset, · 54 unmodified lines
3671	EXPORT_SYMBOL(kernel_sendpage_locked);	3671	EXPORT_SYMBOL(kernel_sendpage_locked);
3672		3672
3673	/**	3673	/**
3674	* kernel_shutdown - shut down part of a full-duplex connection (kernel space)	3674	* kernel_sock_shutdown - shut down part of a full-duplex connection (kernel space)
3675	* @sock: socket	3675	* @sock: socket
3676	* @how: connection part	3676	* @how: connection part
3677	*	3677	*

net/sunrpc/rpcb_clnt.c+2−2

@@ -982,8 +982,8 @@ static int rpcb_dec_getaddr(struct rpc_rqst req, struct xdr_stream xdr, · 981 unmodified lines
982	p = xdr_inline_decode(xdr, len);	982	p = xdr_inline_decode(xdr, len);
983	if (unlikely(p == NULL))	983	if (unlikely(p == NULL))
984	goto out_fail;	984	goto out_fail;
985	dprintk("RPC: %5u RPCB_%s reply: %s\n", req->rq_task->tk_pid,	985	dprintk("RPC: %5u RPCB_%s reply: %*pE\n", req->rq_task->tk_pid,
986	req->rq_task->tk_msg.rpc_proc->p_name, (char *)p);	986	req->rq_task->tk_msg.rpc_proc->p_name, len, (char *)p);
987		987
988	if (rpc_uaddr2sockaddr(req->rq_xprt->xprt_net, (char *)p, len,	988	if (rpc_uaddr2sockaddr(req->rq_xprt->xprt_net, (char *)p, len,
989	sap, sizeof(address)) == 0)	989	sap, sizeof(address)) == 0)

net/sunrpc/xprtrdma/verbs.c+2−0

@@ -933,6 +933,8 @@ static void rpcrdma_req_reset(struct rpcrdma_req *req) · 932 unmodified lines
933		933
934	rpcrdma_regbuf_dma_unmap(req->rl_sendbuf);	934	rpcrdma_regbuf_dma_unmap(req->rl_sendbuf);
935	rpcrdma_regbuf_dma_unmap(req->rl_recvbuf);	935	rpcrdma_regbuf_dma_unmap(req->rl_recvbuf);
		936
		937	frwr_reset(req);
936	}	938	}
937		939
938	/* ASSUMPTION: the rb_allreqs list is stable for the duration,	940	/* ASSUMPTION: the rb_allreqs list is stable for the duration,

net/tipc/crypto.c+9−3

 	if (aead->cloned) {
 		tipc_aead_put(aead->cloned);
 	} else {
-		head = *this_cpu_ptr(aead->tfm_entry);
+		head = *get_cpu_ptr(aead->tfm_entry);
+		put_cpu_ptr(aead->tfm_entry);
 		list_for_each_entry_safe(tfm_entry, tmp, &head->list, list) {
 			crypto_free_aead(tfm_entry->tfm);
 			list_del(&tfm_entry->list);
  */
 static struct crypto_aead *tipc_aead_tfm_next(struct tipc_aead *aead)
 {
-	struct tipc_tfm **tfm_entry = this_cpu_ptr(aead->tfm_entry);
+	struct tipc_tfm **tfm_entry;
+	struct crypto_aead *tfm;
+	tfm_entry = get_cpu_ptr(aead->tfm_entry);
 	*tfm_entry = list_next_entry(*tfm_entry, list);
-	return (*tfm_entry)->tfm;
+	tfm = (*tfm_entry)->tfm;
+	put_cpu_ptr(tfm_entry);
+	return tfm;
 }
 /**

net/tipc/socket.c+6−3

 	trace_tipc_sk_shutdown(sk, NULL, TIPC_DUMP_ALL, " ");
 	__tipc_shutdown(sock, TIPC_CONN_SHUTDOWN);
-	sk->sk_shutdown = SEND_SHUTDOWN;
+	if (tipc_sk_type_connectionless(sk))
+		sk->sk_shutdown = SHUTDOWN_MASK;
+	else
+		sk->sk_shutdown = SEND_SHUTDOWN;
 	if (sk->sk_state == TIPC_DISCONNECTING) {
 		/* Discard any unreceived messages */
 		__skb_queue_purge(&sk->sk_receive_queue);
-		/* Wake up anyone sleeping in poll */
-		sk->sk_state_change(sk);
 		res = 0;
 	} else {
 		res = -ENOTCONN;
 	}
+	/* Wake up anyone sleeping in poll. */
+	sk->sk_state_change(sk);
 	release_sock(sk);
 	return res;

net/wireless/chan.c+11−4

  */
 #include <linux/export.h>
+#include <linux/bitfield.h>
 #include <net/cfg80211.h>
 #include "core.h"
 #include "rdev-ops.h"
 	struct ieee80211_sta_vht_cap *vht_cap;
 	struct ieee80211_edmg *edmg_cap;
 	u32 width, control_freq, cap;
+	bool support_80_80 = false;
 	if (WARN_ON(!cfg80211_chandef_valid(chandef)))
 		return false;
 			return false;
 		break;
 	case NL80211_CHAN_WIDTH_80P80:
-		cap = vht_cap->cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK;
+		cap = vht_cap->cap;
-		if (chandef->chan->band != NL80211_BAND_6GHZ &&
+		support_80_80 =
-		    cap != IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ)
+			(cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ) ||
+			(cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ &&
+			 cap & IEEE80211_VHT_CAP_EXT_NSS_BW_MASK) ||
+			u32_get_bits(cap, IEEE80211_VHT_CAP_EXT_NSS_BW_MASK) > 1;
+		if (chandef->chan->band != NL80211_BAND_6GHZ && !support_80_80)
 			return false;
 		fallthrough;
 	case NL80211_CHAN_WIDTH_80:
 			return false;
 		cap = vht_cap->cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK;
 		if (cap != IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ &&
-		    cap != IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ)
+		    cap != IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ &&
+		    !(vht_cap->cap & IEEE80211_VHT_CAP_EXT_NSS_BW_MASK))
 			return false;
 		break;
 	default:

net/wireless/nl80211.c+1−1

@@ -6011,7 +6011,7 @@ static int nl80211_set_station(struct sk_buff skb, struct genl_info info) · 6010 unmodified lines
6011		6011
6012	if (info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY])	6012	if (info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY])
6013	params.he_6ghz_capa =	6013	params.he_6ghz_capa =
6014	nla_data(info->attrs[NL80211_ATTR_HE_CAPABILITY]);	6014	nla_data(info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY]);
6015		6015
6016	if (info->attrs[NL80211_ATTR_AIRTIME_WEIGHT])	6016	if (info->attrs[NL80211_ATTR_AIRTIME_WEIGHT])
6017	params.airtime_weight =	6017	params.airtime_weight =

net/wireless/reg.c+3−0

@@ -2946,6 +2946,9 @@ int regulatory_hint_user(const char *alpha2, · 2945 unmodified lines
2946	if (WARN_ON(!alpha2))	2946	if (WARN_ON(!alpha2))
2947	return -EINVAL;	2947	return -EINVAL;
2948		2948
		2949	if (!is_world_regdom(alpha2) && !is_an_alpha2(alpha2))
		2950	return -EINVAL;
		2951
2949	request = kzalloc(sizeof(struct regulatory_request), GFP_KERNEL);	2952	request = kzalloc(sizeof(struct regulatory_request), GFP_KERNEL);
2950	if (!request)	2953	if (!request)
2951	return -ENOMEM;	2954	return -ENOMEM;

net/wireless/util.c+5−3

 		return (freq - 2407) / 5;
 	else if (freq >= 4910 && freq <= 4980)
 		return (freq - 4000) / 5;
-	else if (freq < 5945)
+	else if (freq < 5925)
 		return (freq - 5000) / 5;
+	else if (freq == 5935)
+		return 2;
 	else if (freq <= 45000) /* DMG band lower limit */
-		/* see 802.11ax D4.1 27.3.22.2 */
+		/* see 802.11ax D6.1 27.3.22.2 */
-		return (freq - 5940) / 5;
+		return (freq - 5950) / 5;
 	else if (freq >= 58320 && freq <= 70200)
 		return (freq - 56160) / 2160;
 	else

scripts/checkpatch.pl+2−2

@@ -2639,8 +2639,8 @@ sub process { · 2638 unmodified lines
2639		2639
2640	# Check if the commit log has what seems like a diff which can confuse patch	2640	# Check if the commit log has what seems like a diff which can confuse patch
2641	if ($in_commit_log && !$commit_log_has_diff &&	2641	if ($in_commit_log && !$commit_log_has_diff &&
2642	(($line =~ m@^\s+diff\b.*a/[\w/]+@ &&	2642	(($line =~ m@^\s+diff\b.*a/([\w/]+)@ &&
2643	$line =~ m@^\s+diff\b.*a/([\w/]+)\s+b/$1\b@) \|\|	2643	$line =~ m@^\s+diff\b.*a/[\w/]+\s+b/$1\b@) \|\|
2644	$line =~ m@^\s*(?:\-\-\-\s+a/\|\+\+\+\s+b/)@ \|\|	2644	$line =~ m@^\s*(?:\-\-\-\s+a/\|\+\+\+\s+b/)@ \|\|
2645	$line =~ m/^\s*\@\@ \-\d+,\d+ \+\d+,\d+ \@\@/)) {	2645	$line =~ m/^\s*\@\@ \-\d+,\d+ \+\d+,\d+ \@\@/)) {
2646	ERROR("DIFF_IN_COMMIT_MSG",	2646	ERROR("DIFF_IN_COMMIT_MSG",

scripts/kconfig/nconf.c+0−1

@@ -755,7 +755,6 @@ static void build_conf(struct menu *menu) · 754 unmodified lines
755	switch (ptype) {	755	switch (ptype) {
756	case P_MENU:	756	case P_MENU:
757	child_count++;	757	child_count++;
758	prompt = prompt;
759	if (single_menu_mode) {	758	if (single_menu_mode) {
760	item_make(menu, 'm',	759	item_make(menu, 'm',
761	"%s%*c%s",	760	"%s%*c%s",

scripts/kconfig/streamline_config.pl+4−1

 }
 my %setconfigs;
-my @preserved_kconfigs = split(/:/,$ENV{LMC_KEEP});
+my @preserved_kconfigs;
+if (defined($ENV{'LMC_KEEP'})) {
+	@preserved_kconfigs = split(/:/,$ENV{LMC_KEEP});
+}
 sub in_preserved_kconfigs {
     my $kconfig = $config2kfile{$_[0]};

scripts/tags.sh+6−2

 fi
 # ignore userspace tools
-ignore="$ignore ( -path ${tree}tools ) -prune -o"
+if [ -n "$COMPILED_SOURCE" ]; then
+	ignore="$ignore ( -path ./tools ) -prune -o"
+else
+	ignore="$ignore ( -path ${tree}tools ) -prune -o"
+fi
 # Detect if ALLSOURCE_ARCHS is set. If not, we assume SRCARCH
 if [ "${ALLSOURCE_ARCHS}" = "" ]; then
 all_compiled_sources()
 {
 	realpath -es $([ -z "$KBUILD_ABS_SRCTREE" ] && echo --relative-to=.) \
-		include/generated/autoconf.h $(find -name "*.cmd" -exec \
+		include/generated/autoconf.h $(find $ignore -name "*.cmd" -exec \
 		grep -Poh '(?(?=^source_.* \K).*|(?=^  \K\S).*(?= \\))' {} \+ |
 		awk '!a[$0]++') | sort -u
 }

sound/core/oss/mulaw.c+2−2

@@ -329,8 +329,8 @@ int snd_pcm_plugin_build_mulaw(struct snd_pcm_substream *plug, · 328 unmodified lines
329	snd_BUG();	329	snd_BUG();
330	return -EINVAL;	330	return -EINVAL;
331	}	331	}
332	if (snd_BUG_ON(!snd_pcm_format_linear(format->format)))	332	if (!snd_pcm_format_linear(format->format))
333	return -ENXIO;	333	return -EINVAL;
334		334
335	err = snd_pcm_plugin_build(plug, "Mu-Law<->linear conversion",	335	err = snd_pcm_plugin_build(plug, "Mu-Law<->linear conversion",
336	src_format, dst_format,	336	src_format, dst_format,

sound/core/timer.c+3−4

  * timer tasklet
  *
  */
-static void snd_timer_tasklet(unsigned long arg)
+static void snd_timer_tasklet(struct tasklet_struct *t)
 {
-	struct snd_timer *timer = (struct snd_timer *) arg;
+	struct snd_timer *timer = from_tasklet(timer, t, task_queue);
 	unsigned long flags;
 	if (timer->card && timer->card->shutdown) {
 	INIT_LIST_HEAD(&timer->ack_list_head);
 	INIT_LIST_HEAD(&timer->sack_list_head);
 	spin_lock_init(&timer->lock);
-	tasklet_init(&timer->task_queue, snd_timer_tasklet,
+	tasklet_setup(&timer->task_queue, snd_timer_tasklet);
-		     (unsigned long)timer);
 	timer->max_instances = 1000; /* default limit per timer */
 	if (card != NULL) {
 		timer->module = card->module;

sound/firewire/amdtp-stream.c+4−4

@@ -64,7 +64,7 @@ · 63 unmodified lines
64	#define IT_PKT_HEADER_SIZE_CIP 8 // For 2 CIP header.	64	#define IT_PKT_HEADER_SIZE_CIP 8 // For 2 CIP header.
65	#define IT_PKT_HEADER_SIZE_NO_CIP 0 // Nothing.	65	#define IT_PKT_HEADER_SIZE_NO_CIP 0 // Nothing.
66		66
67	static void pcm_period_tasklet(unsigned long data);	67	static void pcm_period_tasklet(struct tasklet_struct *t);
68		68
69	/**	69	/**
70	* amdtp_stream_init - initialize an AMDTP stream structure	70	* amdtp_stream_init - initialize an AMDTP stream structure
@@ -94,7 +94,7 @@ int amdtp_stream_init(struct amdtp_stream s, struct fw_unit unit, · 23 unmodified lines
94	s->flags = flags;	94	s->flags = flags;
95	s->context = ERR_PTR(-1);	95	s->context = ERR_PTR(-1);
96	mutex_init(&s->mutex);	96	mutex_init(&s->mutex);
97	tasklet_init(&s->period_tasklet, pcm_period_tasklet, (unsigned long)s);	97	tasklet_setup(&s->period_tasklet, pcm_period_tasklet);
98	s->packet_index = 0;	98	s->packet_index = 0;
99		99
100	init_waitqueue_head(&s->callback_wait);	100	init_waitqueue_head(&s->callback_wait);
@@ -441,9 +441,9 @@ static void update_pcm_pointers(struct amdtp_stream *s, · 340 unmodified lines
441	}	441	}
442	}	442	}
443		443
444	static void pcm_period_tasklet(unsigned long data)	444	static void pcm_period_tasklet(struct tasklet_struct *t)
445	{	445	{
446	struct amdtp_stream s = (void )data;	446	struct amdtp_stream *s = from_tasklet(s, t, period_tasklet);
447	struct snd_pcm_substream *pcm = READ_ONCE(s->pcm);	447	struct snd_pcm_substream *pcm = READ_ONCE(s->pcm);
448		448
449	if (pcm)	449	if (pcm)

sound/firewire/digi00x/digi00x.c+5−0

 #define VENDOR_DIGIDESIGN	0x00a07e
 #define MODEL_CONSOLE		0x000001
 #define MODEL_RACK		0x000002
+#define SPEC_VERSION		0x000001
 static int name_card(struct snd_dg00x *dg00x)
 {
 	/* Both of 002/003 use the same ID. */
 	{
 		.match_flags = IEEE1394_MATCH_VENDOR_ID |
+			       IEEE1394_MATCH_VERSION |
 			       IEEE1394_MATCH_MODEL_ID,
 		.vendor_id = VENDOR_DIGIDESIGN,
+		.version = SPEC_VERSION,
 		.model_id = MODEL_CONSOLE,
 	},
 	{
 		.match_flags = IEEE1394_MATCH_VENDOR_ID |
+			       IEEE1394_MATCH_VERSION |
 			       IEEE1394_MATCH_MODEL_ID,
 		.vendor_id = VENDOR_DIGIDESIGN,
+		.version = SPEC_VERSION,
 		.model_id = MODEL_RACK,
 	},
 	{}

sound/firewire/tascam/tascam.c+29−4

@@ -39,9 +39,6 @@ static const struct snd_tscm_spec model_specs[] = { · 38 unmodified lines
39	.midi_capture_ports = 2,	39	.midi_capture_ports = 2,
40	.midi_playback_ports = 4,	40	.midi_playback_ports = 4,
41	},	41	},
42	// This kernel module doesn't support FE-8 because the most of features
43	// can be implemented in userspace without any specific support of this
44	// module.
45	};	42	};
46		43
47	static int identify_model(struct snd_tscm *tscm)	44	static int identify_model(struct snd_tscm *tscm)
@@ -211,11 +208,39 @@ static void snd_tscm_remove(struct fw_unit *unit) · 163 unmodified lines
211	}	208	}
212		209
213	static const struct ieee1394_device_id snd_tscm_id_table[] = {	210	static const struct ieee1394_device_id snd_tscm_id_table[] = {
		211	// Tascam, FW-1884.
		212	{
		213	.match_flags = IEEE1394_MATCH_VENDOR_ID \|
		214	IEEE1394_MATCH_SPECIFIER_ID \|
		215	IEEE1394_MATCH_VERSION,
		216	.vendor_id = 0x00022e,
		217	.specifier_id = 0x00022e,
		218	.version = 0x800000,
		219	},
		220	// Tascam, FE-8 (.version = 0x800001)
		221	// This kernel module doesn't support FE-8 because the most of features
		222	// can be implemented in userspace without any specific support of this
		223	// module.
		224	//
		225	// .version = 0x800002 is unknown.
		226	//
		227	// Tascam, FW-1082.
		228	{
		229	.match_flags = IEEE1394_MATCH_VENDOR_ID \|
		230	IEEE1394_MATCH_SPECIFIER_ID \|
		231	IEEE1394_MATCH_VERSION,
		232	.vendor_id = 0x00022e,
		233	.specifier_id = 0x00022e,
		234	.version = 0x800003,
		235	},
		236	// Tascam, FW-1804.
214	{	237	{
215	.match_flags = IEEE1394_MATCH_VENDOR_ID \|	238	.match_flags = IEEE1394_MATCH_VENDOR_ID \|
216	IEEE1394_MATCH_SPECIFIER_ID,	239	IEEE1394_MATCH_SPECIFIER_ID \|
		240	IEEE1394_MATCH_VERSION,
217	.vendor_id = 0x00022e,	241	.vendor_id = 0x00022e,
218	.specifier_id = 0x00022e,	242	.specifier_id = 0x00022e,
		243	.version = 0x800004,
219	},	244	},
220	{}	245	{}
221	};	246	};

sound/hda/hdac_device.c+2−0

 void snd_hdac_device_exit(struct hdac_device *codec)
 {
 	pm_runtime_put_noidle(&codec->dev);
+	/* keep balance of runtime PM child_count in parent device */
+	pm_runtime_set_suspended(&codec->dev);
 	snd_hdac_bus_remove_device(codec->bus, codec);
 	kfree(codec->vendor_name);
 	kfree(codec->chip_name);

sound/hda/intel-dsp-config.c+5−5

@@ -54,7 +54,7 @@ static const struct config_entry config_table[] = { · 53 unmodified lines
54	#endif	54	#endif
55	/*	55	/*
56	* Apollolake (Broxton-P)	56	* Apollolake (Broxton-P)
57	* the legacy HDaudio driver is used except on Up Squared (SOF) and	57	* the legacy HDAudio driver is used except on Up Squared (SOF) and
58	* Chromebooks (SST)	58	* Chromebooks (SST)
59	*/	59	*/
60	#if IS_ENABLED(CONFIG_SND_SOC_SOF_APOLLOLAKE)	60	#if IS_ENABLED(CONFIG_SND_SOC_SOF_APOLLOLAKE)
@@ -89,7 +89,7 @@ static const struct config_entry config_table[] = { · 28 unmodified lines
89	},	89	},
90	#endif	90	#endif
91	/*	91	/*
92	* Skylake and Kabylake use legacy HDaudio driver except for Google	92	* Skylake and Kabylake use legacy HDAudio driver except for Google
93	* Chromebooks (SST)	93	* Chromebooks (SST)
94	*/	94	*/
95		95
@@ -135,7 +135,7 @@ static const struct config_entry config_table[] = { · 39 unmodified lines
135	#endif	135	#endif
136		136
137	/*	137	/*
138	* Geminilake uses legacy HDaudio driver except for Google	138	* Geminilake uses legacy HDAudio driver except for Google
139	* Chromebooks	139	* Chromebooks
140	*/	140	*/
141	/* Geminilake */	141	/* Geminilake */
@@ -157,7 +157,7 @@ static const struct config_entry config_table[] = { · 15 unmodified lines
157		157
158	/*	158	/*
159	* CoffeeLake, CannonLake, CometLake, IceLake, TigerLake use legacy	159	* CoffeeLake, CannonLake, CometLake, IceLake, TigerLake use legacy
160	* HDaudio driver except for Google Chromebooks and when DMICs are	160	* HDAudio driver except for Google Chromebooks and when DMICs are
161	* present. Two cases are required since Coreboot does not expose NHLT	161	* present. Two cases are required since Coreboot does not expose NHLT
162	* tables.	162	* tables.
163	*	163	*
@@ -391,7 +391,7 @@ int snd_intel_dsp_driver_probe(struct pci_dev *pci) · 227 unmodified lines
391	if (pci->class == 0x040300)	391	if (pci->class == 0x040300)
392	return SND_INTEL_DSP_DRIVER_LEGACY;	392	return SND_INTEL_DSP_DRIVER_LEGACY;
393	if (pci->class != 0x040100 && pci->class != 0x040380) {	393	if (pci->class != 0x040100 && pci->class != 0x040380) {
394	dev_err(&pci->dev, "Unknown PCI class/subclass/prog-if information (0x%06x) found, selecting HDA legacy driver\n", pci->class);	394	dev_err(&pci->dev, "Unknown PCI class/subclass/prog-if information (0x%06x) found, selecting HDAudio legacy driver\n", pci->class);
395	return SND_INTEL_DSP_DRIVER_LEGACY;	395	return SND_INTEL_DSP_DRIVER_LEGACY;
396	}	396	}
397		397

sound/pci/asihpi/asihpi.c+4−5

 		add_timer(&dpcm->timer);
 }
-static void snd_card_asihpi_int_task(unsigned long data)
+static void snd_card_asihpi_int_task(struct tasklet_struct *t)
 {
-	struct hpi_adapter *a = (struct hpi_adapter *)data;
+	struct snd_card_asihpi *asihpi = from_tasklet(asihpi, t, t);
-	struct snd_card_asihpi *asihpi;
+	struct hpi_adapter *a = asihpi->hpi;
 	WARN_ON(!a || !a->snd_card || !a->snd_card->private_data);
 	asihpi = (struct snd_card_asihpi *)a->snd_card->private_data;
 	if (hpi->interrupt_mode) {
 		asihpi->pcm_start = snd_card_asihpi_pcm_int_start;
 		asihpi->pcm_stop = snd_card_asihpi_pcm_int_stop;
-		tasklet_init(&asihpi->t, snd_card_asihpi_int_task,
+		tasklet_setup(&asihpi->t, snd_card_asihpi_int_task);
-			(unsigned long)hpi);
 		hpi->interrupt_callback = snd_card_asihpi_isr;
 	} else {
 		asihpi->pcm_start = snd_card_asihpi_pcm_timer_start;

sound/pci/ca0106/ca0106_main.c+2−1

 		else
 			/* Power down */
 			chip->spi_dac_reg[reg] |= bit;
-		return snd_ca0106_spi_write(chip, chip->spi_dac_reg[reg]);
+		if (snd_ca0106_spi_write(chip, chip->spi_dac_reg[reg]) != 0)
+			return -ENXIO;
 	}
 	return 0;
 }

sound/pci/hda/hda_intel.c+3−4

 	 */
 	if (dmic_detect) {
 		err = snd_intel_dsp_driver_probe(pci);
-		if (err != SND_INTEL_DSP_DRIVER_ANY &&
+		if (err != SND_INTEL_DSP_DRIVER_ANY && err != SND_INTEL_DSP_DRIVER_LEGACY) {
-		    err != SND_INTEL_DSP_DRIVER_LEGACY)
+			dev_dbg(&pci->dev, "HDAudio driver not selected, aborting probe\n");
 			return -ENODEV;
+		}
 	} else {
 		dev_warn(&pci->dev, "dmic_detect option is deprecated, pass snd-intel-dspcfg.dsp_driver=1 option instead\n");
 	}
 	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_HDMI },
 	/* Zhaoxin */
 	{ PCI_DEVICE(0x1d17, 0x3288), .driver_data = AZX_DRIVER_ZHAOXIN },
-	/* Loongson */
-	{ PCI_DEVICE(0x0014, 0x7a07), .driver_data = AZX_DRIVER_GENERIC },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, azx_ids);

sound/pci/hda/hda_tegra.c+7−0

 	struct hda_tegra *hda = container_of(chip, struct hda_tegra, chip);
 	if (chip && chip->running) {
+		/* enable controller wake up event */
+		azx_writew(chip, WAKEEN, azx_readw(chip, WAKEEN) |
+			   STATESTS_INT_MASK);
 		azx_stop_chip(chip);
 		azx_enter_link_reset(chip);
 	}
 	if (chip && chip->running) {
 		hda_tegra_init(hda);
 		azx_init_chip(chip, 1);
+		/* disable controller wake up event*/
+		azx_writew(chip, WAKEEN, azx_readw(chip, WAKEEN) &
+			   ~STATESTS_INT_MASK);
 	}
 	return 0;

sound/pci/hda/patch_hdmi.c+7−0

 			       hda_nid_t cvt_nid)
 {
 	if (per_pin) {
+		haswell_verify_D0(codec, per_pin->cvt_nid, per_pin->pin_nid);
 		snd_hda_set_dev_select(codec, per_pin->pin_nid,
 			       per_pin->dev_id);
 		intel_verify_pin_cvt_connect(codec, per_pin);
 static int patch_tegra_hdmi(struct hda_codec *codec)
 {
+	struct hdmi_spec *spec;
 	int err;
 	err = patch_generic_hdmi(codec);
 		return err;
 	codec->patch_ops.build_pcms = tegra_hdmi_build_pcms;
+	spec = codec->spec;
+	spec->chmap.ops.chmap_cea_alloc_validate_get_type =
+		nvhdmi_chmap_cea_alloc_validate_get_type;
+	spec->chmap.ops.chmap_validate = nvhdmi_chmap_validate;
 	return 0;
 }
 HDA_CODEC_ENTRY(0x8086280d, "Geminilake HDMI",	patch_i915_glk_hdmi),
 HDA_CODEC_ENTRY(0x8086280f, "Icelake HDMI",	patch_i915_icl_hdmi),
 HDA_CODEC_ENTRY(0x80862812, "Tigerlake HDMI",	patch_i915_tgl_hdmi),
+HDA_CODEC_ENTRY(0x80862816, "Rocketlake HDMI",	patch_i915_tgl_hdmi),
 HDA_CODEC_ENTRY(0x8086281a, "Jasperlake HDMI",	patch_i915_icl_hdmi),
 HDA_CODEC_ENTRY(0x8086281b, "Elkhartlake HDMI",	patch_i915_icl_hdmi),
 HDA_CODEC_ENTRY(0x80862880, "CedarTrail HDMI",	patch_generic_hdmi),

sound/pci/hda/patch_realtek.c+44−2

@@ -2475,6 +2475,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { · 2474 unmodified lines
2475	SND_PCI_QUIRK(0x1462, 0x1276, "MSI-GL73", ALC1220_FIXUP_CLEVO_P950),	2475	SND_PCI_QUIRK(0x1462, 0x1276, "MSI-GL73", ALC1220_FIXUP_CLEVO_P950),
2476	SND_PCI_QUIRK(0x1462, 0x1293, "MSI-GP65", ALC1220_FIXUP_CLEVO_P950),	2476	SND_PCI_QUIRK(0x1462, 0x1293, "MSI-GP65", ALC1220_FIXUP_CLEVO_P950),
2477	SND_PCI_QUIRK(0x1462, 0x7350, "MSI-7350", ALC889_FIXUP_CD),	2477	SND_PCI_QUIRK(0x1462, 0x7350, "MSI-7350", ALC889_FIXUP_CD),
		2478	SND_PCI_QUIRK(0x1462, 0x9c37, "MSI X570-A PRO", ALC1220_FIXUP_CLEVO_P950),
2478	SND_PCI_QUIRK(0x1462, 0xda57, "MSI Z270-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS),	2479	SND_PCI_QUIRK(0x1462, 0xda57, "MSI Z270-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS),
2479	SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3),	2480	SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3),
2480	SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX),	2481	SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX),
@@ -5867,6 +5868,39 @@ static void alc275_fixup_gpio4_off(struct hda_codec *codec, · 3386 unmodified lines
5867	}	5868	}
5868	}	5869	}
5869		5870
		5871	/* Quirk for Thinkpad X1 7th and 8th Gen
		5872	* The following fixed routing needed
		5873	* DAC1 (NID 0x02) -> Speaker (NID 0x14); some eq applied secretly
		5874	* DAC2 (NID 0x03) -> Bass (NID 0x17) & Headphone (NID 0x21); sharing a DAC
		5875	* DAC3 (NID 0x06) -> Unused, due to the lack of volume amp
		5876	*/
		5877	static void alc285_fixup_thinkpad_x1_gen7(struct hda_codec *codec,
		5878	const struct hda_fixup *fix, int action)
		5879	{
		5880	static const hda_nid_t conn[] = { 0x02, 0x03 }; /* exclude 0x06 */
		5881	static const hda_nid_t preferred_pairs[] = {
		5882	0x14, 0x02, 0x17, 0x03, 0x21, 0x03, 0
		5883	};
		5884	struct alc_spec *spec = codec->spec;
		5885
		5886	switch (action) {
		5887	case HDA_FIXUP_ACT_PRE_PROBE:
		5888	snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);
		5889	spec->gen.preferred_dacs = preferred_pairs;
		5890	break;
		5891	case HDA_FIXUP_ACT_BUILD:
		5892	/* The generic parser creates somewhat unintuitive volume ctls
		5893	* with the fixed routing above, and the shared DAC2 may be
		5894	* confusing for PA.
		5895	* Rename those to unique names so that PA doesn't touch them
		5896	* and use only Master volume.
		5897	*/
		5898	rename_ctl(codec, "Front Playback Volume", "DAC1 Playback Volume");
		5899	rename_ctl(codec, "Bass Speaker Playback Volume", "DAC2 Playback Volume");
		5900	break;
		5901	}
		5902	}
		5903
5870	static void alc233_alc662_fixup_lenovo_dual_codecs(struct hda_codec *codec,	5904	static void alc233_alc662_fixup_lenovo_dual_codecs(struct hda_codec *codec,
5871	const struct hda_fixup *fix,	5905	const struct hda_fixup *fix,
5872	int action)	5906	int action)
@@ -6135,6 +6169,7 @@ enum { · 262 unmodified lines
6135	ALC289_FIXUP_DUAL_SPK,	6169	ALC289_FIXUP_DUAL_SPK,
6136	ALC294_FIXUP_SPK2_TO_DAC1,	6170	ALC294_FIXUP_SPK2_TO_DAC1,
6137	ALC294_FIXUP_ASUS_DUAL_SPK,	6171	ALC294_FIXUP_ASUS_DUAL_SPK,
		6172	ALC285_FIXUP_THINKPAD_X1_GEN7,
6138	ALC285_FIXUP_THINKPAD_HEADSET_JACK,	6173	ALC285_FIXUP_THINKPAD_HEADSET_JACK,
6139	ALC294_FIXUP_ASUS_HPE,	6174	ALC294_FIXUP_ASUS_HPE,
6140	ALC294_FIXUP_ASUS_COEF_1B,	6175	ALC294_FIXUP_ASUS_COEF_1B,
@@ -7280,11 +7315,17 @@ static const struct hda_fixup alc269_fixups[] = { · 1139 unmodified lines
7280	.chained = true,	7315	.chained = true,
7281	.chain_id = ALC294_FIXUP_SPK2_TO_DAC1	7316	.chain_id = ALC294_FIXUP_SPK2_TO_DAC1
7282	},	7317	},
		7318	[ALC285_FIXUP_THINKPAD_X1_GEN7] = {
		7319	.type = HDA_FIXUP_FUNC,
		7320	.v.func = alc285_fixup_thinkpad_x1_gen7,
		7321	.chained = true,
		7322	.chain_id = ALC269_FIXUP_THINKPAD_ACPI
		7323	},
7283	[ALC285_FIXUP_THINKPAD_HEADSET_JACK] = {	7324	[ALC285_FIXUP_THINKPAD_HEADSET_JACK] = {
7284	.type = HDA_FIXUP_FUNC,	7325	.type = HDA_FIXUP_FUNC,
7285	.v.func = alc_fixup_headset_jack,	7326	.v.func = alc_fixup_headset_jack,
7286	.chained = true,	7327	.chained = true,
7287	.chain_id = ALC285_FIXUP_SPEAKER2_TO_DAC1	7328	.chain_id = ALC285_FIXUP_THINKPAD_X1_GEN7
7288	},	7329	},
7289	[ALC294_FIXUP_ASUS_HPE] = {	7330	[ALC294_FIXUP_ASUS_HPE] = {
7290	.type = HDA_FIXUP_VERBS,	7331	.type = HDA_FIXUP_VERBS,
@@ -7695,7 +7736,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { · 404 unmodified lines
7695	SND_PCI_QUIRK(0x144d, 0xc169, "Samsung Notebook 9 Pen (NP930SBE-K01US)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),	7736	SND_PCI_QUIRK(0x144d, 0xc169, "Samsung Notebook 9 Pen (NP930SBE-K01US)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
7696	SND_PCI_QUIRK(0x144d, 0xc176, "Samsung Notebook 9 Pro (NP930MBE-K04US)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),	7737	SND_PCI_QUIRK(0x144d, 0xc176, "Samsung Notebook 9 Pro (NP930MBE-K04US)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
7697	SND_PCI_QUIRK(0x144d, 0xc189, "Samsung Galaxy Flex Book (NT950QCG-X716)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),	7738	SND_PCI_QUIRK(0x144d, 0xc189, "Samsung Galaxy Flex Book (NT950QCG-X716)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
7698	SND_PCI_QUIRK(0x144d, 0xc18a, "Samsung Galaxy Book Ion (NT950XCJ-X716A)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),	7739	SND_PCI_QUIRK(0x144d, 0xc18a, "Samsung Galaxy Book Ion (NP930XCJ-K01US)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
		7740	SND_PCI_QUIRK(0x144d, 0xc830, "Samsung Galaxy Book Ion (NT950XCJ-X716A)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
7699	SND_PCI_QUIRK(0x144d, 0xc740, "Samsung Ativ book 8 (NP870Z5G)", ALC269_FIXUP_ATIV_BOOK_8),	7741	SND_PCI_QUIRK(0x144d, 0xc740, "Samsung Ativ book 8 (NP870Z5G)", ALC269_FIXUP_ATIV_BOOK_8),
7700	SND_PCI_QUIRK(0x144d, 0xc812, "Samsung Notebook Pen S (NT950SBE-X58)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),	7742	SND_PCI_QUIRK(0x144d, 0xc812, "Samsung Notebook Pen S (NT950SBE-X58)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
7701	SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),	7743	SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),

sound/pci/riptide/riptide.c+3−3

@@ -1070,9 +1070,9 @@ getmixer(struct cmdif cif, short num, unsigned short rval, · 1069 unmodified lines
1070	return 0;	1070	return 0;
1071	}	1071	}
1072		1072
1073	static void riptide_handleirq(unsigned long dev_id)	1073	static void riptide_handleirq(struct tasklet_struct *t)
1074	{	1074	{
1075	struct snd_riptide chip = (void )dev_id;	1075	struct snd_riptide *chip = from_tasklet(chip, t, riptide_tq);
1076	struct cmdif *cif = chip->cif;	1076	struct cmdif *cif = chip->cif;
1077	struct snd_pcm_substream *substream[PLAYBACK_SUBSTREAMS + 1];	1077	struct snd_pcm_substream *substream[PLAYBACK_SUBSTREAMS + 1];
1078	struct snd_pcm_runtime *runtime;	1078	struct snd_pcm_runtime *runtime;
@@ -1843,7 +1843,7 @@ snd_riptide_create(struct snd_card card, struct pci_dev pci, · 764 unmodified lines
1843	chip->received_irqs = 0;	1843	chip->received_irqs = 0;
1844	chip->handled_irqs = 0;	1844	chip->handled_irqs = 0;
1845	chip->cif = NULL;	1845	chip->cif = NULL;
1846	tasklet_init(&chip->riptide_tq, riptide_handleirq, (unsigned long)chip);	1846	tasklet_setup(&chip->riptide_tq, riptide_handleirq);
1847		1847
1848	if ((chip->res_port =	1848	if ((chip->res_port =
1849	request_region(chip->port, 64, "RIPTIDE")) == NULL) {	1849	request_region(chip->port, 64, "RIPTIDE")) == NULL) {

sound/pci/rme9652/hdsp.c+3−3

@@ -3791,9 +3791,9 @@ static int snd_hdsp_set_defaults(struct hdsp *hdsp) · 3790 unmodified lines
3791	return 0;	3791	return 0;
3792	}	3792	}
3793		3793
3794	static void hdsp_midi_tasklet(unsigned long arg)	3794	static void hdsp_midi_tasklet(struct tasklet_struct *t)
3795	{	3795	{
3796	struct hdsp hdsp = (struct hdsp )arg;	3796	struct hdsp *hdsp = from_tasklet(hdsp, t, midi_tasklet);
3797		3797
3798	if (hdsp->midi[0].pending)	3798	if (hdsp->midi[0].pending)
3799	snd_hdsp_midi_input_read (&hdsp->midi[0]);	3799	snd_hdsp_midi_input_read (&hdsp->midi[0]);
@@ -5182,7 +5182,7 @@ static int snd_hdsp_create(struct snd_card *card, · 1382 unmodified lines
5182		5182
5183	spin_lock_init(&hdsp->lock);	5183	spin_lock_init(&hdsp->lock);
5184		5184
5185	tasklet_init(&hdsp->midi_tasklet, hdsp_midi_tasklet, (unsigned long)hdsp);	5185	tasklet_setup(&hdsp->midi_tasklet, hdsp_midi_tasklet);
5186		5186
5187	pci_read_config_word(hdsp->pci, PCI_CLASS_REVISION, &hdsp->firmware_rev);	5187	pci_read_config_word(hdsp->pci, PCI_CLASS_REVISION, &hdsp->firmware_rev);
5188	hdsp->firmware_rev &= 0xff;	5188	hdsp->firmware_rev &= 0xff;

sound/pci/rme9652/hdspm.c+3−4

 }
-static void hdspm_midi_tasklet(unsigned long arg)
+static void hdspm_midi_tasklet(struct tasklet_struct *t)
 {
-	struct hdspm *hdspm = (struct hdspm *)arg;
+	struct hdspm *hdspm = from_tasklet(hdspm, t, midi_tasklet);
 	int i = 0;
 	while (i < hdspm->midiPorts) {
 	}
-	tasklet_init(&hdspm->midi_tasklet,
+	tasklet_setup(&hdspm->midi_tasklet, hdspm_midi_tasklet);
-			hdspm_midi_tasklet, (unsigned long) hdspm);
 	if (hdspm->io_type != MADIface) {

sound/soc/fsl/fsl_esai.c+3−4

 			   ESAI_xFCR_xFR, 0);
 }
-static void fsl_esai_hw_reset(unsigned long arg)
+static void fsl_esai_hw_reset(struct tasklet_struct *t)
 {
-	struct fsl_esai *esai_priv = (struct fsl_esai *)arg;
+	struct fsl_esai *esai_priv = from_tasklet(esai_priv, t, task);
 	bool tx = true, rx = false, enabled[2];
 	unsigned long lock_flags;
 	u32 tfcr, rfcr;
 		return ret;
 	}
-	tasklet_init(&esai_priv->task, fsl_esai_hw_reset,
+	tasklet_setup(&esai_priv->task, fsl_esai_hw_reset);
-		     (unsigned long)esai_priv);
 	pm_runtime_enable(&pdev->dev);

sound/soc/sh/siu_pcm.c+4−6

 	return 0;
 }
-static void siu_io_tasklet(unsigned long data)
+static void siu_io_tasklet(struct tasklet_struct *t)
 {
-	struct siu_stream *siu_stream = (struct siu_stream *)data;
+	struct siu_stream *siu_stream = from_tasklet(siu_stream, t, tasklet);
 	struct snd_pcm_substream *substream = siu_stream->substream;
 	struct device *dev = substream->pcm->card->dev;
 	struct snd_pcm_runtime *rt = substream->runtime;
 		(*port_info)->pcm = pcm;
 		/* IO tasklets */
-		tasklet_init(&(*port_info)->playback.tasklet, siu_io_tasklet,
+		tasklet_setup(&(*port_info)->playback.tasklet, siu_io_tasklet);
-			     (unsigned long)&(*port_info)->playback);
+		tasklet_setup(&(*port_info)->capture.tasklet, siu_io_tasklet);
-		tasklet_init(&(*port_info)->capture.tasklet, siu_io_tasklet,
-			     (unsigned long)&(*port_info)->capture);
 	}
 	dev_info(card->dev, "SuperH SIU driver initialized.\n");

sound/soc/txx9/txx9aclc.c+3−4

 #define NR_DMA_CHAIN		2
-static void txx9aclc_dma_tasklet(unsigned long data)
+static void txx9aclc_dma_tasklet(struct tasklet_struct *t)
 {
-	struct txx9aclc_dmadata *dmadata = (struct txx9aclc_dmadata *)data;
+	struct txx9aclc_dmadata *dmadata = from_tasklet(dmadata, t, tasklet);
 	struct dma_chan *chan = dmadata->dma_chan;
 	struct dma_async_tx_descriptor *desc;
 	struct snd_pcm_substream *substream = dmadata->substream;
 			"playback" : "capture");
 		return -EBUSY;
 	}
-	tasklet_init(&dmadata->tasklet, txx9aclc_dma_tasklet,
+	tasklet_setup(&dmadata->tasklet, txx9aclc_dma_tasklet);
-		     (unsigned long)dmadata);
 	return 0;
 }

sound/usb/midi.c+3−4

 	spin_unlock_irqrestore(&ep->buffer_lock, flags);
 }
-static void snd_usbmidi_out_tasklet(unsigned long data)
+static void snd_usbmidi_out_tasklet(struct tasklet_struct *t)
 {
-	struct snd_usb_midi_out_endpoint *ep =
+	struct snd_usb_midi_out_endpoint *ep = from_tasklet(ep, t, tasklet);
-		(struct snd_usb_midi_out_endpoint *) data;
 	snd_usbmidi_do_output(ep);
 }
 	}
 	spin_lock_init(&ep->buffer_lock);
-	tasklet_init(&ep->tasklet, snd_usbmidi_out_tasklet, (unsigned long)ep);
+	tasklet_setup(&ep->tasklet, snd_usbmidi_out_tasklet);
 	init_waitqueue_head(&ep->drain_wait);
 	for (i = 0; i < 0x10; ++i)

sound/usb/misc/ua101.c+3−4

 		*value -= ua->playback.queue_length;
 }
-static void playback_tasklet(unsigned long data)
+static void playback_tasklet(struct tasklet_struct *t)
 {
-	struct ua101 *ua = (void *)data;
+	struct ua101 *ua = from_tasklet(ua, t, playback_tasklet);
 	unsigned long flags;
 	unsigned int frames;
 	struct ua101_urb *urb;
 	spin_lock_init(&ua->lock);
 	mutex_init(&ua->mutex);
 	INIT_LIST_HEAD(&ua->ready_playback_urbs);
-	tasklet_init(&ua->playback_tasklet,
+	tasklet_setup(&ua->playback_tasklet, playback_tasklet);
-		     playback_tasklet, (unsigned long)ua);
 	init_waitqueue_head(&ua->alsa_capture_wait);
 	init_waitqueue_head(&ua->rate_feedback_wait);
 	init_waitqueue_head(&ua->alsa_playback_wait);

sound/usb/pcm.c+2−0

 	case USB_ID(0x07fd, 0x0008): /* MOTU M Series */
 	case USB_ID(0x31e9, 0x0001): /* Solid State Logic SSL2 */
 	case USB_ID(0x31e9, 0x0002): /* Solid State Logic SSL2+ */
+	case USB_ID(0x0499, 0x172f): /* Steinberg UR22C */
 	case USB_ID(0x0d9a, 0x00df): /* RTX6001 */
 		ep = 0x81;
 		ifnum = 2;
 		goto add_sync_ep_from_ifnum;
 	case USB_ID(0x2b73, 0x000a): /* Pioneer DJ DJM-900NXS2 */
+	case USB_ID(0x2b73, 0x0017): /* Pioneer DJ DJM-250MK2 */
 		ep = 0x82;
 		ifnum = 0;
 		goto add_sync_ep_from_ifnum;

sound/usb/quirks-table.h+67−11

@@ -2827,14 +2827,24 @@ YAMAHA_DEVICE(0x7010, "UB99"), · 2826 unmodified lines
2827	/* Lenovo ThinkStation P620 Rear Line-in, Line-out and Microphone */	2827	/* Lenovo ThinkStation P620 Rear Line-in, Line-out and Microphone */
2828	{	2828	{
2829	USB_DEVICE(0x17aa, 0x1046),	2829	USB_DEVICE(0x17aa, 0x1046),
2830	QUIRK_DEVICE_PROFILE("Lenovo", "ThinkStation P620 Rear",	2830	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
2831	"Lenovo-ThinkStation-P620-Rear"),	2831	.vendor_name = "Lenovo",
		2832	.product_name = "ThinkStation P620 Rear",
		2833	.profile_name = "Lenovo-ThinkStation-P620-Rear",
		2834	.ifnum = QUIRK_ANY_INTERFACE,
		2835	.type = QUIRK_SETUP_DISABLE_AUTOSUSPEND
		2836	}
2832	},	2837	},
2833	/* Lenovo ThinkStation P620 Internal Speaker + Front Headset */	2838	/* Lenovo ThinkStation P620 Internal Speaker + Front Headset */
2834	{	2839	{
2835	USB_DEVICE(0x17aa, 0x104d),	2840	USB_DEVICE(0x17aa, 0x104d),
2836	QUIRK_DEVICE_PROFILE("Lenovo", "ThinkStation P620 Main",	2841	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
2837	"Lenovo-ThinkStation-P620-Main"),	2842	.vendor_name = "Lenovo",
		2843	.product_name = "ThinkStation P620 Main",
		2844	.profile_name = "Lenovo-ThinkStation-P620-Main",
		2845	.ifnum = QUIRK_ANY_INTERFACE,
		2846	.type = QUIRK_SETUP_DISABLE_AUTOSUSPEND
		2847	}
2838	},	2848	},
2839		2849
2840	/* Native Instruments MK2 series */	2850	/* Native Instruments MK2 series */
@@ -3549,14 +3559,40 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), · 708 unmodified lines
3549	{	3559	{
3550	/*	3560	/*
3551	* Pioneer DJ DJM-250MK2	3561	* Pioneer DJ DJM-250MK2
3552	* PCM is 8 channels out @ 48 fixed (endpoints 0x01).	3562	* PCM is 8 channels out @ 48 fixed (endpoint 0x01)
3553	* The output from computer to the mixer is usable.	3563	* and 8 channels in @ 48 fixed (endpoint 0x82).
		3564	*
		3565	* Both playback and recording is working, even simultaneously.
3554	*	3566	*
3555	* The input (phono or line to computer) is not working.	3567	* Playback channels could be mapped to:
3556	* It should be at endpoint 0x82 and probably also 8 channels,	3568	* - CH1
3557	* but it seems that it works only with Pioneer proprietary software.	3569	* - CH2
3558	* Even on officially supported OS, the Audacity was unable to record	3570	* - AUX
3559	* and Mixxx to recognize the control vinyls.	3571	*
		3572	* Recording channels could be mapped to:
		3573	* - Post CH1 Fader
		3574	* - Post CH2 Fader
		3575	* - Cross Fader A
		3576	* - Cross Fader B
		3577	* - MIC
		3578	* - AUX
		3579	* - REC OUT
		3580	*
		3581	* There is remaining problem with recording directly from PHONO/LINE.
		3582	* If we map a channel to:
		3583	* - CH1 Control Tone PHONO
		3584	* - CH1 Control Tone LINE
		3585	* - CH2 Control Tone PHONO
		3586	* - CH2 Control Tone LINE
		3587	* it is silent.
		3588	* There is no signal even on other operating systems with official drivers.
		3589	* The signal appears only when a supported application is started.
		3590	* This needs to be investigated yet...
		3591	* (there is quite a lot communication on the USB in both directions)
		3592	*
		3593	* In current version this mixer could be used for playback
		3594	* and for recording from vinyls (through Post CH* Fader)
		3595	* but not for DVS (Digital Vinyl Systems) like in Mixxx.
3560	*/	3596	*/
3561	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x0017),	3597	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x0017),
3562	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {	3598	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
@@ -3580,6 +3616,26 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), · 17 unmodified lines
3580	.rate_max = 48000,	3616	.rate_max = 48000,
3581	.nr_rates = 1,	3617	.nr_rates = 1,
3582	.rate_table = (unsigned int[]) { 48000 }	3618	.rate_table = (unsigned int[]) { 48000 }
		3619	}
		3620	},
		3621	{
		3622	.ifnum = 0,
		3623	.type = QUIRK_AUDIO_FIXED_ENDPOINT,
		3624	.data = &(const struct audioformat) {
		3625	.formats = SNDRV_PCM_FMTBIT_S24_3LE,
		3626	.channels = 8, // inputs
		3627	.iface = 0,
		3628	.altsetting = 1,
		3629	.altset_idx = 1,
		3630	.endpoint = 0x82,
		3631	.ep_attr = USB_ENDPOINT_XFER_ISOC\|
		3632	USB_ENDPOINT_SYNC_ASYNC\|
		3633	USB_ENDPOINT_USAGE_IMPLICIT_FB,
		3634	.rates = SNDRV_PCM_RATE_48000,
		3635	.rate_min = 48000,
		3636	.rate_max = 48000,
		3637	.nr_rates = 1,
		3638	.rate_table = (unsigned int[]) { 48000 }
3583	}	3639	}
3584	},	3640	},
3585	{	3641	{

sound/usb/quirks.c+11−0

 	return 1;	/* Continue with creating streams and mixer */
 }
+static int setup_disable_autosuspend(struct snd_usb_audio *chip,
+				       struct usb_interface *iface,
+				       struct usb_driver *driver,
+				       const struct snd_usb_audio_quirk *quirk)
+{
+	driver->supports_autosuspend = 0;
+	return 1;	/* Continue with creating streams and mixer */
+}
 /*
  * audio-interface quirks
  *
 		[QUIRK_AUDIO_ALIGN_TRANSFER] = create_align_transfer_quirk,
 		[QUIRK_AUDIO_STANDARD_MIXER] = create_standard_mixer_quirk,
 		[QUIRK_SETUP_FMT_AFTER_RESUME] = setup_fmt_after_resume_quirk,
+		[QUIRK_SETUP_DISABLE_AUTOSUSPEND] = setup_disable_autosuspend,
 	};
 	if (quirk->type < QUIRK_TYPE_COUNT) {
 		set_format_emu_quirk(subs, fmt);
 		break;
 	case USB_ID(0x2b73, 0x000a): /* Pioneer DJ DJM-900NXS2 */
+	case USB_ID(0x2b73, 0x0017): /* Pioneer DJ DJM-250MK2 */
 		pioneer_djm_set_format_quirk(subs);
 		break;
 	case USB_ID(0x534d, 0x2109): /* MacroSilicon MS2109 */

sound/usb/usbaudio.h+1−0

@@ -102,6 +102,7 @@ enum quirk_type { · 101 unmodified lines
102	QUIRK_AUDIO_ALIGN_TRANSFER,	102	QUIRK_AUDIO_ALIGN_TRANSFER,
103	QUIRK_AUDIO_STANDARD_MIXER,	103	QUIRK_AUDIO_STANDARD_MIXER,
104	QUIRK_SETUP_FMT_AFTER_RESUME,	104	QUIRK_SETUP_FMT_AFTER_RESUME,
		105	QUIRK_SETUP_DISABLE_AUTOSUSPEND,
105		106
106	QUIRK_TYPE_COUNT	107	QUIRK_TYPE_COUNT
107	};	108	};

sound/x86/Kconfig+1−1

@@ -9,7 +9,7 @@ menuconfig SND_X86 · 8 unmodified lines
9	if SND_X86	9	if SND_X86
10		10
11	config HDMI_LPE_AUDIO	11	config HDMI_LPE_AUDIO
12	tristate "HDMI audio without HDaudio on Intel Atom platforms"	12	tristate "HDMI audio without HDAudio on Intel Atom platforms"
13	depends on DRM_I915	13	depends on DRM_I915
14	select SND_PCM	14	select SND_PCM
15	help	15	help

tools/include/uapi/linux/perf_event.h+1−1

@@ -1196,7 +1196,7 @@ union perf_mem_data_src { · 1195 unmodified lines
1196		1196
1197	#define PERF_MEM_SNOOPX_FWD 0x01 /* forward */	1197	#define PERF_MEM_SNOOPX_FWD 0x01 /* forward */
1198	/* 1 free */	1198	/* 1 free */
1199	#define PERF_MEM_SNOOPX_SHIFT 37	1199	#define PERF_MEM_SNOOPX_SHIFT 38
1200		1200
1201	/* locked instruction */	1201	/* locked instruction */
1202	#define PERF_MEM_LOCK_NA 0x01 /* not available */	1202	#define PERF_MEM_LOCK_NA 0x01 /* not available */

tools/lib/traceevent/event-parse.c+1−1

@@ -5259,7 +5259,7 @@ static int print_arg_pointer(struct trace_seq s, const char format, int plen, · 5258 unmodified lines
5259	default:	5259	default:
5260	ret = 0;	5260	ret = 0;
5261	val = eval_num_arg(data, size, event, arg);	5261	val = eval_num_arg(data, size, event, arg);
5262	trace_seq_printf(s, "%p", (void *)val);	5262	trace_seq_printf(s, "%p", (void *)(intptr_t)val);
5263	break;	5263	break;
5264	}	5264	}
5265		5265

tools/perf/Documentation/perf-record.txt+4−0

         - a raw PMU event (eventsel+umask) in the form of rNNN where NNN is a
 	  hexadecimal event descriptor.
+        - a symbolic or raw PMU event followed by an optional colon
+	  and a list of event modifiers, e.g., cpu-cycles:p.  See the
+	  linkperf:perf-list[1] man page for details on event modifiers.
 	- a symbolically formed PMU event like 'pmu/param1=0x3,param2/' where
 	  'param1', 'param2', etc are defined as formats for the PMU in
 	  /sys/bus/event_source/devices/<pmu>/format/*.

tools/perf/Documentation/perf-stat.txt+7−0

 	- a raw PMU event (eventsel+umask) in the form of rNNN where NNN is a
 	  hexadecimal event descriptor.
+        - a symbolic or raw PMU event followed by an optional colon
+	  and a list of event modifiers, e.g., cpu-cycles:p.  See the
+	  linkperf:perf-list[1] man page for details on event modifiers.
 	- a symbolically formed event like 'pmu/param1=0x3,param2/' where
 	  param1 and param2 are defined as formats for the PMU in
 	  /sys/bus/event_source/devices/<pmu>/format/*
 hardware thread. This is essentially a replacement for the any bit and
 convenient for post processing.
+--summary::
+Print summary for interval mode (-I).
 EXAMPLES
 --------

tools/perf/bench/synthesize.c+2−2

@@ -162,8 +162,8 @@ static int do_run_multi_threaded(struct target *target, · 161 unmodified lines
162	init_stats(&event_stats);	162	init_stats(&event_stats);
163	for (i = 0; i < multi_iterations; i++) {	163	for (i = 0; i < multi_iterations; i++) {
164	session = perf_session__new(NULL, false, NULL);	164	session = perf_session__new(NULL, false, NULL);
165	if (!session)	165	if (IS_ERR(session))
166	return -ENOMEM;	166	return PTR_ERR(session);
167		167
168	atomic_set(&event_count, 0);	168	atomic_set(&event_count, 0);
169	gettimeofday(&start, NULL);	169	gettimeofday(&start, NULL);

tools/perf/builtin-record.c+1−1

@@ -2452,7 +2452,7 @@ static struct option __record_options[] = { · 2451 unmodified lines
2452	OPT_BOOLEAN(0, "tail-synthesize", &record.opts.tail_synthesize,	2452	OPT_BOOLEAN(0, "tail-synthesize", &record.opts.tail_synthesize,
2453	"synthesize non-sample events at the end of output"),	2453	"synthesize non-sample events at the end of output"),
2454	OPT_BOOLEAN(0, "overwrite", &record.opts.overwrite, "use overwrite mode"),	2454	OPT_BOOLEAN(0, "overwrite", &record.opts.overwrite, "use overwrite mode"),
2455	OPT_BOOLEAN(0, "no-bpf-event", &record.opts.no_bpf_event, "record bpf events"),	2455	OPT_BOOLEAN(0, "no-bpf-event", &record.opts.no_bpf_event, "do not record bpf events"),
2456	OPT_BOOLEAN(0, "strict-freq", &record.opts.strict_freq,	2456	OPT_BOOLEAN(0, "strict-freq", &record.opts.strict_freq,
2457	"Fail if the specified frequency can't be used"),	2457	"Fail if the specified frequency can't be used"),
2458	OPT_CALLBACK('F', "freq", &record.opts, "freq or 'max'",	2458	OPT_CALLBACK('F', "freq", &record.opts, "freq or 'max'",

tools/perf/builtin-report.c+3−0

@@ -1332,6 +1332,9 @@ int cmd_report(int argc, const char **argv) · 1331 unmodified lines
1332	if (report.mmaps_mode)	1332	if (report.mmaps_mode)
1333	report.tasks_mode = true;	1333	report.tasks_mode = true;
1334		1334
		1335	if (dump_trace)
		1336	report.tool.ordered_events = false;
		1337
1335	if (quiet)	1338	if (quiet)
1336	perf_quiet_option();	1339	perf_quiet_option();
1337		1340

tools/perf/builtin-sched.c+5−1

 	}
 	if (!sched->idle_hist || thread->tid == 0) {
-		timehist_update_runtime_stats(tr, t, tprev);
+		if (!cpu_list || test_bit(sample->cpu, cpu_bitmap))
+			timehist_update_runtime_stats(tr, t, tprev);
 		if (sched->idle_hist) {
 			struct idle_thread_runtime *itr = (void *)tr;
 	printf("\nIdle stats:\n");
 	for (i = 0; i < idle_max_cpu; ++i) {
+		if (cpu_list && !test_bit(i, cpu_bitmap))
+			continue;
 		t = idle_threads[i];
 		if (!t)
 			continue;

tools/perf/builtin-stat.c+5−3

 {
 	struct evsel *counter;
-	if (!stat_config.summary && (read_affinity_counters(rs) < 0))
+	if (!stat_config.stop_read_counter && (read_affinity_counters(rs) < 0))
 		return;
 	evlist__for_each_entry(evsel_list, counter) {
 	if (stat_config.walltime_run_table)
 		stat_config.walltime_run[run_idx] = t1 - t0;
-	if (interval) {
+	if (interval && stat_config.summary) {
 		stat_config.interval = 0;
-		stat_config.summary = true;
+		stat_config.stop_read_counter = true;
 		init_stats(&walltime_nsecs_stats);
 		update_stats(&walltime_nsecs_stats, t1 - t0);
 		    "Use with 'percore' event qualifier to show the event "
 		    "counts of one hardware thread by sum up total hardware "
 		    "threads of same physical core"),
+	OPT_BOOLEAN(0, "summary", &stat_config.summary,
+		       "print summary for interval mode"),
 #ifdef HAVE_LIBPFM
 	OPT_CALLBACK(0, "pfm-events", &evsel_list, "event",
 		"libpfm4 event selector. use 'perf list' to list available events",

tools/perf/builtin-top.c+2−0

 		goto out_delete_evlist;
 	}
+#ifdef HAVE_LIBBPF_SUPPORT
 	if (!top.record_opts.no_bpf_event) {
 		top.sb_evlist = evlist__new();
 			goto out_delete_evlist;
 		}
 	}
+#endif
 	if (perf_evlist__start_sb_thread(top.sb_evlist, target)) {
 		pr_debug("Couldn't start the BPF side band thread:\nBPF programs starting from now on won't be annotatable\n");

tools/perf/pmu-events/jevents.c+1−1

@@ -137,7 +137,7 @@ static char fixregex(char s) · 136 unmodified lines
137	return s;	137	return s;
138		138
139	/* allocate space for a new string */	139	/* allocate space for a new string */
140	fixed = (char *) malloc(len + 1);	140	fixed = (char *) malloc(len + esc_count + 1);
141	if (!fixed)	141	if (!fixed)
142	return NULL;	142	return NULL;
143		143

tools/perf/tests/bpf.c+1−1

@@ -197,7 +197,7 @@ static int do_test(struct bpf_object obj, int (func)(void), · 196 unmodified lines
197	perf_mmap__read_done(&md->core);	197	perf_mmap__read_done(&md->core);
198	}	198	}
199		199
200	if (count != expect) {	200	if (count != expect * evlist->core.nr_entries) {
201	pr_debug("BPF filter result incorrect, expected %d, got %d samples\n", expect, count);	201	pr_debug("BPF filter result incorrect, expected %d, got %d samples\n", expect, count);
202	goto out_delete_evlist;	202	goto out_delete_evlist;
203	}	203	}

tools/perf/tests/parse-events.c+2−2

tools/perf/tests/parse-metric.c+3−0

 {
 	.metric_expr	= "1/m3",
 	.metric_name	= "M3",
+},
+{
+	.name	= NULL,
 }
 };

tools/perf/ui/browsers/hists.c+2−1

 {
 	int nr_entries = evlist->core.nr_entries;
-single_entry:
 	if (perf_evlist__single_entry(evlist)) {
+single_entry: {
 		struct evsel *first = evlist__first(evlist);
 		return perf_evsel__hists_browse(first, nr_entries, help,
 						env, warn_lost_event,
 						annotation_opts);
 	}
+	}
 	if (symbol_conf.event_group) {
 		struct evsel *pos;

tools/perf/util/arm-spe-decoder/arm-spe-decoder.c+3−3

@@ -182,15 +182,15 @@ static int arm_spe_read_record(struct arm_spe_decoder *decoder) · 181 unmodified lines
182	if (payload & BIT(EV_TLB_ACCESS))	182	if (payload & BIT(EV_TLB_ACCESS))
183	decoder->record.type \|= ARM_SPE_TLB_ACCESS;	183	decoder->record.type \|= ARM_SPE_TLB_ACCESS;
184		184
185	if ((idx == 1 \|\| idx == 2 \|\| idx == 3) &&	185	if ((idx == 2 \|\| idx == 4 \|\| idx == 8) &&
186	(payload & BIT(EV_LLC_MISS)))	186	(payload & BIT(EV_LLC_MISS)))
187	decoder->record.type \|= ARM_SPE_LLC_MISS;	187	decoder->record.type \|= ARM_SPE_LLC_MISS;
188		188
189	if ((idx == 1 \|\| idx == 2 \|\| idx == 3) &&	189	if ((idx == 2 \|\| idx == 4 \|\| idx == 8) &&
190	(payload & BIT(EV_LLC_ACCESS)))	190	(payload & BIT(EV_LLC_ACCESS)))
191	decoder->record.type \|= ARM_SPE_LLC_ACCESS;	191	decoder->record.type \|= ARM_SPE_LLC_ACCESS;
192		192
193	if ((idx == 1 \|\| idx == 2 \|\| idx == 3) &&	193	if ((idx == 2 \|\| idx == 4 \|\| idx == 8) &&
194	(payload & BIT(EV_REMOTE_ACCESS)))	194	(payload & BIT(EV_REMOTE_ACCESS)))
195	decoder->record.type \|= ARM_SPE_REMOTE_ACCESS;	195	decoder->record.type \|= ARM_SPE_REMOTE_ACCESS;
196		196

tools/perf/util/cs-etm.c+8−1

 		attr.sample_type &= ~(u64)PERF_SAMPLE_ADDR;
 	}
-	if (etm->synth_opts.last_branch)
+	if (etm->synth_opts.last_branch) {
 		attr.sample_type |= PERF_SAMPLE_BRANCH_STACK;
+		/*
+		 * We don't use the hardware index, but the sample generation
+		 * code uses the new format branch_stack with this field,
+		 * so the event attributes must indicate that it's present.
+		 */
+		attr.branch_sample_type |= PERF_SAMPLE_BRANCH_HW_INDEX;
+	}
 	if (etm->synth_opts.instructions) {
 		attr.config = PERF_COUNT_HW_INSTRUCTIONS;

tools/perf/util/intel-pt.c+8−1

 	if (pt->synth_opts.callchain)
 		attr.sample_type |= PERF_SAMPLE_CALLCHAIN;
-	if (pt->synth_opts.last_branch)
+	if (pt->synth_opts.last_branch) {
 		attr.sample_type |= PERF_SAMPLE_BRANCH_STACK;
+		/*
+		 * We don't use the hardware index, but the sample generation
+		 * code uses the new format branch_stack with this field,
+		 * so the event attributes must indicate that it's present.
+		 */
+		attr.branch_sample_type |= PERF_SAMPLE_BRANCH_HW_INDEX;
+	}
 	if (pt->synth_opts.instructions) {
 		attr.config = PERF_COUNT_HW_INSTRUCTIONS;

tools/perf/util/machine.c+0−6

 	return 0;
 }
-static int is_bpf_image(const char *name)
-{
-	return strncmp(name, "bpf_trampoline_", sizeof("bpf_trampoline_") - 1) == 0 ||
-	       strncmp(name, "bpf_dispatcher_", sizeof("bpf_dispatcher_") - 1) == 0;
-}
 static int machine__process_ksymbol_register(struct machine *machine,
 					     union perf_event *event,
 					     struct perf_sample *sample __maybe_unused)

tools/perf/util/map.c+16−0

@@ -267,6 +267,22 @@ bool __map__is_bpf_prog(const struct map *map) · 266 unmodified lines
267	return name && (strstr(name, "bpf_prog_") == name);	267	return name && (strstr(name, "bpf_prog_") == name);
268	}	268	}
269		269
		270	bool __map__is_bpf_image(const struct map *map)
		271	{
		272	const char *name;
		273
		274	if (map->dso->binary_type == DSO_BINARY_TYPE__BPF_IMAGE)
		275	return true;
		276
		277	/*
		278	* If PERF_RECORD_KSYMBOL is not included, the dso will not have
		279	* type of DSO_BINARY_TYPE__BPF_IMAGE. In such cases, we can
		280	* guess the type based on name.
		281	*/
		282	name = map->dso->short_name;
		283	return name && is_bpf_image(name);
		284	}
		285
270	bool __map__is_ool(const struct map *map)	286	bool __map__is_ool(const struct map *map)
271	{	287	{
272	return map->dso && map->dso->binary_type == DSO_BINARY_TYPE__OOL;	288	return map->dso && map->dso->binary_type == DSO_BINARY_TYPE__OOL;

tools/perf/util/map.h+8−1

 bool __map__is_kernel(const struct map *map);
 bool __map__is_extra_kernel_map(const struct map *map);
 bool __map__is_bpf_prog(const struct map *map);
+bool __map__is_bpf_image(const struct map *map);
 bool __map__is_ool(const struct map *map);
 static inline bool __map__is_kmodule(const struct map *map)
 {
 	return !__map__is_kernel(map) && !__map__is_extra_kernel_map(map) &&
-	       !__map__is_bpf_prog(map) && !__map__is_ool(map);
+	       !__map__is_bpf_prog(map) && !__map__is_ool(map) &&
+	       !__map__is_bpf_image(map);
 }
 bool map__has_symbols(const struct map *map);
 	return !strcmp(name, ENTRY_TRAMPOLINE_NAME);
 }
+static inline bool is_bpf_image(const char *name)
+{
+	return strncmp(name, "bpf_trampoline_", sizeof("bpf_trampoline_") - 1) == 0 ||
+	       strncmp(name, "bpf_dispatcher_", sizeof("bpf_dispatcher_") - 1) == 0;
+}
 #endif /* __PERF_MAP_H */

tools/perf/util/parse-events.c+19−12

@@ -37,6 +37,7 @@ · 36 unmodified lines
37	#include "util/evsel_config.h"	37	#include "util/evsel_config.h"
38	#include "util/event.h"	38	#include "util/event.h"
39	#include "util/pfm.h"	39	#include "util/pfm.h"
		40	#include "perf.h"
40		41
41	#define MAX_NAME_LEN 100	42	#define MAX_NAME_LEN 100
42		43
@@ -1533,19 +1534,23 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, · 1490 unmodified lines
1533	evsel = __add_event(list, &parse_state->idx, &attr, true,	1534	evsel = __add_event(list, &parse_state->idx, &attr, true,
1534	get_config_name(head_config), pmu,	1535	get_config_name(head_config), pmu,
1535	&config_terms, auto_merge_stats, NULL);	1536	&config_terms, auto_merge_stats, NULL);
1536	if (evsel) {	1537	if (!evsel)
1537	evsel->unit = info.unit;	1538	return -ENOMEM;
1538	evsel->scale = info.scale;	1539
1539	evsel->per_pkg = info.per_pkg;	1540	evsel->pmu_name = name ? strdup(name) : NULL;
1540	evsel->snapshot = info.snapshot;	1541	evsel->use_uncore_alias = use_uncore_alias;
1541	evsel->metric_expr = info.metric_expr;	1542	evsel->percore = config_term_percore(&evsel->config_terms);
1542	evsel->metric_name = info.metric_name;
1543	evsel->pmu_name = name ? strdup(name) : NULL;
1544	evsel->use_uncore_alias = use_uncore_alias;
1545	evsel->percore = config_term_percore(&evsel->config_terms);
1546	}
1547		1543
1548	return evsel ? 0 : -ENOMEM;	1544	if (parse_state->fake_pmu)
		1545	return 0;
		1546
		1547	evsel->unit = info.unit;
		1548	evsel->scale = info.scale;
		1549	evsel->per_pkg = info.per_pkg;
		1550	evsel->snapshot = info.snapshot;
		1551	evsel->metric_expr = info.metric_expr;
		1552	evsel->metric_name = info.metric_name;
		1553	return 0;
1549	}	1554	}
1550		1555
1551	int parse_events_multi_pmu_add(struct parse_events_state *parse_state,	1556	int parse_events_multi_pmu_add(struct parse_events_state *parse_state,
@@ -1794,6 +1799,8 @@ static int get_event_modifier(struct event_modifier mod, char str, · 242 unmodified lines
1794	if (*str == 'u') {	1799	if (*str == 'u') {
1795	if (!exclude)	1800	if (!exclude)
1796	exclude = eu = ek = eh = 1;	1801	exclude = eu = ek = eh = 1;
		1802	if (!exclude_GH && !perf_guest)
		1803	eG = 1;
1797	eu = 0;	1804	eu = 0;
1798	} else if (*str == 'k') {	1805	} else if (*str == 'k') {
1799	if (!exclude)	1806	if (!exclude)

tools/perf/util/parse-events.y+4−4

@@ -511,7 +511,7 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE ':' PE_MODIFIER_BP sep_dc · 510 unmodified lines
511	list = alloc_list();	511	list = alloc_list();
512	ABORT_ON(!list);	512	ABORT_ON(!list);
513	err = parse_events_add_breakpoint(list, &parse_state->idx,	513	err = parse_events_add_breakpoint(list, &parse_state->idx,
514	(void *) $2, $6, $4);	514	(void *)(uintptr_t) $2, $6, $4);
515	free($6);	515	free($6);
516	if (err) {	516	if (err) {
517	free(list);	517	free(list);
@@ -528,7 +528,7 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE sep_dc · 10 unmodified lines
528	list = alloc_list();	528	list = alloc_list();
529	ABORT_ON(!list);	529	ABORT_ON(!list);
530	if (parse_events_add_breakpoint(list, &parse_state->idx,	530	if (parse_events_add_breakpoint(list, &parse_state->idx,
531	(void *) $2, NULL, $4)) {	531	(void *)(uintptr_t) $2, NULL, $4)) {
532	free(list);	532	free(list);
533	YYABORT;	533	YYABORT;
534	}	534	}
@@ -544,7 +544,7 @@ PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc · 9 unmodified lines
544	list = alloc_list();	544	list = alloc_list();
545	ABORT_ON(!list);	545	ABORT_ON(!list);
546	err = parse_events_add_breakpoint(list, &parse_state->idx,	546	err = parse_events_add_breakpoint(list, &parse_state->idx,
547	(void *) $2, $4, 0);	547	(void *)(uintptr_t) $2, $4, 0);
548	free($4);	548	free($4);
549	if (err) {	549	if (err) {
550	free(list);	550	free(list);
@@ -561,7 +561,7 @@ PE_PREFIX_MEM PE_VALUE sep_dc · 10 unmodified lines
561	list = alloc_list();	561	list = alloc_list();
562	ABORT_ON(!list);	562	ABORT_ON(!list);
563	if (parse_events_add_breakpoint(list, &parse_state->idx,	563	if (parse_events_add_breakpoint(list, &parse_state->idx,
564	(void *) $2, NULL, 0)) {	564	(void *)(uintptr_t) $2, NULL, 0)) {
565	free(list);	565	free(list);
566	YYABORT;	566	YYABORT;
567	}	567	}

tools/perf/util/session.c+1−1

@@ -87,7 +87,7 @@ static int perf_session__process_compressed_event(struct perf_session *session, · 86 unmodified lines
87	session->decomp_last = decomp;	87	session->decomp_last = decomp;
88	}	88	}
89		89
90	pr_debug("decomp (B): %ld to %ld\n", src_size, decomp_size);	90	pr_debug("decomp (B): %zd to %zd\n", src_size, decomp_size);
91		91
92	return 0;	92	return 0;
93	}	93	}

tools/perf/util/stat-display.c+1−1

@@ -117,7 +117,7 @@ static void aggr_printout(struct perf_stat_config *config, · 116 unmodified lines
117	cpu_map__id_to_die(id),	117	cpu_map__id_to_die(id),
118	config->csv_output ? 0 : -3,	118	config->csv_output ? 0 : -3,
119	cpu_map__id_to_cpu(id), config->csv_sep);	119	cpu_map__id_to_cpu(id), config->csv_sep);
120	} else {	120	} else if (id > -1) {
121	fprintf(config->output, "CPU%*d%s",	121	fprintf(config->output, "CPU%*d%s",
122	config->csv_output ? 0 : -7,	122	config->csv_output ? 0 : -7,
123	evsel__cpus(evsel)->map[id],	123	evsel__cpus(evsel)->map[id],

tools/perf/util/stat.h+1−0

@@ -113,6 +113,7 @@ struct perf_stat_config { · 112 unmodified lines
113	bool summary;	113	bool summary;
114	bool metric_no_group;	114	bool metric_no_group;
115	bool metric_no_merge;	115	bool metric_no_merge;
		116	bool stop_read_counter;
116	FILE *output;	117	FILE *output;
117	unsigned int interval;	118	unsigned int interval;
118	unsigned int timeout;	119	unsigned int timeout;

tools/perf/util/symbol.c+1−0

@@ -663,6 +663,7 @@ static bool symbol__is_idle(const char *name) · 662 unmodified lines
663	"exit_idle",	663	"exit_idle",
664	"mwait_idle",	664	"mwait_idle",
665	"mwait_idle_with_hints",	665	"mwait_idle_with_hints",
		666	"mwait_idle_with_hints.constprop.0",
666	"poll_idle",	667	"poll_idle",
667	"ppc64_runlatch_off",	668	"ppc64_runlatch_off",
668	"pseries_dedicated_idle_sleep",	669	"pseries_dedicated_idle_sleep",

tools/perf/util/zstd.c+1−1

@@ -99,7 +99,7 @@ size_t zstd_decompress_stream(struct zstd_data data, void src, size_t src_size · 98 unmodified lines
99	while (input.pos < input.size) {	99	while (input.pos < input.size) {
100	ret = ZSTD_decompressStream(data->dstream, &output, &input);	100	ret = ZSTD_decompressStream(data->dstream, &output, &input);
101	if (ZSTD_isError(ret)) {	101	if (ZSTD_isError(ret)) {
102	pr_err("failed to decompress (B): %ld -> %ld, dst_size %ld : %s\n",	102	pr_err("failed to decompress (B): %zd -> %zd, dst_size %zd : %s\n",
103	src_size, output.size, dst_size, ZSTD_getErrorName(ret));	103	src_size, output.size, dst_size, ZSTD_getErrorName(ret));
104	break;	104	break;
105	}	105	}

tools/testing/selftests/bpf/test_maps.c+2−0

@@ -1274,6 +1274,8 @@ static void __run_parallel(unsigned int tasks, · 1273 unmodified lines
1274	pid_t pid[tasks];	1274	pid_t pid[tasks];
1275	int i;	1275	int i;
1276		1276
		1277	fflush(stdout);
		1278
1277	for (i = 0; i < tasks; i++) {	1279	for (i = 0; i < tasks; i++) {
1278	pid[i] = fork();	1280	pid[i] = fork();
1279	if (pid[i] == 0) {	1281	if (pid[i] == 0) {

tools/testing/selftests/bpf/test_progs.c+3−1

@@ -618,7 +618,9 @@ int cd_flavor_subdir(const char *exec_name) · 617 unmodified lines
618	if (!flavor)	618	if (!flavor)
619	return 0;	619	return 0;
620	flavor++;	620	flavor++;
621	fprintf(stdout, "Switching to flavor '%s' subdirectory...\n", flavor);	621	if (env.verbosity > VERBOSE_NONE)
		622	fprintf(stdout, "Switching to flavor '%s' subdirectory...\n", flavor);
		623
622	return chdir(flavor);	624	return chdir(flavor);
623	}	625	}
624		626

tools/testing/selftests/netfilter/nft_flowtable.sh+37−30

 # result in fragmentation and/or PMTU discovery.
 #
 # You can check with different Orgininator/Link/Responder MTU eg:
-# sh nft_flowtable.sh -o1000 -l500 -r100
+# nft_flowtable.sh -o8000 -l1500 -r2000
 #
 log_netns=$(sysctl -n net.netfilter.nf_log_all_netns)
 checktool (){
-	$1 > /dev/null 2>&1
+	if ! $1 > /dev/null 2>&1; then
-	if [ $? -ne 0 ];then
 		echo "SKIP: Could not $2"
 		exit $ksft_skip
 	fi
 lmtu=1500
 rmtu=2000
+usage(){
+	echo "nft_flowtable.sh [OPTIONS]"
+	echo
+	echo "MTU options"
+	echo "   -o originator"
+	echo "   -l link"
+	echo "   -r responder"
+	exit 1
+}
 while getopts "o:l:r:" o
 do
 	case $o in
 		o) omtu=$OPTARG;;
 		l) lmtu=$OPTARG;;
 		r) rmtu=$OPTARG;;
+		*) usage;;
 	esac
 done
-ip -net nsr1 link set veth0 mtu $omtu
+if ! ip -net nsr1 link set veth0 mtu $omtu; then
+	exit 1
+fi
 ip -net ns1 link set eth0 mtu $omtu
-ip -net nsr2 link set veth1 mtu $rmtu
+if ! ip -net nsr2 link set veth1 mtu $rmtu; then
+	exit 1
+fi
 ip -net ns2 link set eth0 mtu $rmtu
 # transfer-net between nsr1 and nsr2.
   ip -net ns$i route add default via 10.0.$i.1
   ip -net ns$i addr add dead:$i::99/64 dev eth0
   ip -net ns$i route add default via dead:$i::1
-  ip netns exec ns$i sysctl net.ipv4.tcp_no_metrics_save=1 > /dev/null
+  if ! ip netns exec ns$i sysctl net.ipv4.tcp_no_metrics_save=1 > /dev/null; then
+	echo "ERROR: Check Originator/Responder values (problem during address addition)"
+	exit 1
+  fi
   # don't set ip DF bit for first two tests
   ip netns exec ns$i sysctl net.ipv4.ip_no_pmtu_disc=1 > /dev/null
 fi
 # test basic connectivity
-ip netns exec ns1 ping -c 1 -q 10.0.2.99 > /dev/null
+if ! ip netns exec ns1 ping -c 1 -q 10.0.2.99 > /dev/null; then
-if [ $? -ne 0 ];then
   echo "ERROR: ns1 cannot reach ns2" 1>&2
   bash
   exit 1
 fi
-ip netns exec ns2 ping -c 1 -q 10.0.1.99 > /dev/null
+if ! ip netns exec ns2 ping -c 1 -q 10.0.1.99 > /dev/null; then
-if [ $? -ne 0 ];then
   echo "ERROR: ns2 cannot reach ns1" 1>&2
   exit 1
 fi
 make_file()
 {
 	name=$1
-	who=$2
 	SIZE=$((RANDOM % (1024 * 8)))
 	TSIZE=$((SIZE * 1024))
 	out=$2
 	what=$3
-	cmp "$in" "$out" > /dev/null 2>&1
+	if ! cmp "$in" "$out" > /dev/null 2>&1; then
-	if [ $? -ne 0 ] ;then
 		echo "FAIL: file mismatch for $what" 1>&2
 		ls -l "$in"
 		ls -l "$out"
 	wait
-	check_transfer "$ns1in" "$ns2out" "ns1 -> ns2"
+	if ! check_transfer "$ns1in" "$ns2out" "ns1 -> ns2"; then
-	if [ $? -ne 0 ];then
 		lret=1
 	fi
-	check_transfer "$ns2in" "$ns1out" "ns1 <- ns2"
+	if ! check_transfer "$ns2in" "$ns1out" "ns1 <- ns2"; then
-	if [ $? -ne 0 ];then
 		lret=1
 	fi
 	return $lret
 }
-make_file "$ns1in" "ns1"
+make_file "$ns1in"
-make_file "$ns2in" "ns2"
+make_file "$ns2in"
 # First test:
 # No PMTU discovery, nsr1 is expected to fragment packets from ns1 to ns2 as needed.
-test_tcp_forwarding ns1 ns2
+if test_tcp_forwarding ns1 ns2; then
-if [ $? -eq 0 ] ;then
 	echo "PASS: flow offloaded for ns1/ns2"
 else
 	echo "FAIL: flow offload for ns1/ns2:" 1>&2
 }
 EOF
-test_tcp_forwarding_nat ns1 ns2
+if test_tcp_forwarding_nat ns1 ns2; then
-if [ $? -eq 0 ] ;then
 	echo "PASS: flow offloaded for ns1/ns2 with NAT"
 else
 	echo "FAIL: flow offload for ns1/ns2 with NAT" 1>&2
 # Same as second test, but with PMTU discovery enabled.
 handle=$(ip netns exec nsr1 nft -a list table inet filter | grep something-to-grep-for | cut -d \# -f 2)
-ip netns exec nsr1 nft delete rule inet filter forward $handle
+if ! ip netns exec nsr1 nft delete rule inet filter forward $handle; then
-if [ $? -ne 0 ] ;then
 	echo "FAIL: Could not delete large-packet accept rule"
 	exit 1
 fi
 ip netns exec ns1 sysctl net.ipv4.ip_no_pmtu_disc=0 > /dev/null
 ip netns exec ns2 sysctl net.ipv4.ip_no_pmtu_disc=0 > /dev/null
-test_tcp_forwarding_nat ns1 ns2
+if test_tcp_forwarding_nat ns1 ns2; then
-if [ $? -eq 0 ] ;then
 	echo "PASS: flow offloaded for ns1/ns2 with NAT and pmtu discovery"
 else
 	echo "FAIL: flow offload for ns1/ns2 with NAT and pmtu discovery" 1>&2
 ip -net ns2 route add default via 10.0.2.1
 ip -net ns2 route add default via dead:2::1
-test_tcp_forwarding ns1 ns2
+if test_tcp_forwarding ns1 ns2; then
-if [ $? -eq 0 ] ;then
 	echo "PASS: ipsec tunnel mode for ns1/ns2"
 else
 	echo "FAIL: ipsec tunnel mode for ns1/ns2"

tools/testing/selftests/timers/Makefile+1−0

@@ -13,6 +13,7 @@ DESTRUCTIVE_TESTS = alarmtimer-suspend valid-adjtimex adjtick change_skew \ · 12 unmodified lines
13		13
14	TEST_GEN_PROGS_EXTENDED = $(DESTRUCTIVE_TESTS)	14	TEST_GEN_PROGS_EXTENDED = $(DESTRUCTIVE_TESTS)
15		15
		16	TEST_FILES := settings
16		17
17	include ../lib.mk	18	include ../lib.mk
18		19

tools/testing/selftests/timers/settings+1−0

@@ -0,0 +1 @@
		1	timeout=0

tools/testing/selftests/x86/test_vsyscall.c+20−2

 	return 0;
 }
+/*
+ * Debuggers expect ptrace() to be able to peek at the vsyscall page.
+ * Use process_vm_readv() as a proxy for ptrace() to test this.  We
+ * want it to work in the vsyscall=emulate case and to fail in the
+ * vsyscall=xonly case.
+ *
+ * It's worth noting that this ABI is a bit nutty.  write(2) can't
+ * read from the vsyscall page on any kernel version or mode.  The
+ * fact that ptrace() ever worked was a nice courtesy of old kernels,
+ * but the code to support it is fairly gross.
+ */
 static int test_process_vm_readv(void)
 {
 #ifdef __x86_64__
 	remote.iov_len = 4096;
 	ret = process_vm_readv(getpid(), &local, 1, &remote, 1, 0);
 	if (ret != 4096) {
-		printf("[OK]\tprocess_vm_readv() failed (ret = %d, errno = %d)\n", ret, errno);
+		/*
-		return 0;
+		 * We expect process_vm_readv() to work if and only if the
+		 * vsyscall page is readable.
+		 */
+		printf("[%s]\tprocess_vm_readv() failed (ret = %d, errno = %d)\n", vsyscall_map_r ? "FAIL" : "OK", ret, errno);
+		return vsyscall_map_r ? 1 : 0;
 	}
 	if (vsyscall_map_r) {
 			printf("[FAIL]\tIt worked but returned incorrect data\n");
 			return 1;
 		}
+	} else {
+		printf("[FAIL]\tprocess_rm_readv() succeeded, but it should have failed in this configuration\n");
+		return 1;
 	}
 #endif

virt/kvm/kvm_main.c+12−9

 void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx,
 			       struct kvm_io_device *dev)
 {
-	int i;
+	int i, j;
 	struct kvm_io_bus *new_bus, *bus;
 	bus = kvm_get_bus(kvm, bus_idx);
 	new_bus = kmalloc(struct_size(bus, range, bus->dev_count - 1),
 			  GFP_KERNEL_ACCOUNT);
-	if (!new_bus)  {
+	if (new_bus) {
+		memcpy(new_bus, bus, sizeof(*bus) + i * sizeof(struct kvm_io_range));
+		new_bus->dev_count--;
+		memcpy(new_bus->range + i, bus->range + i + 1,
+		       (new_bus->dev_count - i) * sizeof(struct kvm_io_range));
+	} else {
 		pr_err("kvm: failed to shrink bus, removing it completely\n");
-		goto broken;
+		for (j = 0; j < bus->dev_count; j++) {
+			if (j == i)
+				continue;
+			kvm_iodevice_destructor(bus->range[j].dev);
+		}
 	}
-	memcpy(new_bus, bus, sizeof(*bus) + i * sizeof(struct kvm_io_range));
-	new_bus->dev_count--;
-	memcpy(new_bus->range + i, bus->range + i + 1,
-	       (new_bus->dev_count - i) * sizeof(struct kvm_io_range));
-broken:
 	rcu_assign_pointer(kvm->buses[bus_idx], new_bus);
 	synchronize_srcu_expedited(&kvm->srcu);
 	kfree(bus);

@@ -68,7 +68,7 @@ See below for all known bank addresses, numbers of sensors in that bank, · 67 unmodified lines
68	number of bytes data per sensor and contents/meaning of those bytes.	68	number of bytes data per sensor and contents/meaning of those bytes.
69		69
70	Although both this document and the kernel driver have kept the sensor	70	Although both this document and the kernel driver have kept the sensor
71	terminoligy for the addressing within a bank this is not 100% correct, in	71	terminology for the addressing within a bank this is not 100% correct, in
72	bank 0x24 for example the addressing within the bank selects a PWM output not	72	bank 0x24 for example the addressing within the bank selects a PWM output not
73	a sensor.	73	a sensor.
74		74
@@ -155,7 +155,7 @@ After wider testing of the Linux kernel driver some variants of the uGuru have · 80 unmodified lines
155	turned up which do not hold 0x08 at DATA within 250 reads after writing the	155	turned up which do not hold 0x08 at DATA within 250 reads after writing the
156	bank address. With these versions this happens quite frequent, using larger	156	bank address. With these versions this happens quite frequent, using larger
157	timeouts doesn't help, they just go offline for a second or 2, doing some	157	timeouts doesn't help, they just go offline for a second or 2, doing some
158	internal callibration or whatever. Your code should be prepared to handle	158	internal calibration or whatever. Your code should be prepared to handle
159	this and in case of no response in this specific case just goto sleep for a	159	this and in case of no response in this specific case just goto sleep for a
160	while and then retry.	160	while and then retry.
161		161
@@ -331,6 +331,6 @@ the voltage / clock programming out, I tried reading and only reading banks · 169 unmodified lines
331	0-0x30 with the reading code used for the sensor banks (0x20-0x28) and this	331	0-0x30 with the reading code used for the sensor banks (0x20-0x28) and this
332	resulted in a _permanent_ reprogramming of the voltages, luckily I had the	332	resulted in a _permanent_ reprogramming of the voltages, luckily I had the
333	sensors part configured so that it would shutdown my system on any out of spec	333	sensors part configured so that it would shutdown my system on any out of spec
334	voltages which proprably safed my computer (after a reboot I managed to	334	voltages which probably safed my computer (after a reboot I managed to
335	immediately enter the bios and reload the defaults). This probably means that	335	immediately enter the bios and reload the defaults). This probably means that
336	the read/write cycle for the non sensor part is different from the sensor part.	336	the read/write cycle for the non sensor part is different from the sensor part.

@@ -17,7 +17,7 @@ Supported chips: · 16 unmodified lines
17	Note:	17	Note:
18	The uGuru is a microcontroller with onboard firmware which programs	18	The uGuru is a microcontroller with onboard firmware which programs
19	it to behave as a hwmon IC. There are many different revisions of the	19	it to behave as a hwmon IC. There are many different revisions of the
20	firmware and thus effectivly many different revisions of the uGuru.	20	firmware and thus effectively many different revisions of the uGuru.
21	Below is an incomplete list with which revisions are used for which	21	Below is an incomplete list with which revisions are used for which
22	Motherboards:	22	Motherboards:
23		23
@@ -33,7 +33,7 @@ Supported chips: · 9 unmodified lines
33	sensortype (Volt or Temp) for bank1 sensors, for revision 1 uGuru's	33	sensortype (Volt or Temp) for bank1 sensors, for revision 1 uGuru's
34	this does not always work. For these uGuru's the autodetection can	34	this does not always work. For these uGuru's the autodetection can
35	be overridden with the bank1_types module param. For all 3 known	35	be overridden with the bank1_types module param. For all 3 known
36	revison 1 motherboards the correct use of this param is:	36	revision 1 motherboards the correct use of this param is:
37	bank1_types=1,1,0,0,0,0,0,2,0,0,0,0,2,0,0,1	37	bank1_types=1,1,0,0,0,0,0,2,0,0,0,0,2,0,0,1
38	You may also need to specify the fan_sensors option for these boards	38	You may also need to specify the fan_sensors option for these boards
39	fan_sensors=5	39	fan_sensors=5

@@ -378,15 +378,15 @@ enum axi_id { · 377 unmodified lines
378	((((y) & RAZWI_INITIATOR_Y_MASK) << RAZWI_INITIATOR_Y_SHIFT) \| \	378	((((y) & RAZWI_INITIATOR_Y_MASK) << RAZWI_INITIATOR_Y_SHIFT) \| \
379	(((x) & RAZWI_INITIATOR_X_MASK) << RAZWI_INITIATOR_X_SHIFT))	379	(((x) & RAZWI_INITIATOR_X_MASK) << RAZWI_INITIATOR_X_SHIFT))
380		380
381	#define RAZWI_INITIATOR_ID_X_Y_TPC0_NIC0 RAZWI_INITIATOR_ID_X_Y(1, 0)	381	#define RAZWI_INITIATOR_ID_X_Y_TPC0_NIC0 RAZWI_INITIATOR_ID_X_Y(1, 1)
382	#define RAZWI_INITIATOR_ID_X_Y_TPC1 RAZWI_INITIATOR_ID_X_Y(2, 0)	382	#define RAZWI_INITIATOR_ID_X_Y_TPC1 RAZWI_INITIATOR_ID_X_Y(2, 1)
383	#define RAZWI_INITIATOR_ID_X_Y_MME0_0 RAZWI_INITIATOR_ID_X_Y(3, 0)	383	#define RAZWI_INITIATOR_ID_X_Y_MME0_0 RAZWI_INITIATOR_ID_X_Y(3, 1)
384	#define RAZWI_INITIATOR_ID_X_Y_MME0_1 RAZWI_INITIATOR_ID_X_Y(4, 0)	384	#define RAZWI_INITIATOR_ID_X_Y_MME0_1 RAZWI_INITIATOR_ID_X_Y(4, 1)
385	#define RAZWI_INITIATOR_ID_X_Y_MME1_0 RAZWI_INITIATOR_ID_X_Y(5, 0)	385	#define RAZWI_INITIATOR_ID_X_Y_MME1_0 RAZWI_INITIATOR_ID_X_Y(5, 1)
386	#define RAZWI_INITIATOR_ID_X_Y_MME1_1 RAZWI_INITIATOR_ID_X_Y(6, 0)	386	#define RAZWI_INITIATOR_ID_X_Y_MME1_1 RAZWI_INITIATOR_ID_X_Y(6, 1)
387	#define RAZWI_INITIATOR_ID_X_Y_TPC2 RAZWI_INITIATOR_ID_X_Y(7, 0)	387	#define RAZWI_INITIATOR_ID_X_Y_TPC2 RAZWI_INITIATOR_ID_X_Y(7, 1)
388	#define RAZWI_INITIATOR_ID_X_Y_TPC3_PCI_CPU_PSOC \	388	#define RAZWI_INITIATOR_ID_X_Y_TPC3_PCI_CPU_PSOC \
389	RAZWI_INITIATOR_ID_X_Y(8, 0)	389	RAZWI_INITIATOR_ID_X_Y(8, 1)
390	#define RAZWI_INITIATOR_ID_X_Y_DMA_IF_W_S_0 RAZWI_INITIATOR_ID_X_Y(0, 1)	390	#define RAZWI_INITIATOR_ID_X_Y_DMA_IF_W_S_0 RAZWI_INITIATOR_ID_X_Y(0, 1)
391	#define RAZWI_INITIATOR_ID_X_Y_DMA_IF_E_S_0 RAZWI_INITIATOR_ID_X_Y(9, 1)	391	#define RAZWI_INITIATOR_ID_X_Y_DMA_IF_E_S_0 RAZWI_INITIATOR_ID_X_Y(9, 1)
392	#define RAZWI_INITIATOR_ID_X_Y_DMA_IF_W_S_1 RAZWI_INITIATOR_ID_X_Y(0, 2)	392	#define RAZWI_INITIATOR_ID_X_Y_DMA_IF_W_S_1 RAZWI_INITIATOR_ID_X_Y(0, 2)
@@ -395,14 +395,14 @@ enum axi_id { · 2 unmodified lines
395	#define RAZWI_INITIATOR_ID_X_Y_DMA_IF_E_N_0 RAZWI_INITIATOR_ID_X_Y(9, 3)	395	#define RAZWI_INITIATOR_ID_X_Y_DMA_IF_E_N_0 RAZWI_INITIATOR_ID_X_Y(9, 3)
396	#define RAZWI_INITIATOR_ID_X_Y_DMA_IF_W_N_1 RAZWI_INITIATOR_ID_X_Y(0, 4)	396	#define RAZWI_INITIATOR_ID_X_Y_DMA_IF_W_N_1 RAZWI_INITIATOR_ID_X_Y(0, 4)
397	#define RAZWI_INITIATOR_ID_X_Y_DMA_IF_E_N_1 RAZWI_INITIATOR_ID_X_Y(9, 4)	397	#define RAZWI_INITIATOR_ID_X_Y_DMA_IF_E_N_1 RAZWI_INITIATOR_ID_X_Y(9, 4)
398	#define RAZWI_INITIATOR_ID_X_Y_TPC4_NIC1_NIC2 RAZWI_INITIATOR_ID_X_Y(1, 5)	398	#define RAZWI_INITIATOR_ID_X_Y_TPC4_NIC1_NIC2 RAZWI_INITIATOR_ID_X_Y(1, 6)
399	#define RAZWI_INITIATOR_ID_X_Y_TPC5 RAZWI_INITIATOR_ID_X_Y(2, 5)	399	#define RAZWI_INITIATOR_ID_X_Y_TPC5 RAZWI_INITIATOR_ID_X_Y(2, 6)
400	#define RAZWI_INITIATOR_ID_X_Y_MME2_0 RAZWI_INITIATOR_ID_X_Y(3, 5)	400	#define RAZWI_INITIATOR_ID_X_Y_MME2_0 RAZWI_INITIATOR_ID_X_Y(3, 6)
401	#define RAZWI_INITIATOR_ID_X_Y_MME2_1 RAZWI_INITIATOR_ID_X_Y(4, 5)	401	#define RAZWI_INITIATOR_ID_X_Y_MME2_1 RAZWI_INITIATOR_ID_X_Y(4, 6)
402	#define RAZWI_INITIATOR_ID_X_Y_MME3_0 RAZWI_INITIATOR_ID_X_Y(5, 5)	402	#define RAZWI_INITIATOR_ID_X_Y_MME3_0 RAZWI_INITIATOR_ID_X_Y(5, 6)
403	#define RAZWI_INITIATOR_ID_X_Y_MME3_1 RAZWI_INITIATOR_ID_X_Y(6, 5)	403	#define RAZWI_INITIATOR_ID_X_Y_MME3_1 RAZWI_INITIATOR_ID_X_Y(6, 6)
404	#define RAZWI_INITIATOR_ID_X_Y_TPC6 RAZWI_INITIATOR_ID_X_Y(7, 5)	404	#define RAZWI_INITIATOR_ID_X_Y_TPC6 RAZWI_INITIATOR_ID_X_Y(7, 6)
405	#define RAZWI_INITIATOR_ID_X_Y_TPC7_NIC4_NIC5 RAZWI_INITIATOR_ID_X_Y(8, 5)	405	#define RAZWI_INITIATOR_ID_X_Y_TPC7_NIC4_NIC5 RAZWI_INITIATOR_ID_X_Y(8, 6)
406		406
407	#define PSOC_ETR_AXICTL_PROTCTRLBIT1_SHIFT 1	407	#define PSOC_ETR_AXICTL_PROTCTRLBIT1_SHIFT 1
408		408

@@ -4603,18 +4603,18 @@ qla2x00_nvram_config(scsi_qla_host_t *vha) · 4602 unmodified lines
4603	nv->firmware_options[1] = BIT_7 \| BIT_5;	4603	nv->firmware_options[1] = BIT_7 \| BIT_5;
4604	nv->add_firmware_options[0] = BIT_5;	4604	nv->add_firmware_options[0] = BIT_5;
4605	nv->add_firmware_options[1] = BIT_5 \| BIT_4;	4605	nv->add_firmware_options[1] = BIT_5 \| BIT_4;
4606	nv->frame_payload_size = 2048;	4606	nv->frame_payload_size = cpu_to_le16(2048);
4607	nv->special_options[1] = BIT_7;	4607	nv->special_options[1] = BIT_7;
4608	} else if (IS_QLA2200(ha)) {	4608	} else if (IS_QLA2200(ha)) {
4609	nv->firmware_options[0] = BIT_2 \| BIT_1;	4609	nv->firmware_options[0] = BIT_2 \| BIT_1;
4610	nv->firmware_options[1] = BIT_7 \| BIT_5;	4610	nv->firmware_options[1] = BIT_7 \| BIT_5;
4611	nv->add_firmware_options[0] = BIT_5;	4611	nv->add_firmware_options[0] = BIT_5;
4612	nv->add_firmware_options[1] = BIT_5 \| BIT_4;	4612	nv->add_firmware_options[1] = BIT_5 \| BIT_4;
4613	nv->frame_payload_size = 1024;	4613	nv->frame_payload_size = cpu_to_le16(1024);
4614	} else if (IS_QLA2100(ha)) {	4614	} else if (IS_QLA2100(ha)) {
4615	nv->firmware_options[0] = BIT_3 \| BIT_1;	4615	nv->firmware_options[0] = BIT_3 \| BIT_1;
4616	nv->firmware_options[1] = BIT_5;	4616	nv->firmware_options[1] = BIT_5;
4617	nv->frame_payload_size = 1024;	4617	nv->frame_payload_size = cpu_to_le16(1024);
4618	}	4618	}
4619		4619
4620	nv->max_iocb_allocation = cpu_to_le16(256);	4620	nv->max_iocb_allocation = cpu_to_le16(256);

@@ -719,7 +719,7 @@ static int test__group2(struct evlist *evlist) · 718 unmodified lines
719	TEST_ASSERT_VAL("wrong exclude_user", !evsel->core.attr.exclude_user);	719	TEST_ASSERT_VAL("wrong exclude_user", !evsel->core.attr.exclude_user);
720	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->core.attr.exclude_kernel);	720	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->core.attr.exclude_kernel);
721	TEST_ASSERT_VAL("wrong exclude_hv", evsel->core.attr.exclude_hv);	721	TEST_ASSERT_VAL("wrong exclude_hv", evsel->core.attr.exclude_hv);
722	TEST_ASSERT_VAL("wrong exclude guest", !evsel->core.attr.exclude_guest);	722	TEST_ASSERT_VAL("wrong exclude guest", evsel->core.attr.exclude_guest);
723	TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host);	723	TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host);
724	TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);	724	TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);
725	TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));	725	TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));
@@ -842,7 +842,7 @@ static int test__group3(struct evlist *evlist __maybe_unused) · 116 unmodified lines
842	TEST_ASSERT_VAL("wrong exclude_user", !evsel->core.attr.exclude_user);	842	TEST_ASSERT_VAL("wrong exclude_user", !evsel->core.attr.exclude_user);
843	TEST_ASSERT_VAL("wrong exclude_kernel", evsel->core.attr.exclude_kernel);	843	TEST_ASSERT_VAL("wrong exclude_kernel", evsel->core.attr.exclude_kernel);
844	TEST_ASSERT_VAL("wrong exclude_hv", evsel->core.attr.exclude_hv);	844	TEST_ASSERT_VAL("wrong exclude_hv", evsel->core.attr.exclude_hv);
845	TEST_ASSERT_VAL("wrong exclude guest", !evsel->core.attr.exclude_guest);	845	TEST_ASSERT_VAL("wrong exclude guest", evsel->core.attr.exclude_guest);
846	TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host);	846	TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host);
847	TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);	847	TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);
848	TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));	848	TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));