lael-labs/linux

.mailmap+3−0

 Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>
 Christian Borntraeger <borntraeger@linux.ibm.com> <cborntra@de.ibm.com>
 Christian Borntraeger <borntraeger@linux.ibm.com> <borntrae@de.ibm.com>
+Christian Brauner <brauner@kernel.org> <christian@brauner.io>
+Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>
+Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>
 Christophe Ricard <christophe.ricard@gmail.com>
 Christoph Hellwig <hch@lst.de>
 Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>

Documentation/admin-guide/gpio/index.rst+1−0

@@ -10,6 +10,7 @@ gpio · 9 unmodified lines
10	gpio-aggregator	10	gpio-aggregator
11	sysfs	11	sysfs
12	gpio-mockup	12	gpio-mockup
		13	gpio-sim
13		14
14	.. only:: subproject and html	15	.. only:: subproject and html
15		16

Documentation/arm/marvell.rst+2−0

 -------------
   Flavors:
+       - 88F6500
        - 88F6510
        - 88F6530P
        - 88F6550
        - 88F6560
+       - 88F6601
   Homepage:
 	https://web.archive.org/web/20181005145041/http://www.marvell.com/broadband/

Documentation/arm64/silicon-errata.rst+12−0

 | Allwinner      | A64/R18         | UNKNOWN1        | SUN50I_ERRATUM_UNKNOWN1     |
 +----------------+-----------------+-----------------+-----------------------------+
 +----------------+-----------------+-----------------+-----------------------------+
+| ARM            | Cortex-A510     | #2064142        | ARM64_ERRATUM_2064142       |
++----------------+-----------------+-----------------+-----------------------------+
+| ARM            | Cortex-A510     | #2038923        | ARM64_ERRATUM_2038923       |
++----------------+-----------------+-----------------+-----------------------------+
+| ARM            | Cortex-A510     | #1902691        | ARM64_ERRATUM_1902691       |
++----------------+-----------------+-----------------+-----------------------------+
 | ARM            | Cortex-A53      | #826319         | ARM64_ERRATUM_826319        |
 +----------------+-----------------+-----------------+-----------------------------+
 | ARM            | Cortex-A53      | #827319         | ARM64_ERRATUM_827319        |
 +----------------+-----------------+-----------------+-----------------------------+
 | ARM            | Cortex-A77      | #1508412        | ARM64_ERRATUM_1508412       |
 +----------------+-----------------+-----------------+-----------------------------+
+| ARM            | Cortex-A510     | #2051678        | ARM64_ERRATUM_2051678       |
++----------------+-----------------+-----------------+-----------------------------+
 | ARM            | Cortex-A710     | #2119858        | ARM64_ERRATUM_2119858       |
 +----------------+-----------------+-----------------+-----------------------------+
 | ARM            | Cortex-A710     | #2054223        | ARM64_ERRATUM_2054223       |
 +----------------+-----------------+-----------------+-----------------------------+
 | ARM            | Cortex-A710     | #2224489        | ARM64_ERRATUM_2224489       |
 +----------------+-----------------+-----------------+-----------------------------+
+| ARM            | Cortex-X2       | #2119858        | ARM64_ERRATUM_2119858       |
++----------------+-----------------+-----------------+-----------------------------+
+| ARM            | Cortex-X2       | #2224489        | ARM64_ERRATUM_2224489       |
++----------------+-----------------+-----------------+-----------------------------+
 | ARM            | Neoverse-N1     | #1188873,1418040| ARM64_ERRATUM_1418040       |
 +----------------+-----------------+-----------------+-----------------------------+
 | ARM            | Neoverse-N1     | #1349291        | N/A                         |

Documentation/dev-tools/kselftest.rst+8−0

@@ -7,6 +7,14 @@ directory. These are intended to be small tests to exercise individual code · 6 unmodified lines
7	paths in the kernel. Tests are intended to be run after building, installing	7	paths in the kernel. Tests are intended to be run after building, installing
8	and booting a kernel.	8	and booting a kernel.
9		9
		10	Kselftest from mainline can be run on older stable kernels. Running tests
		11	from mainline offers the best coverage. Several test rings run mainline
		12	kselftest suite on stable releases. The reason is that when a new test
		13	gets added to test existing code to regression test a bug, we should be
		14	able to run that test on an older kernel. Hence, it is important to keep
		15	code that can still test an older kernel and make sure it skips the test
		16	gracefully on newer releases.
		17
10	You can find additional information on Kselftest framework, how to	18	You can find additional information on Kselftest framework, how to
11	write new tests using the framework on Kselftest wiki:	19	write new tests using the framework on Kselftest wiki:
12		20

Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.yaml+1−0

@@ -36,6 +36,7 @@ properties: · 35 unmodified lines
36	- renesas,intc-ex-r8a77980 # R-Car V3H	36	- renesas,intc-ex-r8a77980 # R-Car V3H
37	- renesas,intc-ex-r8a77990 # R-Car E3	37	- renesas,intc-ex-r8a77990 # R-Car E3
38	- renesas,intc-ex-r8a77995 # R-Car D3	38	- renesas,intc-ex-r8a77995 # R-Car D3
		39	- renesas,intc-ex-r8a779a0 # R-Car V3U
39	- const: renesas,irqc	40	- const: renesas,irqc
40		41
41	'#interrupt-cells':	42	'#interrupt-cells':

Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml+6−6

   interrupts-extended:
     minItems: 1
+    maxItems: 15872
     description:
       Specifies which contexts are connected to the PLIC, with "-1" specifying
       that a context is not present. Each node pointed to should be a
       #interrupt-cells = <1>;
       compatible = "sifive,fu540-c000-plic", "sifive,plic-1.0.0";
       interrupt-controller;
-      interrupts-extended = <
+      interrupts-extended = <&cpu0_intc 11>,
-        &cpu0_intc 11
+                            <&cpu1_intc 11>, <&cpu1_intc 9>,
-        &cpu1_intc 11 &cpu1_intc 9
+                            <&cpu2_intc 11>, <&cpu2_intc 9>,
-        &cpu2_intc 11 &cpu2_intc 9
+                            <&cpu3_intc 11>, <&cpu3_intc 9>,
-        &cpu3_intc 11 &cpu3_intc 9
+                            <&cpu4_intc 11>, <&cpu4_intc 9>;
-        &cpu4_intc 11 &cpu4_intc 9>;
       reg = <0xc000000 0x4000000>;
       riscv,ndev = <10>;
     };

Documentation/devicetree/bindings/net/qcom,ipa.yaml+6−0

           - const: imem
           - const: config
+  qcom,qmp:
+    $ref: /schemas/types.yaml#/definitions/phandle
+    description: phandle to the AOSS side-channel message RAM
   qcom,smem-states:
     $ref: /schemas/types.yaml#/definitions/phandle-array
     description: State bits used in by the AP to signal the modem.
                                      "imem",
                                      "config";
+                qcom,qmp = <&aoss_qmp>;
                 qcom,smem-states = <&ipa_smp2p_out 0>,
                                    <&ipa_smp2p_out 1>;
                 qcom,smem-state-names = "ipa-clock-enabled-valid",

Documentation/devicetree/bindings/spi/spi-peripheral-props.yaml+3−2

     minItems: 1
     maxItems: 256
     items:
-      minimum: 0
+      items:
-      maximum: 256
+        - minimum: 0
+          maximum: 256
     description:
       Chip select used by the device.

Documentation/index.rst+1−0

@@ -166,6 +166,7 @@ to ReStructured Text format, or are simply too old. · 165 unmodified lines
166	.. toctree::	166	.. toctree::
167	:maxdepth: 2	167	:maxdepth: 2
168		168
		169	tools/index
169	staging/index	170	staging/index
170	watch_queue	171	watch_queue
171		172

Documentation/kernel-hacking/locking.rst+1−1

@@ -295,7 +295,7 @@ Pete Zaitcev gives the following summary: · 294 unmodified lines
295		295
296	- If you are in a process context (any syscall) and want to lock other	296	- If you are in a process context (any syscall) and want to lock other
297	process out, use a mutex. You can take a mutex and sleep	297	process out, use a mutex. You can take a mutex and sleep
298	(``copy_from_user*(`` or ``kmalloc(x,GFP_KERNEL)``).	298	(``copy_from_user()`` or ``kmalloc(x,GFP_KERNEL)``).
299		299
300	- Otherwise (== data can be touched in an interrupt), use	300	- Otherwise (== data can be touched in an interrupt), use
301	spin_lock_irqsave() and	301	spin_lock_irqsave() and

Documentation/tools/index.rst+20−0

@@ -0,0 +1,20 @@
	1	.. SPDX-License-Identifier: GPL-2.0
	2
	3	============
	4	Kernel tools
	5	============
	6
	7	This book covers user-space tools that are shipped with the kernel source;
	8	more additions are needed here:
	9
	10	.. toctree::
	11	:maxdepth: 1
	12
	13	rtla/index
	14
	15	.. only:: subproject and html
	16
	17	Indices
	18	=======
	19
	20	* :ref:`genindex`

Documentation/tools/rtla/index.rst+26−0

@@ -0,0 +1,26 @@
	1	.. SPDX-License-Identifier: GPL-2.0
	2
	3	================================
	4	The realtime Linux analysis tool
	5	================================
	6
	7	RTLA provides a set of tools for the analysis of the kernel's realtime
	8	behavior on specific hardware.
	9
	10	.. toctree::
	11	:maxdepth: 1
	12
	13	rtla
	14	rtla-osnoise
	15	rtla-osnoise-hist
	16	rtla-osnoise-top
	17	rtla-timerlat
	18	rtla-timerlat-hist
	19	rtla-timerlat-top
	20
	21	.. only:: subproject and html
	22
	23	Indices
	24	=======
	25
	26	* :ref:`genindex`

Documentation/virt/kvm/api.rst+3−1

 :Capability: KVM_CAP_DEVICE_CTRL, KVM_CAP_VM_ATTRIBUTES for vm device,
              KVM_CAP_VCPU_ATTRIBUTES for vcpu device
+             KVM_CAP_SYS_ATTRIBUTES for system (/dev/kvm) device (no set)
 :Type: device ioctl, vm ioctl, vcpu ioctl
 :Parameters: struct kvm_device_attr
 :Returns: 0 on success, -1 on error
 ------------------------
 :Capability: KVM_CAP_DEVICE_CTRL, KVM_CAP_VM_ATTRIBUTES for vm device,
-	     KVM_CAP_VCPU_ATTRIBUTES for vcpu device
+             KVM_CAP_VCPU_ATTRIBUTES for vcpu device
+             KVM_CAP_SYS_ATTRIBUTES for system (/dev/kvm) device
 :Type: device ioctl, vm ioctl, vcpu ioctl
 :Parameters: struct kvm_device_attr
 :Returns: 0 on success, -1 on error

Documentation/vm/page_table_check.rst+1−1

@@ -9,7 +9,7 @@ Page Table Check · 8 unmodified lines
9	Introduction	9	Introduction
10	============	10	============
11		11
12	Page table check allows to hardern the kernel by ensuring that some types of	12	Page table check allows to harden the kernel by ensuring that some types of
13	the memory corruptions are prevented.	13	the memory corruptions are prevented.
14		14
15	Page table check performs extra verifications at the time when new pages become	15	Page table check performs extra verifications at the time when new pages become

MAINTAINERS+1−2

@@ -4157,9 +4157,8 @@ N: csky · 4156 unmodified lines
4157	K: csky	4157	K: csky
4158		4158
4159	CA8210 IEEE-802.15.4 RADIO DRIVER	4159	CA8210 IEEE-802.15.4 RADIO DRIVER
4160	M: Harry Morris <h.morris@cascoda.com>
4161	L: linux-wpan@vger.kernel.org	4160	L: linux-wpan@vger.kernel.org
4162	S: Maintained	4161	S: Orphan
4163	W: https://github.com/Cascoda/ca8210-linux.git	4162	W: https://github.com/Cascoda/ca8210-linux.git
4164	F: Documentation/devicetree/bindings/net/ieee802154/ca8210.txt	4163	F: Documentation/devicetree/bindings/net/ieee802154/ca8210.txt
4165	F: drivers/net/ieee802154/ca8210.c	4164	F: drivers/net/ieee802154/ca8210.c

Makefile+1−1

@@ -2,7 +2,7 @@ · 1 unmodified line
2	VERSION = 5	2	VERSION = 5
3	PATCHLEVEL = 17	3	PATCHLEVEL = 17
4	SUBLEVEL = 0	4	SUBLEVEL = 0
5	EXTRAVERSION = -rc1	5	EXTRAVERSION = -rc2
6	NAME = Gobble Gobble	6	NAME = Gobble Gobble
7		7
8	# DOCUMENTATION	8	# DOCUMENTATION

arch/arm/Kconfig+1−0

@@ -83,6 +83,7 @@ config ARM · 82 unmodified lines
83	select HAVE_EBPF_JIT if !CPU_ENDIAN_BE32	83	select HAVE_EBPF_JIT if !CPU_ENDIAN_BE32
84	select HAVE_CONTEXT_TRACKING	84	select HAVE_CONTEXT_TRACKING
85	select HAVE_C_RECORDMCOUNT	85	select HAVE_C_RECORDMCOUNT
		86	select HAVE_BUILDTIME_MCOUNT_SORT
86	select HAVE_DEBUG_KMEMLEAK if !XIP_KERNEL	87	select HAVE_DEBUG_KMEMLEAK if !XIP_KERNEL
87	select HAVE_DMA_CONTIGUOUS if MMU	88	select HAVE_DMA_CONTIGUOUS if MMU
88	select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU	89	select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU

arch/arm64/Kconfig+75−6

@@ -670,15 +670,25 @@ config ARM64_ERRATUM_1508412 · 669 unmodified lines
670	config ARM64_WORKAROUND_TRBE_OVERWRITE_FILL_MODE	670	config ARM64_WORKAROUND_TRBE_OVERWRITE_FILL_MODE
671	bool	671	bool
672		672
		673	config ARM64_ERRATUM_2051678
		674	bool "Cortex-A510: 2051678: disable Hardware Update of the page table dirty bit"
		675	help
		676	This options adds the workaround for ARM Cortex-A510 erratum ARM64_ERRATUM_2051678.
		677	Affected Coretex-A510 might not respect the ordering rules for
		678	hardware update of the page table's dirty bit. The workaround
		679	is to not enable the feature on affected CPUs.
		680
		681	If unsure, say Y.
		682
673	config ARM64_ERRATUM_2119858	683	config ARM64_ERRATUM_2119858
674	bool "Cortex-A710: 2119858: workaround TRBE overwriting trace data in FILL mode"	684	bool "Cortex-A710/X2: 2119858: workaround TRBE overwriting trace data in FILL mode"
675	default y	685	default y
676	depends on CORESIGHT_TRBE	686	depends on CORESIGHT_TRBE
677	select ARM64_WORKAROUND_TRBE_OVERWRITE_FILL_MODE	687	select ARM64_WORKAROUND_TRBE_OVERWRITE_FILL_MODE
678	help	688	help
679	This option adds the workaround for ARM Cortex-A710 erratum 2119858.	689	This option adds the workaround for ARM Cortex-A710/X2 erratum 2119858.
680		690
681	Affected Cortex-A710 cores could overwrite up to 3 cache lines of trace	691	Affected Cortex-A710/X2 cores could overwrite up to 3 cache lines of trace
682	data at the base of the buffer (pointed to by TRBASER_EL1) in FILL mode in	692	data at the base of the buffer (pointed to by TRBASER_EL1) in FILL mode in
683	the event of a WRAP event.	693	the event of a WRAP event.
684		694
@@ -761,14 +771,14 @@ config ARM64_ERRATUM_2253138 · 76 unmodified lines
761	If unsure, say Y.	771	If unsure, say Y.
762		772
763	config ARM64_ERRATUM_2224489	773	config ARM64_ERRATUM_2224489
764	bool "Cortex-A710: 2224489: workaround TRBE writing to address out-of-range"	774	bool "Cortex-A710/X2: 2224489: workaround TRBE writing to address out-of-range"
765	depends on CORESIGHT_TRBE	775	depends on CORESIGHT_TRBE
766	default y	776	default y
767	select ARM64_WORKAROUND_TRBE_WRITE_OUT_OF_RANGE	777	select ARM64_WORKAROUND_TRBE_WRITE_OUT_OF_RANGE
768	help	778	help
769	This option adds the workaround for ARM Cortex-A710 erratum 2224489.	779	This option adds the workaround for ARM Cortex-A710/X2 erratum 2224489.
770		780
771	Affected Cortex-A710 cores might write to an out-of-range address, not reserved	781	Affected Cortex-A710/X2 cores might write to an out-of-range address, not reserved
772	for TRBE. Under some conditions, the TRBE might generate a write to the next	782	for TRBE. Under some conditions, the TRBE might generate a write to the next
773	virtually addressed page following the last page of the TRBE address space	783	virtually addressed page following the last page of the TRBE address space
774	(i.e., the TRBLIMITR_EL1.LIMIT), instead of wrapping around to the base.	784	(i.e., the TRBLIMITR_EL1.LIMIT), instead of wrapping around to the base.
@@ -778,6 +788,65 @@ config ARM64_ERRATUM_2224489 · 3 unmodified lines
778		788
779	If unsure, say Y.	789	If unsure, say Y.
780		790
		791	config ARM64_ERRATUM_2064142
		792	bool "Cortex-A510: 2064142: workaround TRBE register writes while disabled"
		793	depends on COMPILE_TEST # Until the CoreSight TRBE driver changes are in
		794	default y
		795	help
		796	This option adds the workaround for ARM Cortex-A510 erratum 2064142.
		797
		798	Affected Cortex-A510 core might fail to write into system registers after the
		799	TRBE has been disabled. Under some conditions after the TRBE has been disabled
		800	writes into TRBE registers TRBLIMITR_EL1, TRBPTR_EL1, TRBBASER_EL1, TRBSR_EL1,
		801	and TRBTRG_EL1 will be ignored and will not be effected.
		802
		803	Work around this in the driver by executing TSB CSYNC and DSB after collection
		804	is stopped and before performing a system register write to one of the affected
		805	registers.
		806
		807	If unsure, say Y.
		808
		809	config ARM64_ERRATUM_2038923
		810	bool "Cortex-A510: 2038923: workaround TRBE corruption with enable"
		811	depends on COMPILE_TEST # Until the CoreSight TRBE driver changes are in
		812	default y
		813	help
		814	This option adds the workaround for ARM Cortex-A510 erratum 2038923.
		815
		816	Affected Cortex-A510 core might cause an inconsistent view on whether trace is
		817	prohibited within the CPU. As a result, the trace buffer or trace buffer state
		818	might be corrupted. This happens after TRBE buffer has been enabled by setting
		819	TRBLIMITR_EL1.E, followed by just a single context synchronization event before
		820	execution changes from a context, in which trace is prohibited to one where it
		821	isn't, or vice versa. In these mentioned conditions, the view of whether trace
		822	is prohibited is inconsistent between parts of the CPU, and the trace buffer or
		823	the trace buffer state might be corrupted.
		824
		825	Work around this in the driver by preventing an inconsistent view of whether the
		826	trace is prohibited or not based on TRBLIMITR_EL1.E by immediately following a
		827	change to TRBLIMITR_EL1.E with at least one ISB instruction before an ERET, or
		828	two ISB instructions if no ERET is to take place.
		829
		830	If unsure, say Y.
		831
		832	config ARM64_ERRATUM_1902691
		833	bool "Cortex-A510: 1902691: workaround TRBE trace corruption"
		834	depends on COMPILE_TEST # Until the CoreSight TRBE driver changes are in
		835	default y
		836	help
		837	This option adds the workaround for ARM Cortex-A510 erratum 1902691.
		838
		839	Affected Cortex-A510 core might cause trace data corruption, when being written
		840	into the memory. Effectively TRBE is broken and hence cannot be used to capture
		841	trace data.
		842
		843	Work around this problem in the driver by just preventing TRBE initialization on
		844	affected cpus. The firmware must have disabled the access to TRBE for the kernel
		845	on such implementations. This will cover the kernel for any firmware that doesn't
		846	do this already.
		847
		848	If unsure, say Y.
		849
781	config CAVIUM_ERRATUM_22375	850	config CAVIUM_ERRATUM_22375
782	bool "Cavium erratum 22375, 24313"	851	bool "Cavium erratum 22375, 24313"
783	default y	852	default y

arch/arm64/include/asm/cputype.h+4−0

 #define ARM_CPU_PART_CORTEX_A76		0xD0B
 #define ARM_CPU_PART_NEOVERSE_N1	0xD0C
 #define ARM_CPU_PART_CORTEX_A77		0xD0D
+#define ARM_CPU_PART_CORTEX_A510	0xD46
 #define ARM_CPU_PART_CORTEX_A710	0xD47
+#define ARM_CPU_PART_CORTEX_X2		0xD48
 #define ARM_CPU_PART_NEOVERSE_N2	0xD49
 #define APM_CPU_PART_POTENZA		0x000
 #define MIDR_CORTEX_A76	MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A76)
 #define MIDR_NEOVERSE_N1 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_N1)
 #define MIDR_CORTEX_A77	MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A77)
+#define MIDR_CORTEX_A510 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A510)
 #define MIDR_CORTEX_A710 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A710)
+#define MIDR_CORTEX_X2 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X2)
 #define MIDR_NEOVERSE_N2 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_N2)
 #define MIDR_THUNDERX	MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX)
 #define MIDR_THUNDERX_81XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_81XX)

arch/arm64/kernel/cpu_errata.c+29−0

@@ -347,6 +347,7 @@ static const struct midr_range trbe_overwrite_fill_mode_cpus[] = { · 346 unmodified lines
347	#endif	347	#endif
348	#ifdef CONFIG_ARM64_ERRATUM_2119858	348	#ifdef CONFIG_ARM64_ERRATUM_2119858
349	MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),	349	MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),
		350	MIDR_RANGE(MIDR_CORTEX_X2, 0, 0, 2, 0),
350	#endif	351	#endif
351	{},	352	{},
352	};	353	};
@@ -371,6 +372,7 @@ static struct midr_range trbe_write_out_of_range_cpus[] = { · 18 unmodified lines
371	#endif	372	#endif
372	#ifdef CONFIG_ARM64_ERRATUM_2224489	373	#ifdef CONFIG_ARM64_ERRATUM_2224489
373	MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),	374	MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),
		375	MIDR_RANGE(MIDR_CORTEX_X2, 0, 0, 2, 0),
374	#endif	376	#endif
375	{},	377	{},
376	};	378	};
@@ -597,6 +599,33 @@ const struct arm64_cpu_capabilities arm64_errata[] = { · 220 unmodified lines
597	.type = ARM64_CPUCAP_WEAK_LOCAL_CPU_FEATURE,	599	.type = ARM64_CPUCAP_WEAK_LOCAL_CPU_FEATURE,
598	CAP_MIDR_RANGE_LIST(trbe_write_out_of_range_cpus),	600	CAP_MIDR_RANGE_LIST(trbe_write_out_of_range_cpus),
599	},	601	},
		602	#endif
		603	#ifdef CONFIG_ARM64_ERRATUM_2064142
		604	{
		605	.desc = "ARM erratum 2064142",
		606	.capability = ARM64_WORKAROUND_2064142,
		607
		608	/* Cortex-A510 r0p0 - r0p2 */
		609	ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A510, 0, 0, 2)
		610	},
		611	#endif
		612	#ifdef CONFIG_ARM64_ERRATUM_2038923
		613	{
		614	.desc = "ARM erratum 2038923",
		615	.capability = ARM64_WORKAROUND_2038923,
		616
		617	/* Cortex-A510 r0p0 - r0p2 */
		618	ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A510, 0, 0, 2)
		619	},
		620	#endif
		621	#ifdef CONFIG_ARM64_ERRATUM_1902691
		622	{
		623	.desc = "ARM erratum 1902691",
		624	.capability = ARM64_WORKAROUND_1902691,
		625
		626	/* Cortex-A510 r0p0 - r0p1 */
		627	ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A510, 0, 0, 1)
		628	},
600	#endif	629	#endif
601	{	630	{
602	}	631	}

arch/arm64/kernel/cpufeature.c+3−0

 		MIDR_ALL_VERSIONS(MIDR_CORTEX_A55),
 		/* Kryo4xx Silver (rdpe => r1p0) */
 		MIDR_REV(MIDR_QCOM_KRYO_4XX_SILVER, 0xd, 0xe),
+#endif
+#ifdef CONFIG_ARM64_ERRATUM_2051678
+		MIDR_REV_RANGE(MIDR_CORTEX_A510, 0, 0, 2),
 #endif
 		{},
 	};

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

  */
-static void start_backtrace(struct stackframe *frame, unsigned long fp,
+static notrace void start_backtrace(struct stackframe *frame, unsigned long fp,
-			    unsigned long pc)
+				    unsigned long pc)
 {
 	frame->fp = fp;
 	frame->pc = pc;
 	frame->prev_fp = 0;
 	frame->prev_type = STACK_TYPE_UNKNOWN;
 }
+NOKPROBE_SYMBOL(start_backtrace);
 /*
  * Unwind from one frame record (A) to the next frame record (B).

arch/arm64/kernel/vdso/Makefile+4−1

 ccflags-y := -fno-common -fno-builtin -fno-stack-protector -ffixed-x18
 ccflags-y += -DDISABLE_BRANCH_PROFILING -DBUILD_VDSO
+# -Wmissing-prototypes and -Wmissing-declarations are removed from
+# the CFLAGS of vgettimeofday.c to make possible to build the
+# kernel with CONFIG_WERROR enabled.
 CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -Os $(CC_FLAGS_SCS) $(GCC_PLUGINS_CFLAGS) \
-				$(CC_FLAGS_LTO)
+				$(CC_FLAGS_LTO) -Wmissing-prototypes -Wmissing-declarations
 KASAN_SANITIZE			:= n
 KCSAN_SANITIZE			:= n
 UBSAN_SANITIZE			:= n

arch/arm64/kvm/hyp/exception.c+4−1

 static void __vcpu_write_spsr(struct kvm_vcpu *vcpu, u64 val)
 {
-	write_sysreg_el1(val, SYS_SPSR);
+	if (has_vhe())
+		write_sysreg_el1(val, SYS_SPSR);
+	else
+		__vcpu_sys_reg(vcpu, SPSR_EL1) = val;
 }
 static void __vcpu_write_spsr_abt(struct kvm_vcpu *vcpu, u64 val)

arch/arm64/kvm/hyp/pgtable.c+6−12

@@ -983,13 +983,9 @@ static int stage2_unmap_walker(u64 addr, u64 end, u32 level, kvm_pte_t *ptep, · 982 unmodified lines
983	*/	983	*/
984	stage2_put_pte(ptep, mmu, addr, level, mm_ops);	984	stage2_put_pte(ptep, mmu, addr, level, mm_ops);
985		985
986	if (need_flush) {	986	if (need_flush && mm_ops->dcache_clean_inval_poc)
987	kvm_pte_t *pte_follow = kvm_pte_follow(pte, mm_ops);	987	mm_ops->dcache_clean_inval_poc(kvm_pte_follow(pte, mm_ops),
988		988	kvm_granule_size(level));
989	dcache_clean_inval_poc((unsigned long)pte_follow,
990	(unsigned long)pte_follow +
991	kvm_granule_size(level));
992	}
993		989
994	if (childp)	990	if (childp)
995	mm_ops->put_page(childp);	991	mm_ops->put_page(childp);
@@ -1151,15 +1147,13 @@ static int stage2_flush_walker(u64 addr, u64 end, u32 level, kvm_pte_t *ptep, · 155 unmodified lines
1151	struct kvm_pgtable *pgt = arg;	1147	struct kvm_pgtable *pgt = arg;
1152	struct kvm_pgtable_mm_ops *mm_ops = pgt->mm_ops;	1148	struct kvm_pgtable_mm_ops *mm_ops = pgt->mm_ops;
1153	kvm_pte_t pte = *ptep;	1149	kvm_pte_t pte = *ptep;
1154	kvm_pte_t *pte_follow;
1155		1150
1156	if (!kvm_pte_valid(pte) \|\| !stage2_pte_cacheable(pgt, pte))	1151	if (!kvm_pte_valid(pte) \|\| !stage2_pte_cacheable(pgt, pte))
1157	return 0;	1152	return 0;
1158		1153
1159	pte_follow = kvm_pte_follow(pte, mm_ops);	1154	if (mm_ops->dcache_clean_inval_poc)
1160	dcache_clean_inval_poc((unsigned long)pte_follow,	1155	mm_ops->dcache_clean_inval_poc(kvm_pte_follow(pte, mm_ops),
1161	(unsigned long)pte_follow +	1156	kvm_granule_size(level));
1162	kvm_granule_size(level));
1163	return 0;	1157	return 0;
1164	}	1158	}
1165		1159

arch/arm64/kvm/hyp/vgic-v3-sr.c+3−0

 	val = ((vtr >> 29) & 7) << ICC_CTLR_EL1_PRI_BITS_SHIFT;
 	/* IDbits */
 	val |= ((vtr >> 23) & 7) << ICC_CTLR_EL1_ID_BITS_SHIFT;
+	/* SEIS */
+	if (kvm_vgic_global_state.ich_vtr_el2 & ICH_VTR_SEIS_MASK)
+		val |= BIT(ICC_CTLR_EL1_SEIS_SHIFT);
 	/* A3V */
 	val |= ((vtr >> 21) & 1) << ICC_CTLR_EL1_A3V_SHIFT;
 	/* EOImode */

arch/arm64/kvm/vgic/vgic-v3.c+15−2

 }
 early_param("kvm-arm.vgic_v4_enable", early_gicv4_enable);
+static const struct midr_range broken_seis[] = {
+	MIDR_ALL_VERSIONS(MIDR_APPLE_M1_ICESTORM),
+	MIDR_ALL_VERSIONS(MIDR_APPLE_M1_FIRESTORM),
+	{},
+};
+static bool vgic_v3_broken_seis(void)
+{
+	return ((kvm_vgic_global_state.ich_vtr_el2 & ICH_VTR_SEIS_MASK) &&
+		is_midr_in_range_list(read_cpuid_id(), broken_seis));
+}
 /**
  * vgic_v3_probe - probe for a VGICv3 compatible interrupt controller
  * @info:	pointer to the GIC description
 		group1_trap = true;
 	}
-	if (kvm_vgic_global_state.ich_vtr_el2 & ICH_VTR_SEIS_MASK) {
+	if (vgic_v3_broken_seis()) {
-		kvm_info("GICv3 with locally generated SEI\n");
+		kvm_info("GICv3 with broken locally generated SEI\n");
+		kvm_vgic_global_state.ich_vtr_el2 &= ~ICH_VTR_SEIS_MASK;
 		group0_trap = true;
 		group1_trap = true;
 		if (ich_vtr_el2 & ICH_VTR_TDS_MASK)

arch/arm64/mm/extable.c+2−2

@@ -40,8 +40,8 @@ static bool · 39 unmodified lines
40	ex_handler_load_unaligned_zeropad(const struct exception_table_entry *ex,	40	ex_handler_load_unaligned_zeropad(const struct exception_table_entry *ex,
41	struct pt_regs *regs)	41	struct pt_regs *regs)
42	{	42	{
43	int reg_data = FIELD_GET(EX_DATA_REG_DATA, ex->type);	43	int reg_data = FIELD_GET(EX_DATA_REG_DATA, ex->data);
44	int reg_addr = FIELD_GET(EX_DATA_REG_ADDR, ex->type);	44	int reg_addr = FIELD_GET(EX_DATA_REG_ADDR, ex->data);
45	unsigned long data, addr, offset;	45	unsigned long data, addr, offset;
46		46
47	addr = pt_regs_read_reg(regs, reg_addr);	47	addr = pt_regs_read_reg(regs, reg_addr);

arch/arm64/tools/cpucaps+3−0

 WORKAROUND_1463225
 WORKAROUND_1508412
 WORKAROUND_1542419
+WORKAROUND_2064142
+WORKAROUND_2038923
+WORKAROUND_1902691
 WORKAROUND_TRBE_OVERWRITE_FILL_MODE
 WORKAROUND_TSB_FLUSH_FAILURE
 WORKAROUND_TRBE_WRITE_OUT_OF_RANGE

arch/ia64/Kconfig+1−1

@@ -318,7 +318,7 @@ config ARCH_PROC_KCORE_TEXT · 317 unmodified lines
318	depends on PROC_KCORE	318	depends on PROC_KCORE
319		319
320	config IA64_MCA_RECOVERY	320	config IA64_MCA_RECOVERY
321	tristate "MCA recovery from errors other than TLB."	321	bool "MCA recovery from errors other than TLB."
322		322
323	config IA64_PALINFO	323	config IA64_PALINFO
324	tristate "/proc/pal support"	324	tristate "/proc/pal support"

arch/ia64/pci/fixup.c+2−2

@@ -76,5 +76,5 @@ static void pci_fixup_video(struct pci_dev *pdev) · 75 unmodified lines
76	}	76	}
77	}	77	}
78	}	78	}
79	DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,	79	DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_ANY_ID, PCI_ANY_ID,
80	PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video);	80	PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video);

arch/mips/cavium-octeon/octeon-memcpy.S+1−1

@@ -74,7 +74,7 @@ · 73 unmodified lines
74	#define EXC(inst_reg,addr,handler) \	74	#define EXC(inst_reg,addr,handler) \
75	9: inst_reg, addr; \	75	9: inst_reg, addr; \
76	.section __ex_table,"a"; \	76	.section __ex_table,"a"; \
77	PTR 9b, handler; \	77	PTR_WD 9b, handler; \
78	.previous	78	.previous
79		79
80	/*	80	/*

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

@@ -285,7 +285,7 @@ symbol = value · 284 unmodified lines
285		285
286	#define PTR_SCALESHIFT 2	286	#define PTR_SCALESHIFT 2
287		287
288	#define PTR .word	288	#define PTR_WD .word
289	#define PTRSIZE 4	289	#define PTRSIZE 4
290	#define PTRLOG 2	290	#define PTRLOG 2
291	#endif	291	#endif
@@ -310,7 +310,7 @@ symbol = value · 18 unmodified lines
310		310
311	#define PTR_SCALESHIFT 3	311	#define PTR_SCALESHIFT 3
312		312
313	#define PTR .dword	313	#define PTR_WD .dword
314	#define PTRSIZE 8	314	#define PTRSIZE 8
315	#define PTRLOG 3	315	#define PTRLOG 3
316	#endif	316	#endif

arch/mips/include/asm/ftrace.h+2−2

@@ -32,7 +32,7 @@ do { \ · 31 unmodified lines
32	".previous\n" \	32	".previous\n" \
33	\	33	\
34	".section\t__ex_table,\"a\"\n\t" \	34	".section\t__ex_table,\"a\"\n\t" \
35	STR(PTR) "\t1b, 3b\n\t" \	35	STR(PTR_WD) "\t1b, 3b\n\t" \
36	".previous\n" \	36	".previous\n" \
37	\	37	\
38	: [tmp_dst] "=&r" (dst), [tmp_err] "=r" (error)\	38	: [tmp_dst] "=&r" (dst), [tmp_err] "=r" (error)\
@@ -54,7 +54,7 @@ do { \ · 15 unmodified lines
54	".previous\n" \	54	".previous\n" \
55	\	55	\
56	".section\t__ex_table,\"a\"\n\t"\	56	".section\t__ex_table,\"a\"\n\t"\
57	STR(PTR) "\t1b, 3b\n\t" \	57	STR(PTR_WD) "\t1b, 3b\n\t" \
58	".previous\n" \	58	".previous\n" \
59	\	59	\
60	: [tmp_err] "=r" (error) \	60	: [tmp_err] "=r" (error) \

arch/mips/include/asm/r4kcache.h+2−2

@@ -119,7 +119,7 @@ static inline void flush_scache_line(unsigned long addr) · 118 unmodified lines
119	" j 2b \n" \	119	" j 2b \n" \
120	" .previous \n" \	120	" .previous \n" \
121	" .section __ex_table,\"a\" \n" \	121	" .section __ex_table,\"a\" \n" \
122	" "STR(PTR)" 1b, 3b \n" \	122	" "STR(PTR_WD)" 1b, 3b \n" \
123	" .previous" \	123	" .previous" \
124	: "+r" (__err) \	124	: "+r" (__err) \
125	: "i" (op), "r" (addr), "i" (-EFAULT)); \	125	: "i" (op), "r" (addr), "i" (-EFAULT)); \
@@ -142,7 +142,7 @@ static inline void flush_scache_line(unsigned long addr) · 16 unmodified lines
142	" j 2b \n" \	142	" j 2b \n" \
143	" .previous \n" \	143	" .previous \n" \
144	" .section __ex_table,\"a\" \n" \	144	" .section __ex_table,\"a\" \n" \
145	" "STR(PTR)" 1b, 3b \n" \	145	" "STR(PTR_WD)" 1b, 3b \n" \
146	" .previous" \	146	" .previous" \
147	: "+r" (__err) \	147	: "+r" (__err) \
148	: "i" (op), "r" (addr), "i" (-EFAULT)); \	148	: "i" (op), "r" (addr), "i" (-EFAULT)); \

arch/mips/include/asm/unaligned-emul.h+88−88

@@ -20,8 +20,8 @@ do { \ · 19 unmodified lines
20	"j\t3b\n\t" \	20	"j\t3b\n\t" \
21	".previous\n\t" \	21	".previous\n\t" \
22	".section\t__ex_table,\"a\"\n\t" \	22	".section\t__ex_table,\"a\"\n\t" \
23	STR(PTR)"\t1b, 4b\n\t" \	23	STR(PTR_WD)"\t1b, 4b\n\t" \
24	STR(PTR)"\t2b, 4b\n\t" \	24	STR(PTR_WD)"\t2b, 4b\n\t" \
25	".previous" \	25	".previous" \
26	: "=&r" (value), "=r" (res) \	26	: "=&r" (value), "=r" (res) \
27	: "r" (addr), "i" (-EFAULT)); \	27	: "r" (addr), "i" (-EFAULT)); \
@@ -41,8 +41,8 @@ do { \ · 13 unmodified lines
41	"j\t3b\n\t" \	41	"j\t3b\n\t" \
42	".previous\n\t" \	42	".previous\n\t" \
43	".section\t__ex_table,\"a\"\n\t" \	43	".section\t__ex_table,\"a\"\n\t" \
44	STR(PTR)"\t1b, 4b\n\t" \	44	STR(PTR_WD)"\t1b, 4b\n\t" \
45	STR(PTR)"\t2b, 4b\n\t" \	45	STR(PTR_WD)"\t2b, 4b\n\t" \
46	".previous" \	46	".previous" \
47	: "=&r" (value), "=r" (res) \	47	: "=&r" (value), "=r" (res) \
48	: "r" (addr), "i" (-EFAULT)); \	48	: "r" (addr), "i" (-EFAULT)); \
@@ -74,10 +74,10 @@ do { \ · 25 unmodified lines
74	"j\t10b\n\t" \	74	"j\t10b\n\t" \
75	".previous\n\t" \	75	".previous\n\t" \
76	".section\t__ex_table,\"a\"\n\t" \	76	".section\t__ex_table,\"a\"\n\t" \
77	STR(PTR)"\t1b, 11b\n\t" \	77	STR(PTR_WD)"\t1b, 11b\n\t" \
78	STR(PTR)"\t2b, 11b\n\t" \	78	STR(PTR_WD)"\t2b, 11b\n\t" \
79	STR(PTR)"\t3b, 11b\n\t" \	79	STR(PTR_WD)"\t3b, 11b\n\t" \
80	STR(PTR)"\t4b, 11b\n\t" \	80	STR(PTR_WD)"\t4b, 11b\n\t" \
81	".previous" \	81	".previous" \
82	: "=&r" (value), "=r" (res) \	82	: "=&r" (value), "=r" (res) \
83	: "r" (addr), "i" (-EFAULT)); \	83	: "r" (addr), "i" (-EFAULT)); \
@@ -102,8 +102,8 @@ do { \ · 18 unmodified lines
102	"j\t3b\n\t" \	102	"j\t3b\n\t" \
103	".previous\n\t" \	103	".previous\n\t" \
104	".section\t__ex_table,\"a\"\n\t" \	104	".section\t__ex_table,\"a\"\n\t" \
105	STR(PTR)"\t1b, 4b\n\t" \	105	STR(PTR_WD)"\t1b, 4b\n\t" \
106	STR(PTR)"\t2b, 4b\n\t" \	106	STR(PTR_WD)"\t2b, 4b\n\t" \
107	".previous" \	107	".previous" \
108	: "=&r" (value), "=r" (res) \	108	: "=&r" (value), "=r" (res) \
109	: "r" (addr), "i" (-EFAULT)); \	109	: "r" (addr), "i" (-EFAULT)); \
@@ -125,8 +125,8 @@ do { \ · 15 unmodified lines
125	"j\t3b\n\t" \	125	"j\t3b\n\t" \
126	".previous\n\t" \	126	".previous\n\t" \
127	".section\t__ex_table,\"a\"\n\t" \	127	".section\t__ex_table,\"a\"\n\t" \
128	STR(PTR)"\t1b, 4b\n\t" \	128	STR(PTR_WD)"\t1b, 4b\n\t" \
129	STR(PTR)"\t2b, 4b\n\t" \	129	STR(PTR_WD)"\t2b, 4b\n\t" \
130	".previous" \	130	".previous" \
131	: "=&r" (value), "=r" (res) \	131	: "=&r" (value), "=r" (res) \
132	: "r" (addr), "i" (-EFAULT)); \	132	: "r" (addr), "i" (-EFAULT)); \
@@ -145,8 +145,8 @@ do { \ · 12 unmodified lines
145	"j\t3b\n\t" \	145	"j\t3b\n\t" \
146	".previous\n\t" \	146	".previous\n\t" \
147	".section\t__ex_table,\"a\"\n\t" \	147	".section\t__ex_table,\"a\"\n\t" \
148	STR(PTR)"\t1b, 4b\n\t" \	148	STR(PTR_WD)"\t1b, 4b\n\t" \
149	STR(PTR)"\t2b, 4b\n\t" \	149	STR(PTR_WD)"\t2b, 4b\n\t" \
150	".previous" \	150	".previous" \
151	: "=&r" (value), "=r" (res) \	151	: "=&r" (value), "=r" (res) \
152	: "r" (addr), "i" (-EFAULT)); \	152	: "r" (addr), "i" (-EFAULT)); \
@@ -178,10 +178,10 @@ do { \ · 25 unmodified lines
178	"j\t10b\n\t" \	178	"j\t10b\n\t" \
179	".previous\n\t" \	179	".previous\n\t" \
180	".section\t__ex_table,\"a\"\n\t" \	180	".section\t__ex_table,\"a\"\n\t" \
181	STR(PTR)"\t1b, 11b\n\t" \	181	STR(PTR_WD)"\t1b, 11b\n\t" \
182	STR(PTR)"\t2b, 11b\n\t" \	182	STR(PTR_WD)"\t2b, 11b\n\t" \
183	STR(PTR)"\t3b, 11b\n\t" \	183	STR(PTR_WD)"\t3b, 11b\n\t" \
184	STR(PTR)"\t4b, 11b\n\t" \	184	STR(PTR_WD)"\t4b, 11b\n\t" \
185	".previous" \	185	".previous" \
186	: "=&r" (value), "=r" (res) \	186	: "=&r" (value), "=r" (res) \
187	: "r" (addr), "i" (-EFAULT)); \	187	: "r" (addr), "i" (-EFAULT)); \
@@ -223,14 +223,14 @@ do { \ · 35 unmodified lines
223	"j\t10b\n\t" \	223	"j\t10b\n\t" \
224	".previous\n\t" \	224	".previous\n\t" \
225	".section\t__ex_table,\"a\"\n\t" \	225	".section\t__ex_table,\"a\"\n\t" \
226	STR(PTR)"\t1b, 11b\n\t" \	226	STR(PTR_WD)"\t1b, 11b\n\t" \
227	STR(PTR)"\t2b, 11b\n\t" \	227	STR(PTR_WD)"\t2b, 11b\n\t" \
228	STR(PTR)"\t3b, 11b\n\t" \	228	STR(PTR_WD)"\t3b, 11b\n\t" \
229	STR(PTR)"\t4b, 11b\n\t" \	229	STR(PTR_WD)"\t4b, 11b\n\t" \
230	STR(PTR)"\t5b, 11b\n\t" \	230	STR(PTR_WD)"\t5b, 11b\n\t" \
231	STR(PTR)"\t6b, 11b\n\t" \	231	STR(PTR_WD)"\t6b, 11b\n\t" \
232	STR(PTR)"\t7b, 11b\n\t" \	232	STR(PTR_WD)"\t7b, 11b\n\t" \
233	STR(PTR)"\t8b, 11b\n\t" \	233	STR(PTR_WD)"\t8b, 11b\n\t" \
234	".previous" \	234	".previous" \
235	: "=&r" (value), "=r" (res) \	235	: "=&r" (value), "=r" (res) \
236	: "r" (addr), "i" (-EFAULT)); \	236	: "r" (addr), "i" (-EFAULT)); \
@@ -255,8 +255,8 @@ do { \ · 18 unmodified lines
255	"j\t3b\n\t" \	255	"j\t3b\n\t" \
256	".previous\n\t" \	256	".previous\n\t" \
257	".section\t__ex_table,\"a\"\n\t" \	257	".section\t__ex_table,\"a\"\n\t" \
258	STR(PTR)"\t1b, 4b\n\t" \	258	STR(PTR_WD)"\t1b, 4b\n\t" \
259	STR(PTR)"\t2b, 4b\n\t" \	259	STR(PTR_WD)"\t2b, 4b\n\t" \
260	".previous" \	260	".previous" \
261	: "=r" (res) \	261	: "=r" (res) \
262	: "r" (value), "r" (addr), "i" (-EFAULT));\	262	: "r" (value), "r" (addr), "i" (-EFAULT));\
@@ -276,8 +276,8 @@ do { \ · 13 unmodified lines
276	"j\t3b\n\t" \	276	"j\t3b\n\t" \
277	".previous\n\t" \	277	".previous\n\t" \
278	".section\t__ex_table,\"a\"\n\t" \	278	".section\t__ex_table,\"a\"\n\t" \
279	STR(PTR)"\t1b, 4b\n\t" \	279	STR(PTR_WD)"\t1b, 4b\n\t" \
280	STR(PTR)"\t2b, 4b\n\t" \	280	STR(PTR_WD)"\t2b, 4b\n\t" \
281	".previous" \	281	".previous" \
282	: "=r" (res) \	282	: "=r" (res) \
283	: "r" (value), "r" (addr), "i" (-EFAULT)); \	283	: "r" (value), "r" (addr), "i" (-EFAULT)); \
@@ -296,8 +296,8 @@ do { \ · 12 unmodified lines
296	"j\t3b\n\t" \	296	"j\t3b\n\t" \
297	".previous\n\t" \	297	".previous\n\t" \
298	".section\t__ex_table,\"a\"\n\t" \	298	".section\t__ex_table,\"a\"\n\t" \
299	STR(PTR)"\t1b, 4b\n\t" \	299	STR(PTR_WD)"\t1b, 4b\n\t" \
300	STR(PTR)"\t2b, 4b\n\t" \	300	STR(PTR_WD)"\t2b, 4b\n\t" \
301	".previous" \	301	".previous" \
302	: "=r" (res) \	302	: "=r" (res) \
303	: "r" (value), "r" (addr), "i" (-EFAULT)); \	303	: "r" (value), "r" (addr), "i" (-EFAULT)); \
@@ -325,10 +325,10 @@ do { \ · 21 unmodified lines
325	"j\t10b\n\t" \	325	"j\t10b\n\t" \
326	".previous\n\t" \	326	".previous\n\t" \
327	".section\t__ex_table,\"a\"\n\t" \	327	".section\t__ex_table,\"a\"\n\t" \
328	STR(PTR)"\t1b, 11b\n\t" \	328	STR(PTR_WD)"\t1b, 11b\n\t" \
329	STR(PTR)"\t2b, 11b\n\t" \	329	STR(PTR_WD)"\t2b, 11b\n\t" \
330	STR(PTR)"\t3b, 11b\n\t" \	330	STR(PTR_WD)"\t3b, 11b\n\t" \
331	STR(PTR)"\t4b, 11b\n\t" \	331	STR(PTR_WD)"\t4b, 11b\n\t" \
332	".previous" \	332	".previous" \
333	: "=&r" (res) \	333	: "=&r" (res) \
334	: "r" (value), "r" (addr), "i" (-EFAULT) \	334	: "r" (value), "r" (addr), "i" (-EFAULT) \
@@ -365,14 +365,14 @@ do { \ · 30 unmodified lines
365	"j\t10b\n\t" \	365	"j\t10b\n\t" \
366	".previous\n\t" \	366	".previous\n\t" \
367	".section\t__ex_table,\"a\"\n\t" \	367	".section\t__ex_table,\"a\"\n\t" \
368	STR(PTR)"\t1b, 11b\n\t" \	368	STR(PTR_WD)"\t1b, 11b\n\t" \
369	STR(PTR)"\t2b, 11b\n\t" \	369	STR(PTR_WD)"\t2b, 11b\n\t" \
370	STR(PTR)"\t3b, 11b\n\t" \	370	STR(PTR_WD)"\t3b, 11b\n\t" \
371	STR(PTR)"\t4b, 11b\n\t" \	371	STR(PTR_WD)"\t4b, 11b\n\t" \
372	STR(PTR)"\t5b, 11b\n\t" \	372	STR(PTR_WD)"\t5b, 11b\n\t" \
373	STR(PTR)"\t6b, 11b\n\t" \	373	STR(PTR_WD)"\t6b, 11b\n\t" \
374	STR(PTR)"\t7b, 11b\n\t" \	374	STR(PTR_WD)"\t7b, 11b\n\t" \
375	STR(PTR)"\t8b, 11b\n\t" \	375	STR(PTR_WD)"\t8b, 11b\n\t" \
376	".previous" \	376	".previous" \
377	: "=&r" (res) \	377	: "=&r" (res) \
378	: "r" (value), "r" (addr), "i" (-EFAULT) \	378	: "r" (value), "r" (addr), "i" (-EFAULT) \
@@ -398,8 +398,8 @@ do { \ · 19 unmodified lines
398	"j\t3b\n\t" \	398	"j\t3b\n\t" \
399	".previous\n\t" \	399	".previous\n\t" \
400	".section\t__ex_table,\"a\"\n\t" \	400	".section\t__ex_table,\"a\"\n\t" \
401	STR(PTR)"\t1b, 4b\n\t" \	401	STR(PTR_WD)"\t1b, 4b\n\t" \
402	STR(PTR)"\t2b, 4b\n\t" \	402	STR(PTR_WD)"\t2b, 4b\n\t" \
403	".previous" \	403	".previous" \
404	: "=&r" (value), "=r" (res) \	404	: "=&r" (value), "=r" (res) \
405	: "r" (addr), "i" (-EFAULT)); \	405	: "r" (addr), "i" (-EFAULT)); \
@@ -419,8 +419,8 @@ do { \ · 13 unmodified lines
419	"j\t3b\n\t" \	419	"j\t3b\n\t" \
420	".previous\n\t" \	420	".previous\n\t" \
421	".section\t__ex_table,\"a\"\n\t" \	421	".section\t__ex_table,\"a\"\n\t" \
422	STR(PTR)"\t1b, 4b\n\t" \	422	STR(PTR_WD)"\t1b, 4b\n\t" \
423	STR(PTR)"\t2b, 4b\n\t" \	423	STR(PTR_WD)"\t2b, 4b\n\t" \
424	".previous" \	424	".previous" \
425	: "=&r" (value), "=r" (res) \	425	: "=&r" (value), "=r" (res) \
426	: "r" (addr), "i" (-EFAULT)); \	426	: "r" (addr), "i" (-EFAULT)); \
@@ -452,10 +452,10 @@ do { \ · 25 unmodified lines
452	"j\t10b\n\t" \	452	"j\t10b\n\t" \
453	".previous\n\t" \	453	".previous\n\t" \
454	".section\t__ex_table,\"a\"\n\t" \	454	".section\t__ex_table,\"a\"\n\t" \
455	STR(PTR)"\t1b, 11b\n\t" \	455	STR(PTR_WD)"\t1b, 11b\n\t" \
456	STR(PTR)"\t2b, 11b\n\t" \	456	STR(PTR_WD)"\t2b, 11b\n\t" \
457	STR(PTR)"\t3b, 11b\n\t" \	457	STR(PTR_WD)"\t3b, 11b\n\t" \
458	STR(PTR)"\t4b, 11b\n\t" \	458	STR(PTR_WD)"\t4b, 11b\n\t" \
459	".previous" \	459	".previous" \
460	: "=&r" (value), "=r" (res) \	460	: "=&r" (value), "=r" (res) \
461	: "r" (addr), "i" (-EFAULT)); \	461	: "r" (addr), "i" (-EFAULT)); \
@@ -481,8 +481,8 @@ do { \ · 19 unmodified lines
481	"j\t3b\n\t" \	481	"j\t3b\n\t" \
482	".previous\n\t" \	482	".previous\n\t" \
483	".section\t__ex_table,\"a\"\n\t" \	483	".section\t__ex_table,\"a\"\n\t" \
484	STR(PTR)"\t1b, 4b\n\t" \	484	STR(PTR_WD)"\t1b, 4b\n\t" \
485	STR(PTR)"\t2b, 4b\n\t" \	485	STR(PTR_WD)"\t2b, 4b\n\t" \
486	".previous" \	486	".previous" \
487	: "=&r" (value), "=r" (res) \	487	: "=&r" (value), "=r" (res) \
488	: "r" (addr), "i" (-EFAULT)); \	488	: "r" (addr), "i" (-EFAULT)); \
@@ -504,8 +504,8 @@ do { \ · 15 unmodified lines
504	"j\t3b\n\t" \	504	"j\t3b\n\t" \
505	".previous\n\t" \	505	".previous\n\t" \
506	".section\t__ex_table,\"a\"\n\t" \	506	".section\t__ex_table,\"a\"\n\t" \
507	STR(PTR)"\t1b, 4b\n\t" \	507	STR(PTR_WD)"\t1b, 4b\n\t" \
508	STR(PTR)"\t2b, 4b\n\t" \	508	STR(PTR_WD)"\t2b, 4b\n\t" \
509	".previous" \	509	".previous" \
510	: "=&r" (value), "=r" (res) \	510	: "=&r" (value), "=r" (res) \
511	: "r" (addr), "i" (-EFAULT)); \	511	: "r" (addr), "i" (-EFAULT)); \
@@ -524,8 +524,8 @@ do { \ · 12 unmodified lines
524	"j\t3b\n\t" \	524	"j\t3b\n\t" \
525	".previous\n\t" \	525	".previous\n\t" \
526	".section\t__ex_table,\"a\"\n\t" \	526	".section\t__ex_table,\"a\"\n\t" \
527	STR(PTR)"\t1b, 4b\n\t" \	527	STR(PTR_WD)"\t1b, 4b\n\t" \
528	STR(PTR)"\t2b, 4b\n\t" \	528	STR(PTR_WD)"\t2b, 4b\n\t" \
529	".previous" \	529	".previous" \
530	: "=&r" (value), "=r" (res) \	530	: "=&r" (value), "=r" (res) \
531	: "r" (addr), "i" (-EFAULT)); \	531	: "r" (addr), "i" (-EFAULT)); \
@@ -557,10 +557,10 @@ do { \ · 25 unmodified lines
557	"j\t10b\n\t" \	557	"j\t10b\n\t" \
558	".previous\n\t" \	558	".previous\n\t" \
559	".section\t__ex_table,\"a\"\n\t" \	559	".section\t__ex_table,\"a\"\n\t" \
560	STR(PTR)"\t1b, 11b\n\t" \	560	STR(PTR_WD)"\t1b, 11b\n\t" \
561	STR(PTR)"\t2b, 11b\n\t" \	561	STR(PTR_WD)"\t2b, 11b\n\t" \
562	STR(PTR)"\t3b, 11b\n\t" \	562	STR(PTR_WD)"\t3b, 11b\n\t" \
563	STR(PTR)"\t4b, 11b\n\t" \	563	STR(PTR_WD)"\t4b, 11b\n\t" \
564	".previous" \	564	".previous" \
565	: "=&r" (value), "=r" (res) \	565	: "=&r" (value), "=r" (res) \
566	: "r" (addr), "i" (-EFAULT)); \	566	: "r" (addr), "i" (-EFAULT)); \
@@ -602,14 +602,14 @@ do { \ · 35 unmodified lines
602	"j\t10b\n\t" \	602	"j\t10b\n\t" \
603	".previous\n\t" \	603	".previous\n\t" \
604	".section\t__ex_table,\"a\"\n\t" \	604	".section\t__ex_table,\"a\"\n\t" \
605	STR(PTR)"\t1b, 11b\n\t" \	605	STR(PTR_WD)"\t1b, 11b\n\t" \
606	STR(PTR)"\t2b, 11b\n\t" \	606	STR(PTR_WD)"\t2b, 11b\n\t" \
607	STR(PTR)"\t3b, 11b\n\t" \	607	STR(PTR_WD)"\t3b, 11b\n\t" \
608	STR(PTR)"\t4b, 11b\n\t" \	608	STR(PTR_WD)"\t4b, 11b\n\t" \
609	STR(PTR)"\t5b, 11b\n\t" \	609	STR(PTR_WD)"\t5b, 11b\n\t" \
610	STR(PTR)"\t6b, 11b\n\t" \	610	STR(PTR_WD)"\t6b, 11b\n\t" \
611	STR(PTR)"\t7b, 11b\n\t" \	611	STR(PTR_WD)"\t7b, 11b\n\t" \
612	STR(PTR)"\t8b, 11b\n\t" \	612	STR(PTR_WD)"\t8b, 11b\n\t" \
613	".previous" \	613	".previous" \
614	: "=&r" (value), "=r" (res) \	614	: "=&r" (value), "=r" (res) \
615	: "r" (addr), "i" (-EFAULT)); \	615	: "r" (addr), "i" (-EFAULT)); \
@@ -632,8 +632,8 @@ do { \ · 16 unmodified lines
632	"j\t3b\n\t" \	632	"j\t3b\n\t" \
633	".previous\n\t" \	633	".previous\n\t" \
634	".section\t__ex_table,\"a\"\n\t" \	634	".section\t__ex_table,\"a\"\n\t" \
635	STR(PTR)"\t1b, 4b\n\t" \	635	STR(PTR_WD)"\t1b, 4b\n\t" \
636	STR(PTR)"\t2b, 4b\n\t" \	636	STR(PTR_WD)"\t2b, 4b\n\t" \
637	".previous" \	637	".previous" \
638	: "=r" (res) \	638	: "=r" (res) \
639	: "r" (value), "r" (addr), "i" (-EFAULT));\	639	: "r" (value), "r" (addr), "i" (-EFAULT));\
@@ -653,8 +653,8 @@ do { \ · 13 unmodified lines
653	"j\t3b\n\t" \	653	"j\t3b\n\t" \
654	".previous\n\t" \	654	".previous\n\t" \
655	".section\t__ex_table,\"a\"\n\t" \	655	".section\t__ex_table,\"a\"\n\t" \
656	STR(PTR)"\t1b, 4b\n\t" \	656	STR(PTR_WD)"\t1b, 4b\n\t" \
657	STR(PTR)"\t2b, 4b\n\t" \	657	STR(PTR_WD)"\t2b, 4b\n\t" \
658	".previous" \	658	".previous" \
659	: "=r" (res) \	659	: "=r" (res) \
660	: "r" (value), "r" (addr), "i" (-EFAULT)); \	660	: "r" (value), "r" (addr), "i" (-EFAULT)); \
@@ -673,8 +673,8 @@ do { \ · 12 unmodified lines
673	"j\t3b\n\t" \	673	"j\t3b\n\t" \
674	".previous\n\t" \	674	".previous\n\t" \
675	".section\t__ex_table,\"a\"\n\t" \	675	".section\t__ex_table,\"a\"\n\t" \
676	STR(PTR)"\t1b, 4b\n\t" \	676	STR(PTR_WD)"\t1b, 4b\n\t" \
677	STR(PTR)"\t2b, 4b\n\t" \	677	STR(PTR_WD)"\t2b, 4b\n\t" \
678	".previous" \	678	".previous" \
679	: "=r" (res) \	679	: "=r" (res) \
680	: "r" (value), "r" (addr), "i" (-EFAULT)); \	680	: "r" (value), "r" (addr), "i" (-EFAULT)); \
@@ -703,10 +703,10 @@ do { \ · 22 unmodified lines
703	"j\t10b\n\t" \	703	"j\t10b\n\t" \
704	".previous\n\t" \	704	".previous\n\t" \
705	".section\t__ex_table,\"a\"\n\t" \	705	".section\t__ex_table,\"a\"\n\t" \
706	STR(PTR)"\t1b, 11b\n\t" \	706	STR(PTR_WD)"\t1b, 11b\n\t" \
707	STR(PTR)"\t2b, 11b\n\t" \	707	STR(PTR_WD)"\t2b, 11b\n\t" \
708	STR(PTR)"\t3b, 11b\n\t" \	708	STR(PTR_WD)"\t3b, 11b\n\t" \
709	STR(PTR)"\t4b, 11b\n\t" \	709	STR(PTR_WD)"\t4b, 11b\n\t" \
710	".previous" \	710	".previous" \
711	: "=&r" (res) \	711	: "=&r" (res) \
712	: "r" (value), "r" (addr), "i" (-EFAULT) \	712	: "r" (value), "r" (addr), "i" (-EFAULT) \
@@ -743,14 +743,14 @@ do { \ · 30 unmodified lines
743	"j\t10b\n\t" \	743	"j\t10b\n\t" \
744	".previous\n\t" \	744	".previous\n\t" \
745	".section\t__ex_table,\"a\"\n\t" \	745	".section\t__ex_table,\"a\"\n\t" \
746	STR(PTR)"\t1b, 11b\n\t" \	746	STR(PTR_WD)"\t1b, 11b\n\t" \
747	STR(PTR)"\t2b, 11b\n\t" \	747	STR(PTR_WD)"\t2b, 11b\n\t" \
748	STR(PTR)"\t3b, 11b\n\t" \	748	STR(PTR_WD)"\t3b, 11b\n\t" \
749	STR(PTR)"\t4b, 11b\n\t" \	749	STR(PTR_WD)"\t4b, 11b\n\t" \
750	STR(PTR)"\t5b, 11b\n\t" \	750	STR(PTR_WD)"\t5b, 11b\n\t" \
751	STR(PTR)"\t6b, 11b\n\t" \	751	STR(PTR_WD)"\t6b, 11b\n\t" \
752	STR(PTR)"\t7b, 11b\n\t" \	752	STR(PTR_WD)"\t7b, 11b\n\t" \
753	STR(PTR)"\t8b, 11b\n\t" \	753	STR(PTR_WD)"\t8b, 11b\n\t" \
754	".previous" \	754	".previous" \
755	: "=&r" (res) \	755	: "=&r" (res) \
756	: "r" (value), "r" (addr), "i" (-EFAULT) \	756	: "r" (value), "r" (addr), "i" (-EFAULT) \

arch/mips/kernel/mips-r2-to-r6-emul.c+52−52

@@ -1258,10 +1258,10 @@ fpu_emul: · 1257 unmodified lines
1258	" j 10b\n"	1258	" j 10b\n"
1259	" .previous\n"	1259	" .previous\n"
1260	" .section __ex_table,\"a\"\n"	1260	" .section __ex_table,\"a\"\n"
1261	STR(PTR) " 1b,8b\n"	1261	STR(PTR_WD) " 1b,8b\n"
1262	STR(PTR) " 2b,8b\n"	1262	STR(PTR_WD) " 2b,8b\n"
1263	STR(PTR) " 3b,8b\n"	1263	STR(PTR_WD) " 3b,8b\n"
1264	STR(PTR) " 4b,8b\n"	1264	STR(PTR_WD) " 4b,8b\n"
1265	" .previous\n"	1265	" .previous\n"
1266	" .set pop\n"	1266	" .set pop\n"
1267	: "+&r"(rt), "=&r"(rs),	1267	: "+&r"(rt), "=&r"(rs),
@@ -1333,10 +1333,10 @@ fpu_emul: · 65 unmodified lines
1333	" j 10b\n"	1333	" j 10b\n"
1334	" .previous\n"	1334	" .previous\n"
1335	" .section __ex_table,\"a\"\n"	1335	" .section __ex_table,\"a\"\n"
1336	STR(PTR) " 1b,8b\n"	1336	STR(PTR_WD) " 1b,8b\n"
1337	STR(PTR) " 2b,8b\n"	1337	STR(PTR_WD) " 2b,8b\n"
1338	STR(PTR) " 3b,8b\n"	1338	STR(PTR_WD) " 3b,8b\n"
1339	STR(PTR) " 4b,8b\n"	1339	STR(PTR_WD) " 4b,8b\n"
1340	" .previous\n"	1340	" .previous\n"
1341	" .set pop\n"	1341	" .set pop\n"
1342	: "+&r"(rt), "=&r"(rs),	1342	: "+&r"(rt), "=&r"(rs),
@@ -1404,10 +1404,10 @@ fpu_emul: · 61 unmodified lines
1404	" j 9b\n"	1404	" j 9b\n"
1405	" .previous\n"	1405	" .previous\n"
1406	" .section __ex_table,\"a\"\n"	1406	" .section __ex_table,\"a\"\n"
1407	STR(PTR) " 1b,8b\n"	1407	STR(PTR_WD) " 1b,8b\n"
1408	STR(PTR) " 2b,8b\n"	1408	STR(PTR_WD) " 2b,8b\n"
1409	STR(PTR) " 3b,8b\n"	1409	STR(PTR_WD) " 3b,8b\n"
1410	STR(PTR) " 4b,8b\n"	1410	STR(PTR_WD) " 4b,8b\n"
1411	" .previous\n"	1411	" .previous\n"
1412	" .set pop\n"	1412	" .set pop\n"
1413	: "+&r"(rt), "=&r"(rs),	1413	: "+&r"(rt), "=&r"(rs),
@@ -1474,10 +1474,10 @@ fpu_emul: · 60 unmodified lines
1474	" j 9b\n"	1474	" j 9b\n"
1475	" .previous\n"	1475	" .previous\n"
1476	" .section __ex_table,\"a\"\n"	1476	" .section __ex_table,\"a\"\n"
1477	STR(PTR) " 1b,8b\n"	1477	STR(PTR_WD) " 1b,8b\n"
1478	STR(PTR) " 2b,8b\n"	1478	STR(PTR_WD) " 2b,8b\n"
1479	STR(PTR) " 3b,8b\n"	1479	STR(PTR_WD) " 3b,8b\n"
1480	STR(PTR) " 4b,8b\n"	1480	STR(PTR_WD) " 4b,8b\n"
1481	" .previous\n"	1481	" .previous\n"
1482	" .set pop\n"	1482	" .set pop\n"
1483	: "+&r"(rt), "=&r"(rs),	1483	: "+&r"(rt), "=&r"(rs),
@@ -1589,14 +1589,14 @@ fpu_emul: · 105 unmodified lines
1589	" j 9b\n"	1589	" j 9b\n"
1590	" .previous\n"	1590	" .previous\n"
1591	" .section __ex_table,\"a\"\n"	1591	" .section __ex_table,\"a\"\n"
1592	STR(PTR) " 1b,8b\n"	1592	STR(PTR_WD) " 1b,8b\n"
1593	STR(PTR) " 2b,8b\n"	1593	STR(PTR_WD) " 2b,8b\n"
1594	STR(PTR) " 3b,8b\n"	1594	STR(PTR_WD) " 3b,8b\n"
1595	STR(PTR) " 4b,8b\n"	1595	STR(PTR_WD) " 4b,8b\n"
1596	STR(PTR) " 5b,8b\n"	1596	STR(PTR_WD) " 5b,8b\n"
1597	STR(PTR) " 6b,8b\n"	1597	STR(PTR_WD) " 6b,8b\n"
1598	STR(PTR) " 7b,8b\n"	1598	STR(PTR_WD) " 7b,8b\n"
1599	STR(PTR) " 0b,8b\n"	1599	STR(PTR_WD) " 0b,8b\n"
1600	" .previous\n"	1600	" .previous\n"
1601	" .set pop\n"	1601	" .set pop\n"
1602	: "+&r"(rt), "=&r"(rs),	1602	: "+&r"(rt), "=&r"(rs),
@@ -1708,14 +1708,14 @@ fpu_emul: · 105 unmodified lines
1708	" j 9b\n"	1708	" j 9b\n"
1709	" .previous\n"	1709	" .previous\n"
1710	" .section __ex_table,\"a\"\n"	1710	" .section __ex_table,\"a\"\n"
1711	STR(PTR) " 1b,8b\n"	1711	STR(PTR_WD) " 1b,8b\n"
1712	STR(PTR) " 2b,8b\n"	1712	STR(PTR_WD) " 2b,8b\n"
1713	STR(PTR) " 3b,8b\n"	1713	STR(PTR_WD) " 3b,8b\n"
1714	STR(PTR) " 4b,8b\n"	1714	STR(PTR_WD) " 4b,8b\n"
1715	STR(PTR) " 5b,8b\n"	1715	STR(PTR_WD) " 5b,8b\n"
1716	STR(PTR) " 6b,8b\n"	1716	STR(PTR_WD) " 6b,8b\n"
1717	STR(PTR) " 7b,8b\n"	1717	STR(PTR_WD) " 7b,8b\n"
1718	STR(PTR) " 0b,8b\n"	1718	STR(PTR_WD) " 0b,8b\n"
1719	" .previous\n"	1719	" .previous\n"
1720	" .set pop\n"	1720	" .set pop\n"
1721	: "+&r"(rt), "=&r"(rs),	1721	: "+&r"(rt), "=&r"(rs),
@@ -1827,14 +1827,14 @@ fpu_emul: · 105 unmodified lines
1827	" j 9b\n"	1827	" j 9b\n"
1828	" .previous\n"	1828	" .previous\n"
1829	" .section __ex_table,\"a\"\n"	1829	" .section __ex_table,\"a\"\n"
1830	STR(PTR) " 1b,8b\n"	1830	STR(PTR_WD) " 1b,8b\n"
1831	STR(PTR) " 2b,8b\n"	1831	STR(PTR_WD) " 2b,8b\n"
1832	STR(PTR) " 3b,8b\n"	1832	STR(PTR_WD) " 3b,8b\n"
1833	STR(PTR) " 4b,8b\n"	1833	STR(PTR_WD) " 4b,8b\n"
1834	STR(PTR) " 5b,8b\n"	1834	STR(PTR_WD) " 5b,8b\n"
1835	STR(PTR) " 6b,8b\n"	1835	STR(PTR_WD) " 6b,8b\n"
1836	STR(PTR) " 7b,8b\n"	1836	STR(PTR_WD) " 7b,8b\n"
1837	STR(PTR) " 0b,8b\n"	1837	STR(PTR_WD) " 0b,8b\n"
1838	" .previous\n"	1838	" .previous\n"
1839	" .set pop\n"	1839	" .set pop\n"
1840	: "+&r"(rt), "=&r"(rs),	1840	: "+&r"(rt), "=&r"(rs),
@@ -1945,14 +1945,14 @@ fpu_emul: · 104 unmodified lines
1945	" j 9b\n"	1945	" j 9b\n"
1946	" .previous\n"	1946	" .previous\n"
1947	" .section __ex_table,\"a\"\n"	1947	" .section __ex_table,\"a\"\n"
1948	STR(PTR) " 1b,8b\n"	1948	STR(PTR_WD) " 1b,8b\n"
1949	STR(PTR) " 2b,8b\n"	1949	STR(PTR_WD) " 2b,8b\n"
1950	STR(PTR) " 3b,8b\n"	1950	STR(PTR_WD) " 3b,8b\n"
1951	STR(PTR) " 4b,8b\n"	1951	STR(PTR_WD) " 4b,8b\n"
1952	STR(PTR) " 5b,8b\n"	1952	STR(PTR_WD) " 5b,8b\n"
1953	STR(PTR) " 6b,8b\n"	1953	STR(PTR_WD) " 6b,8b\n"
1954	STR(PTR) " 7b,8b\n"	1954	STR(PTR_WD) " 7b,8b\n"
1955	STR(PTR) " 0b,8b\n"	1955	STR(PTR_WD) " 0b,8b\n"
1956	" .previous\n"	1956	" .previous\n"
1957	" .set pop\n"	1957	" .set pop\n"
1958	: "+&r"(rt), "=&r"(rs),	1958	: "+&r"(rt), "=&r"(rs),
@@ -2007,7 +2007,7 @@ fpu_emul: · 48 unmodified lines
2007	"j 2b\n"	2007	"j 2b\n"
2008	".previous\n"	2008	".previous\n"
2009	".section __ex_table,\"a\"\n"	2009	".section __ex_table,\"a\"\n"
2010	STR(PTR) " 1b,3b\n"	2010	STR(PTR_WD) " 1b,3b\n"
2011	".previous\n"	2011	".previous\n"
2012	: "=&r"(res), "+&r"(err)	2012	: "=&r"(res), "+&r"(err)
2013	: "r"(vaddr), "i"(SIGSEGV)	2013	: "r"(vaddr), "i"(SIGSEGV)
@@ -2065,7 +2065,7 @@ fpu_emul: · 51 unmodified lines
2065	"j 2b\n"	2065	"j 2b\n"
2066	".previous\n"	2066	".previous\n"
2067	".section __ex_table,\"a\"\n"	2067	".section __ex_table,\"a\"\n"
2068	STR(PTR) " 1b,3b\n"	2068	STR(PTR_WD) " 1b,3b\n"
2069	".previous\n"	2069	".previous\n"
2070	: "+&r"(res), "+&r"(err)	2070	: "+&r"(res), "+&r"(err)
2071	: "r"(vaddr), "i"(SIGSEGV));	2071	: "r"(vaddr), "i"(SIGSEGV));
@@ -2126,7 +2126,7 @@ fpu_emul: · 54 unmodified lines
2126	"j 2b\n"	2126	"j 2b\n"
2127	".previous\n"	2127	".previous\n"
2128	".section __ex_table,\"a\"\n"	2128	".section __ex_table,\"a\"\n"
2129	STR(PTR) " 1b,3b\n"	2129	STR(PTR_WD) " 1b,3b\n"
2130	".previous\n"	2130	".previous\n"
2131	: "=&r"(res), "+&r"(err)	2131	: "=&r"(res), "+&r"(err)
2132	: "r"(vaddr), "i"(SIGSEGV)	2132	: "r"(vaddr), "i"(SIGSEGV)
@@ -2189,7 +2189,7 @@ fpu_emul: · 56 unmodified lines
2189	"j 2b\n"	2189	"j 2b\n"
2190	".previous\n"	2190	".previous\n"
2191	".section __ex_table,\"a\"\n"	2191	".section __ex_table,\"a\"\n"
2192	STR(PTR) " 1b,3b\n"	2192	STR(PTR_WD) " 1b,3b\n"
2193	".previous\n"	2193	".previous\n"
2194	: "+&r"(res), "+&r"(err)	2194	: "+&r"(res), "+&r"(err)
2195	: "r"(vaddr), "i"(SIGSEGV));	2195	: "r"(vaddr), "i"(SIGSEGV));

arch/mips/kernel/r2300_fpu.S+3−3

@@ -23,14 +23,14 @@ · 22 unmodified lines
23	#define EX(a,b) \	23	#define EX(a,b) \
24	9: a,##b; \	24	9: a,##b; \
25	.section __ex_table,"a"; \	25	.section __ex_table,"a"; \
26	PTR 9b,fault; \	26	PTR_WD 9b,fault; \
27	.previous	27	.previous
28		28
29	#define EX2(a,b) \	29	#define EX2(a,b) \
30	9: a,##b; \	30	9: a,##b; \
31	.section __ex_table,"a"; \	31	.section __ex_table,"a"; \
32	PTR 9b,fault; \	32	PTR_WD 9b,fault; \
33	PTR 9b+4,fault; \	33	PTR_WD 9b+4,fault; \
34	.previous	34	.previous
35		35
36	.set mips1	36	.set mips1

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

@@ -31,7 +31,7 @@ · 30 unmodified lines
31	.ex\@: \insn \reg, \src	31	.ex\@: \insn \reg, \src
32	.set pop	32	.set pop
33	.section __ex_table,"a"	33	.section __ex_table,"a"
34	PTR .ex\@, fault	34	PTR_WD .ex\@, fault
35	.previous	35	.previous
36	.endm	36	.endm
37		37

arch/mips/kernel/relocate_kernel.S+11−11

@@ -147,10 +147,10 @@ LEAF(kexec_smp_wait) · 146 unmodified lines
147		147
148	kexec_args:	148	kexec_args:
149	EXPORT(kexec_args)	149	EXPORT(kexec_args)
150	arg0: PTR 0x0	150	arg0: PTR_WD 0x0
151	arg1: PTR 0x0	151	arg1: PTR_WD 0x0
152	arg2: PTR 0x0	152	arg2: PTR_WD 0x0
153	arg3: PTR 0x0	153	arg3: PTR_WD 0x0
154	.size kexec_args,PTRSIZE*4	154	.size kexec_args,PTRSIZE*4
155		155
156	#ifdef CONFIG_SMP	156	#ifdef CONFIG_SMP
@@ -161,10 +161,10 @@ arg3: PTR 0x0 · 4 unmodified lines
161	*/	161	*/
162	secondary_kexec_args:	162	secondary_kexec_args:
163	EXPORT(secondary_kexec_args)	163	EXPORT(secondary_kexec_args)
164	s_arg0: PTR 0x0	164	s_arg0: PTR_WD 0x0
165	s_arg1: PTR 0x0	165	s_arg1: PTR_WD 0x0
166	s_arg2: PTR 0x0	166	s_arg2: PTR_WD 0x0
167	s_arg3: PTR 0x0	167	s_arg3: PTR_WD 0x0
168	.size secondary_kexec_args,PTRSIZE*4	168	.size secondary_kexec_args,PTRSIZE*4
169	kexec_flag:	169	kexec_flag:
170	LONG 0x1	170	LONG 0x1
@@ -173,17 +173,17 @@ kexec_flag: · 2 unmodified lines
173		173
174	kexec_start_address:	174	kexec_start_address:
175	EXPORT(kexec_start_address)	175	EXPORT(kexec_start_address)
176	PTR 0x0	176	PTR_WD 0x0
177	.size kexec_start_address, PTRSIZE	177	.size kexec_start_address, PTRSIZE
178		178
179	kexec_indirection_page:	179	kexec_indirection_page:
180	EXPORT(kexec_indirection_page)	180	EXPORT(kexec_indirection_page)
181	PTR 0	181	PTR_WD 0
182	.size kexec_indirection_page, PTRSIZE	182	.size kexec_indirection_page, PTRSIZE
183		183
184	relocate_new_kernel_end:	184	relocate_new_kernel_end:
185		185
186	relocate_new_kernel_size:	186	relocate_new_kernel_size:
187	EXPORT(relocate_new_kernel_size)	187	EXPORT(relocate_new_kernel_size)
188	PTR relocate_new_kernel_end - relocate_new_kernel	188	PTR_WD relocate_new_kernel_end - relocate_new_kernel
189	.size relocate_new_kernel_size, PTRSIZE	189	.size relocate_new_kernel_size, PTRSIZE

arch/mips/kernel/scall32-o32.S+5−5

@@ -72,10 +72,10 @@ loads_done: · 71 unmodified lines
72	.set pop	72	.set pop
73		73
74	.section __ex_table,"a"	74	.section __ex_table,"a"
75	PTR load_a4, bad_stack_a4	75	PTR_WD load_a4, bad_stack_a4
76	PTR load_a5, bad_stack_a5	76	PTR_WD load_a5, bad_stack_a5
77	PTR load_a6, bad_stack_a6	77	PTR_WD load_a6, bad_stack_a6
78	PTR load_a7, bad_stack_a7	78	PTR_WD load_a7, bad_stack_a7
79	.previous	79	.previous
80		80
81	lw t0, TI_FLAGS($28) # syscall tracing enabled?	81	lw t0, TI_FLAGS($28) # syscall tracing enabled?
@@ -216,7 +216,7 @@ einval: li v0, -ENOSYS · 134 unmodified lines
216	#endif /* CONFIG_MIPS_MT_FPAFF */	216	#endif /* CONFIG_MIPS_MT_FPAFF */
217		217
218	#define __SYSCALL_WITH_COMPAT(nr, native, compat) __SYSCALL(nr, native)	218	#define __SYSCALL_WITH_COMPAT(nr, native, compat) __SYSCALL(nr, native)
219	#define __SYSCALL(nr, entry) PTR entry	219	#define __SYSCALL(nr, entry) PTR_WD entry
220	.align 2	220	.align 2
221	.type sys_call_table, @object	221	.type sys_call_table, @object
222	EXPORT(sys_call_table)	222	EXPORT(sys_call_table)

arch/mips/kernel/scall64-n32.S+1−1

@@ -101,7 +101,7 @@ not_n32_scall: · 100 unmodified lines
101		101
102	END(handle_sysn32)	102	END(handle_sysn32)
103		103
104	#define __SYSCALL(nr, entry) PTR entry	104	#define __SYSCALL(nr, entry) PTR_WD entry
105	.type sysn32_call_table, @object	105	.type sysn32_call_table, @object
106	EXPORT(sysn32_call_table)	106	EXPORT(sysn32_call_table)
107	#include <asm/syscall_table_n32.h>	107	#include <asm/syscall_table_n32.h>

arch/mips/kernel/scall64-n64.S+1−1

@@ -109,7 +109,7 @@ illegal_syscall: · 108 unmodified lines
109	j n64_syscall_exit	109	j n64_syscall_exit
110	END(handle_sys64)	110	END(handle_sys64)
111		111
112	#define __SYSCALL(nr, entry) PTR entry	112	#define __SYSCALL(nr, entry) PTR_WD entry
113	.align 3	113	.align 3
114	.type sys_call_table, @object	114	.type sys_call_table, @object
115	EXPORT(sys_call_table)	115	EXPORT(sys_call_table)

arch/mips/kernel/scall64-o32.S+5−5

@@ -73,10 +73,10 @@ load_a7: lw a7, 28(t0) # argument #8 from usp · 72 unmodified lines
73	loads_done:	73	loads_done:
74		74
75	.section __ex_table,"a"	75	.section __ex_table,"a"
76	PTR load_a4, bad_stack_a4	76	PTR_WD load_a4, bad_stack_a4
77	PTR load_a5, bad_stack_a5	77	PTR_WD load_a5, bad_stack_a5
78	PTR load_a6, bad_stack_a6	78	PTR_WD load_a6, bad_stack_a6
79	PTR load_a7, bad_stack_a7	79	PTR_WD load_a7, bad_stack_a7
80	.previous	80	.previous
81		81
82	li t1, _TIF_WORK_SYSCALL_ENTRY	82	li t1, _TIF_WORK_SYSCALL_ENTRY
@@ -214,7 +214,7 @@ einval: li v0, -ENOSYS · 131 unmodified lines
214	END(sys32_syscall)	214	END(sys32_syscall)
215		215
216	#define __SYSCALL_WITH_COMPAT(nr, native, compat) __SYSCALL(nr, compat)	216	#define __SYSCALL_WITH_COMPAT(nr, native, compat) __SYSCALL(nr, compat)
217	#define __SYSCALL(nr, entry) PTR entry	217	#define __SYSCALL(nr, entry) PTR_WD entry
218	.align 3	218	.align 3
219	.type sys32_call_table,@object	219	.type sys32_call_table,@object
220	EXPORT(sys32_call_table)	220	EXPORT(sys32_call_table)

arch/mips/kernel/syscall.c+4−4

@@ -122,8 +122,8 @@ static inline int mips_atomic_set(unsigned long addr, unsigned long new) · 121 unmodified lines
122	" j 3b \n"	122	" j 3b \n"
123	" .previous \n"	123	" .previous \n"
124	" .section __ex_table,\"a\" \n"	124	" .section __ex_table,\"a\" \n"
125	" "STR(PTR)" 1b, 4b \n"	125	" "STR(PTR_WD)" 1b, 4b \n"
126	" "STR(PTR)" 2b, 4b \n"	126	" "STR(PTR_WD)" 2b, 4b \n"
127	" .previous \n"	127	" .previous \n"
128	" .set pop \n"	128	" .set pop \n"
129	: [old] "=&r" (old),	129	: [old] "=&r" (old),
@@ -152,8 +152,8 @@ static inline int mips_atomic_set(unsigned long addr, unsigned long new) · 22 unmodified lines
152	" j 3b \n"	152	" j 3b \n"
153	" .previous \n"	153	" .previous \n"
154	" .section __ex_table,\"a\" \n"	154	" .section __ex_table,\"a\" \n"
155	" "STR(PTR)" 1b, 5b \n"	155	" "STR(PTR_WD)" 1b, 5b \n"
156	" "STR(PTR)" 2b, 5b \n"	156	" "STR(PTR_WD)" 2b, 5b \n"
157	" .previous \n"	157	" .previous \n"
158	" .set pop \n"	158	" .set pop \n"
159	: [old] "=&r" (old),	159	: [old] "=&r" (old),

arch/mips/kvm/vz.c+9−3

 /**
  * _kvm_vz_save_htimer() - Switch to software emulation of guest timer.
  * @vcpu:	Virtual CPU.
- * @compare:	Pointer to write compare value to.
+ * @out_compare: Pointer to write compare value to.
- * @cause:	Pointer to write cause value to.
+ * @out_cause:	Pointer to write cause value to.
  *
  * Save VZ guest timer state and switch to software emulation of guest CP0
  * timer. The hard timer must already be in use, so preemption should be
 }
 /**
- * kvm_trap_vz_handle_cop_unusuable() - Guest used unusable coprocessor.
+ * kvm_trap_vz_handle_cop_unusable() - Guest used unusable coprocessor.
  * @vcpu:	Virtual CPU context.
  *
  * Handle when the guest attempts to use a coprocessor which hasn't been allowed
  * by the root context.
+ *
+ * Return: value indicating whether to resume the host or the guest
+ * 	   (RESUME_HOST or RESUME_GUEST)
  */
 static int kvm_trap_vz_handle_cop_unusable(struct kvm_vcpu *vcpu)
 {
  *
  * Handle when the guest attempts to use MSA when it is disabled in the root
  * context.
+ *
+ * Return: value indicating whether to resume the host or the guest
+ * 	   (RESUME_HOST or RESUME_GUEST)
  */
 static int kvm_trap_vz_handle_msa_disabled(struct kvm_vcpu *vcpu)
 {

arch/mips/lib/csum_partial.S+2−2

@@ -347,7 +347,7 @@ EXPORT_SYMBOL(csum_partial) · 346 unmodified lines
347	.if \mode == LEGACY_MODE; \	347	.if \mode == LEGACY_MODE; \
348	9: insn reg, addr; \	348	9: insn reg, addr; \
349	.section __ex_table,"a"; \	349	.section __ex_table,"a"; \
350	PTR 9b, .L_exc; \	350	PTR_WD 9b, .L_exc; \
351	.previous; \	351	.previous; \
352	/* This is enabled in EVA mode */ \	352	/* This is enabled in EVA mode */ \
353	.else; \	353	.else; \
@@ -356,7 +356,7 @@ EXPORT_SYMBOL(csum_partial) · 2 unmodified lines
356	((\to == USEROP) && (type == ST_INSN)); \	356	((\to == USEROP) && (type == ST_INSN)); \
357	9: __BUILD_EVA_INSN(insn##e, reg, addr); \	357	9: __BUILD_EVA_INSN(insn##e, reg, addr); \
358	.section __ex_table,"a"; \	358	.section __ex_table,"a"; \
359	PTR 9b, .L_exc; \	359	PTR_WD 9b, .L_exc; \
360	.previous; \	360	.previous; \
361	.else; \	361	.else; \
362	/* EVA without exception */ \	362	/* EVA without exception */ \

arch/mips/lib/memcpy.S+2−2

@@ -116,7 +116,7 @@ · 115 unmodified lines
116	.if \mode == LEGACY_MODE; \	116	.if \mode == LEGACY_MODE; \
117	9: insn reg, addr; \	117	9: insn reg, addr; \
118	.section __ex_table,"a"; \	118	.section __ex_table,"a"; \
119	PTR 9b, handler; \	119	PTR_WD 9b, handler; \
120	.previous; \	120	.previous; \
121	/* This is assembled in EVA mode */ \	121	/* This is assembled in EVA mode */ \
122	.else; \	122	.else; \
@@ -125,7 +125,7 @@ · 2 unmodified lines
125	((\to == USEROP) && (type == ST_INSN)); \	125	((\to == USEROP) && (type == ST_INSN)); \
126	9: __BUILD_EVA_INSN(insn##e, reg, addr); \	126	9: __BUILD_EVA_INSN(insn##e, reg, addr); \
127	.section __ex_table,"a"; \	127	.section __ex_table,"a"; \
128	PTR 9b, handler; \	128	PTR_WD 9b, handler; \
129	.previous; \	129	.previous; \
130	.else; \	130	.else; \
131	/* \	131	/* \

arch/mips/lib/memset.S+1−1

@@ -52,7 +52,7 @@ · 51 unmodified lines
52	9: ___BUILD_EVA_INSN(insn, reg, addr); \	52	9: ___BUILD_EVA_INSN(insn, reg, addr); \
53	.endif; \	53	.endif; \
54	.section __ex_table,"a"; \	54	.section __ex_table,"a"; \
55	PTR 9b, handler; \	55	PTR_WD 9b, handler; \
56	.previous	56	.previous
57		57
58	.macro f_fill64 dst, offset, val, fixup, mode	58	.macro f_fill64 dst, offset, val, fixup, mode

arch/mips/lib/strncpy_user.S+2−2

@@ -15,7 +15,7 @@ · 14 unmodified lines
15	#define EX(insn,reg,addr,handler) \	15	#define EX(insn,reg,addr,handler) \
16	9: insn reg, addr; \	16	9: insn reg, addr; \
17	.section __ex_table,"a"; \	17	.section __ex_table,"a"; \
18	PTR 9b, handler; \	18	PTR_WD 9b, handler; \
19	.previous	19	.previous
20		20
21	/*	21	/*
@@ -59,7 +59,7 @@ LEAF(__strncpy_from_user_asm) · 37 unmodified lines
59	jr ra	59	jr ra
60		60
61	.section __ex_table,"a"	61	.section __ex_table,"a"
62	PTR 1b, .Lfault	62	PTR_WD 1b, .Lfault
63	.previous	63	.previous
64		64
65	EXPORT_SYMBOL(__strncpy_from_user_asm)	65	EXPORT_SYMBOL(__strncpy_from_user_asm)

arch/mips/lib/strnlen_user.S+1−1

@@ -14,7 +14,7 @@ · 13 unmodified lines
14	#define EX(insn,reg,addr,handler) \	14	#define EX(insn,reg,addr,handler) \
15	9: insn reg, addr; \	15	9: insn reg, addr; \
16	.section __ex_table,"a"; \	16	.section __ex_table,"a"; \
17	PTR 9b, handler; \	17	PTR_WD 9b, handler; \
18	.previous	18	.previous
19		19
20	/*	20	/*

arch/mips/loongson64/vbios_quirk.c+4−5

 #include <linux/pci.h>
 #include <loongson.h>
-static void pci_fixup_radeon(struct pci_dev *pdev)
+static void pci_fixup_video(struct pci_dev *pdev)
 {
 	struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];
 	res->flags = IORESOURCE_MEM | IORESOURCE_ROM_SHADOW |
 		     IORESOURCE_PCI_FIXED;
-	dev_info(&pdev->dev, "BAR %d: assigned %pR for Radeon ROM\n",
+	dev_info(&pdev->dev, "Video device with shadowed ROM at %pR\n", res);
-		 PCI_ROM_RESOURCE, res);
 }
-DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_ATI, 0x9615,
+DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_ATI, 0x9615,
-				PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_radeon);
+			       PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video);

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

@@ -178,6 +178,7 @@ static inline bool pte_user(pte_t pte) · 177 unmodified lines
178	#ifndef __ASSEMBLY__	178	#ifndef __ASSEMBLY__
179		179
180	int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot);	180	int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot);
		181	void unmap_kernel_page(unsigned long va);
181		182
182	#endif /* !__ASSEMBLY__ */	183	#endif /* !__ASSEMBLY__ */
183		184

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

@@ -1082,6 +1082,8 @@ static inline int map_kernel_page(unsigned long ea, unsigned long pa, pgprot_t p · 1081 unmodified lines
1082	return hash__map_kernel_page(ea, pa, prot);	1082	return hash__map_kernel_page(ea, pa, prot);
1083	}	1083	}
1084		1084
		1085	void unmap_kernel_page(unsigned long va);
		1086
1085	static inline int __meminit vmemmap_create_mapping(unsigned long start,	1087	static inline int __meminit vmemmap_create_mapping(unsigned long start,
1086	unsigned long page_size,	1088	unsigned long page_size,
1087	unsigned long phys)	1089	unsigned long phys)

arch/powerpc/include/asm/fixmap.h+4−2

@@ -111,8 +111,10 @@ static inline void __set_fixmap(enum fixed_addresses idx, · 110 unmodified lines
111	BUILD_BUG_ON(idx >= __end_of_fixed_addresses);	111	BUILD_BUG_ON(idx >= __end_of_fixed_addresses);
112	else if (WARN_ON(idx >= __end_of_fixed_addresses))	112	else if (WARN_ON(idx >= __end_of_fixed_addresses))
113	return;	113	return;
114		114	if (pgprot_val(flags))
115	map_kernel_page(__fix_to_virt(idx), phys, flags);	115	map_kernel_page(__fix_to_virt(idx), phys, flags);
		116	else
		117	unmap_kernel_page(__fix_to_virt(idx));
116	}	118	}
117		119
118	#define __early_set_fixmap __set_fixmap	120	#define __early_set_fixmap __set_fixmap

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

@@ -39,7 +39,6 @@ struct kvm_nested_guest { · 38 unmodified lines
39	pgd_t shadow_pgtable; / our page table for this guest */	39	pgd_t shadow_pgtable; / our page table for this guest */
40	u64 l1_gr_to_hr; /* L1's addr of part'n-scoped table */	40	u64 l1_gr_to_hr; /* L1's addr of part'n-scoped table */
41	u64 process_table; /* process table entry for this guest */	41	u64 process_table; /* process table entry for this guest */
42	u64 hfscr; /* HFSCR that the L1 requested for this nested guest */
43	long refcnt; /* number of pointers to this struct */	42	long refcnt; /* number of pointers to this struct */
44	struct mutex tlb_lock; /* serialize page faults and tlbies */	43	struct mutex tlb_lock; /* serialize page faults and tlbies */
45	struct kvm_nested_guest *next;	44	struct kvm_nested_guest *next;

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

@@ -818,6 +818,7 @@ struct kvm_vcpu_arch { · 817 unmodified lines
818		818
819	/* For support of nested guests */	819	/* For support of nested guests */
820	struct kvm_nested_guest *nested;	820	struct kvm_nested_guest *nested;
		821	u64 nested_hfscr; /* HFSCR that the L1 requested for the nested guest */
821	u32 nested_vcpu_id;	822	u32 nested_vcpu_id;
822	gpa_t nested_io_gpr;	823	gpa_t nested_io_gpr;
823	#endif	824	#endif

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

@@ -64,6 +64,7 @@ extern int icache_44x_need_flush; · 63 unmodified lines
64	#ifndef __ASSEMBLY__	64	#ifndef __ASSEMBLY__
65		65
66	int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot);	66	int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot);
		67	void unmap_kernel_page(unsigned long va);
67		68
68	#endif /* !__ASSEMBLY__ */	69	#endif /* !__ASSEMBLY__ */
69		70

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

@@ -308,6 +308,7 @@ static inline void __ptep_set_access_flags(struct vm_area_struct *vma, · 307 unmodified lines
308	#define __swp_entry_to_pte(x) __pte((x).val)	308	#define __swp_entry_to_pte(x) __pte((x).val)
309		309
310	int map_kernel_page(unsigned long ea, unsigned long pa, pgprot_t prot);	310	int map_kernel_page(unsigned long ea, unsigned long pa, pgprot_t prot);
		311	void unmap_kernel_page(unsigned long va);
311	extern int __meminit vmemmap_create_mapping(unsigned long start,	312	extern int __meminit vmemmap_create_mapping(unsigned long start,
312	unsigned long page_size,	313	unsigned long page_size,
313	unsigned long phys);	314	unsigned long phys);

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

 		__this_cpu_inc(irq_stat.timer_irqs_event);
 	} else {
 		now = *next_tb - now;
-		if (now <= decrementer_max)
+		if (now > decrementer_max)
-			set_dec_or_work(now);
+			now = decrementer_max;
+		set_dec_or_work(now);
 		__this_cpu_inc(irq_stat.timer_irqs_others);
 	}

arch/powerpc/kvm/book3s_hv.c+1−2

 static int kvmppc_handle_nested_exit(struct kvm_vcpu *vcpu)
 {
-	struct kvm_nested_guest *nested = vcpu->arch.nested;
 	int r;
 	int srcu_idx;
 		 * it into a HEAI.
 		 */
 		if (!(vcpu->arch.hfscr_permitted & (1UL << cause)) ||
-					(nested->hfscr & (1UL << cause))) {
+				(vcpu->arch.nested_hfscr & (1UL << cause))) {
 			vcpu->arch.trap = BOOK3S_INTERRUPT_H_EMUL_ASSIST;
 			/*

arch/powerpc/kvm/book3s_hv_nested.c+1−1

@@ -363,7 +363,7 @@ long kvmhv_enter_nested_guest(struct kvm_vcpu *vcpu) · 362 unmodified lines
363	/* set L1 state to L2 state */	363	/* set L1 state to L2 state */
364	vcpu->arch.nested = l2;	364	vcpu->arch.nested = l2;
365	vcpu->arch.nested_vcpu_id = l2_hv.vcpu_token;	365	vcpu->arch.nested_vcpu_id = l2_hv.vcpu_token;
366	l2->hfscr = l2_hv.hfscr;	366	vcpu->arch.nested_hfscr = l2_hv.hfscr;
367	vcpu->arch.regs = l2_regs;	367	vcpu->arch.regs = l2_regs;
368		368
369	/* Guest must always run with ME enabled, HV disabled. */	369	/* Guest must always run with ME enabled, HV disabled. */

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

@@ -206,6 +206,15 @@ void set_pte_at(struct mm_struct mm, unsigned long addr, pte_t ptep, · 205 unmodified lines
206	__set_pte_at(mm, addr, ptep, pte, 0);	206	__set_pte_at(mm, addr, ptep, pte, 0);
207	}	207	}
208		208
		209	void unmap_kernel_page(unsigned long va)
		210	{
		211	pmd_t *pmdp = pmd_off_k(va);
		212	pte_t *ptep = pte_offset_kernel(pmdp, va);
		213
		214	pte_clear(&init_mm, va, ptep);
		215	flush_tlb_kernel_range(va, va + PAGE_SIZE);
		216	}
		217
209	/*	218	/*
210	* This is called when relaxing access to a PTE. It's also called in the page	219	* This is called when relaxing access to a PTE. It's also called in the page
211	* fault path when we don't hit any of the major fault cases, ie, a minor	220	* fault path when we don't hit any of the major fault cases, ie, a minor

arch/powerpc/perf/core-book3s.c+14−3

@@ -1355,9 +1355,20 @@ static void power_pmu_disable(struct pmu *pmu) · 1354 unmodified lines
1355	* Otherwise provide a warning if there is PMI pending, but	1355	* Otherwise provide a warning if there is PMI pending, but
1356	* no counter is found overflown.	1356	* no counter is found overflown.
1357	*/	1357	*/
1358	if (any_pmc_overflown(cpuhw))	1358	if (any_pmc_overflown(cpuhw)) {
1359	clear_pmi_irq_pending();	1359	/*
1360	else	1360	* Since power_pmu_disable runs under local_irq_save, it
		1361	* could happen that code hits a PMC overflow without PMI
		1362	* pending in paca. Hence only clear PMI pending if it was
		1363	* set.
		1364	*
		1365	* If a PMI is pending, then MSR[EE] must be disabled (because
		1366	* the masked PMI handler disabling EE). So it is safe to
		1367	* call clear_pmi_irq_pending().
		1368	*/
		1369	if (pmi_irq_pending())
		1370	clear_pmi_irq_pending();
		1371	} else
1361	WARN_ON(pmi_irq_pending());	1372	WARN_ON(pmi_irq_pending());
1362		1373
1363	val = mmcra = cpuhw->mmcr.mmcra;	1374	val = mmcra = cpuhw->mmcr.mmcra;

arch/s390/Kconfig+15−0

@@ -945,6 +945,9 @@ config S390_GUEST · 944 unmodified lines
945		945
946	endmenu	946	endmenu
947		947
		948	config S390_MODULES_SANITY_TEST_HELPERS
		949	def_bool n
		950
948	menu "Selftests"	951	menu "Selftests"
949		952
950	config S390_UNWIND_SELFTEST	953	config S390_UNWIND_SELFTEST
@@ -971,4 +974,16 @@ config S390_KPROBES_SANITY_TEST · 20 unmodified lines
971		974
972	Say N if you are unsure.	975	Say N if you are unsure.
973		976
		977	config S390_MODULES_SANITY_TEST
		978	def_tristate n
		979	depends on KUNIT
		980	default KUNIT_ALL_TESTS
		981	prompt "Enable s390 specific modules tests"
		982	select S390_MODULES_SANITY_TEST_HELPERS
		983	help
		984	This option enables an s390 specific modules test. This option is
		985	not useful for distributions or general kernels, but only for
		986	kernel developers working on architecture code.
		987
		988	Say N if you are unsure.
974	endmenu	989	endmenu

arch/s390/configs/debug_defconfig+10−10

 CONFIG_KVM=m
 CONFIG_S390_UNWIND_SELFTEST=m
 CONFIG_S390_KPROBES_SANITY_TEST=m
+CONFIG_S390_MODULES_SANITY_TEST=m
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 CONFIG_STATIC_KEYS_SELFTEST=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_KSM=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_FRONTSWAP=y
 CONFIG_CMA_DEBUG=y
 CONFIG_CMA_DEBUGFS=y
 CONFIG_CMA_SYSFS=y
 CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_PERCPU_STATS=y
 CONFIG_GUP_TEST=y
+CONFIG_ANON_VMA_NAME=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX_DIAG=m
 CONFIG_XFRM_USER=m
 CONFIG_NET_KEY=m
-CONFIG_NET_SWITCHDEV=y
 CONFIG_SMC=m
 CONFIG_SMC_DIAG=m
 CONFIG_INET=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_INET=y
 CONFIG_NFT_CT=m
-CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
 CONFIG_NFT_NAT=m
 CONFIG_VSOCKETS=m
 CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_NETLINK_DIAG=m
+CONFIG_NET_SWITCHDEV=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_NET_PKTGEN=m
 CONFIG_PCI=y
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_S390=y
 CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_SAFE=y
 CONFIG_CONNECTOR=y
 CONFIG_ZRAM=y
 CONFIG_BLK_DEV_LOOP=m
 # CONFIG_NET_VENDOR_DEC is not set
 # CONFIG_NET_VENDOR_DLINK is not set
 # CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_ENGLEDER is not set
 # CONFIG_NET_VENDOR_EZCHIP is not set
 # CONFIG_NET_VENDOR_GOOGLE is not set
 # CONFIG_NET_VENDOR_HUAWEI is not set
 CONFIG_MLX4_EN=m
 CONFIG_MLX5_CORE=m
 CONFIG_MLX5_CORE_EN=y
-CONFIG_MLX5_ESWITCH=y
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
 # CONFIG_NET_VENDOR_TEHUTI is not set
 # CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VERTEXCOM is not set
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_NET_VENDOR_XILINX is not set
 CONFIG_VIRTIO_INPUT=y
 CONFIG_VHOST_NET=m
 CONFIG_VHOST_VSOCK=m
+# CONFIG_SURFACE_PLATFORMS is not set
 CONFIG_S390_CCW_IOMMU=y
 CONFIG_S390_AP_IOMMU=y
 CONFIG_EXT4_FS=y
 CONFIG_CRYPTO_USER_API_RNG=m
 CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_STATS=y
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
 CONFIG_ZCRYPT=m
 CONFIG_PKEY=m
 CONFIG_CRYPTO_PAES_S390=m
 CONFIG_CRYPTO_CRC32_S390=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CORDIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
 CONFIG_CRC32_SELFTEST=y
 CONFIG_CRC4=m
 CONFIG_CRC7=m
 CONFIG_SLUB_STATS=y
 CONFIG_DEBUG_STACK_USAGE=y
 CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_VM_VMACACHE=y
 CONFIG_DEBUG_VM_PGFLAGS=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_WQ_WATCHDOG=y
 CONFIG_TEST_LOCKUP=m
-CONFIG_DEBUG_TIMEKEEPING=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_LOCK_STAT=y
-CONFIG_DEBUG_LOCKDEP=y
 CONFIG_DEBUG_ATOMIC_SLEEP=y
 CONFIG_DEBUG_LOCKING_API_SELFTESTS=y
+CONFIG_DEBUG_IRQFLAGS=y
 CONFIG_DEBUG_SG=y
 CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_BUG_ON_DATA_CORRUPTION=y

arch/s390/configs/defconfig+9−7

 CONFIG_KVM=m
 CONFIG_S390_UNWIND_SELFTEST=m
 CONFIG_S390_KPROBES_SANITY_TEST=m
+CONFIG_S390_MODULES_SANITY_TEST=m
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 # CONFIG_GCC_PLUGINS is not set
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_KSM=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_FRONTSWAP=y
 CONFIG_CMA_SYSFS=y
 CONFIG_CMA_AREAS=7
 CONFIG_MEM_SOFT_DIRTY=y
 CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
 CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_PERCPU_STATS=y
+CONFIG_ANON_VMA_NAME=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX_DIAG=m
 CONFIG_XFRM_USER=m
 CONFIG_NET_KEY=m
-CONFIG_NET_SWITCHDEV=y
 CONFIG_SMC=m
 CONFIG_SMC_DIAG=m
 CONFIG_INET=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_INET=y
 CONFIG_NFT_CT=m
-CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
 CONFIG_NFT_NAT=m
 CONFIG_VSOCKETS=m
 CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_NETLINK_DIAG=m
+CONFIG_NET_SWITCHDEV=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_NET_PKTGEN=m
 CONFIG_PCI=y
 CONFIG_HOTPLUG_PCI_S390=y
 CONFIG_UEVENT_HELPER=y
 CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_SAFE=y
 CONFIG_CONNECTOR=y
 CONFIG_ZRAM=y
 CONFIG_BLK_DEV_LOOP=m
 # CONFIG_NET_VENDOR_DEC is not set
 # CONFIG_NET_VENDOR_DLINK is not set
 # CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_ENGLEDER is not set
 # CONFIG_NET_VENDOR_EZCHIP is not set
 # CONFIG_NET_VENDOR_GOOGLE is not set
 # CONFIG_NET_VENDOR_HUAWEI is not set
 CONFIG_MLX4_EN=m
 CONFIG_MLX5_CORE=m
 CONFIG_MLX5_CORE_EN=y
-CONFIG_MLX5_ESWITCH=y
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
 # CONFIG_NET_VENDOR_TEHUTI is not set
 # CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VERTEXCOM is not set
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_NET_VENDOR_XILINX is not set
 CONFIG_VIRTIO_INPUT=y
 CONFIG_VHOST_NET=m
 CONFIG_VHOST_VSOCK=m
+# CONFIG_SURFACE_PLATFORMS is not set
 CONFIG_S390_CCW_IOMMU=y
 CONFIG_S390_AP_IOMMU=y
 CONFIG_EXT4_FS=y
 CONFIG_CRYPTO_USER_API_RNG=m
 CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_STATS=y
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
 CONFIG_ZCRYPT=m
 CONFIG_PKEY=m
 CONFIG_CRYPTO_PAES_S390=m
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CORDIC=m
 CONFIG_PRIME_NUMBERS=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
 CONFIG_CRC4=m
 CONFIG_CRC7=m
 CONFIG_CRC8=m

arch/s390/configs/zfcpdump_defconfig+3−0

 # CONFIG_SWAP is not set
 CONFIG_NO_HZ_IDLE=y
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BPF_SYSCALL=y
 # CONFIG_CPU_ISOLATION is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_TIME_NS is not set
 # CONFIG_PCPU_DEV_REFCNT is not set
 # CONFIG_ETHTOOL_NETLINK is not set
 CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_SAFE=y
 CONFIG_BLK_DEV_RAM=y
 # CONFIG_DCSSBLK is not set
 # CONFIG_DASD is not set
 # CONFIG_HID is not set
 # CONFIG_VIRTIO_MENU is not set
 # CONFIG_VHOST_MENU is not set
+# CONFIG_SURFACE_PLATFORMS is not set
 # CONFIG_IOMMU_SUPPORT is not set
 # CONFIG_DNOTIFY is not set
 # CONFIG_INOTIFY_USER is not set

arch/s390/hypfs/hypfs_vm.c+4−2

 static char local_guest[] = "        ";
 static char all_guests[] = "*       ";
+static char *all_groups = all_guests;
 static char *guest_query;
 struct diag2fc_data {
 	memcpy(parm_list.userid, query, NAME_LEN);
 	ASCEBC(parm_list.userid, NAME_LEN);
-	parm_list.addr = (unsigned long) addr ;
+	memcpy(parm_list.aci_grp, all_groups, NAME_LEN);
+	ASCEBC(parm_list.aci_grp, NAME_LEN);
+	parm_list.addr = (unsigned long)addr;
 	parm_list.size = size;
 	parm_list.fmt = 0x02;
-	memset(parm_list.aci_grp, 0x40, NAME_LEN);
 	rc = -1;
 	diag_stat_inc(DIAG_STAT_X2FC);

arch/s390/include/asm/uaccess.h+2−2

 int __put_user_bad(void) __attribute__((noreturn));
 int __get_user_bad(void) __attribute__((noreturn));
-#ifdef CONFIG_HAVE_MARCH_Z10_FEATURES
 union oac {
 	unsigned int val;
 	struct {
 	};
 };
+#ifdef CONFIG_HAVE_MARCH_Z10_FEATURES
 #define __put_get_user_asm(to, from, size, oac_spec)			\
 ({									\
 	int __rc;							\

arch/s390/kernel/module.c+18−19

@@ -33,7 +33,7 @@ · 32 unmodified lines
33	#define DEBUGP(fmt , ...)	33	#define DEBUGP(fmt , ...)
34	#endif	34	#endif
35		35
36	#define PLT_ENTRY_SIZE 20	36	#define PLT_ENTRY_SIZE 22
37		37
38	void *module_alloc(unsigned long size)	38	void *module_alloc(unsigned long size)
39	{	39	{
@@ -341,27 +341,26 @@ static int apply_rela(Elf_Rela rela, Elf_Addr base, Elf_Sym symtab, · 301 unmodified lines
341	case R_390_PLTOFF32: /* 32 bit offset from GOT to PLT. */	341	case R_390_PLTOFF32: /* 32 bit offset from GOT to PLT. */
342	case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */	342	case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
343	if (info->plt_initialized == 0) {	343	if (info->plt_initialized == 0) {
344	unsigned int insn[5];	344	unsigned char insn[PLT_ENTRY_SIZE];
345	unsigned int *ip = me->core_layout.base +	345	char *plt_base;
346	me->arch.plt_offset +	346	char *ip;
347	info->plt_offset;	347
348		348	plt_base = me->core_layout.base + me->arch.plt_offset;
349	insn[0] = 0x0d10e310; /* basr 1,0 */	349	ip = plt_base + info->plt_offset;
350	insn[1] = 0x100a0004; /* lg 1,10(1) */	350	(int )insn = 0x0d10e310; /* basr 1,0 */
		351	(int )&insn[4] = 0x100c0004; /* lg 1,12(1) */
351	if (IS_ENABLED(CONFIG_EXPOLINE) && !nospec_disable) {	352	if (IS_ENABLED(CONFIG_EXPOLINE) && !nospec_disable) {
352	unsigned int *ij;	353	char *jump_r1;
353	ij = me->core_layout.base +	354
354	me->arch.plt_offset +	355	jump_r1 = plt_base + me->arch.plt_size -
355	me->arch.plt_size - PLT_ENTRY_SIZE;	356	PLT_ENTRY_SIZE;
356	insn[2] = 0xa7f40000 + /* j __jump_r1 */	357	/* brcl 0xf,__jump_r1 */
357	(unsigned int)(u16)	358	(short )&insn[8] = 0xc0f4;
358	(((unsigned long) ij - 8 -	359	(int )&insn[10] = (jump_r1 - (ip + 8)) / 2;
359	(unsigned long) ip) / 2);
360	} else {	360	} else {
361	insn[2] = 0x07f10000; /* br %r1 */	361	(int )&insn[8] = 0x07f10000; /* br %r1 */
362	}	362	}
363	insn[3] = (unsigned int) (val >> 32);	363	(long )&insn[14] = val;
364	insn[4] = (unsigned int) val;
365		364
366	write(ip, insn, sizeof(insn));	365	write(ip, insn, sizeof(insn));
367	info->plt_initialized = 1;	366	info->plt_initialized = 1;

arch/s390/kernel/nmi.c+22−5

 		/* Validate vector registers */
 		union ctlreg0 cr0;
-		if (!mci.vr) {
+		/*
+		 * The vector validity must only be checked if not running a
+		 * KVM guest. For KVM guests the machine check is forwarded by
+		 * KVM and it is the responsibility of the guest to take
+		 * appropriate actions. The host vector or FPU values have been
+		 * saved by KVM and will be restored by KVM.
+		 */
+		if (!mci.vr && !test_cpu_flag(CIF_MCCK_GUEST)) {
 			/*
 			 * Vector registers can't be restored. If the kernel
 			 * currently uses vector registers the system is
 	if (cr2.gse) {
 		if (!mci.gs) {
 			/*
-			 * Guarded storage register can't be restored and
+			 * 2 cases:
-			 * the current processes uses guarded storage.
+			 * - machine check in kernel or userspace
-			 * It has to be terminated.
+			 * - machine check while running SIE (KVM guest)
+			 * For kernel or userspace the userspace values of
+			 * guarded storage control can not be recreated, the
+			 * process must be terminated.
+			 * For SIE the guest values of guarded storage can not
+			 * be recreated. This is either due to a bug or due to
+			 * GS being disabled in the guest. The guest will be
+			 * notified by KVM code and the guests machine check
+			 * handling must take care of this.  The host values
+			 * are saved by KVM and are not affected.
 			 */
-			kill_task = 1;
+			if (!test_cpu_flag(CIF_MCCK_GUEST))
+				kill_task = 1;
 		} else {
 			load_gs_cb((struct gs_cb *)mcesa->guarded_storage_save_area);
 		}

arch/s390/lib/Makefile+3−0

@@ -17,4 +17,7 @@ KASAN_SANITIZE_uaccess.o := n · 16 unmodified lines
17	obj-$(CONFIG_S390_UNWIND_SELFTEST) += test_unwind.o	17	obj-$(CONFIG_S390_UNWIND_SELFTEST) += test_unwind.o
18	CFLAGS_test_unwind.o += -fno-optimize-sibling-calls	18	CFLAGS_test_unwind.o += -fno-optimize-sibling-calls
19		19
		20	obj-$(CONFIG_S390_MODULES_SANITY_TEST) += test_modules.o
		21	obj-$(CONFIG_S390_MODULES_SANITY_TEST_HELPERS) += test_modules_helpers.o
		22
20	lib-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o	23	lib-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o

arch/s390/lib/test_modules.c+35−0

@@ -0,0 +1,35 @@
	1	// SPDX-License-Identifier: GPL-2.0+
	2
	3	#include <kunit/test.h>
	4	#include <linux/module.h>
	5
	6	#include "test_modules.h"
	7
	8	#define DECLARE_RETURN(i) int test_modules_return_ ## i(void)
	9	REPEAT_10000(DECLARE_RETURN);
	10
	11	/*
	12	* Test that modules with many relocations are loaded properly.
	13	*/
	14	static void test_modules_many_vmlinux_relocs(struct kunit *test)
	15	{
	16	int result = 0;
	17
	18	#define CALL_RETURN(i) result += test_modules_return_ ## i()
	19	REPEAT_10000(CALL_RETURN);
	20	KUNIT_ASSERT_EQ(test, result, 49995000);
	21	}
	22
	23	static struct kunit_case modules_testcases[] = {
	24	KUNIT_CASE(test_modules_many_vmlinux_relocs),
	25	{}
	26	};
	27
	28	static struct kunit_suite modules_test_suite = {
	29	.name = "modules_test_s390",
	30	.test_cases = modules_testcases,
	31	};
	32
	33	kunit_test_suites(&modules_test_suite);
	34
	35	MODULE_LICENSE("GPL");

arch/s390/lib/test_modules.h+50−0

@@ -0,0 +1,50 @@
	1	/* SPDX-License-Identifier: GPL-2.0+ */
	2	#ifndef TEST_MODULES_H
	3	#define TEST_MODULES_H
	4
	5	#define __REPEAT_10000_3(f, x) \
	6	f(x ## 0); \
	7	f(x ## 1); \
	8	f(x ## 2); \
	9	f(x ## 3); \
	10	f(x ## 4); \
	11	f(x ## 5); \
	12	f(x ## 6); \
	13	f(x ## 7); \
	14	f(x ## 8); \
	15	f(x ## 9)
	16	#define __REPEAT_10000_2(f, x) \
	17	__REPEAT_10000_3(f, x ## 0); \
	18	__REPEAT_10000_3(f, x ## 1); \
	19	__REPEAT_10000_3(f, x ## 2); \
	20	__REPEAT_10000_3(f, x ## 3); \
	21	__REPEAT_10000_3(f, x ## 4); \
	22	__REPEAT_10000_3(f, x ## 5); \
	23	__REPEAT_10000_3(f, x ## 6); \
	24	__REPEAT_10000_3(f, x ## 7); \
	25	__REPEAT_10000_3(f, x ## 8); \
	26	__REPEAT_10000_3(f, x ## 9)
	27	#define __REPEAT_10000_1(f, x) \
	28	__REPEAT_10000_2(f, x ## 0); \
	29	__REPEAT_10000_2(f, x ## 1); \
	30	__REPEAT_10000_2(f, x ## 2); \
	31	__REPEAT_10000_2(f, x ## 3); \
	32	__REPEAT_10000_2(f, x ## 4); \
	33	__REPEAT_10000_2(f, x ## 5); \
	34	__REPEAT_10000_2(f, x ## 6); \
	35	__REPEAT_10000_2(f, x ## 7); \
	36	__REPEAT_10000_2(f, x ## 8); \
	37	__REPEAT_10000_2(f, x ## 9)
	38	#define REPEAT_10000(f) \
	39	__REPEAT_10000_1(f, 0); \
	40	__REPEAT_10000_1(f, 1); \
	41	__REPEAT_10000_1(f, 2); \
	42	__REPEAT_10000_1(f, 3); \
	43	__REPEAT_10000_1(f, 4); \
	44	__REPEAT_10000_1(f, 5); \
	45	__REPEAT_10000_1(f, 6); \
	46	__REPEAT_10000_1(f, 7); \
	47	__REPEAT_10000_1(f, 8); \
	48	__REPEAT_10000_1(f, 9)
	49
	50	#endif

arch/s390/lib/test_modules_helpers.c+13−0

@@ -0,0 +1,13 @@
	1	// SPDX-License-Identifier: GPL-2.0+
	2
	3	#include <linux/export.h>
	4
	5	#include "test_modules.h"
	6
	7	#define DEFINE_RETURN(i) \
	8	int test_modules_return_ ## i(void) \
	9	{ \
	10	return 1 ## i - 10000; \
	11	} \
	12	EXPORT_SYMBOL_GPL(test_modules_return_ ## i)
	13	REPEAT_10000(DEFINE_RETURN);

arch/x86/Kconfig+1−0

@@ -186,6 +186,7 @@ config X86 · 185 unmodified lines
186	select HAVE_CONTEXT_TRACKING_OFFSTACK if HAVE_CONTEXT_TRACKING	186	select HAVE_CONTEXT_TRACKING_OFFSTACK if HAVE_CONTEXT_TRACKING
187	select HAVE_C_RECORDMCOUNT	187	select HAVE_C_RECORDMCOUNT
188	select HAVE_OBJTOOL_MCOUNT if STACK_VALIDATION	188	select HAVE_OBJTOOL_MCOUNT if STACK_VALIDATION
		189	select HAVE_BUILDTIME_MCOUNT_SORT
189	select HAVE_DEBUG_KMEMLEAK	190	select HAVE_DEBUG_KMEMLEAK
190	select HAVE_DMA_CONTIGUOUS	191	select HAVE_DMA_CONTIGUOUS
191	select HAVE_DYNAMIC_FTRACE	192	select HAVE_DYNAMIC_FTRACE

arch/x86/include/asm/kvm_host.h+3−2

 	int (*get_msr_feature)(struct kvm_msr_entry *entry);
-	bool (*can_emulate_instruction)(struct kvm_vcpu *vcpu, void *insn, int insn_len);
+	bool (*can_emulate_instruction)(struct kvm_vcpu *vcpu, int emul_type,
+					void *insn, int insn_len);
 	bool (*apic_init_signal_blocked)(struct kvm_vcpu *vcpu);
 	int (*enable_direct_tlbflush)(struct kvm_vcpu *vcpu);
 };
 struct kvm_x86_nested_ops {
+	void (*leave_nested)(struct kvm_vcpu *vcpu);
 	int (*check_events)(struct kvm_vcpu *vcpu);
 	bool (*hv_timer_pending)(struct kvm_vcpu *vcpu);
 	void (*triple_fault)(struct kvm_vcpu *vcpu);
 int kvm_arch_interrupt_allowed(struct kvm_vcpu *vcpu);
 int kvm_cpu_get_interrupt(struct kvm_vcpu *v);
 void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event);
-void kvm_vcpu_reload_apic_access_page(struct kvm_vcpu *vcpu);
 int kvm_pv_send_ipi(struct kvm *kvm, unsigned long ipi_bitmap_low,
 		    unsigned long ipi_bitmap_high, u32 min,

arch/x86/include/uapi/asm/kvm.h+3−0

@@ -452,6 +452,9 @@ struct kvm_sync_regs { · 451 unmodified lines
452		452
453	#define KVM_STATE_VMX_PREEMPTION_TIMER_DEADLINE 0x00000001	453	#define KVM_STATE_VMX_PREEMPTION_TIMER_DEADLINE 0x00000001
454		454
		455	/* attributes for system fd (group 0) */
		456	#define KVM_X86_XCOMP_GUEST_SUPP 0
		457
455	struct kvm_vmx_nested_state_data {	458	struct kvm_vmx_nested_state_data {
456	__u8 vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];	459	__u8 vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];
457	__u8 shadow_vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];	460	__u8 shadow_vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];

arch/x86/kernel/cpu/mce/amd.c+1−1

@@ -423,7 +423,7 @@ static void threshold_restart_bank(void *_tr) · 422 unmodified lines
423	u32 hi, lo;	423	u32 hi, lo;
424		424
425	/* sysfs write might race against an offline operation */	425	/* sysfs write might race against an offline operation */
426	if (this_cpu_read(threshold_banks))	426	if (!this_cpu_read(threshold_banks) && !tr->set_lvt_off)
427	return;	427	return;
428		428
429	rdmsr(tr->b->address, lo, hi);	429	rdmsr(tr->b->address, lo, hi);

arch/x86/kernel/cpu/mce/intel.c+1−0

@@ -486,6 +486,7 @@ static void intel_ppin_init(struct cpuinfo_x86 *c) · 485 unmodified lines
486	case INTEL_FAM6_BROADWELL_X:	486	case INTEL_FAM6_BROADWELL_X:
487	case INTEL_FAM6_SKYLAKE_X:	487	case INTEL_FAM6_SKYLAKE_X:
488	case INTEL_FAM6_ICELAKE_X:	488	case INTEL_FAM6_ICELAKE_X:
		489	case INTEL_FAM6_ICELAKE_D:
489	case INTEL_FAM6_SAPPHIRERAPIDS_X:	490	case INTEL_FAM6_SAPPHIRERAPIDS_X:
490	case INTEL_FAM6_XEON_PHI_KNL:	491	case INTEL_FAM6_XEON_PHI_KNL:
491	case INTEL_FAM6_XEON_PHI_KNM:	492	case INTEL_FAM6_XEON_PHI_KNM:

arch/x86/kvm/cpuid.c+55−35

 		orig = &vcpu->arch.cpuid_entries[i];
 		if (e2[i].function != orig->function ||
 		    e2[i].index != orig->index ||
+		    e2[i].flags != orig->flags ||
 		    e2[i].eax != orig->eax || e2[i].ebx != orig->ebx ||
 		    e2[i].ecx != orig->ecx || e2[i].edx != orig->edx)
 			return -EINVAL;
 		vcpu->arch.pv_cpuid.features = best->eax;
 }
+/*
+ * Calculate guest's supported XCR0 taking into account guest CPUID data and
+ * supported_xcr0 (comprised of host configuration and KVM_SUPPORTED_XCR0).
+ */
+static u64 cpuid_get_supported_xcr0(struct kvm_cpuid_entry2 *entries, int nent)
+{
+	struct kvm_cpuid_entry2 *best;
+	best = cpuid_entry2_find(entries, nent, 0xd, 0);
+	if (!best)
+		return 0;
+	return (best->eax | ((u64)best->edx << 32)) & supported_xcr0;
+}
 static void __kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *entries,
 				       int nent)
 {
 	struct kvm_cpuid_entry2 *best;
+	u64 guest_supported_xcr0 = cpuid_get_supported_xcr0(entries, nent);
 	best = cpuid_entry2_find(entries, nent, 1, 0);
 	if (best) {
 					   vcpu->arch.ia32_misc_enable_msr &
 					   MSR_IA32_MISC_ENABLE_MWAIT);
 	}
+	/*
+	 * Bits 127:0 of the allowed SECS.ATTRIBUTES (CPUID.0x12.0x1) enumerate
+	 * the supported XSAVE Feature Request Mask (XFRM), i.e. the enclave's
+	 * requested XCR0 value.  The enclave's XFRM must be a subset of XCRO
+	 * at the time of EENTER, thus adjust the allowed XFRM by the guest's
+	 * supported XCR0.  Similar to XCR0 handling, FP and SSE are forced to
+	 * '1' even on CPUs that don't support XSAVE.
+	 */
+	best = cpuid_entry2_find(entries, nent, 0x12, 0x1);
+	if (best) {
+		best->ecx &= guest_supported_xcr0 & 0xffffffff;
+		best->edx &= guest_supported_xcr0 >> 32;
+		best->ecx |= XFEATURE_MASK_FPSSE;
+	}
 }
 void kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu)
 		kvm_apic_set_version(vcpu);
 	}
-	best = kvm_find_cpuid_entry(vcpu, 0xD, 0);
+	vcpu->arch.guest_supported_xcr0 =
-	if (!best)
+		cpuid_get_supported_xcr0(vcpu->arch.cpuid_entries, vcpu->arch.cpuid_nent);
-		vcpu->arch.guest_supported_xcr0 = 0;
-	else
-		vcpu->arch.guest_supported_xcr0 =
-			(best->eax | ((u64)best->edx << 32)) & supported_xcr0;
-	/*
-	 * Bits 127:0 of the allowed SECS.ATTRIBUTES (CPUID.0x12.0x1) enumerate
-	 * the supported XSAVE Feature Request Mask (XFRM), i.e. the enclave's
-	 * requested XCR0 value.  The enclave's XFRM must be a subset of XCRO
-	 * at the time of EENTER, thus adjust the allowed XFRM by the guest's
-	 * supported XCR0.  Similar to XCR0 handling, FP and SSE are forced to
-	 * '1' even on CPUs that don't support XSAVE.
-	 */
-	best = kvm_find_cpuid_entry(vcpu, 0x12, 0x1);
-	if (best) {
-		best->ecx &= vcpu->arch.guest_supported_xcr0 & 0xffffffff;
-		best->edx &= vcpu->arch.guest_supported_xcr0 >> 32;
-		best->ecx |= XFEATURE_MASK_FPSSE;
-	}
 	kvm_update_pv_runtime(vcpu);
 	 * KVM_SET_CPUID{,2} again. To support this legacy behavior, check
 	 * whether the supplied CPUID data is equal to what's already set.
 	 */
-	if (vcpu->arch.last_vmentry_cpu != -1)
+	if (vcpu->arch.last_vmentry_cpu != -1) {
-		return kvm_cpuid_check_equal(vcpu, e2, nent);
+		r = kvm_cpuid_check_equal(vcpu, e2, nent);
+		if (r)
+			return r;
+		kvfree(e2);
+		return 0;
+	}
 	r = kvm_check_cpuid(vcpu, e2, nent);
 	if (r)
 		}
 		break;
 	case 0xd: {
-		u64 guest_perm = xstate_get_guest_group_perm();
+		u64 permitted_xcr0 = supported_xcr0 & xstate_get_guest_group_perm();
+		u64 permitted_xss = supported_xss;
-		entry->eax &= supported_xcr0 & guest_perm;
+		entry->eax &= permitted_xcr0;
-		entry->ebx = xstate_required_size(supported_xcr0, false);
+		entry->ebx = xstate_required_size(permitted_xcr0, false);
 		entry->ecx = entry->ebx;
-		entry->edx &= (supported_xcr0 & guest_perm) >> 32;
+		entry->edx &= permitted_xcr0 >> 32;
-		if (!supported_xcr0)
+		if (!permitted_xcr0)
 			break;
 		entry = do_host_cpuid(array, function, 1);
 		cpuid_entry_override(entry, CPUID_D_1_EAX);
 		if (entry->eax & (F(XSAVES)|F(XSAVEC)))
-			entry->ebx = xstate_required_size(supported_xcr0 | supported_xss,
+			entry->ebx = xstate_required_size(permitted_xcr0 | permitted_xss,
 							  true);
 		else {
-			WARN_ON_ONCE(supported_xss != 0);
+			WARN_ON_ONCE(permitted_xss != 0);
 			entry->ebx = 0;
 		}
-		entry->ecx &= supported_xss;
+		entry->ecx &= permitted_xss;
-		entry->edx &= supported_xss >> 32;
+		entry->edx &= permitted_xss >> 32;
 		for (i = 2; i < 64; ++i) {
 			bool s_state;
-			if (supported_xcr0 & BIT_ULL(i))
+			if (permitted_xcr0 & BIT_ULL(i))
 				s_state = false;
-			else if (supported_xss & BIT_ULL(i))
+			else if (permitted_xss & BIT_ULL(i))
 				s_state = true;
 			else
 				continue;
 			 * invalid sub-leafs.  Only valid sub-leafs should
 			 * reach this point, and they should have a non-zero
 			 * save state size.  Furthermore, check whether the
-			 * processor agrees with supported_xcr0/supported_xss
+			 * processor agrees with permitted_xcr0/permitted_xss
 			 * on whether this is an XCR0- or IA32_XSS-managed area.
 			 */
 			if (WARN_ON_ONCE(!entry->eax || (entry->ecx & 0x1) != s_state)) {

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

@@ -2629,7 +2629,7 @@ int kvm_apic_set_state(struct kvm_vcpu vcpu, struct kvm_lapic_state s) · 2628 unmodified lines
2629	kvm_apic_set_version(vcpu);	2629	kvm_apic_set_version(vcpu);
2630		2630
2631	apic_update_ppr(apic);	2631	apic_update_ppr(apic);
2632	hrtimer_cancel(&apic->lapic_timer.timer);	2632	cancel_apic_timer(apic);
2633	apic->lapic_timer.expired_tscdeadline = 0;	2633	apic->lapic_timer.expired_tscdeadline = 0;
2634	apic_update_lvtt(apic);	2634	apic_update_lvtt(apic);
2635	apic_manage_nmi_watchdog(apic, kvm_lapic_get_reg(apic, APIC_LVT0));	2635	apic_manage_nmi_watchdog(apic, kvm_lapic_get_reg(apic, APIC_LVT0));

arch/x86/kvm/svm/nested.c+5−4

 /*
  * Forcibly leave nested mode in order to be able to reset the VCPU later on.
  */
-void svm_leave_nested(struct vcpu_svm *svm)
+void svm_leave_nested(struct kvm_vcpu *vcpu)
 {
-	struct kvm_vcpu *vcpu = &svm->vcpu;
+	struct vcpu_svm *svm = to_svm(vcpu);
 	if (is_guest_mode(vcpu)) {
 		svm->nested.nested_run_pending = 0;
 		return -EINVAL;
 	if (!(kvm_state->flags & KVM_STATE_NESTED_GUEST_MODE)) {
-		svm_leave_nested(svm);
+		svm_leave_nested(vcpu);
 		svm_set_gif(svm, !!(kvm_state->flags & KVM_STATE_NESTED_GIF_SET));
 		return 0;
 	}
 	 */
 	if (is_guest_mode(vcpu))
-		svm_leave_nested(svm);
+		svm_leave_nested(vcpu);
 	else
 		svm->nested.vmcb02.ptr->save = svm->vmcb01.ptr->save;
 }
 struct kvm_x86_nested_ops svm_nested_ops = {
+	.leave_nested = svm_leave_nested,
 	.check_events = svm_check_nested_events,
 	.triple_fault = nested_svm_triple_fault,
 	.get_nested_state_pages = svm_get_nested_state_pages,

arch/x86/kvm/svm/sev.c+7−2

 	if (!sev_enabled || !npt_enabled)
 		goto out;
-	/* Does the CPU support SEV? */
+	/*
-	if (!boot_cpu_has(X86_FEATURE_SEV))
+	 * SEV must obviously be supported in hardware.  Sanity check that the
+	 * CPU supports decode assists, which is mandatory for SEV guests to
+	 * support instruction emulation.
+	 */
+	if (!boot_cpu_has(X86_FEATURE_SEV) ||
+	    WARN_ON_ONCE(!boot_cpu_has(X86_FEATURE_DECODEASSISTS)))
 		goto out;
 	/* Retrieve SEV CPUID information */

arch/x86/kvm/svm/svm.c+122−55

@@ -290,7 +290,7 @@ int svm_set_efer(struct kvm_vcpu *vcpu, u64 efer) · 289 unmodified lines
290		290
291	if ((old_efer & EFER_SVME) != (efer & EFER_SVME)) {	291	if ((old_efer & EFER_SVME) != (efer & EFER_SVME)) {
292	if (!(efer & EFER_SVME)) {	292	if (!(efer & EFER_SVME)) {
293	svm_leave_nested(svm);	293	svm_leave_nested(vcpu);
294	svm_set_gif(svm, true);	294	svm_set_gif(svm, true);
295	/* #GP intercept is still needed for vmware backdoor */	295	/* #GP intercept is still needed for vmware backdoor */
296	if (!enable_vmware_backdoor)	296	if (!enable_vmware_backdoor)
@@ -312,7 +312,11 @@ int svm_set_efer(struct kvm_vcpu *vcpu, u64 efer) · 15 unmodified lines
312	return ret;	312	return ret;
313	}	313	}
314		314
315	if (svm_gp_erratum_intercept)	315	/*
		316	* Never intercept #GP for SEV guests, KVM can't
		317	* decrypt guest memory to workaround the erratum.
		318	*/
		319	if (svm_gp_erratum_intercept && !sev_guest(vcpu->kvm))
316	set_exception_intercept(svm, GP_VECTOR);	320	set_exception_intercept(svm, GP_VECTOR);
317	}	321	}
318	}	322	}
@@ -1010,9 +1014,10 @@ static void init_vmcb(struct kvm_vcpu *vcpu) · 691 unmodified lines
1010	* Guest access to VMware backdoor ports could legitimately	1014	* Guest access to VMware backdoor ports could legitimately
1011	* trigger #GP because of TSS I/O permission bitmap.	1015	* trigger #GP because of TSS I/O permission bitmap.
1012	* We intercept those #GP and allow access to them anyway	1016	* We intercept those #GP and allow access to them anyway
1013	* as VMware does.	1017	* as VMware does. Don't intercept #GP for SEV guests as KVM can't
		1018	* decrypt guest memory to decode the faulting instruction.
1014	*/	1019	*/
1015	if (enable_vmware_backdoor)	1020	if (enable_vmware_backdoor && !sev_guest(vcpu->kvm))
1016	set_exception_intercept(svm, GP_VECTOR);	1021	set_exception_intercept(svm, GP_VECTOR);
1017		1022
1018	svm_set_intercept(svm, INTERCEPT_INTR);	1023	svm_set_intercept(svm, INTERCEPT_INTR);
@@ -2091,10 +2096,6 @@ static int gp_interception(struct kvm_vcpu *vcpu) · 1072 unmodified lines
2091	if (error_code)	2096	if (error_code)
2092	goto reinject;	2097	goto reinject;
2093		2098
2094	/* All SVM instructions expect page aligned RAX */
2095	if (svm->vmcb->save.rax & ~PAGE_MASK)
2096	goto reinject;
2097
2098	/* Decode the instruction for usage later */	2099	/* Decode the instruction for usage later */
2099	if (x86_decode_emulated_instruction(vcpu, 0, NULL, 0) != EMULATION_OK)	2100	if (x86_decode_emulated_instruction(vcpu, 0, NULL, 0) != EMULATION_OK)
2100	goto reinject;	2101	goto reinject;
@@ -2112,8 +2113,13 @@ static int gp_interception(struct kvm_vcpu *vcpu) · 11 unmodified lines
2112	if (!is_guest_mode(vcpu))	2113	if (!is_guest_mode(vcpu))
2113	return kvm_emulate_instruction(vcpu,	2114	return kvm_emulate_instruction(vcpu,
2114	EMULTYPE_VMWARE_GP \| EMULTYPE_NO_DECODE);	2115	EMULTYPE_VMWARE_GP \| EMULTYPE_NO_DECODE);
2115	} else	2116	} else {
		2117	/* All SVM instructions expect page aligned RAX */
		2118	if (svm->vmcb->save.rax & ~PAGE_MASK)
		2119	goto reinject;
		2120
2116	return emulate_svm_instr(vcpu, opcode);	2121	return emulate_svm_instr(vcpu, opcode);
		2122	}
2117		2123
2118	reinject:	2124	reinject:
2119	kvm_queue_exception_e(vcpu, GP_VECTOR, error_code);	2125	kvm_queue_exception_e(vcpu, GP_VECTOR, error_code);
@@ -4252,79 +4258,140 @@ static void svm_enable_smi_window(struct kvm_vcpu *vcpu) · 2132 unmodified lines
4252	}	4258	}
4253	}	4259	}
4254		4260
4255	static bool svm_can_emulate_instruction(struct kvm_vcpu vcpu, void insn, int insn_len)	4261	static bool svm_can_emulate_instruction(struct kvm_vcpu *vcpu, int emul_type,
		4262	void *insn, int insn_len)
4256	{	4263	{
4257	bool smep, smap, is_user;	4264	bool smep, smap, is_user;
4258	unsigned long cr4;	4265	unsigned long cr4;
		4266	u64 error_code;
		4267
		4268	/* Emulation is always possible when KVM has access to all guest state. */
		4269	if (!sev_guest(vcpu->kvm))
		4270	return true;
		4271
		4272	/* #UD and #GP should never be intercepted for SEV guests. */
		4273	WARN_ON_ONCE(emul_type & (EMULTYPE_TRAP_UD \|
		4274	EMULTYPE_TRAP_UD_FORCED \|
		4275	EMULTYPE_VMWARE_GP));
4259		4276
4260	/*	4277	/*
4261	* When the guest is an SEV-ES guest, emulation is not possible.	4278	* Emulation is impossible for SEV-ES guests as KVM doesn't have access
		4279	* to guest register state.
4262	*/	4280	*/
4263	if (sev_es_guest(vcpu->kvm))	4281	if (sev_es_guest(vcpu->kvm))
4264	return false;	4282	return false;
4265		4283
		4284	/*
		4285	* Emulation is possible if the instruction is already decoded, e.g.
		4286	* when completing I/O after returning from userspace.
		4287	*/
		4288	if (emul_type & EMULTYPE_NO_DECODE)
		4289	return true;
		4290
		4291	/*
		4292	* Emulation is possible for SEV guests if and only if a prefilled
		4293	* buffer containing the bytes of the intercepted instruction is
		4294	* available. SEV guest memory is encrypted with a guest specific key
		4295	* and cannot be decrypted by KVM, i.e. KVM would read cyphertext and
		4296	* decode garbage.
		4297	*
		4298	* Inject #UD if KVM reached this point without an instruction buffer.
		4299	* In practice, this path should never be hit by a well-behaved guest,
		4300	* e.g. KVM doesn't intercept #UD or #GP for SEV guests, but this path
		4301	* is still theoretically reachable, e.g. via unaccelerated fault-like
		4302	* AVIC access, and needs to be handled by KVM to avoid putting the
		4303	* guest into an infinite loop. Injecting #UD is somewhat arbitrary,
		4304	* but its the least awful option given lack of insight into the guest.
		4305	*/
		4306	if (unlikely(!insn)) {
		4307	kvm_queue_exception(vcpu, UD_VECTOR);
		4308	return false;
		4309	}
		4310
		4311	/*
		4312	* Emulate for SEV guests if the insn buffer is not empty. The buffer
		4313	* will be empty if the DecodeAssist microcode cannot fetch bytes for
		4314	* the faulting instruction because the code fetch itself faulted, e.g.
		4315	* the guest attempted to fetch from emulated MMIO or a guest page
		4316	* table used to translate CS:RIP resides in emulated MMIO.
		4317	*/
		4318	if (likely(insn_len))
		4319	return true;
		4320
4266	/*	4321	/*
4267	* Detect and workaround Errata 1096 Fam_17h_00_0Fh.	4322	* Detect and workaround Errata 1096 Fam_17h_00_0Fh.
4268	*	4323	*
4269	* Errata:	4324	* Errata:
4270	* When CPU raise #NPF on guest data access and vCPU CR4.SMAP=1, it is	4325	* When CPU raises #NPF on guest data access and vCPU CR4.SMAP=1, it is
4271	* possible that CPU microcode implementing DecodeAssist will fail	4326	* possible that CPU microcode implementing DecodeAssist will fail to
4272	* to read bytes of instruction which caused #NPF. In this case,	4327	* read guest memory at CS:RIP and vmcb.GuestIntrBytes will incorrectly
4273	* GuestIntrBytes field of the VMCB on a VMEXIT will incorrectly	4328	* be '0'. This happens because microcode reads CS:RIP using a _data_
4274	* return 0 instead of the correct guest instruction bytes.	4329	* loap uop with CPL=0 privileges. If the load hits a SMAP #PF, ucode
4275	*	4330	* gives up and does not fill the instruction bytes buffer.
4276	* This happens because CPU microcode reading instruction bytes
4277	* uses a special opcode which attempts to read data using CPL=0
4278	* privileges. The microcode reads CS:RIP and if it hits a SMAP
4279	* fault, it gives up and returns no instruction bytes.
4280	*	4331	*
4281	* Detection:	4332	* As above, KVM reaches this point iff the VM is an SEV guest, the CPU
4282	* We reach here in case CPU supports DecodeAssist, raised #NPF and	4333	* supports DecodeAssist, a #NPF was raised, KVM's page fault handler
4283	* returned 0 in GuestIntrBytes field of the VMCB.	4334	* triggered emulation (e.g. for MMIO), and the CPU returned 0 in the
4284	* First, errata can only be triggered in case vCPU CR4.SMAP=1.	4335	* GuestIntrBytes field of the VMCB.
4285	* Second, if vCPU CR4.SMEP=1, errata could only be triggered
4286	* in case vCPU CPL==3 (Because otherwise guest would have triggered
4287	* a SMEP fault instead of #NPF).
4288	* Otherwise, vCPU CR4.SMEP=0, errata could be triggered by any vCPU CPL.
4289	* As most guests enable SMAP if they have also enabled SMEP, use above
4290	* logic in order to attempt minimize false-positive of detecting errata
4291	* while still preserving all cases semantic correctness.
4292	*	4336	*
4293	* Workaround:	4337	* This does _not_ mean that the erratum has been encountered, as the
4294	* To determine what instruction the guest was executing, the hypervisor	4338	* DecodeAssist will also fail if the load for CS:RIP hits a legitimate
4295	* will have to decode the instruction at the instruction pointer.	4339	* #PF, e.g. if the guest attempt to execute from emulated MMIO and
		4340	* encountered a reserved/not-present #PF.
4296	*	4341	*
4297	* In non SEV guest, hypervisor will be able to read the guest	4342	* To hit the erratum, the following conditions must be true:
4298	* memory to decode the instruction pointer when insn_len is zero	4343	* 1. CR4.SMAP=1 (obviously).
4299	* so we return true to indicate that decoding is possible.	4344	* 2. CR4.SMEP=0 \|\| CPL=3. If SMEP=1 and CPL<3, the erratum cannot
		4345	* have been hit as the guest would have encountered a SMEP
		4346	* violation #PF, not a #NPF.
		4347	* 3. The #NPF is not due to a code fetch, in which case failure to
		4348	* retrieve the instruction bytes is legitimate (see abvoe).
4300	*	4349	*
4301	* But in the SEV guest, the guest memory is encrypted with the	4350	* In addition, don't apply the erratum workaround if the #NPF occurred
4302	* guest specific key and hypervisor will not be able to decode the	4351	* while translating guest page tables (see below).
4303	* instruction pointer so we will not able to workaround it. Lets
4304	* print the error and request to kill the guest.
4305	*/	4352	*/
4306	if (likely(!insn \|\| insn_len))	4353	error_code = to_svm(vcpu)->vmcb->control.exit_info_1;
4307	return true;	4354	if (error_code & (PFERR_GUEST_PAGE_MASK \| PFERR_FETCH_MASK))
4308		4355	goto resume_guest;
4309	/*
4310	* If RIP is invalid, go ahead with emulation which will cause an
4311	* internal error exit.
4312	*/
4313	if (!kvm_vcpu_gfn_to_memslot(vcpu, kvm_rip_read(vcpu) >> PAGE_SHIFT))
4314	return true;
4315		4356
4316	cr4 = kvm_read_cr4(vcpu);	4357	cr4 = kvm_read_cr4(vcpu);
4317	smep = cr4 & X86_CR4_SMEP;	4358	smep = cr4 & X86_CR4_SMEP;
4318	smap = cr4 & X86_CR4_SMAP;	4359	smap = cr4 & X86_CR4_SMAP;
4319	is_user = svm_get_cpl(vcpu) == 3;	4360	is_user = svm_get_cpl(vcpu) == 3;
4320	if (smap && (!smep \|\| is_user)) {	4361	if (smap && (!smep \|\| is_user)) {
4321	if (!sev_guest(vcpu->kvm))
4322	return true;
4323
4324	pr_err_ratelimited("KVM: SEV Guest triggered AMD Erratum 1096\n");	4362	pr_err_ratelimited("KVM: SEV Guest triggered AMD Erratum 1096\n");
4325	kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu);	4363
		4364	/*
		4365	* If the fault occurred in userspace, arbitrarily inject #GP
		4366	* to avoid killing the guest and to hopefully avoid confusing
		4367	* the guest kernel too much, e.g. injecting #PF would not be
		4368	* coherent with respect to the guest's page tables. Request
		4369	* triple fault if the fault occurred in the kernel as there's
		4370	* no fault that KVM can inject without confusing the guest.
		4371	* In practice, the triple fault is moot as no sane SEV kernel
		4372	* will execute from user memory while also running with SMAP=1.
		4373	*/
		4374	if (is_user)
		4375	kvm_inject_gp(vcpu, 0);
		4376	else
		4377	kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu);
4326	}	4378	}
4327		4379
		4380	resume_guest:
		4381	/*
		4382	* If the erratum was not hit, simply resume the guest and let it fault
		4383	* again. While awful, e.g. the vCPU may get stuck in an infinite loop
		4384	* if the fault is at CPL=0, it's the lesser of all evils. Exiting to
		4385	* userspace will kill the guest, and letting the emulator read garbage
		4386	* will yield random behavior and potentially corrupt the guest.
		4387	*
		4388	* Simply resuming the guest is technically not a violation of the SEV
		4389	* architecture. AMD's APM states that all code fetches and page table
		4390	* accesses for SEV guest are encrypted, regardless of the C-Bit. The
		4391	* APM also states that encrypted accesses to MMIO are "ignored", but
		4392	* doesn't explicitly define "ignored", i.e. doing nothing and letting
		4393	* the guest spin is technically "ignoring" the access.
		4394	*/
4328	return false;	4395	return false;
4329	}	4396	}
4330		4397

arch/x86/kvm/svm/svm.h+1−6

 			       & ~VMCB_ALWAYS_DIRTY_MASK;
 }
-static inline bool vmcb_is_clean(struct vmcb *vmcb, int bit)
-{
-	return (vmcb->control.clean & (1 << bit));
-}
 static inline void vmcb_mark_dirty(struct vmcb *vmcb, int bit)
 {
 	vmcb->control.clean &= ~(1 << bit);
 int enter_svm_guest_mode(struct kvm_vcpu *vcpu,
 			 u64 vmcb_gpa, struct vmcb *vmcb12, bool from_vmrun);
-void svm_leave_nested(struct vcpu_svm *svm);
+void svm_leave_nested(struct kvm_vcpu *vcpu);
 void svm_free_nested(struct vcpu_svm *svm);
 int svm_allocate_nested(struct vcpu_svm *svm);
 int nested_svm_vmrun(struct kvm_vcpu *vcpu);

arch/x86/kvm/svm/svm_onhyperv.h+4−8

 	if (npt_enabled &&
 	    ms_hyperv.nested_features & HV_X64_NESTED_ENLIGHTENED_TLB)
 		hve->hv_enlightenments_control.enlightened_npt_tlb = 1;
+	if (ms_hyperv.nested_features & HV_X64_NESTED_MSR_BITMAP)
+		hve->hv_enlightenments_control.msr_bitmap = 1;
 }
 static inline void svm_hv_hardware_setup(void)
 	struct hv_enlightenments *hve =
 		(struct hv_enlightenments *)vmcb->control.reserved_sw;
-	/*
+	if (hve->hv_enlightenments_control.msr_bitmap)
-	 * vmcb can be NULL if called during early vcpu init.
-	 * And its okay not to mark vmcb dirty during vcpu init
-	 * as we mark it dirty unconditionally towards end of vcpu
-	 * init phase.
-	 */
-	if (vmcb_is_clean(vmcb, VMCB_HV_NESTED_ENLIGHTENMENTS) &&
-	    hve->hv_enlightenments_control.msr_bitmap)
 		vmcb_mark_dirty(vmcb, VMCB_HV_NESTED_ENLIGHTENMENTS);
 }

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

@@ -54,7 +54,6 @@ struct nested_vmx_msrs { · 53 unmodified lines
54		54
55	struct vmcs_config {	55	struct vmcs_config {
56	int size;	56	int size;
57	int order;
58	u32 basic_cap;	57	u32 basic_cap;
59	u32 revision_id;	58	u32 revision_id;
60	u32 pin_based_exec_ctrl;	59	u32 pin_based_exec_ctrl;

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

 DEFINE_STATIC_KEY_FALSE(enable_evmcs);
-#if IS_ENABLED(CONFIG_HYPERV)
 #define EVMCS1_OFFSET(x) offsetof(struct hv_enlightened_vmcs, x)
 #define EVMCS1_FIELD(number, name, clean_field)[ROL16(number, 6)] = \
 		{EVMCS1_OFFSET(name), clean_field}
 };
 const unsigned int nr_evmcs_1_fields = ARRAY_SIZE(vmcs_field_to_evmcs_1);
+#if IS_ENABLED(CONFIG_HYPERV)
 __init void evmcs_sanitize_exec_ctrls(struct vmcs_config *vmcs_conf)
 {
 	vmcs_conf->pin_based_exec_ctrl &= ~EVMCS1_UNSUPPORTED_PINCTRL;
 	case MSR_IA32_VMX_PROCBASED_CTLS2:
 		ctl_high &= ~EVMCS1_UNSUPPORTED_2NDEXEC;
 		break;
+	case MSR_IA32_VMX_TRUE_PINBASED_CTLS:
 	case MSR_IA32_VMX_PINBASED_CTLS:
 		ctl_high &= ~EVMCS1_UNSUPPORTED_PINCTRL;
 		break;

arch/x86/kvm/vmx/evmcs.h+39−9

 	 SECONDARY_EXEC_SHADOW_VMCS |					\
 	 SECONDARY_EXEC_TSC_SCALING |					\
 	 SECONDARY_EXEC_PAUSE_LOOP_EXITING)
-#define EVMCS1_UNSUPPORTED_VMEXIT_CTRL (VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL)
+#define EVMCS1_UNSUPPORTED_VMEXIT_CTRL					\
+	(VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL |				\
+	 VM_EXIT_SAVE_VMX_PREEMPTION_TIMER)
 #define EVMCS1_UNSUPPORTED_VMENTRY_CTRL (VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL)
 #define EVMCS1_UNSUPPORTED_VMFUNC (VMX_VMFUNC_EPTP_SWITCHING)
-#if IS_ENABLED(CONFIG_HYPERV)
 struct evmcs_field {
 	u16 offset;
 	u16 clean_field;
 extern const struct evmcs_field vmcs_field_to_evmcs_1[];
 extern const unsigned int nr_evmcs_1_fields;
-static __always_inline int get_evmcs_offset(unsigned long field,
+static __always_inline int evmcs_field_offset(unsigned long field,
-					    u16 *clean_field)
+					      u16 *clean_field)
 {
 	unsigned int index = ROL16(field, 6);
 	const struct evmcs_field *evmcs_field;
-	if (unlikely(index >= nr_evmcs_1_fields)) {
+	if (unlikely(index >= nr_evmcs_1_fields))
-		WARN_ONCE(1, "KVM: accessing unsupported EVMCS field %lx\n",
-			  field);
 		return -ENOENT;
-	}
 	evmcs_field = &vmcs_field_to_evmcs_1[index];
+	/*
+	 * Use offset=0 to detect holes in eVMCS. This offset belongs to
+	 * 'revision_id' but this field has no encoding and is supposed to
+	 * be accessed directly.
+	 */
+	if (unlikely(!evmcs_field->offset))
+		return -ENOENT;
 	if (clean_field)
 		*clean_field = evmcs_field->clean_field;
 	return evmcs_field->offset;
 }
+static inline u64 evmcs_read_any(struct hv_enlightened_vmcs *evmcs,
+				 unsigned long field, u16 offset)
+{
+	/*
+	 * vmcs12_read_any() doesn't care whether the supplied structure
+	 * is 'struct vmcs12' or 'struct hv_enlightened_vmcs' as it takes
+	 * the exact offset of the required field, use it for convenience
+	 * here.
+	 */
+	return vmcs12_read_any((void *)evmcs, field, offset);
+}
+#if IS_ENABLED(CONFIG_HYPERV)
+static __always_inline int get_evmcs_offset(unsigned long field,
+					    u16 *clean_field)
+{
+	int offset = evmcs_field_offset(field, clean_field);
+	WARN_ONCE(offset < 0, "KVM: accessing unsupported EVMCS field %lx\n",
+		  field);
+	return offset;
+}
 static __always_inline void evmcs_write64(unsigned long field, u64 value)
 {
 	u16 clean_field;

arch/x86/kvm/vmx/nested.c+54−28

 #include <asm/mmu_context.h>
 #include "cpuid.h"
+#include "evmcs.h"
 #include "hyperv.h"
 #include "mmu.h"
 #include "nested.h"
 	struct loaded_vmcs *loaded_vmcs = vmx->loaded_vmcs;
 	/*
-	 * We should allocate a shadow vmcs for vmcs01 only when L1
+	 * KVM allocates a shadow VMCS only when L1 executes VMXON and frees it
-	 * executes VMXON and free it when L1 executes VMXOFF.
+	 * when L1 executes VMXOFF or the vCPU is forced out of nested
-	 * As it is invalid to execute VMXON twice, we shouldn't reach
+	 * operation.  VMXON faults if the CPU is already post-VMXON, so it
-	 * here when vmcs01 already have an allocated shadow vmcs.
+	 * should be impossible to already have an allocated shadow VMCS.  KVM
+	 * doesn't support virtualization of VMCS shadowing, so vmcs01 should
+	 * always be the loaded VMCS.
 	 */
-	WARN_ON(loaded_vmcs == &vmx->vmcs01 && loaded_vmcs->shadow_vmcs);
+	if (WARN_ON(loaded_vmcs != &vmx->vmcs01 || loaded_vmcs->shadow_vmcs))
+		return loaded_vmcs->shadow_vmcs;
+	loaded_vmcs->shadow_vmcs = alloc_vmcs(true);
+	if (loaded_vmcs->shadow_vmcs)
+		vmcs_clear(loaded_vmcs->shadow_vmcs);
-	if (!loaded_vmcs->shadow_vmcs) {
-		loaded_vmcs->shadow_vmcs = alloc_vmcs(true);
-		if (loaded_vmcs->shadow_vmcs)
-			vmcs_clear(loaded_vmcs->shadow_vmcs);
-	}
 	return loaded_vmcs->shadow_vmcs;
 }
 	if (!nested_vmx_check_permission(vcpu))
 		return 1;
-	/*
-	 * In VMX non-root operation, when the VMCS-link pointer is INVALID_GPA,
-	 * any VMREAD sets the ALU flags for VMfailInvalid.
-	 */
-	if (vmx->nested.current_vmptr == INVALID_GPA ||
-	    (is_guest_mode(vcpu) &&
-	     get_vmcs12(vcpu)->vmcs_link_pointer == INVALID_GPA))
-		return nested_vmx_failInvalid(vcpu);
 	/* Decode instruction info and find the field to read */
 	field = kvm_register_read(vcpu, (((instr_info) >> 28) & 0xf));
-	offset = vmcs_field_to_offset(field);
+	if (!evmptr_is_valid(vmx->nested.hv_evmcs_vmptr)) {
-	if (offset < 0)
+		/*
-		return nested_vmx_fail(vcpu, VMXERR_UNSUPPORTED_VMCS_COMPONENT);
+		 * In VMX non-root operation, when the VMCS-link pointer is INVALID_GPA,
+		 * any VMREAD sets the ALU flags for VMfailInvalid.
+		 */
+		if (vmx->nested.current_vmptr == INVALID_GPA ||
+		    (is_guest_mode(vcpu) &&
+		     get_vmcs12(vcpu)->vmcs_link_pointer == INVALID_GPA))
+			return nested_vmx_failInvalid(vcpu);
-	if (!is_guest_mode(vcpu) && is_vmcs12_ext_field(field))
+		offset = get_vmcs12_field_offset(field);
-		copy_vmcs02_to_vmcs12_rare(vcpu, vmcs12);
+		if (offset < 0)
+			return nested_vmx_fail(vcpu, VMXERR_UNSUPPORTED_VMCS_COMPONENT);
+		if (!is_guest_mode(vcpu) && is_vmcs12_ext_field(field))
+			copy_vmcs02_to_vmcs12_rare(vcpu, vmcs12);
-	/* Read the field, zero-extended to a u64 value */
+		/* Read the field, zero-extended to a u64 value */
-	value = vmcs12_read_any(vmcs12, field, offset);
+		value = vmcs12_read_any(vmcs12, field, offset);
+	} else {
+		/*
+		 * Hyper-V TLFS (as of 6.0b) explicitly states, that while an
+		 * enlightened VMCS is active VMREAD/VMWRITE instructions are
+		 * unsupported. Unfortunately, certain versions of Windows 11
+		 * don't comply with this requirement which is not enforced in
+		 * genuine Hyper-V. Allow VMREAD from an enlightened VMCS as a
+		 * workaround, as misbehaving guests will panic on VM-Fail.
+		 * Note, enlightened VMCS is incompatible with shadow VMCS so
+		 * all VMREADs from L2 should go to L1.
+		 */
+		if (WARN_ON_ONCE(is_guest_mode(vcpu)))
+			return nested_vmx_failInvalid(vcpu);
+		offset = evmcs_field_offset(field, NULL);
+		if (offset < 0)
+			return nested_vmx_fail(vcpu, VMXERR_UNSUPPORTED_VMCS_COMPONENT);
+		/* Read the field, zero-extended to a u64 value */
+		value = evmcs_read_any(vmx->nested.hv_evmcs, field, offset);
+	}
 	/*
 	 * Now copy part of this value to register or memory, as requested.
 	field = kvm_register_read(vcpu, (((instr_info) >> 28) & 0xf));
-	offset = vmcs_field_to_offset(field);
+	offset = get_vmcs12_field_offset(field);
 	if (offset < 0)
 		return nested_vmx_fail(vcpu, VMXERR_UNSUPPORTED_VMCS_COMPONENT);
 	max_idx = 0;
 	for (i = 0; i < nr_vmcs12_fields; i++) {
 		/* The vmcs12 table is very, very sparsely populated. */
-		if (!vmcs_field_to_offset_table[i])
+		if (!vmcs12_field_offsets[i])
 			continue;
 		idx = vmcs_field_index(VMCS12_IDX_TO_ENC(i));
 }
 struct kvm_x86_nested_ops vmx_nested_ops = {
+	.leave_nested = vmx_leave_nested,
 	.check_events = vmx_check_nested_events,
 	.hv_timer_pending = nested_vmx_preemption_timer_pending,
 	.triple_fault = nested_vmx_triple_fault,

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

@@ -8,7 +8,7 @@ · 7 unmodified lines
8	FIELD(number, name), \	8	FIELD(number, name), \
9	[ROL16(number##_HIGH, 6)] = VMCS12_OFFSET(name) + sizeof(u32)	9	[ROL16(number##_HIGH, 6)] = VMCS12_OFFSET(name) + sizeof(u32)
10		10
11	const unsigned short vmcs_field_to_offset_table[] = {	11	const unsigned short vmcs12_field_offsets[] = {
12	FIELD(VIRTUAL_PROCESSOR_ID, virtual_processor_id),	12	FIELD(VIRTUAL_PROCESSOR_ID, virtual_processor_id),
13	FIELD(POSTED_INTR_NV, posted_intr_nv),	13	FIELD(POSTED_INTR_NV, posted_intr_nv),
14	FIELD(GUEST_ES_SELECTOR, guest_es_selector),	14	FIELD(GUEST_ES_SELECTOR, guest_es_selector),
@@ -151,4 +151,4 @@ const unsigned short vmcs_field_to_offset_table[] = { · 136 unmodified lines
151	FIELD(HOST_RSP, host_rsp),	151	FIELD(HOST_RSP, host_rsp),
152	FIELD(HOST_RIP, host_rip),	152	FIELD(HOST_RIP, host_rip),
153	};	153	};
154	const unsigned int nr_vmcs12_fields = ARRAY_SIZE(vmcs_field_to_offset_table);	154	const unsigned int nr_vmcs12_fields = ARRAY_SIZE(vmcs12_field_offsets);

arch/x86/kvm/vmx/vmcs12.h+3−3

@@ -361,10 +361,10 @@ static inline void vmx_check_vmcs12_offsets(void) · 360 unmodified lines
361	CHECK_OFFSET(guest_pml_index, 996);	361	CHECK_OFFSET(guest_pml_index, 996);
362	}	362	}
363		363
364	extern const unsigned short vmcs_field_to_offset_table[];	364	extern const unsigned short vmcs12_field_offsets[];
365	extern const unsigned int nr_vmcs12_fields;	365	extern const unsigned int nr_vmcs12_fields;
366		366
367	static inline short vmcs_field_to_offset(unsigned long field)	367	static inline short get_vmcs12_field_offset(unsigned long field)
368	{	368	{
369	unsigned short offset;	369	unsigned short offset;
370	unsigned int index;	370	unsigned int index;
@@ -377,7 +377,7 @@ static inline short vmcs_field_to_offset(unsigned long field) · 6 unmodified lines
377	return -ENOENT;	377	return -ENOENT;
378		378
379	index = array_index_nospec(index, nr_vmcs12_fields);	379	index = array_index_nospec(index, nr_vmcs12_fields);
380	offset = vmcs_field_to_offset_table[index];	380	offset = vmcs12_field_offsets[index];
381	if (offset == 0)	381	if (offset == 0)
382	return -ENOENT;	382	return -ENOENT;
383	return offset;	383	return offset;

arch/x86/kvm/vmx/vmx.c+38−9

 	return 0;
 }
-static bool vmx_can_emulate_instruction(struct kvm_vcpu *vcpu, void *insn, int insn_len)
+static bool vmx_can_emulate_instruction(struct kvm_vcpu *vcpu, int emul_type,
+					void *insn, int insn_len)
 {
 	/*
 	 * Emulation of instructions in SGX enclaves is impossible as RIP does
-	 * not point  tthe failing instruction, and even if it did, the code
+	 * not point at the failing instruction, and even if it did, the code
 	 * stream is inaccessible.  Inject #UD instead of exiting to userspace
 	 * so that guest userspace can't DoS the guest simply by triggering
 	 * emulation (enclaves are CPL3 only).
 		return -EIO;
 	vmcs_conf->size = vmx_msr_high & 0x1fff;
-	vmcs_conf->order = get_order(vmcs_conf->size);
 	vmcs_conf->basic_cap = vmx_msr_high & ~0x1fff;
 	vmcs_conf->revision_id = vmx_msr_low;
 	struct page *pages;
 	struct vmcs *vmcs;
-	pages = __alloc_pages_node(node, flags, vmcs_config.order);
+	pages = __alloc_pages_node(node, flags, 0);
 	if (!pages)
 		return NULL;
 	vmcs = page_address(pages);
 void free_vmcs(struct vmcs *vmcs)
 {
-	free_pages((unsigned long)vmcs, vmcs_config.order);
+	free_page((unsigned long)vmcs);
 }
 /*
 	vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
 	/*
-	 * If 32-bit syscall is enabled, vmx_vcpu_load_vcms rewrites
+	 * SYSENTER is used for 32-bit system calls on either 32-bit or
-	 * HOST_IA32_SYSENTER_ESP.
+	 * 64-bit kernels.  It is always zero If neither is allowed, otherwise
+	 * vmx_vcpu_load_vmcs loads it with the per-CPU entry stack (and may
+	 * have already done so!).
 	 */
-	vmcs_writel(HOST_IA32_SYSENTER_ESP, 0);
+	if (!IS_ENABLED(CONFIG_IA32_EMULATION) && !IS_ENABLED(CONFIG_X86_32))
+		vmcs_writel(HOST_IA32_SYSENTER_ESP, 0);
 	rdmsrl(MSR_IA32_SYSENTER_EIP, tmpl);
 	vmcs_writel(HOST_IA32_SYSENTER_EIP, tmpl);   /* 22.2.3 */
 		dr6 = vmx_get_exit_qual(vcpu);
 		if (!(vcpu->guest_debug &
 		      (KVM_GUESTDBG_SINGLESTEP | KVM_GUESTDBG_USE_HW_BP))) {
+			/*
+			 * If the #DB was due to ICEBP, a.k.a. INT1, skip the
+			 * instruction.  ICEBP generates a trap-like #DB, but
+			 * despite its interception control being tied to #DB,
+			 * is an instruction intercept, i.e. the VM-Exit occurs
+			 * on the ICEBP itself.  Note, skipping ICEBP also
+			 * clears STI and MOVSS blocking.
+			 *
+			 * For all other #DBs, set vmcs.PENDING_DBG_EXCEPTIONS.BS
+			 * if single-step is enabled in RFLAGS and STI or MOVSS
+			 * blocking is active, as the CPU doesn't set the bit
+			 * on VM-Exit due to #DB interception.  VM-Entry has a
+			 * consistency check that a single-step #DB is pending
+			 * in this scenario as the previous instruction cannot
+			 * have toggled RFLAGS.TF 0=>1 (because STI and POP/MOV
+			 * don't modify RFLAGS), therefore the one instruction
+			 * delay when activating single-step breakpoints must
+			 * have already expired.  Note, the CPU sets/clears BS
+			 * as appropriate for all other VM-Exits types.
+			 */
 			if (is_icebp(intr_info))
 				WARN_ON(!skip_emulated_instruction(vcpu));
+			else if ((vmx_get_rflags(vcpu) & X86_EFLAGS_TF) &&
+				 (vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) &
+				  (GUEST_INTR_STATE_STI | GUEST_INTR_STATE_MOV_SS)))
+				vmcs_writel(GUEST_PENDING_DBG_EXCEPTIONS,
+					    vmcs_readl(GUEST_PENDING_DBG_EXCEPTIONS) | DR6_BS);
 			kvm_queue_exception_p(vcpu, DB_VECTOR, dr6);
 			return 1;
 {
 	gpa_t gpa;
-	if (!vmx_can_emulate_instruction(vcpu, NULL, 0))
+	if (!vmx_can_emulate_instruction(vcpu, EMULTYPE_PF, NULL, 0))
 		return 1;
 	/*

arch/x86/kvm/x86.c+81−13

 		if (data & ~supported_xss)
 			return 1;
 		vcpu->arch.ia32_xss = data;
+		kvm_update_cpuid_runtime(vcpu);
 		break;
 	case MSR_SMI_COUNT:
 		if (!msr_info->host_initiated)
 	case KVM_CAP_SREGS2:
 	case KVM_CAP_EXIT_ON_EMULATION_FAILURE:
 	case KVM_CAP_VCPU_ATTRIBUTES:
+	case KVM_CAP_SYS_ATTRIBUTES:
 		r = 1;
 		break;
 	case KVM_CAP_EXIT_HYPERCALL:
 		break;
 	}
 	return r;
+}
+static inline void __user *kvm_get_attr_addr(struct kvm_device_attr *attr)
+{
+	void __user *uaddr = (void __user*)(unsigned long)attr->addr;
+	if ((u64)(unsigned long)uaddr != attr->addr)
+		return ERR_PTR(-EFAULT);
+	return uaddr;
+}
+static int kvm_x86_dev_get_attr(struct kvm_device_attr *attr)
+{
+	u64 __user *uaddr = kvm_get_attr_addr(attr);
+	if (attr->group)
+		return -ENXIO;
+	if (IS_ERR(uaddr))
+		return PTR_ERR(uaddr);
+	switch (attr->attr) {
+	case KVM_X86_XCOMP_GUEST_SUPP:
+		if (put_user(supported_xcr0, uaddr))
+			return -EFAULT;
+		return 0;
+	default:
+		return -ENXIO;
+		break;
+	}
+}
+static int kvm_x86_dev_has_attr(struct kvm_device_attr *attr)
+{
+	if (attr->group)
+		return -ENXIO;
+	switch (attr->attr) {
+	case KVM_X86_XCOMP_GUEST_SUPP:
+		return 0;
+	default:
+		return -ENXIO;
+	}
 }
 long kvm_arch_dev_ioctl(struct file *filp,
 	case KVM_GET_SUPPORTED_HV_CPUID:
 		r = kvm_ioctl_get_supported_hv_cpuid(NULL, argp);
 		break;
+	case KVM_GET_DEVICE_ATTR: {
+		struct kvm_device_attr attr;
+		r = -EFAULT;
+		if (copy_from_user(&attr, (void __user *)arg, sizeof(attr)))
+			break;
+		r = kvm_x86_dev_get_attr(&attr);
+		break;
+	}
+	case KVM_HAS_DEVICE_ATTR: {
+		struct kvm_device_attr attr;
+		r = -EFAULT;
+		if (copy_from_user(&attr, (void __user *)arg, sizeof(attr)))
+			break;
+		r = kvm_x86_dev_has_attr(&attr);
+		break;
+	}
 	default:
 		r = -EINVAL;
 		break;
 		vcpu->arch.apic->sipi_vector = events->sipi_vector;
 	if (events->flags & KVM_VCPUEVENT_VALID_SMM) {
-		if (!!(vcpu->arch.hflags & HF_SMM_MASK) != events->smi.smm)
+		if (!!(vcpu->arch.hflags & HF_SMM_MASK) != events->smi.smm) {
+			kvm_x86_ops.nested_ops->leave_nested(vcpu);
 			kvm_smm_changed(vcpu, events->smi.smm);
+		}
 		vcpu->arch.smi_pending = events->smi.pending;
 static int kvm_arch_tsc_get_attr(struct kvm_vcpu *vcpu,
 				 struct kvm_device_attr *attr)
 {
-	u64 __user *uaddr = (u64 __user *)(unsigned long)attr->addr;
+	u64 __user *uaddr = kvm_get_attr_addr(attr);
 	int r;
-	if ((u64)(unsigned long)uaddr != attr->addr)
+	if (IS_ERR(uaddr))
-		return -EFAULT;
+		return PTR_ERR(uaddr);
 	switch (attr->attr) {
 	case KVM_VCPU_TSC_OFFSET:
 static int kvm_arch_tsc_set_attr(struct kvm_vcpu *vcpu,
 				 struct kvm_device_attr *attr)
 {
-	u64 __user *uaddr = (u64 __user *)(unsigned long)attr->addr;
+	u64 __user *uaddr = kvm_get_attr_addr(attr);
 	struct kvm *kvm = vcpu->kvm;
 	int r;
-	if ((u64)(unsigned long)uaddr != attr->addr)
+	if (IS_ERR(uaddr))
-		return -EFAULT;
+		return PTR_ERR(uaddr);
 	switch (attr->attr) {
 	case KVM_VCPU_TSC_OFFSET: {
 }
 EXPORT_SYMBOL_GPL(kvm_write_guest_virt_system);
+static int kvm_can_emulate_insn(struct kvm_vcpu *vcpu, int emul_type,
+				void *insn, int insn_len)
+{
+	return static_call(kvm_x86_can_emulate_instruction)(vcpu, emul_type,
+							    insn, insn_len);
+}
 int handle_ud(struct kvm_vcpu *vcpu)
 {
 	static const char kvm_emulate_prefix[] = { __KVM_EMULATE_PREFIX };
 	char sig[5]; /* ud2; .ascii "kvm" */
 	struct x86_exception e;
-	if (unlikely(!static_call(kvm_x86_can_emulate_instruction)(vcpu, NULL, 0)))
+	if (unlikely(!kvm_can_emulate_insn(vcpu, emul_type, NULL, 0)))
 		return 1;
 	if (force_emulation_prefix &&
 	bool writeback = true;
 	bool write_fault_to_spt;
-	if (unlikely(!static_call(kvm_x86_can_emulate_instruction)(vcpu, insn, insn_len)))
+	if (unlikely(!kvm_can_emulate_insn(vcpu, emulation_type, insn, insn_len)))
 		return 1;
 	vcpu->arch.l1tf_flush_l1d = true;
 		kvm_make_all_cpus_request(kvm, KVM_REQ_APIC_PAGE_RELOAD);
 }
-void kvm_vcpu_reload_apic_access_page(struct kvm_vcpu *vcpu)
+static void kvm_vcpu_reload_apic_access_page(struct kvm_vcpu *vcpu)
 {
 	if (!lapic_in_kernel(vcpu))
 		return;
 		vcpu->arch.msr_misc_features_enables = 0;
-		vcpu->arch.xcr0 = XFEATURE_MASK_FP;
+		__kvm_set_xcr(vcpu, 0, XFEATURE_MASK_FP);
+		__kvm_set_msr(vcpu, MSR_IA32_XSS, 0, true);
 	}
 	/* All GPRs except RDX (handled below) are zeroed on RESET/INIT. */
 	cpuid_0x1 = kvm_find_cpuid_entry(vcpu, 1, 0);
 	kvm_rdx_write(vcpu, cpuid_0x1 ? cpuid_0x1->eax : 0x600);
-	vcpu->arch.ia32_xss = 0;
 	static_call(kvm_x86_vcpu_reset)(vcpu, init_event);
 	kvm_set_rflags(vcpu, X86_EFLAGS_FIXED);

arch/x86/kvm/xen.c+2−8

 				     "\tnotq %0\n"
 				     "\t" LOCK_PREFIX "andq %0, %2\n"
 				     "2:\n"
-				     "\t.section .fixup,\"ax\"\n"
+				     _ASM_EXTABLE_UA(1b, 2b)
-				     "3:\tjmp\t2b\n"
-				     "\t.previous\n"
-				     _ASM_EXTABLE_UA(1b, 3b)
 				     : "=r" (evtchn_pending_sel),
 				       "+m" (vi->evtchn_pending_sel),
 				       "+m" (v->arch.xen.evtchn_pending_sel)
 				     "\tnotl %0\n"
 				     "\t" LOCK_PREFIX "andl %0, %2\n"
 				     "2:\n"
-				     "\t.section .fixup,\"ax\"\n"
+				     _ASM_EXTABLE_UA(1b, 2b)
-				     "3:\tjmp\t2b\n"
-				     "\t.previous\n"
-				     _ASM_EXTABLE_UA(1b, 3b)
 				     : "=r" (evtchn_pending_sel32),
 				       "+m" (vi->evtchn_pending_sel),
 				       "+m" (v->arch.xen.evtchn_pending_sel)

arch/x86/pci/fixup.c+2−2

@@ -353,8 +353,8 @@ static void pci_fixup_video(struct pci_dev *pdev) · 352 unmodified lines
353	}	353	}
354	}	354	}
355	}	355	}
356	DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,	356	DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_ANY_ID, PCI_ANY_ID,
357	PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video);	357	PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video);
358		358
359		359
360	static const struct dmi_system_id msi_k8t_dmi_table[] = {	360	static const struct dmi_system_id msi_k8t_dmi_table[] = {

block/blk-core.c+19−6

 }
 static unsigned long __part_start_io_acct(struct block_device *part,
-					  unsigned int sectors, unsigned int op)
+					  unsigned int sectors, unsigned int op,
+					  unsigned long start_time)
 {
 	const int sgrp = op_stat_group(op);
-	unsigned long now = READ_ONCE(jiffies);
 	part_stat_lock();
-	update_io_ticks(part, now, false);
+	update_io_ticks(part, start_time, false);
 	part_stat_inc(part, ios[sgrp]);
 	part_stat_add(part, sectors[sgrp], sectors);
 	part_stat_local_inc(part, in_flight[op_is_write(op)]);
 	part_stat_unlock();
-	return now;
+	return start_time;
+}
+/**
+ * bio_start_io_acct_time - start I/O accounting for bio based drivers
+ * @bio:	bio to start account for
+ * @start_time:	start time that should be passed back to bio_end_io_acct().
+ */
+void bio_start_io_acct_time(struct bio *bio, unsigned long start_time)
+{
+	__part_start_io_acct(bio->bi_bdev, bio_sectors(bio),
+			     bio_op(bio), start_time);
 }
+EXPORT_SYMBOL_GPL(bio_start_io_acct_time);
 /**
  * bio_start_io_acct - start I/O accounting for bio based drivers
  */
 unsigned long bio_start_io_acct(struct bio *bio)
 {
-	return __part_start_io_acct(bio->bi_bdev, bio_sectors(bio), bio_op(bio));
+	return __part_start_io_acct(bio->bi_bdev, bio_sectors(bio),
+				    bio_op(bio), jiffies);
 }
 EXPORT_SYMBOL_GPL(bio_start_io_acct);
 unsigned long disk_start_io_acct(struct gendisk *disk, unsigned int sectors,
 				 unsigned int op)
 {
-	return __part_start_io_acct(disk->part0, sectors, op);
+	return __part_start_io_acct(disk->part0, sectors, op, jiffies);
 }
 EXPORT_SYMBOL(disk_start_io_acct);

block/blk-ia-ranges.c+1−1

@@ -144,7 +144,7 @@ int disk_register_independent_access_ranges(struct gendisk *disk, · 143 unmodified lines
144	&q->kobj, "%s", "independent_access_ranges");	144	&q->kobj, "%s", "independent_access_ranges");
145	if (ret) {	145	if (ret) {
146	q->ia_ranges = NULL;	146	q->ia_ranges = NULL;
147	kfree(iars);	147	kobject_put(&iars->kobj);
148	return ret;	148	return ret;
149	}	149	}
150		150

block/blk-mq.c+2−0

 	 */
 	blk_mq_run_dispatch_ops(rq->q,
 			ret = blk_mq_request_issue_directly(rq, true));
+	if (ret)
+		blk_account_io_done(rq, ktime_get_ns());
 	return ret;
 }
 EXPORT_SYMBOL_GPL(blk_insert_cloned_request);

drivers/ata/pata_platform.c+2−0

@@ -128,6 +128,8 @@ int __pata_platform_probe(struct device dev, struct resource io_res, · 127 unmodified lines
128	ap = host->ports[0];	128	ap = host->ports[0];
129		129
130	ap->ops = devm_kzalloc(dev, sizeof(*ap->ops), GFP_KERNEL);	130	ap->ops = devm_kzalloc(dev, sizeof(*ap->ops), GFP_KERNEL);
		131	if (!ap->ops)
		132	return -ENOMEM;
131	ap->ops->inherits = &ata_sff_port_ops;	133	ap->ops->inherits = &ata_sff_port_ops;
132	ap->ops->cable_detect = ata_cable_unknown;	134	ap->ops->cable_detect = ata_cable_unknown;
133	ap->ops->set_mode = pata_platform_set_mode;	135	ap->ops->set_mode = pata_platform_set_mode;

drivers/counter/counter-core.c+6−9

 	int err;
 	ch = kzalloc(sizeof(*ch) + sizeof_priv, GFP_KERNEL);
-	if (!ch) {
+	if (!ch)
-		err = -ENOMEM;
+		return NULL;
-		goto err_alloc_ch;
-	}
 	counter = &ch->counter;
 	dev = &counter->dev;
 err_ida_alloc:
 	kfree(ch);
-err_alloc_ch:
-	return ERR_PTR(err);
+	return NULL;
 }
 EXPORT_SYMBOL_GPL(counter_alloc);
 	int err;
 	counter = counter_alloc(sizeof_priv);
-	if (IS_ERR(counter))
+	if (!counter)
-		return counter;
+		return NULL;
 	err = devm_add_action_or_reset(dev, devm_counter_put, counter);
 	if (err < 0)
-		return ERR_PTR(err);
+		return NULL;
 	return counter;
 }

drivers/firmware/efi/efi.c+7−0

@@ -722,6 +722,13 @@ void __init efi_systab_report_header(const efi_table_hdr_t *systab_hdr, · 721 unmodified lines
722	systab_hdr->revision >> 16,	722	systab_hdr->revision >> 16,
723	systab_hdr->revision & 0xffff,	723	systab_hdr->revision & 0xffff,
724	vendor);	724	vendor);
		725
		726	if (IS_ENABLED(CONFIG_X86_64) &&
		727	systab_hdr->revision > EFI_1_10_SYSTEM_TABLE_REVISION &&
		728	!strcmp(vendor, "Apple")) {
		729	pr_info("Apple Mac detected, using EFI v1.10 runtime services only\n");
		730	efi.runtime_version = EFI_1_10_SYSTEM_TABLE_REVISION;
		731	}
725	}	732	}
726		733
727	static __initdata char memory_type_name[][13] = {	734	static __initdata char memory_type_name[][13] = {

drivers/firmware/efi/libstub/arm64-stub.c+3−3

@@ -119,9 +119,9 @@ efi_status_t handle_kernel_image(unsigned long *image_addr, · 118 unmodified lines
119	if (image->image_base != _text)	119	if (image->image_base != _text)
120	efi_err("FIRMWARE BUG: efi_loaded_image_t::image_base has bogus value\n");	120	efi_err("FIRMWARE BUG: efi_loaded_image_t::image_base has bogus value\n");
121		121
122	if (!IS_ALIGNED((u64)_text, EFI_KIMG_ALIGN))	122	if (!IS_ALIGNED((u64)_text, SEGMENT_ALIGN))
123	efi_err("FIRMWARE BUG: kernel image not aligned on %ldk boundary\n",	123	efi_err("FIRMWARE BUG: kernel image not aligned on %dk boundary\n",
124	EFI_KIMG_ALIGN >> 10);	124	SEGMENT_ALIGN >> 10);
125		125
126	kernel_size = _edata - _text;	126	kernel_size = _edata - _text;
127	kernel_memsize = kernel_size + (_end - _edata);	127	kernel_memsize = kernel_size + (_end - _edata);

drivers/gpio/gpio-sim.c+1−1

@@ -816,7 +816,7 @@ gpio_sim_make_bank_swnode(struct gpio_sim_bank *bank, · 815 unmodified lines
816		816
817	properties[prop_idx++] = PROPERTY_ENTRY_U32("ngpios", bank->num_lines);	817	properties[prop_idx++] = PROPERTY_ENTRY_U32("ngpios", bank->num_lines);
818		818
819	if (bank->label)	819	if (bank->label && (strlen(bank->label) > 0))
820	properties[prop_idx++] = PROPERTY_ENTRY_STRING("gpio-sim,label",	820	properties[prop_idx++] = PROPERTY_ENTRY_STRING("gpio-sim,label",
821	bank->label);	821	bank->label);
822		822

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c+81−0

@@ -1525,6 +1525,87 @@ static const u16 amdgpu_unsupported_pciidlist[] = { · 1524 unmodified lines
1525	0x99A0,	1525	0x99A0,
1526	0x99A2,	1526	0x99A2,
1527	0x99A4,	1527	0x99A4,
		1528	/* radeon secondary ids */
		1529	0x3171,
		1530	0x3e70,
		1531	0x4164,
		1532	0x4165,
		1533	0x4166,
		1534	0x4168,
		1535	0x4170,
		1536	0x4171,
		1537	0x4172,
		1538	0x4173,
		1539	0x496e,
		1540	0x4a69,
		1541	0x4a6a,
		1542	0x4a6b,
		1543	0x4a70,
		1544	0x4a74,
		1545	0x4b69,
		1546	0x4b6b,
		1547	0x4b6c,
		1548	0x4c6e,
		1549	0x4e64,
		1550	0x4e65,
		1551	0x4e66,
		1552	0x4e67,
		1553	0x4e68,
		1554	0x4e69,
		1555	0x4e6a,
		1556	0x4e71,
		1557	0x4f73,
		1558	0x5569,
		1559	0x556b,
		1560	0x556d,
		1561	0x556f,
		1562	0x5571,
		1563	0x5854,
		1564	0x5874,
		1565	0x5940,
		1566	0x5941,
		1567	0x5b72,
		1568	0x5b73,
		1569	0x5b74,
		1570	0x5b75,
		1571	0x5d44,
		1572	0x5d45,
		1573	0x5d6d,
		1574	0x5d6f,
		1575	0x5d72,
		1576	0x5d77,
		1577	0x5e6b,
		1578	0x5e6d,
		1579	0x7120,
		1580	0x7124,
		1581	0x7129,
		1582	0x712e,
		1583	0x712f,
		1584	0x7162,
		1585	0x7163,
		1586	0x7166,
		1587	0x7167,
		1588	0x7172,
		1589	0x7173,
		1590	0x71a0,
		1591	0x71a1,
		1592	0x71a3,
		1593	0x71a7,
		1594	0x71bb,
		1595	0x71e0,
		1596	0x71e1,
		1597	0x71e2,
		1598	0x71e6,
		1599	0x71e7,
		1600	0x71f2,
		1601	0x7269,
		1602	0x726b,
		1603	0x726e,
		1604	0x72a0,
		1605	0x72a8,
		1606	0x72b1,
		1607	0x72b3,
		1608	0x793f,
1528	};	1609	};
1529		1610
1530	static const struct pci_device_id pciidlist[] = {	1611	static const struct pci_device_id pciidlist[] = {

drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c+2−2

 	kfree(surface_type);
 free_tiling_mode:
 	kfree(tiling_mode);
-free_yclk:
-	kfree(yclk);
 free_sclk:
 	kfree(sclk);
+free_yclk:
+	kfree(yclk);
 }
 /*******************************************************************************

drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c+0−1

@@ -503,7 +503,6 @@ static void dcn_bw_calc_rq_dlg_ttu( · 502 unmodified lines
503	//input[in_idx].dout.output_standard;	503	//input[in_idx].dout.output_standard;
504		504
505	/todo: soc->sr_enter_plus_exit_time??/	505	/todo: soc->sr_enter_plus_exit_time??/
506	dlg_sys_param->t_srx_delay_us = dc->dcn_ip->dcfclk_cstate_latency / v->dcf_clk_deep_sleep;
507		506
508	dml1_rq_dlg_get_rq_params(dml, rq_param, &input->pipe.src);	507	dml1_rq_dlg_get_rq_params(dml, rq_param, &input->pipe.src);
509	dml1_extract_rq_regs(dml, rq_regs, rq_param);	508	dml1_extract_rq_regs(dml, rq_regs, rq_param);

drivers/gpu/drm/amd/display/dc/core/dc.c+27−13

 				status->timing_sync_info.master = false;
 		}
-		/* remove any other unblanked pipes as they have already been synced */
-		for (j = j + 1; j < group_size; j++) {
-			bool is_blanked;
-			if (pipe_set[j]->stream_res.opp->funcs->dpg_is_blanked)
+		/* remove any other pipes that are already been synced */
-				is_blanked =
+		if (dc->config.use_pipe_ctx_sync_logic) {
-					pipe_set[j]->stream_res.opp->funcs->dpg_is_blanked(pipe_set[j]->stream_res.opp);
+			/* check pipe's syncd to decide which pipe to be removed */
-			else
+			for (j = 1; j < group_size; j++) {
-				is_blanked =
+				if (pipe_set[j]->pipe_idx_syncd == pipe_set[0]->pipe_idx_syncd) {
-					pipe_set[j]->stream_res.tg->funcs->is_blanked(pipe_set[j]->stream_res.tg);
+					group_size--;
-			if (!is_blanked) {
+					pipe_set[j] = pipe_set[group_size];
-				group_size--;
+					j--;
-				pipe_set[j] = pipe_set[group_size];
+				} else
-				j--;
+					/* link slave pipe's syncd with master pipe */
+					pipe_set[j]->pipe_idx_syncd = pipe_set[0]->pipe_idx_syncd;
+			}
+		} else {
+			for (j = j + 1; j < group_size; j++) {
+				bool is_blanked;
+				if (pipe_set[j]->stream_res.opp->funcs->dpg_is_blanked)
+					is_blanked =
+						pipe_set[j]->stream_res.opp->funcs->dpg_is_blanked(pipe_set[j]->stream_res.opp);
+				else
+					is_blanked =
+						pipe_set[j]->stream_res.tg->funcs->is_blanked(pipe_set[j]->stream_res.tg);
+				if (!is_blanked) {
+					group_size--;
+					pipe_set[j] = pipe_set[group_size];
+					j--;
+				}
 			}
 		}

drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c+3−3

@@ -202,7 +202,7 @@ void dp_wait_for_training_aux_rd_interval( · 201 unmodified lines
202	uint32_t wait_in_micro_secs)	202	uint32_t wait_in_micro_secs)
203	{	203	{
204	#if defined(CONFIG_DRM_AMD_DC_DCN)	204	#if defined(CONFIG_DRM_AMD_DC_DCN)
205	if (wait_in_micro_secs > 16000)	205	if (wait_in_micro_secs > 1000)
206	msleep(wait_in_micro_secs/1000);	206	msleep(wait_in_micro_secs/1000);
207	else	207	else
208	udelay(wait_in_micro_secs);	208	udelay(wait_in_micro_secs);
@@ -6935,7 +6935,7 @@ bool dpcd_write_128b_132b_sst_payload_allocation_table( · 6726 unmodified lines
6935	}	6935	}
6936	}	6936	}
6937	retries++;	6937	retries++;
6938	udelay(5000);	6938	msleep(5);
6939	}	6939	}
6940		6940
6941	if (!result && retries == max_retries) {	6941	if (!result && retries == max_retries) {
@@ -6987,7 +6987,7 @@ bool dpcd_poll_for_allocation_change_trigger(struct dc_link *link) · 45 unmodified lines
6987	break;	6987	break;
6988	}	6988	}
6989		6989
6990	udelay(5000);	6990	msleep(5);
6991	}	6991	}
6992		6992
6993	if (result == ACT_FAILED) {	6993	if (result == ACT_FAILED) {

drivers/gpu/drm/amd/display/dc/core/dc_resource.c+54−0

@@ -3217,6 +3217,60 @@ struct hpo_dp_link_encoder *resource_get_hpo_dp_link_enc_for_det_lt( · 3216 unmodified lines
3217	}	3217	}
3218	#endif	3218	#endif
3219		3219
		3220	void reset_syncd_pipes_from_disabled_pipes(struct dc *dc,
		3221	struct dc_state *context)
		3222	{
		3223	int i, j;
		3224	struct pipe_ctx pipe_ctx_old, pipe_ctx, *pipe_ctx_syncd;
		3225
		3226	/* If pipe backend is reset, need to reset pipe syncd status */
		3227	for (i = 0; i < dc->res_pool->pipe_count; i++) {
		3228	pipe_ctx_old = &dc->current_state->res_ctx.pipe_ctx[i];
		3229	pipe_ctx = &context->res_ctx.pipe_ctx[i];
		3230
		3231	if (!pipe_ctx_old->stream)
		3232	continue;
		3233
		3234	if (pipe_ctx_old->top_pipe \|\| pipe_ctx_old->prev_odm_pipe)
		3235	continue;
		3236
		3237	if (!pipe_ctx->stream \|\|
		3238	pipe_need_reprogram(pipe_ctx_old, pipe_ctx)) {
		3239
		3240	/* Reset all the syncd pipes from the disabled pipe */
		3241	for (j = 0; j < dc->res_pool->pipe_count; j++) {
		3242	pipe_ctx_syncd = &context->res_ctx.pipe_ctx[j];
		3243	if ((GET_PIPE_SYNCD_FROM_PIPE(pipe_ctx_syncd) == pipe_ctx_old->pipe_idx) \|\|
		3244	!IS_PIPE_SYNCD_VALID(pipe_ctx_syncd))
		3245	SET_PIPE_SYNCD_TO_PIPE(pipe_ctx_syncd, j);
		3246	}
		3247	}
		3248	}
		3249	}
		3250
		3251	void check_syncd_pipes_for_disabled_master_pipe(struct dc *dc,
		3252	struct dc_state *context,
		3253	uint8_t disabled_master_pipe_idx)
		3254	{
		3255	int i;
		3256	struct pipe_ctx pipe_ctx, pipe_ctx_check;
		3257
		3258	pipe_ctx = &context->res_ctx.pipe_ctx[disabled_master_pipe_idx];
		3259	if ((GET_PIPE_SYNCD_FROM_PIPE(pipe_ctx) != disabled_master_pipe_idx) \|\|
		3260	!IS_PIPE_SYNCD_VALID(pipe_ctx))
		3261	SET_PIPE_SYNCD_TO_PIPE(pipe_ctx, disabled_master_pipe_idx);
		3262
		3263	/* for the pipe disabled, check if any slave pipe exists and assert */
		3264	for (i = 0; i < dc->res_pool->pipe_count; i++) {
		3265	pipe_ctx_check = &context->res_ctx.pipe_ctx[i];
		3266
		3267	if ((GET_PIPE_SYNCD_FROM_PIPE(pipe_ctx_check) == disabled_master_pipe_idx) &&
		3268	IS_PIPE_SYNCD_VALID(pipe_ctx_check) && (i != disabled_master_pipe_idx))
		3269	DC_ERR("DC: Failure: pipe_idx[%d] syncd with disabled master pipe_idx[%d]\n",
		3270	i, disabled_master_pipe_idx);
		3271	}
		3272	}
		3273
3220	uint8_t resource_transmitter_to_phy_idx(const struct dc *dc, enum transmitter transmitter)	3274	uint8_t resource_transmitter_to_phy_idx(const struct dc *dc, enum transmitter transmitter)
3221	{	3275	{
3222	/* TODO - get transmitter to phy idx mapping from DMUB */	3276	/* TODO - get transmitter to phy idx mapping from DMUB */

drivers/gpu/drm/amd/display/dc/dc.h+1−0

@@ -344,6 +344,7 @@ struct dc_config { · 343 unmodified lines
344	uint8_t vblank_alignment_max_frame_time_diff;	344	uint8_t vblank_alignment_max_frame_time_diff;
345	bool is_asymmetric_memory;	345	bool is_asymmetric_memory;
346	bool is_single_rank_dimm;	346	bool is_single_rank_dimm;
		347	bool use_pipe_ctx_sync_logic;
347	};	348	};
348		349
349	enum visual_confirm {	350	enum visual_confirm {

drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c+9−1

 				&pipe_ctx->stream->audio_info);
 	}
+	/* make sure no pipes syncd to the pipe being enabled */
+	if (!pipe_ctx->stream->apply_seamless_boot_optimization && dc->config.use_pipe_ctx_sync_logic)
+		check_syncd_pipes_for_disabled_master_pipe(dc, context, pipe_ctx->pipe_idx);
 #if defined(CONFIG_DRM_AMD_DC_DCN)
 	/* DCN3.1 FPGA Workaround
 	 * Need to enable HPO DP Stream Encoder before setting OTG master enable.
 			pipe_ctx->stream_res.stream_enc,
 			pipe_ctx->stream_res.tg->inst);
-	if (dc_is_dp_signal(pipe_ctx->stream->signal) &&
+	if (dc_is_embedded_signal(pipe_ctx->stream->signal) &&
 		pipe_ctx->stream_res.stream_enc->funcs->reset_fifo)
 		pipe_ctx->stream_res.stream_enc->funcs->reset_fifo(
 			pipe_ctx->stream_res.stream_enc);
 	enum dc_status status;
 	int i;
+	/* reset syncd pipes from disabled pipes */
+	if (dc->config.use_pipe_ctx_sync_logic)
+		reset_syncd_pipes_from_disabled_pipes(dc, context);
 	/* Reset old context */
 	/* look up the targets that have been removed since last commit */
 	hws->funcs.reset_hw_ctx_wrap(dc, context);

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c+2−2

 	dc->res_pool->funcs->update_soc_for_wm_a(dc, context);
 	pipe_cnt = dc->res_pool->funcs->populate_dml_pipes(dc, context, pipes, fast_validate);
-	DC_FP_START();
 	if (!pipe_cnt) {
 		out = true;
 		goto validate_out;
 	out = false;
 validate_out:
-	DC_FP_END();
 	return out;
 }
 	BW_VAL_TRACE_COUNT();
+	DC_FP_START();
 	out = dcn30_internal_validate_bw(dc, context, pipes, &pipe_cnt, &vlevel, fast_validate);
+	DC_FP_END();
 	if (pipe_cnt == 0)
 		goto validate_out;

drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c+12−1

 	.disable_clock_gate = true,
 	.disable_pplib_clock_request = true,
 	.disable_pplib_wm_range = true,
-	.pipe_split_policy = MPC_SPLIT_DYNAMIC,
+	.pipe_split_policy = MPC_SPLIT_AVOID,
 	.force_single_disp_pipe_split = false,
 	.disable_dcc = DCC_ENABLE,
 	.vsr_support = true,
 	pp_smu->nv_funcs.set_wm_ranges(&pp_smu->nv_funcs.pp_smu, &ranges);
 }
+static void dcn301_calculate_wm_and_dlg(
+		struct dc *dc, struct dc_state *context,
+		display_e2e_pipe_params_st *pipes,
+		int pipe_cnt,
+		int vlevel)
+{
+	DC_FP_START();
+	dcn301_calculate_wm_and_dlg_fp(dc, context, pipes, pipe_cnt, vlevel);
+	DC_FP_END();
+}
 static struct resource_funcs dcn301_res_pool_funcs = {
 	.destroy = dcn301_destroy_resource_pool,
 	.link_enc_create = dcn301_link_encoder_create,

drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c+3−0

@@ -2260,6 +2260,9 @@ static bool dcn31_resource_construct( · 2259 unmodified lines
2260	dc->caps.color.mpc.ogam_rom_caps.hlg = 0;	2260	dc->caps.color.mpc.ogam_rom_caps.hlg = 0;
2261	dc->caps.color.mpc.ocsc = 1;	2261	dc->caps.color.mpc.ocsc = 1;
2262		2262
		2263	/* Use pipe context based otg sync logic */
		2264	dc->config.use_pipe_ctx_sync_logic = true;
		2265
2263	/* read VBIOS LTTPR caps */	2266	/* read VBIOS LTTPR caps */
2264	{	2267	{
2265	if (ctx->dc_bios->funcs->get_lttpr_caps) {	2268	if (ctx->dc_bios->funcs->get_lttpr_caps) {

drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c+0−2

@@ -1576,8 +1576,6 @@ void dml20_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib, · 1575 unmodified lines
1576	dlg_sys_param.total_flip_bytes = get_total_immediate_flip_bytes(mode_lib,	1576	dlg_sys_param.total_flip_bytes = get_total_immediate_flip_bytes(mode_lib,
1577	e2e_pipe_param,	1577	e2e_pipe_param,
1578	num_pipes);	1578	num_pipes);
1579	dlg_sys_param.t_srx_delay_us = mode_lib->ip.dcfclk_cstate_latency
1580	/ dlg_sys_param.deepsleep_dcfclk_mhz; // TODO: Deprecated
1581		1579
1582	print__dlg_sys_params_st(mode_lib, &dlg_sys_param);	1580	print__dlg_sys_params_st(mode_lib, &dlg_sys_param);
1583		1581

drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c+0−2

@@ -1577,8 +1577,6 @@ void dml20v2_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib, · 1576 unmodified lines
1577	dlg_sys_param.total_flip_bytes = get_total_immediate_flip_bytes(mode_lib,	1577	dlg_sys_param.total_flip_bytes = get_total_immediate_flip_bytes(mode_lib,
1578	e2e_pipe_param,	1578	e2e_pipe_param,
1579	num_pipes);	1579	num_pipes);
1580	dlg_sys_param.t_srx_delay_us = mode_lib->ip.dcfclk_cstate_latency
1581	/ dlg_sys_param.deepsleep_dcfclk_mhz; // TODO: Deprecated
1582		1580
1583	print__dlg_sys_params_st(mode_lib, &dlg_sys_param);	1581	print__dlg_sys_params_st(mode_lib, &dlg_sys_param);
1584		1582

drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c+0−2

@@ -1688,8 +1688,6 @@ void dml21_rq_dlg_get_dlg_reg( · 1687 unmodified lines
1688	mode_lib,	1688	mode_lib,
1689	e2e_pipe_param,	1689	e2e_pipe_param,
1690	num_pipes);	1690	num_pipes);
1691	dlg_sys_param.t_srx_delay_us = mode_lib->ip.dcfclk_cstate_latency
1692	/ dlg_sys_param.deepsleep_dcfclk_mhz; // TODO: Deprecated
1693		1691
1694	print__dlg_sys_params_st(mode_lib, &dlg_sys_param);	1692	print__dlg_sys_params_st(mode_lib, &dlg_sys_param);
1695		1693

drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c+0−2

@@ -1858,8 +1858,6 @@ void dml30_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib, · 1857 unmodified lines
1858	dlg_sys_param.total_flip_bytes = get_total_immediate_flip_bytes(mode_lib,	1858	dlg_sys_param.total_flip_bytes = get_total_immediate_flip_bytes(mode_lib,
1859	e2e_pipe_param,	1859	e2e_pipe_param,
1860	num_pipes);	1860	num_pipes);
1861	dlg_sys_param.t_srx_delay_us = mode_lib->ip.dcfclk_cstate_latency
1862	/ dlg_sys_param.deepsleep_dcfclk_mhz; // TODO: Deprecated
1863		1861
1864	print__dlg_sys_params_st(mode_lib, &dlg_sys_param);	1862	print__dlg_sys_params_st(mode_lib, &dlg_sys_param);
1865		1863

drivers/gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c+1−1

@@ -327,7 +327,7 @@ void dcn301_fpu_init_soc_bounding_box(struct bp_soc_bb_info bb_info) · 326 unmodified lines
327	dcn3_01_soc.sr_exit_time_us = bb_info.dram_sr_exit_latency_100ns * 10;	327	dcn3_01_soc.sr_exit_time_us = bb_info.dram_sr_exit_latency_100ns * 10;
328	}	328	}
329		329
330	void dcn301_calculate_wm_and_dlg(struct dc *dc,	330	void dcn301_calculate_wm_and_dlg_fp(struct dc *dc,
331	struct dc_state *context,	331	struct dc_state *context,
332	display_e2e_pipe_params_st *pipes,	332	display_e2e_pipe_params_st *pipes,
333	int pipe_cnt,	333	int pipe_cnt,

drivers/gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.h+1−1

@@ -34,7 +34,7 @@ void dcn301_fpu_set_wm_ranges(int i, · 33 unmodified lines
34		34
35	void dcn301_fpu_init_soc_bounding_box(struct bp_soc_bb_info bb_info);	35	void dcn301_fpu_init_soc_bounding_box(struct bp_soc_bb_info bb_info);
36		36
37	void dcn301_calculate_wm_and_dlg(struct dc *dc,	37	void dcn301_calculate_wm_and_dlg_fp(struct dc *dc,
38	struct dc_state *context,	38	struct dc_state *context,
39	display_e2e_pipe_params_st *pipes,	39	display_e2e_pipe_params_st *pipes,
40	int pipe_cnt,	40	int pipe_cnt,

drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h+0−1

@@ -546,7 +546,6 @@ struct _vcs_dpi_display_dlg_sys_params_st { · 545 unmodified lines
546	double t_sr_wm_us;	546	double t_sr_wm_us;
547	double t_extra_us;	547	double t_extra_us;
548	double mem_trip_us;	548	double mem_trip_us;
549	double t_srx_delay_us;
550	double deepsleep_dcfclk_mhz;	549	double deepsleep_dcfclk_mhz;
551	double total_flip_bw;	550	double total_flip_bw;
552	unsigned int total_flip_bytes;	551	unsigned int total_flip_bytes;

drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_helpers.c+0−3

 	dml_print("DML_RQ_DLG_CALC:    t_urg_wm_us          = %3.2f\n", dlg_sys_param->t_urg_wm_us);
 	dml_print("DML_RQ_DLG_CALC:    t_sr_wm_us           = %3.2f\n", dlg_sys_param->t_sr_wm_us);
 	dml_print("DML_RQ_DLG_CALC:    t_extra_us           = %3.2f\n", dlg_sys_param->t_extra_us);
-	dml_print(
-			"DML_RQ_DLG_CALC:    t_srx_delay_us       = %3.2f\n",
-			dlg_sys_param->t_srx_delay_us);
 	dml_print(
 			"DML_RQ_DLG_CALC:    deepsleep_dcfclk_mhz = %3.2f\n",
 			dlg_sys_param->deepsleep_dcfclk_mhz);

drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c+0−4

 	if (dual_plane)
 		DTRACE("DLG: %s: swath_height_c     = %d", __func__, swath_height_c);
-	DTRACE(
-			"DLG: %s: t_srx_delay_us     = %3.2f",
-			__func__,
-			(double) dlg_sys_param->t_srx_delay_us);
 	DTRACE("DLG: %s: line_time_in_us    = %3.2f", __func__, (double) line_time_in_us);
 	DTRACE("DLG: %s: vupdate_offset     = %d", __func__, vupdate_offset);
 	DTRACE("DLG: %s: vupdate_width      = %d", __func__, vupdate_width);

drivers/gpu/drm/amd/display/dc/inc/core_types.h+1−0

@@ -382,6 +382,7 @@ struct pipe_ctx { · 381 unmodified lines
382	struct pll_settings pll_settings;	382	struct pll_settings pll_settings;
383		383
384	uint8_t pipe_idx;	384	uint8_t pipe_idx;
		385	uint8_t pipe_idx_syncd;
385		386
386	struct pipe_ctx *top_pipe;	387	struct pipe_ctx *top_pipe;
387	struct pipe_ctx *bottom_pipe;	388	struct pipe_ctx *bottom_pipe;

drivers/gpu/drm/amd/display/dc/inc/resource.h+11−0

 #define MEMORY_TYPE_HBM 2
+#define IS_PIPE_SYNCD_VALID(pipe) ((((pipe)->pipe_idx_syncd) & 0x80)?1:0)
+#define GET_PIPE_SYNCD_FROM_PIPE(pipe) ((pipe)->pipe_idx_syncd & 0x7F)
+#define SET_PIPE_SYNCD_TO_PIPE(pipe, pipe_syncd) ((pipe)->pipe_idx_syncd = (0x80 | pipe_syncd))
 enum dce_version resource_parse_asic_id(
 		struct hw_asic_id asic_id);
 		const struct dc_link *link);
 #endif
+void reset_syncd_pipes_from_disabled_pipes(struct dc *dc,
+	struct dc_state *context);
+void check_syncd_pipes_for_disabled_master_pipe(struct dc *dc,
+	struct dc_state *context,
+	uint8_t disabled_master_pipe_idx);
 uint8_t resource_transmitter_to_phy_idx(const struct dc *dc, enum transmitter transmitter);
 #endif /* DRIVERS_GPU_DRM_AMD_DC_DEV_DC_INC_RESOURCE_H_ */

drivers/gpu/drm/ast/ast_tables.h+0−2

@@ -282,8 +282,6 @@ static const struct ast_vbios_enhtable res_1360x768[] = { · 281 unmodified lines
282	};	282	};
283		283
284	static const struct ast_vbios_enhtable res_1600x900[] = {	284	static const struct ast_vbios_enhtable res_1600x900[] = {
285	{1800, 1600, 24, 80, 1000, 900, 1, 3, VCLK108, /* 60Hz */
286	(SyncPP \| Charx8Dot \| LineCompareOff \| WideScreenMode \| NewModeInfo), 60, 3, 0x3A },
287	{1760, 1600, 48, 32, 926, 900, 3, 5, VCLK97_75, /* 60Hz CVT RB */	285	{1760, 1600, 48, 32, 926, 900, 3, 5, VCLK97_75, /* 60Hz CVT RB */
288	(SyncNP \| Charx8Dot \| LineCompareOff \| WideScreenMode \| NewModeInfo \|	286	(SyncNP \| Charx8Dot \| LineCompareOff \| WideScreenMode \| NewModeInfo \|
289	AST2500PreCatchCRT), 60, 1, 0x3A },	287	AST2500PreCatchCRT), 60, 1, 0x3A },

drivers/gpu/drm/drm_atomic.c+8−4

 	drm_dbg_atomic(dev, "checking %p\n", state);
-	for_each_new_crtc_in_state(state, crtc, new_crtc_state, i)
+	for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
-		requested_crtc |= drm_crtc_mask(crtc);
+		if (new_crtc_state->enable)
+			requested_crtc |= drm_crtc_mask(crtc);
+	}
 	for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {
 		ret = drm_atomic_plane_check(old_plane_state, new_plane_state);
 		}
 	}
-	for_each_new_crtc_in_state(state, crtc, new_crtc_state, i)
+	for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
-		affected_crtc |= drm_crtc_mask(crtc);
+		if (new_crtc_state->enable)
+			affected_crtc |= drm_crtc_mask(crtc);
+	}
 	/*
 	 * For commits that allow modesets drivers can add other CRTCs to the

drivers/gpu/drm/drm_panel_orientation_quirks.c+12−0

 	.orientation = DRM_MODE_PANEL_ORIENTATION_RIGHT_UP,
 };
+static const struct drm_dmi_panel_orientation_data lcd1600x2560_leftside_up = {
+	.width = 1600,
+	.height = 2560,
+	.orientation = DRM_MODE_PANEL_ORIENTATION_LEFT_UP,
+};
 static const struct dmi_system_id orientation_data[] = {
 	{	/* Acer One 10 (S1003) */
 		.matches = {
 		  DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "Default string"),
 		},
 		.driver_data = (void *)&onegx1_pro,
+	}, {	/* OneXPlayer */
+		.matches = {
+		  DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ONE-NETBOOK TECHNOLOGY CO., LTD."),
+		  DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "ONE XPLAYER"),
+		},
+		.driver_data = (void *)&lcd1600x2560_leftside_up,
 	}, {	/* Samsung GalaxyBook 10.6 */
 		.matches = {
 		  DMI_EXACT_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),

drivers/gpu/drm/drm_privacy_screen_x86.c+3−0

@@ -33,6 +33,9 @@ static bool __init detect_thinkpad_privacy_screen(void) · 32 unmodified lines
33	unsigned long long output;	33	unsigned long long output;
34	acpi_status status;	34	acpi_status status;
35		35
		36	if (acpi_disabled)
		37	return false;
		38
36	/* Get embedded-controller handle */	39	/* Get embedded-controller handle */
37	status = acpi_get_devices("PNP0C09", acpi_set_handle, NULL, &ec_handle);	40	status = acpi_get_devices("PNP0C09", acpi_set_handle, NULL, &ec_handle);
38	if (ACPI_FAILURE(status) \|\| !ec_handle)	41	if (ACPI_FAILURE(status) \|\| !ec_handle)

drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c+2−2

@@ -469,8 +469,8 @@ int etnaviv_ioctl_gem_submit(struct drm_device dev, void data, · 468 unmodified lines
469	return -EINVAL;	469	return -EINVAL;
470	}	470	}
471		471
472	if (args->stream_size > SZ_64K \|\| args->nr_relocs > SZ_64K \|\|	472	if (args->stream_size > SZ_128K \|\| args->nr_relocs > SZ_128K \|\|
473	args->nr_bos > SZ_64K \|\| args->nr_pmrs > 128) {	473	args->nr_bos > SZ_128K \|\| args->nr_pmrs > 128) {
474	DRM_ERROR("submit arguments out of size limits\n");	474	DRM_ERROR("submit arguments out of size limits\n");
475	return -EINVAL;	475	return -EINVAL;
476	}	476	}

drivers/gpu/drm/msm/adreno/a6xx_gpu.c+2−0

@@ -1560,6 +1560,8 @@ static int a6xx_pm_suspend(struct msm_gpu *gpu) · 1559 unmodified lines
1560	for (i = 0; i < gpu->nr_rings; i++)	1560	for (i = 0; i < gpu->nr_rings; i++)
1561	a6xx_gpu->shadow[i] = 0;	1561	a6xx_gpu->shadow[i] = 0;
1562		1562
		1563	gpu->suspend_count++;
		1564
1563	return 0;	1565	return 0;
1564	}	1566	}
1565		1567

drivers/gpu/drm/msm/adreno/adreno_device.c+18−0

@@ -608,9 +608,27 @@ static int adreno_resume(struct device *dev) · 607 unmodified lines
608	return gpu->funcs->pm_resume(gpu);	608	return gpu->funcs->pm_resume(gpu);
609	}	609	}
610		610
		611	static int active_submits(struct msm_gpu *gpu)
		612	{
		613	int active_submits;
		614	mutex_lock(&gpu->active_lock);
		615	active_submits = gpu->active_submits;
		616	mutex_unlock(&gpu->active_lock);
		617	return active_submits;
		618	}
		619
611	static int adreno_suspend(struct device *dev)	620	static int adreno_suspend(struct device *dev)
612	{	621	{
613	struct msm_gpu *gpu = dev_to_gpu(dev);	622	struct msm_gpu *gpu = dev_to_gpu(dev);
		623	int remaining;
		624
		625	remaining = wait_event_timeout(gpu->retire_event,
		626	active_submits(gpu) == 0,
		627	msecs_to_jiffies(1000));
		628	if (remaining == 0) {
		629	dev_err(dev, "Timeout waiting for GPU to suspend\n");
		630	return -EBUSY;
		631	}
614		632
615	return gpu->funcs->pm_suspend(gpu);	633	return gpu->funcs->pm_suspend(gpu);
616	}	634	}

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c+9−2

 		struct dpu_hw_pcc_cfg *cfg)
 {
-	u32 base = ctx->cap->sblk->pcc.base;
+	u32 base;
-	if (!ctx || !base) {
+	if (!ctx) {
+		DRM_ERROR("invalid ctx %pK\n", ctx);
+		return;
+	}
+	base = ctx->cap->sblk->pcc.base;
+	if (!base) {
 		DRM_ERROR("invalid ctx %pK pcc base 0x%x\n", ctx, base);
 		return;
 	}

drivers/gpu/drm/msm/dsi/dsi.c+6−1

 	of_node_put(phy_node);
-	if (!phy_pdev || !msm_dsi->phy) {
+	if (!phy_pdev) {
+		DRM_DEV_ERROR(&pdev->dev, "%s: phy driver is not ready\n", __func__);
+		return -EPROBE_DEFER;
+	}
+	if (!msm_dsi->phy) {
+		put_device(&phy_pdev->dev);
 		DRM_DEV_ERROR(&pdev->dev, "%s: phy driver is not ready\n", __func__);
 		return -EPROBE_DEFER;
 	}

drivers/gpu/drm/msm/dsi/phy/dsi_phy.c+3−1

 			struct msm_dsi_phy_clk_request *clk_req,
 			struct msm_dsi_phy_shared_timings *shared_timings)
 {
-	struct device *dev = &phy->pdev->dev;
+	struct device *dev;
 	int ret;
 	if (!phy || !phy->cfg->ops.enable)
 		return -EINVAL;
+	dev = &phy->pdev->dev;
 	ret = dsi_phy_enable_resource(phy);
 	if (ret) {
 		DRM_DEV_ERROR(dev, "%s: resource enable failed, %d\n",

drivers/gpu/drm/msm/hdmi/hdmi.c+6−1

 	of_node_put(phy_node);
-	if (!phy_pdev || !hdmi->phy) {
+	if (!phy_pdev) {
 		DRM_DEV_ERROR(&pdev->dev, "phy driver is not ready\n");
 		return -EPROBE_DEFER;
 	}
+	if (!hdmi->phy) {
+		DRM_DEV_ERROR(&pdev->dev, "phy driver is not ready\n");
+		put_device(&phy_pdev->dev);
+		return -EPROBE_DEFER;
+	}
 	hdmi->phy_dev = get_device(&phy_pdev->dev);

drivers/gpu/drm/msm/msm_drv.c+1−4

 		of_node_put(node);
 		if (ret)
 			return ret;
-		size = r.end - r.start;
+		size = r.end - r.start + 1;
 		DRM_INFO("using VRAM carveout: %lx@%pa\n", size, &r.start);
 		/* if we have no IOMMU, then we need to use carveout allocator.
 	struct msm_drm_private *priv = dev_get_drvdata(dev);
 	struct drm_device *ddev;
 	struct msm_kms *kms;
-	struct msm_mdss *mdss;
 	int ret, i;
 	ddev = drm_dev_alloc(drv, dev);
 	ddev->dev_private = priv;
 	priv->dev = ddev;
-	mdss = priv->mdss;
 	priv->wq = alloc_ordered_workqueue("msm", 0);
 	priv->hangcheck_period = DRM_MSM_HANGCHECK_DEFAULT_PERIOD;

drivers/gpu/drm/msm/msm_gpu.c+3−0

 			}
 		}
 	}
+	wake_up_all(&gpu->retire_event);
 }
 static void retire_worker(struct kthread_work *work)
 	INIT_LIST_HEAD(&gpu->active_list);
 	mutex_init(&gpu->active_lock);
 	mutex_init(&gpu->lock);
+	init_waitqueue_head(&gpu->retire_event);
 	kthread_init_work(&gpu->retire_work, retire_worker);
 	kthread_init_work(&gpu->recover_work, recover_worker);
 	kthread_init_work(&gpu->fault_work, fault_worker);

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

@@ -230,6 +230,9 @@ struct msm_gpu { · 229 unmodified lines
230	/* work for handling GPU recovery: */	230	/* work for handling GPU recovery: */
231	struct kthread_work recover_work;	231	struct kthread_work recover_work;
232		232
		233	/** retire_event: notified when submits are retired: */
		234	wait_queue_head_t retire_event;
		235
233	/* work for handling active-list retiring: */	236	/* work for handling active-list retiring: */
234	struct kthread_work retire_work;	237	struct kthread_work retire_work;
235		238

drivers/gpu/drm/msm/msm_gpu_devfreq.c+19−2

 			      CLOCK_MONOTONIC, HRTIMER_MODE_REL);
 }
+static void cancel_idle_work(struct msm_gpu_devfreq *df)
+{
+	hrtimer_cancel(&df->idle_work.timer);
+	kthread_cancel_work_sync(&df->idle_work.work);
+}
+static void cancel_boost_work(struct msm_gpu_devfreq *df)
+{
+	hrtimer_cancel(&df->boost_work.timer);
+	kthread_cancel_work_sync(&df->boost_work.work);
+}
 void msm_devfreq_cleanup(struct msm_gpu *gpu)
 {
 	struct msm_gpu_devfreq *df = &gpu->devfreq;
 void msm_devfreq_suspend(struct msm_gpu *gpu)
 {
-	devfreq_suspend_device(gpu->devfreq.devfreq);
+	struct msm_gpu_devfreq *df = &gpu->devfreq;
+	devfreq_suspend_device(df->devfreq);
+	cancel_idle_work(df);
+	cancel_boost_work(df);
 }
 static void msm_devfreq_boost_work(struct kthread_work *work)
 	/*
 	 * Cancel any pending transition to idle frequency:
 	 */
-	hrtimer_cancel(&df->idle_work.timer);
+	cancel_idle_work(df);
 	idle_time = ktime_to_ms(ktime_sub(ktime_get(), df->idle_time));

drivers/gpu/drm/vc4/vc4_dsi.c+4−10

 			       struct mipi_dsi_device *device)
 {
 	struct vc4_dsi *dsi = host_to_dsi(host);
-	int ret;
 	dsi->lanes = device->lanes;
 	dsi->channel = device->channel;
 		return 0;
 	}
-	ret = component_add(&dsi->pdev->dev, &vc4_dsi_ops);
+	return component_add(&dsi->pdev->dev, &vc4_dsi_ops);
-	if (ret) {
-		mipi_dsi_host_unregister(&dsi->dsi_host);
-		return ret;
-	}
-	return 0;
 }
 static int vc4_dsi_host_detach(struct mipi_dsi_host *host,
 			       struct mipi_dsi_device *device)
 {
+	struct vc4_dsi *dsi = host_to_dsi(host);
+	component_del(&dsi->pdev->dev, &vc4_dsi_ops);
 	return 0;
 }
 	struct device *dev = &pdev->dev;
 	struct vc4_dsi *dsi = dev_get_drvdata(dev);
-	component_del(&pdev->dev, &vc4_dsi_ops);
 	mipi_dsi_host_unregister(&dsi->dsi_host);
 	return 0;
 }

drivers/hv/hv_balloon.c+7−0

@@ -1660,6 +1660,13 @@ static int balloon_connect_vsp(struct hv_device *dev) · 1659 unmodified lines
1660	unsigned long t;	1660	unsigned long t;
1661	int ret;	1661	int ret;
1662		1662
		1663	/*
		1664	* max_pkt_size should be large enough for one vmbus packet header plus
		1665	* our receive buffer size. Hyper-V sends messages up to
		1666	* HV_HYP_PAGE_SIZE bytes long on balloon channel.
		1667	*/
		1668	dev->channel->max_pkt_size = HV_HYP_PAGE_SIZE * 2;
		1669
1663	ret = vmbus_open(dev->channel, dm_ring_size, dm_ring_size, NULL, 0,	1670	ret = vmbus_open(dev->channel, dm_ring_size, dm_ring_size, NULL, 0,
1664	balloon_onchannelcallback, dev);	1671	balloon_onchannelcallback, dev);
1665	if (ret)	1672	if (ret)

drivers/hwmon/adt7470.c+3−0

@@ -662,6 +662,9 @@ static int adt7470_fan_write(struct device *dev, u32 attr, int channel, long val · 661 unmodified lines
662	struct adt7470_data *data = dev_get_drvdata(dev);	662	struct adt7470_data *data = dev_get_drvdata(dev);
663	int err;	663	int err;
664		664
		665	if (val <= 0)
		666	return -EINVAL;
		667
665	val = FAN_RPM_TO_PERIOD(val);	668	val = FAN_RPM_TO_PERIOD(val);
666	val = clamp_val(val, 1, 65534);	669	val = clamp_val(val, 1, 65534);
667		670

drivers/hwmon/lm90.c+11−10

 		.flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT
 		  | LM90_HAVE_BROKEN_ALERT | LM90_HAVE_CRIT,
 		.alert_alarms = 0x7c,
-		.max_convrate = 8,
+		.max_convrate = 7,
 	},
 	[lm86] = {
 		.flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT
 		.max_convrate = 9,
 	},
 	[max6646] = {
-		.flags = LM90_HAVE_CRIT,
+		.flags = LM90_HAVE_CRIT | LM90_HAVE_BROKEN_ALERT,
 		.alert_alarms = 0x7c,
 		.max_convrate = 6,
 		.reg_local_ext = MAX6657_REG_R_LOCAL_TEMPL,
 	},
 	[max6654] = {
+		.flags = LM90_HAVE_BROKEN_ALERT,
 		.alert_alarms = 0x7c,
 		.max_convrate = 7,
 		.reg_local_ext = MAX6657_REG_R_LOCAL_TEMPL,
 	},
 	[max6680] = {
 		.flags = LM90_HAVE_OFFSET | LM90_HAVE_CRIT
-		  | LM90_HAVE_CRIT_ALRM_SWP,
+		  | LM90_HAVE_CRIT_ALRM_SWP | LM90_HAVE_BROKEN_ALERT,
 		.alert_alarms = 0x7c,
 		.max_convrate = 7,
 	},
 		 * Re-enable ALERT# output if it was originally enabled and
 		 * relevant alarms are all clear
 		 */
-		if (!(data->config_orig & 0x80) &&
+		if ((client->irq || !(data->config_orig & 0x80)) &&
 		    !(data->alarms & data->alert_alarms)) {
 			if (data->config & 0x80) {
 				dev_dbg(&client->dev, "Re-enabling ALERT#\n");
 	if (st & LM90_STATUS_LLOW)
 		hwmon_notify_event(data->hwmon_dev, hwmon_temp,
-				   hwmon_temp_min, 0);
+				   hwmon_temp_min_alarm, 0);
 	if (st & LM90_STATUS_RLOW)
 		hwmon_notify_event(data->hwmon_dev, hwmon_temp,
-				   hwmon_temp_min, 1);
+				   hwmon_temp_min_alarm, 1);
 	if (st2 & MAX6696_STATUS2_R2LOW)
 		hwmon_notify_event(data->hwmon_dev, hwmon_temp,
-				   hwmon_temp_min, 2);
+				   hwmon_temp_min_alarm, 2);
 	if (st & LM90_STATUS_LHIGH)
 		hwmon_notify_event(data->hwmon_dev, hwmon_temp,
-				   hwmon_temp_max, 0);
+				   hwmon_temp_max_alarm, 0);
 	if (st & LM90_STATUS_RHIGH)
 		hwmon_notify_event(data->hwmon_dev, hwmon_temp,
-				   hwmon_temp_max, 1);
+				   hwmon_temp_max_alarm, 1);
 	if (st2 & MAX6696_STATUS2_R2HIGH)
 		hwmon_notify_event(data->hwmon_dev, hwmon_temp,
-				   hwmon_temp_max, 2);
+				   hwmon_temp_max_alarm, 2);
 	return true;
 }

drivers/hwmon/nct6775.c+3−3

@@ -1175,7 +1175,7 @@ static inline u8 in_to_reg(u32 val, u8 nr) · 1174 unmodified lines
1175		1175
1176	struct nct6775_data {	1176	struct nct6775_data {
1177	int addr; /* IO base of hw monitor block */	1177	int addr; /* IO base of hw monitor block */
1178	int sioreg; /* SIO register address */	1178	struct nct6775_sio_data *sio_data;
1179	enum kinds kind;	1179	enum kinds kind;
1180	const char *name;	1180	const char *name;
1181		1181
@@ -3559,7 +3559,7 @@ clear_caseopen(struct device dev, struct device_attribute attr, · 2377 unmodified lines
3559	const char *buf, size_t count)	3559	const char *buf, size_t count)
3560	{	3560	{
3561	struct nct6775_data *data = dev_get_drvdata(dev);	3561	struct nct6775_data *data = dev_get_drvdata(dev);
3562	struct nct6775_sio_data *sio_data = dev_get_platdata(dev);	3562	struct nct6775_sio_data *sio_data = data->sio_data;
3563	int nr = to_sensor_dev_attr(attr)->index - INTRUSION_ALARM_BASE;	3563	int nr = to_sensor_dev_attr(attr)->index - INTRUSION_ALARM_BASE;
3564	unsigned long val;	3564	unsigned long val;
3565	u8 reg;	3565	u8 reg;
@@ -3967,7 +3967,7 @@ static int nct6775_probe(struct platform_device *pdev) · 401 unmodified lines
3967	return -ENOMEM;	3967	return -ENOMEM;
3968		3968
3969	data->kind = sio_data->kind;	3969	data->kind = sio_data->kind;
3970	data->sioreg = sio_data->sioreg;	3970	data->sio_data = sio_data;
3971		3971
3972	if (sio_data->access == access_direct) {	3972	if (sio_data->access == access_direct) {
3973	data->addr = res->start;	3973	data->addr = res->start;

drivers/hwmon/pmbus/ir38064.c+1−1

@@ -62,7 +62,7 @@ static const struct i2c_device_id ir38064_id[] = { · 61 unmodified lines
62		62
63	MODULE_DEVICE_TABLE(i2c, ir38064_id);	63	MODULE_DEVICE_TABLE(i2c, ir38064_id);
64		64
65	static const struct of_device_id ir38064_of_match[] = {	65	static const struct of_device_id __maybe_unused ir38064_of_match[] = {
66	{ .compatible = "infineon,ir38060" },	66	{ .compatible = "infineon,ir38060" },
67	{ .compatible = "infineon,ir38064" },	67	{ .compatible = "infineon,ir38064" },
68	{ .compatible = "infineon,ir38164" },	68	{ .compatible = "infineon,ir38164" },

drivers/irqchip/irq-apple-aic.c+0−1

@@ -178,7 +178,6 @@ struct aic_irq_chip { · 177 unmodified lines
178	struct irq_domain *hw_domain;	178	struct irq_domain *hw_domain;
179	struct irq_domain *ipi_domain;	179	struct irq_domain *ipi_domain;
180	int nr_hw;	180	int nr_hw;
181	int ipi_hwirq;
182	};	181	};
183		182
184	static DEFINE_PER_CPU(uint32_t, aic_fiq_unmasked);	183	static DEFINE_PER_CPU(uint32_t, aic_fiq_unmasked);

drivers/irqchip/irq-gic-v3-its.c+101−22

@@ -4856,6 +4856,38 @@ static struct syscore_ops its_syscore_ops = { · 4855 unmodified lines
4856	.resume = its_restore_enable,	4856	.resume = its_restore_enable,
4857	};	4857	};
4858		4858
		4859	static void __init __iomem its_map_one(struct resource res, int *err)
		4860	{
		4861	void __iomem *its_base;
		4862	u32 val;
		4863
		4864	its_base = ioremap(res->start, SZ_64K);
		4865	if (!its_base) {
		4866	pr_warn("ITS@%pa: Unable to map ITS registers\n", &res->start);
		4867	*err = -ENOMEM;
		4868	return NULL;
		4869	}
		4870
		4871	val = readl_relaxed(its_base + GITS_PIDR2) & GIC_PIDR2_ARCH_MASK;
		4872	if (val != 0x30 && val != 0x40) {
		4873	pr_warn("ITS@%pa: No ITS detected, giving up\n", &res->start);
		4874	*err = -ENODEV;
		4875	goto out_unmap;
		4876	}
		4877
		4878	*err = its_force_quiescent(its_base);
		4879	if (*err) {
		4880	pr_warn("ITS@%pa: Failed to quiesce, giving up\n", &res->start);
		4881	goto out_unmap;
		4882	}
		4883
		4884	return its_base;
		4885
		4886	out_unmap:
		4887	iounmap(its_base);
		4888	return NULL;
		4889	}
		4890
4859	static int its_init_domain(struct fwnode_handle handle, struct its_node its)	4891	static int its_init_domain(struct fwnode_handle handle, struct its_node its)
4860	{	4892	{
4861	struct irq_domain *inner_domain;	4893	struct irq_domain *inner_domain;
@@ -4963,29 +4995,14 @@ static int __init its_probe_one(struct resource *res, · 101 unmodified lines
4963	{	4995	{
4964	struct its_node *its;	4996	struct its_node *its;
4965	void __iomem *its_base;	4997	void __iomem *its_base;
4966	u32 val, ctlr;
4967	u64 baser, tmp, typer;	4998	u64 baser, tmp, typer;
4968	struct page *page;	4999	struct page *page;
		5000	u32 ctlr;
4969	int err;	5001	int err;
4970		5002
4971	its_base = ioremap(res->start, SZ_64K);	5003	its_base = its_map_one(res, &err);
4972	if (!its_base) {	5004	if (!its_base)
4973	pr_warn("ITS@%pa: Unable to map ITS registers\n", &res->start);	5005	return err;
4974	return -ENOMEM;
4975	}
4976
4977	val = readl_relaxed(its_base + GITS_PIDR2) & GIC_PIDR2_ARCH_MASK;
4978	if (val != 0x30 && val != 0x40) {
4979	pr_warn("ITS@%pa: No ITS detected, giving up\n", &res->start);
4980	err = -ENODEV;
4981	goto out_unmap;
4982	}
4983
4984	err = its_force_quiescent(its_base);
4985	if (err) {
4986	pr_warn("ITS@%pa: Failed to quiesce, giving up\n", &res->start);
4987	goto out_unmap;
4988	}
4989		5006
4990	pr_info("ITS %pR\n", res);	5007	pr_info("ITS %pR\n", res);
4991		5008
@@ -5241,13 +5258,31 @@ static int its_cpu_memreserve_lpi(unsigned int cpu) · 249 unmodified lines
5241		5258
5242	out:	5259	out:
5243	/* Last CPU being brought up gets to issue the cleanup */	5260	/* Last CPU being brought up gets to issue the cleanup */
5244	if (cpumask_equal(&cpus_booted_once_mask, cpu_possible_mask))	5261	if (!IS_ENABLED(CONFIG_SMP) \|\|
		5262	cpumask_equal(&cpus_booted_once_mask, cpu_possible_mask))
5245	schedule_work(&rdist_memreserve_cpuhp_cleanup_work);	5263	schedule_work(&rdist_memreserve_cpuhp_cleanup_work);
5246		5264
5247	gic_data_rdist()->flags \|= RD_LOCAL_MEMRESERVE_DONE;	5265	gic_data_rdist()->flags \|= RD_LOCAL_MEMRESERVE_DONE;
5248	return ret;	5266	return ret;
5249	}	5267	}
5250		5268
		5269	/* Mark all the BASER registers as invalid before they get reprogrammed */
		5270	static int __init its_reset_one(struct resource *res)
		5271	{
		5272	void __iomem *its_base;
		5273	int err, i;
		5274
		5275	its_base = its_map_one(res, &err);
		5276	if (!its_base)
		5277	return err;
		5278
		5279	for (i = 0; i < GITS_BASER_NR_REGS; i++)
		5280	gits_write_baser(0, its_base + GITS_BASER + (i << 3));
		5281
		5282	iounmap(its_base);
		5283	return 0;
		5284	}
		5285
5251	static const struct of_device_id its_device_id[] = {	5286	static const struct of_device_id its_device_id[] = {
5252	{ .compatible = "arm,gic-v3-its", },	5287	{ .compatible = "arm,gic-v3-its", },
5253	{},	5288	{},
@@ -5258,6 +5293,26 @@ static int __init its_of_probe(struct device_node *node) · 4 unmodified lines
5258	struct device_node *np;	5293	struct device_node *np;
5259	struct resource res;	5294	struct resource res;
5260		5295
		5296	/*
		5297	* Make sure all the ITS are reset before we probe any, as
		5298	* they may be sharing memory. If any of the ITS fails to
		5299	* reset, don't even try to go any further, as this could
		5300	* result in something even worse.
		5301	*/
		5302	for (np = of_find_matching_node(node, its_device_id); np;
		5303	np = of_find_matching_node(np, its_device_id)) {
		5304	int err;
		5305
		5306	if (!of_device_is_available(np) \|\|
		5307	!of_property_read_bool(np, "msi-controller") \|\|
		5308	of_address_to_resource(np, 0, &res))
		5309	continue;
		5310
		5311	err = its_reset_one(&res);
		5312	if (err)
		5313	return err;
		5314	}
		5315
5261	for (np = of_find_matching_node(node, its_device_id); np;	5316	for (np = of_find_matching_node(node, its_device_id); np;
5262	np = of_find_matching_node(np, its_device_id)) {	5317	np = of_find_matching_node(np, its_device_id)) {
5263	if (!of_device_is_available(np))	5318	if (!of_device_is_available(np))
@@ -5420,11 +5475,35 @@ dom_err: · 156 unmodified lines
5420	return err;	5475	return err;
5421	}	5476	}
5422		5477
		5478	static int __init its_acpi_reset(union acpi_subtable_headers *header,
		5479	const unsigned long end)
		5480	{
		5481	struct acpi_madt_generic_translator *its_entry;
		5482	struct resource res;
		5483
		5484	its_entry = (struct acpi_madt_generic_translator *)header;
		5485	res = (struct resource) {
		5486	.start = its_entry->base_address,
		5487	.end = its_entry->base_address + ACPI_GICV3_ITS_MEM_SIZE - 1,
		5488	.flags = IORESOURCE_MEM,
		5489	};
		5490
		5491	return its_reset_one(&res);
		5492	}
		5493
5423	static void __init its_acpi_probe(void)	5494	static void __init its_acpi_probe(void)
5424	{	5495	{
5425	acpi_table_parse_srat_its();	5496	acpi_table_parse_srat_its();
5426	acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_TRANSLATOR,	5497	/*
5427	gic_acpi_parse_madt_its, 0);	5498	* Make sure all the ITS are reset before we probe any, as
		5499	* they may be sharing memory. If any of the ITS fails to
		5500	* reset, don't even try to go any further, as this could
		5501	* result in something even worse.
		5502	*/
		5503	if (acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_TRANSLATOR,
		5504	its_acpi_reset, 0) > 0)
		5505	acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_TRANSLATOR,
		5506	gic_acpi_parse_madt_its, 0);
5428	acpi_its_srat_maps_free();	5507	acpi_its_srat_maps_free();
5429	}	5508	}
5430	#else	5509	#else

drivers/irqchip/irq-loongson-pch-msi.c+1−1

@@ -241,7 +241,7 @@ static int pch_msi_init(struct device_node *node, · 240 unmodified lines
241	return 0;	241	return 0;
242		242
243	err_map:	243	err_map:
244	kfree(priv->msi_map);	244	bitmap_free(priv->msi_map);
245	err_priv:	245	err_priv:
246	kfree(priv);	246	kfree(priv);
247	return ret;	247	return ret;

drivers/irqchip/irq-realtek-rtl.c+12−6

 static int intc_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw)
 {
-	irq_set_chip_and_handler(hw, &realtek_ictl_irq, handle_level_irq);
+	irq_set_chip_and_handler(irq, &realtek_ictl_irq, handle_level_irq);
 	return 0;
 }
 {
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	struct irq_domain *domain;
-	unsigned int pending;
+	unsigned long pending;
+	unsigned int soc_int;
 	chained_irq_enter(chip, desc);
 	pending = readl(REG(RTL_ICTL_GIMR)) & readl(REG(RTL_ICTL_GISR));
 	if (unlikely(!pending)) {
 		spurious_interrupt();
 		goto out;
 	}
 	domain = irq_desc_get_handler_data(desc);
-	generic_handle_domain_irq(domain, __ffs(pending));
+	for_each_set_bit(soc_int, &pending, 32)
+		generic_handle_domain_irq(domain, soc_int);
 out:
 	chained_irq_exit(chip, desc);
  * SoC interrupts are cascaded to MIPS CPU interrupts according to the
  * interrupt-map in the device tree. Each SoC interrupt gets 4 bits for
  * the CPU interrupt in an Interrupt Routing Register. Max 32 SoC interrupts
- * thus go into 4 IRRs.
+ * thus go into 4 IRRs. A routing value of '0' means the interrupt is left
+ * disconnected. Routing values {1..15} connect to output lines {0..14}.
  */
 static int __init map_interrupts(struct device_node *node, struct irq_domain *domain)
 {
 		of_node_put(cpu_ictl);
 		cpu_int = be32_to_cpup(imap + 2);
-		if (cpu_int > 7)
+		if (cpu_int > 7 || cpu_int < 2)
 			return -EINVAL;
 		if (!(mips_irqs_set & BIT(cpu_int))) {
 			mips_irqs_set |= BIT(cpu_int);
 		}
-		regs[(soc_int * 4) / 32] |= cpu_int << (soc_int * 4) % 32;
+		/* Use routing values (1..6) for CPU interrupts (2..7) */
+		regs[(soc_int * 4) / 32] |= (cpu_int - 1) << (soc_int * 4) % 32;
 		imap += 3;
 	}

drivers/md/dm.c+3−17

 	struct mapped_device *md = io->md;
 	struct bio *bio = io->orig_bio;
-	io->start_time = bio_start_io_acct(bio);
+	bio_start_io_acct_time(bio, io->start_time);
 	if (unlikely(dm_stats_used(&md->stats)))
 		dm_stats_account_io(&md->stats, bio_data_dir(bio),
 				    bio->bi_iter.bi_sector, bio_sectors(bio),
 	io->md = md;
 	spin_lock_init(&io->endio_lock);
-	start_io_acct(io);
+	io->start_time = jiffies;
 	return io;
 }
 	ci->sector = bio->bi_iter.bi_sector;
 }
-#define __dm_part_stat_sub(part, field, subnd)	\
-	(part_stat_get(part, field) -= (subnd))
 /*
  * Entry point to split a bio into clones and submit them to the targets.
  */
 						  GFP_NOIO, &md->queue->bio_split);
 			ci.io->orig_bio = b;
-			/*
-			 * Adjust IO stats for each split, otherwise upon queue
-			 * reentry there will be redundant IO accounting.
-			 * NOTE: this is a stop-gap fix, a proper fix involves
-			 * significant refactoring of DM core's bio splitting
-			 * (by eliminating DM's splitting and just using bio_split)
-			 */
-			part_stat_lock();
-			__dm_part_stat_sub(dm_disk(md)->part0,
-					   sectors[op_stat_group(bio_op(bio))], ci.sector_count);
-			part_stat_unlock();
 			bio_chain(b, bio);
 			trace_block_split(b, bio->bi_iter.bi_sector);
 			submit_bio_noacct(bio);
 		}
 	}
+	start_io_acct(ci.io);
 	/* drop the extra reference count */
 	dm_io_dec_pending(ci.io, errno_to_blk_status(error));

drivers/misc/eeprom/at25.c+4−0

 		return -ENXIO;
 	}
+	at25 = devm_kzalloc(&spi->dev, sizeof(*at25), GFP_KERNEL);
+	if (!at25)
+		return -ENOMEM;
 	mutex_init(&at25->lock);
 	at25->spi = spi;
 	spi_set_drvdata(spi, at25);

drivers/net/dsa/Kconfig+1−0

@@ -36,6 +36,7 @@ config NET_DSA_LANTIQ_GSWIP · 35 unmodified lines
36	config NET_DSA_MT7530	36	config NET_DSA_MT7530
37	tristate "MediaTek MT753x and MT7621 Ethernet switch support"	37	tristate "MediaTek MT753x and MT7621 Ethernet switch support"
38	select NET_DSA_TAG_MTK	38	select NET_DSA_TAG_MTK
		39	select MEDIATEK_GE_PHY
39	help	40	help
40	This enables support for the MediaTek MT7530, MT7531, and MT7621	41	This enables support for the MediaTek MT7530, MT7531, and MT7621
41	Ethernet switch chips.	42	Ethernet switch chips.

drivers/net/ethernet/amd/xgbe/xgbe-drv.c+13−1

 		if (!channel->tx_ring)
 			break;
+		/* Deactivate the Tx timer */
 		del_timer_sync(&channel->tx_timer);
+		channel->tx_timer_active = 0;
 	}
 }
 			buf2_len = xgbe_rx_buf2_len(rdata, packet, len);
 			len += buf2_len;
+			if (buf2_len > rdata->rx.buf.dma_len) {
+				/* Hardware inconsistency within the descriptors
+				 * that has resulted in a length underflow.
+				 */
+				error = 1;
+				goto skip_data;
+			}
 			if (!skb) {
 				skb = xgbe_create_skb(pdata, napi, rdata,
 						      buf1_len);
 		if (!last || context_next)
 			goto read_again;
-		if (!skb)
+		if (!skb || error) {
+			dev_kfree_skb(skb);
 			goto next_packet;
+		}
 		/* Be sure we don't exceed the configured MTU */
 		max_len = netdev->mtu + ETH_HLEN;

drivers/net/ethernet/google/gve/gve_adminq.c+1−1

@@ -301,7 +301,7 @@ static int gve_adminq_parse_err(struct gve_priv *priv, u32 status) · 300 unmodified lines
301	*/	301	*/
302	static int gve_adminq_kick_and_wait(struct gve_priv *priv)	302	static int gve_adminq_kick_and_wait(struct gve_priv *priv)
303	{	303	{
304	u32 tail, head;	304	int tail, head;
305	int i;	305	int i;
306		306
307	tail = ioread32be(&priv->reg_bar0->adminq_event_counter);	307	tail = ioread32be(&priv->reg_bar0->adminq_event_counter);

drivers/net/ethernet/intel/e1000e/e1000.h+3−1

 	board_pch_lpt,
 	board_pch_spt,
 	board_pch_cnp,
-	board_pch_tgp
+	board_pch_tgp,
+	board_pch_adp
 };
 struct e1000_ps_page {
 extern const struct e1000_info e1000_pch_spt_info;
 extern const struct e1000_info e1000_pch_cnp_info;
 extern const struct e1000_info e1000_pch_tgp_info;
+extern const struct e1000_info e1000_pch_adp_info;
 extern const struct e1000_info e1000_es2_info;
 void e1000e_ptp_init(struct e1000_adapter *adapter);

drivers/net/ethernet/intel/e1000e/ich8lan.c+20−0

@@ -6021,3 +6021,23 @@ const struct e1000_info e1000_pch_tgp_info = { · 6020 unmodified lines
6021	.phy_ops = &ich8_phy_ops,	6021	.phy_ops = &ich8_phy_ops,
6022	.nvm_ops = &spt_nvm_ops,	6022	.nvm_ops = &spt_nvm_ops,
6023	};	6023	};
		6024
		6025	const struct e1000_info e1000_pch_adp_info = {
		6026	.mac = e1000_pch_adp,
		6027	.flags = FLAG_IS_ICH
		6028	\| FLAG_HAS_WOL
		6029	\| FLAG_HAS_HW_TIMESTAMP
		6030	\| FLAG_HAS_CTRLEXT_ON_LOAD
		6031	\| FLAG_HAS_AMT
		6032	\| FLAG_HAS_FLASH
		6033	\| FLAG_HAS_JUMBO_FRAMES
		6034	\| FLAG_APME_IN_WUC,
		6035	.flags2 = FLAG2_HAS_PHY_STATS
		6036	\| FLAG2_HAS_EEE,
		6037	.pba = 26,
		6038	.max_hw_frame_size = 9022,
		6039	.get_variants = e1000_get_variants_ich8lan,
		6040	.mac_ops = &ich8_mac_ops,
		6041	.phy_ops = &ich8_phy_ops,
		6042	.nvm_ops = &spt_nvm_ops,
		6043	};

drivers/net/ethernet/intel/e1000e/netdev.c+21−18

drivers/net/ethernet/intel/i40e/i40e.h+1−0

@@ -144,6 +144,7 @@ enum i40e_state_t { · 143 unmodified lines
144	__I40E_VIRTCHNL_OP_PENDING,	144	__I40E_VIRTCHNL_OP_PENDING,
145	__I40E_RECOVERY_MODE,	145	__I40E_RECOVERY_MODE,
146	__I40E_VF_RESETS_DISABLED, /* disable resets during i40e_remove */	146	__I40E_VF_RESETS_DISABLED, /* disable resets during i40e_remove */
		147	__I40E_IN_REMOVE,
147	__I40E_VFS_RELEASING,	148	__I40E_VFS_RELEASING,
148	/* This must be last as it determines the size of the BITMAP */	149	/* This must be last as it determines the size of the BITMAP */
149	__I40E_STATE_SIZE__,	150	__I40E_STATE_SIZE__,

drivers/net/ethernet/intel/i40e/i40e_main.c+29−2

@@ -5372,7 +5372,15 @@ static int i40e_vsi_configure_bw_alloc(struct i40e_vsi *vsi, u8 enabled_tc, · 5371 unmodified lines
5372	/* There is no need to reset BW when mqprio mode is on. */	5372	/* There is no need to reset BW when mqprio mode is on. */
5373	if (pf->flags & I40E_FLAG_TC_MQPRIO)	5373	if (pf->flags & I40E_FLAG_TC_MQPRIO)
5374	return 0;	5374	return 0;
5375	if (!vsi->mqprio_qopt.qopt.hw && !(pf->flags & I40E_FLAG_DCB_ENABLED)) {	5375
		5376	if (!vsi->mqprio_qopt.qopt.hw) {
		5377	if (pf->flags & I40E_FLAG_DCB_ENABLED)
		5378	goto skip_reset;
		5379
		5380	if (IS_ENABLED(CONFIG_I40E_DCB) &&
		5381	i40e_dcb_hw_get_num_tc(&pf->hw) == 1)
		5382	goto skip_reset;
		5383
5376	ret = i40e_set_bw_limit(vsi, vsi->seid, 0);	5384	ret = i40e_set_bw_limit(vsi, vsi->seid, 0);
5377	if (ret)	5385	if (ret)
5378	dev_info(&pf->pdev->dev,	5386	dev_info(&pf->pdev->dev,
@@ -5380,6 +5388,8 @@ static int i40e_vsi_configure_bw_alloc(struct i40e_vsi *vsi, u8 enabled_tc, · 1 unmodified line
5380	vsi->seid);	5388	vsi->seid);
5381	return ret;	5389	return ret;
5382	}	5390	}
		5391
		5392	skip_reset:
5383	memset(&bw_data, 0, sizeof(bw_data));	5393	memset(&bw_data, 0, sizeof(bw_data));
5384	bw_data.tc_valid_bits = enabled_tc;	5394	bw_data.tc_valid_bits = enabled_tc;
5385	for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++)	5395	for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++)
@@ -10853,6 +10863,9 @@ static void i40e_reset_and_rebuild(struct i40e_pf *pf, bool reinit, · 5467 unmodified lines
10853	bool lock_acquired)	10863	bool lock_acquired)
10854	{	10864	{
10855	int ret;	10865	int ret;
		10866
		10867	if (test_bit(__I40E_IN_REMOVE, pf->state))
		10868	return;
10856	/* Now we wait for GRST to settle out.	10869	/* Now we wait for GRST to settle out.
10857	* We don't have to delete the VEBs or VSIs from the hw switch	10870	* We don't have to delete the VEBs or VSIs from the hw switch
10858	* because the reset will make them disappear.	10871	* because the reset will make them disappear.
@@ -12212,6 +12225,8 @@ int i40e_reconfig_rss_queues(struct i40e_pf *pf, int queue_count) · 1353 unmodified lines
12212		12225
12213	vsi->req_queue_pairs = queue_count;	12226	vsi->req_queue_pairs = queue_count;
12214	i40e_prep_for_reset(pf);	12227	i40e_prep_for_reset(pf);
		12228	if (test_bit(__I40E_IN_REMOVE, pf->state))
		12229	return pf->alloc_rss_size;
12215		12230
12216	pf->alloc_rss_size = new_rss_size;	12231	pf->alloc_rss_size = new_rss_size;
12217		12232
@@ -13038,6 +13053,10 @@ static int i40e_xdp_setup(struct i40e_vsi vsi, struct bpf_prog prog, · 820 unmodified lines
13038	if (need_reset)	13053	if (need_reset)
13039	i40e_prep_for_reset(pf);	13054	i40e_prep_for_reset(pf);
13040		13055
		13056	/* VSI shall be deleted in a moment, just return EINVAL */
		13057	if (test_bit(__I40E_IN_REMOVE, pf->state))
		13058	return -EINVAL;
		13059
13041	old_prog = xchg(&vsi->xdp_prog, prog);	13060	old_prog = xchg(&vsi->xdp_prog, prog);
13042		13061
13043	if (need_reset) {	13062	if (need_reset) {
@@ -15925,8 +15944,13 @@ static void i40e_remove(struct pci_dev *pdev) · 2881 unmodified lines
15925	i40e_write_rx_ctl(hw, I40E_PFQF_HENA(0), 0);	15944	i40e_write_rx_ctl(hw, I40E_PFQF_HENA(0), 0);
15926	i40e_write_rx_ctl(hw, I40E_PFQF_HENA(1), 0);	15945	i40e_write_rx_ctl(hw, I40E_PFQF_HENA(1), 0);
15927		15946
15928	while (test_bit(__I40E_RESET_RECOVERY_PENDING, pf->state))	15947	/* Grab __I40E_RESET_RECOVERY_PENDING and set __I40E_IN_REMOVE
		15948	* flags, once they are set, i40e_rebuild should not be called as
		15949	* i40e_prep_for_reset always returns early.
		15950	*/
		15951	while (test_and_set_bit(__I40E_RESET_RECOVERY_PENDING, pf->state))
15929	usleep_range(1000, 2000);	15952	usleep_range(1000, 2000);
		15953	set_bit(__I40E_IN_REMOVE, pf->state);
15930		15954
15931	if (pf->flags & I40E_FLAG_SRIOV_ENABLED) {	15955	if (pf->flags & I40E_FLAG_SRIOV_ENABLED) {
15932	set_bit(__I40E_VF_RESETS_DISABLED, pf->state);	15956	set_bit(__I40E_VF_RESETS_DISABLED, pf->state);
@@ -16125,6 +16149,9 @@ static void i40e_pci_error_reset_done(struct pci_dev *pdev) · 192 unmodified lines
16125	{	16149	{
16126	struct i40e_pf *pf = pci_get_drvdata(pdev);	16150	struct i40e_pf *pf = pci_get_drvdata(pdev);
16127		16151
		16152	if (test_bit(__I40E_IN_REMOVE, pf->state))
		16153	return;
		16154
16128	i40e_reset_and_rebuild(pf, false, false);	16155	i40e_reset_and_rebuild(pf, false, false);
16129	}	16156	}
16130		16157

drivers/net/ethernet/mellanox/mlx5/core/en.h+3−3

@@ -224,7 +224,7 @@ static inline int mlx5e_get_max_num_channels(struct mlx5_core_dev *mdev) · 223 unmodified lines
224	struct mlx5e_tx_wqe {	224	struct mlx5e_tx_wqe {
225	struct mlx5_wqe_ctrl_seg ctrl;	225	struct mlx5_wqe_ctrl_seg ctrl;
226	struct mlx5_wqe_eth_seg eth;	226	struct mlx5_wqe_eth_seg eth;
227	struct mlx5_wqe_data_seg data[0];	227	struct mlx5_wqe_data_seg data[];
228	};	228	};
229		229
230	struct mlx5e_rx_wqe_ll {	230	struct mlx5e_rx_wqe_ll {
@@ -241,8 +241,8 @@ struct mlx5e_umr_wqe { · 10 unmodified lines
241	struct mlx5_wqe_umr_ctrl_seg uctrl;	241	struct mlx5_wqe_umr_ctrl_seg uctrl;
242	struct mlx5_mkey_seg mkc;	242	struct mlx5_mkey_seg mkc;
243	union {	243	union {
244	struct mlx5_mtt inline_mtts[0];	244	DECLARE_FLEX_ARRAY(struct mlx5_mtt, inline_mtts);
245	struct mlx5_klm inline_klms[0];	245	DECLARE_FLEX_ARRAY(struct mlx5_klm, inline_klms);
246	};	246	};
247	};	247	};
248		248

drivers/net/ethernet/mellanox/mlx5/core/en/qos.c+2−1

@@ -570,7 +570,8 @@ static int mlx5e_htb_convert_rate(struct mlx5e_priv *priv, u64 rate, · 569 unmodified lines
570		570
571	static void mlx5e_htb_convert_ceil(struct mlx5e_priv priv, u64 ceil, u32 max_average_bw)	571	static void mlx5e_htb_convert_ceil(struct mlx5e_priv priv, u64 ceil, u32 max_average_bw)
572	{	572	{
573	*max_average_bw = div_u64(ceil, BYTES_IN_MBIT);	573	/* Hardware treats 0 as "unlimited", set at least 1. */
		574	*max_average_bw = max_t(u32, div_u64(ceil, BYTES_IN_MBIT), 1);
574		575
575	qos_dbg(priv->mdev, "Convert: ceil %llu -> max_average_bw %u\n",	576	qos_dbg(priv->mdev, "Convert: ceil %llu -> max_average_bw %u\n",
576	ceil, *max_average_bw);	577	ceil, *max_average_bw);

drivers/net/ethernet/mellanox/mlx5/core/en/rep/bond.c+14−18

 static bool mlx5e_rep_is_lag_netdev(struct net_device *netdev)
 {
-	struct mlx5e_rep_priv *rpriv;
+	return netif_is_lag_port(netdev) && mlx5e_eswitch_vf_rep(netdev);
-	struct mlx5e_priv *priv;
-	/* A given netdev is not a representor or not a slave of LAG configuration */
-	if (!mlx5e_eswitch_rep(netdev) || !netif_is_lag_port(netdev))
-		return false;
-	priv = netdev_priv(netdev);
-	rpriv = priv->ppriv;
-	/* Egress acl forward to vport is supported only non-uplink representor */
-	return rpriv->rep->vport != MLX5_VPORT_UPLINK;
 }
 static void mlx5e_rep_changelowerstate_event(struct net_device *netdev, void *ptr)
 	u16 fwd_vport_num;
 	int err;
-	if (!mlx5e_rep_is_lag_netdev(netdev))
-		return;
 	info = ptr;
 	lag_info = info->lower_state_info;
 	/* This is not an event of a representor becoming active slave */
 	struct net_device *lag_dev;
 	struct mlx5e_priv *priv;
-	if (!mlx5e_rep_is_lag_netdev(netdev))
-		return;
 	priv = netdev_priv(netdev);
 	rpriv = priv->ppriv;
 	lag_dev = info->upper_dev;
 				       unsigned long event, void *ptr)
 {
 	struct net_device *netdev = netdev_notifier_info_to_dev(ptr);
+	struct mlx5e_rep_priv *rpriv;
+	struct mlx5e_rep_bond *bond;
+	struct mlx5e_priv *priv;
+	if (!mlx5e_rep_is_lag_netdev(netdev))
+		return NOTIFY_DONE;
+	bond = container_of(nb, struct mlx5e_rep_bond, nb);
+	priv = netdev_priv(netdev);
+	rpriv = mlx5_eswitch_get_uplink_priv(priv->mdev->priv.eswitch, REP_ETH);
+	/* Verify VF representor is on the same device of the bond handling the netevent. */
+	if (rpriv->uplink_priv.bond != bond)
+		return NOTIFY_DONE;
 	switch (event) {
 	case NETDEV_CHANGELOWERSTATE:

drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.c+4−2

 	}
 	br_offloads->netdev_nb.notifier_call = mlx5_esw_bridge_switchdev_port_event;
-	err = register_netdevice_notifier(&br_offloads->netdev_nb);
+	err = register_netdevice_notifier_net(&init_net, &br_offloads->netdev_nb);
 	if (err) {
 		esw_warn(mdev, "Failed to register bridge offloads netdevice notifier (err=%d)\n",
 			 err);
 err_register_swdev:
 	destroy_workqueue(br_offloads->wq);
 err_alloc_wq:
+	rtnl_lock();
 	mlx5_esw_bridge_cleanup(esw);
+	rtnl_unlock();
 }
 void mlx5e_rep_bridge_cleanup(struct mlx5e_priv *priv)
 		return;
 	cancel_delayed_work_sync(&br_offloads->update_work);
-	unregister_netdevice_notifier(&br_offloads->netdev_nb);
+	unregister_netdevice_notifier_net(&init_net, &br_offloads->netdev_nb);
 	unregister_switchdev_blocking_notifier(&br_offloads->nb_blk);
 	unregister_switchdev_notifier(&br_offloads->nb);
 	destroy_workqueue(br_offloads->wq);

drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h+5−0

 	return pi;
 }
+static inline u16 mlx5e_shampo_get_cqe_header_index(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe)
+{
+	return be16_to_cpu(cqe->shampo.header_entry_index) & (rq->mpwqe.shampo->hd_per_wq - 1);
+}
 struct mlx5e_shampo_umr {
 	u16 len;
 };

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

 	/* copy the inline part if required */
 	if (sq->min_inline_mode != MLX5_INLINE_MODE_NONE) {
-		memcpy(eseg->inline_hdr.start, xdptxd->data, MLX5E_XDP_MIN_INLINE);
+		memcpy(eseg->inline_hdr.start, xdptxd->data, sizeof(eseg->inline_hdr.start));
 		eseg->inline_hdr.sz = cpu_to_be16(MLX5E_XDP_MIN_INLINE);
+		memcpy(dseg, xdptxd->data + sizeof(eseg->inline_hdr.start),
+		       MLX5E_XDP_MIN_INLINE - sizeof(eseg->inline_hdr.start));
 		dma_len  -= MLX5E_XDP_MIN_INLINE;
 		dma_addr += MLX5E_XDP_MIN_INLINE;
 		dseg++;

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c+11−2

@@ -157,11 +157,20 @@ static void mlx5e_ipsec_set_swp(struct sk_buff *skb, · 156 unmodified lines
157	/* Tunnel mode */	157	/* Tunnel mode */
158	if (mode == XFRM_MODE_TUNNEL) {	158	if (mode == XFRM_MODE_TUNNEL) {
159	eseg->swp_inner_l3_offset = skb_inner_network_offset(skb) / 2;	159	eseg->swp_inner_l3_offset = skb_inner_network_offset(skb) / 2;
160	eseg->swp_inner_l4_offset = skb_inner_transport_offset(skb) / 2;
161	if (xo->proto == IPPROTO_IPV6)	160	if (xo->proto == IPPROTO_IPV6)
162	eseg->swp_flags \|= MLX5_ETH_WQE_SWP_INNER_L3_IPV6;	161	eseg->swp_flags \|= MLX5_ETH_WQE_SWP_INNER_L3_IPV6;
163	if (inner_ip_hdr(skb)->protocol == IPPROTO_UDP)	162
		163	switch (xo->inner_ipproto) {
		164	case IPPROTO_UDP:
164	eseg->swp_flags \|= MLX5_ETH_WQE_SWP_INNER_L4_UDP;	165	eseg->swp_flags \|= MLX5_ETH_WQE_SWP_INNER_L4_UDP;
		166	fallthrough;
		167	case IPPROTO_TCP:
		168	/* IP \| ESP \| IP \| [TCP \| UDP] */
		169	eseg->swp_inner_l4_offset = skb_inner_transport_offset(skb) / 2;
		170	break;
		171	default:
		172	break;
		173	}
165	return;	174	return;
166	}	175	}
167		176

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h+6−3

 mlx5e_ipsec_txwqe_build_eseg_csum(struct mlx5e_txqsq *sq, struct sk_buff *skb,
 				  struct mlx5_wqe_eth_seg *eseg)
 {
-	struct xfrm_offload *xo = xfrm_offload(skb);
+	u8 inner_ipproto;
 	if (!mlx5e_ipsec_eseg_meta(eseg))
 		return false;
 	eseg->cs_flags = MLX5_ETH_WQE_L3_CSUM;
-	if (xo->inner_ipproto) {
+	inner_ipproto = xfrm_offload(skb)->inner_ipproto;
-		eseg->cs_flags |= MLX5_ETH_WQE_L4_INNER_CSUM | MLX5_ETH_WQE_L3_INNER_CSUM;
+	if (inner_ipproto) {
+		eseg->cs_flags |= MLX5_ETH_WQE_L3_INNER_CSUM;
+		if (inner_ipproto == IPPROTO_TCP || inner_ipproto == IPPROTO_UDP)
+			eseg->cs_flags |= MLX5_ETH_WQE_L4_INNER_CSUM;
 	} else if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
 		eseg->cs_flags |= MLX5_ETH_WQE_L4_CSUM;
 		sq->stats->csum_partial_inner++;

drivers/net/ethernet/mellanox/mlx5/core/en_rx.c+19−11

 static void mlx5e_shampo_update_fin_psh_flags(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe,
 					      struct tcphdr *skb_tcp_hd)
 {
-	u16 header_index = be16_to_cpu(cqe->shampo.header_entry_index);
+	u16 header_index = mlx5e_shampo_get_cqe_header_index(rq, cqe);
 	struct tcphdr *last_tcp_hd;
 	void *last_hd_addr;
 	return skb;
 }
-static void
+static struct sk_buff *
 mlx5e_skb_from_cqe_shampo(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi,
 			  struct mlx5_cqe64 *cqe, u16 header_index)
 {
 		skb = mlx5e_build_linear_skb(rq, hdr, frag_size, rx_headroom, head_size);
 		if (unlikely(!skb))
-			return;
+			return NULL;
 		/* queue up for recycling/reuse */
 		page_ref_inc(head->page);
 				     ALIGN(head_size, sizeof(long)));
 		if (unlikely(!skb)) {
 			rq->stats->buff_alloc_err++;
-			return;
+			return NULL;
 		}
 		prefetchw(skb->data);
 		skb->tail += head_size;
 		skb->len  += head_size;
 	}
-	rq->hw_gro_data->skb = skb;
+	return skb;
-	NAPI_GRO_CB(skb)->count = 1;
-	skb_shinfo(skb)->gso_size = mpwrq_get_cqe_byte_cnt(cqe) - head_size;
 }
 static void
 static void mlx5e_handle_rx_cqe_mpwrq_shampo(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe)
 {
 	u16 data_bcnt		= mpwrq_get_cqe_byte_cnt(cqe) - cqe->shampo.header_size;
-	u16 header_index	= be16_to_cpu(cqe->shampo.header_entry_index);
+	u16 header_index	= mlx5e_shampo_get_cqe_header_index(rq, cqe);
 	u32 wqe_offset		= be32_to_cpu(cqe->shampo.data_offset);
 	u16 cstrides		= mpwrq_get_cqe_consumed_strides(cqe);
 	u32 data_offset		= wqe_offset & (PAGE_SIZE - 1);
 	u32 cqe_bcnt		= mpwrq_get_cqe_byte_cnt(cqe);
 	u16 wqe_id		= be16_to_cpu(cqe->wqe_id);
 	u32 page_idx		= wqe_offset >> PAGE_SHIFT;
+	u16 head_size		= cqe->shampo.header_size;
 	struct sk_buff **skb	= &rq->hw_gro_data->skb;
 	bool flush		= cqe->shampo.flush;
 	bool match		= cqe->shampo.match;
 	}
 	if (!*skb) {
-		mlx5e_skb_from_cqe_shampo(rq, wi, cqe, header_index);
+		if (likely(head_size))
+			*skb = mlx5e_skb_from_cqe_shampo(rq, wi, cqe, header_index);
+		else
+			*skb = mlx5e_skb_from_cqe_mpwrq_nonlinear(rq, wi, cqe_bcnt, data_offset,
+								  page_idx);
 		if (unlikely(!*skb))
 			goto free_hd_entry;
+		NAPI_GRO_CB(*skb)->count = 1;
+		skb_shinfo(*skb)->gso_size = cqe_bcnt - head_size;
 	} else {
 		NAPI_GRO_CB(*skb)->count++;
 		if (NAPI_GRO_CB(*skb)->count == 2 &&
 		}
 	}
-	di = &wi->umr.dma_info[page_idx];
+	if (likely(head_size)) {
-	mlx5e_fill_skb_data(*skb, rq, di, data_bcnt, data_offset);
+		di = &wi->umr.dma_info[page_idx];
+		mlx5e_fill_skb_data(*skb, rq, di, data_bcnt, data_offset);
+	}
 	mlx5e_shampo_complete_rx_cqe(rq, cqe, cqe_bcnt, *skb);
 	if (flush)

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c+14−1

 		if (err)
 			goto err_out;
-		if (!attr->chain && esw_attr->int_port) {
+		if (!attr->chain && esw_attr->int_port &&
+		    attr->action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) {
 			/* If decap route device is internal port, change the
 			 * source vport value in reg_c0 back to uplink just in
 			 * case the rule performs goto chain > 0. If we have a miss
 		return false;
 	}
+	if (!(~actions &
+	      (MLX5_FLOW_CONTEXT_ACTION_FWD_DEST | MLX5_FLOW_CONTEXT_ACTION_DROP))) {
+		NL_SET_ERR_MSG_MOD(extack, "Rule cannot support forward+drop action");
+		return false;
+	}
+	if (actions & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR &&
+	    actions & MLX5_FLOW_CONTEXT_ACTION_DROP) {
+		NL_SET_ERR_MSG_MOD(extack, "Drop with modify header action is not supported");
+		return false;
+	}
 	if (actions & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR &&
 	    !modify_header_match_supported(priv, &parse_attr->spec, flow_action,
 					   actions, ct_flow, ct_clear, extack))

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

@@ -208,7 +208,7 @@ static inline void mlx5e_insert_vlan(void start, struct sk_buff skb, u16 ihs) · 207 unmodified lines
208	int cpy1_sz = 2 * ETH_ALEN;	208	int cpy1_sz = 2 * ETH_ALEN;
209	int cpy2_sz = ihs - cpy1_sz;	209	int cpy2_sz = ihs - cpy1_sz;
210		210
211	memcpy(vhdr, skb->data, cpy1_sz);	211	memcpy(&vhdr->addrs, skb->data, cpy1_sz);
212	vhdr->h_vlan_proto = skb->vlan_proto;	212	vhdr->h_vlan_proto = skb->vlan_proto;
213	vhdr->h_vlan_TCI = cpu_to_be16(skb_vlan_tag_get(skb));	213	vhdr->h_vlan_TCI = cpu_to_be16(skb_vlan_tag_get(skb));
214	memcpy(&vhdr->h_vlan_encapsulated_proto, skb->data + cpy1_sz, cpy2_sz);	214	memcpy(&vhdr->h_vlan_encapsulated_proto, skb->data + cpy1_sz, cpy2_sz);

drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c+4−0

 {
 	struct mlx5_esw_bridge_offloads *br_offloads;
+	ASSERT_RTNL();
 	br_offloads = kvzalloc(sizeof(*br_offloads), GFP_KERNEL);
 	if (!br_offloads)
 		return ERR_PTR(-ENOMEM);
 {
 	struct mlx5_esw_bridge_offloads *br_offloads = esw->br_offloads;
+	ASSERT_RTNL();
 	if (!br_offloads)
 		return;

drivers/net/ethernet/mellanox/mlx5/core/esw/diag/bridge_tracepoint.h+1−1

@@ -21,7 +21,7 @@ DECLARE_EVENT_CLASS(mlx5_esw_bridge_fdb_template, · 20 unmodified lines
21	__field(unsigned int, used)	21	__field(unsigned int, used)
22	),	22	),
23	TP_fast_assign(	23	TP_fast_assign(
24	strncpy(__entry->dev_name,	24	strscpy(__entry->dev_name,
25	netdev_name(fdb->dev),	25	netdev_name(fdb->dev),
26	IFNAMSIZ);	26	IFNAMSIZ);
27	memcpy(__entry->addr, fdb->key.addr, ETH_ALEN);	27	memcpy(__entry->addr, fdb->key.addr, ETH_ALEN);

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

@@ -132,7 +132,7 @@ static void mlx5_stop_sync_reset_poll(struct mlx5_core_dev *dev) · 131 unmodified lines
132	{	132	{
133	struct mlx5_fw_reset *fw_reset = dev->priv.fw_reset;	133	struct mlx5_fw_reset *fw_reset = dev->priv.fw_reset;
134		134
135	del_timer(&fw_reset->timer);	135	del_timer_sync(&fw_reset->timer);
136	}	136	}
137		137
138	static void mlx5_sync_reset_clear_reset_requested(struct mlx5_core_dev *dev, bool poll_health)	138	static void mlx5_sync_reset_clear_reset_requested(struct mlx5_core_dev *dev, bool poll_health)

drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c+5−4

 u32 mlx5_chains_get_prio_range(struct mlx5_fs_chains *chains)
 {
-	if (!mlx5_chains_prios_supported(chains))
-		return 1;
 	if (mlx5_chains_ignore_flow_level_supported(chains))
 		return UINT_MAX;
+	if (!chains->dev->priv.eswitch ||
+	    chains->dev->priv.eswitch->mode != MLX5_ESWITCH_OFFLOADS)
+		return 1;
 	/* We should get here only for eswitch case */
 	return FDB_TC_MAX_PRIO;
 }
 create_chain_restore(struct fs_chain *chain)
 {
 	struct mlx5_eswitch *esw = chain->chains->dev->priv.eswitch;
-	char modact[MLX5_UN_SZ_BYTES(set_add_copy_action_in_auto)];
+	u8 modact[MLX5_UN_SZ_BYTES(set_add_copy_action_in_auto)] = {};
 	struct mlx5_fs_chains *chains = chain->chains;
 	enum mlx5e_tc_attr_to_reg chain_to_reg;
 	struct mlx5_modify_hdr *mod_hdr;

drivers/net/ethernet/mellanox/mlx5/core/port.c+5−4

 	switch (module_id) {
 	case MLX5_MODULE_ID_SFP:
-		mlx5_sfp_eeprom_params_set(&query.i2c_address, &query.page, &query.offset);
+		mlx5_sfp_eeprom_params_set(&query.i2c_address, &query.page, &offset);
 		break;
 	case MLX5_MODULE_ID_QSFP:
 	case MLX5_MODULE_ID_QSFP_PLUS:
 	case MLX5_MODULE_ID_QSFP28:
-		mlx5_qsfp_eeprom_params_set(&query.i2c_address, &query.page, &query.offset);
+		mlx5_qsfp_eeprom_params_set(&query.i2c_address, &query.page, &offset);
 		break;
 	default:
 		mlx5_core_err(dev, "Module ID not recognized: 0x%x\n", module_id);
 		return -EINVAL;
 	}
-	if (query.offset + size > MLX5_EEPROM_PAGE_LENGTH)
+	if (offset + size > MLX5_EEPROM_PAGE_LENGTH)
 		/* Cross pages read, read until offset 256 in low page */
-		size -= offset + size - MLX5_EEPROM_PAGE_LENGTH;
+		size = MLX5_EEPROM_PAGE_LENGTH - offset;
 	query.size = size;
+	query.offset = offset;
 	return mlx5_query_mcia(dev, &query, data);
 }

drivers/net/ethernet/microchip/sparx5/sparx5_packet.c+1−1

 	skb_put(skb, byte_cnt - ETH_FCS_LEN);
 	eth_skb_pad(skb);
 	skb->protocol = eth_type_trans(skb, netdev);
-	netif_rx(skb);
 	netdev->stats.rx_bytes += skb->len;
 	netdev->stats.rx_packets++;
+	netif_rx(skb);
 }
 static int sparx5_inject(struct sparx5 *sparx5,

drivers/net/ethernet/smsc/smc911x.c+4−4

@@ -1648,7 +1648,7 @@ static int smc911x_ethtool_geteeprom(struct net_device *dev, · 1647 unmodified lines
1648	return ret;	1648	return ret;
1649	if ((ret=smc911x_ethtool_read_eeprom_byte(dev, &eebuf[i]))!=0)	1649	if ((ret=smc911x_ethtool_read_eeprom_byte(dev, &eebuf[i]))!=0)
1650	return ret;	1650	return ret;
1651	}	1651	}
1652	memcpy(data, eebuf+eeprom->offset, eeprom->len);	1652	memcpy(data, eebuf+eeprom->offset, eeprom->len);
1653	return 0;	1653	return 0;
1654	}	1654	}
@@ -1667,11 +1667,11 @@ static int smc911x_ethtool_seteeprom(struct net_device *dev, · 12 unmodified lines
1667	return ret;	1667	return ret;
1668	/* write byte */	1668	/* write byte */
1669	if ((ret=smc911x_ethtool_write_eeprom_byte(dev, *data))!=0)	1669	if ((ret=smc911x_ethtool_write_eeprom_byte(dev, *data))!=0)
1670	return ret;	1670	return ret;
1671	if ((ret=smc911x_ethtool_write_eeprom_cmd(dev, E2P_CMD_EPC_CMD_WRITE_, i ))!=0)	1671	if ((ret=smc911x_ethtool_write_eeprom_cmd(dev, E2P_CMD_EPC_CMD_WRITE_, i ))!=0)
1672	return ret;	1672	return ret;
1673	}	1673	}
1674	return 0;	1674	return 0;
1675	}	1675	}
1676		1676
1677	static int smc911x_ethtool_geteeprom_len(struct net_device *dev)	1677	static int smc911x_ethtool_geteeprom_len(struct net_device *dev)

drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c+7−2

 	void __iomem *reg;
 	u32 phy_intf_sel;
 	struct clk *phy_ref_clk;
+	struct device *dev;
 	spinlock_t lock; /* lock to protect register update */
 };
 static void visconti_eth_fix_mac_speed(void *priv, unsigned int speed)
 {
 	struct visconti_eth *dwmac = priv;
-	unsigned int val, clk_sel_val;
+	struct net_device *netdev = dev_get_drvdata(dwmac->dev);
+	unsigned int val, clk_sel_val = 0;
 	unsigned long flags;
 	spin_lock_irqsave(&dwmac->lock, flags);
 		break;
 	default:
 		/* No bit control */
-		break;
+		netdev_err(netdev, "Unsupported speed request (%d)", speed);
+		spin_unlock_irqrestore(&dwmac->lock, flags);
+		return;
 	}
 	writel(val, dwmac->reg + MAC_CTRL_REG);
 	spin_lock_init(&dwmac->lock);
 	dwmac->reg = stmmac_res.addr;
+	dwmac->dev = &pdev->dev;
 	plat_dat->bsp_priv = dwmac;
 	plat_dat->fix_mac_speed = visconti_eth_fix_mac_speed;

drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h+1−0

@@ -150,6 +150,7 @@ · 149 unmodified lines
150		150
151	#define NUM_DWMAC100_DMA_REGS 9	151	#define NUM_DWMAC100_DMA_REGS 9
152	#define NUM_DWMAC1000_DMA_REGS 23	152	#define NUM_DWMAC1000_DMA_REGS 23
		153	#define NUM_DWMAC4_DMA_REGS 27
153		154
154	void dwmac_enable_dma_transmission(void __iomem *ioaddr);	155	void dwmac_enable_dma_transmission(void __iomem *ioaddr);
155	void dwmac_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx);	156	void dwmac_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx);

drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c+17−2

 #include "dwxgmac2.h"
 #define REG_SPACE_SIZE	0x1060
+#define GMAC4_REG_SPACE_SIZE	0x116C
 #define MAC100_ETHTOOL_NAME	"st_mac100"
 #define GMAC_ETHTOOL_NAME	"st_gmac"
 #define XGMAC_ETHTOOL_NAME	"st_xgmac"
+/* Same as DMA_CHAN_BASE_ADDR defined in dwmac4_dma.h
+ *
+ * It is here because dwmac_dma.h and dwmac4_dam.h can not be included at the
+ * same time due to the conflicting macro names.
+ */
+#define GMAC4_DMA_CHAN_BASE_ADDR  0x00001100
 #define ETHTOOL_DMA_OFFSET	55
 struct stmmac_stats {
 	if (priv->plat->has_xgmac)
 		return XGMAC_REGSIZE * 4;
+	else if (priv->plat->has_gmac4)
+		return GMAC4_REG_SPACE_SIZE;
 	return REG_SPACE_SIZE;
 }
 	stmmac_dump_mac_regs(priv, priv->hw, reg_space);
 	stmmac_dump_dma_regs(priv, priv->ioaddr, reg_space);
-	if (!priv->plat->has_xgmac) {
+	/* Copy DMA registers to where ethtool expects them */
-		/* Copy DMA registers to where ethtool expects them */
+	if (priv->plat->has_gmac4) {
+		/* GMAC4 dumps its DMA registers at its DMA_CHAN_BASE_ADDR */
+		memcpy(&reg_space[ETHTOOL_DMA_OFFSET],
+		       &reg_space[GMAC4_DMA_CHAN_BASE_ADDR / 4],
+		       NUM_DWMAC4_DMA_REGS * 4);
+	} else if (!priv->plat->has_xgmac) {
 		memcpy(&reg_space[ETHTOOL_DMA_OFFSET],
 		       &reg_space[DMA_BUS_MODE / 4],
 		       NUM_DWMAC1000_DMA_REGS * 4);

drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c+12−7

 static void get_systime(void __iomem *ioaddr, u64 *systime)
 {
-	u64 ns;
+	u64 ns, sec0, sec1;
-	/* Get the TSSS value */
+	/* Get the TSS value */
-	ns = readl(ioaddr + PTP_STNSR);
+	sec1 = readl_relaxed(ioaddr + PTP_STSR);
-	/* Get the TSS and convert sec time value to nanosecond */
+	do {
-	ns += readl(ioaddr + PTP_STSR) * 1000000000ULL;
+		sec0 = sec1;
+		/* Get the TSSS value */
+		ns = readl_relaxed(ioaddr + PTP_STNSR);
+		/* Get the TSS value */
+		sec1 = readl_relaxed(ioaddr + PTP_STSR);
+	} while (sec0 != sec1);
 	if (systime)
-		*systime = ns;
+		*systime = ns + (sec1 * 1000000000ULL);
 }
 static void get_ptptime(void __iomem *ptpaddr, u64 *ptp_time)

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c+4−2

 	netdev_info(priv->dev, "%s: removing driver", __func__);
+	pm_runtime_get_sync(dev);
+	pm_runtime_disable(dev);
+	pm_runtime_put_noidle(dev);
 	stmmac_stop_all_dma(priv);
 	stmmac_mac_set(priv, priv->ioaddr, false);
 	netif_carrier_off(ndev);
 	if (priv->plat->stmmac_rst)
 		reset_control_assert(priv->plat->stmmac_rst);
 	reset_control_assert(priv->plat->stmmac_ahb_rst);
-	pm_runtime_put(dev);
-	pm_runtime_disable(dev);
 	if (priv->hw->pcs != STMMAC_PCS_TBI &&
 	    priv->hw->pcs != STMMAC_PCS_RTBI)
 		stmmac_mdio_unregister(ndev);

drivers/net/ieee802154/at86rf230.c+11−2

 	unsigned long cal_timeout;
 	bool is_tx;
 	bool is_tx_from_off;
+	bool was_tx;
 	u8 tx_retry;
 	struct sk_buff *tx_skb;
 	struct at86rf230_state_change tx;
 	if (ctx->free)
 		kfree(ctx);
-	ieee802154_wake_queue(lp->hw);
+	if (lp->was_tx) {
+		lp->was_tx = 0;
+		dev_kfree_skb_any(lp->tx_skb);
+		ieee802154_wake_queue(lp->hw);
+	}
 }
 static void
 	struct at86rf230_state_change *ctx = context;
 	struct at86rf230_local *lp = ctx->lp;
-	lp->is_tx = 0;
+	if (lp->is_tx) {
+		lp->was_tx = 1;
+		lp->is_tx = 0;
+	}
 	at86rf230_async_state_change(lp, ctx, STATE_RX_AACK_ON,
 				     at86rf230_async_error_recover_complete);
 }

drivers/net/ieee802154/ca8210.c+1−0

@@ -1771,6 +1771,7 @@ static int ca8210_async_xmit_complete( · 1770 unmodified lines
1771	status	1771	status
1772	);	1772	);
1773	if (status != MAC_TRANSACTION_OVERFLOW) {	1773	if (status != MAC_TRANSACTION_OVERFLOW) {
		1774	dev_kfree_skb_any(priv->tx_skb);
1774	ieee802154_wake_queue(priv->hw);	1775	ieee802154_wake_queue(priv->hw);
1775	return 0;	1776	return 0;
1776	}	1777	}

drivers/net/ieee802154/mac802154_hwsim.c+1−0

@@ -786,6 +786,7 @@ static int hwsim_add_one(struct genl_info info, struct device dev, · 785 unmodified lines
786	goto err_pib;	786	goto err_pib;
787	}	787	}
788		788
		789	pib->channel = 13;
789	rcu_assign_pointer(phy->pib, pib);	790	rcu_assign_pointer(phy->pib, pib);
790	phy->idx = idx;	791	phy->idx = idx;
791	INIT_LIST_HEAD(&phy->edges);	792	INIT_LIST_HEAD(&phy->edges);

drivers/net/ieee802154/mcr20a.c+2−2

@@ -976,8 +976,8 @@ static void mcr20a_hw_setup(struct mcr20a_local *lp) · 975 unmodified lines
976	dev_dbg(printdev(lp), "%s\n", __func__);	976	dev_dbg(printdev(lp), "%s\n", __func__);
977		977
978	phy->symbol_duration = 16;	978	phy->symbol_duration = 16;
979	phy->lifs_period = 40;	979	phy->lifs_period = 40 * phy->symbol_duration;
980	phy->sifs_period = 12;	980	phy->sifs_period = 12 * phy->symbol_duration;
981		981
982	hw->flags = IEEE802154_HW_TX_OMIT_CKSUM \|	982	hw->flags = IEEE802154_HW_TX_OMIT_CKSUM \|
983	IEEE802154_HW_AFILT \|	983	IEEE802154_HW_AFILT \|

drivers/net/ipa/ipa_power.c+52−0

@@ -11,6 +11,8 @@ · 10 unmodified lines
11	#include <linux/pm_runtime.h>	11	#include <linux/pm_runtime.h>
12	#include <linux/bitops.h>	12	#include <linux/bitops.h>
13		13
		14	#include "linux/soc/qcom/qcom_aoss.h"
		15
14	#include "ipa.h"	16	#include "ipa.h"
15	#include "ipa_power.h"	17	#include "ipa_power.h"
16	#include "ipa_endpoint.h"	18	#include "ipa_endpoint.h"
@@ -64,6 +66,7 @@ enum ipa_power_flag { · 47 unmodified lines
64	* struct ipa_power - IPA power management information	66	* struct ipa_power - IPA power management information
65	* @dev: IPA device pointer	67	* @dev: IPA device pointer
66	* @core: IPA core clock	68	* @core: IPA core clock
		69	* @qmp: QMP handle for AOSS communication
67	* @spinlock: Protects modem TX queue enable/disable	70	* @spinlock: Protects modem TX queue enable/disable
68	* @flags: Boolean state flags	71	* @flags: Boolean state flags
69	* @interconnect_count: Number of elements in interconnect[]	72	* @interconnect_count: Number of elements in interconnect[]
@@ -72,6 +75,7 @@ enum ipa_power_flag { · 2 unmodified lines
72	struct ipa_power {	75	struct ipa_power {
73	struct device *dev;	76	struct device *dev;
74	struct clk *core;	77	struct clk *core;
		78	struct qmp *qmp;
75	spinlock_t spinlock; /* used with STOPPED/STARTED power flags */	79	spinlock_t spinlock; /* used with STOPPED/STARTED power flags */
76	DECLARE_BITMAP(flags, IPA_POWER_FLAG_COUNT);	80	DECLARE_BITMAP(flags, IPA_POWER_FLAG_COUNT);
77	u32 interconnect_count;	81	u32 interconnect_count;
@@ -382,6 +386,47 @@ void ipa_power_modem_queue_active(struct ipa *ipa) · 304 unmodified lines
382	clear_bit(IPA_POWER_FLAG_STARTED, ipa->power->flags);	386	clear_bit(IPA_POWER_FLAG_STARTED, ipa->power->flags);
383	}	387	}
384		388
		389	static int ipa_power_retention_init(struct ipa_power *power)
		390	{
		391	struct qmp *qmp = qmp_get(power->dev);
		392
		393	if (IS_ERR(qmp)) {
		394	if (PTR_ERR(qmp) == -EPROBE_DEFER)
		395	return -EPROBE_DEFER;
		396
		397	/* We assume any other error means it's not defined/needed */
		398	qmp = NULL;
		399	}
		400	power->qmp = qmp;
		401
		402	return 0;
		403	}
		404
		405	static void ipa_power_retention_exit(struct ipa_power *power)
		406	{
		407	qmp_put(power->qmp);
		408	power->qmp = NULL;
		409	}
		410
		411	/* Control register retention on power collapse */
		412	void ipa_power_retention(struct ipa *ipa, bool enable)
		413	{
		414	static const char fmt[] = "{ class: bcm, res: ipa_pc, val: %c }";
		415	struct ipa_power *power = ipa->power;
		416	char buf[36]; /* Exactly enough for fmt[]; size a multiple of 4 */
		417	int ret;
		418
		419	if (!power->qmp)
		420	return; /* Not needed on this platform */
		421
		422	(void)snprintf(buf, sizeof(buf), fmt, enable ? '1' : '0');
		423
		424	ret = qmp_send(power->qmp, buf, sizeof(buf));
		425	if (ret)
		426	dev_err(power->dev, "error %d sending QMP %sable request\n",
		427	ret, enable ? "en" : "dis");
		428	}
		429
385	int ipa_power_setup(struct ipa *ipa)	430	int ipa_power_setup(struct ipa *ipa)
386	{	431	{
387	int ret;	432	int ret;
@@ -438,12 +483,18 @@ ipa_power_init(struct device dev, const struct ipa_power_data data) · 50 unmodified lines
438	if (ret)	483	if (ret)
439	goto err_kfree;	484	goto err_kfree;
440		485
		486	ret = ipa_power_retention_init(power);
		487	if (ret)
		488	goto err_interconnect_exit;
		489
441	pm_runtime_set_autosuspend_delay(dev, IPA_AUTOSUSPEND_DELAY);	490	pm_runtime_set_autosuspend_delay(dev, IPA_AUTOSUSPEND_DELAY);
442	pm_runtime_use_autosuspend(dev);	491	pm_runtime_use_autosuspend(dev);
443	pm_runtime_enable(dev);	492	pm_runtime_enable(dev);
444		493
445	return power;	494	return power;
446		495
		496	err_interconnect_exit:
		497	ipa_interconnect_exit(power);
447	err_kfree:	498	err_kfree:
448	kfree(power);	499	kfree(power);
449	err_clk_put:	500	err_clk_put:
@@ -460,6 +511,7 @@ void ipa_power_exit(struct ipa_power *power) · 10 unmodified lines
460		511
461	pm_runtime_disable(dev);	512	pm_runtime_disable(dev);
462	pm_runtime_dont_use_autosuspend(dev);	513	pm_runtime_dont_use_autosuspend(dev);
		514	ipa_power_retention_exit(power);
463	ipa_interconnect_exit(power);	515	ipa_interconnect_exit(power);
464	kfree(power);	516	kfree(power);
465	clk_put(clk);	517	clk_put(clk);

drivers/net/ipa/ipa_power.h+7−0

@@ -40,6 +40,13 @@ void ipa_power_modem_queue_wake(struct ipa *ipa); · 39 unmodified lines
40	*/	40	*/
41	void ipa_power_modem_queue_active(struct ipa *ipa);	41	void ipa_power_modem_queue_active(struct ipa *ipa);
42		42
		43	/**
		44	* ipa_power_retention() - Control register retention on power collapse
		45	* @ipa: IPA pointer
		46	* @enable: Whether retention should be enabled or disabled
		47	*/
		48	void ipa_power_retention(struct ipa *ipa, bool enable);
		49
43	/**	50	/**
44	* ipa_power_setup() - Set up IPA power management	51	* ipa_power_setup() - Set up IPA power management
45	* @ipa: IPA pointer	52	* @ipa: IPA pointer

drivers/net/ipa/ipa_uc.c+5−0

 #include "ipa.h"
 #include "ipa_uc.h"
+#include "ipa_power.h"
 /**
  * DOC:  The IPA embedded microcontroller
 	case IPA_UC_RESPONSE_INIT_COMPLETED:
 		if (ipa->uc_powered) {
 			ipa->uc_loaded = true;
+			ipa_power_retention(ipa, true);
 			pm_runtime_mark_last_busy(dev);
 			(void)pm_runtime_put_autosuspend(dev);
 			ipa->uc_powered = false;
 	ipa_interrupt_remove(ipa->interrupt, IPA_IRQ_UC_1);
 	ipa_interrupt_remove(ipa->interrupt, IPA_IRQ_UC_0);
+	if (ipa->uc_loaded)
+		ipa_power_retention(ipa, false);
 	if (!ipa->uc_powered)
 		return;

drivers/net/macsec.c+21−12

 	struct macsec_dev *macsec = macsec_priv(dev);
 	struct net_device *real_dev = macsec->real_dev;
+	/* If h/w offloading is available, propagate to the device */
+	if (macsec_is_offloaded(macsec)) {
+		const struct macsec_ops *ops;
+		struct macsec_context ctx;
+		ops = macsec_get_ops(netdev_priv(dev), &ctx);
+		if (ops) {
+			ctx.secy = &macsec->secy;
+			macsec_offload(ops->mdo_del_secy, &ctx);
+		}
+	}
 	unregister_netdevice_queue(dev, head);
 	list_del_rcu(&macsec->secys);
 	macsec_del_dev(macsec);
 	struct net_device *real_dev = macsec->real_dev;
 	struct macsec_rxh_data *rxd = macsec_data_rtnl(real_dev);
-	/* If h/w offloading is available, propagate to the device */
-	if (macsec_is_offloaded(macsec)) {
-		const struct macsec_ops *ops;
-		struct macsec_context ctx;
-		ops = macsec_get_ops(netdev_priv(dev), &ctx);
-		if (ops) {
-			ctx.secy = &macsec->secy;
-			macsec_offload(ops->mdo_del_secy, &ctx);
-		}
-	}
 	macsec_common_dellink(dev, head);
 	if (list_empty(&rxd->secys)) {
 	    !macsec_check_offload(macsec->offload, macsec))
 		return -EOPNOTSUPP;
+	/* send_sci must be set to true when transmit sci explicitly is set */
+	if ((data && data[IFLA_MACSEC_SCI]) &&
+	    (data && data[IFLA_MACSEC_INC_SCI])) {
+		u8 send_sci = !!nla_get_u8(data[IFLA_MACSEC_INC_SCI]);
+		if (!send_sci)
+			return -EINVAL;
+	}
 	if (data && data[IFLA_MACSEC_ICV_LEN])
 		icv_len = nla_get_u8(data[IFLA_MACSEC_ICV_LEN]);
 	mtu = real_dev->mtu - icv_len - macsec_extra_len(true);

drivers/net/phy/at803x.c+13−13

@@ -1794,19 +1794,19 @@ static int qca808x_read_status(struct phy_device *phydev) · 1793 unmodified lines
1794	if (ret < 0)	1794	if (ret < 0)
1795	return ret;	1795	return ret;
1796		1796
1797	if (phydev->link && phydev->speed == SPEED_2500)	1797	if (phydev->link) {
1798	phydev->interface = PHY_INTERFACE_MODE_2500BASEX;	1798	if (phydev->speed == SPEED_2500)
1799	else	1799	phydev->interface = PHY_INTERFACE_MODE_2500BASEX;
1800	phydev->interface = PHY_INTERFACE_MODE_SMII;	1800	else
1801		1801	phydev->interface = PHY_INTERFACE_MODE_SGMII;
1802	/* generate seed as a lower random value to make PHY linked as SLAVE easily,	1802	} else {
1803	* except for master/slave configuration fault detected.	1803	/* generate seed as a lower random value to make PHY linked as SLAVE easily,
1804	* the reason for not putting this code into the function link_change_notify is	1804	* except for master/slave configuration fault detected.
1805	* the corner case where the link partner is also the qca8081 PHY and the seed	1805	* the reason for not putting this code into the function link_change_notify is
1806	* value is configured as the same value, the link can't be up and no link change	1806	* the corner case where the link partner is also the qca8081 PHY and the seed
1807	* occurs.	1807	* value is configured as the same value, the link can't be up and no link change
1808	*/	1808	* occurs.
1809	if (!phydev->link) {	1809	*/
1810	if (phydev->master_slave_state == MASTER_SLAVE_STATE_ERR) {	1810	if (phydev->master_slave_state == MASTER_SLAVE_STATE_ERR) {
1811	qca808x_phy_ms_seed_enable(phydev, false);	1811	qca808x_phy_ms_seed_enable(phydev, false);
1812	} else {	1812	} else {

drivers/net/usb/ipheth.c+3−3

@@ -121,7 +121,7 @@ static int ipheth_alloc_urbs(struct ipheth_device *iphone) · 120 unmodified lines
121	if (tx_buf == NULL)	121	if (tx_buf == NULL)
122	goto free_rx_urb;	122	goto free_rx_urb;
123		123
124	rx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE,	124	rx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE + IPHETH_IP_ALIGN,
125	GFP_KERNEL, &rx_urb->transfer_dma);	125	GFP_KERNEL, &rx_urb->transfer_dma);
126	if (rx_buf == NULL)	126	if (rx_buf == NULL)
127	goto free_tx_buf;	127	goto free_tx_buf;
@@ -146,7 +146,7 @@ error_nomem: · 18 unmodified lines
146		146
147	static void ipheth_free_urbs(struct ipheth_device *iphone)	147	static void ipheth_free_urbs(struct ipheth_device *iphone)
148	{	148	{
149	usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->rx_buf,	149	usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE + IPHETH_IP_ALIGN, iphone->rx_buf,
150	iphone->rx_urb->transfer_dma);	150	iphone->rx_urb->transfer_dma);
151	usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf,	151	usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf,
152	iphone->tx_urb->transfer_dma);	152	iphone->tx_urb->transfer_dma);
@@ -317,7 +317,7 @@ static int ipheth_rx_submit(struct ipheth_device *dev, gfp_t mem_flags) · 164 unmodified lines
317		317
318	usb_fill_bulk_urb(dev->rx_urb, udev,	318	usb_fill_bulk_urb(dev->rx_urb, udev,
319	usb_rcvbulkpipe(udev, dev->bulk_in),	319	usb_rcvbulkpipe(udev, dev->bulk_in),
320	dev->rx_buf, IPHETH_BUF_SIZE,	320	dev->rx_buf, IPHETH_BUF_SIZE + IPHETH_IP_ALIGN,
321	ipheth_rcvbulk_callback,	321	ipheth_rcvbulk_callback,
322	dev);	322	dev);
323	dev->rx_urb->transfer_flags \|= URB_NO_TRANSFER_DMA_MAP;	323	dev->rx_urb->transfer_flags \|= URB_NO_TRANSFER_DMA_MAP;

drivers/nvme/host/fabrics.c+1−2

 static int nvmf_dev_show(struct seq_file *seq_file, void *private)
 {
 	struct nvme_ctrl *ctrl;
-	int ret = 0;
 	mutex_lock(&nvmf_dev_mutex);
 	ctrl = seq_file->private;
 out_unlock:
 	mutex_unlock(&nvmf_dev_mutex);
-	return ret;
+	return 0;
 }
 static int nvmf_dev_open(struct inode *inode, struct file *file)

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

 				NVME_QUIRK_DEALLOCATE_ZEROES, },
 	{ PCI_VDEVICE(INTEL, 0x0a54),	/* Intel P4500/P4600 */
 		.driver_data = NVME_QUIRK_STRIPE_SIZE |
-				NVME_QUIRK_DEALLOCATE_ZEROES, },
+				NVME_QUIRK_DEALLOCATE_ZEROES |
+				NVME_QUIRK_IGNORE_DEV_SUBNQN, },
 	{ PCI_VDEVICE(INTEL, 0x0a55),	/* Dell Express Flash P4600 */
 		.driver_data = NVME_QUIRK_STRIPE_SIZE |
 				NVME_QUIRK_DEALLOCATE_ZEROES, },

drivers/pci/controller/pcie-mt7621.c+1−10

 	writel_relaxed(val, pcie->base + reg);
 }
-static inline void pcie_rmw(struct mt7621_pcie *pcie, u32 reg, u32 clr, u32 set)
-{
-	u32 val = readl_relaxed(pcie->base + reg);
-	val &= ~clr;
-	val |= set;
-	writel_relaxed(val, pcie->base + reg);
-}
 static inline u32 pcie_port_read(struct mt7621_pcie_port *port, u32 reg)
 {
 	return readl_relaxed(port->base + reg);
 	.remove = mt7621_pcie_remove,
 	.driver = {
 		.name = "mt7621-pci",
-		.of_match_table = of_match_ptr(mt7621_pcie_ids),
+		.of_match_table = mt7621_pcie_ids,
 	},
 };
 builtin_platform_driver(mt7621_pcie_driver);

drivers/pinctrl/Makefile+1−1

 obj-$(CONFIG_PINCTRL_RK805)	+= pinctrl-rk805.o
 obj-$(CONFIG_PINCTRL_ROCKCHIP)	+= pinctrl-rockchip.o
 obj-$(CONFIG_PINCTRL_SINGLE)	+= pinctrl-single.o
+obj-$(CONFIG_PINCTRL_ST) 	+= pinctrl-st.o
 obj-$(CONFIG_PINCTRL_STARFIVE)	+= pinctrl-starfive.o
 obj-$(CONFIG_PINCTRL_STMFX) 	+= pinctrl-stmfx.o
-obj-$(CONFIG_PINCTRL_ST) 	+= pinctrl-st.o
 obj-$(CONFIG_PINCTRL_SX150X)	+= pinctrl-sx150x.o
 obj-$(CONFIG_PINCTRL_TB10X)	+= pinctrl-tb10x.o
 obj-$(CONFIG_PINCTRL_THUNDERBAY) += pinctrl-thunderbay.o

drivers/pinctrl/bcm/Kconfig+1−0

@@ -35,6 +35,7 @@ config PINCTRL_BCM63XX · 34 unmodified lines
35	select PINCONF	35	select PINCONF
36	select GENERIC_PINCONF	36	select GENERIC_PINCONF
37	select GPIOLIB	37	select GPIOLIB
		38	select REGMAP
38	select GPIO_REGMAP	39	select GPIO_REGMAP
39		40
40	config PINCTRL_BCM6318	41	config PINCTRL_BCM6318

drivers/pinctrl/bcm/pinctrl-bcm2835.c+15−8

 				     sizeof(*girq->parents),
 				     GFP_KERNEL);
 	if (!girq->parents) {
-		pinctrl_remove_gpio_range(pc->pctl_dev, &pc->gpio_range);
+		err = -ENOMEM;
-		return -ENOMEM;
+		goto out_remove;
 	}
 	if (is_7211) {
 		pc->wake_irq = devm_kcalloc(dev, BCM2835_NUM_IRQS,
 					    sizeof(*pc->wake_irq),
 					    GFP_KERNEL);
-		if (!pc->wake_irq)
+		if (!pc->wake_irq) {
-			return -ENOMEM;
+			err = -ENOMEM;
+			goto out_remove;
+		}
 	}
 	/*
 		len = strlen(dev_name(pc->dev)) + 16;
 		name = devm_kzalloc(pc->dev, len, GFP_KERNEL);
-		if (!name)
+		if (!name) {
-			return -ENOMEM;
+			err = -ENOMEM;
+			goto out_remove;
+		}
 		snprintf(name, len, "%s:bank%d", dev_name(pc->dev), i);
 	err = gpiochip_add_data(&pc->gpio_chip, pc);
 	if (err) {
 		dev_err(dev, "could not add GPIO chip\n");
-		pinctrl_remove_gpio_range(pc->pctl_dev, &pc->gpio_range);
+		goto out_remove;
-		return err;
 	}
 	return 0;
+out_remove:
+	pinctrl_remove_gpio_range(pc->pctl_dev, &pc->gpio_range);
+	return err;
 }
 static struct platform_driver bcm2835_pinctrl_driver = {

drivers/pinctrl/intel/pinctrl-cherryview.c+3−2

@@ -1471,8 +1471,9 @@ static void chv_gpio_irq_handler(struct irq_desc *desc) · 1470 unmodified lines
1471		1471
1472	offset = cctx->intr_lines[intr_line];	1472	offset = cctx->intr_lines[intr_line];
1473	if (offset == CHV_INVALID_HWIRQ) {	1473	if (offset == CHV_INVALID_HWIRQ) {
1474	dev_err(dev, "interrupt on unused interrupt line %u\n", intr_line);	1474	dev_warn_once(dev, "interrupt on unmapped interrupt line %u\n", intr_line);
1475	continue;	1475	/* Some boards expect hwirq 0 to trigger in this case */
		1476	offset = 0;
1476	}	1477	}
1477		1478
1478	generic_handle_domain_irq(gc->irq.domain, offset);	1479	generic_handle_domain_irq(gc->irq.domain, offset);

drivers/pinctrl/intel/pinctrl-intel.c+36−28

 	value &= ~PADCFG0_PMODE_MASK;
 	value |= PADCFG0_PMODE_GPIO;
-	/* Disable input and output buffers */
+	/* Disable TX buffer and enable RX (this will be input) */
-	value |= PADCFG0_GPIORXDIS;
+	value &= ~PADCFG0_GPIORXDIS;
 	value |= PADCFG0_GPIOTXDIS;
 	/* Disable SCI/SMI/NMI generation */
 	intel_gpio_set_gpio_mode(padcfg0);
-	/* Disable TX buffer and enable RX (this will be input) */
-	__intel_gpio_set_direction(padcfg0, true);
 	raw_spin_unlock_irqrestore(&pctrl->lock, flags);
 	return 0;
 	intel_gpio_set_gpio_mode(reg);
-	/* Disable TX buffer and enable RX (this will be input) */
-	__intel_gpio_set_direction(reg, true);
 	value = readl(reg);
 	value &= ~(PADCFG0_RXEVCFG_MASK | PADCFG0_RXINV);
 	return IRQ_RETVAL(ret);
 }
+static void intel_gpio_irq_init(struct intel_pinctrl *pctrl)
+{
+	int i;
+	for (i = 0; i < pctrl->ncommunities; i++) {
+		const struct intel_community *community;
+		void __iomem *base;
+		unsigned int gpp;
+		community = &pctrl->communities[i];
+		base = community->regs;
+		for (gpp = 0; gpp < community->ngpps; gpp++) {
+			/* Mask and clear all interrupts */
+			writel(0, base + community->ie_offset + gpp * 4);
+			writel(0xffff, base + community->is_offset + gpp * 4);
+		}
+	}
+}
+static int intel_gpio_irq_init_hw(struct gpio_chip *gc)
+{
+	struct intel_pinctrl *pctrl = gpiochip_get_data(gc);
+	/*
+	 * Make sure the interrupt lines are in a proper state before
+	 * further configuration.
+	 */
+	intel_gpio_irq_init(pctrl);
+	return 0;
+}
 static int intel_gpio_add_community_ranges(struct intel_pinctrl *pctrl,
 				const struct intel_community *community)
 {
 	girq->num_parents = 0;
 	girq->default_type = IRQ_TYPE_NONE;
 	girq->handler = handle_bad_irq;
+	girq->init_hw = intel_gpio_irq_init_hw;
 	ret = devm_gpiochip_add_data(pctrl->dev, &pctrl->chip, pctrl);
 	if (ret) {
 }
 EXPORT_SYMBOL_GPL(intel_pinctrl_suspend_noirq);
-static void intel_gpio_irq_init(struct intel_pinctrl *pctrl)
-{
-	size_t i;
-	for (i = 0; i < pctrl->ncommunities; i++) {
-		const struct intel_community *community;
-		void __iomem *base;
-		unsigned int gpp;
-		community = &pctrl->communities[i];
-		base = community->regs;
-		for (gpp = 0; gpp < community->ngpps; gpp++) {
-			/* Mask and clear all interrupts */
-			writel(0, base + community->ie_offset + gpp * 4);
-			writel(0xffff, base + community->is_offset + gpp * 4);
-		}
-	}
-}
 static bool intel_gpio_update_reg(void __iomem *reg, u32 mask, u32 value)
 {
 	u32 curr, updated;

drivers/pinctrl/pinctrl-microchip-sgpio.c+2−1

@@ -137,7 +137,8 @@ static inline int sgpio_addr_to_pin(struct sgpio_priv *priv, int port, int bit) · 136 unmodified lines
137		137
138	static inline u32 sgpio_get_addr(struct sgpio_priv *priv, u32 rno, u32 off)	138	static inline u32 sgpio_get_addr(struct sgpio_priv *priv, u32 rno, u32 off)
139	{	139	{
140	return priv->properties->regoff[rno] + off;	140	return (priv->properties->regoff[rno] + off) *
		141	regmap_get_reg_stride(priv->regs);
141	}	142	}
142		143
143	static u32 sgpio_readl(struct sgpio_priv *priv, u32 rno, u32 off)	144	static u32 sgpio_readl(struct sgpio_priv *priv, u32 rno, u32 off)

drivers/pinctrl/pinctrl-thunderbay.c+35−55

@@ -773,63 +773,42 @@ static int thunderbay_build_groups(struct thunderbay_pinctrl *tpc) · 772 unmodified lines
773		773
774	static int thunderbay_add_functions(struct thunderbay_pinctrl tpc, struct function_desc funcs)	774	static int thunderbay_add_functions(struct thunderbay_pinctrl tpc, struct function_desc funcs)
775	{	775	{
776	struct function_desc *function = funcs;
777	int i;	776	int i;
778		777
779	/* Assign the groups for each function */	778	/* Assign the groups for each function */
780	for (i = 0; i < tpc->soc->npins; i++) {	779	for (i = 0; i < tpc->nfuncs; i++) {
781	const struct pinctrl_pin_desc *pin_info = thunderbay_pins + i;	780	struct function_desc *func = &funcs[i];
782	struct thunderbay_mux_desc *pin_mux = pin_info->drv_data;	781	const char **group_names;
783		782	unsigned int grp_idx = 0;
784	while (pin_mux->name) {	783	int j;
785	const char **grp;	784
786	int j, grp_num, match = 0;	785	group_names = devm_kcalloc(tpc->dev, func->num_group_names,
787	size_t grp_size;	786	sizeof(*group_names), GFP_KERNEL);
788	struct function_desc *func;	787	if (!group_names)
789		788	return -ENOMEM;
790	for (j = 0; j < tpc->nfuncs; j++) {	789
791	if (!strcmp(pin_mux->name, function[j].name)) {	790	for (j = 0; j < tpc->soc->npins; j++) {
792	match = 1;	791	const struct pinctrl_pin_desc *pin_info = &thunderbay_pins[j];
793	break;	792	struct thunderbay_mux_desc *pin_mux;
794	}	793
795	}	794	for (pin_mux = pin_info->drv_data; pin_mux->name; pin_mux++) {
796		795	if (!strcmp(pin_mux->name, func->name))
797	if (!match)	796	group_names[grp_idx++] = pin_info->name;
798	return -EINVAL;
799
800	func = function + j;
801	grp_num = func->num_group_names;
802	grp_size = sizeof(*func->group_names);
803
804	if (!func->group_names) {
805	func->group_names = devm_kcalloc(tpc->dev,
806	grp_num,
807	grp_size,
808	GFP_KERNEL);
809	if (!func->group_names) {
810	kfree(func);
811	return -ENOMEM;
812	}
813	}	797	}
814
815	grp = func->group_names;
816	while (*grp)
817	grp++;
818
819	*grp = pin_info->name;
820	pin_mux++;
821	}	798	}
		799
		800	func->group_names = group_names;
822	}	801	}
823		802
824	/* Add all functions */	803	/* Add all functions */
825	for (i = 0; i < tpc->nfuncs; i++) {	804	for (i = 0; i < tpc->nfuncs; i++) {
826	pinmux_generic_add_function(tpc->pctrl,	805	pinmux_generic_add_function(tpc->pctrl,
827	function[i].name,	806	funcs[i].name,
828	function[i].group_names,	807	funcs[i].group_names,
829	function[i].num_group_names,	808	funcs[i].num_group_names,
830	function[i].data);	809	funcs[i].data);
831	}	810	}
832	kfree(function);	811	kfree(funcs);
833	return 0;	812	return 0;
834	}	813	}
835		814
@@ -839,27 +818,30 @@ static int thunderbay_build_functions(struct thunderbay_pinctrl *tpc) · 3 unmodified lines
839	void *ptr;	818	void *ptr;
840	int pin;	819	int pin;
841		820
842	/* Total number of functions is unknown at this point. Allocate first. */	821	/*
		822	* Allocate maximum possible number of functions. Assume every pin
		823	* being part of 8 (hw maximum) globally unique muxes.
		824	*/
843	tpc->nfuncs = 0;	825	tpc->nfuncs = 0;
844	thunderbay_funcs = kcalloc(tpc->soc->npins * 8,	826	thunderbay_funcs = kcalloc(tpc->soc->npins * 8,
845	sizeof(*thunderbay_funcs), GFP_KERNEL);	827	sizeof(*thunderbay_funcs), GFP_KERNEL);
846	if (!thunderbay_funcs)	828	if (!thunderbay_funcs)
847	return -ENOMEM;	829	return -ENOMEM;
848		830
849	/* Find total number of functions and each's properties */	831	/* Setup 1 function for each unique mux */
850	for (pin = 0; pin < tpc->soc->npins; pin++) {	832	for (pin = 0; pin < tpc->soc->npins; pin++) {
851	const struct pinctrl_pin_desc *pin_info = thunderbay_pins + pin;	833	const struct pinctrl_pin_desc *pin_info = thunderbay_pins + pin;
852	struct thunderbay_mux_desc *pin_mux = pin_info->drv_data;	834	struct thunderbay_mux_desc *pin_mux;
853		835
854	while (pin_mux->name) {	836	for (pin_mux = pin_info->drv_data; pin_mux->name; pin_mux++) {
855	struct function_desc *func = thunderbay_funcs;	837	struct function_desc *func;
856		838
857	while (func->name) {	839	/* Check if we already have function for this mux */
		840	for (func = thunderbay_funcs; func->name; func++) {
858	if (!strcmp(pin_mux->name, func->name)) {	841	if (!strcmp(pin_mux->name, func->name)) {
859	func->num_group_names++;	842	func->num_group_names++;
860	break;	843	break;
861	}	844	}
862	func++;
863	}	845	}
864		846
865	if (!func->name) {	847	if (!func->name) {
@@ -868,8 +850,6 @@ static int thunderbay_build_functions(struct thunderbay_pinctrl *tpc) · 2 unmodified lines
868	func->data = (int *)&pin_mux->mode;	850	func->data = (int *)&pin_mux->mode;
869	tpc->nfuncs++;	851	tpc->nfuncs++;
870	}	852	}
871
872	pin_mux++;
873	}	853	}
874	}	854	}
875		855

drivers/pinctrl/pinctrl-zynqmp.c+4−6

 					   unsigned int *npins)
 {
 	struct pinctrl_pin_desc *pins, *pin;
-	char **pin_names;
 	int ret;
 	int i;
 	if (!pins)
 		return -ENOMEM;
-	pin_names = devm_kasprintf_strarray(dev, ZYNQMP_PIN_PREFIX, *npins);
-	if (IS_ERR(pin_names))
-		return PTR_ERR(pin_names);
 	for (i = 0; i < *npins; i++) {
 		pin = &pins[i];
 		pin->number = i;
-		pin->name = pin_names[i];
+		pin->name = devm_kasprintf(dev, GFP_KERNEL, "%s%d",
+					   ZYNQMP_PIN_PREFIX, i);
+		if (!pin->name)
+			return -ENOMEM;
 	}
 	*zynqmp_pins = pins;

drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c+4−4

drivers/platform/surface/Kconfig+1−0

@@ -5,6 +5,7 @@ · 4 unmodified lines
5		5
6	menuconfig SURFACE_PLATFORMS	6	menuconfig SURFACE_PLATFORMS
7	bool "Microsoft Surface Platform-Specific Device Drivers"	7	bool "Microsoft Surface Platform-Specific Device Drivers"
		8	depends on ARM64 \|\| X86 \|\| COMPILE_TEST
8	default y	9	default y
9	help	10	help
10	Say Y here to get to see options for platform-specific device drivers	11	Say Y here to get to see options for platform-specific device drivers

drivers/platform/x86/amd-pmc.c+9−6

 	u32 cpu_id;
 	u32 active_ips;
 /* SMU version information */
-	u16 major;
+	u8 smu_program;
-	u16 minor;
+	u8 major;
-	u16 rev;
+	u8 minor;
+	u8 rev;
 	struct device *dev;
 	struct pci_dev *rdev;
 	struct mutex lock; /* generic mutex lock */
 	if (rc)
 		return rc;
-	dev->major = (val >> 16) & GENMASK(15, 0);
+	dev->smu_program = (val >> 24) & GENMASK(7, 0);
+	dev->major = (val >> 16) & GENMASK(7, 0);
 	dev->minor = (val >> 8) & GENMASK(7, 0);
 	dev->rev = (val >> 0) & GENMASK(7, 0);
-	dev_dbg(dev->dev, "SMU version is %u.%u.%u\n", dev->major, dev->minor, dev->rev);
+	dev_dbg(dev->dev, "SMU program %u version is %u.%u.%u\n",
+		dev->smu_program, dev->major, dev->minor, dev->rev);
 	return 0;
 }
 	return 0;
 }
-const struct file_operations amd_pmc_stb_debugfs_fops = {
+static const struct file_operations amd_pmc_stb_debugfs_fops = {
 	.owner = THIS_MODULE,
 	.open = amd_pmc_stb_debugfs_open,
 	.read = amd_pmc_stb_debugfs_read,

drivers/platform/x86/asus-tf103c-dock.c+2−2

@@ -250,7 +250,7 @@ static int tf103c_dock_hid_raw_request(struct hid_device *hid, u8 reportnum, · 249 unmodified lines
250	return 0;	250	return 0;
251	}	251	}
252		252
253	struct hid_ll_driver tf103c_dock_hid_ll_driver = {	253	static struct hid_ll_driver tf103c_dock_hid_ll_driver = {
254	.parse = tf103c_dock_hid_parse,	254	.parse = tf103c_dock_hid_parse,
255	.start = tf103c_dock_hid_start,	255	.start = tf103c_dock_hid_start,
256	.stop = tf103c_dock_hid_stop,	256	.stop = tf103c_dock_hid_stop,
@@ -921,7 +921,7 @@ static int __maybe_unused tf103c_dock_resume(struct device *dev) · 664 unmodified lines
921	return 0;	921	return 0;
922	}	922	}
923		923
924	SIMPLE_DEV_PM_OPS(tf103c_dock_pm_ops, tf103c_dock_suspend, tf103c_dock_resume);	924	static SIMPLE_DEV_PM_OPS(tf103c_dock_pm_ops, tf103c_dock_suspend, tf103c_dock_resume);
925		925
926	static const struct acpi_device_id tf103c_dock_acpi_match[] = {	926	static const struct acpi_device_id tf103c_dock_acpi_match[] = {
927	{"NPCE69A"},	927	{"NPCE69A"},

drivers/platform/x86/intel/crystal_cove_charger.c+13−13

 #include <linux/regmap.h>
 #define CHGRIRQ_REG					0x0a
+#define MCHGRIRQ_REG					0x17
 struct crystal_cove_charger_data {
 	struct mutex buslock; /* irq_bus_lock */
 	struct irq_domain *irq_domain;
 	int irq;
 	int charger_irq;
-	bool irq_enabled;
+	u8 mask;
-	bool irq_is_enabled;
+	u8 new_mask;
 };
 static irqreturn_t crystal_cove_charger_irq(int irq, void *data)
 {
 	struct crystal_cove_charger_data *charger = irq_data_get_irq_chip_data(data);
-	if (charger->irq_is_enabled != charger->irq_enabled) {
+	if (charger->mask != charger->new_mask) {
-		if (charger->irq_enabled)
+		regmap_write(charger->regmap, MCHGRIRQ_REG, charger->new_mask);
-			enable_irq(charger->irq);
+		charger->mask = charger->new_mask;
-		else
-			disable_irq(charger->irq);
-		charger->irq_is_enabled = charger->irq_enabled;
 	}
 	mutex_unlock(&charger->buslock);
 {
 	struct crystal_cove_charger_data *charger = irq_data_get_irq_chip_data(data);
-	charger->irq_enabled = true;
+	charger->new_mask &= ~BIT(data->hwirq);
 }
 static void crystal_cove_charger_irq_mask(struct irq_data *data)
 {
 	struct crystal_cove_charger_data *charger = irq_data_get_irq_chip_data(data);
-	charger->irq_enabled = false;
+	charger->new_mask |= BIT(data->hwirq);
 }
 static void crystal_cove_charger_rm_irq_domain(void *data)
 	irq_set_nested_thread(charger->charger_irq, true);
 	irq_set_noprobe(charger->charger_irq);
+	/* Mask the single 2nd level IRQ before enabling the 1st level IRQ */
+	charger->mask = charger->new_mask = BIT(0);
+	regmap_write(charger->regmap, MCHGRIRQ_REG, charger->mask);
 	ret = devm_request_threaded_irq(&pdev->dev, charger->irq, NULL,
 					crystal_cove_charger_irq,
-					IRQF_ONESHOT | IRQF_NO_AUTOEN,
+					IRQF_ONESHOT, KBUILD_MODNAME, charger);
-					KBUILD_MODNAME, charger);
 	if (ret)
 		return dev_err_probe(&pdev->dev, ret, "requesting irq\n");

drivers/platform/x86/intel/speed_select_if/isst_if_common.c+63−34

 	return ret;
 }
-static DEFINE_MUTEX(punit_misc_dev_lock);
+/* Lock to prevent module registration when already opened by user space */
+static DEFINE_MUTEX(punit_misc_dev_open_lock);
+/* Lock to allow one share misc device for all ISST interace */
+static DEFINE_MUTEX(punit_misc_dev_reg_lock);
 static int misc_usage_count;
 static int misc_device_ret;
 static int misc_device_open;
 	int i, ret = 0;
 	/* Fail open, if a module is going away */
-	mutex_lock(&punit_misc_dev_lock);
+	mutex_lock(&punit_misc_dev_open_lock);
 	for (i = 0; i < ISST_IF_DEV_MAX; ++i) {
 		struct isst_if_cmd_cb *cb = &punit_callbacks[i];
 	} else {
 		misc_device_open++;
 	}
-	mutex_unlock(&punit_misc_dev_lock);
+	mutex_unlock(&punit_misc_dev_open_lock);
 	return ret;
 }
 {
 	int i;
-	mutex_lock(&punit_misc_dev_lock);
+	mutex_lock(&punit_misc_dev_open_lock);
 	misc_device_open--;
 	for (i = 0; i < ISST_IF_DEV_MAX; ++i) {
 		struct isst_if_cmd_cb *cb = &punit_callbacks[i];
 		if (cb->registered)
 			module_put(cb->owner);
 	}
-	mutex_unlock(&punit_misc_dev_lock);
+	mutex_unlock(&punit_misc_dev_open_lock);
 	return 0;
 }
 	.fops		= &isst_if_char_driver_ops,
 };
+static int isst_misc_reg(void)
+{
+	mutex_lock(&punit_misc_dev_reg_lock);
+	if (misc_device_ret)
+		goto unlock_exit;
+	if (!misc_usage_count) {
+		misc_device_ret = isst_if_cpu_info_init();
+		if (misc_device_ret)
+			goto unlock_exit;
+		misc_device_ret = misc_register(&isst_if_char_driver);
+		if (misc_device_ret) {
+			isst_if_cpu_info_exit();
+			goto unlock_exit;
+		}
+	}
+	misc_usage_count++;
+unlock_exit:
+	mutex_unlock(&punit_misc_dev_reg_lock);
+	return misc_device_ret;
+}
+static void isst_misc_unreg(void)
+{
+	mutex_lock(&punit_misc_dev_reg_lock);
+	if (misc_usage_count)
+		misc_usage_count--;
+	if (!misc_usage_count && !misc_device_ret) {
+		misc_deregister(&isst_if_char_driver);
+		isst_if_cpu_info_exit();
+	}
+	mutex_unlock(&punit_misc_dev_reg_lock);
+}
 /**
  * isst_if_cdev_register() - Register callback for IOCTL
  * @device_type: The device type this callback handling.
  */
 int isst_if_cdev_register(int device_type, struct isst_if_cmd_cb *cb)
 {
-	if (misc_device_ret)
+	int ret;
-		return misc_device_ret;
 	if (device_type >= ISST_IF_DEV_MAX)
 		return -EINVAL;
-	mutex_lock(&punit_misc_dev_lock);
+	mutex_lock(&punit_misc_dev_open_lock);
+	/* Device is already open, we don't want to add new callbacks */
 	if (misc_device_open) {
-		mutex_unlock(&punit_misc_dev_lock);
+		mutex_unlock(&punit_misc_dev_open_lock);
 		return -EAGAIN;
 	}
-	if (!misc_usage_count) {
-		int ret;
-		misc_device_ret = misc_register(&isst_if_char_driver);
-		if (misc_device_ret)
-			goto unlock_exit;
-		ret = isst_if_cpu_info_init();
-		if (ret) {
-			misc_deregister(&isst_if_char_driver);
-			misc_device_ret = ret;
-			goto unlock_exit;
-		}
-	}
 	memcpy(&punit_callbacks[device_type], cb, sizeof(*cb));
 	punit_callbacks[device_type].registered = 1;
-	misc_usage_count++;
+	mutex_unlock(&punit_misc_dev_open_lock);
-unlock_exit:
-	mutex_unlock(&punit_misc_dev_lock);
-	return misc_device_ret;
+	ret = isst_misc_reg();
+	if (ret) {
+		/*
+		 * No need of mutex as the misc device register failed
+		 * as no one can open device yet. Hence no contention.
+		 */
+		punit_callbacks[device_type].registered = 0;
+		return ret;
+	}
+	return 0;
 }
 EXPORT_SYMBOL_GPL(isst_if_cdev_register);
  */
 void isst_if_cdev_unregister(int device_type)
 {
-	mutex_lock(&punit_misc_dev_lock);
+	isst_misc_unreg();
-	misc_usage_count--;
+	mutex_lock(&punit_misc_dev_open_lock);
 	punit_callbacks[device_type].registered = 0;
 	if (device_type == ISST_IF_DEV_MBOX)
 		isst_delete_hash();
-	if (!misc_usage_count && !misc_device_ret) {
+	mutex_unlock(&punit_misc_dev_open_lock);
-		misc_deregister(&isst_if_char_driver);
-		isst_if_cpu_info_exit();
-	}
-	mutex_unlock(&punit_misc_dev_lock);
 }
 EXPORT_SYMBOL_GPL(isst_if_cdev_unregister);

drivers/platform/x86/thinkpad_acpi.c+22−3

 	.attrs = fan_driver_attributes,
 };
-#define TPACPI_FAN_Q1	0x0001		/* Unitialized HFSP */
+#define TPACPI_FAN_Q1		0x0001		/* Uninitialized HFSP */
-#define TPACPI_FAN_2FAN	0x0002		/* EC 0x31 bit 0 selects fan2 */
+#define TPACPI_FAN_2FAN		0x0002		/* EC 0x31 bit 0 selects fan2 */
-#define TPACPI_FAN_2CTL	0x0004		/* selects fan2 control */
+#define TPACPI_FAN_2CTL		0x0004		/* selects fan2 control */
+#define TPACPI_FAN_NOFAN	0x0008		/* no fan available */
 static const struct tpacpi_quirk fan_quirk_table[] __initconst = {
 	TPACPI_QEC_IBM('1', 'Y', TPACPI_FAN_Q1),
 	TPACPI_Q_LNV3('N', '4', '0', TPACPI_FAN_2CTL),	/* P1 / X1 Extreme (4nd gen) */
 	TPACPI_Q_LNV3('N', '3', '0', TPACPI_FAN_2CTL),	/* P15 (1st gen) / P15v (1st gen) */
 	TPACPI_Q_LNV3('N', '3', '2', TPACPI_FAN_2CTL),	/* X1 Carbon (9th gen) */
+	TPACPI_Q_LNV3('N', '1', 'O', TPACPI_FAN_NOFAN),	/* X1 Tablet (2nd gen) */
 };
 static int __init fan_init(struct ibm_init_struct *iibm)
 	quirks = tpacpi_check_quirks(fan_quirk_table,
 				     ARRAY_SIZE(fan_quirk_table));
+	if (quirks & TPACPI_FAN_NOFAN) {
+		pr_info("No integrated ThinkPad fan available\n");
+		return -ENODEV;
+	}
 	if (gfan_handle) {
 		/* 570, 600e/x, 770e, 770x */
 		fan_status_access_mode = TPACPI_FAN_RD_ACPI_GFAN;
 #define DYTC_CMD_MMC_GET      8 /* To get current MMC function and mode */
 #define DYTC_CMD_RESET    0x1ff /* To reset back to default */
+#define DYTC_CMD_FUNC_CAP     3 /* To get DYTC capabilities */
+#define DYTC_FC_MMC           27 /* MMC Mode supported */
 #define DYTC_GET_FUNCTION_BIT 8  /* Bits  8-11 - function setting */
 #define DYTC_GET_MODE_BIT     12 /* Bits 12-15 - mode setting */
 	if (dytc_version < 5)
 		return -ENODEV;
+	/* Check what capabilities are supported. Currently MMC is needed */
+	err = dytc_command(DYTC_CMD_FUNC_CAP, &output);
+	if (err)
+		return err;
+	if (!(output & BIT(DYTC_FC_MMC))) {
+		dbg_printk(TPACPI_DBG_INIT, " DYTC MMC mode not supported\n");
+		return -ENODEV;
+	}
 	dbg_printk(TPACPI_DBG_INIT,
 			"DYTC version %d: thermal mode available\n", dytc_version);
 	/*

drivers/platform/x86/touchscreen_dmi.c+24−0

@@ -770,6 +770,21 @@ static const struct ts_dmi_data predia_basic_data = { · 769 unmodified lines
770	.properties = predia_basic_props,	770	.properties = predia_basic_props,
771	};	771	};
772		772
		773	static const struct property_entry rwc_nanote_p8_props[] = {
		774	PROPERTY_ENTRY_U32("touchscreen-min-y", 46),
		775	PROPERTY_ENTRY_U32("touchscreen-size-x", 1728),
		776	PROPERTY_ENTRY_U32("touchscreen-size-y", 1140),
		777	PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
		778	PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-rwc-nanote-p8.fw"),
		779	PROPERTY_ENTRY_U32("silead,max-fingers", 10),
		780	{ }
		781	};
		782
		783	static const struct ts_dmi_data rwc_nanote_p8_data = {
		784	.acpi_name = "MSSL1680:00",
		785	.properties = rwc_nanote_p8_props,
		786	};
		787
773	static const struct property_entry schneider_sct101ctm_props[] = {	788	static const struct property_entry schneider_sct101ctm_props[] = {
774	PROPERTY_ENTRY_U32("touchscreen-size-x", 1715),	789	PROPERTY_ENTRY_U32("touchscreen-size-x", 1715),
775	PROPERTY_ENTRY_U32("touchscreen-size-y", 1140),	790	PROPERTY_ENTRY_U32("touchscreen-size-y", 1140),
@@ -1394,6 +1409,15 @@ const struct dmi_system_id touchscreen_dmi_table[] = { · 618 unmodified lines
1394	DMI_EXACT_MATCH(DMI_BOARD_NAME, "0E57"),	1409	DMI_EXACT_MATCH(DMI_BOARD_NAME, "0E57"),
1395	},	1410	},
1396	},	1411	},
		1412	{
		1413	/* RWC NANOTE P8 */
		1414	.driver_data = (void *)&rwc_nanote_p8_data,
		1415	.matches = {
		1416	DMI_MATCH(DMI_BOARD_VENDOR, "Default string"),
		1417	DMI_MATCH(DMI_PRODUCT_NAME, "AY07J"),
		1418	DMI_MATCH(DMI_PRODUCT_SKU, "0001")
		1419	},
		1420	},
1397	{	1421	{
1398	/* Schneider SCT101CTM */	1422	/* Schneider SCT101CTM */
1399	.driver_data = (void *)&schneider_sct101ctm_data,	1423	.driver_data = (void *)&schneider_sct101ctm_data,

drivers/platform/x86/x86-android-tablets.c+95−10

 #include <linux/string.h>
 /* For gpio_get_desc() which is EXPORT_SYMBOL_GPL() */
 #include "../../gpio/gpiolib.h"
+#include "../../gpio/gpiolib-acpi.h"
 /*
  * Helper code to get Linux IRQ numbers given a description of the IRQ source
 	int polarity; /* ACPI_ACTIVE_HIGH / ACPI_ACTIVE_LOW / ACPI_ACTIVE_BOTH */
 };
-static int x86_acpi_irq_helper_gpiochip_find(struct gpio_chip *gc, void *data)
+static int gpiochip_find_match_label(struct gpio_chip *gc, void *data)
 {
 	return gc->label && !strcmp(gc->label, data);
 }
 		return irq;
 	case X86_ACPI_IRQ_TYPE_GPIOINT:
 		/* Like acpi_dev_gpio_irq_get(), but without parsing ACPI resources */
-		chip = gpiochip_find(data->chip, x86_acpi_irq_helper_gpiochip_find);
+		chip = gpiochip_find(data->chip, gpiochip_find_match_label);
 		if (!chip) {
 			pr_err("error cannot find GPIO chip %s\n", data->chip);
 			return -ENODEV;
 };
 struct x86_dev_info {
+	char *invalid_aei_gpiochip;
 	const char * const *modules;
-	struct gpiod_lookup_table **gpiod_lookup_tables;
+	struct gpiod_lookup_table * const *gpiod_lookup_tables;
 	const struct x86_i2c_client_info *i2c_client_info;
 	const struct platform_device_info *pdev_info;
 	const struct x86_serdev_info *serdev_info;
 	int i2c_client_count;
 	int pdev_count;
 	int serdev_count;
+	int (*init)(void);
+	void (*exit)(void);
 };
 /* Generic / shared bq24190 settings */
 };
 static const char * const bq24190_modules[] __initconst = {
-	"crystal_cove_charger", /* For the bq24190 IRQ */
+	"intel_crystal_cove_charger", /* For the bq24190 IRQ */
-	"bq24190_charger",      /* For the Vbus regulator for intel-int3496 */
+	"bq24190_charger",            /* For the Vbus regulator for intel-int3496 */
 	NULL
 };
 	},
 };
-static struct gpiod_lookup_table *asus_me176c_gpios[] = {
+static struct gpiod_lookup_table * const asus_me176c_gpios[] = {
 	&int3496_gpo2_pin22_gpios,
 	&asus_me176c_goodix_gpios,
 	NULL
 	.serdev_count = ARRAY_SIZE(asus_me176c_serdevs),
 	.gpiod_lookup_tables = asus_me176c_gpios,
 	.modules = bq24190_modules,
+	.invalid_aei_gpiochip = "INT33FC:02",
 };
 /* Asus TF103C tablets have an Android factory img with everything hardcoded */
 	},
 };
-static struct gpiod_lookup_table *asus_tf103c_gpios[] = {
+static struct gpiod_lookup_table * const asus_tf103c_gpios[] = {
 	&int3496_gpo2_pin22_gpios,
 	NULL
 };
 	.pdev_count = ARRAY_SIZE(int3496_pdevs),
 	.gpiod_lookup_tables = asus_tf103c_gpios,
 	.modules = bq24190_modules,
+	.invalid_aei_gpiochip = "INT33FC:02",
 };
 /*
 	.i2c_client_count = ARRAY_SIZE(chuwi_hi8_i2c_clients),
 };
+#define CZC_EC_EXTRA_PORT	0x68
+#define CZC_EC_ANDROID_KEYS	0x63
+static int __init czc_p10t_init(void)
+{
+	/*
+	 * The device boots up in "Windows 7" mode, when the home button sends a
+	 * Windows specific key sequence (Left Meta + D) and the second button
+	 * sends an unknown one while also toggling the Radio Kill Switch.
+	 * This is a surprising behavior when the second button is labeled "Back".
+	 *
+	 * The vendor-supplied Android-x86 build switches the device to a "Android"
+	 * mode by writing value 0x63 to the I/O port 0x68. This just seems to just
+	 * set bit 6 on address 0x96 in the EC region; switching the bit directly
+	 * seems to achieve the same result. It uses a "p10t_switcher" to do the
+	 * job. It doesn't seem to be able to do anything else, and no other use
+	 * of the port 0x68 is known.
+	 *
+	 * In the Android mode, the home button sends just a single scancode,
+	 * which can be handled in Linux userspace more reasonably and the back
+	 * button only sends a scancode without toggling the kill switch.
+	 * The scancode can then be mapped either to Back or RF Kill functionality
+	 * in userspace, depending on how the button is labeled on that particular
+	 * model.
+	 */
+	outb(CZC_EC_ANDROID_KEYS, CZC_EC_EXTRA_PORT);
+	return 0;
+}
+static const struct x86_dev_info czc_p10t __initconst = {
+	.init = czc_p10t_init,
+};
 /*
  * Whitelabel (sold as various brands) TM800A550L tablets.
  * These tablet's DSDT contains a whole bunch of bogus ACPI I2C devices
 	},
 };
-static struct gpiod_lookup_table *whitelabel_tm800a550l_gpios[] = {
+static struct gpiod_lookup_table * const whitelabel_tm800a550l_gpios[] = {
 	&whitelabel_tm800a550l_goodix_gpios,
 	NULL
 };
 		},
 		.driver_data = (void *)&chuwi_hi8_info,
 	},
+	{
+		/* CZC P10T */
+		.ident = "CZC ODEON TPC-10 (\"P10T\")",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "CZC"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "ODEON*TPC-10"),
+		},
+		.driver_data = (void *)&czc_p10t,
+	},
+	{
+		/* A variant of CZC P10T */
+		.ident = "ViewSonic ViewPad 10",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "ViewSonic"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "VPAD10"),
+		},
+		.driver_data = (void *)&czc_p10t,
+	},
 	{
 		/* Whitelabel (sold as various brands) TM800A550L */
 		.matches = {
 static struct i2c_client **i2c_clients;
 static struct platform_device **pdevs;
 static struct serdev_device **serdevs;
-static struct gpiod_lookup_table **gpiod_lookup_tables;
+static struct gpiod_lookup_table * const *gpiod_lookup_tables;
+static void (*exit_handler)(void);
 static __init int x86_instantiate_i2c_client(const struct x86_dev_info *dev_info,
 					     int idx)
 	kfree(i2c_clients);
+	if (exit_handler)
+		exit_handler();
 	for (i = 0; gpiod_lookup_tables && gpiod_lookup_tables[i]; i++)
 		gpiod_remove_lookup_table(gpiod_lookup_tables[i]);
 }
 {
 	const struct x86_dev_info *dev_info;
 	const struct dmi_system_id *id;
+	struct gpio_chip *chip;
 	int i, ret = 0;
 	id = dmi_first_match(x86_android_tablet_ids);
 	dev_info = id->driver_data;
+	/*
+	 * The broken DSDTs on these devices often also include broken
+	 * _AEI (ACPI Event Interrupt) handlers, disable these.
+	 */
+	if (dev_info->invalid_aei_gpiochip) {
+		chip = gpiochip_find(dev_info->invalid_aei_gpiochip,
+				     gpiochip_find_match_label);
+		if (!chip) {
+			pr_err("error cannot find GPIO chip %s\n", dev_info->invalid_aei_gpiochip);
+			return -ENODEV;
+		}
+		acpi_gpiochip_free_interrupts(chip);
+	}
 	/*
 	 * Since this runs from module_init() it cannot use -EPROBE_DEFER,
 	 * instead pre-load any modules which are listed as requirements.
 	for (i = 0; gpiod_lookup_tables && gpiod_lookup_tables[i]; i++)
 		gpiod_add_lookup_table(gpiod_lookup_tables[i]);
+	if (dev_info->init) {
+		ret = dev_info->init();
+		if (ret < 0) {
+			x86_android_tablet_cleanup();
+			return ret;
+		}
+		exit_handler = dev_info->exit;
+	}
 	i2c_clients = kcalloc(dev_info->i2c_client_count, sizeof(*i2c_clients), GFP_KERNEL);
 	if (!i2c_clients) {
 		x86_android_tablet_cleanup();
 module_init(x86_android_tablet_init);
 module_exit(x86_android_tablet_cleanup);
-MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com");
+MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
 MODULE_DESCRIPTION("X86 Android tablets DSDT fixups driver");
 MODULE_LICENSE("GPL");

drivers/regulator/max20086-regulator.c+2−1

 #include <linux/err.h>
 #include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 	node = of_get_child_by_name(chip->dev->of_node, "regulators");
 	if (!node) {
 		dev_err(chip->dev, "regulators node not found\n");
-		return PTR_ERR(node);
+		return -ENODEV;
 	}
 	for (i = 0; i < chip->info->num_outputs; ++i)

drivers/s390/scsi/zfcp_fc.c+12−1

 		goto out;
 	}
+	/* re-init to undo drop from zfcp_fc_adisc() */
+	port->d_id = ntoh24(adisc_resp->adisc_port_id);
 	/* port is good, unblock rport without going through erp */
 	zfcp_scsi_schedule_rport_register(port);
  out:
 	struct zfcp_fc_req *fc_req;
 	struct zfcp_adapter *adapter = port->adapter;
 	struct Scsi_Host *shost = adapter->scsi_host;
+	u32 d_id;
 	int ret;
 	fc_req = kmem_cache_zalloc(zfcp_fc_req_cache, GFP_ATOMIC);
 	fc_req->u.adisc.req.adisc_cmd = ELS_ADISC;
 	hton24(fc_req->u.adisc.req.adisc_port_id, fc_host_port_id(shost));
-	ret = zfcp_fsf_send_els(adapter, port->d_id, &fc_req->ct_els,
+	d_id = port->d_id; /* remember as destination for send els below */
+	/*
+	 * Force fresh GID_PN lookup on next port recovery.
+	 * Must happen after request setup and before sending request,
+	 * to prevent race with port->d_id re-init in zfcp_fc_adisc_handler().
+	 */
+	port->d_id = 0;
+	ret = zfcp_fsf_send_els(adapter, d_id, &fc_req->ct_els,
 				ZFCP_FC_CTELS_TMO);
 	if (ret)
 		kmem_cache_free(zfcp_fc_req_cache, fc_req);

drivers/scsi/3w-sas.c+0−4

 	pci_try_set_mwi(pdev);
 	retval = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
-	if (retval)
-		retval = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
 	if (retval) {
 		TW_PRINTK(host, TW_DRIVER, 0x18, "Failed to set dma mask");
 		retval = -ENODEV;
 	pci_try_set_mwi(pdev);
 	retval = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
-	if (retval)
-		retval = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
 	if (retval) {
 		TW_PRINTK(host, TW_DRIVER, 0x25, "Failed to set dma mask during resume");
 		retval = -ENODEV;

drivers/scsi/53c700.c+0−1

@@ -1507,7 +1507,6 @@ NCR_700_intr(int irq, void *dev_id) · 1506 unmodified lines
1507	struct scsi_cmnd *SCp = hostdata->cmd;	1507	struct scsi_cmnd *SCp = hostdata->cmd;
1508		1508
1509	handled = 1;	1509	handled = 1;
1510	SCp = hostdata->cmd;
1511		1510
1512	if(istat & SCSI_INT_PENDING) {	1511	if(istat & SCSI_INT_PENDING) {
1513	udelay(10);	1512	udelay(10);

drivers/scsi/bfa/bfad.c+0−6

 	pci_set_master(pdev);
 	rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
-	if (rc)
-		rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
 	if (rc) {
 		rc = -ENODEV;
 		printk(KERN_ERR "dma_set_mask_and_coherent fail %p\n", pdev);
 	pci_set_master(pdev);
 	rc = dma_set_mask_and_coherent(&bfad->pcidev->dev, DMA_BIT_MASK(64));
-	if (rc)
-		rc = dma_set_mask_and_coherent(&bfad->pcidev->dev,
-					       DMA_BIT_MASK(32));
 	if (rc)
 		goto out_disable_device;

drivers/scsi/bnx2fc/bnx2fc_fcoe.c+5−15

@@ -82,7 +82,7 @@ static int bnx2fc_bind_pcidev(struct bnx2fc_hba *hba); · 81 unmodified lines
82	static void bnx2fc_unbind_pcidev(struct bnx2fc_hba *hba);	82	static void bnx2fc_unbind_pcidev(struct bnx2fc_hba *hba);
83	static struct fc_lport bnx2fc_if_create(struct bnx2fc_interface interface,	83	static struct fc_lport bnx2fc_if_create(struct bnx2fc_interface interface,
84	struct device *parent, int npiv);	84	struct device *parent, int npiv);
85	static void bnx2fc_destroy_work(struct work_struct *work);	85	static void bnx2fc_port_destroy(struct fcoe_port *port);
86		86
87	static struct bnx2fc_hba bnx2fc_hba_lookup(struct net_device phys_dev);	87	static struct bnx2fc_hba bnx2fc_hba_lookup(struct net_device phys_dev);
88	static struct bnx2fc_interface *bnx2fc_interface_lookup(struct net_device	88	static struct bnx2fc_interface *bnx2fc_interface_lookup(struct net_device
@@ -907,9 +907,6 @@ static void bnx2fc_indicate_netevent(void *context, unsigned long event, · 818 unmodified lines
907	__bnx2fc_destroy(interface);	907	__bnx2fc_destroy(interface);
908	}	908	}
909	mutex_unlock(&bnx2fc_dev_lock);	909	mutex_unlock(&bnx2fc_dev_lock);
910
911	/* Ensure ALL destroy work has been completed before return */
912	flush_workqueue(bnx2fc_wq);
913	return;	910	return;
914		911
915	default:	912	default:
@@ -1215,8 +1212,8 @@ static int bnx2fc_vport_destroy(struct fc_vport *vport) · 299 unmodified lines
1215	mutex_unlock(&n_port->lp_mutex);	1212	mutex_unlock(&n_port->lp_mutex);
1216	bnx2fc_free_vport(interface->hba, port->lport);	1213	bnx2fc_free_vport(interface->hba, port->lport);
1217	bnx2fc_port_shutdown(port->lport);	1214	bnx2fc_port_shutdown(port->lport);
		1215	bnx2fc_port_destroy(port);
1218	bnx2fc_interface_put(interface);	1216	bnx2fc_interface_put(interface);
1219	queue_work(bnx2fc_wq, &port->destroy_work);
1220	return 0;	1217	return 0;
1221	}	1218	}
1222		1219
@@ -1525,7 +1522,6 @@ static struct fc_lport bnx2fc_if_create(struct bnx2fc_interface interface, · 302 unmodified lines
1525	port->lport = lport;	1522	port->lport = lport;
1526	port->priv = interface;	1523	port->priv = interface;
1527	port->get_netdev = bnx2fc_netdev;	1524	port->get_netdev = bnx2fc_netdev;
1528	INIT_WORK(&port->destroy_work, bnx2fc_destroy_work);
1529		1525
1530	/* Configure fcoe_port */	1526	/* Configure fcoe_port */
1531	rc = bnx2fc_lport_config(lport);	1527	rc = bnx2fc_lport_config(lport);
@@ -1653,8 +1649,8 @@ static void __bnx2fc_destroy(struct bnx2fc_interface *interface) · 121 unmodified lines
1653	bnx2fc_interface_cleanup(interface);	1649	bnx2fc_interface_cleanup(interface);
1654	bnx2fc_stop(interface);	1650	bnx2fc_stop(interface);
1655	list_del(&interface->list);	1651	list_del(&interface->list);
		1652	bnx2fc_port_destroy(port);
1656	bnx2fc_interface_put(interface);	1653	bnx2fc_interface_put(interface);
1657	queue_work(bnx2fc_wq, &port->destroy_work);
1658	}	1654	}
1659		1655
1660	/**	1656	/**
@@ -1694,15 +1690,12 @@ netdev_err: · 33 unmodified lines
1694	return rc;	1690	return rc;
1695	}	1691	}
1696		1692
1697	static void bnx2fc_destroy_work(struct work_struct *work)	1693	static void bnx2fc_port_destroy(struct fcoe_port *port)
1698	{	1694	{
1699	struct fcoe_port *port;
1700	struct fc_lport *lport;	1695	struct fc_lport *lport;
1701		1696
1702	port = container_of(work, struct fcoe_port, destroy_work);
1703	lport = port->lport;	1697	lport = port->lport;
1704		1698	BNX2FC_HBA_DBG(lport, "Entered %s, destroying lport %p\n", __func__, lport);
1705	BNX2FC_HBA_DBG(lport, "Entered bnx2fc_destroy_work\n");
1706		1699
1707	bnx2fc_if_destroy(lport);	1700	bnx2fc_if_destroy(lport);
1708	}	1701	}
@@ -2556,9 +2549,6 @@ static void bnx2fc_ulp_exit(struct cnic_dev *dev) · 847 unmodified lines
2556	__bnx2fc_destroy(interface);	2549	__bnx2fc_destroy(interface);
2557	mutex_unlock(&bnx2fc_dev_lock);	2550	mutex_unlock(&bnx2fc_dev_lock);
2558		2551
2559	/* Ensure ALL destroy work has been completed before return */
2560	flush_workqueue(bnx2fc_wq);
2561
2562	bnx2fc_ulp_stop(hba);	2552	bnx2fc_ulp_stop(hba);
2563	/* unregister cnic device */	2553	/* unregister cnic device */
2564	if (test_and_clear_bit(BNX2FC_CNIC_REGISTERED, &hba->reg_with_cnic))	2554	if (test_and_clear_bit(BNX2FC_CNIC_REGISTERED, &hba->reg_with_cnic))

drivers/scsi/elx/libefc/efc_els.c+2−6

 	efc = node->efc;
-	spin_lock_irqsave(&node->els_ios_lock, flags);
 	if (!node->els_io_enabled) {
 		efc_log_err(efc, "els io alloc disabled\n");
-		spin_unlock_irqrestore(&node->els_ios_lock, flags);
 		return NULL;
 	}
 	els = mempool_alloc(efc->els_io_pool, GFP_ATOMIC);
 	if (!els) {
 		atomic_add_return(1, &efc->els_io_alloc_failed_count);
-		spin_unlock_irqrestore(&node->els_ios_lock, flags);
 		return NULL;
 	}
 					      &els->io.req.phys, GFP_KERNEL);
 	if (!els->io.req.virt) {
 		mempool_free(els, efc->els_io_pool);
-		spin_unlock_irqrestore(&node->els_ios_lock, flags);
 		return NULL;
 	}
 		/* add els structure to ELS IO list */
 		INIT_LIST_HEAD(&els->list_entry);
+		spin_lock_irqsave(&node->els_ios_lock, flags);
 		list_add_tail(&els->list_entry, &node->els_ios_list);
+		spin_unlock_irqrestore(&node->els_ios_lock, flags);
 	}
-	spin_unlock_irqrestore(&node->els_ios_lock, flags);
 	return els;
 }

drivers/scsi/hisi_sas/hisi_sas_main.c+0−3

@@ -2666,9 +2666,6 @@ static struct Scsi_Host hisi_sas_shost_alloc(struct platform_device pdev, · 2665 unmodified lines
2666	goto err_out;	2666	goto err_out;
2667		2667
2668	error = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));	2668	error = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
2669	if (error)
2670	error = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
2671
2672	if (error) {	2669	if (error) {
2673	dev_err(dev, "No usable DMA addressing method\n");	2670	dev_err(dev, "No usable DMA addressing method\n");
2674	goto err_out;	2671	goto err_out;

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c+0−2

@@ -4695,8 +4695,6 @@ hisi_sas_v3_probe(struct pci_dev pdev, const struct pci_device_id id) · 4694 unmodified lines
4695	goto err_out;	4695	goto err_out;
4696		4696
4697	rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));	4697	rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
4698	if (rc)
4699	rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
4700	if (rc) {	4698	if (rc) {
4701	dev_err(dev, "No usable DMA addressing method\n");	4699	dev_err(dev, "No usable DMA addressing method\n");
4702	rc = -ENODEV;	4700	rc = -ENODEV;

drivers/scsi/myrs.c+2−1

@@ -2267,7 +2267,8 @@ static void myrs_cleanup(struct myrs_hba *cs) · 2266 unmodified lines
2267	myrs_unmap(cs);	2267	myrs_unmap(cs);
2268		2268
2269	if (cs->mmio_base) {	2269	if (cs->mmio_base) {
2270	cs->disable_intr(cs);	2270	if (cs->disable_intr)
		2271	cs->disable_intr(cs);
2271	iounmap(cs->mmio_base);	2272	iounmap(cs->mmio_base);
2272	cs->mmio_base = NULL;	2273	cs->mmio_base = NULL;
2273	}	2274	}

drivers/scsi/pm8001/pm80xx_hwi.c+14−2

@@ -4151,10 +4151,22 @@ static int process_oq(struct pm8001_hba_info *pm8001_ha, u8 vec) · 4150 unmodified lines
4151	u32 ret = MPI_IO_STATUS_FAIL;	4151	u32 ret = MPI_IO_STATUS_FAIL;
4152	u32 regval;	4152	u32 regval;
4153		4153
		4154	/*
		4155	* Fatal errors are programmed to be signalled in irq vector
		4156	* pm8001_ha->max_q_num - 1 through pm8001_ha->main_cfg_tbl.pm80xx_tbl.
		4157	* fatal_err_interrupt
		4158	*/
4154	if (vec == (pm8001_ha->max_q_num - 1)) {	4159	if (vec == (pm8001_ha->max_q_num - 1)) {
		4160	u32 mipsall_ready;
		4161
		4162	if (pm8001_ha->chip_id == chip_8008 \|\|
		4163	pm8001_ha->chip_id == chip_8009)
		4164	mipsall_ready = SCRATCH_PAD_MIPSALL_READY_8PORT;
		4165	else
		4166	mipsall_ready = SCRATCH_PAD_MIPSALL_READY_16PORT;
		4167
4155	regval = pm8001_cr32(pm8001_ha, 0, MSGU_SCRATCH_PAD_1);	4168	regval = pm8001_cr32(pm8001_ha, 0, MSGU_SCRATCH_PAD_1);
4156	if ((regval & SCRATCH_PAD_MIPSALL_READY) !=	4169	if ((regval & mipsall_ready) != mipsall_ready) {
4157	SCRATCH_PAD_MIPSALL_READY) {
4158	pm8001_ha->controller_fatal_error = true;	4170	pm8001_ha->controller_fatal_error = true;
4159	pm8001_dbg(pm8001_ha, FAIL,	4171	pm8001_dbg(pm8001_ha, FAIL,
4160	"Firmware Fatal error! Regval:0x%x\n",	4172	"Firmware Fatal error! Regval:0x%x\n",

drivers/scsi/pm8001/pm80xx_hwi.h+5−1

 #define SCRATCH_PAD_BOOT_LOAD_SUCCESS	0x0
 #define SCRATCH_PAD_IOP0_READY		0xC00
 #define SCRATCH_PAD_IOP1_READY		0x3000
-#define SCRATCH_PAD_MIPSALL_READY	(SCRATCH_PAD_IOP1_READY | \
+#define SCRATCH_PAD_MIPSALL_READY_16PORT	(SCRATCH_PAD_IOP1_READY | \
 					SCRATCH_PAD_IOP0_READY | \
+					SCRATCH_PAD_ILA_READY | \
+					SCRATCH_PAD_RAAE_READY)
+#define SCRATCH_PAD_MIPSALL_READY_8PORT	(SCRATCH_PAD_IOP0_READY | \
+					SCRATCH_PAD_ILA_READY | \
 					SCRATCH_PAD_RAAE_READY)
 /* boot loader state */

drivers/scsi/qedf/qedf_io.c+1−0

@@ -2250,6 +2250,7 @@ process_els: · 2249 unmodified lines
2250	io_req->tm_flags == FCP_TMF_TGT_RESET) {	2250	io_req->tm_flags == FCP_TMF_TGT_RESET) {
2251	clear_bit(QEDF_CMD_OUTSTANDING, &io_req->flags);	2251	clear_bit(QEDF_CMD_OUTSTANDING, &io_req->flags);
2252	io_req->sc_cmd = NULL;	2252	io_req->sc_cmd = NULL;
		2253	kref_put(&io_req->refcount, qedf_release_cmd);
2253	complete(&io_req->tm_done);	2254	complete(&io_req->tm_done);
2254	}	2255	}
2255		2256

drivers/scsi/qedf/qedf_main.c+5−2

 	struct qed_link_output if_link;
 	if (lport->vport) {
-		QEDF_ERR(NULL, "Cannot issue host reset on NPIV port.\n");
+		printk_ratelimited("Cannot issue host reset on NPIV port.\n");
 		return;
 	}
 	vport_qedf->cmd_mgr = base_qedf->cmd_mgr;
 	init_completion(&vport_qedf->flogi_compl);
 	INIT_LIST_HEAD(&vport_qedf->fcports);
+	INIT_DELAYED_WORK(&vport_qedf->stag_work, qedf_stag_change_work);
 	rc = qedf_vport_libfc_config(vport, vn_port);
 	if (rc) {
 	struct qedf_ctx *qedf =
 	    container_of(work, struct qedf_ctx, stag_work.work);
-	QEDF_ERR(&qedf->dbg_ctx, "Performing software context reset.\n");
+	printk_ratelimited("[%s]:[%s:%d]:%d: Performing software context reset.",
+			dev_name(&qedf->pdev->dev), __func__, __LINE__,
+			qedf->dbg_ctx.host_no);
 	qedf_ctx_soft_reset(qedf->lport);
 }

drivers/scsi/ufs/ufshcd-pltfrm.c+7−0

 		clki->min_freq = clkfreq[i];
 		clki->max_freq = clkfreq[i+1];
 		clki->name = devm_kstrdup(dev, name, GFP_KERNEL);
+		if (!clki->name) {
+			ret = -ENOMEM;
+			goto out;
+		}
 		if (!strcmp(name, "ref_clk"))
 			clki->keep_link_active = true;
 		dev_dbg(dev, "%s: min %u max %u name %s\n", "freq-table-hz",
 		return -ENOMEM;
 	vreg->name = devm_kstrdup(dev, name, GFP_KERNEL);
+	if (!vreg->name)
+		return -ENOMEM;
 	snprintf(prop_name, MAX_PROP_SIZE, "%s-max-microamp", name);
 	if (of_property_read_u32(np, prop_name, &vreg->max_uA)) {

drivers/scsi/ufs/ufshcd.c+6−3

  * @pwr_mode: device power mode to set
  *
  * Returns 0 if requested power mode is set successfully
- * Returns non-zero if failed to set the requested power mode
+ * Returns < 0 if failed to set the requested power mode
  */
 static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba,
 				     enum ufs_dev_pwr_mode pwr_mode)
 		sdev_printk(KERN_WARNING, sdp,
 			    "START_STOP failed for power mode: %d, result %x\n",
 			    pwr_mode, ret);
-		if (ret > 0 && scsi_sense_valid(&sshdr))
+		if (ret > 0) {
-			scsi_print_sense_hdr(sdp, NULL, &sshdr);
+			if (scsi_sense_valid(&sshdr))
+				scsi_print_sense_hdr(sdp, NULL, &sshdr);
+			ret = -EIO;
+		}
 	}
 	if (!ret)

drivers/scsi/ufs/ufshci.h+2−1

@@ -142,7 +142,8 @@ static inline u32 ufshci_version(u32 major, u32 minor) · 141 unmodified lines
142	#define INT_FATAL_ERRORS (DEVICE_FATAL_ERROR \|\	142	#define INT_FATAL_ERRORS (DEVICE_FATAL_ERROR \|\
143	CONTROLLER_FATAL_ERROR \|\	143	CONTROLLER_FATAL_ERROR \|\
144	SYSTEM_BUS_FATAL_ERROR \|\	144	SYSTEM_BUS_FATAL_ERROR \|\
145	CRYPTO_ENGINE_FATAL_ERROR)	145	CRYPTO_ENGINE_FATAL_ERROR \|\
		146	UIC_LINK_LOST)
146		147
147	/* HCS - Host Controller Status 30h */	148	/* HCS - Host Controller Status 30h */
148	#define DEVICE_PRESENT 0x1	149	#define DEVICE_PRESENT 0x1

drivers/spi/spi-bcm-qspi.c+1−1

@@ -585,7 +585,7 @@ static void bcm_qspi_chip_select(struct bcm_qspi *qspi, int cs) · 584 unmodified lines
585	u32 rd = 0;	585	u32 rd = 0;
586	u32 wr = 0;	586	u32 wr = 0;
587		587
588	if (qspi->base[CHIP_SELECT]) {	588	if (cs >= 0 && qspi->base[CHIP_SELECT]) {
589	rd = bcm_qspi_read(qspi, CHIP_SELECT, 0);	589	rd = bcm_qspi_read(qspi, CHIP_SELECT, 0);
590	wr = (rd & ~0xff) \| (1 << cs);	590	wr = (rd & ~0xff) \| (1 << cs);
591	if (rd == wr)	591	if (rd == wr)

drivers/spi/spi-meson-spicc.c+5−0

 	writel_relaxed(0, spicc->base + SPICC_INTREG);
 	irq = platform_get_irq(pdev, 0);
+	if (irq < 0) {
+		ret = irq;
+		goto out_master;
+	}
 	ret = devm_request_irq(&pdev->dev, irq, meson_spicc_irq,
 			       0, NULL, spicc);
 	if (ret) {

drivers/spi/spi-mt65xx.c+1−1

@@ -624,7 +624,7 @@ static irqreturn_t mtk_spi_interrupt(int irq, void *dev_id) · 623 unmodified lines
624	else	624	else
625	mdata->state = MTK_SPI_IDLE;	625	mdata->state = MTK_SPI_IDLE;
626		626
627	if (!master->can_dma(master, master->cur_msg->spi, trans)) {	627	if (!master->can_dma(master, NULL, trans)) {
628	if (trans->rx_buf) {	628	if (trans->rx_buf) {
629	cnt = mdata->xfer_len / 4;	629	cnt = mdata->xfer_len / 4;
630	ioread32_rep(mdata->base + SPI_RX_DATA_REG,	630	ioread32_rep(mdata->base + SPI_RX_DATA_REG,

drivers/spi/spi-stm32-qspi.c+17−30

 	struct resource *res;
 	int ret, irq;
-	ctrl = spi_alloc_master(dev, sizeof(*qspi));
+	ctrl = devm_spi_alloc_master(dev, sizeof(*qspi));
 	if (!ctrl)
 		return -ENOMEM;
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi");
 	qspi->io_base = devm_ioremap_resource(dev, res);
-	if (IS_ERR(qspi->io_base)) {
+	if (IS_ERR(qspi->io_base))
-		ret = PTR_ERR(qspi->io_base);
+		return PTR_ERR(qspi->io_base);
-		goto err_master_put;
-	}
 	qspi->phys_base = res->start;
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi_mm");
 	qspi->mm_base = devm_ioremap_resource(dev, res);
-	if (IS_ERR(qspi->mm_base)) {
+	if (IS_ERR(qspi->mm_base))
-		ret = PTR_ERR(qspi->mm_base);
+		return PTR_ERR(qspi->mm_base);
-		goto err_master_put;
-	}
 	qspi->mm_size = resource_size(res);
-	if (qspi->mm_size > STM32_QSPI_MAX_MMAP_SZ) {
+	if (qspi->mm_size > STM32_QSPI_MAX_MMAP_SZ)
-		ret = -EINVAL;
+		return -EINVAL;
-		goto err_master_put;
-	}
 	irq = platform_get_irq(pdev, 0);
-	if (irq < 0) {
+	if (irq < 0)
-		ret = irq;
+		return irq;
-		goto err_master_put;
-	}
 	ret = devm_request_irq(dev, irq, stm32_qspi_irq, 0,
 			       dev_name(dev), qspi);
 	if (ret) {
 		dev_err(dev, "failed to request irq\n");
-		goto err_master_put;
+		return ret;
 	}
 	init_completion(&qspi->data_completion);
 	init_completion(&qspi->match_completion);
 	qspi->clk = devm_clk_get(dev, NULL);
-	if (IS_ERR(qspi->clk)) {
+	if (IS_ERR(qspi->clk))
-		ret = PTR_ERR(qspi->clk);
+		return PTR_ERR(qspi->clk);
-		goto err_master_put;
-	}
 	qspi->clk_rate = clk_get_rate(qspi->clk);
-	if (!qspi->clk_rate) {
+	if (!qspi->clk_rate)
-		ret = -EINVAL;
+		return -EINVAL;
-		goto err_master_put;
-	}
 	ret = clk_prepare_enable(qspi->clk);
 	if (ret) {
 		dev_err(dev, "can not enable the clock\n");
-		goto err_master_put;
+		return ret;
 	}
 	rstc = devm_reset_control_get_exclusive(dev, NULL);
 	pm_runtime_enable(dev);
 	pm_runtime_get_noresume(dev);
-	ret = devm_spi_register_master(dev, ctrl);
+	ret = spi_register_master(ctrl);
 	if (ret)
 		goto err_pm_runtime_free;
 	stm32_qspi_dma_free(qspi);
 err_clk_disable:
 	clk_disable_unprepare(qspi->clk);
-err_master_put:
-	spi_master_put(qspi->ctrl);
 	return ret;
 }
 	struct stm32_qspi *qspi = platform_get_drvdata(pdev);
 	pm_runtime_get_sync(qspi->dev);
+	spi_unregister_master(qspi->ctrl);
 	/* disable qspi */
 	writel_relaxed(0, qspi->io_base + QSPI_CR);
 	stm32_qspi_dma_free(qspi);

drivers/spi/spi-stm32.c+4−3

  * time between frames (if driver has this functionality)
  * @set_number_of_data: optional routine to configure registers to desired
  * number of data (if driver has this functionality)
- * @can_dma: routine to determine if the transfer is eligible for DMA use
  * @transfer_one_dma_start: routine to start transfer a single spi_transfer
  * using DMA
  * @dma_rx_cb: routine to call after DMA RX channel operation is complete
  * @baud_rate_div_min: minimum baud rate divisor
  * @baud_rate_div_max: maximum baud rate divisor
  * @has_fifo: boolean to know if fifo is used for driver
- * @has_startbit: boolean to know if start bit is used to start transfer
+ * @flags: compatible specific SPI controller flags used at registration time
  */
 struct stm32_spi_cfg {
 	const struct stm32_spi_regspec *regs;
 	unsigned int baud_rate_div_min;
 	unsigned int baud_rate_div_max;
 	bool has_fifo;
+	u16 flags;
 };
 /**
 	.baud_rate_div_min = STM32F4_SPI_BR_DIV_MIN,
 	.baud_rate_div_max = STM32F4_SPI_BR_DIV_MAX,
 	.has_fifo = false,
+	.flags = SPI_MASTER_MUST_TX,
 };
 static const struct stm32_spi_cfg stm32h7_spi_cfg = {
 	master->prepare_message = stm32_spi_prepare_msg;
 	master->transfer_one = stm32_spi_transfer_one;
 	master->unprepare_message = stm32_spi_unprepare_msg;
-	master->flags = SPI_MASTER_MUST_TX;
+	master->flags = spi->cfg->flags;
 	spi->dma_tx = dma_request_chan(spi->dev, "tx");
 	if (IS_ERR(spi->dma_tx)) {

drivers/spi/spi-uniphier.c+14−4

 		if (ret) {
 			dev_err(&pdev->dev, "failed to get TX DMA capacities: %d\n",
 				ret);
-			goto out_disable_clk;
+			goto out_release_dma;
 		}
 		dma_tx_burst = caps.max_burst;
 	}
 	if (IS_ERR_OR_NULL(master->dma_rx)) {
 		if (PTR_ERR(master->dma_rx) == -EPROBE_DEFER) {
 			ret = -EPROBE_DEFER;
-			goto out_disable_clk;
+			goto out_release_dma;
 		}
 		master->dma_rx = NULL;
 		dma_rx_burst = INT_MAX;
 		if (ret) {
 			dev_err(&pdev->dev, "failed to get RX DMA capacities: %d\n",
 				ret);
-			goto out_disable_clk;
+			goto out_release_dma;
 		}
 		dma_rx_burst = caps.max_burst;
 	}
 	ret = devm_spi_register_master(&pdev->dev, master);
 	if (ret)
-		goto out_disable_clk;
+		goto out_release_dma;
 	return 0;
+out_release_dma:
+	if (!IS_ERR_OR_NULL(master->dma_rx)) {
+		dma_release_channel(master->dma_rx);
+		master->dma_rx = NULL;
+	}
+	if (!IS_ERR_OR_NULL(master->dma_tx)) {
+		dma_release_channel(master->dma_tx);
+		master->dma_tx = NULL;
+	}
 out_disable_clk:
 	clk_disable_unprepare(priv->clk);

drivers/target/iscsi/iscsi_target_tpg.c+3−0

@@ -443,6 +443,9 @@ static bool iscsit_tpg_check_network_portal( · 442 unmodified lines
443	break;	443	break;
444	}	444	}
445	spin_unlock(&tpg->tpg_np_lock);	445	spin_unlock(&tpg->tpg_np_lock);
		446
		447	if (match)
		448	break;
446	}	449	}
447	spin_unlock(&tiqn->tiqn_tpg_lock);	450	spin_unlock(&tiqn->tiqn_tpg_lock);
448		451

drivers/tty/n_gsm.c+3−1

 #define GSM1_ESCAPE_BITS	0x20
 #define XON			0x11
 #define XOFF			0x13
+#define ISO_IEC_646_MASK	0x7F
 static const struct tty_port_operations gsm_port_ops;
 	int olen = 0;
 	while (len--) {
 		if (*input == GSM1_SOF || *input == GSM1_ESCAPE
-		    || *input == XON || *input == XOFF) {
+		    || (*input & ISO_IEC_646_MASK) == XON
+		    || (*input & ISO_IEC_646_MASK) == XOFF) {
 			*output++ = GSM1_ESCAPE;
 			*output++ = *input++ ^ GSM1_ESCAPE_BITS;
 			olen++;

drivers/tty/rpmsg_tty.c+26−14

 static int rpmsg_tty_install(struct tty_driver *driver, struct tty_struct *tty)
 {
 	struct rpmsg_tty_port *cport = idr_find(&tty_idr, tty->index);
+	struct tty_port *port;
 	tty->driver_data = cport;
-	return tty_port_install(&cport->port, driver, tty);
+	port = tty_port_get(&cport->port);
+	return tty_port_install(port, driver, tty);
+}
+static void rpmsg_tty_cleanup(struct tty_struct *tty)
+{
+	tty_port_put(tty->port);
 }
 static int rpmsg_tty_open(struct tty_struct *tty, struct file *filp)
 	return size;
 }
+static void rpmsg_tty_hangup(struct tty_struct *tty)
+{
+	tty_port_hangup(tty->port);
+}
 static const struct tty_operations rpmsg_tty_ops = {
 	.install	= rpmsg_tty_install,
 	.open		= rpmsg_tty_open,
 	.close		= rpmsg_tty_close,
 	.write		= rpmsg_tty_write,
 	.write_room	= rpmsg_tty_write_room,
+	.hangup		= rpmsg_tty_hangup,
+	.cleanup	= rpmsg_tty_cleanup,
 };
 static struct rpmsg_tty_port *rpmsg_tty_alloc_cport(void)
 	return cport;
 }
-static void rpmsg_tty_release_cport(struct rpmsg_tty_port *cport)
+static void rpmsg_tty_destruct_port(struct tty_port *port)
 {
+	struct rpmsg_tty_port *cport = container_of(port, struct rpmsg_tty_port, port);
 	mutex_lock(&idr_lock);
 	idr_remove(&tty_idr, cport->id);
 	mutex_unlock(&idr_lock);
 	kfree(cport);
 }
-static const struct tty_port_operations rpmsg_tty_port_ops = { };
+static const struct tty_port_operations rpmsg_tty_port_ops = {
+	.destruct = rpmsg_tty_destruct_port,
+};
 static int rpmsg_tty_probe(struct rpmsg_device *rpdev)
 {
 					   cport->id, dev);
 	if (IS_ERR(tty_dev)) {
 		ret = dev_err_probe(dev, PTR_ERR(tty_dev), "Failed to register tty port\n");
-		goto err_destroy;
+		tty_port_put(&cport->port);
+		return ret;
 	}
 	cport->rpdev = rpdev;
 		rpdev->src, rpdev->dst, cport->id);
 	return 0;
-err_destroy:
-	tty_port_destroy(&cport->port);
-	rpmsg_tty_release_cport(cport);
-	return ret;
 }
 static void rpmsg_tty_remove(struct rpmsg_device *rpdev)
 	dev_dbg(&rpdev->dev, "Removing rpmsg tty device %d\n", cport->id);
 	/* User hang up to release the tty */
-	if (tty_port_initialized(&cport->port))
+	tty_port_tty_hangup(&cport->port, false);
-		tty_port_tty_hangup(&cport->port, false);
 	tty_unregister_device(rpmsg_tty_driver, cport->id);
-	tty_port_destroy(&cport->port);
+	tty_port_put(&cport->port);
-	rpmsg_tty_release_cport(cport);
 }
 static struct rpmsg_device_id rpmsg_driver_tty_id_table[] = {

drivers/tty/serial/8250/8250_of.c+10−1

@@ -83,8 +83,17 @@ static int of_platform_serial_setup(struct platform_device *ofdev, · 82 unmodified lines
83	port->mapsize = resource_size(&resource);	83	port->mapsize = resource_size(&resource);
84		84
85	/* Check for shifted address mapping */	85	/* Check for shifted address mapping */
86	if (of_property_read_u32(np, "reg-offset", &prop) == 0)	86	if (of_property_read_u32(np, "reg-offset", &prop) == 0) {
		87	if (prop >= port->mapsize) {
		88	dev_warn(&ofdev->dev, "reg-offset %u exceeds region size %pa\n",
		89	prop, &port->mapsize);
		90	ret = -EINVAL;
		91	goto err_unprepare;
		92	}
		93
87	port->mapbase += prop;	94	port->mapbase += prop;
		95	port->mapsize -= prop;
		96	}
88		97
89	port->iotype = UPIO_MEM;	98	port->iotype = UPIO_MEM;
90	if (of_property_read_u32(np, "reg-io-width", &prop) == 0) {	99	if (of_property_read_u32(np, "reg-io-width", &prop) == 0) {

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

@@ -4779,8 +4779,30 @@ static const struct pci_device_id serial_pci_tbl[] = { · 4778 unmodified lines
4779	{ PCI_VENDOR_ID_INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS400,	4779	{ PCI_VENDOR_ID_INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS400,
4780	PCI_ANY_ID, PCI_ANY_ID, 0, 0, /* 135a.0dc0 */	4780	PCI_ANY_ID, PCI_ANY_ID, 0, 0, /* 135a.0dc0 */
4781	pbn_b2_4_115200 },	4781	pbn_b2_4_115200 },
		4782	/* Brainboxes Devices */
4782	/*	4783	/*
4783	* BrainBoxes UC-260	4784	* Brainboxes UC-101
		4785	*/
		4786	{ PCI_VENDOR_ID_INTASHIELD, 0x0BA1,
		4787	PCI_ANY_ID, PCI_ANY_ID,
		4788	0, 0,
		4789	pbn_b2_2_115200 },
		4790	/*
		4791	* Brainboxes UC-235/246
		4792	*/
		4793	{ PCI_VENDOR_ID_INTASHIELD, 0x0AA1,
		4794	PCI_ANY_ID, PCI_ANY_ID,
		4795	0, 0,
		4796	pbn_b2_1_115200 },
		4797	/*
		4798	* Brainboxes UC-257
		4799	*/
		4800	{ PCI_VENDOR_ID_INTASHIELD, 0x0861,
		4801	PCI_ANY_ID, PCI_ANY_ID,
		4802	0, 0,
		4803	pbn_b2_2_115200 },
		4804	/*
		4805	* Brainboxes UC-260/271/701/756
4784	*/	4806	*/
4785	{ PCI_VENDOR_ID_INTASHIELD, 0x0D21,	4807	{ PCI_VENDOR_ID_INTASHIELD, 0x0D21,
4786	PCI_ANY_ID, PCI_ANY_ID,	4808	PCI_ANY_ID, PCI_ANY_ID,
@@ -4788,7 +4810,81 @@ static const struct pci_device_id serial_pci_tbl[] = { · 1 unmodified line
4788	pbn_b2_4_115200 },	4810	pbn_b2_4_115200 },
4789	{ PCI_VENDOR_ID_INTASHIELD, 0x0E34,	4811	{ PCI_VENDOR_ID_INTASHIELD, 0x0E34,
4790	PCI_ANY_ID, PCI_ANY_ID,	4812	PCI_ANY_ID, PCI_ANY_ID,
4791	PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, 0xffff00,	4813	PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, 0xffff00,
		4814	pbn_b2_4_115200 },
		4815	/*
		4816	* Brainboxes UC-268
		4817	*/
		4818	{ PCI_VENDOR_ID_INTASHIELD, 0x0841,
		4819	PCI_ANY_ID, PCI_ANY_ID,
		4820	0, 0,
		4821	pbn_b2_4_115200 },
		4822	/*
		4823	* Brainboxes UC-275/279
		4824	*/
		4825	{ PCI_VENDOR_ID_INTASHIELD, 0x0881,
		4826	PCI_ANY_ID, PCI_ANY_ID,
		4827	0, 0,
		4828	pbn_b2_8_115200 },
		4829	/*
		4830	* Brainboxes UC-302
		4831	*/
		4832	{ PCI_VENDOR_ID_INTASHIELD, 0x08E1,
		4833	PCI_ANY_ID, PCI_ANY_ID,
		4834	0, 0,
		4835	pbn_b2_2_115200 },
		4836	/*
		4837	* Brainboxes UC-310
		4838	*/
		4839	{ PCI_VENDOR_ID_INTASHIELD, 0x08C1,
		4840	PCI_ANY_ID, PCI_ANY_ID,
		4841	0, 0,
		4842	pbn_b2_2_115200 },
		4843	/*
		4844	* Brainboxes UC-313
		4845	*/
		4846	{ PCI_VENDOR_ID_INTASHIELD, 0x08A3,
		4847	PCI_ANY_ID, PCI_ANY_ID,
		4848	0, 0,
		4849	pbn_b2_2_115200 },
		4850	/*
		4851	* Brainboxes UC-320/324
		4852	*/
		4853	{ PCI_VENDOR_ID_INTASHIELD, 0x0A61,
		4854	PCI_ANY_ID, PCI_ANY_ID,
		4855	0, 0,
		4856	pbn_b2_1_115200 },
		4857	/*
		4858	* Brainboxes UC-346
		4859	*/
		4860	{ PCI_VENDOR_ID_INTASHIELD, 0x0B02,
		4861	PCI_ANY_ID, PCI_ANY_ID,
		4862	0, 0,
		4863	pbn_b2_4_115200 },
		4864	/*
		4865	* Brainboxes UC-357
		4866	*/
		4867	{ PCI_VENDOR_ID_INTASHIELD, 0x0A81,
		4868	PCI_ANY_ID, PCI_ANY_ID,
		4869	0, 0,
		4870	pbn_b2_2_115200 },
		4871	{ PCI_VENDOR_ID_INTASHIELD, 0x0A83,
		4872	PCI_ANY_ID, PCI_ANY_ID,
		4873	0, 0,
		4874	pbn_b2_2_115200 },
		4875	/*
		4876	* Brainboxes UC-368
		4877	*/
		4878	{ PCI_VENDOR_ID_INTASHIELD, 0x0C41,
		4879	PCI_ANY_ID, PCI_ANY_ID,
		4880	0, 0,
		4881	pbn_b2_4_115200 },
		4882	/*
		4883	* Brainboxes UC-420/431
		4884	*/
		4885	{ PCI_VENDOR_ID_INTASHIELD, 0x0921,
		4886	PCI_ANY_ID, PCI_ANY_ID,
		4887	0, 0,
4792	pbn_b2_4_115200 },	4888	pbn_b2_4_115200 },
4793	/*	4889	/*
4794	* Perle PCI-RAS cards	4890	* Perle PCI-RAS cards

drivers/tty/serial/8250/8250_port.c+6−55

@@ -2056,7 +2056,10 @@ static void serial8250_break_ctl(struct uart_port *port, int break_state) · 2055 unmodified lines
2056	serial8250_rpm_put(up);	2056	serial8250_rpm_put(up);
2057	}	2057	}
2058		2058
2059	static void wait_for_lsr(struct uart_8250_port *up, int bits)	2059	/*
		2060	* Wait for transmitter & holding register to empty
		2061	*/
		2062	static void wait_for_xmitr(struct uart_8250_port *up, int bits)
2060	{	2063	{
2061	unsigned int status, tmout = 10000;	2064	unsigned int status, tmout = 10000;
2062		2065
@@ -2073,16 +2076,6 @@ static void wait_for_lsr(struct uart_8250_port *up, int bits) · 10 unmodified lines
2073	udelay(1);	2076	udelay(1);
2074	touch_nmi_watchdog();	2077	touch_nmi_watchdog();
2075	}	2078	}
2076	}
2077
2078	/*
2079	* Wait for transmitter & holding register to empty
2080	*/
2081	static void wait_for_xmitr(struct uart_8250_port *up, int bits)
2082	{
2083	unsigned int tmout;
2084
2085	wait_for_lsr(up, bits);
2086		2079
2087	/* Wait up to 1s for flow control if necessary */	2080	/* Wait up to 1s for flow control if necessary */
2088	if (up->port.flags & UPF_CONS_FLOW) {	2081	if (up->port.flags & UPF_CONS_FLOW) {
@@ -3332,35 +3325,6 @@ static void serial8250_console_restore(struct uart_8250_port *up) · 1243 unmodified lines
3332	serial8250_out_MCR(up, UART_MCR_DTR \| UART_MCR_RTS);	3325	serial8250_out_MCR(up, UART_MCR_DTR \| UART_MCR_RTS);
3333	}	3326	}
3334		3327
3335	/*
3336	* Print a string to the serial port using the device FIFO
3337	*
3338	* It sends fifosize bytes and then waits for the fifo
3339	* to get empty.
3340	*/
3341	static void serial8250_console_fifo_write(struct uart_8250_port *up,
3342	const char *s, unsigned int count)
3343	{
3344	int i;
3345	const char *end = s + count;
3346	unsigned int fifosize = up->port.fifosize;
3347	bool cr_sent = false;
3348
3349	while (s != end) {
3350	wait_for_lsr(up, UART_LSR_THRE);
3351
3352	for (i = 0; i < fifosize && s != end; ++i) {
3353	if (*s == '\n' && !cr_sent) {
3354	serial_out(up, UART_TX, '\r');
3355	cr_sent = true;
3356	} else {
3357	serial_out(up, UART_TX, *s++);
3358	cr_sent = false;
3359	}
3360	}
3361	}
3362	}
3363
3364	/*	3328	/*
3365	* Print a string to the serial port trying not to disturb	3329	* Print a string to the serial port trying not to disturb
3366	* any possible real use of the port...	3330	* any possible real use of the port...
@@ -3376,7 +3340,7 @@ void serial8250_console_write(struct uart_8250_port up, const char s, · 9 unmodified lines
3376	struct uart_8250_em485 *em485 = up->em485;	3340	struct uart_8250_em485 *em485 = up->em485;
3377	struct uart_port *port = &up->port;	3341	struct uart_port *port = &up->port;
3378	unsigned long flags;	3342	unsigned long flags;
3379	unsigned int ier, use_fifo;	3343	unsigned int ier;
3380	int locked = 1;	3344	int locked = 1;
3381		3345
3382	touch_nmi_watchdog();	3346	touch_nmi_watchdog();
@@ -3408,20 +3372,7 @@ void serial8250_console_write(struct uart_8250_port up, const char s, · 25 unmodified lines
3408	mdelay(port->rs485.delay_rts_before_send);	3372	mdelay(port->rs485.delay_rts_before_send);
3409	}	3373	}
3410		3374
3411	use_fifo = (up->capabilities & UART_CAP_FIFO) &&	3375	uart_console_write(port, s, count, serial8250_console_putchar);
3412	port->fifosize > 1 &&
3413	(serial_port_in(port, UART_FCR) & UART_FCR_ENABLE_FIFO) &&
3414	/*
3415	* After we put a data in the fifo, the controller will send
3416	* it regardless of the CTS state. Therefore, only use fifo
3417	* if we don't use control flow.
3418	*/
3419	!(up->port.flags & UPF_CONS_FLOW);
3420
3421	if (likely(use_fifo))
3422	serial8250_console_fifo_write(up, s, count);
3423	else
3424	uart_console_write(port, s, count, serial8250_console_putchar);
3425		3376
3426	/*	3377	/*
3427	* Finally, wait for transmitter to become empty	3378	* Finally, wait for transmitter to become empty

drivers/tty/serial/amba-pl011.c+1−10

 	    container_of(port, struct uart_amba_port, port);
 	unsigned int cr;
-	if (port->rs485.flags & SER_RS485_ENABLED)
-		mctrl &= ~TIOCM_RTS;
 	cr = pl011_read(uap, REG_CR);
 #define	TIOCMBIT(tiocmbit, uartbit)		\
 	cr &= UART011_CR_RTS | UART011_CR_DTR;
 	cr |= UART01x_CR_UARTEN | UART011_CR_RXE;
-	if (port->rs485.flags & SER_RS485_ENABLED) {
+	if (!(port->rs485.flags & SER_RS485_ENABLED))
-		if (port->rs485.flags & SER_RS485_RTS_AFTER_SEND)
-			cr &= ~UART011_CR_RTS;
-		else
-			cr |= UART011_CR_RTS;
-	} else {
 		cr |= UART011_CR_TXE;
-	}
 	pl011_write(cr, uap, REG_CR);

drivers/tty/serial/serial_core.c+12−22

@@ -144,6 +144,11 @@ uart_update_mctrl(struct uart_port *port, unsigned int set, unsigned int clear) · 143 unmodified lines
144	unsigned long flags;	144	unsigned long flags;
145	unsigned int old;	145	unsigned int old;
146		146
		147	if (port->rs485.flags & SER_RS485_ENABLED) {
		148	set &= ~TIOCM_RTS;
		149	clear &= ~TIOCM_RTS;
		150	}
		151
147	spin_lock_irqsave(&port->lock, flags);	152	spin_lock_irqsave(&port->lock, flags);
148	old = port->mctrl;	153	old = port->mctrl;
149	port->mctrl = (old & ~clear) \| set;	154	port->mctrl = (old & ~clear) \| set;
@@ -157,23 +162,10 @@ uart_update_mctrl(struct uart_port *port, unsigned int set, unsigned int clear) · 7 unmodified lines
157		162
158	static void uart_port_dtr_rts(struct uart_port *uport, int raise)	163	static void uart_port_dtr_rts(struct uart_port *uport, int raise)
159	{	164	{
160	int rs485_on = uport->rs485_config &&	165	if (raise)
161	(uport->rs485.flags & SER_RS485_ENABLED);	166	uart_set_mctrl(uport, TIOCM_DTR \| TIOCM_RTS);
162	int RTS_after_send = !!(uport->rs485.flags & SER_RS485_RTS_AFTER_SEND);	167	else
163		168	uart_clear_mctrl(uport, TIOCM_DTR \| TIOCM_RTS);
164	if (raise) {
165	if (rs485_on && RTS_after_send) {
166	uart_set_mctrl(uport, TIOCM_DTR);
167	uart_clear_mctrl(uport, TIOCM_RTS);
168	} else {
169	uart_set_mctrl(uport, TIOCM_DTR \| TIOCM_RTS);
170	}
171	} else {
172	unsigned int clear = TIOCM_DTR;
173
174	clear \|= (!rs485_on \|\| RTS_after_send) ? TIOCM_RTS : 0;
175	uart_clear_mctrl(uport, clear);
176	}
177	}	169	}
178		170
179	/*	171	/*
@@ -1075,11 +1067,6 @@ uart_tiocmset(struct tty_struct *tty, unsigned int set, unsigned int clear) · 895 unmodified lines
1075	goto out;	1067	goto out;
1076		1068
1077	if (!tty_io_error(tty)) {	1069	if (!tty_io_error(tty)) {
1078	if (uport->rs485.flags & SER_RS485_ENABLED) {
1079	set &= ~TIOCM_RTS;
1080	clear &= ~TIOCM_RTS;
1081	}
1082
1083	uart_update_mctrl(uport, set, clear);	1070	uart_update_mctrl(uport, set, clear);
1084	ret = 0;	1071	ret = 0;
1085	}	1072	}
@@ -2390,6 +2377,9 @@ uart_configure_port(struct uart_driver drv, struct uart_state state, · 1304 unmodified lines
2390	*/	2377	*/
2391	spin_lock_irqsave(&port->lock, flags);	2378	spin_lock_irqsave(&port->lock, flags);
2392	port->mctrl &= TIOCM_DTR;	2379	port->mctrl &= TIOCM_DTR;
		2380	if (port->rs485.flags & SER_RS485_ENABLED &&
		2381	!(port->rs485.flags & SER_RS485_RTS_AFTER_SEND))
		2382	port->mctrl \|= TIOCM_RTS;
2393	port->ops->set_mctrl(port, port->mctrl);	2383	port->ops->set_mctrl(port, port->mctrl);
2394	spin_unlock_irqrestore(&port->lock, flags);	2384	spin_unlock_irqrestore(&port->lock, flags);
2395		2385

drivers/tty/serial/stm32-usart.c+13−1

 	struct stm32_port *stm32_port = to_stm32_port(port);
 	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;
 	struct circ_buf *xmit = &port->state->xmit;
+	u32 isr;
+	int ret;
 	if (port->x_char) {
 		if (stm32_usart_tx_dma_started(stm32_port) &&
 		    stm32_usart_tx_dma_enabled(stm32_port))
 			stm32_usart_clr_bits(port, ofs->cr3, USART_CR3_DMAT);
+		/* Check that TDR is empty before filling FIFO */
+		ret =
+		readl_relaxed_poll_timeout_atomic(port->membase + ofs->isr,
+						  isr,
+						  (isr & USART_SR_TXE),
+						  10, 1000);
+		if (ret)
+			dev_warn(port->dev, "1 character may be erased\n");
 		writel_relaxed(port->x_char, port->membase + ofs->tdr);
 		port->x_char = 0;
 		port->icount.tx++;
 	struct serial_rs485 *rs485conf = &port->rs485;
 	struct circ_buf *xmit = &port->state->xmit;
-	if (uart_circ_empty(xmit))
+	if (uart_circ_empty(xmit) && !port->x_char)
 		return;
 	if (rs485conf->flags & SER_RS485_ENABLED) {

drivers/usb/cdns3/drd.c+3−3

@@ -483,11 +483,11 @@ int cdns_drd_exit(struct cdns *cdns) · 482 unmodified lines
483	/* Indicate the cdns3 core was power lost before */	483	/* Indicate the cdns3 core was power lost before */
484	bool cdns_power_is_lost(struct cdns *cdns)	484	bool cdns_power_is_lost(struct cdns *cdns)
485	{	485	{
486	if (cdns->version == CDNS3_CONTROLLER_V1) {	486	if (cdns->version == CDNS3_CONTROLLER_V0) {
487	if (!(readl(&cdns->otg_v1_regs->simulate) & BIT(0)))	487	if (!(readl(&cdns->otg_v0_regs->simulate) & BIT(0)))
488	return true;	488	return true;
489	} else {	489	} else {
490	if (!(readl(&cdns->otg_v0_regs->simulate) & BIT(0)))	490	if (!(readl(&cdns->otg_v1_regs->simulate) & BIT(0)))
491	return true;	491	return true;
492	}	492	}
493	return false;	493	return false;

drivers/usb/common/ulpi.c+5−2

 	struct ulpi *ulpi = to_ulpi_dev(dev);
 	const struct ulpi_device_id *id;
-	/* Some ULPI devices don't have a vendor id so rely on OF match */
+	/*
-	if (ulpi->id.vendor == 0)
+	 * Some ULPI devices don't have a vendor id
+	 * or provide an id_table so rely on OF match.
+	 */
+	if (ulpi->id.vendor == 0 || !drv->id_table)
 		return of_driver_match_device(dev, driver);
 	for (id = drv->id_table; id->vendor; id++)

drivers/usb/core/hcd.c+14−0

@@ -1563,6 +1563,13 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags) · 1562 unmodified lines
1563	urb->hcpriv = NULL;	1563	urb->hcpriv = NULL;
1564	INIT_LIST_HEAD(&urb->urb_list);	1564	INIT_LIST_HEAD(&urb->urb_list);
1565	atomic_dec(&urb->use_count);	1565	atomic_dec(&urb->use_count);
		1566	/*
		1567	* Order the write of urb->use_count above before the read
		1568	* of urb->reject below. Pairs with the memory barriers in
		1569	* usb_kill_urb() and usb_poison_urb().
		1570	*/
		1571	smp_mb__after_atomic();
		1572
1566	atomic_dec(&urb->dev->urbnum);	1573	atomic_dec(&urb->dev->urbnum);
1567	if (atomic_read(&urb->reject))	1574	if (atomic_read(&urb->reject))
1568	wake_up(&usb_kill_urb_queue);	1575	wake_up(&usb_kill_urb_queue);
@@ -1665,6 +1672,13 @@ static void __usb_hcd_giveback_urb(struct urb *urb) · 96 unmodified lines
1665		1672
1666	usb_anchor_resume_wakeups(anchor);	1673	usb_anchor_resume_wakeups(anchor);
1667	atomic_dec(&urb->use_count);	1674	atomic_dec(&urb->use_count);
		1675	/*
		1676	* Order the write of urb->use_count above before the read
		1677	* of urb->reject below. Pairs with the memory barriers in
		1678	* usb_kill_urb() and usb_poison_urb().
		1679	*/
		1680	smp_mb__after_atomic();
		1681
1668	if (unlikely(atomic_read(&urb->reject)))	1682	if (unlikely(atomic_read(&urb->reject)))
1669	wake_up(&usb_kill_urb_queue);	1683	wake_up(&usb_kill_urb_queue);
1670	usb_put_urb(urb);	1684	usb_put_urb(urb);

drivers/usb/core/urb.c+12−0

 	if (!(urb && urb->dev && urb->ep))
 		return;
 	atomic_inc(&urb->reject);
+	/*
+	 * Order the write of urb->reject above before the read
+	 * of urb->use_count below.  Pairs with the barriers in
+	 * __usb_hcd_giveback_urb() and usb_hcd_submit_urb().
+	 */
+	smp_mb__after_atomic();
 	usb_hcd_unlink_urb(urb, -ENOENT);
 	wait_event(usb_kill_urb_queue, atomic_read(&urb->use_count) == 0);
 	if (!urb)
 		return;
 	atomic_inc(&urb->reject);
+	/*
+	 * Order the write of urb->reject above before the read
+	 * of urb->use_count below.  Pairs with the barriers in
+	 * __usb_hcd_giveback_urb() and usb_hcd_submit_urb().
+	 */
+	smp_mb__after_atomic();
 	if (!urb->dev || !urb->ep)
 		return;

drivers/usb/dwc2/gadget.c+1−1

@@ -5097,7 +5097,7 @@ int dwc2_hsotg_suspend(struct dwc2_hsotg *hsotg) · 5096 unmodified lines
5097	hsotg->gadget.speed = USB_SPEED_UNKNOWN;	5097	hsotg->gadget.speed = USB_SPEED_UNKNOWN;
5098	spin_unlock_irqrestore(&hsotg->lock, flags);	5098	spin_unlock_irqrestore(&hsotg->lock, flags);
5099		5099
5100	for (ep = 0; ep < hsotg->num_of_eps; ep++) {	5100	for (ep = 1; ep < hsotg->num_of_eps; ep++) {
5101	if (hsotg->eps_in[ep])	5101	if (hsotg->eps_in[ep])
5102	dwc2_hsotg_ep_disable_lock(&hsotg->eps_in[ep]->ep);	5102	dwc2_hsotg_ep_disable_lock(&hsotg->eps_in[ep]->ep);
5103	if (hsotg->eps_out[ep])	5103	if (hsotg->eps_out[ep])

drivers/usb/dwc3/dwc3-xilinx.c+18−5

 	int			ret;
 	u32			reg;
-	usb3_phy = devm_phy_get(dev, "usb3-phy");
+	usb3_phy = devm_phy_optional_get(dev, "usb3-phy");
-	if (PTR_ERR(usb3_phy) == -EPROBE_DEFER) {
+	if (IS_ERR(usb3_phy)) {
-		ret = -EPROBE_DEFER;
+		ret = PTR_ERR(usb3_phy);
+		dev_err_probe(dev, ret,
+			      "failed to get USB3 PHY\n");
 		goto err;
-	} else if (IS_ERR(usb3_phy)) {
-		usb3_phy = NULL;
 	}
+	/*
+	 * The following core resets are not required unless a USB3 PHY
+	 * is used, and the subsequent register settings are not required
+	 * unless a core reset is performed (they should be set properly
+	 * by the first-stage boot loader, but may be reverted by a core
+	 * reset). They may also break the configuration if USB3 is actually
+	 * in use but the usb3-phy entry is missing from the device tree.
+	 * Therefore, skip these operations in this case.
+	 */
+	if (!usb3_phy)
+		goto skip_usb3_phy;
 	crst = devm_reset_control_get_exclusive(dev, "usb_crst");
 	if (IS_ERR(crst)) {
 		ret = PTR_ERR(crst);
 		goto err;
 	}
+skip_usb3_phy:
 	/*
 	 * This routes the USB DMA traffic to go through FPD path instead
 	 * of reaching DDR directly. This traffic routing is needed to

drivers/usb/gadget/function/f_sourcesink.c+1−0

@@ -584,6 +584,7 @@ static int source_sink_start_ep(struct f_sourcesink *ss, bool is_in, · 583 unmodified lines
584		584
585	if (is_iso) {	585	if (is_iso) {
586	switch (speed) {	586	switch (speed) {
		587	case USB_SPEED_SUPER_PLUS:
587	case USB_SPEED_SUPER:	588	case USB_SPEED_SUPER:
588	size = ss->isoc_maxpacket *	589	size = ss->isoc_maxpacket *
589	(ss->isoc_mult + 1) *	590	(ss->isoc_mult + 1) *

drivers/usb/gadget/udc/at91_udc.c+1−1

@@ -1895,7 +1895,7 @@ static int at91udc_probe(struct platform_device *pdev) · 1894 unmodified lines
1895	at91_vbus_irq, 0, driver_name, udc);	1895	at91_vbus_irq, 0, driver_name, udc);
1896	if (retval) {	1896	if (retval) {
1897	DBG("request vbus irq %d failed\n",	1897	DBG("request vbus irq %d failed\n",
1898	udc->board.vbus_pin);	1898	desc_to_gpio(udc->board.vbus_pin));
1899	goto err_unprepare_iclk;	1899	goto err_unprepare_iclk;
1900	}	1900	}
1901	}	1901	}

drivers/usb/host/xhci-plat.c+3−0

@@ -437,6 +437,9 @@ static int __maybe_unused xhci_plat_suspend(struct device *dev) · 436 unmodified lines
437	struct xhci_hcd *xhci = hcd_to_xhci(hcd);	437	struct xhci_hcd *xhci = hcd_to_xhci(hcd);
438	int ret;	438	int ret;
439		439
		440	if (pm_runtime_suspended(dev))
		441	pm_runtime_resume(dev);
		442
440	ret = xhci_priv_suspend_quirk(hcd);	443	ret = xhci_priv_suspend_quirk(hcd);
441	if (ret)	444	if (ret)
442	return ret;	445	return ret;

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

@@ -2301,6 +2301,16 @@ UNUSUAL_DEV( 0x2027, 0xa001, 0x0000, 0x9999, · 2300 unmodified lines
2301	USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_euscsi_init,	2301	USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_euscsi_init,
2302	US_FL_SCM_MULT_TARG ),	2302	US_FL_SCM_MULT_TARG ),
2303		2303
		2304	/*
		2305	* Reported by DocMAX <mail@vacharakis.de>
		2306	* and Thomas Weißschuh <linux@weissschuh.net>
		2307	*/
		2308	UNUSUAL_DEV( 0x2109, 0x0715, 0x9999, 0x9999,
		2309	"VIA Labs, Inc.",
		2310	"VL817 SATA Bridge",
		2311	USB_SC_DEVICE, USB_PR_DEVICE, NULL,
		2312	US_FL_IGNORE_UAS),
		2313
2304	UNUSUAL_DEV( 0x2116, 0x0320, 0x0001, 0x0001,	2314	UNUSUAL_DEV( 0x2116, 0x0320, 0x0001, 0x0001,
2305	"ST",	2315	"ST",
2306	"2A",	2316	"2A",

drivers/usb/typec/port-mapper.c+7−1

 {
 	struct each_port_arg arg = { .port = con, .match = NULL };
+	if (!has_acpi_companion(&con->dev))
+		return 0;
 	bus_for_each_dev(&acpi_bus_type, NULL, &arg, typec_port_match);
+	if (!arg.match)
+		return 0;
 	/*
 	 * REVISIT: Now each connector can have only a single component master.
 void typec_unlink_ports(struct typec_port *con)
 {
-	component_master_del(&con->dev, &typec_aggregate_ops);
+	if (has_acpi_companion(&con->dev))
+		component_master_del(&con->dev, &typec_aggregate_ops);
 }

drivers/usb/typec/tcpm/tcpci.c+26−0

@@ -75,9 +75,25 @@ static int tcpci_write16(struct tcpci *tcpci, unsigned int reg, u16 val) · 74 unmodified lines
75	static int tcpci_set_cc(struct tcpc_dev *tcpc, enum typec_cc_status cc)	75	static int tcpci_set_cc(struct tcpc_dev *tcpc, enum typec_cc_status cc)
76	{	76	{
77	struct tcpci *tcpci = tcpc_to_tcpci(tcpc);	77	struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
		78	bool vconn_pres;
		79	enum typec_cc_polarity polarity = TYPEC_POLARITY_CC1;
78	unsigned int reg;	80	unsigned int reg;
79	int ret;	81	int ret;
80		82
		83	ret = regmap_read(tcpci->regmap, TCPC_POWER_STATUS, &reg);
		84	if (ret < 0)
		85	return ret;
		86
		87	vconn_pres = !!(reg & TCPC_POWER_STATUS_VCONN_PRES);
		88	if (vconn_pres) {
		89	ret = regmap_read(tcpci->regmap, TCPC_TCPC_CTRL, &reg);
		90	if (ret < 0)
		91	return ret;
		92
		93	if (reg & TCPC_TCPC_CTRL_ORIENTATION)
		94	polarity = TYPEC_POLARITY_CC2;
		95	}
		96
81	switch (cc) {	97	switch (cc) {
82	case TYPEC_CC_RA:	98	case TYPEC_CC_RA:
83	reg = (TCPC_ROLE_CTRL_CC_RA << TCPC_ROLE_CTRL_CC1_SHIFT) \|	99	reg = (TCPC_ROLE_CTRL_CC_RA << TCPC_ROLE_CTRL_CC1_SHIFT) \|
@@ -112,6 +128,16 @@ static int tcpci_set_cc(struct tcpc_dev *tcpc, enum typec_cc_status cc) · 28 unmodified lines
112	break;	128	break;
113	}	129	}
114		130
		131	if (vconn_pres) {
		132	if (polarity == TYPEC_POLARITY_CC2) {
		133	reg &= ~(TCPC_ROLE_CTRL_CC1_MASK << TCPC_ROLE_CTRL_CC1_SHIFT);
		134	reg \|= (TCPC_ROLE_CTRL_CC_OPEN << TCPC_ROLE_CTRL_CC1_SHIFT);
		135	} else {
		136	reg &= ~(TCPC_ROLE_CTRL_CC2_MASK << TCPC_ROLE_CTRL_CC2_SHIFT);
		137	reg \|= (TCPC_ROLE_CTRL_CC_OPEN << TCPC_ROLE_CTRL_CC2_SHIFT);
		138	}
		139	}
		140
115	ret = regmap_write(tcpci->regmap, TCPC_ROLE_CTRL, reg);	141	ret = regmap_write(tcpci->regmap, TCPC_ROLE_CTRL, reg);
116	if (ret < 0)	142	if (ret < 0)
117	return ret;	143	return ret;

drivers/usb/typec/tcpm/tcpci.h+1−0

@@ -98,6 +98,7 @@ · 97 unmodified lines
98	#define TCPC_POWER_STATUS_SOURCING_VBUS BIT(4)	98	#define TCPC_POWER_STATUS_SOURCING_VBUS BIT(4)
99	#define TCPC_POWER_STATUS_VBUS_DET BIT(3)	99	#define TCPC_POWER_STATUS_VBUS_DET BIT(3)
100	#define TCPC_POWER_STATUS_VBUS_PRES BIT(2)	100	#define TCPC_POWER_STATUS_VBUS_PRES BIT(2)
		101	#define TCPC_POWER_STATUS_VCONN_PRES BIT(1)
101	#define TCPC_POWER_STATUS_SINKING_VBUS BIT(0)	102	#define TCPC_POWER_STATUS_SINKING_VBUS BIT(0)
102		103
103	#define TCPC_FAULT_STATUS 0x1f	104	#define TCPC_FAULT_STATUS 0x1f

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

 	case SNK_TRYWAIT_DEBOUNCE:
 		break;
 	case SNK_ATTACH_WAIT:
-		tcpm_set_state(port, SNK_UNATTACHED, 0);
+	case SNK_DEBOUNCED:
+		/* Do nothing, as TCPM is still waiting for vbus to reaach VSAFE5V to connect */
 		break;
 	case SNK_NEGOTIATE_CAPABILITIES:
 	case PR_SWAP_SNK_SRC_SOURCE_ON:
 		/* Do nothing, vsafe0v is expected during transition */
 		break;
+	case SNK_ATTACH_WAIT:
+	case SNK_DEBOUNCED:
+		/*Do nothing, still waiting for VSAFE5V for connect */
+		break;
 	default:
 		if (port->pwr_role == TYPEC_SINK && port->auto_vbus_discharge_enabled)
 			tcpm_set_state(port, SNK_UNATTACHED, 0);

drivers/usb/typec/ucsi/ucsi_ccg.c+1−1

@@ -325,7 +325,7 @@ static int ucsi_ccg_init(struct ucsi_ccg *uc) · 324 unmodified lines
325	if (status < 0)	325	if (status < 0)
326	return status;	326	return status;
327		327
328	if (!data)	328	if (!(data & DEV_INT))
329	return 0;	329	return 0;
330		330
331	status = ccg_write(uc, CCGX_RAB_INTR_REG, &data, sizeof(data));	331	status = ccg_write(uc, CCGX_RAB_INTR_REG, &data, sizeof(data));

drivers/video/fbdev/hyperv_fb.c+3−13

 static uint screen_width = HVFB_WIDTH;
 static uint screen_height = HVFB_HEIGHT;
-static uint screen_width_max = HVFB_WIDTH;
-static uint screen_height_max = HVFB_HEIGHT;
 static uint screen_depth;
 static uint screen_fb_size;
 static uint dio_fb_size; /* FB size for deferred IO */
 	int ret = 0;
 	unsigned long t;
 	u8 index;
-	int i;
 	memset(msg, 0, sizeof(struct synthvid_msg));
 	msg->vid_hdr.type = SYNTHVID_RESOLUTION_REQUEST;
 		goto out;
 	}
-	for (i = 0; i < msg->resolution_resp.resolution_count; i++) {
-		screen_width_max = max_t(unsigned int, screen_width_max,
-		    msg->resolution_resp.supported_resolution[i].width);
-		screen_height_max = max_t(unsigned int, screen_height_max,
-		    msg->resolution_resp.supported_resolution[i].height);
-	}
 	screen_width =
 		msg->resolution_resp.supported_resolution[index].width;
 	screen_height =
 	if (x < HVFB_WIDTH_MIN || y < HVFB_HEIGHT_MIN ||
 	    (synthvid_ver_ge(par->synthvid_version, SYNTHVID_VERSION_WIN10) &&
-	    (x > screen_width_max || y > screen_height_max)) ||
+	    (x * y * screen_depth / 8 > screen_fb_size)) ||
 	    (par->synthvid_version == SYNTHVID_VERSION_WIN8 &&
 	     x * y * screen_depth / 8 > SYNTHVID_FB_SIZE_WIN8) ||
 	    (par->synthvid_version == SYNTHVID_VERSION_WIN7 &&
 	}
 	hvfb_get_option(info);
-	pr_info("Screen resolution: %dx%d, Color depth: %d\n",
+	pr_info("Screen resolution: %dx%d, Color depth: %d, Frame buffer size: %d\n",
-		screen_width, screen_height, screen_depth);
+		screen_width, screen_height, screen_depth, screen_fb_size);
 	ret = hvfb_getmem(hdev, info);
 	if (ret) {

fs/Makefile+1−1

@@ -96,7 +96,7 @@ obj-$(CONFIG_EXPORTFS) += exportfs/ · 95 unmodified lines
96	obj-$(CONFIG_NFSD) += nfsd/	96	obj-$(CONFIG_NFSD) += nfsd/
97	obj-$(CONFIG_LOCKD) += lockd/	97	obj-$(CONFIG_LOCKD) += lockd/
98	obj-$(CONFIG_NLS) += nls/	98	obj-$(CONFIG_NLS) += nls/
99	obj-$(CONFIG_UNICODE) += unicode/	99	obj-y += unicode/
100	obj-$(CONFIG_SYSV_FS) += sysv/	100	obj-$(CONFIG_SYSV_FS) += sysv/
101	obj-$(CONFIG_SMBFS_COMMON) += smbfs_common/	101	obj-$(CONFIG_SMBFS_COMMON) += smbfs_common/
102	obj-$(CONFIG_CIFS) += cifs/	102	obj-$(CONFIG_CIFS) += cifs/

fs/binfmt_misc.c+4−4

 };
 MODULE_ALIAS_FS("binfmt_misc");
+static struct ctl_table_header *binfmt_misc_header;
 static int __init init_misc_binfmt(void)
 {
 	int err = register_filesystem(&bm_fs_type);
 	if (!err)
 		insert_binfmt(&misc_format);
-	if (!register_sysctl_mount_point("fs/binfmt_misc")) {
+	binfmt_misc_header = register_sysctl_mount_point("fs/binfmt_misc");
-		pr_warn("Failed to create fs/binfmt_misc sysctl mount point");
-		return -ENOMEM;
-	}
 	return 0;
 }
 static void __exit exit_misc_binfmt(void)
 {
+	unregister_sysctl_table(binfmt_misc_header);
 	unregister_binfmt(&misc_format);
 	unregister_filesystem(&bm_fs_type);
 }

fs/btrfs/ioctl.c+2−4

 	btrfs_inode_lock(inode, 0);
 	err = btrfs_delete_subvolume(dir, dentry);
 	btrfs_inode_unlock(inode, 0);
-	if (!err) {
+	if (!err)
-		fsnotify_rmdir(dir, dentry);
+		d_delete_notify(dir, dentry);
-		d_delete(dentry);
-	}
 out_dput:
 	dput(dentry);

fs/ceph/caps.c+37−18

 	struct ceph_mds_client *mdsc = ceph_sb_to_client(inode->i_sb)->mdsc;
 	struct ceph_inode_info *ci = ceph_inode(inode);
 	struct ceph_mds_request *req1 = NULL, *req2 = NULL;
+	unsigned int max_sessions;
 	int ret, err = 0;
 	spin_lock(&ci->i_unsafe_lock);
 	}
 	spin_unlock(&ci->i_unsafe_lock);
+	/*
+	 * The mdsc->max_sessions is unlikely to be changed
+	 * mostly, here we will retry it by reallocating the
+	 * sessions array memory to get rid of the mdsc->mutex
+	 * lock.
+	 */
+retry:
+	max_sessions = mdsc->max_sessions;
 	/*
 	 * Trigger to flush the journal logs in all the relevant MDSes
 	 * manually, or in the worst case we must wait at most 5 seconds
 	 * to wait the journal logs to be flushed by the MDSes periodically.
 	 */
-	if (req1 || req2) {
+	if ((req1 || req2) && likely(max_sessions)) {
 		struct ceph_mds_session **sessions = NULL;
 		struct ceph_mds_session *s;
 		struct ceph_mds_request *req;
-		unsigned int max;
 		int i;
-		/*
+		sessions = kzalloc(max_sessions * sizeof(s), GFP_KERNEL);
-		 * The mdsc->max_sessions is unlikely to be changed
+		if (!sessions) {
-		 * mostly, here we will retry it by reallocating the
+			err = -ENOMEM;
-		 * sessions arrary memory to get rid of the mdsc->mutex
+			goto out;
-		 * lock.
+		}
-		 */
-retry:
-		max = mdsc->max_sessions;
-		sessions = krealloc(sessions, max * sizeof(s), __GFP_ZERO);
-		if (!sessions)
-			return -ENOMEM;
 		spin_lock(&ci->i_unsafe_lock);
 		if (req1) {
 			list_for_each_entry(req, &ci->i_unsafe_dirops,
 					    r_unsafe_dir_item) {
 				s = req->r_session;
-				if (unlikely(s->s_mds >= max)) {
+				if (unlikely(s->s_mds >= max_sessions)) {
 					spin_unlock(&ci->i_unsafe_lock);
+					for (i = 0; i < max_sessions; i++) {
+						s = sessions[i];
+						if (s)
+							ceph_put_mds_session(s);
+					}
+					kfree(sessions);
 					goto retry;
 				}
 				if (!sessions[s->s_mds]) {
 			list_for_each_entry(req, &ci->i_unsafe_iops,
 					    r_unsafe_target_item) {
 				s = req->r_session;
-				if (unlikely(s->s_mds >= max)) {
+				if (unlikely(s->s_mds >= max_sessions)) {
 					spin_unlock(&ci->i_unsafe_lock);
+					for (i = 0; i < max_sessions; i++) {
+						s = sessions[i];
+						if (s)
+							ceph_put_mds_session(s);
+					}
+					kfree(sessions);
 					goto retry;
 				}
 				if (!sessions[s->s_mds]) {
 		spin_unlock(&ci->i_ceph_lock);
 		/* send flush mdlog request to MDSes */
-		for (i = 0; i < max; i++) {
+		for (i = 0; i < max_sessions; i++) {
 			s = sessions[i];
 			if (s) {
 				send_flush_mdlog(s);
 					ceph_timeout_jiffies(req1->r_timeout));
 		if (ret)
 			err = -EIO;
-		ceph_mdsc_put_request(req1);
 	}
 	if (req2) {
 		ret = !wait_for_completion_timeout(&req2->r_safe_completion,
 					ceph_timeout_jiffies(req2->r_timeout));
 		if (ret)
 			err = -EIO;
-		ceph_mdsc_put_request(req2);
 	}
+out:
+	if (req1)
+		ceph_mdsc_put_request(req1);
+	if (req2)
+		ceph_mdsc_put_request(req2);
 	return err;
 }

fs/ceph/file.c+9−0

 	struct ceph_inode_info *ci = ceph_inode(dir);
 	struct inode *inode;
 	struct timespec64 now;
+	struct ceph_string *pool_ns;
 	struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(dir->i_sb);
 	struct ceph_vino vino = { .ino = req->r_deleg_ino,
 				  .snap = CEPH_NOSNAP };
 	in.max_size = cpu_to_le64(lo->stripe_unit);
 	ceph_file_layout_to_legacy(lo, &in.layout);
+	/* lo is private, so pool_ns can't change */
+	pool_ns = rcu_dereference_raw(lo->pool_ns);
+	if (pool_ns) {
+		iinfo.pool_ns_len = pool_ns->len;
+		iinfo.pool_ns_data = pool_ns->str;
+	}
 	down_read(&mdsc->snap_rwsem);
 	ret = ceph_fill_inode(inode, NULL, &iinfo, NULL, req->r_session,
 				restore_deleg_ino(dir, req->r_deleg_ino);
 				ceph_mdsc_put_request(req);
 				try_async = false;
+				ceph_put_string(rcu_dereference_raw(lo.pool_ns));
 				goto retry;
 			}
+			ceph_put_string(rcu_dereference_raw(lo.pool_ns));
 			goto out_req;
 		}
 	}

fs/configfs/dir.c+3−3

 	configfs_detach_group(&group->cg_item);
 	d_inode(dentry)->i_flags |= S_DEAD;
 	dont_mount(dentry);
+	d_drop(dentry);
 	fsnotify_rmdir(d_inode(parent), dentry);
-	d_delete(dentry);
 	inode_unlock(d_inode(parent));
 	dput(dentry);
 	configfs_detach_group(&group->cg_item);
 	d_inode(dentry)->i_flags |= S_DEAD;
 	dont_mount(dentry);
-	fsnotify_rmdir(d_inode(root), dentry);
 	inode_unlock(d_inode(dentry));
-	d_delete(dentry);
+	d_drop(dentry);
+	fsnotify_rmdir(d_inode(root), dentry);
 	inode_unlock(d_inode(root));

fs/devpts/inode.c+1−1

@@ -621,8 +621,8 @@ void devpts_pty_kill(struct dentry *dentry) · 620 unmodified lines
621		621
622	dentry->d_fsdata = NULL;	622	dentry->d_fsdata = NULL;
623	drop_nlink(dentry->d_inode);	623	drop_nlink(dentry->d_inode);
624	fsnotify_unlink(d_inode(dentry->d_parent), dentry);
625	d_drop(dentry);	624	d_drop(dentry);
		625	fsnotify_unlink(d_inode(dentry->d_parent), dentry);
626	dput(dentry); /* d_alloc_name() in devpts_pty_new() */	626	dput(dentry); /* d_alloc_name() in devpts_pty_new() */
627	}	627	}
628		628

fs/ext4/ext4.h+7−7

@@ -2485,7 +2485,7 @@ struct ext4_filename { · 2484 unmodified lines
2485	#ifdef CONFIG_FS_ENCRYPTION	2485	#ifdef CONFIG_FS_ENCRYPTION
2486	struct fscrypt_str crypto_buf;	2486	struct fscrypt_str crypto_buf;
2487	#endif	2487	#endif
2488	#ifdef CONFIG_UNICODE	2488	#if IS_ENABLED(CONFIG_UNICODE)
2489	struct fscrypt_str cf_name;	2489	struct fscrypt_str cf_name;
2490	#endif	2490	#endif
2491	};	2491	};
@@ -2721,7 +2721,7 @@ extern unsigned ext4_free_clusters_after_init(struct super_block *sb, · 229 unmodified lines
2721	struct ext4_group_desc *gdp);	2721	struct ext4_group_desc *gdp);
2722	ext4_fsblk_t ext4_inode_to_goal_block(struct inode *);	2722	ext4_fsblk_t ext4_inode_to_goal_block(struct inode *);
2723		2723
2724	#ifdef CONFIG_UNICODE	2724	#if IS_ENABLED(CONFIG_UNICODE)
2725	extern int ext4_fname_setup_ci_filename(struct inode *dir,	2725	extern int ext4_fname_setup_ci_filename(struct inode *dir,
2726	const struct qstr *iname,	2726	const struct qstr *iname,
2727	struct ext4_filename *fname);	2727	struct ext4_filename *fname);
@@ -2754,7 +2754,7 @@ static inline int ext4_fname_setup_filename(struct inode *dir, · 26 unmodified lines
2754		2754
2755	ext4_fname_from_fscrypt_name(fname, &name);	2755	ext4_fname_from_fscrypt_name(fname, &name);
2756		2756
2757	#ifdef CONFIG_UNICODE	2757	#if IS_ENABLED(CONFIG_UNICODE)
2758	err = ext4_fname_setup_ci_filename(dir, iname, fname);	2758	err = ext4_fname_setup_ci_filename(dir, iname, fname);
2759	#endif	2759	#endif
2760	return err;	2760	return err;
@@ -2773,7 +2773,7 @@ static inline int ext4_fname_prepare_lookup(struct inode *dir, · 12 unmodified lines
2773		2773
2774	ext4_fname_from_fscrypt_name(fname, &name);	2774	ext4_fname_from_fscrypt_name(fname, &name);
2775		2775
2776	#ifdef CONFIG_UNICODE	2776	#if IS_ENABLED(CONFIG_UNICODE)
2777	err = ext4_fname_setup_ci_filename(dir, &dentry->d_name, fname);	2777	err = ext4_fname_setup_ci_filename(dir, &dentry->d_name, fname);
2778	#endif	2778	#endif
2779	return err;	2779	return err;
@@ -2790,7 +2790,7 @@ static inline void ext4_fname_free_filename(struct ext4_filename *fname) · 10 unmodified lines
2790	fname->usr_fname = NULL;	2790	fname->usr_fname = NULL;
2791	fname->disk_name.name = NULL;	2791	fname->disk_name.name = NULL;
2792		2792
2793	#ifdef CONFIG_UNICODE	2793	#if IS_ENABLED(CONFIG_UNICODE)
2794	kfree(fname->cf_name.name);	2794	kfree(fname->cf_name.name);
2795	fname->cf_name.name = NULL;	2795	fname->cf_name.name = NULL;
2796	#endif	2796	#endif
@@ -2806,7 +2806,7 @@ static inline int ext4_fname_setup_filename(struct inode *dir, · 9 unmodified lines
2806	fname->disk_name.name = (unsigned char *) iname->name;	2806	fname->disk_name.name = (unsigned char *) iname->name;
2807	fname->disk_name.len = iname->len;	2807	fname->disk_name.len = iname->len;
2808		2808
2809	#ifdef CONFIG_UNICODE	2809	#if IS_ENABLED(CONFIG_UNICODE)
2810	err = ext4_fname_setup_ci_filename(dir, iname, fname);	2810	err = ext4_fname_setup_ci_filename(dir, iname, fname);
2811	#endif	2811	#endif
2812		2812
@@ -2822,7 +2822,7 @@ static inline int ext4_fname_prepare_lookup(struct inode *dir, · 9 unmodified lines
2822		2822
2823	static inline void ext4_fname_free_filename(struct ext4_filename *fname)	2823	static inline void ext4_fname_free_filename(struct ext4_filename *fname)
2824	{	2824	{
2825	#ifdef CONFIG_UNICODE	2825	#if IS_ENABLED(CONFIG_UNICODE)
2826	kfree(fname->cf_name.name);	2826	kfree(fname->cf_name.name);
2827	fname->cf_name.name = NULL;	2827	fname->cf_name.name = NULL;
2828	#endif	2828	#endif

fs/ext4/hash.c+1−1

@@ -290,7 +290,7 @@ static int __ext4fs_dirhash(const struct inode dir, const char name, int len, · 289 unmodified lines
290	int ext4fs_dirhash(const struct inode dir, const char name, int len,	290	int ext4fs_dirhash(const struct inode dir, const char name, int len,
291	struct dx_hash_info *hinfo)	291	struct dx_hash_info *hinfo)
292	{	292	{
293	#ifdef CONFIG_UNICODE	293	#if IS_ENABLED(CONFIG_UNICODE)
294	const struct unicode_map *um = dir->i_sb->s_encoding;	294	const struct unicode_map *um = dir->i_sb->s_encoding;
295	int r, dlen;	295	int r, dlen;
296	unsigned char *buff;	296	unsigned char *buff;

fs/ext4/namei.c+6−6

@@ -1317,7 +1317,7 @@ static void dx_insert_block(struct dx_frame *frame, u32 hash, ext4_lblk_t block) · 1316 unmodified lines
1317	dx_set_count(entries, count + 1);	1317	dx_set_count(entries, count + 1);
1318	}	1318	}
1319		1319
1320	#ifdef CONFIG_UNICODE	1320	#if IS_ENABLED(CONFIG_UNICODE)
1321	/*	1321	/*
1322	* Test whether a case-insensitive directory entry matches the filename	1322	* Test whether a case-insensitive directory entry matches the filename
1323	* being searched for. If quick is set, assume the name being looked up	1323	* being searched for. If quick is set, assume the name being looked up
@@ -1428,7 +1428,7 @@ static bool ext4_match(struct inode *parent, · 104 unmodified lines
1428	f.crypto_buf = fname->crypto_buf;	1428	f.crypto_buf = fname->crypto_buf;
1429	#endif	1429	#endif
1430		1430
1431	#ifdef CONFIG_UNICODE	1431	#if IS_ENABLED(CONFIG_UNICODE)
1432	if (parent->i_sb->s_encoding && IS_CASEFOLDED(parent) &&	1432	if (parent->i_sb->s_encoding && IS_CASEFOLDED(parent) &&
1433	(!IS_ENCRYPTED(parent) \|\| fscrypt_has_encryption_key(parent))) {	1433	(!IS_ENCRYPTED(parent) \|\| fscrypt_has_encryption_key(parent))) {
1434	if (fname->cf_name.name) {	1434	if (fname->cf_name.name) {
@@ -1800,7 +1800,7 @@ static struct dentry ext4_lookup(struct inode dir, struct dentry *dentry, unsi · 365 unmodified lines
1800	}	1800	}
1801	}	1801	}
1802		1802
1803	#ifdef CONFIG_UNICODE	1803	#if IS_ENABLED(CONFIG_UNICODE)
1804	if (!inode && IS_CASEFOLDED(dir)) {	1804	if (!inode && IS_CASEFOLDED(dir)) {
1805	/* Eventually we want to call d_add_ci(dentry, NULL)	1805	/* Eventually we want to call d_add_ci(dentry, NULL)
1806	* for negative dentries in the encoding case as	1806	* for negative dentries in the encoding case as
@@ -2308,7 +2308,7 @@ static int ext4_add_entry(handle_t handle, struct dentry dentry, · 501 unmodified lines
2308	if (fscrypt_is_nokey_name(dentry))	2308	if (fscrypt_is_nokey_name(dentry))
2309	return -ENOKEY;	2309	return -ENOKEY;
2310		2310
2311	#ifdef CONFIG_UNICODE	2311	#if IS_ENABLED(CONFIG_UNICODE)
2312	if (sb_has_strict_encoding(sb) && IS_CASEFOLDED(dir) &&	2312	if (sb_has_strict_encoding(sb) && IS_CASEFOLDED(dir) &&
2313	sb->s_encoding && utf8_validate(sb->s_encoding, &dentry->d_name))	2313	sb->s_encoding && utf8_validate(sb->s_encoding, &dentry->d_name))
2314	return -EINVAL;	2314	return -EINVAL;
@@ -3126,7 +3126,7 @@ static int ext4_rmdir(struct inode dir, struct dentry dentry) · 811 unmodified lines
3126	ext4_fc_track_unlink(handle, dentry);	3126	ext4_fc_track_unlink(handle, dentry);
3127	retval = ext4_mark_inode_dirty(handle, dir);	3127	retval = ext4_mark_inode_dirty(handle, dir);
3128		3128
3129	#ifdef CONFIG_UNICODE	3129	#if IS_ENABLED(CONFIG_UNICODE)
3130	/* VFS negative dentries are incompatible with Encoding and	3130	/* VFS negative dentries are incompatible with Encoding and
3131	* Case-insensitiveness. Eventually we'll want avoid	3131	* Case-insensitiveness. Eventually we'll want avoid
3132	* invalidating the dentries here, alongside with returning the	3132	* invalidating the dentries here, alongside with returning the
@@ -3231,7 +3231,7 @@ static int ext4_unlink(struct inode dir, struct dentry dentry) · 98 unmodified lines
3231	retval = __ext4_unlink(handle, dir, &dentry->d_name, d_inode(dentry));	3231	retval = __ext4_unlink(handle, dir, &dentry->d_name, d_inode(dentry));
3232	if (!retval)	3232	if (!retval)
3233	ext4_fc_track_unlink(handle, dentry);	3233	ext4_fc_track_unlink(handle, dentry);
3234	#ifdef CONFIG_UNICODE	3234	#if IS_ENABLED(CONFIG_UNICODE)
3235	/* VFS negative dentries are incompatible with Encoding and	3235	/* VFS negative dentries are incompatible with Encoding and
3236	* Case-insensitiveness. Eventually we'll want avoid	3236	* Case-insensitiveness. Eventually we'll want avoid
3237	* invalidating the dentries here, alongside with returning the	3237	* invalidating the dentries here, alongside with returning the

fs/ext4/super.c+5−5

@@ -1301,7 +1301,7 @@ static void ext4_put_super(struct super_block *sb) · 1300 unmodified lines
1301	kfree(sbi->s_blockgroup_lock);	1301	kfree(sbi->s_blockgroup_lock);
1302	fs_put_dax(sbi->s_daxdev);	1302	fs_put_dax(sbi->s_daxdev);
1303	fscrypt_free_dummy_policy(&sbi->s_dummy_enc_policy);	1303	fscrypt_free_dummy_policy(&sbi->s_dummy_enc_policy);
1304	#ifdef CONFIG_UNICODE	1304	#if IS_ENABLED(CONFIG_UNICODE)
1305	utf8_unload(sb->s_encoding);	1305	utf8_unload(sb->s_encoding);
1306	#endif	1306	#endif
1307	kfree(sbi);	1307	kfree(sbi);
@@ -1961,7 +1961,7 @@ static const struct mount_opts { · 653 unmodified lines
1961	{Opt_err, 0, 0}	1961	{Opt_err, 0, 0}
1962	};	1962	};
1963		1963
1964	#ifdef CONFIG_UNICODE	1964	#if IS_ENABLED(CONFIG_UNICODE)
1965	static const struct ext4_sb_encodings {	1965	static const struct ext4_sb_encodings {
1966	__u16 magic;	1966	__u16 magic;
1967	char *name;	1967	char *name;
@@ -3606,7 +3606,7 @@ int ext4_feature_set_ok(struct super_block *sb, int readonly) · 1638 unmodified lines
3606	return 0;	3606	return 0;
3607	}	3607	}
3608		3608
3609	#ifndef CONFIG_UNICODE	3609	#if !IS_ENABLED(CONFIG_UNICODE)
3610	if (ext4_has_feature_casefold(sb)) {	3610	if (ext4_has_feature_casefold(sb)) {
3611	ext4_msg(sb, KERN_ERR,	3611	ext4_msg(sb, KERN_ERR,
3612	"Filesystem with casefold feature cannot be "	3612	"Filesystem with casefold feature cannot be "
@@ -4610,7 +4610,7 @@ static int __ext4_fill_super(struct fs_context fc, struct super_block sb) · 997 unmodified lines
4610	if (err < 0)	4610	if (err < 0)
4611	goto failed_mount;	4611	goto failed_mount;
4612		4612
4613	#ifdef CONFIG_UNICODE	4613	#if IS_ENABLED(CONFIG_UNICODE)
4614	if (ext4_has_feature_casefold(sb) && !sb->s_encoding) {	4614	if (ext4_has_feature_casefold(sb) && !sb->s_encoding) {
4615	const struct ext4_sb_encodings *encoding_info;	4615	const struct ext4_sb_encodings *encoding_info;
4616	struct unicode_map *encoding;	4616	struct unicode_map *encoding;
@@ -5514,7 +5514,7 @@ failed_mount: · 897 unmodified lines
5514	if (sbi->s_chksum_driver)	5514	if (sbi->s_chksum_driver)
5515	crypto_free_shash(sbi->s_chksum_driver);	5515	crypto_free_shash(sbi->s_chksum_driver);
5516		5516
5517	#ifdef CONFIG_UNICODE	5517	#if IS_ENABLED(CONFIG_UNICODE)
5518	utf8_unload(sb->s_encoding);	5518	utf8_unload(sb->s_encoding);
5519	#endif	5519	#endif
5520		5520

fs/ext4/sysfs.c+4−4

@@ -309,7 +309,7 @@ EXT4_ATTR_FEATURE(meta_bg_resize); · 308 unmodified lines
309	EXT4_ATTR_FEATURE(encryption);	309	EXT4_ATTR_FEATURE(encryption);
310	EXT4_ATTR_FEATURE(test_dummy_encryption_v2);	310	EXT4_ATTR_FEATURE(test_dummy_encryption_v2);
311	#endif	311	#endif
312	#ifdef CONFIG_UNICODE	312	#if IS_ENABLED(CONFIG_UNICODE)
313	EXT4_ATTR_FEATURE(casefold);	313	EXT4_ATTR_FEATURE(casefold);
314	#endif	314	#endif
315	#ifdef CONFIG_FS_VERITY	315	#ifdef CONFIG_FS_VERITY
@@ -317,7 +317,7 @@ EXT4_ATTR_FEATURE(verity); · 1 unmodified line
317	#endif	317	#endif
318	EXT4_ATTR_FEATURE(metadata_csum_seed);	318	EXT4_ATTR_FEATURE(metadata_csum_seed);
319	EXT4_ATTR_FEATURE(fast_commit);	319	EXT4_ATTR_FEATURE(fast_commit);
320	#if defined(CONFIG_UNICODE) && defined(CONFIG_FS_ENCRYPTION)	320	#if IS_ENABLED(CONFIG_UNICODE) && defined(CONFIG_FS_ENCRYPTION)
321	EXT4_ATTR_FEATURE(encrypted_casefold);	321	EXT4_ATTR_FEATURE(encrypted_casefold);
322	#endif	322	#endif
323		323
@@ -329,7 +329,7 @@ static struct attribute *ext4_feat_attrs[] = { · 5 unmodified lines
329	ATTR_LIST(encryption),	329	ATTR_LIST(encryption),
330	ATTR_LIST(test_dummy_encryption_v2),	330	ATTR_LIST(test_dummy_encryption_v2),
331	#endif	331	#endif
332	#ifdef CONFIG_UNICODE	332	#if IS_ENABLED(CONFIG_UNICODE)
333	ATTR_LIST(casefold),	333	ATTR_LIST(casefold),
334	#endif	334	#endif
335	#ifdef CONFIG_FS_VERITY	335	#ifdef CONFIG_FS_VERITY
@@ -337,7 +337,7 @@ static struct attribute *ext4_feat_attrs[] = { · 1 unmodified line
337	#endif	337	#endif
338	ATTR_LIST(metadata_csum_seed),	338	ATTR_LIST(metadata_csum_seed),
339	ATTR_LIST(fast_commit),	339	ATTR_LIST(fast_commit),
340	#if defined(CONFIG_UNICODE) && defined(CONFIG_FS_ENCRYPTION)	340	#if IS_ENABLED(CONFIG_UNICODE) && defined(CONFIG_FS_ENCRYPTION)
341	ATTR_LIST(encrypted_casefold),	341	ATTR_LIST(encrypted_casefold),
342	#endif	342	#endif
343	NULL,	343	NULL,

fs/f2fs/dir.c+5−5

@@ -16,7 +16,7 @@ · 15 unmodified lines
16	#include "xattr.h"	16	#include "xattr.h"
17	#include <trace/events/f2fs.h>	17	#include <trace/events/f2fs.h>
18		18
19	#ifdef CONFIG_UNICODE	19	#if IS_ENABLED(CONFIG_UNICODE)
20	extern struct kmem_cache *f2fs_cf_name_slab;	20	extern struct kmem_cache *f2fs_cf_name_slab;
21	#endif	21	#endif
22		22
@@ -79,7 +79,7 @@ unsigned char f2fs_get_de_type(struct f2fs_dir_entry *de) · 56 unmodified lines
79	int f2fs_init_casefolded_name(const struct inode *dir,	79	int f2fs_init_casefolded_name(const struct inode *dir,
80	struct f2fs_filename *fname)	80	struct f2fs_filename *fname)
81	{	81	{
82	#ifdef CONFIG_UNICODE	82	#if IS_ENABLED(CONFIG_UNICODE)
83	struct super_block *sb = dir->i_sb;	83	struct super_block *sb = dir->i_sb;
84		84
85	if (IS_CASEFOLDED(dir)) {	85	if (IS_CASEFOLDED(dir)) {
@@ -174,7 +174,7 @@ void f2fs_free_filename(struct f2fs_filename *fname) · 88 unmodified lines
174	kfree(fname->crypto_buf.name);	174	kfree(fname->crypto_buf.name);
175	fname->crypto_buf.name = NULL;	175	fname->crypto_buf.name = NULL;
176	#endif	176	#endif
177	#ifdef CONFIG_UNICODE	177	#if IS_ENABLED(CONFIG_UNICODE)
178	if (fname->cf_name.name) {	178	if (fname->cf_name.name) {
179	kmem_cache_free(f2fs_cf_name_slab, fname->cf_name.name);	179	kmem_cache_free(f2fs_cf_name_slab, fname->cf_name.name);
180	fname->cf_name.name = NULL;	180	fname->cf_name.name = NULL;
@@ -208,7 +208,7 @@ static struct f2fs_dir_entry find_in_block(struct inode dir, · 27 unmodified lines
208	return f2fs_find_target_dentry(&d, fname, max_slots);	208	return f2fs_find_target_dentry(&d, fname, max_slots);
209	}	209	}
210		210
211	#ifdef CONFIG_UNICODE	211	#if IS_ENABLED(CONFIG_UNICODE)
212	/*	212	/*
213	* Test whether a case-insensitive directory entry matches the filename	213	* Test whether a case-insensitive directory entry matches the filename
214	* being searched for.	214	* being searched for.
@@ -266,7 +266,7 @@ static inline int f2fs_match_name(const struct inode *dir, · 51 unmodified lines
266	{	266	{
267	struct fscrypt_name f;	267	struct fscrypt_name f;
268		268
269	#ifdef CONFIG_UNICODE	269	#if IS_ENABLED(CONFIG_UNICODE)
270	if (fname->cf_name.name) {	270	if (fname->cf_name.name) {
271	struct qstr cf = FSTR_TO_QSTR(&fname->cf_name);	271	struct qstr cf = FSTR_TO_QSTR(&fname->cf_name);
272		272

fs/f2fs/f2fs.h+1−1

@@ -488,7 +488,7 @@ struct f2fs_filename { · 487 unmodified lines
488	*/	488	*/
489	struct fscrypt_str crypto_buf;	489	struct fscrypt_str crypto_buf;
490	#endif	490	#endif
491	#ifdef CONFIG_UNICODE	491	#if IS_ENABLED(CONFIG_UNICODE)
492	/*	492	/*
493	* For casefolded directories: the casefolded name, but it's left NULL	493	* For casefolded directories: the casefolded name, but it's left NULL
494	* if the original name is not valid Unicode, if the directory is both	494	* if the original name is not valid Unicode, if the directory is both

fs/f2fs/hash.c+1−1

@@ -105,7 +105,7 @@ void f2fs_hash_filename(const struct inode dir, struct f2fs_filename fname) · 104 unmodified lines
105	return;	105	return;
106	}	106	}
107		107
108	#ifdef CONFIG_UNICODE	108	#if IS_ENABLED(CONFIG_UNICODE)
109	if (IS_CASEFOLDED(dir)) {	109	if (IS_CASEFOLDED(dir)) {
110	/*	110	/*
111	* If the casefolded name is provided, hash it instead of the	111	* If the casefolded name is provided, hash it instead of the

fs/f2fs/namei.c+2−2

@@ -561,7 +561,7 @@ static struct dentry f2fs_lookup(struct inode dir, struct dentry *dentry, · 560 unmodified lines
561	goto out_iput;	561	goto out_iput;
562	}	562	}
563	out_splice:	563	out_splice:
564	#ifdef CONFIG_UNICODE	564	#if IS_ENABLED(CONFIG_UNICODE)
565	if (!inode && IS_CASEFOLDED(dir)) {	565	if (!inode && IS_CASEFOLDED(dir)) {
566	/* Eventually we want to call d_add_ci(dentry, NULL)	566	/* Eventually we want to call d_add_ci(dentry, NULL)
567	* for negative dentries in the encoding case as	567	* for negative dentries in the encoding case as
@@ -622,7 +622,7 @@ static int f2fs_unlink(struct inode dir, struct dentry dentry) · 54 unmodified lines
622	goto fail;	622	goto fail;
623	}	623	}
624	f2fs_delete_entry(de, page, dir, inode);	624	f2fs_delete_entry(de, page, dir, inode);
625	#ifdef CONFIG_UNICODE	625	#if IS_ENABLED(CONFIG_UNICODE)
626	/* VFS negative dentries are incompatible with Encoding and	626	/* VFS negative dentries are incompatible with Encoding and
627	* Case-insensitiveness. Eventually we'll want avoid	627	* Case-insensitiveness. Eventually we'll want avoid
628	* invalidating the dentries here, alongside with returning the	628	* invalidating the dentries here, alongside with returning the

fs/f2fs/recovery.c+2−2

@@ -46,7 +46,7 @@ · 45 unmodified lines
46		46
47	static struct kmem_cache *fsync_entry_slab;	47	static struct kmem_cache *fsync_entry_slab;
48		48
49	#ifdef CONFIG_UNICODE	49	#if IS_ENABLED(CONFIG_UNICODE)
50	extern struct kmem_cache *f2fs_cf_name_slab;	50	extern struct kmem_cache *f2fs_cf_name_slab;
51	#endif	51	#endif
52		52
@@ -149,7 +149,7 @@ static int init_recovered_filename(const struct inode *dir, · 96 unmodified lines
149	if (err)	149	if (err)
150	return err;	150	return err;
151	f2fs_hash_filename(dir, fname);	151	f2fs_hash_filename(dir, fname);
152	#ifdef CONFIG_UNICODE	152	#if IS_ENABLED(CONFIG_UNICODE)
153	/* Case-sensitive match is fine for recovery */	153	/* Case-sensitive match is fine for recovery */
154	kmem_cache_free(f2fs_cf_name_slab, fname->cf_name.name);	154	kmem_cache_free(f2fs_cf_name_slab, fname->cf_name.name);
155	fname->cf_name.name = NULL;	155	fname->cf_name.name = NULL;

fs/f2fs/super.c+5−5

@@ -257,7 +257,7 @@ void f2fs_printk(struct f2fs_sb_info sbi, const char fmt, ...) · 256 unmodified lines
257	va_end(args);	257	va_end(args);
258	}	258	}
259		259
260	#ifdef CONFIG_UNICODE	260	#if IS_ENABLED(CONFIG_UNICODE)
261	static const struct f2fs_sb_encodings {	261	static const struct f2fs_sb_encodings {
262	__u16 magic;	262	__u16 magic;
263	char *name;	263	char *name;
@@ -1259,7 +1259,7 @@ default_check: · 995 unmodified lines
1259	return -EINVAL;	1259	return -EINVAL;
1260	}	1260	}
1261	#endif	1261	#endif
1262	#ifndef CONFIG_UNICODE	1262	#if !IS_ENABLED(CONFIG_UNICODE)
1263	if (f2fs_sb_has_casefold(sbi)) {	1263	if (f2fs_sb_has_casefold(sbi)) {
1264	f2fs_err(sbi,	1264	f2fs_err(sbi,
1265	"Filesystem with casefold feature cannot be mounted without CONFIG_UNICODE");	1265	"Filesystem with casefold feature cannot be mounted without CONFIG_UNICODE");
@@ -1619,7 +1619,7 @@ static void f2fs_put_super(struct super_block *sb) · 353 unmodified lines
1619	f2fs_destroy_iostat(sbi);	1619	f2fs_destroy_iostat(sbi);
1620	for (i = 0; i < NR_PAGE_TYPE; i++)	1620	for (i = 0; i < NR_PAGE_TYPE; i++)
1621	kvfree(sbi->write_io[i]);	1621	kvfree(sbi->write_io[i]);
1622	#ifdef CONFIG_UNICODE	1622	#if IS_ENABLED(CONFIG_UNICODE)
1623	utf8_unload(sb->s_encoding);	1623	utf8_unload(sb->s_encoding);
1624	#endif	1624	#endif
1625	kfree(sbi);	1625	kfree(sbi);
@@ -3903,7 +3903,7 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi) · 2277 unmodified lines
3903		3903
3904	static int f2fs_setup_casefold(struct f2fs_sb_info *sbi)	3904	static int f2fs_setup_casefold(struct f2fs_sb_info *sbi)
3905	{	3905	{
3906	#ifdef CONFIG_UNICODE	3906	#if IS_ENABLED(CONFIG_UNICODE)
3907	if (f2fs_sb_has_casefold(sbi) && !sbi->sb->s_encoding) {	3907	if (f2fs_sb_has_casefold(sbi) && !sbi->sb->s_encoding) {
3908	const struct f2fs_sb_encodings *encoding_info;	3908	const struct f2fs_sb_encodings *encoding_info;
3909	struct unicode_map *encoding;	3909	struct unicode_map *encoding;
@@ -4458,7 +4458,7 @@ free_bio_info: · 548 unmodified lines
4458	for (i = 0; i < NR_PAGE_TYPE; i++)	4458	for (i = 0; i < NR_PAGE_TYPE; i++)
4459	kvfree(sbi->write_io[i]);	4459	kvfree(sbi->write_io[i]);
4460		4460
4461	#ifdef CONFIG_UNICODE	4461	#if IS_ENABLED(CONFIG_UNICODE)
4462	utf8_unload(sb->s_encoding);	4462	utf8_unload(sb->s_encoding);
4463	sb->s_encoding = NULL;	4463	sb->s_encoding = NULL;
4464	#endif	4464	#endif

fs/f2fs/sysfs.c+5−5

@@ -201,7 +201,7 @@ static ssize_t unusable_show(struct f2fs_attr *a, · 200 unmodified lines
201	static ssize_t encoding_show(struct f2fs_attr *a,	201	static ssize_t encoding_show(struct f2fs_attr *a,
202	struct f2fs_sb_info sbi, char buf)	202	struct f2fs_sb_info sbi, char buf)
203	{	203	{
204	#ifdef CONFIG_UNICODE	204	#if IS_ENABLED(CONFIG_UNICODE)
205	struct super_block *sb = sbi->sb;	205	struct super_block *sb = sbi->sb;
206		206
207	if (f2fs_sb_has_casefold(sbi))	207	if (f2fs_sb_has_casefold(sbi))
@@ -778,7 +778,7 @@ F2FS_GENERAL_RO_ATTR(avg_vblocks); · 570 unmodified lines
778	#ifdef CONFIG_FS_ENCRYPTION	778	#ifdef CONFIG_FS_ENCRYPTION
779	F2FS_FEATURE_RO_ATTR(encryption);	779	F2FS_FEATURE_RO_ATTR(encryption);
780	F2FS_FEATURE_RO_ATTR(test_dummy_encryption_v2);	780	F2FS_FEATURE_RO_ATTR(test_dummy_encryption_v2);
781	#ifdef CONFIG_UNICODE	781	#if IS_ENABLED(CONFIG_UNICODE)
782	F2FS_FEATURE_RO_ATTR(encrypted_casefold);	782	F2FS_FEATURE_RO_ATTR(encrypted_casefold);
783	#endif	783	#endif
784	#endif /* CONFIG_FS_ENCRYPTION */	784	#endif /* CONFIG_FS_ENCRYPTION */
@@ -797,7 +797,7 @@ F2FS_FEATURE_RO_ATTR(lost_found); · 12 unmodified lines
797	F2FS_FEATURE_RO_ATTR(verity);	797	F2FS_FEATURE_RO_ATTR(verity);
798	#endif	798	#endif
799	F2FS_FEATURE_RO_ATTR(sb_checksum);	799	F2FS_FEATURE_RO_ATTR(sb_checksum);
800	#ifdef CONFIG_UNICODE	800	#if IS_ENABLED(CONFIG_UNICODE)
801	F2FS_FEATURE_RO_ATTR(casefold);	801	F2FS_FEATURE_RO_ATTR(casefold);
802	#endif	802	#endif
803	F2FS_FEATURE_RO_ATTR(readonly);	803	F2FS_FEATURE_RO_ATTR(readonly);
@@ -910,7 +910,7 @@ static struct attribute *f2fs_feat_attrs[] = { · 106 unmodified lines
910	#ifdef CONFIG_FS_ENCRYPTION	910	#ifdef CONFIG_FS_ENCRYPTION
911	ATTR_LIST(encryption),	911	ATTR_LIST(encryption),
912	ATTR_LIST(test_dummy_encryption_v2),	912	ATTR_LIST(test_dummy_encryption_v2),
913	#ifdef CONFIG_UNICODE	913	#if IS_ENABLED(CONFIG_UNICODE)
914	ATTR_LIST(encrypted_casefold),	914	ATTR_LIST(encrypted_casefold),
915	#endif	915	#endif
916	#endif /* CONFIG_FS_ENCRYPTION */	916	#endif /* CONFIG_FS_ENCRYPTION */
@@ -929,7 +929,7 @@ static struct attribute *f2fs_feat_attrs[] = { · 12 unmodified lines
929	ATTR_LIST(verity),	929	ATTR_LIST(verity),
930	#endif	930	#endif
931	ATTR_LIST(sb_checksum),	931	ATTR_LIST(sb_checksum),
932	#ifdef CONFIG_UNICODE	932	#if IS_ENABLED(CONFIG_UNICODE)
933	ATTR_LIST(casefold),	933	ATTR_LIST(casefold),
934	#endif	934	#endif
935	ATTR_LIST(readonly),	935	ATTR_LIST(readonly),

fs/io_uring.c+8−3

 	struct io_ring_ctx *ctx = node->rsrc_data->ctx;
 	unsigned long flags;
 	bool first_add = false;
+	unsigned long delay = HZ;
 	spin_lock_irqsave(&ctx->rsrc_ref_lock, flags);
 	node->done = true;
+	/* if we are mid-quiesce then do not delay */
+	if (node->rsrc_data->quiesce)
+		delay = 0;
 	while (!list_empty(&ctx->rsrc_ref_list)) {
 		node = list_first_entry(&ctx->rsrc_ref_list,
 					    struct io_rsrc_node, node);
 	spin_unlock_irqrestore(&ctx->rsrc_ref_lock, flags);
 	if (first_add)
-		mod_delayed_work(system_wq, &ctx->rsrc_put_work, HZ);
+		mod_delayed_work(system_wq, &ctx->rsrc_put_work, delay);
 }
-static struct io_rsrc_node *io_rsrc_node_alloc(struct io_ring_ctx *ctx)
+static struct io_rsrc_node *io_rsrc_node_alloc(void)
 {
 	struct io_rsrc_node *ref_node;
 {
 	if (ctx->rsrc_backup_node)
 		return 0;
-	ctx->rsrc_backup_node = io_rsrc_node_alloc(ctx);
+	ctx->rsrc_backup_node = io_rsrc_node_alloc();
 	return ctx->rsrc_backup_node ? 0 : -ENOMEM;
 }

fs/jbd2/journal.c+2−0

 	jbd_unlock_bh_journal_head(bh);
 	return jh;
 }
+EXPORT_SYMBOL(jbd2_journal_grab_journal_head);
 static void __journal_remove_journal_head(struct buffer_head *bh)
 {
 		jbd_unlock_bh_journal_head(bh);
 	}
 }
+EXPORT_SYMBOL(jbd2_journal_put_journal_head);
 /*
  * Initialize jbd inode head

fs/libfs.c+5−5

@@ -1379,7 +1379,7 @@ bool is_empty_dir_inode(struct inode *inode) · 1378 unmodified lines
1379	(inode->i_op == &empty_dir_inode_operations);	1379	(inode->i_op == &empty_dir_inode_operations);
1380	}	1380	}
1381		1381
1382	#ifdef CONFIG_UNICODE	1382	#if IS_ENABLED(CONFIG_UNICODE)
1383	/*	1383	/*
1384	* Determine if the name of a dentry should be casefolded.	1384	* Determine if the name of a dentry should be casefolded.
1385	*	1385	*
@@ -1473,7 +1473,7 @@ static const struct dentry_operations generic_encrypted_dentry_ops = { · 87 unmodified lines
1473	};	1473	};
1474	#endif	1474	#endif
1475		1475
1476	#if defined(CONFIG_FS_ENCRYPTION) && defined(CONFIG_UNICODE)	1476	#if defined(CONFIG_FS_ENCRYPTION) && IS_ENABLED(CONFIG_UNICODE)
1477	static const struct dentry_operations generic_encrypted_ci_dentry_ops = {	1477	static const struct dentry_operations generic_encrypted_ci_dentry_ops = {
1478	.d_hash = generic_ci_d_hash,	1478	.d_hash = generic_ci_d_hash,
1479	.d_compare = generic_ci_d_compare,	1479	.d_compare = generic_ci_d_compare,
@@ -1508,10 +1508,10 @@ void generic_set_encrypted_ci_d_ops(struct dentry *dentry) · 28 unmodified lines
1508	#ifdef CONFIG_FS_ENCRYPTION	1508	#ifdef CONFIG_FS_ENCRYPTION
1509	bool needs_encrypt_ops = dentry->d_flags & DCACHE_NOKEY_NAME;	1509	bool needs_encrypt_ops = dentry->d_flags & DCACHE_NOKEY_NAME;
1510	#endif	1510	#endif
1511	#ifdef CONFIG_UNICODE	1511	#if IS_ENABLED(CONFIG_UNICODE)
1512	bool needs_ci_ops = dentry->d_sb->s_encoding;	1512	bool needs_ci_ops = dentry->d_sb->s_encoding;
1513	#endif	1513	#endif
1514	#if defined(CONFIG_FS_ENCRYPTION) && defined(CONFIG_UNICODE)	1514	#if defined(CONFIG_FS_ENCRYPTION) && IS_ENABLED(CONFIG_UNICODE)
1515	if (needs_encrypt_ops && needs_ci_ops) {	1515	if (needs_encrypt_ops && needs_ci_ops) {
1516	d_set_d_op(dentry, &generic_encrypted_ci_dentry_ops);	1516	d_set_d_op(dentry, &generic_encrypted_ci_dentry_ops);
1517	return;	1517	return;
@@ -1523,7 +1523,7 @@ void generic_set_encrypted_ci_d_ops(struct dentry *dentry) · 5 unmodified lines
1523	return;	1523	return;
1524	}	1524	}
1525	#endif	1525	#endif
1526	#ifdef CONFIG_UNICODE	1526	#if IS_ENABLED(CONFIG_UNICODE)
1527	if (needs_ci_ops) {	1527	if (needs_ci_ops) {
1528	d_set_d_op(dentry, &generic_ci_dentry_ops);	1528	d_set_d_op(dentry, &generic_ci_dentry_ops);
1529	return;	1529	return;

fs/lockd/svcsubs.c+10−8

 static int nlm_unlock_files(struct nlm_file *file)
 {
 	struct file_lock lock;
-	struct file *f;
+	locks_init_lock(&lock);
 	lock.fl_type  = F_UNLCK;
 	lock.fl_start = 0;
 	lock.fl_end   = OFFSET_MAX;
-	for (f = file->f_file[0]; f <= file->f_file[1]; f++) {
+	if (file->f_file[O_RDONLY] &&
-		if (f && vfs_lock_file(f, F_SETLK, &lock, NULL) < 0) {
+	    vfs_lock_file(file->f_file[O_RDONLY], F_SETLK, &lock, NULL))
-			pr_warn("lockd: unlock failure in %s:%d\n",
+		goto out_err;
-				__FILE__, __LINE__);
+	if (file->f_file[O_WRONLY] &&
-			return 1;
+	    vfs_lock_file(file->f_file[O_WRONLY], F_SETLK, &lock, NULL))
-		}
+		goto out_err;
-	}
 	return 0;
+out_err:
+	pr_warn("lockd: unlock failure in %s:%d\n", __FILE__, __LINE__);
+	return 1;
 }
 /*

fs/namei.c+5−5

 	dentry->d_inode->i_flags |= S_DEAD;
 	dont_mount(dentry);
 	detach_mounts(dentry);
-	fsnotify_rmdir(dir, dentry);
 out:
 	inode_unlock(dentry->d_inode);
 	dput(dentry);
 	if (!error)
-		d_delete(dentry);
+		d_delete_notify(dir, dentry);
 	return error;
 }
 EXPORT_SYMBOL(vfs_rmdir);
 			if (!error) {
 				dont_mount(dentry);
 				detach_mounts(dentry);
-				fsnotify_unlink(dir, dentry);
 			}
 		}
 	}
 	inode_unlock(target);
 	/* We don't d_delete() NFS sillyrenamed files--they still exist. */
-	if (!error && !(dentry->d_flags & DCACHE_NFSFS_RENAMED)) {
+	if (!error && dentry->d_flags & DCACHE_NFSFS_RENAMED) {
+		fsnotify_unlink(dir, dentry);
+	} else if (!error) {
 		fsnotify_link_count(target);
-		d_delete(dentry);
+		d_delete_notify(dir, dentry);
 	}
 	return error;

fs/nfsd/nfs4state.c+3−1

 			status = nfserr_clid_inuse;
 			if (client_has_state(old)
 					&& !same_creds(&unconf->cl_cred,
-							&old->cl_cred))
+							&old->cl_cred)) {
+				old = NULL;
 				goto out;
+			}
 			status = mark_client_expired_locked(old);
 			if (status) {
 				old = NULL;

fs/nfsd/nfsctl.c+3−2

 	clear_ncl(d_inode(dentry));
 	dget(dentry);
 	ret = simple_unlink(dir, dentry);
-	d_delete(dentry);
+	d_drop(dentry);
+	fsnotify_unlink(dir, dentry);
 	dput(dentry);
 	WARN_ON_ONCE(ret);
 }
 	dget(dentry);
 	ret = simple_rmdir(dir, dentry);
 	WARN_ON_ONCE(ret);
+	d_drop(dentry);
 	fsnotify_rmdir(dir, dentry);
-	d_delete(dentry);
 	dput(dentry);
 	inode_unlock(dir);
 }

fs/notify/fanotify/fanotify_user.c+3−6

 				 struct fanotify_event *event)
 {
 	size_t event_len = FAN_EVENT_METADATA_LEN;
-	struct fanotify_info *info;
 	int fh_len;
 	int dot_len = 0;
 	if (fanotify_is_error_event(event->mask))
 		event_len += FANOTIFY_ERROR_INFO_LEN;
-	info = fanotify_event_info(event);
 	if (fanotify_event_has_any_dir_fh(event)) {
 		event_len += fanotify_dir_name_info_len(event);
 	} else if ((info_mode & FAN_REPORT_NAME) &&
 	if (fanotify_is_perm_event(event->mask))
 		FANOTIFY_PERM(event)->fd = fd;
-	if (f)
-		fd_install(fd, f);
 	if (info_mode) {
 		ret = copy_info_records_to_user(event, info, info_mode, pidfd,
 						buf, count);
 			goto out_close_fd;
 	}
+	if (f)
+		fd_install(fd, f);
 	return metadata.event_len;
 out_close_fd:

fs/ocfs2/stackglue.c+1−12

 	{ }
 };
-static struct ctl_table ocfs2_mod_table[] = {
-	{
-		.procname	= "nm",
-		.data		= NULL,
-		.maxlen		= 0,
-		.mode		= 0555,
-		.child		= ocfs2_nm_table
-	},
-	{ }
-};
 static struct ctl_table_header *ocfs2_table_header;
 /*
 {
 	strcpy(cluster_stack_name, OCFS2_STACK_PLUGIN_O2CB);
-	ocfs2_table_header = register_sysctl("fs/ocfs2", ocfs2_mod_table);
+	ocfs2_table_header = register_sysctl("fs/ocfs2/nm", ocfs2_nm_table);
 	if (!ocfs2_table_header) {
 		printk(KERN_ERR
 		       "ocfs2 stack glue: unable to register sysctl\n");

fs/ocfs2/suballoc.c+11−14

@@ -1251,26 +1251,23 @@ static int ocfs2_test_bg_bit_allocatable(struct buffer_head *bg_bh, · 1250 unmodified lines
1251	{	1251	{
1252	struct ocfs2_group_desc bg = (struct ocfs2_group_desc ) bg_bh->b_data;	1252	struct ocfs2_group_desc bg = (struct ocfs2_group_desc ) bg_bh->b_data;
1253	struct journal_head *jh;	1253	struct journal_head *jh;
1254	int ret = 1;	1254	int ret;
1255		1255
1256	if (ocfs2_test_bit(nr, (unsigned long *)bg->bg_bitmap))	1256	if (ocfs2_test_bit(nr, (unsigned long *)bg->bg_bitmap))
1257	return 0;	1257	return 0;
1258		1258
1259	if (!buffer_jbd(bg_bh))	1259	jh = jbd2_journal_grab_journal_head(bg_bh);
		1260	if (!jh)
1260	return 1;	1261	return 1;
1261		1262
1262	jbd_lock_bh_journal_head(bg_bh);	1263	spin_lock(&jh->b_state_lock);
1263	if (buffer_jbd(bg_bh)) {	1264	bg = (struct ocfs2_group_desc *) jh->b_committed_data;
1264	jh = bh2jh(bg_bh);	1265	if (bg)
1265	spin_lock(&jh->b_state_lock);	1266	ret = !ocfs2_test_bit(nr, (unsigned long *)bg->bg_bitmap);
1266	bg = (struct ocfs2_group_desc *) jh->b_committed_data;	1267	else
1267	if (bg)	1268	ret = 1;
1268	ret = !ocfs2_test_bit(nr, (unsigned long *)bg->bg_bitmap);	1269	spin_unlock(&jh->b_state_lock);
1269	else	1270	jbd2_journal_put_journal_head(jh);
1270	ret = 1;
1271	spin_unlock(&jh->b_state_lock);
1272	}
1273	jbd_unlock_bh_journal_head(bg_bh);
1274		1271
1275	return ret;	1272	return ret;
1276	}	1273	}

fs/overlayfs/copy_up.c+13−3

 		if (err == -ENOTTY || err == -EINVAL)
 			return 0;
 		pr_warn("failed to retrieve lower fileattr (%pd2, err=%i)\n",
-			old, err);
+			old->dentry, err);
 		return err;
 	}
 	 */
 	if (oldfa.flags & OVL_PROT_FS_FLAGS_MASK) {
 		err = ovl_set_protattr(inode, new->dentry, &oldfa);
-		if (err)
+		if (err == -EPERM)
+			pr_warn_once("copying fileattr: no xattr on upper\n");
+		else if (err)
 			return err;
 	}
 	err = ovl_real_fileattr_get(new, &newfa);
 	if (err) {
+		/*
+		 * Returning an error if upper doesn't support fileattr will
+		 * result in a regression, so revert to the old behavior.
+		 */
+		if (err == -ENOTTY || err == -EINVAL) {
+			pr_warn_once("copying fileattr: no support on upper\n");
+			return 0;
+		}
 		pr_warn("failed to retrieve upper fileattr (%pd2, err=%i)\n",
-			new, err);
+			new->dentry, err);
 		return err;
 	}

fs/udf/inode.c+4−5

 	char *kaddr;
 	struct udf_inode_info *iinfo = UDF_I(inode);
 	int err;
-	struct writeback_control udf_wbc = {
-		.sync_mode = WB_SYNC_NONE,
-		.nr_to_write = 1,
-	};
 	WARN_ON_ONCE(!inode_is_locked(inode));
 	if (!iinfo->i_lenAlloc) {
 		iinfo->i_alloc_type = ICBTAG_FLAG_AD_LONG;
 	/* from now on we have normal address_space methods */
 	inode->i_data.a_ops = &udf_aops;
+	set_page_dirty(page);
+	unlock_page(page);
 	up_write(&iinfo->i_data_sem);
-	err = inode->i_data.a_ops->writepage(page, &udf_wbc);
+	err = filemap_fdatawrite(inode->i_mapping);
 	if (err) {
 		/* Restore everything back so that we don't lose data... */
 		lock_page(page);
 		unlock_page(page);
 		iinfo->i_alloc_type = ICBTAG_FLAG_AD_IN_ICB;
 		inode->i_data.a_ops = &udf_adinicb_aops;
+		iinfo->i_lenAlloc = inode->i_size;
 		up_write(&iinfo->i_data_sem);
 	}
 	put_page(page);

fs/unicode/Kconfig+5−13

@@ -3,21 +3,13 @@ · 2 unmodified lines
3	# UTF-8 normalization	3	# UTF-8 normalization
4	#	4	#
5	config UNICODE	5	config UNICODE
6	bool "UTF-8 normalization and casefolding support"	6	tristate "UTF-8 normalization and casefolding support"
7	help	7	help
8	Say Y here to enable UTF-8 NFD normalization and NFD+CF casefolding	8	Say Y here to enable UTF-8 NFD normalization and NFD+CF casefolding
9	support.	9	support. If you say M here the large table of case foldings will
10		10	be a separate loadable module that gets requested only when a file
11	config UNICODE_UTF8_DATA	11	system actually use it.
12	tristate "UTF-8 normalization and casefolding tables"
13	depends on UNICODE
14	default UNICODE
15	help
16	This contains a large table of case foldings, which can be loaded as
17	a separate module if you say M here. To be on the safe side stick
18	to the default of Y. Saying N here makes no sense, if you do not want
19	utf8 casefolding support, disable CONFIG_UNICODE instead.
20		12
21	config UNICODE_NORMALIZATION_SELFTEST	13	config UNICODE_NORMALIZATION_SELFTEST
22	tristate "Test UTF-8 normalization support"	14	tristate "Test UTF-8 normalization support"
23	depends on UNICODE_UTF8_DATA	15	depends on UNICODE

fs/unicode/Makefile+4−2

 # SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_UNICODE) += unicode.o
+ifneq ($(CONFIG_UNICODE),)
+obj-y			+= unicode.o
+endif
+obj-$(CONFIG_UNICODE)	+= utf8data.o
 obj-$(CONFIG_UNICODE_NORMALIZATION_SELFTEST) += utf8-selftest.o
-obj-$(CONFIG_UNICODE_UTF8_DATA) += utf8data.o
 unicode-y := utf8-norm.o utf8-core.o

include/linux/blkdev.h+1−0

@@ -1258,6 +1258,7 @@ unsigned long disk_start_io_acct(struct gendisk *disk, unsigned int sectors, · 1257 unmodified lines
1258	void disk_end_io_acct(struct gendisk *disk, unsigned int op,	1258	void disk_end_io_acct(struct gendisk *disk, unsigned int op,
1259	unsigned long start_time);	1259	unsigned long start_time);
1260		1260
		1261	void bio_start_io_acct_time(struct bio *bio, unsigned long start_time);
1261	unsigned long bio_start_io_acct(struct bio *bio);	1262	unsigned long bio_start_io_acct(struct bio *bio);
1262	void bio_end_io_acct_remapped(struct bio *bio, unsigned long start_time,	1263	void bio_end_io_acct_remapped(struct bio *bio, unsigned long start_time,
1263	struct block_device *orig_bdev);	1264	struct block_device *orig_bdev);

include/linux/fs.h+1−1

@@ -1483,7 +1483,7 @@ struct super_block { · 1482 unmodified lines
1483	#ifdef CONFIG_FS_VERITY	1483	#ifdef CONFIG_FS_VERITY
1484	const struct fsverity_operations *s_vop;	1484	const struct fsverity_operations *s_vop;
1485	#endif	1485	#endif
1486	#ifdef CONFIG_UNICODE	1486	#if IS_ENABLED(CONFIG_UNICODE)
1487	struct unicode_map *s_encoding;	1487	struct unicode_map *s_encoding;
1488	__u16 s_encoding_flags;	1488	__u16 s_encoding_flags;
1489	#endif	1489	#endif

include/linux/fsnotify.h+43−6

@@ -224,6 +224,43 @@ static inline void fsnotify_link(struct inode dir, struct inode inode, · 223 unmodified lines
224	dir, &new_dentry->d_name, 0);	224	dir, &new_dentry->d_name, 0);
225	}	225	}
226		226
		227	/*
		228	* fsnotify_delete - @dentry was unlinked and unhashed
		229	*
		230	* Caller must make sure that dentry->d_name is stable.
		231	*
		232	* Note: unlike fsnotify_unlink(), we have to pass also the unlinked inode
		233	* as this may be called after d_delete() and old_dentry may be negative.
		234	*/
		235	static inline void fsnotify_delete(struct inode dir, struct inode inode,
		236	struct dentry *dentry)
		237	{
		238	__u32 mask = FS_DELETE;
		239
		240	if (S_ISDIR(inode->i_mode))
		241	mask \|= FS_ISDIR;
		242
		243	fsnotify_name(mask, inode, FSNOTIFY_EVENT_INODE, dir, &dentry->d_name,
		244	0);
		245	}
		246
		247	/**
		248	* d_delete_notify - delete a dentry and call fsnotify_delete()
		249	* @dentry: The dentry to delete
		250	*
		251	* This helper is used to guaranty that the unlinked inode cannot be found
		252	* by lookup of this name after fsnotify_delete() event has been delivered.
		253	*/
		254	static inline void d_delete_notify(struct inode dir, struct dentry dentry)
		255	{
		256	struct inode *inode = d_inode(dentry);
		257
		258	ihold(inode);
		259	d_delete(dentry);
		260	fsnotify_delete(dir, inode, dentry);
		261	iput(inode);
		262	}
		263
227	/*	264	/*
228	* fsnotify_unlink - 'name' was unlinked	265	* fsnotify_unlink - 'name' was unlinked
229	*	266	*
@@ -231,10 +268,10 @@ static inline void fsnotify_link(struct inode dir, struct inode inode, · 1 unmodified line
231	*/	268	*/
232	static inline void fsnotify_unlink(struct inode dir, struct dentry dentry)	269	static inline void fsnotify_unlink(struct inode dir, struct dentry dentry)
233	{	270	{
234	/* Expected to be called before d_delete() */	271	if (WARN_ON_ONCE(d_is_negative(dentry)))
235	WARN_ON_ONCE(d_is_negative(dentry));	272	return;
236		273
237	fsnotify_dirent(dir, dentry, FS_DELETE);	274	fsnotify_delete(dir, d_inode(dentry), dentry);
238	}	275	}
239		276
240	/*	277	/*
@@ -258,10 +295,10 @@ static inline void fsnotify_mkdir(struct inode dir, struct dentry dentry) · 17 unmodified lines
258	*/	295	*/
259	static inline void fsnotify_rmdir(struct inode dir, struct dentry dentry)	296	static inline void fsnotify_rmdir(struct inode dir, struct dentry dentry)
260	{	297	{
261	/* Expected to be called before d_delete() */	298	if (WARN_ON_ONCE(d_is_negative(dentry)))
262	WARN_ON_ONCE(d_is_negative(dentry));	299	return;
263		300
264	fsnotify_dirent(dir, dentry, FS_DELETE \| FS_ISDIR);	301	fsnotify_delete(dir, d_inode(dentry), dentry);
265	}	302	}
266		303
267	/*	304	/*

include/linux/if_vlan.h+4−2

  *	@h_vlan_encapsulated_proto: packet type ID or len
  */
 struct vlan_ethhdr {
-	unsigned char	h_dest[ETH_ALEN];
+	struct_group(addrs,
-	unsigned char	h_source[ETH_ALEN];
+		unsigned char	h_dest[ETH_ALEN];
+		unsigned char	h_source[ETH_ALEN];
+	);
 	__be16		h_vlan_proto;
 	__be16		h_vlan_TCI;
 	__be16		h_vlan_encapsulated_proto;

include/linux/lsm_hook_defs.h+1−1

@@ -80,7 +80,7 @@ LSM_HOOK(int, 0, sb_clone_mnt_opts, const struct super_block *oldsb, · 79 unmodified lines
80	unsigned long *set_kern_flags)	80	unsigned long *set_kern_flags)
81	LSM_HOOK(int, 0, move_mount, const struct path *from_path,	81	LSM_HOOK(int, 0, move_mount, const struct path *from_path,
82	const struct path *to_path)	82	const struct path *to_path)
83	LSM_HOOK(int, 0, dentry_init_security, struct dentry *dentry,	83	LSM_HOOK(int, -EOPNOTSUPP, dentry_init_security, struct dentry *dentry,
84	int mode, const struct qstr name, const char *xattr_name,	84	int mode, const struct qstr name, const char *xattr_name,
85	void *ctx, u32 ctxlen)	85	void *ctx, u32 ctxlen)
86	LSM_HOOK(int, 0, dentry_create_files_as, struct dentry *dentry, int mode,	86	LSM_HOOK(int, 0, dentry_create_files_as, struct dentry *dentry, int mode,

include/linux/mm.h+12−5

@@ -1506,11 +1506,18 @@ static inline u8 page_kasan_tag(const struct page *page) · 1505 unmodified lines
1506		1506
1507	static inline void page_kasan_tag_set(struct page *page, u8 tag)	1507	static inline void page_kasan_tag_set(struct page *page, u8 tag)
1508	{	1508	{
1509	if (kasan_enabled()) {	1509	unsigned long old_flags, flags;
1510	tag ^= 0xff;	1510
1511	page->flags &= ~(KASAN_TAG_MASK << KASAN_TAG_PGSHIFT);	1511	if (!kasan_enabled())
1512	page->flags \|= (tag & KASAN_TAG_MASK) << KASAN_TAG_PGSHIFT;	1512	return;
1513	}	1513
		1514	tag ^= 0xff;
		1515	old_flags = READ_ONCE(page->flags);
		1516	do {
		1517	flags = old_flags;
		1518	flags &= ~(KASAN_TAG_MASK << KASAN_TAG_PGSHIFT);
		1519	flags \|= (tag & KASAN_TAG_MASK) << KASAN_TAG_PGSHIFT;
		1520	} while (unlikely(!try_cmpxchg(&page->flags, &old_flags, flags)));
1514	}	1521	}
1515		1522
1516	static inline void page_kasan_tag_reset(struct page *page)	1523	static inline void page_kasan_tag_reset(struct page *page)

include/linux/mm_types.h+1−0

@@ -261,6 +261,7 @@ static_assert(sizeof(struct page) == sizeof(struct folio)); · 260 unmodified lines
261	static_assert(offsetof(struct page, pg) == offsetof(struct folio, fl))	261	static_assert(offsetof(struct page, pg) == offsetof(struct folio, fl))
262	FOLIO_MATCH(flags, flags);	262	FOLIO_MATCH(flags, flags);
263	FOLIO_MATCH(lru, lru);	263	FOLIO_MATCH(lru, lru);
		264	FOLIO_MATCH(mapping, mapping);
264	FOLIO_MATCH(compound_head, lru);	265	FOLIO_MATCH(compound_head, lru);
265	FOLIO_MATCH(index, index);	266	FOLIO_MATCH(index, index);
266	FOLIO_MATCH(private, private);	267	FOLIO_MATCH(private, private);

include/linux/psi.h+5−6

 void psi_memstall_leave(unsigned long *flags);
 int psi_show(struct seq_file *s, struct psi_group *group, enum psi_res res);
-#ifdef CONFIG_CGROUPS
-int psi_cgroup_alloc(struct cgroup *cgrp);
-void psi_cgroup_free(struct cgroup *cgrp);
-void cgroup_move_task(struct task_struct *p, struct css_set *to);
 struct psi_trigger *psi_trigger_create(struct psi_group *group,
 			char *buf, size_t nbytes, enum psi_res res);
 void psi_trigger_destroy(struct psi_trigger *t);
 __poll_t psi_trigger_poll(void **trigger_ptr, struct file *file,
 			poll_table *wait);
+#ifdef CONFIG_CGROUPS
+int psi_cgroup_alloc(struct cgroup *cgrp);
+void psi_cgroup_free(struct cgroup *cgrp);
+void cgroup_move_task(struct task_struct *p, struct css_set *to);
 #endif
 #else /* CONFIG_PSI */

include/linux/quota.h+1−1

@@ -91,7 +91,7 @@ extern bool qid_valid(struct kqid qid); · 90 unmodified lines
91	*	91	*
92	* When there is no mapping defined for the user-namespace, type,	92	* When there is no mapping defined for the user-namespace, type,
93	* qid tuple an invalid kqid is returned. Callers are expected to	93	* qid tuple an invalid kqid is returned. Callers are expected to
94	* test for and handle handle invalid kqids being returned.	94	* test for and handle invalid kqids being returned.
95	* Invalid kqids may be tested for using qid_valid().	95	* Invalid kqids may be tested for using qid_valid().
96	*/	96	*/
97	static inline struct kqid make_kqid(struct user_namespace *from,	97	static inline struct kqid make_kqid(struct user_namespace *from,

include/linux/sched.h+0−1

@@ -1680,7 +1680,6 @@ extern struct pid *cad_pid; · 1679 unmodified lines
1680	#define PF_MEMALLOC 0x00000800 /* Allocating memory */	1680	#define PF_MEMALLOC 0x00000800 /* Allocating memory */
1681	#define PF_NPROC_EXCEEDED 0x00001000 /* set_user() noticed that RLIMIT_NPROC was exceeded */	1681	#define PF_NPROC_EXCEEDED 0x00001000 /* set_user() noticed that RLIMIT_NPROC was exceeded */
1682	#define PF_USED_MATH 0x00002000 /* If unset the fpu must be initialized before use */	1682	#define PF_USED_MATH 0x00002000 /* If unset the fpu must be initialized before use */
1683	#define PF_USED_ASYNC 0x00004000 /* Used async_schedule(), used by module init /
1684	#define PF_NOFREEZE 0x00008000 /* This thread should not be frozen */	1683	#define PF_NOFREEZE 0x00008000 /* This thread should not be frozen */
1685	#define PF_FROZEN 0x00010000 /* Frozen for system suspend */	1684	#define PF_FROZEN 0x00010000 /* Frozen for system suspend */
1686	#define PF_KSWAPD 0x00020000 /* I am kswapd */	1685	#define PF_KSWAPD 0x00020000 /* I am kswapd */

include/linux/suspend.h+1−10

 #ifdef CONFIG_HIBERNATION
 /* kernel/power/snapshot.c */
-extern void __register_nosave_region(unsigned long b, unsigned long e, int km);
+extern void register_nosave_region(unsigned long b, unsigned long e);
-static inline void __init register_nosave_region(unsigned long b, unsigned long e)
-{
-	__register_nosave_region(b, e, 0);
-}
-static inline void __init register_nosave_region_late(unsigned long b, unsigned long e)
-{
-	__register_nosave_region(b, e, 1);
-}
 extern int swsusp_page_is_forbidden(struct page *);
 extern void swsusp_set_page_free(struct page *);
 extern void swsusp_unset_page_free(struct page *);
 int hibernate_quiet_exec(int (*func)(void *data), void *data);
 #else /* CONFIG_HIBERNATION */
 static inline void register_nosave_region(unsigned long b, unsigned long e) {}
-static inline void register_nosave_region_late(unsigned long b, unsigned long e) {}
 static inline int swsusp_page_is_forbidden(struct page *p) { return 0; }
 static inline void swsusp_set_page_free(struct page *p) {}
 static inline void swsusp_unset_page_free(struct page *p) {}

include/linux/sysctl.h+1−1

@@ -265,7 +265,7 @@ static inline struct ctl_table_header register_sysctl_table(struct ctl_table · 264 unmodified lines
265	return NULL;	265	return NULL;
266	}	266	}
267		267
268	static inline struct sysctl_header register_sysctl_mount_point(const char path)	268	static inline struct ctl_table_header register_sysctl_mount_point(const char path)
269	{	269	{
270	return NULL;	270	return NULL;
271	}	271	}

include/linux/usb/role.h+6−0

 static inline void usb_role_switch_put(struct usb_role_switch *sw) { }
+static inline struct usb_role_switch *
+usb_role_switch_find_by_fwnode(const struct fwnode_handle *fwnode)
+{
+	return NULL;
+}
 static inline struct usb_role_switch *
 usb_role_switch_register(struct device *parent,
 			 const struct usb_role_switch_desc *desc)

include/net/ax25.h+12−0

 #if defined(CONFIG_AX25_DAMA_SLAVE) || defined(CONFIG_AX25_DAMA_MASTER)
 	ax25_dama_info		dama;
 #endif
+	refcount_t		refcount;
 } ax25_dev;
 typedef struct ax25_cb {
 	}
 }
+static inline void ax25_dev_hold(ax25_dev *ax25_dev)
+{
+	refcount_inc(&ax25_dev->refcount);
+}
+static inline void ax25_dev_put(ax25_dev *ax25_dev)
+{
+	if (refcount_dec_and_test(&ax25_dev->refcount)) {
+		kfree(ax25_dev);
+	}
+}
 static inline __be16 ax25_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
 	skb->dev      = dev;

include/net/neighbour.h+13−5

 	return __neigh_create(tbl, pkey, dev, true);
 }
 void neigh_destroy(struct neighbour *neigh);
-int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb);
+int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb,
+		       const bool immediate_ok);
 int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new, u32 flags,
 		 u32 nlmsg_pid);
 void __neigh_set_probe_once(struct neighbour *neigh);
 #define neigh_hold(n)	refcount_inc(&(n)->refcnt)
-static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
+static __always_inline int neigh_event_send_probe(struct neighbour *neigh,
+						  struct sk_buff *skb,
+						  const bool immediate_ok)
 {
 	unsigned long now = jiffies;
 	if (READ_ONCE(neigh->used) != now)
 		WRITE_ONCE(neigh->used, now);
-	if (!(neigh->nud_state&(NUD_CONNECTED|NUD_DELAY|NUD_PROBE)))
+	if (!(neigh->nud_state & (NUD_CONNECTED | NUD_DELAY | NUD_PROBE)))
-		return __neigh_event_send(neigh, skb);
+		return __neigh_event_send(neigh, skb, immediate_ok);
 	return 0;
 }
+static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
+{
+	return neigh_event_send_probe(neigh, skb, true);
+}
 #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
 static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb)
 {

include/trace/perf.h+3−2

@@ -23,8 +23,9 @@ · 22 unmodified lines
23		23
24	#undef __get_rel_dynamic_array	24	#undef __get_rel_dynamic_array
25	#define __get_rel_dynamic_array(field) \	25	#define __get_rel_dynamic_array(field) \
26	((void *)(&__entry->__rel_loc_##field) + \	26	((void *)__entry + \
27	sizeof(__entry->__rel_loc_##field) + \	27	offsetof(typeof(*__entry), __rel_loc_##field) + \
		28	sizeof(__entry->__rel_loc_##field) + \
28	(__entry->__rel_loc_##field & 0xffff))	29	(__entry->__rel_loc_##field & 0xffff))
29		30
30	#undef __get_rel_dynamic_array_len	31	#undef __get_rel_dynamic_array_len

include/trace/trace_events.h+5−4

 	struct trace_event_raw_##name {					\
 		struct trace_entry	ent;				\
 		tstruct							\
-		char			__data[0];			\
+		char			__data[];			\
 	};								\
 									\
 	static struct trace_event_class event_class_##name;
 #define __get_str(field) ((char *)__get_dynamic_array(field))
 #undef __get_rel_dynamic_array
-#define __get_rel_dynamic_array(field)	\
+#define __get_rel_dynamic_array(field)					\
-		((void *)(&__entry->__rel_loc_##field) +	\
+		((void *)__entry + 					\
-		 sizeof(__entry->__rel_loc_##field) +		\
+		 offsetof(typeof(*__entry), __rel_loc_##field) +	\
+		 sizeof(__entry->__rel_loc_##field) +			\
 		 (__entry->__rel_loc_##field & 0xffff))
 #undef __get_rel_dynamic_array_len

include/uapi/linux/cyclades.h+35−0

@@ -0,0 +1,35 @@
	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
	2
	3	#ifndef _UAPI_LINUX_CYCLADES_H
	4	#define _UAPI_LINUX_CYCLADES_H
	5
	6	#warning "Support for features provided by this header has been removed"
	7	#warning "Please consider updating your code"
	8
	9	struct cyclades_monitor {
	10	unsigned long int_count;
	11	unsigned long char_count;
	12	unsigned long char_max;
	13	unsigned long char_last;
	14	};
	15
	16	#define CYGETMON 0x435901
	17	#define CYGETTHRESH 0x435902
	18	#define CYSETTHRESH 0x435903
	19	#define CYGETDEFTHRESH 0x435904
	20	#define CYSETDEFTHRESH 0x435905
	21	#define CYGETTIMEOUT 0x435906
	22	#define CYSETTIMEOUT 0x435907
	23	#define CYGETDEFTIMEOUT 0x435908
	24	#define CYSETDEFTIMEOUT 0x435909
	25	#define CYSETRFLOW 0x43590a
	26	#define CYGETRFLOW 0x43590b
	27	#define CYSETRTSDTR_INV 0x43590c
	28	#define CYGETRTSDTR_INV 0x43590d
	29	#define CYZSETPOLLCYCLE 0x43590e
	30	#define CYZGETPOLLCYCLE 0x43590f
	31	#define CYGETCD1400VER 0x435910
	32	#define CYSETWAIT 0x435912
	33	#define CYGETWAIT 0x435913
	34
	35	#endif /* _UAPI_LINUX_CYCLADES_H */

include/uapi/linux/kvm.h+1−0

@@ -1133,6 +1133,7 @@ struct kvm_ppc_resize_hpt { · 1132 unmodified lines
1133	#define KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM 206	1133	#define KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM 206
1134	#define KVM_CAP_VM_GPA_BITS 207	1134	#define KVM_CAP_VM_GPA_BITS 207
1135	#define KVM_CAP_XSAVE2 208	1135	#define KVM_CAP_XSAVE2 208
		1136	#define KVM_CAP_SYS_ATTRIBUTES 209
1136		1137
1137	#ifdef KVM_CAP_IRQ_ROUTING	1138	#ifdef KVM_CAP_IRQ_ROUTING
1138		1139

include/uapi/linux/smc_diag.h+5−6

@@ -84,12 +84,11 @@ struct smc_diag_conninfo { · 83 unmodified lines
84	/* SMC_DIAG_LINKINFO */	84	/* SMC_DIAG_LINKINFO */
85		85
86	struct smc_diag_linkinfo {	86	struct smc_diag_linkinfo {
87	__u8 link_id; /* link identifier */	87	__u8 link_id; /* link identifier */
88	__u8 ibname[IB_DEVICE_NAME_MAX]; /* name of the RDMA device */	88	__u8 ibname[IB_DEVICE_NAME_MAX]; /* name of the RDMA device */
89	__u8 ibport; /* RDMA device port number */	89	__u8 ibport; /* RDMA device port number */
90	__u8 gid[40]; /* local GID */	90	__u8 gid[40]; /* local GID */
91	__u8 peer_gid[40]; /* peer GID */	91	__u8 peer_gid[40]; /* peer GID */
92	__aligned_u64 net_cookie; /* RDMA device net namespace */
93	};	92	};
94		93
95	struct smc_diag_lgrinfo {	94	struct smc_diag_lgrinfo {

kernel/async.c+0−3

@@ -205,9 +205,6 @@ async_cookie_t async_schedule_node_domain(async_func_t func, void *data, · 204 unmodified lines
205	atomic_inc(&entry_count);	205	atomic_inc(&entry_count);
206	spin_unlock_irqrestore(&async_lock, flags);	206	spin_unlock_irqrestore(&async_lock, flags);
207		207
208	/* mark that this task has queued an async job, used by module init */
209	current->flags \|= PF_USED_ASYNC;
210
211	/* schedule for execution */	208	/* schedule for execution */
212	queue_work_node(node, system_unbound_wq, &entry->work);	209	queue_work_node(node, system_unbound_wq, &entry->work);
213		210

kernel/audit.c+43−19

@@ -541,20 +541,22 @@ static void kauditd_printk_skb(struct sk_buff *skb) · 540 unmodified lines
541	/**	541	/**
542	* kauditd_rehold_skb - Handle a audit record send failure in the hold queue	542	* kauditd_rehold_skb - Handle a audit record send failure in the hold queue
543	* @skb: audit record	543	* @skb: audit record
		544	* @error: error code (unused)
544	*	545	*
545	* Description:	546	* Description:
546	* This should only be used by the kauditd_thread when it fails to flush the	547	* This should only be used by the kauditd_thread when it fails to flush the
547	* hold queue.	548	* hold queue.
548	*/	549	*/
549	static void kauditd_rehold_skb(struct sk_buff *skb)	550	static void kauditd_rehold_skb(struct sk_buff *skb, __always_unused int error)
550	{	551	{
551	/* put the record back in the queue at the same place */	552	/* put the record back in the queue */
552	skb_queue_head(&audit_hold_queue, skb);	553	skb_queue_tail(&audit_hold_queue, skb);
553	}	554	}
554		555
555	/**	556	/**
556	* kauditd_hold_skb - Queue an audit record, waiting for auditd	557	* kauditd_hold_skb - Queue an audit record, waiting for auditd
557	* @skb: audit record	558	* @skb: audit record
		559	* @error: error code
558	*	560	*
559	* Description:	561	* Description:
560	* Queue the audit record, waiting for an instance of auditd. When this	562	* Queue the audit record, waiting for an instance of auditd. When this
@@ -564,19 +566,31 @@ static void kauditd_rehold_skb(struct sk_buff *skb) · 3 unmodified lines
564	* and queue it, if we have room. If we want to hold on to the record, but we	566	* and queue it, if we have room. If we want to hold on to the record, but we
565	* don't have room, record a record lost message.	567	* don't have room, record a record lost message.
566	*/	568	*/
567	static void kauditd_hold_skb(struct sk_buff *skb)	569	static void kauditd_hold_skb(struct sk_buff *skb, int error)
568	{	570	{
569	/* at this point it is uncertain if we will ever send this to auditd so	571	/* at this point it is uncertain if we will ever send this to auditd so
570	* try to send the message via printk before we go any further */	572	* try to send the message via printk before we go any further */
571	kauditd_printk_skb(skb);	573	kauditd_printk_skb(skb);
572		574
573	/* can we just silently drop the message? */	575	/* can we just silently drop the message? */
574	if (!audit_default) {	576	if (!audit_default)
575	kfree_skb(skb);	577	goto drop;
576	return;	578
		579	/* the hold queue is only for when the daemon goes away completely,
		580	* not -EAGAIN failures; if we are in a -EAGAIN state requeue the
		581	* record on the retry queue unless it's full, in which case drop it
		582	*/
		583	if (error == -EAGAIN) {
		584	if (!audit_backlog_limit \|\|
		585	skb_queue_len(&audit_retry_queue) < audit_backlog_limit) {
		586	skb_queue_tail(&audit_retry_queue, skb);
		587	return;
		588	}
		589	audit_log_lost("kauditd retry queue overflow");
		590	goto drop;
577	}	591	}
578		592
579	/* if we have room, queue the message */	593	/* if we have room in the hold queue, queue the message */
580	if (!audit_backlog_limit \|\|	594	if (!audit_backlog_limit \|\|
581	skb_queue_len(&audit_hold_queue) < audit_backlog_limit) {	595	skb_queue_len(&audit_hold_queue) < audit_backlog_limit) {
582	skb_queue_tail(&audit_hold_queue, skb);	596	skb_queue_tail(&audit_hold_queue, skb);
@@ -585,24 +599,32 @@ static void kauditd_hold_skb(struct sk_buff *skb) · 2 unmodified lines
585		599
586	/* we have no other options - drop the message */	600	/* we have no other options - drop the message */
587	audit_log_lost("kauditd hold queue overflow");	601	audit_log_lost("kauditd hold queue overflow");
		602	drop:
588	kfree_skb(skb);	603	kfree_skb(skb);
589	}	604	}
590		605
591	/**	606	/**
592	* kauditd_retry_skb - Queue an audit record, attempt to send again to auditd	607	* kauditd_retry_skb - Queue an audit record, attempt to send again to auditd
593	* @skb: audit record	608	* @skb: audit record
		609	* @error: error code (unused)
594	*	610	*
595	* Description:	611	* Description:
596	* Not as serious as kauditd_hold_skb() as we still have a connected auditd,	612	* Not as serious as kauditd_hold_skb() as we still have a connected auditd,
597	* but for some reason we are having problems sending it audit records so	613	* but for some reason we are having problems sending it audit records so
598	* queue the given record and attempt to resend.	614	* queue the given record and attempt to resend.
599	*/	615	*/
600	static void kauditd_retry_skb(struct sk_buff *skb)	616	static void kauditd_retry_skb(struct sk_buff *skb, __always_unused int error)
601	{	617	{
602	/* NOTE: because records should only live in the retry queue for a	618	if (!audit_backlog_limit \|\|
603	* short period of time, before either being sent or moved to the hold	619	skb_queue_len(&audit_retry_queue) < audit_backlog_limit) {
604	* queue, we don't currently enforce a limit on this queue */	620	skb_queue_tail(&audit_retry_queue, skb);
605	skb_queue_tail(&audit_retry_queue, skb);	621	return;
		622	}
		623
		624	/* we have to drop the record, send it via printk as a last effort */
		625	kauditd_printk_skb(skb);
		626	audit_log_lost("kauditd retry queue overflow");
		627	kfree_skb(skb);
606	}	628	}
607		629
608	/**	630	/**
@@ -640,7 +662,7 @@ static void auditd_reset(const struct auditd_connection *ac) · 31 unmodified lines
640	/* flush the retry queue to the hold queue, but don't touch the main	662	/* flush the retry queue to the hold queue, but don't touch the main
641	* queue since we need to process that normally for multicast */	663	* queue since we need to process that normally for multicast */
642	while ((skb = skb_dequeue(&audit_retry_queue)))	664	while ((skb = skb_dequeue(&audit_retry_queue)))
643	kauditd_hold_skb(skb);	665	kauditd_hold_skb(skb, -ECONNREFUSED);
644	}	666	}
645		667
646	/**	668	/**
@@ -714,16 +736,18 @@ static int kauditd_send_queue(struct sock *sk, u32 portid, · 67 unmodified lines
714	struct sk_buff_head *queue,	736	struct sk_buff_head *queue,
715	unsigned int retry_limit,	737	unsigned int retry_limit,
716	void (skb_hook)(struct sk_buff skb),	738	void (skb_hook)(struct sk_buff skb),
717	void (err_hook)(struct sk_buff skb))	739	void (err_hook)(struct sk_buff skb, int error))
718	{	740	{
719	int rc = 0;	741	int rc = 0;
720	struct sk_buff *skb;	742	struct sk_buff *skb = NULL;
		743	struct sk_buff *skb_tail;
721	unsigned int failed = 0;	744	unsigned int failed = 0;
722		745
723	/* NOTE: kauditd_thread takes care of all our locking, we just use	746	/* NOTE: kauditd_thread takes care of all our locking, we just use
724	* the netlink info passed to us (e.g. sk and portid) */	747	* the netlink info passed to us (e.g. sk and portid) */
725		748
726	while ((skb = skb_dequeue(queue))) {	749	skb_tail = skb_peek_tail(queue);
		750	while ((skb != skb_tail) && (skb = skb_dequeue(queue))) {
727	/* call the skb_hook for each skb we touch */	751	/* call the skb_hook for each skb we touch */
728	if (skb_hook)	752	if (skb_hook)
729	(*skb_hook)(skb);	753	(*skb_hook)(skb);
@@ -731,7 +755,7 @@ static int kauditd_send_queue(struct sock *sk, u32 portid, · 1 unmodified line
731	/* can we send to anyone via unicast? */	755	/* can we send to anyone via unicast? */
732	if (!sk) {	756	if (!sk) {
733	if (err_hook)	757	if (err_hook)
734	(*err_hook)(skb);	758	(*err_hook)(skb, -ECONNREFUSED);
735	continue;	759	continue;
736	}	760	}
737		761
@@ -745,7 +769,7 @@ retry: · 7 unmodified lines
745	rc == -ECONNREFUSED \|\| rc == -EPERM) {	769	rc == -ECONNREFUSED \|\| rc == -EPERM) {
746	sk = NULL;	770	sk = NULL;
747	if (err_hook)	771	if (err_hook)
748	(*err_hook)(skb);	772	(*err_hook)(skb, rc);
749	if (rc == -EAGAIN)	773	if (rc == -EAGAIN)
750	rc = 0;	774	rc = 0;
751	/* continue to drain the queue */	775	/* continue to drain the queue */

kernel/bpf/bpf_lsm.c+1−1

@@ -207,7 +207,7 @@ BTF_ID(func, bpf_lsm_socket_socketpair) · 206 unmodified lines
207		207
208	BTF_ID(func, bpf_lsm_syslog)	208	BTF_ID(func, bpf_lsm_syslog)
209	BTF_ID(func, bpf_lsm_task_alloc)	209	BTF_ID(func, bpf_lsm_task_alloc)
210	BTF_ID(func, bpf_lsm_task_getsecid_subj)	210	BTF_ID(func, bpf_lsm_current_getsecid_subj)
211	BTF_ID(func, bpf_lsm_task_getsecid_obj)	211	BTF_ID(func, bpf_lsm_task_getsecid_obj)
212	BTF_ID(func, bpf_lsm_task_prctl)	212	BTF_ID(func, bpf_lsm_task_prctl)
213	BTF_ID(func, bpf_lsm_task_setscheduler)	213	BTF_ID(func, bpf_lsm_task_setscheduler)

kernel/bpf/ringbuf.c+1−1

@@ -104,7 +104,7 @@ static struct bpf_ringbuf *bpf_ringbuf_area_alloc(size_t data_sz, int numa_node) · 103 unmodified lines
104	}	104	}
105		105
106	rb = vmap(pages, nr_meta_pages + 2 * nr_data_pages,	106	rb = vmap(pages, nr_meta_pages + 2 * nr_data_pages,
107	VM_ALLOC \| VM_USERMAP, PAGE_KERNEL);	107	VM_MAP \| VM_USERMAP, PAGE_KERNEL);
108	if (rb) {	108	if (rb) {
109	kmemleak_not_leak(pages);	109	kmemleak_not_leak(pages);
110	rb->pages = pages;	110	rb->pages = pages;

kernel/bpf/trampoline.c+3−2

 static void notrace inc_misses_counter(struct bpf_prog *prog)
 {
 	struct bpf_prog_stats *stats;
+	unsigned int flags;
 	stats = this_cpu_ptr(prog->stats);
-	u64_stats_update_begin(&stats->syncp);
+	flags = u64_stats_update_begin_irqsave(&stats->syncp);
 	u64_stats_inc(&stats->misses);
-	u64_stats_update_end(&stats->syncp);
+	u64_stats_update_end_irqrestore(&stats->syncp, flags);
 }
 /* The logic is similar to bpf_prog_run(), but with an explicit

kernel/cgroup/cgroup-v1.c+14−0

@@ -549,6 +549,14 @@ static ssize_t cgroup_release_agent_write(struct kernfs_open_file *of, · 548 unmodified lines
549		549
550	BUILD_BUG_ON(sizeof(cgrp->root->release_agent_path) < PATH_MAX);	550	BUILD_BUG_ON(sizeof(cgrp->root->release_agent_path) < PATH_MAX);
551		551
		552	/*
		553	* Release agent gets called with all capabilities,
		554	* require capabilities to set release agent.
		555	*/
		556	if ((of->file->f_cred->user_ns != &init_user_ns) \|\|
		557	!capable(CAP_SYS_ADMIN))
		558	return -EPERM;
		559
552	cgrp = cgroup_kn_lock_live(of->kn, false);	560	cgrp = cgroup_kn_lock_live(of->kn, false);
553	if (!cgrp)	561	if (!cgrp)
554	return -ENODEV;	562	return -ENODEV;
@@ -954,6 +962,12 @@ int cgroup1_parse_param(struct fs_context fc, struct fs_parameter param) · 399 unmodified lines
954	/* Specifying two release agents is forbidden */	962	/* Specifying two release agents is forbidden */
955	if (ctx->release_agent)	963	if (ctx->release_agent)
956	return invalfc(fc, "release_agent respecified");	964	return invalfc(fc, "release_agent respecified");
		965	/*
		966	* Release agent gets called with all capabilities,
		967	* require capabilities to set release agent.
		968	*/
		969	if ((fc->user_ns != &init_user_ns) \|\| !capable(CAP_SYS_ADMIN))
		970	return invalfc(fc, "Setting release_agent not allowed");
957	ctx->release_agent = param->string;	971	ctx->release_agent = param->string;
958	param->string = NULL;	972	param->string = NULL;
959	break;	973	break;

kernel/cgroup/cpuset.c+51−14

 	kfree(cs);
 }
+/*
+ * validate_change_legacy() - Validate conditions specific to legacy (v1)
+ *                            behavior.
+ */
+static int validate_change_legacy(struct cpuset *cur, struct cpuset *trial)
+{
+	struct cgroup_subsys_state *css;
+	struct cpuset *c, *par;
+	int ret;
+	WARN_ON_ONCE(!rcu_read_lock_held());
+	/* Each of our child cpusets must be a subset of us */
+	ret = -EBUSY;
+	cpuset_for_each_child(c, css, cur)
+		if (!is_cpuset_subset(c, trial))
+			goto out;
+	/* On legacy hierarchy, we must be a subset of our parent cpuset. */
+	ret = -EACCES;
+	par = parent_cs(cur);
+	if (par && !is_cpuset_subset(trial, par))
+		goto out;
+	ret = 0;
+out:
+	return ret;
+}
 /*
  * validate_change() - Used to validate that any proposed cpuset change
  *		       follows the structural rules for cpusets.
 {
 	struct cgroup_subsys_state *css;
 	struct cpuset *c, *par;
-	int ret;
+	int ret = 0;
-	/* The checks don't apply to root cpuset */
-	if (cur == &top_cpuset)
-		return 0;
 	rcu_read_lock();
-	par = parent_cs(cur);
-	/* On legacy hierarchy, we must be a subset of our parent cpuset. */
+	if (!is_in_v2_mode())
-	ret = -EACCES;
+		ret = validate_change_legacy(cur, trial);
-	if (!is_in_v2_mode() && !is_cpuset_subset(trial, par))
+	if (ret)
+		goto out;
+	/* Remaining checks don't apply to root cpuset */
+	if (cur == &top_cpuset)
 		goto out;
+	par = parent_cs(cur);
 	/*
 	 * If either I or some sibling (!= me) is exclusive, we can't
 	 * overlap
  *
  * Because of the implicit cpu exclusive nature of a partition root,
  * cpumask changes that violates the cpu exclusivity rule will not be
- * permitted when checked by validate_change(). The validate_change()
+ * permitted when checked by validate_change().
- * function will also prevent any changes to the cpu list if it is not
- * a superset of children's cpu lists.
  */
 static int update_parent_subparts_cpumask(struct cpuset *cpuset, int cmd,
 					  struct cpumask *newmask,
 	struct cpuset *sibling;
 	struct cgroup_subsys_state *pos_css;
+	percpu_rwsem_assert_held(&cpuset_rwsem);
 	/*
 	 * Check all its siblings and call update_cpumasks_hier()
 	 * if their use_parent_ecpus flag is set in order for them
 	 * to use the right effective_cpus value.
+	 *
+	 * The update_cpumasks_hier() function may sleep. So we have to
+	 * release the RCU read lock before calling it.
 	 */
 	rcu_read_lock();
 	cpuset_for_each_child(sibling, pos_css, parent) {
 			continue;
 		if (!sibling->use_parent_ecpus)
 			continue;
+		if (!css_tryget_online(&sibling->css))
+			continue;
+		rcu_read_unlock();
 		update_cpumasks_hier(sibling, tmp);
+		rcu_read_lock();
+		css_put(&sibling->css);
 	}
 	rcu_read_unlock();
 }
 	 * Make sure that subparts_cpus is a subset of cpus_allowed.
 	 */
 	if (cs->nr_subparts_cpus) {
-		cpumask_andnot(cs->subparts_cpus, cs->subparts_cpus,
+		cpumask_and(cs->subparts_cpus, cs->subparts_cpus, cs->cpus_allowed);
-			       cs->cpus_allowed);
 		cs->nr_subparts_cpus = cpumask_weight(cs->subparts_cpus);
 	}
 	spin_unlock_irq(&callback_lock);

kernel/events/core.c+19−4

 	 * event_function_call() user.
 	 */
 	raw_spin_lock_irq(&ctx->lock);
-	if (!ctx->is_active) {
+	/*
+	 * Cgroup events are per-cpu events, and must IPI because of
+	 * cgrp_cpuctx_list.
+	 */
+	if (!ctx->is_active && !is_cgroup_event(event)) {
 		__perf_remove_from_context(event, __get_cpu_context(ctx),
 					   ctx, (void *)flags);
 		raw_spin_unlock_irq(&ctx->lock);
 	 * perf_event_attr::disabled events will not run and can be initialized
 	 * without IPI. Except when this is the first event for the context, in
 	 * that case we need the magic of the IPI to set ctx->is_active.
+	 * Similarly, cgroup events for the context also needs the IPI to
+	 * manipulate the cgrp_cpuctx_list.
 	 *
 	 * The IOC_ENABLE that is sure to follow the creation of a disabled
 	 * event will issue the IPI and reprogram the hardware.
 	 */
-	if (__perf_effective_state(event) == PERF_EVENT_STATE_OFF && ctx->nr_events) {
+	if (__perf_effective_state(event) == PERF_EVENT_STATE_OFF &&
+	    ctx->nr_events && !is_cgroup_event(event)) {
 		raw_spin_lock_irq(&ctx->lock);
 		if (ctx->task == TASK_TOMBSTONE) {
 			raw_spin_unlock_irq(&ctx->lock);
 	struct perf_buffer *old_rb = NULL;
 	unsigned long flags;
+	WARN_ON_ONCE(event->parent);
 	if (event->rb) {
 		/*
 		 * Should be impossible, we set this when removing
 {
 	struct perf_buffer *rb;
+	if (event->parent)
+		event = event->parent;
 	rcu_read_lock();
 	rb = rcu_dereference(event->rb);
 	if (rb) {
 {
 	struct perf_buffer *rb;
+	if (event->parent)
+		event = event->parent;
 	rcu_read_lock();
 	rb = rcu_dereference(event->rb);
 	if (rb) {
 	if (WARN_ON_ONCE(READ_ONCE(sampler->oncpu) != smp_processor_id()))
 		goto out;
-	rb = ring_buffer_get(sampler->parent ? sampler->parent : sampler);
+	rb = ring_buffer_get(sampler);
 	if (!rb)
 		goto out;
 	if (WARN_ON_ONCE(!sampler || !data->aux_size))
 		return;
-	rb = ring_buffer_get(sampler->parent ? sampler->parent : sampler);
+	rb = ring_buffer_get(sampler);
 	if (!rb)
 		return;

kernel/module.c+5−20

 	}
 	freeinit->module_init = mod->init_layout.base;
-	/*
-	 * We want to find out whether @mod uses async during init.  Clear
-	 * PF_USED_ASYNC.  async_schedule*() will set it.
-	 */
-	current->flags &= ~PF_USED_ASYNC;
 	do_mod_ctors(mod);
 	/* Start the module */
 	if (mod->init != NULL)
 	/*
 	 * We need to finish all async code before the module init sequence
-	 * is done.  This has potential to deadlock.  For example, a newly
+	 * is done. This has potential to deadlock if synchronous module
-	 * detected block device can trigger request_module() of the
+	 * loading is requested from async (which is not allowed!).
-	 * default iosched from async probing task.  Once userland helper
-	 * reaches here, async_synchronize_full() will wait on the async
-	 * task waiting on request_module() and deadlock.
-	 *
-	 * This deadlock is avoided by perfomring async_synchronize_full()
-	 * iff module init queued any async jobs.  This isn't a full
-	 * solution as it will deadlock the same if module loading from
-	 * async jobs nests more than once; however, due to the various
-	 * constraints, this hack seems to be the best option for now.
-	 * Please refer to the following thread for details.
 	 *
-	 * http://thread.gmane.org/gmane.linux.kernel/1420814
+	 * See commit 0fdff3ec6d87 ("async, kmod: warn on synchronous
+	 * request_module() from async workers") for more details.
 	 */
-	if (!mod->async_probe_requested && (current->flags & PF_USED_ASYNC))
+	if (!mod->async_probe_requested)
 		async_synchronize_full();
 	ftrace_free_mem(mod, mod->init_layout.base, mod->init_layout.base +

kernel/power/snapshot.c+7−14

  * Register a range of page frames the contents of which should not be saved
  * during hibernation (to be used in the early initialization code).
  */
-void __init __register_nosave_region(unsigned long start_pfn,
+void __init register_nosave_region(unsigned long start_pfn, unsigned long end_pfn)
-				     unsigned long end_pfn, int use_kmalloc)
 {
 	struct nosave_region *region;
 			goto Report;
 		}
 	}
-	if (use_kmalloc) {
+	/* This allocation cannot fail */
-		/* During init, this shouldn't fail */
+	region = memblock_alloc(sizeof(struct nosave_region),
-		region = kmalloc(sizeof(struct nosave_region), GFP_KERNEL);
+				SMP_CACHE_BYTES);
-		BUG_ON(!region);
+	if (!region)
-	} else {
+		panic("%s: Failed to allocate %zu bytes\n", __func__,
-		/* This allocation cannot fail */
+		      sizeof(struct nosave_region));
-		region = memblock_alloc(sizeof(struct nosave_region),
-					SMP_CACHE_BYTES);
-		if (!region)
-			panic("%s: Failed to allocate %zu bytes\n", __func__,
-			      sizeof(struct nosave_region));
-	}
 	region->start_pfn = start_pfn;
 	region->end_pfn = end_pfn;
 	list_add_tail(&region->list, &nosave_regions);

kernel/power/wakelock.c+4−7

 {
 	struct rb_node *node;
 	struct wakelock *wl;
-	char *str = buf;
+	int len = 0;
-	char *end = buf + PAGE_SIZE;
 	mutex_lock(&wakelocks_lock);
 	for (node = rb_first(&wakelocks_tree); node; node = rb_next(node)) {
 		wl = rb_entry(node, struct wakelock, node);
 		if (wl->ws->active == show_active)
-			str += scnprintf(str, end - str, "%s ", wl->name);
+			len += sysfs_emit_at(buf, len, "%s ", wl->name);
 	}
-	if (str > buf)
-		str--;
-	str += scnprintf(str, end - str, "\n");
+	len += sysfs_emit_at(buf, len, "\n");
 	mutex_unlock(&wakelocks_lock);
-	return (str - buf);
+	return len;
 }
 #if CONFIG_PM_WAKELOCKS_LIMIT > 0

kernel/printk/sysctl.c+1−1

@@ -12,7 +12,7 @@ · 11 unmodified lines
12	static const int ten_thousand = 10000;	12	static const int ten_thousand = 10000;
13		13
14	static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,	14	static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
15	void __user buffer, size_t lenp, loff_t *ppos)	15	void buffer, size_t lenp, loff_t *ppos)
16	{	16	{
17	if (write && !capable(CAP_SYS_ADMIN))	17	if (write && !capable(CAP_SYS_ADMIN))
18	return -EPERM;	18	return -EPERM;

kernel/rcu/tasks.h+8−4

 	.call_func = call,								\
 	.rtpcpu = &rt_name ## __percpu,							\
 	.name = n,									\
-	.percpu_enqueue_shift = ilog2(CONFIG_NR_CPUS),					\
+	.percpu_enqueue_shift = ilog2(CONFIG_NR_CPUS) + 1,				\
 	.percpu_enqueue_lim = 1,							\
 	.percpu_dequeue_lim = 1,							\
 	.barrier_q_mutex = __MUTEX_INITIALIZER(rt_name.barrier_q_mutex),		\
 	int cpu;
 	unsigned long flags;
 	int lim;
+	int shift;
 	raw_spin_lock_irqsave(&rtp->cbs_gbl_lock, flags);
 	if (rcu_task_enqueue_lim < 0) {
 	if (lim > nr_cpu_ids)
 		lim = nr_cpu_ids;
-	WRITE_ONCE(rtp->percpu_enqueue_shift, ilog2(nr_cpu_ids / lim));
+	shift = ilog2(nr_cpu_ids / lim);
+	if (((nr_cpu_ids - 1) >> shift) >= lim)
+		shift++;
+	WRITE_ONCE(rtp->percpu_enqueue_shift, shift);
 	WRITE_ONCE(rtp->percpu_dequeue_lim, lim);
 	smp_store_release(&rtp->percpu_enqueue_lim, lim);
 	for_each_possible_cpu(cpu) {
 	if (unlikely(needadjust)) {
 		raw_spin_lock_irqsave(&rtp->cbs_gbl_lock, flags);
 		if (rtp->percpu_enqueue_lim != nr_cpu_ids) {
-			WRITE_ONCE(rtp->percpu_enqueue_shift, ilog2(nr_cpu_ids));
+			WRITE_ONCE(rtp->percpu_enqueue_shift, ilog2(nr_cpu_ids) + 1);
 			WRITE_ONCE(rtp->percpu_dequeue_lim, nr_cpu_ids);
 			smp_store_release(&rtp->percpu_enqueue_lim, nr_cpu_ids);
 			pr_info("Switching %s to per-CPU callback queuing.\n", rtp->name);
 	if (rcu_task_cb_adjust && ncbs <= rcu_task_collapse_lim) {
 		raw_spin_lock_irqsave(&rtp->cbs_gbl_lock, flags);
 		if (rtp->percpu_enqueue_lim > 1) {
-			WRITE_ONCE(rtp->percpu_enqueue_shift, ilog2(nr_cpu_ids));
+			WRITE_ONCE(rtp->percpu_enqueue_shift, ilog2(nr_cpu_ids) + 1);
 			smp_store_release(&rtp->percpu_enqueue_lim, 1);
 			rtp->percpu_dequeue_gpseq = get_state_synchronize_rcu();
 			pr_info("Starting switch %s to CPU-0 callback queuing.\n", rtp->name);

kernel/sched/membarrier.c+5−4

 #endif
 #ifdef CONFIG_RSEQ
-#define MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ_BITMASK		\
+#define MEMBARRIER_PRIVATE_EXPEDITED_RSEQ_BITMASK		\
 	(MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ			\
-	| MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ_BITMASK)
+	| MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ)
 #else
-#define MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ_BITMASK	0
+#define MEMBARRIER_PRIVATE_EXPEDITED_RSEQ_BITMASK	0
 #endif
 #define MEMBARRIER_CMD_BITMASK						\
 	| MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED			\
 	| MEMBARRIER_CMD_PRIVATE_EXPEDITED				\
 	| MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED			\
-	| MEMBARRIER_PRIVATE_EXPEDITED_SYNC_CORE_BITMASK)
+	| MEMBARRIER_PRIVATE_EXPEDITED_SYNC_CORE_BITMASK		\
+	| MEMBARRIER_PRIVATE_EXPEDITED_RSEQ_BITMASK)
 static void ipi_mb(void *info)
 {

kernel/sched/psi.c+41−38

 	return 0;
 }
-static int psi_io_show(struct seq_file *m, void *v)
-{
-	return psi_show(m, &psi_system, PSI_IO);
-}
-static int psi_memory_show(struct seq_file *m, void *v)
-{
-	return psi_show(m, &psi_system, PSI_MEM);
-}
-static int psi_cpu_show(struct seq_file *m, void *v)
-{
-	return psi_show(m, &psi_system, PSI_CPU);
-}
-static int psi_open(struct file *file, int (*psi_show)(struct seq_file *, void *))
-{
-	if (file->f_mode & FMODE_WRITE && !capable(CAP_SYS_RESOURCE))
-		return -EPERM;
-	return single_open(file, psi_show, NULL);
-}
-static int psi_io_open(struct inode *inode, struct file *file)
-{
-	return psi_open(file, psi_io_show);
-}
-static int psi_memory_open(struct inode *inode, struct file *file)
-{
-	return psi_open(file, psi_memory_show);
-}
-static int psi_cpu_open(struct inode *inode, struct file *file)
-{
-	return psi_open(file, psi_cpu_show);
-}
 struct psi_trigger *psi_trigger_create(struct psi_group *group,
 			char *buf, size_t nbytes, enum psi_res res)
 {
 	return ret;
 }
+#ifdef CONFIG_PROC_FS
+static int psi_io_show(struct seq_file *m, void *v)
+{
+	return psi_show(m, &psi_system, PSI_IO);
+}
+static int psi_memory_show(struct seq_file *m, void *v)
+{
+	return psi_show(m, &psi_system, PSI_MEM);
+}
+static int psi_cpu_show(struct seq_file *m, void *v)
+{
+	return psi_show(m, &psi_system, PSI_CPU);
+}
+static int psi_open(struct file *file, int (*psi_show)(struct seq_file *, void *))
+{
+	if (file->f_mode & FMODE_WRITE && !capable(CAP_SYS_RESOURCE))
+		return -EPERM;
+	return single_open(file, psi_show, NULL);
+}
+static int psi_io_open(struct inode *inode, struct file *file)
+{
+	return psi_open(file, psi_io_show);
+}
+static int psi_memory_open(struct inode *inode, struct file *file)
+{
+	return psi_open(file, psi_memory_show);
+}
+static int psi_cpu_open(struct inode *inode, struct file *file)
+{
+	return psi_open(file, psi_cpu_show);
+}
 static ssize_t psi_write(struct file *file, const char __user *user_buf,
 			 size_t nbytes, enum psi_res res)
 {
 	return 0;
 }
 module_init(psi_proc_init);
+#endif /* CONFIG_PROC_FS */

kernel/stackleak.c+2−3

 #define skip_erasing()	false
 #endif /* CONFIG_STACKLEAK_RUNTIME_DISABLE */
-asmlinkage void notrace stackleak_erase(void)
+asmlinkage void noinstr stackleak_erase(void)
 {
 	/* It would be nice not to have 'kstack_ptr' and 'boundary' on stack */
 	unsigned long kstack_ptr = current->lowest_stack;
 	/* Reset the 'lowest_stack' value for the next syscall */
 	current->lowest_stack = current_top_of_stack() - THREAD_SIZE/64;
 }
-NOKPROBE_SYMBOL(stackleak_erase);
-void __used __no_caller_saved_registers notrace stackleak_track_stack(void)
+void __used __no_caller_saved_registers noinstr stackleak_track_stack(void)
 {
 	unsigned long sp = current_stack_pointer;

kernel/trace/Kconfig+7−1

 	help
 	  C version of recordmcount available?
+config HAVE_BUILDTIME_MCOUNT_SORT
+       bool
+       help
+         An architecture selects this if it sorts the mcount_loc section
+	 at build time.
 config BUILDTIME_MCOUNT_SORT
        bool
        default y
-       depends on BUILDTIME_TABLE_SORT && !S390
+       depends on HAVE_BUILDTIME_MCOUNT_SORT && DYNAMIC_FTRACE
        help
          Sort the mcount_loc section at build time.

kernel/trace/trace.c+2−1

@@ -7740,7 +7740,8 @@ static struct tracing_log_err get_tracing_log_err(struct trace_array tr) · 7739 unmodified lines
7740	err = kzalloc(sizeof(*err), GFP_KERNEL);	7740	err = kzalloc(sizeof(*err), GFP_KERNEL);
7741	if (!err)	7741	if (!err)
7742	err = ERR_PTR(-ENOMEM);	7742	err = ERR_PTR(-ENOMEM);
7743	tr->n_err_log_entries++;	7743	else
		7744	tr->n_err_log_entries++;
7744		7745
7745	return err;	7746	return err;
7746	}	7747	}

kernel/trace/trace_events_hist.c+8−2

 		(HIST_FIELD_FL_TIMESTAMP | HIST_FIELD_FL_TIMESTAMP_USECS);
 	expr->fn = hist_field_unary_minus;
 	expr->operands[0] = operand1;
+	expr->size = operand1->size;
+	expr->is_signed = operand1->is_signed;
 	expr->operator = FIELD_OP_UNARY_MINUS;
 	expr->name = expr_str(expr, 0);
 	expr->type = kstrdup_const(operand1->type, GFP_KERNEL);
 		/* The operand sizes should be the same, so just pick one */
 		expr->size = operand1->size;
+		expr->is_signed = operand1->is_signed;
 		expr->operator = field_op;
 		expr->type = kstrdup_const(operand1->type, GFP_KERNEL);
 			var_ref_idx = find_var_ref_idx(hist_data, var_ref);
 			if (WARN_ON(var_ref_idx < 0)) {
+				kfree(p);
 				ret = var_ref_idx;
 				goto err;
 			}
 	lockdep_assert_held(&event_mutex);
-	if (glob && strlen(glob)) {
+	WARN_ON(!glob);
+	if (strlen(glob)) {
 		hist_err_clear();
 		last_cmd_set(file, param);
 	}
 			continue;
 		}
 		break;
-	} while (p);
+	} while (1);
 	if (!p)
 		param = NULL;

kernel/ucount.c+2−0

 			kfree(new);
 		} else {
 			hlist_add_head(&new->node, hashent);
+			get_user_ns(new->ns);
 			spin_unlock_irq(&ucounts_lock);
 			return new;
 		}
 	if (atomic_dec_and_lock_irqsave(&ucounts->count, &ucounts_lock, flags)) {
 		hlist_del_init(&ucounts->node);
 		spin_unlock_irqrestore(&ucounts_lock, flags);
+		put_user_ns(ucounts->ns);
 		kfree(ucounts);
 	}
 }

lib/sbitmap.c+6−2

@@ -488,9 +488,13 @@ void sbitmap_queue_recalculate_wake_batch(struct sbitmap_queue *sbq, · 487 unmodified lines
488	unsigned int users)	488	unsigned int users)
489	{	489	{
490	unsigned int wake_batch;	490	unsigned int wake_batch;
		491	unsigned int min_batch;
		492	unsigned int depth = (sbq->sb.depth + users - 1) / users;
491		493
492	wake_batch = clamp_val((sbq->sb.depth + users - 1) /	494	min_batch = sbq->sb.depth >= (4 * SBQ_WAIT_QUEUES) ? 4 : 1;
493	users, 4, SBQ_WAKE_BATCH);	495
		496	wake_batch = clamp_val(depth / SBQ_WAIT_QUEUES,
		497	min_batch, SBQ_WAKE_BATCH);
494	__sbitmap_queue_update_wake_batch(sbq, wake_batch);	498	__sbitmap_queue_update_wake_batch(sbq, wake_batch);
495	}	499	}
496	EXPORT_SYMBOL_GPL(sbitmap_queue_recalculate_wake_batch);	500	EXPORT_SYMBOL_GPL(sbitmap_queue_recalculate_wake_batch);

lib/test_kasan.c+5−0

 	ptr = kmalloc(size, GFP_KERNEL);
 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr);
+	OPTIMIZER_HIDE_VAR(ptr);
 	OPTIMIZER_HIDE_VAR(size);
 	KUNIT_EXPECT_KASAN_FAIL(test,
 				memset(ptr, 0, size + KASAN_GRANULE_SIZE));
 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr);
 	memset((char *)ptr, 0, 64);
+	OPTIMIZER_HIDE_VAR(ptr);
 	OPTIMIZER_HIDE_VAR(invalid_size);
 	KUNIT_EXPECT_KASAN_FAIL(test,
 		memmove((char *)ptr, (char *)ptr + 4, invalid_size));
 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr);
 	memset((char *)ptr, 0, 64);
+	OPTIMIZER_HIDE_VAR(ptr);
 	KUNIT_EXPECT_KASAN_FAIL(test,
 		memmove((char *)ptr, (char *)ptr + 4, invalid_size));
 	kfree(ptr);
 	ptr = kmalloc(size, GFP_KERNEL | __GFP_ZERO);
 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr);
+	OPTIMIZER_HIDE_VAR(ptr);
 	OPTIMIZER_HIDE_VAR(size);
 	KUNIT_EXPECT_KASAN_FAIL(test,
 		kasan_ptr_result = memchr(ptr, '1', size + 1));
 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr);
 	memset(arr, 0, sizeof(arr));
+	OPTIMIZER_HIDE_VAR(ptr);
 	OPTIMIZER_HIDE_VAR(size);
 	KUNIT_EXPECT_KASAN_FAIL(test,
 		kasan_int_result = memcmp(ptr, arr, size+1));

mm/gup.c+30−5

@@ -124,8 +124,8 @@ static inline struct page try_get_compound_head(struct page page, int refs) · 123 unmodified lines
124	* considered failure, and furthermore, a likely bug in the caller, so a warning	124	* considered failure, and furthermore, a likely bug in the caller, so a warning
125	* is also emitted.	125	* is also emitted.
126	*/	126	*/
127	struct page try_grab_compound_head(struct page page,	127	__maybe_unused struct page try_grab_compound_head(struct page page,
128	int refs, unsigned int flags)	128	int refs, unsigned int flags)
129	{	129	{
130	if (flags & FOLL_GET)	130	if (flags & FOLL_GET)
131	return try_get_compound_head(page, refs);	131	return try_get_compound_head(page, refs);
@@ -208,10 +208,35 @@ static void put_compound_head(struct page *page, int refs, unsigned int flags) · 76 unmodified lines
208	*/	208	*/
209	bool __must_check try_grab_page(struct page *page, unsigned int flags)	209	bool __must_check try_grab_page(struct page *page, unsigned int flags)
210	{	210	{
211	if (!(flags & (FOLL_GET \| FOLL_PIN)))	211	WARN_ON_ONCE((flags & (FOLL_GET \| FOLL_PIN)) == (FOLL_GET \| FOLL_PIN));
212	return true;
213		212
214	return try_grab_compound_head(page, 1, flags);	213	if (flags & FOLL_GET)
		214	return try_get_page(page);
		215	else if (flags & FOLL_PIN) {
		216	int refs = 1;
		217
		218	page = compound_head(page);
		219
		220	if (WARN_ON_ONCE(page_ref_count(page) <= 0))
		221	return false;
		222
		223	if (hpage_pincount_available(page))
		224	hpage_pincount_add(page, 1);
		225	else
		226	refs = GUP_PIN_COUNTING_BIAS;
		227
		228	/*
		229	* Similar to try_grab_compound_head(): even if using the
		230	* hpage_pincount_add/_sub() routines, be sure to
		231	* also increment the normal page refcount field at least
		232	* once, so that the page really is pinned.
		233	*/
		234	page_ref_add(page, refs);
		235
		236	mod_node_page_state(page_pgdat(page), NR_FOLL_PIN_ACQUIRED, 1);
		237	}
		238
		239	return true;
215	}	240	}
216		241
217	/**	242	/**

mm/memory-failure.c+6−0

 		goto out;
 	}
+	/*
+	 * Pages instantiated by device-dax (not filesystem-dax)
+	 * may be compound pages.
+	 */
+	page = compound_head(page);
 	/*
 	 * Prevent the inode from being freed while we are interrogating
 	 * the address_space, typically this would be handled by

net/ax25/af_ax25.c+16−7

@@ -77,6 +77,7 @@ static void ax25_kill_by_device(struct net_device *dev) · 76 unmodified lines
77	{	77	{
78	ax25_dev *ax25_dev;	78	ax25_dev *ax25_dev;
79	ax25_cb *s;	79	ax25_cb *s;
		80	struct sock *sk;
80		81
81	if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL)	82	if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL)
82	return;	83	return;
@@ -85,13 +86,16 @@ static void ax25_kill_by_device(struct net_device *dev) · 2 unmodified lines
85	again:	86	again:
86	ax25_for_each(s, &ax25_list) {	87	ax25_for_each(s, &ax25_list) {
87	if (s->ax25_dev == ax25_dev) {	88	if (s->ax25_dev == ax25_dev) {
		89	sk = s->sk;
		90	sock_hold(sk);
88	spin_unlock_bh(&ax25_list_lock);	91	spin_unlock_bh(&ax25_list_lock);
89	lock_sock(s->sk);	92	lock_sock(sk);
90	s->ax25_dev = NULL;	93	s->ax25_dev = NULL;
91	release_sock(s->sk);	94	ax25_dev_put(ax25_dev);
		95	release_sock(sk);
92	ax25_disconnect(s, ENETUNREACH);	96	ax25_disconnect(s, ENETUNREACH);
93	spin_lock_bh(&ax25_list_lock);	97	spin_lock_bh(&ax25_list_lock);
94		98	sock_put(sk);
95	/* The entry could have been deleted from the	99	/* The entry could have been deleted from the
96	* list meanwhile and thus the next pointer is	100	* list meanwhile and thus the next pointer is
97	* no longer valid. Play it safe and restart	101	* no longer valid. Play it safe and restart
@@ -355,21 +359,25 @@ static int ax25_ctl_ioctl(const unsigned int cmd, void __user *arg) · 257 unmodified lines
355	if (copy_from_user(&ax25_ctl, arg, sizeof(ax25_ctl)))	359	if (copy_from_user(&ax25_ctl, arg, sizeof(ax25_ctl)))
356	return -EFAULT;	360	return -EFAULT;
357		361
358	if ((ax25_dev = ax25_addr_ax25dev(&ax25_ctl.port_addr)) == NULL)
359	return -ENODEV;
360
361	if (ax25_ctl.digi_count > AX25_MAX_DIGIS)	362	if (ax25_ctl.digi_count > AX25_MAX_DIGIS)
362	return -EINVAL;	363	return -EINVAL;
363		364
364	if (ax25_ctl.arg > ULONG_MAX / HZ && ax25_ctl.cmd != AX25_KILL)	365	if (ax25_ctl.arg > ULONG_MAX / HZ && ax25_ctl.cmd != AX25_KILL)
365	return -EINVAL;	366	return -EINVAL;
366		367
		368	ax25_dev = ax25_addr_ax25dev(&ax25_ctl.port_addr);
		369	if (!ax25_dev)
		370	return -ENODEV;
		371
367	digi.ndigi = ax25_ctl.digi_count;	372	digi.ndigi = ax25_ctl.digi_count;
368	for (k = 0; k < digi.ndigi; k++)	373	for (k = 0; k < digi.ndigi; k++)
369	digi.calls[k] = ax25_ctl.digi_addr[k];	374	digi.calls[k] = ax25_ctl.digi_addr[k];
370		375
371	if ((ax25 = ax25_find_cb(&ax25_ctl.source_addr, &ax25_ctl.dest_addr, &digi, ax25_dev->dev)) == NULL)	376	ax25 = ax25_find_cb(&ax25_ctl.source_addr, &ax25_ctl.dest_addr, &digi, ax25_dev->dev);
		377	if (!ax25) {
		378	ax25_dev_put(ax25_dev);
372	return -ENOTCONN;	379	return -ENOTCONN;
		380	}
373		381
374	switch (ax25_ctl.cmd) {	382	switch (ax25_ctl.cmd) {
375	case AX25_KILL:	383	case AX25_KILL:
@@ -436,6 +444,7 @@ static int ax25_ctl_ioctl(const unsigned int cmd, void __user *arg) · 60 unmodified lines
436	}	444	}
437		445
438	out_put:	446	out_put:
		447	ax25_dev_put(ax25_dev);
439	ax25_cb_put(ax25);	448	ax25_cb_put(ax25);
440	return ret;	449	return ret;
441		450

net/ax25/ax25_dev.c+23−5

 	for (ax25_dev = ax25_dev_list; ax25_dev != NULL; ax25_dev = ax25_dev->next)
 		if (ax25cmp(addr, (const ax25_address *)ax25_dev->dev->dev_addr) == 0) {
 			res = ax25_dev;
+			ax25_dev_hold(ax25_dev);
 		}
 	spin_unlock_bh(&ax25_dev_lock);
 		return;
 	}
+	refcount_set(&ax25_dev->refcount, 1);
 	dev->ax25_ptr     = ax25_dev;
 	ax25_dev->dev     = dev;
 	dev_hold_track(dev, &ax25_dev->dev_tracker, GFP_ATOMIC);
 	ax25_dev->next = ax25_dev_list;
 	ax25_dev_list  = ax25_dev;
 	spin_unlock_bh(&ax25_dev_lock);
+	ax25_dev_hold(ax25_dev);
 	ax25_register_dev_sysctl(ax25_dev);
 }
 	if ((s = ax25_dev_list) == ax25_dev) {
 		ax25_dev_list = s->next;
 		spin_unlock_bh(&ax25_dev_lock);
+		ax25_dev_put(ax25_dev);
 		dev->ax25_ptr = NULL;
 		dev_put_track(dev, &ax25_dev->dev_tracker);
-		kfree(ax25_dev);
+		ax25_dev_put(ax25_dev);
 		return;
 	}
 		if (s->next == ax25_dev) {
 			s->next = ax25_dev->next;
 			spin_unlock_bh(&ax25_dev_lock);
+			ax25_dev_put(ax25_dev);
 			dev->ax25_ptr = NULL;
 			dev_put_track(dev, &ax25_dev->dev_tracker);
-			kfree(ax25_dev);
+			ax25_dev_put(ax25_dev);
 			return;
 		}
 	}
 	spin_unlock_bh(&ax25_dev_lock);
 	dev->ax25_ptr = NULL;
+	ax25_dev_put(ax25_dev);
 }
 int ax25_fwd_ioctl(unsigned int cmd, struct ax25_fwd_struct *fwd)
 	switch (cmd) {
 	case SIOCAX25ADDFWD:
-		if ((fwd_dev = ax25_addr_ax25dev(&fwd->port_to)) == NULL)
+		fwd_dev = ax25_addr_ax25dev(&fwd->port_to);
+		if (!fwd_dev) {
+			ax25_dev_put(ax25_dev);
 			return -EINVAL;
-		if (ax25_dev->forward != NULL)
+		}
+		if (ax25_dev->forward) {
+			ax25_dev_put(fwd_dev);
+			ax25_dev_put(ax25_dev);
 			return -EINVAL;
+		}
 		ax25_dev->forward = fwd_dev->dev;
+		ax25_dev_put(fwd_dev);
+		ax25_dev_put(ax25_dev);
 		break;
 	case SIOCAX25DELFWD:
-		if (ax25_dev->forward == NULL)
+		if (!ax25_dev->forward) {
+			ax25_dev_put(ax25_dev);
 			return -EINVAL;
+		}
 		ax25_dev->forward = NULL;
+		ax25_dev_put(ax25_dev);
 		break;
 	default:
+		ax25_dev_put(ax25_dev);
 		return -EINVAL;
 	}

net/ax25/ax25_route.c+11−2

 	ax25_dev *ax25_dev;
 	int i;
-	if ((ax25_dev = ax25_addr_ax25dev(&route->port_addr)) == NULL)
-		return -EINVAL;
 	if (route->digi_count > AX25_MAX_DIGIS)
 		return -EINVAL;
+	ax25_dev = ax25_addr_ax25dev(&route->port_addr);
+	if (!ax25_dev)
+		return -EINVAL;
 	write_lock_bh(&ax25_route_lock);
 	ax25_rt = ax25_route_list;
 			if (route->digi_count != 0) {
 				if ((ax25_rt->digipeat = kmalloc(sizeof(ax25_digi), GFP_ATOMIC)) == NULL) {
 					write_unlock_bh(&ax25_route_lock);
+					ax25_dev_put(ax25_dev);
 					return -ENOMEM;
 				}
 				ax25_rt->digipeat->lastrepeat = -1;
 				}
 			}
 			write_unlock_bh(&ax25_route_lock);
+			ax25_dev_put(ax25_dev);
 			return 0;
 		}
 		ax25_rt = ax25_rt->next;
 	if ((ax25_rt = kmalloc(sizeof(ax25_route), GFP_ATOMIC)) == NULL) {
 		write_unlock_bh(&ax25_route_lock);
+		ax25_dev_put(ax25_dev);
 		return -ENOMEM;
 	}
 		if ((ax25_rt->digipeat = kmalloc(sizeof(ax25_digi), GFP_ATOMIC)) == NULL) {
 			write_unlock_bh(&ax25_route_lock);
 			kfree(ax25_rt);
+			ax25_dev_put(ax25_dev);
 			return -ENOMEM;
 		}
 		ax25_rt->digipeat->lastrepeat = -1;
 	ax25_rt->next   = ax25_route_list;
 	ax25_route_list = ax25_rt;
 	write_unlock_bh(&ax25_route_lock);
+	ax25_dev_put(ax25_dev);
 	return 0;
 }
 		}
 	}
 	write_unlock_bh(&ax25_route_lock);
+	ax25_dev_put(ax25_dev);
 	return 0;
 }
 out:
 	write_unlock_bh(&ax25_route_lock);
+	ax25_dev_put(ax25_dev);
 	return err;
 }

net/bridge/netfilter/nft_reject_bridge.c+4−4

@@ -49,7 +49,7 @@ static void nft_reject_br_send_v4_tcp_reset(struct net *net, · 48 unmodified lines
49	{	49	{
50	struct sk_buff *nskb;	50	struct sk_buff *nskb;
51		51
52	nskb = nf_reject_skb_v4_tcp_reset(net, oldskb, dev, hook);	52	nskb = nf_reject_skb_v4_tcp_reset(net, oldskb, NULL, hook);
53	if (!nskb)	53	if (!nskb)
54	return;	54	return;
55		55
@@ -65,7 +65,7 @@ static void nft_reject_br_send_v4_unreach(struct net *net, · 9 unmodified lines
65	{	65	{
66	struct sk_buff *nskb;	66	struct sk_buff *nskb;
67		67
68	nskb = nf_reject_skb_v4_unreach(net, oldskb, dev, hook, code);	68	nskb = nf_reject_skb_v4_unreach(net, oldskb, NULL, hook, code);
69	if (!nskb)	69	if (!nskb)
70	return;	70	return;
71		71
@@ -81,7 +81,7 @@ static void nft_reject_br_send_v6_tcp_reset(struct net *net, · 9 unmodified lines
81	{	81	{
82	struct sk_buff *nskb;	82	struct sk_buff *nskb;
83		83
84	nskb = nf_reject_skb_v6_tcp_reset(net, oldskb, dev, hook);	84	nskb = nf_reject_skb_v6_tcp_reset(net, oldskb, NULL, hook);
85	if (!nskb)	85	if (!nskb)
86	return;	86	return;
87		87
@@ -98,7 +98,7 @@ static void nft_reject_br_send_v6_unreach(struct net *net, · 10 unmodified lines
98	{	98	{
99	struct sk_buff *nskb;	99	struct sk_buff *nskb;
100		100
101	nskb = nf_reject_skb_v6_unreach(net, oldskb, dev, hook, code);	101	nskb = nf_reject_skb_v6_unreach(net, oldskb, NULL, hook, code);
102	if (!nskb)	102	if (!nskb)
103	return;	103	return;
104		104

net/core/neighbour.c+12−6

 	neigh_release(neigh);
 }
-int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
+int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb,
+		       const bool immediate_ok)
 {
 	int rc;
 	bool immediate_probe = false;
 			atomic_set(&neigh->probes,
 				   NEIGH_VAR(neigh->parms, UCAST_PROBES));
 			neigh_del_timer(neigh);
-			neigh->nud_state     = NUD_INCOMPLETE;
+			neigh->nud_state = NUD_INCOMPLETE;
 			neigh->updated = now;
-			next = now + max(NEIGH_VAR(neigh->parms, RETRANS_TIME),
+			if (!immediate_ok) {
-					 HZ/100);
+				next = now + 1;
+			} else {
+				immediate_probe = true;
+				next = now + max(NEIGH_VAR(neigh->parms,
+							   RETRANS_TIME),
+						 HZ / 100);
+			}
 			neigh_add_timer(neigh, next);
-			immediate_probe = true;
 		} else {
 			neigh->nud_state = NUD_FAILED;
 			neigh->updated = jiffies;
 	write_lock_bh(&tbl->lock);
 	list_for_each_entry(neigh, &tbl->managed_list, managed_list)
-		neigh_event_send(neigh, NULL);
+		neigh_event_send_probe(neigh, NULL, false);
 	queue_delayed_work(system_power_efficient_wq, &tbl->managed_work,
 			   NEIGH_VAR(&tbl->parms, DELAY_PROBE_TIME));
 	write_unlock_bh(&tbl->lock);

net/core/rtnetlink.c+4−2

 	struct nlattr *slave_attr[RTNL_SLAVE_MAX_TYPE + 1];
 	unsigned char name_assign_type = NET_NAME_USER;
 	struct nlattr *linkinfo[IFLA_INFO_MAX + 1];
-	const struct rtnl_link_ops *m_ops = NULL;
+	const struct rtnl_link_ops *m_ops;
-	struct net_device *master_dev = NULL;
+	struct net_device *master_dev;
 	struct net *net = sock_net(skb->sk);
 	const struct rtnl_link_ops *ops;
 	struct nlattr *tb[IFLA_MAX + 1];
 	else
 		dev = NULL;
+	master_dev = NULL;
+	m_ops = NULL;
 	if (dev) {
 		master_dev = netdev_master_upper_dev_get(dev);
 		if (master_dev)

net/ieee802154/nl802154.c+4−4

@@ -1441,7 +1441,7 @@ static int nl802154_send_key(struct sk_buff *msg, u32 cmd, u32 portid, · 1440 unmodified lines
1441		1441
1442	hdr = nl802154hdr_put(msg, portid, seq, flags, cmd);	1442	hdr = nl802154hdr_put(msg, portid, seq, flags, cmd);
1443	if (!hdr)	1443	if (!hdr)
1444	return -1;	1444	return -ENOBUFS;
1445		1445
1446	if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev->ifindex))	1446	if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev->ifindex))
1447	goto nla_put_failure;	1447	goto nla_put_failure;
@@ -1634,7 +1634,7 @@ static int nl802154_send_device(struct sk_buff *msg, u32 cmd, u32 portid, · 186 unmodified lines
1634		1634
1635	hdr = nl802154hdr_put(msg, portid, seq, flags, cmd);	1635	hdr = nl802154hdr_put(msg, portid, seq, flags, cmd);
1636	if (!hdr)	1636	if (!hdr)
1637	return -1;	1637	return -ENOBUFS;
1638		1638
1639	if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev->ifindex))	1639	if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev->ifindex))
1640	goto nla_put_failure;	1640	goto nla_put_failure;
@@ -1812,7 +1812,7 @@ static int nl802154_send_devkey(struct sk_buff *msg, u32 cmd, u32 portid, · 171 unmodified lines
1812		1812
1813	hdr = nl802154hdr_put(msg, portid, seq, flags, cmd);	1813	hdr = nl802154hdr_put(msg, portid, seq, flags, cmd);
1814	if (!hdr)	1814	if (!hdr)
1815	return -1;	1815	return -ENOBUFS;
1816		1816
1817	if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev->ifindex))	1817	if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev->ifindex))
1818	goto nla_put_failure;	1818	goto nla_put_failure;
@@ -1988,7 +1988,7 @@ static int nl802154_send_seclevel(struct sk_buff *msg, u32 cmd, u32 portid, · 169 unmodified lines
1988		1988
1989	hdr = nl802154hdr_put(msg, portid, seq, flags, cmd);	1989	hdr = nl802154hdr_put(msg, portid, seq, flags, cmd);
1990	if (!hdr)	1990	if (!hdr)
1991	return -1;	1991	return -ENOBUFS;
1992		1992
1993	if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev->ifindex))	1993	if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev->ifindex))
1994	goto nla_put_failure;	1994	goto nla_put_failure;

net/ipv4/netfilter/Kconfig+0−4

@@ -58,10 +58,6 @@ config NF_TABLES_ARP · 57 unmodified lines
58		58
59	endif # NF_TABLES	59	endif # NF_TABLES
60		60
61	config NF_FLOW_TABLE_IPV4
62	tristate
63	select NF_FLOW_TABLE_INET
64
65	config NF_DUP_IPV4	61	config NF_DUP_IPV4
66	tristate "Netfilter IPv4 packet duplication to alternate destination"	62	tristate "Netfilter IPv4 packet duplication to alternate destination"
67	depends on !NF_CONNTRACK \|\| NF_CONNTRACK	63	depends on !NF_CONNTRACK \|\| NF_CONNTRACK

net/ipv4/tcp.c+5−2

 			/* skb changing from pure zc to mixed, must charge zc */
 			if (unlikely(skb_zcopy_pure(skb))) {
-				if (!sk_wmem_schedule(sk, skb->data_len))
+				u32 extra = skb->truesize -
+					    SKB_TRUESIZE(skb_end_offset(skb));
+				if (!sk_wmem_schedule(sk, extra))
 					goto wait_for_space;
-				sk_mem_charge(sk, skb->data_len);
+				sk_mem_charge(sk, extra);
 				skb_shinfo(skb)->flags &= ~SKBFL_PURE_ZEROCOPY;
 			}

net/ipv4/tcp_input.c+2−0

@@ -1660,6 +1660,8 @@ static struct sk_buff tcp_shift_skb_data(struct sock sk, struct sk_buff *skb, · 1659 unmodified lines
1660	(mss != tcp_skb_seglen(skb)))	1660	(mss != tcp_skb_seglen(skb)))
1661	goto out;	1661	goto out;
1662		1662
		1663	if (!tcp_skb_can_collapse(prev, skb))
		1664	goto out;
1663	len = skb->len;	1665	len = skb->len;
1664	pcount = tcp_skb_pcount(skb);	1666	pcount = tcp_skb_pcount(skb);
1665	if (tcp_skb_shift(prev, skb, pcount, len))	1667	if (tcp_skb_shift(prev, skb, pcount, len))

net/ipv6/netfilter/Kconfig+0−4

 endif # NF_TABLES_IPV6
 endif # NF_TABLES
-config NF_FLOW_TABLE_IPV6
-	tristate
-	select NF_FLOW_TABLE_INET
 config NF_DUP_IPV6
 	tristate "Netfilter IPv6 packet duplication to alternate destination"
 	depends on !NF_CONNTRACK || NF_CONNTRACK

net/ipv6/netfilter/Makefile+0−3

@@ -28,9 +28,6 @@ obj-$(CONFIG_NFT_REJECT_IPV6) += nft_reject_ipv6.o · 27 unmodified lines
28	obj-$(CONFIG_NFT_DUP_IPV6) += nft_dup_ipv6.o	28	obj-$(CONFIG_NFT_DUP_IPV6) += nft_dup_ipv6.o
29	obj-$(CONFIG_NFT_FIB_IPV6) += nft_fib_ipv6.o	29	obj-$(CONFIG_NFT_FIB_IPV6) += nft_fib_ipv6.o
30		30
31	# flow table support
32	obj-$(CONFIG_NF_FLOW_TABLE_IPV6) += nf_flow_table_ipv6.o
33
34	# matches	31	# matches
35	obj-$(CONFIG_IP6_NF_MATCH_AH) += ip6t_ah.o	32	obj-$(CONFIG_IP6_NF_MATCH_AH) += ip6t_ah.o
36	obj-$(CONFIG_IP6_NF_MATCH_EUI64) += ip6t_eui64.o	33	obj-$(CONFIG_IP6_NF_MATCH_EUI64) += ip6t_eui64.o

net/ipv6/netfilter/nf_flow_table_ipv6.c+0−0

Empty file deleted.

net/netfilter/nf_tables_api.c+0−1

@@ -2011,7 +2011,6 @@ static void nft_last_rule(struct nft_rule_blob blob, const void ptr) · 2010 unmodified lines
2011		2011
2012	prule = (struct nft_rule_dp *)ptr;	2012	prule = (struct nft_rule_dp *)ptr;
2013	prule->is_last = 1;	2013	prule->is_last = 1;
2014	ptr += offsetof(struct nft_rule_dp, data);
2015	/* blob size does not include the trailer rule */	2014	/* blob size does not include the trailer rule */
2016	}	2015	}
2017		2016

net/netfilter/nft_byteorder.c+12−0

 	return -1;
 }
+static bool nft_byteorder_reduce(struct nft_regs_track *track,
+				 const struct nft_expr *expr)
+{
+	struct nft_byteorder *priv = nft_expr_priv(expr);
+	track->regs[priv->dreg].selector = NULL;
+	track->regs[priv->dreg].bitwise = NULL;
+	return false;
+}
 static const struct nft_expr_ops nft_byteorder_ops = {
 	.type		= &nft_byteorder_type,
 	.size		= NFT_EXPR_SIZE(sizeof(struct nft_byteorder)),
 	.eval		= nft_byteorder_eval,
 	.init		= nft_byteorder_init,
 	.dump		= nft_byteorder_dump,
+	.reduce		= nft_byteorder_reduce,
 };
 struct nft_expr_type nft_byteorder_type __read_mostly = {

net/netfilter/nft_ct.c+4−1

 	ct = this_cpu_read(nft_ct_pcpu_template);
 	if (likely(refcount_read(&ct->ct_general.use) == 1)) {
+		refcount_inc(&ct->ct_general.use);
 		nf_ct_zone_add(ct, &zone);
 	} else {
-		/* previous skb got queued to userspace */
+		/* previous skb got queued to userspace, allocate temporary
+		 * one until percpu template can be reused.
+		 */
 		ct = nf_ct_tmpl_alloc(nft_net(pkt), &zone, GFP_ATOMIC);
 		if (!ct) {
 			regs->verdict.code = NF_DROP;

net/packet/af_packet.c+6−2

@@ -1789,7 +1789,10 @@ static int fanout_add(struct sock sk, struct fanout_args args) · 1788 unmodified lines
1789	err = -ENOSPC;	1789	err = -ENOSPC;
1790	if (refcount_read(&match->sk_ref) < match->max_num_members) {	1790	if (refcount_read(&match->sk_ref) < match->max_num_members) {
1791	__dev_remove_pack(&po->prot_hook);	1791	__dev_remove_pack(&po->prot_hook);
1792	po->fanout = match;	1792
		1793	/* Paired with packet_setsockopt(PACKET_FANOUT_DATA) */
		1794	WRITE_ONCE(po->fanout, match);
		1795
1793	po->rollover = rollover;	1796	po->rollover = rollover;
1794	rollover = NULL;	1797	rollover = NULL;
1795	refcount_set(&match->sk_ref, refcount_read(&match->sk_ref) + 1);	1798	refcount_set(&match->sk_ref, refcount_read(&match->sk_ref) + 1);
@@ -3934,7 +3937,8 @@ packet_setsockopt(struct socket *sock, int level, int optname, sockptr_t optval, · 2138 unmodified lines
3934	}	3937	}
3935	case PACKET_FANOUT_DATA:	3938	case PACKET_FANOUT_DATA:
3936	{	3939	{
3937	if (!po->fanout)	3940	/* Paired with the WRITE_ONCE() in fanout_add() */
		3941	if (!READ_ONCE(po->fanout))
3938	return -EINVAL;	3942	return -EINVAL;
3939		3943
3940	return fanout_set_data(po, optval, optlen);	3944	return fanout_set_data(po, optval, optlen);

net/sched/cls_api.c+7−4

 	bool prio_allocate;
 	u32 parent;
 	u32 chain_index;
-	struct Qdisc *q = NULL;
+	struct Qdisc *q;
 	struct tcf_chain_info chain_info;
-	struct tcf_chain *chain = NULL;
+	struct tcf_chain *chain;
 	struct tcf_block *block;
 	struct tcf_proto *tp;
 	unsigned long cl;
 	tp = NULL;
 	cl = 0;
 	block = NULL;
+	q = NULL;
+	chain = NULL;
 	flags = 0;
 	if (prio == 0) {
 	struct tcmsg *t;
 	u32 parent;
 	u32 chain_index;
-	struct Qdisc *q = NULL;
+	struct Qdisc *q;
-	struct tcf_chain *chain = NULL;
+	struct tcf_chain *chain;
 	struct tcf_block *block;
 	unsigned long cl;
 	int err;
 		return -EPERM;
 replay:
+	q = NULL;
 	err = nlmsg_parse_deprecated(n, sizeof(*t), tca, TCA_MAX,
 				     rtm_tca_policy, extack);
 	if (err < 0)

net/smc/af_smc.c+118−15

@@ -566,17 +566,115 @@ static void smc_stat_fallback(struct smc_sock *smc) · 565 unmodified lines
566	mutex_unlock(&net->smc.mutex_fback_rsn);	566	mutex_unlock(&net->smc.mutex_fback_rsn);
567	}	567	}
568		568
		569	/* must be called under rcu read lock */
		570	static void smc_fback_wakeup_waitqueue(struct smc_sock smc, void key)
		571	{
		572	struct socket_wq *wq;
		573	__poll_t flags;
		574
		575	wq = rcu_dereference(smc->sk.sk_wq);
		576	if (!skwq_has_sleeper(wq))
		577	return;
		578
		579	/* wake up smc sk->sk_wq */
		580	if (!key) {
		581	/* sk_state_change */
		582	wake_up_interruptible_all(&wq->wait);
		583	} else {
		584	flags = key_to_poll(key);
		585	if (flags & (EPOLLIN \| EPOLLOUT))
		586	/* sk_data_ready or sk_write_space */
		587	wake_up_interruptible_sync_poll(&wq->wait, flags);
		588	else if (flags & EPOLLERR)
		589	/* sk_error_report */
		590	wake_up_interruptible_poll(&wq->wait, flags);
		591	}
		592	}
		593
		594	static int smc_fback_mark_woken(wait_queue_entry_t *wait,
		595	unsigned int mode, int sync, void *key)
		596	{
		597	struct smc_mark_woken *mark =
		598	container_of(wait, struct smc_mark_woken, wait_entry);
		599
		600	mark->woken = true;
		601	mark->key = key;
		602	return 0;
		603	}
		604
		605	static void smc_fback_forward_wakeup(struct smc_sock smc, struct sock clcsk,
		606	void (clcsock_callback)(struct sock sk))
		607	{
		608	struct smc_mark_woken mark = { .woken = false };
		609	struct socket_wq *wq;
		610
		611	init_waitqueue_func_entry(&mark.wait_entry,
		612	smc_fback_mark_woken);
		613	rcu_read_lock();
		614	wq = rcu_dereference(clcsk->sk_wq);
		615	if (!wq)
		616	goto out;
		617	add_wait_queue(sk_sleep(clcsk), &mark.wait_entry);
		618	clcsock_callback(clcsk);
		619	remove_wait_queue(sk_sleep(clcsk), &mark.wait_entry);
		620
		621	if (mark.woken)
		622	smc_fback_wakeup_waitqueue(smc, mark.key);
		623	out:
		624	rcu_read_unlock();
		625	}
		626
		627	static void smc_fback_state_change(struct sock *clcsk)
		628	{
		629	struct smc_sock *smc =
		630	smc_clcsock_user_data(clcsk);
		631
		632	if (!smc)
		633	return;
		634	smc_fback_forward_wakeup(smc, clcsk, smc->clcsk_state_change);
		635	}
		636
		637	static void smc_fback_data_ready(struct sock *clcsk)
		638	{
		639	struct smc_sock *smc =
		640	smc_clcsock_user_data(clcsk);
		641
		642	if (!smc)
		643	return;
		644	smc_fback_forward_wakeup(smc, clcsk, smc->clcsk_data_ready);
		645	}
		646
		647	static void smc_fback_write_space(struct sock *clcsk)
		648	{
		649	struct smc_sock *smc =
		650	smc_clcsock_user_data(clcsk);
		651
		652	if (!smc)
		653	return;
		654	smc_fback_forward_wakeup(smc, clcsk, smc->clcsk_write_space);
		655	}
		656
		657	static void smc_fback_error_report(struct sock *clcsk)
		658	{
		659	struct smc_sock *smc =
		660	smc_clcsock_user_data(clcsk);
		661
		662	if (!smc)
		663	return;
		664	smc_fback_forward_wakeup(smc, clcsk, smc->clcsk_error_report);
		665	}
		666
569	static int smc_switch_to_fallback(struct smc_sock *smc, int reason_code)	667	static int smc_switch_to_fallback(struct smc_sock *smc, int reason_code)
570	{	668	{
571	wait_queue_head_t *smc_wait = sk_sleep(&smc->sk);	669	struct sock *clcsk;
572	wait_queue_head_t *clc_wait;
573	unsigned long flags;
574		670
575	mutex_lock(&smc->clcsock_release_lock);	671	mutex_lock(&smc->clcsock_release_lock);
576	if (!smc->clcsock) {	672	if (!smc->clcsock) {
577	mutex_unlock(&smc->clcsock_release_lock);	673	mutex_unlock(&smc->clcsock_release_lock);
578	return -EBADF;	674	return -EBADF;
579	}	675	}
		676	clcsk = smc->clcsock->sk;
		677
580	smc->use_fallback = true;	678	smc->use_fallback = true;
581	smc->fallback_rsn = reason_code;	679	smc->fallback_rsn = reason_code;
582	smc_stat_fallback(smc);	680	smc_stat_fallback(smc);
@@ -587,16 +685,22 @@ static int smc_switch_to_fallback(struct smc_sock *smc, int reason_code) · 4 unmodified lines
587	smc->clcsock->wq.fasync_list =	685	smc->clcsock->wq.fasync_list =
588	smc->sk.sk_socket->wq.fasync_list;	686	smc->sk.sk_socket->wq.fasync_list;
589		687
590	/* There may be some entries remaining in	688	/* There might be some wait entries remaining
591	* smc socket->wq, which should be removed	689	* in smc sk->sk_wq and they should be woken up
592	* to clcsocket->wq during the fallback.	690	* as clcsock's wait queue is woken up.
593	*/	691	*/
594	clc_wait = sk_sleep(smc->clcsock->sk);	692	smc->clcsk_state_change = clcsk->sk_state_change;
595	spin_lock_irqsave(&smc_wait->lock, flags);	693	smc->clcsk_data_ready = clcsk->sk_data_ready;
596	spin_lock_nested(&clc_wait->lock, SINGLE_DEPTH_NESTING);	694	smc->clcsk_write_space = clcsk->sk_write_space;
597	list_splice_init(&smc_wait->head, &clc_wait->head);	695	smc->clcsk_error_report = clcsk->sk_error_report;
598	spin_unlock(&clc_wait->lock);	696
599	spin_unlock_irqrestore(&smc_wait->lock, flags);	697	clcsk->sk_state_change = smc_fback_state_change;
		698	clcsk->sk_data_ready = smc_fback_data_ready;
		699	clcsk->sk_write_space = smc_fback_write_space;
		700	clcsk->sk_error_report = smc_fback_error_report;
		701
		702	smc->clcsock->sk->sk_user_data =
		703	(void *)((uintptr_t)smc \| SK_USER_DATA_NOCOPY);
600	}	704	}
601	mutex_unlock(&smc->clcsock_release_lock);	705	mutex_unlock(&smc->clcsock_release_lock);
602	return 0;	706	return 0;
@@ -2115,10 +2219,9 @@ out: · 1512 unmodified lines
2115		2219
2116	static void smc_clcsock_data_ready(struct sock *listen_clcsock)	2220	static void smc_clcsock_data_ready(struct sock *listen_clcsock)
2117	{	2221	{
2118	struct smc_sock *lsmc;	2222	struct smc_sock *lsmc =
		2223	smc_clcsock_user_data(listen_clcsock);
2119		2224
2120	lsmc = (struct smc_sock *)
2121	((uintptr_t)listen_clcsock->sk_user_data & ~SK_USER_DATA_NOCOPY);
2122	if (!lsmc)	2225	if (!lsmc)
2123	return;	2226	return;
2124	lsmc->clcsk_data_ready(listen_clcsock);	2227	lsmc->clcsk_data_ready(listen_clcsock);

net/smc/smc.h+19−1

 	SMC_URG_READ	= 3,			/* data was already read */
 };
+struct smc_mark_woken {
+	bool woken;
+	void *key;
+	wait_queue_entry_t wait_entry;
+};
 struct smc_connection {
 	struct rb_node		alert_node;
 	struct smc_link_group	*lgr;		/* link group of connection */
 struct smc_sock {				/* smc sock container */
 	struct sock		sk;
 	struct socket		*clcsock;	/* internal tcp socket */
+	void			(*clcsk_state_change)(struct sock *sk);
+						/* original stat_change fct. */
 	void			(*clcsk_data_ready)(struct sock *sk);
-						/* original data_ready fct. **/
+						/* original data_ready fct. */
+	void			(*clcsk_write_space)(struct sock *sk);
+						/* original write_space fct. */
+	void			(*clcsk_error_report)(struct sock *sk);
+						/* original error_report fct. */
 	struct smc_connection	conn;		/* smc connection */
 	struct smc_sock		*listen_smc;	/* listen parent */
 	struct work_struct	connect_work;	/* handle non-blocking connect*/
 	return (struct smc_sock *)sk;
 }
+static inline struct smc_sock *smc_clcsock_user_data(struct sock *clcsk)
+{
+	return (struct smc_sock *)
+	       ((uintptr_t)clcsk->sk_user_data & ~SK_USER_DATA_NOCOPY);
+}
 extern struct workqueue_struct	*smc_hs_wq;	/* wq for handshake work */
 extern struct workqueue_struct	*smc_close_wq;	/* wq for close work */

net/smc/smc_diag.c+0−2

 	    (req->diag_ext & (1 << (SMC_DIAG_LGRINFO - 1))) &&
 	    !list_empty(&smc->conn.lgr->list)) {
 		struct smc_link *link = smc->conn.lnk;
-		struct net *net = read_pnet(&link->smcibdev->ibdev->coredev.rdma_net);
 		struct smc_diag_lgrinfo linfo = {
 			.role = smc->conn.lgr->role,
 			.lnk[0].ibport = link->ibport,
 			.lnk[0].link_id = link->link_id,
-			.lnk[0].net_cookie = net->net_cookie,
 		};
 		memcpy(linfo.lnk[0].ibname,

net/sunrpc/rpc_pipe.c+2−2

 	dget(dentry);
 	ret = simple_rmdir(dir, dentry);
+	d_drop(dentry);
 	if (!ret)
 		fsnotify_rmdir(dir, dentry);
-	d_delete(dentry);
 	dput(dentry);
 	return ret;
 }
 	dget(dentry);
 	ret = simple_unlink(dir, dentry);
+	d_drop(dentry);
 	if (!ret)
 		fsnotify_unlink(dir, dentry);
-	d_delete(dentry);
 	dput(dentry);
 	return ret;
 }

scripts/Makefile+1−1

@@ -25,7 +25,7 @@ HOSTCFLAGS_sorttable.o += -I$(srctree)/tools/arch/x86/include · 24 unmodified lines
25	HOSTCFLAGS_sorttable.o += -DUNWINDER_ORC_ENABLED	25	HOSTCFLAGS_sorttable.o += -DUNWINDER_ORC_ENABLED
26	endif	26	endif
27		27
28	ifdef CONFIG_DYNAMIC_FTRACE	28	ifdef CONFIG_BUILDTIME_MCOUNT_SORT
29	HOSTCFLAGS_sorttable.o += -DMCOUNT_SORT_ENABLED	29	HOSTCFLAGS_sorttable.o += -DMCOUNT_SORT_ENABLED
30	endif	30	endif
31		31

security/security.c+13−2

@@ -1048,8 +1048,19 @@ int security_dentry_init_security(struct dentry *dentry, int mode, · 1047 unmodified lines
1048	const char xattr_name, void ctx,	1048	const char xattr_name, void ctx,
1049	u32 *ctxlen)	1049	u32 *ctxlen)
1050	{	1050	{
1051	return call_int_hook(dentry_init_security, -EOPNOTSUPP, dentry, mode,	1051	struct security_hook_list *hp;
1052	name, xattr_name, ctx, ctxlen);	1052	int rc;
		1053
		1054	/*
		1055	* Only one module will provide a security context.
		1056	*/
		1057	hlist_for_each_entry(hp, &security_hook_heads.dentry_init_security, list) {
		1058	rc = hp->hook.dentry_init_security(dentry, mode, name,
		1059	xattr_name, ctx, ctxlen);
		1060	if (rc != LSM_RET_DEFAULT(dentry_init_security))
		1061	return rc;
		1062	}
		1063	return LSM_RET_DEFAULT(dentry_init_security);
1053	}	1064	}
1054	EXPORT_SYMBOL(security_dentry_init_security);	1065	EXPORT_SYMBOL(security_dentry_init_security);
1055		1066

security/selinux/ss/conditional.c+2−1

 	for (i = 0; i < p->cond_list_len; i++)
 		cond_node_destroy(&p->cond_list[i]);
 	kfree(p->cond_list);
+	p->cond_list = NULL;
+	p->cond_list_len = 0;
 }
 void cond_policydb_destroy(struct policydb *p)
 	return 0;
 err:
 	cond_list_destroy(p);
-	p->cond_list = NULL;
 	return rc;
 }

tools/arch/x86/include/uapi/asm/kvm.h+3−0

@@ -452,6 +452,9 @@ struct kvm_sync_regs { · 451 unmodified lines
452		452
453	#define KVM_STATE_VMX_PREEMPTION_TIMER_DEADLINE 0x00000001	453	#define KVM_STATE_VMX_PREEMPTION_TIMER_DEADLINE 0x00000001
454		454
		455	/* attributes for system fd (group 0) */
		456	#define KVM_X86_XCOMP_GUEST_SUPP 0
		457
455	struct kvm_vmx_nested_state_data {	458	struct kvm_vmx_nested_state_data {
456	__u8 vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];	459	__u8 vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];
457	__u8 shadow_vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];	460	__u8 shadow_vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];

tools/bpf/resolve_btfids/Makefile+5−1

   msg =
 else
   Q = @
-  msg = @printf '  %-8s %s%s\n' "$(1)" "$(notdir $(2))" "$(if $(3), $(3))";
+  ifeq ($(silent),1)
+    msg =
+  else
+    msg = @printf '  %-8s %s%s\n' "$(1)" "$(notdir $(2))" "$(if $(3), $(3))";
+  endif
   MAKEFLAGS=--no-print-directory
 endif

tools/include/uapi/linux/kvm.h+1−0

@@ -1133,6 +1133,7 @@ struct kvm_ppc_resize_hpt { · 1132 unmodified lines
1133	#define KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM 206	1133	#define KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM 206
1134	#define KVM_CAP_VM_GPA_BITS 207	1134	#define KVM_CAP_VM_GPA_BITS 207
1135	#define KVM_CAP_XSAVE2 208	1135	#define KVM_CAP_XSAVE2 208
		1136	#define KVM_CAP_SYS_ATTRIBUTES 209
1136		1137
1137	#ifdef KVM_CAP_IRQ_ROUTING	1138	#ifdef KVM_CAP_IRQ_ROUTING
1138		1139

tools/include/uapi/linux/lirc.h+0−229

@@ -1,229 +0,0 @@
1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2	/*
3	* lirc.h - linux infrared remote control header file
4	* last modified 2010/07/13 by Jarod Wilson
5	*/
6
7	#ifndef _LINUX_LIRC_H
8	#define _LINUX_LIRC_H
9
10	#include <linux/types.h>
11	#include <linux/ioctl.h>
12
13	#define PULSE_BIT 0x01000000
14	#define PULSE_MASK 0x00FFFFFF
15
16	#define LIRC_MODE2_SPACE 0x00000000
17	#define LIRC_MODE2_PULSE 0x01000000
18	#define LIRC_MODE2_FREQUENCY 0x02000000
19	#define LIRC_MODE2_TIMEOUT 0x03000000
20
21	#define LIRC_VALUE_MASK 0x00FFFFFF
22	#define LIRC_MODE2_MASK 0xFF000000
23
24	#define LIRC_SPACE(val) (((val)&LIRC_VALUE_MASK) \| LIRC_MODE2_SPACE)
25	#define LIRC_PULSE(val) (((val)&LIRC_VALUE_MASK) \| LIRC_MODE2_PULSE)
26	#define LIRC_FREQUENCY(val) (((val)&LIRC_VALUE_MASK) \| LIRC_MODE2_FREQUENCY)
27	#define LIRC_TIMEOUT(val) (((val)&LIRC_VALUE_MASK) \| LIRC_MODE2_TIMEOUT)
28
29	#define LIRC_VALUE(val) ((val)&LIRC_VALUE_MASK)
30	#define LIRC_MODE2(val) ((val)&LIRC_MODE2_MASK)
31
32	#define LIRC_IS_SPACE(val) (LIRC_MODE2(val) == LIRC_MODE2_SPACE)
33	#define LIRC_IS_PULSE(val) (LIRC_MODE2(val) == LIRC_MODE2_PULSE)
34	#define LIRC_IS_FREQUENCY(val) (LIRC_MODE2(val) == LIRC_MODE2_FREQUENCY)
35	#define LIRC_IS_TIMEOUT(val) (LIRC_MODE2(val) == LIRC_MODE2_TIMEOUT)
36
37	/* used heavily by lirc userspace */
38	#define lirc_t int
39
40	/* lirc compatible hardware features */
41
42	#define LIRC_MODE2SEND(x) (x)
43	#define LIRC_SEND2MODE(x) (x)
44	#define LIRC_MODE2REC(x) ((x) << 16)
45	#define LIRC_REC2MODE(x) ((x) >> 16)
46
47	#define LIRC_MODE_RAW 0x00000001
48	#define LIRC_MODE_PULSE 0x00000002
49	#define LIRC_MODE_MODE2 0x00000004
50	#define LIRC_MODE_SCANCODE 0x00000008
51	#define LIRC_MODE_LIRCCODE 0x00000010
52
53
54	#define LIRC_CAN_SEND_RAW LIRC_MODE2SEND(LIRC_MODE_RAW)
55	#define LIRC_CAN_SEND_PULSE LIRC_MODE2SEND(LIRC_MODE_PULSE)
56	#define LIRC_CAN_SEND_MODE2 LIRC_MODE2SEND(LIRC_MODE_MODE2)
57	#define LIRC_CAN_SEND_LIRCCODE LIRC_MODE2SEND(LIRC_MODE_LIRCCODE)
58
59	#define LIRC_CAN_SEND_MASK 0x0000003f
60
61	#define LIRC_CAN_SET_SEND_CARRIER 0x00000100
62	#define LIRC_CAN_SET_SEND_DUTY_CYCLE 0x00000200
63	#define LIRC_CAN_SET_TRANSMITTER_MASK 0x00000400
64
65	#define LIRC_CAN_REC_RAW LIRC_MODE2REC(LIRC_MODE_RAW)
66	#define LIRC_CAN_REC_PULSE LIRC_MODE2REC(LIRC_MODE_PULSE)
67	#define LIRC_CAN_REC_MODE2 LIRC_MODE2REC(LIRC_MODE_MODE2)
68	#define LIRC_CAN_REC_SCANCODE LIRC_MODE2REC(LIRC_MODE_SCANCODE)
69	#define LIRC_CAN_REC_LIRCCODE LIRC_MODE2REC(LIRC_MODE_LIRCCODE)
70
71	#define LIRC_CAN_REC_MASK LIRC_MODE2REC(LIRC_CAN_SEND_MASK)
72
73	#define LIRC_CAN_SET_REC_CARRIER (LIRC_CAN_SET_SEND_CARRIER << 16)
74	#define LIRC_CAN_SET_REC_DUTY_CYCLE (LIRC_CAN_SET_SEND_DUTY_CYCLE << 16)
75
76	#define LIRC_CAN_SET_REC_DUTY_CYCLE_RANGE 0x40000000
77	#define LIRC_CAN_SET_REC_CARRIER_RANGE 0x80000000
78	#define LIRC_CAN_GET_REC_RESOLUTION 0x20000000
79	#define LIRC_CAN_SET_REC_TIMEOUT 0x10000000
80	#define LIRC_CAN_SET_REC_FILTER 0x08000000
81
82	#define LIRC_CAN_MEASURE_CARRIER 0x02000000
83	#define LIRC_CAN_USE_WIDEBAND_RECEIVER 0x04000000
84
85	#define LIRC_CAN_SEND(x) ((x)&LIRC_CAN_SEND_MASK)
86	#define LIRC_CAN_REC(x) ((x)&LIRC_CAN_REC_MASK)
87
88	#define LIRC_CAN_NOTIFY_DECODE 0x01000000
89
90	/* IOCTL commands for lirc driver */
91
92	#define LIRC_GET_FEATURES _IOR('i', 0x00000000, __u32)
93
94	#define LIRC_GET_SEND_MODE _IOR('i', 0x00000001, __u32)
95	#define LIRC_GET_REC_MODE _IOR('i', 0x00000002, __u32)
96	#define LIRC_GET_REC_RESOLUTION _IOR('i', 0x00000007, __u32)
97
98	#define LIRC_GET_MIN_TIMEOUT _IOR('i', 0x00000008, __u32)
99	#define LIRC_GET_MAX_TIMEOUT _IOR('i', 0x00000009, __u32)
100
101	/* code length in bits, currently only for LIRC_MODE_LIRCCODE */
102	#define LIRC_GET_LENGTH _IOR('i', 0x0000000f, __u32)
103
104	#define LIRC_SET_SEND_MODE _IOW('i', 0x00000011, __u32)
105	#define LIRC_SET_REC_MODE _IOW('i', 0x00000012, __u32)
106	/* Note: these can reset the according pulse_width */
107	#define LIRC_SET_SEND_CARRIER _IOW('i', 0x00000013, __u32)
108	#define LIRC_SET_REC_CARRIER _IOW('i', 0x00000014, __u32)
109	#define LIRC_SET_SEND_DUTY_CYCLE _IOW('i', 0x00000015, __u32)
110	#define LIRC_SET_TRANSMITTER_MASK _IOW('i', 0x00000017, __u32)
111
112	/*
113	* when a timeout != 0 is set the driver will send a
114	* LIRC_MODE2_TIMEOUT data packet, otherwise LIRC_MODE2_TIMEOUT is
115	* never sent, timeout is disabled by default
116	*/
117	#define LIRC_SET_REC_TIMEOUT _IOW('i', 0x00000018, __u32)
118
119	/* 1 enables, 0 disables timeout reports in MODE2 */
120	#define LIRC_SET_REC_TIMEOUT_REPORTS _IOW('i', 0x00000019, __u32)
121
122	/*
123	* if enabled from the next key press on the driver will send
124	* LIRC_MODE2_FREQUENCY packets
125	*/
126	#define LIRC_SET_MEASURE_CARRIER_MODE _IOW('i', 0x0000001d, __u32)
127
128	/*
129	* to set a range use LIRC_SET_REC_CARRIER_RANGE with the
130	* lower bound first and later LIRC_SET_REC_CARRIER with the upper bound
131	*/
132	#define LIRC_SET_REC_CARRIER_RANGE _IOW('i', 0x0000001f, __u32)
133
134	#define LIRC_SET_WIDEBAND_RECEIVER _IOW('i', 0x00000023, __u32)
135
136	/*
137	* Return the recording timeout, which is either set by
138	* the ioctl LIRC_SET_REC_TIMEOUT or by the kernel after setting the protocols.
139	*/
140	#define LIRC_GET_REC_TIMEOUT _IOR('i', 0x00000024, __u32)
141
142	/*
143	* struct lirc_scancode - decoded scancode with protocol for use with
144	* LIRC_MODE_SCANCODE
145	*
146	* @timestamp: Timestamp in nanoseconds using CLOCK_MONOTONIC when IR
147	* was decoded.
148	* @flags: should be 0 for transmit. When receiving scancodes,
149	* LIRC_SCANCODE_FLAG_TOGGLE or LIRC_SCANCODE_FLAG_REPEAT can be set
150	* depending on the protocol
151	* @rc_proto: see enum rc_proto
152	* @keycode: the translated keycode. Set to 0 for transmit.
153	* @scancode: the scancode received or to be sent
154	*/
155	struct lirc_scancode {
156	__u64 timestamp;
157	__u16 flags;
158	__u16 rc_proto;
159	__u32 keycode;
160	__u64 scancode;
161	};
162
163	/* Set if the toggle bit of rc-5 or rc-6 is enabled */
164	#define LIRC_SCANCODE_FLAG_TOGGLE 1
165	/* Set if this is a nec or sanyo repeat */
166	#define LIRC_SCANCODE_FLAG_REPEAT 2
167
168	/**
169	* enum rc_proto - the Remote Controller protocol
170	*
171	* @RC_PROTO_UNKNOWN: Protocol not known
172	* @RC_PROTO_OTHER: Protocol known but proprietary
173	* @RC_PROTO_RC5: Philips RC5 protocol
174	* @RC_PROTO_RC5X_20: Philips RC5x 20 bit protocol
175	* @RC_PROTO_RC5_SZ: StreamZap variant of RC5
176	* @RC_PROTO_JVC: JVC protocol
177	* @RC_PROTO_SONY12: Sony 12 bit protocol
178	* @RC_PROTO_SONY15: Sony 15 bit protocol
179	* @RC_PROTO_SONY20: Sony 20 bit protocol
180	* @RC_PROTO_NEC: NEC protocol
181	* @RC_PROTO_NECX: Extended NEC protocol
182	* @RC_PROTO_NEC32: NEC 32 bit protocol
183	* @RC_PROTO_SANYO: Sanyo protocol
184	* @RC_PROTO_MCIR2_KBD: RC6-ish MCE keyboard
185	* @RC_PROTO_MCIR2_MSE: RC6-ish MCE mouse
186	* @RC_PROTO_RC6_0: Philips RC6-0-16 protocol
187	* @RC_PROTO_RC6_6A_20: Philips RC6-6A-20 protocol
188	* @RC_PROTO_RC6_6A_24: Philips RC6-6A-24 protocol
189	* @RC_PROTO_RC6_6A_32: Philips RC6-6A-32 protocol
190	* @RC_PROTO_RC6_MCE: MCE (Philips RC6-6A-32 subtype) protocol
191	* @RC_PROTO_SHARP: Sharp protocol
192	* @RC_PROTO_XMP: XMP protocol
193	* @RC_PROTO_CEC: CEC protocol
194	* @RC_PROTO_IMON: iMon Pad protocol
195	* @RC_PROTO_RCMM12: RC-MM protocol 12 bits
196	* @RC_PROTO_RCMM24: RC-MM protocol 24 bits
197	* @RC_PROTO_RCMM32: RC-MM protocol 32 bits
198	*/
199	enum rc_proto {
200	RC_PROTO_UNKNOWN = 0,
201	RC_PROTO_OTHER = 1,
202	RC_PROTO_RC5 = 2,
203	RC_PROTO_RC5X_20 = 3,
204	RC_PROTO_RC5_SZ = 4,
205	RC_PROTO_JVC = 5,
206	RC_PROTO_SONY12 = 6,
207	RC_PROTO_SONY15 = 7,
208	RC_PROTO_SONY20 = 8,
209	RC_PROTO_NEC = 9,
210	RC_PROTO_NECX = 10,
211	RC_PROTO_NEC32 = 11,
212	RC_PROTO_SANYO = 12,
213	RC_PROTO_MCIR2_KBD = 13,
214	RC_PROTO_MCIR2_MSE = 14,
215	RC_PROTO_RC6_0 = 15,
216	RC_PROTO_RC6_6A_20 = 16,
217	RC_PROTO_RC6_6A_24 = 17,
218	RC_PROTO_RC6_6A_32 = 18,
219	RC_PROTO_RC6_MCE = 19,
220	RC_PROTO_SHARP = 20,
221	RC_PROTO_XMP = 21,
222	RC_PROTO_CEC = 22,
223	RC_PROTO_IMON = 23,
224	RC_PROTO_RCMM12 = 24,
225	RC_PROTO_RCMM24 = 25,
226	RC_PROTO_RCMM32 = 26,
227	};
228
229	#endif

tools/scripts/Makefile.include+1−1

@@ -90,7 +90,7 @@ EXTRA_WARNINGS += -Wstrict-aliasing=3 · 89 unmodified lines
90		90
91	else ifneq ($(CROSS_COMPILE),)	91	else ifneq ($(CROSS_COMPILE),)
92	CLANG_CROSS_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%))	92	CLANG_CROSS_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%))
93	GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)gcc))	93	GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)gcc 2>/dev/null))
94	ifneq ($(GCC_TOOLCHAIN_DIR),)	94	ifneq ($(GCC_TOOLCHAIN_DIR),)
95	CLANG_CROSS_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE))	95	CLANG_CROSS_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE))
96	CLANG_CROSS_FLAGS += --sysroot=$(shell $(CROSS_COMPILE)gcc -print-sysroot)	96	CLANG_CROSS_FLAGS += --sysroot=$(shell $(CROSS_COMPILE)gcc -print-sysroot)

tools/testing/kunit/kunit_kernel.py+1−0

@@ -6,6 +6,7 @@ · 5 unmodified lines
6	# Author: Felix Guo <felixguoxiuping@gmail.com>	6	# Author: Felix Guo <felixguoxiuping@gmail.com>
7	# Author: Brendan Higgins <brendanhiggins@google.com>	7	# Author: Brendan Higgins <brendanhiggins@google.com>
8		8
		9	import importlib.abc
9	import importlib.util	10	import importlib.util
10	import logging	11	import logging
11	import subprocess	12	import subprocess

tools/testing/scatterlist/linux/mm.h+2−1

 	      __UNIQUE_ID(min1_), __UNIQUE_ID(min2_),   \
 	      x, y)
-#define preemptible() (1)
+#define pagefault_disabled() (0)
 static inline void *kmap(struct page *page)
 {
 #define kmemleak_free(a)
 #define PageSlab(p) (0)
+#define flush_dcache_page(p)
 #define MAX_ERRNO	4095

tools/testing/selftests/arm64/fp/sve-ptrace.c+9−2

 	}
 	ksft_test_result((sve->flags & SVE_PT_REGS_MASK) == SVE_PT_REGS_FPSIMD,
-			 "Set FPSIMD registers via %s\n", type->name);
+			 "Got FPSIMD registers via %s\n", type->name);
 	if ((sve->flags & SVE_PT_REGS_MASK) != SVE_PT_REGS_FPSIMD)
 		goto out;
 		}
 		/* prctl() flags */
-		ptrace_set_get_inherit(child, &vec_types[i]);
+		if (getauxval(vec_types[i].hwcap_type) & vec_types[i].hwcap) {
+			ptrace_set_get_inherit(child, &vec_types[i]);
+		} else {
+			ksft_test_result_skip("%s SVE_PT_VL_INHERIT set\n",
+					      vec_types[i].name);
+			ksft_test_result_skip("%s SVE_PT_VL_INHERIT cleared\n",
+					      vec_types[i].name);
+		}
 		/* Step through every possible VQ */
 		for (vq = SVE_VQ_MIN; vq <= SVE_VQ_MAX; vq++) {

tools/testing/selftests/bpf/test_lirc_mode2_user.c+0−1

@@ -28,7 +28,6 @@ · 27 unmodified lines
28	// 5. We can read keycode from same /dev/lirc device	28	// 5. We can read keycode from same /dev/lirc device
29		29
30	#include <linux/bpf.h>	30	#include <linux/bpf.h>
31	#include <linux/lirc.h>
32	#include <linux/input.h>	31	#include <linux/input.h>
33	#include <errno.h>	32	#include <errno.h>
34	#include <stdio.h>	33	#include <stdio.h>

tools/testing/selftests/cpufreq/main.sh+1−1

@@ -194,5 +194,5 @@ prerequisite · 193 unmodified lines
194		194
195	# Run requested functions	195	# Run requested functions
196	clear_dumps $OUTFILE	196	clear_dumps $OUTFILE
197	do_test >> $OUTFILE.txt	197	do_test \| tee -a $OUTFILE.txt
198	dmesg_dumps $OUTFILE	198	dmesg_dumps $OUTFILE

tools/testing/selftests/exec/Makefile+1−1

@@ -5,7 +5,7 @@ CFLAGS += -D_GNU_SOURCE · 4 unmodified lines
5		5
6	TEST_PROGS := binfmt_script non-regular	6	TEST_PROGS := binfmt_script non-regular
7	TEST_GEN_PROGS := execveat load_address_4096 load_address_2097152 load_address_16777216	7	TEST_GEN_PROGS := execveat load_address_4096 load_address_2097152 load_address_16777216
8	TEST_GEN_FILES := execveat.symlink execveat.denatured script subdir pipe	8	TEST_GEN_FILES := execveat.symlink execveat.denatured script subdir
9	# Makefile is a run-time dependency, since it's accessed by the execveat test	9	# Makefile is a run-time dependency, since it's accessed by the execveat test
10	TEST_FILES := Makefile	10	TEST_FILES := Makefile
11		11

tools/testing/selftests/futex/Makefile+2−2

@@ -11,7 +11,7 @@ all: · 10 unmodified lines
11	@for DIR in $(SUBDIRS); do \	11	@for DIR in $(SUBDIRS); do \
12	BUILD_TARGET=$(OUTPUT)/$$DIR; \	12	BUILD_TARGET=$(OUTPUT)/$$DIR; \
13	mkdir $$BUILD_TARGET -p; \	13	mkdir $$BUILD_TARGET -p; \
14	make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\	14	$(MAKE) OUTPUT=$$BUILD_TARGET -C $$DIR $@;\
15	if [ -e $$DIR/$(TEST_PROGS) ]; then \	15	if [ -e $$DIR/$(TEST_PROGS) ]; then \
16	rsync -a $$DIR/$(TEST_PROGS) $$BUILD_TARGET/; \	16	rsync -a $$DIR/$(TEST_PROGS) $$BUILD_TARGET/; \
17	fi \	17	fi \
@@ -32,6 +32,6 @@ override define CLEAN · 14 unmodified lines
32	@for DIR in $(SUBDIRS); do \	32	@for DIR in $(SUBDIRS); do \
33	BUILD_TARGET=$(OUTPUT)/$$DIR; \	33	BUILD_TARGET=$(OUTPUT)/$$DIR; \
34	mkdir $$BUILD_TARGET -p; \	34	mkdir $$BUILD_TARGET -p; \
35	make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\	35	$(MAKE) OUTPUT=$$BUILD_TARGET -C $$DIR $@;\
36	done	36	done
37	endef	37	endef

tools/testing/selftests/kselftest_harness.h+3−1

 	}
 	t->timed_out = true;
-	kill(t->pid, SIGKILL);
+	// signal process group
+	kill(-(t->pid), SIGKILL);
 }
 void __wait_for_test(struct __test_metadata *t)
 		ksft_print_msg("ERROR SPAWNING TEST CHILD\n");
 		t->passed = 0;
 	} else if (t->pid == 0) {
+		setpgrp();
 		t->fn(t, variant);
 		if (t->skip)
 			_exit(255);

tools/testing/selftests/kvm/Makefile+1−0

@@ -85,6 +85,7 @@ TEST_GEN_PROGS_x86_64 += x86_64/xen_vmcall_test · 84 unmodified lines
85	TEST_GEN_PROGS_x86_64 += x86_64/vmx_pi_mmio_test	85	TEST_GEN_PROGS_x86_64 += x86_64/vmx_pi_mmio_test
86	TEST_GEN_PROGS_x86_64 += x86_64/sev_migrate_tests	86	TEST_GEN_PROGS_x86_64 += x86_64/sev_migrate_tests
87	TEST_GEN_PROGS_x86_64 += x86_64/amx_test	87	TEST_GEN_PROGS_x86_64 += x86_64/amx_test
		88	TEST_GEN_PROGS_x86_64 += access_tracking_perf_test
88	TEST_GEN_PROGS_x86_64 += demand_paging_test	89	TEST_GEN_PROGS_x86_64 += demand_paging_test
89	TEST_GEN_PROGS_x86_64 += dirty_log_test	90	TEST_GEN_PROGS_x86_64 += dirty_log_test
90	TEST_GEN_PROGS_x86_64 += dirty_log_perf_test	91	TEST_GEN_PROGS_x86_64 += dirty_log_perf_test

tools/testing/selftests/kvm/include/kvm_util_base.h+0−1

@@ -345,7 +345,6 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus, · 344 unmodified lines
345	* guest_code - The vCPU's entry point	345	* guest_code - The vCPU's entry point
346	*/	346	*/
347	void vm_vcpu_add_default(struct kvm_vm vm, uint32_t vcpuid, void guest_code);	347	void vm_vcpu_add_default(struct kvm_vm vm, uint32_t vcpuid, void guest_code);
348	void vm_xsave_req_perm(void);
349		348
350	bool vm_is_unrestricted_guest(struct kvm_vm *vm);	349	bool vm_is_unrestricted_guest(struct kvm_vm *vm);
351		350

tools/testing/selftests/kvm/include/x86_64/processor.h+1−0

@@ -458,6 +458,7 @@ uint64_t kvm_hypercall(uint64_t nr, uint64_t a0, uint64_t a1, uint64_t a2, · 457 unmodified lines
458	struct kvm_cpuid2 *kvm_get_supported_hv_cpuid(void);	458	struct kvm_cpuid2 *kvm_get_supported_hv_cpuid(void);
459	void vcpu_set_hv_cpuid(struct kvm_vm *vm, uint32_t vcpuid);	459	void vcpu_set_hv_cpuid(struct kvm_vm *vm, uint32_t vcpuid);
460	struct kvm_cpuid2 vcpu_get_supported_hv_cpuid(struct kvm_vm vm, uint32_t vcpuid);	460	struct kvm_cpuid2 vcpu_get_supported_hv_cpuid(struct kvm_vm vm, uint32_t vcpuid);
		461	void vm_xsave_req_perm(int bit);
461		462
462	enum x86_page_size {	463	enum x86_page_size {
463	X86_PAGE_SIZE_4K = 0,	464	X86_PAGE_SIZE_4K = 0,

tools/testing/selftests/kvm/lib/kvm_util.c+0−7

@@ -393,13 +393,6 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus, · 392 unmodified lines
393	struct kvm_vm *vm;	393	struct kvm_vm *vm;
394	int i;	394	int i;
395		395
396	#ifdef __x86_64__
397	/*
398	* Permission needs to be requested before KVM_SET_CPUID2.
399	*/
400	vm_xsave_req_perm();
401	#endif
402
403	/* Force slot0 memory size not small than DEFAULT_GUEST_PHY_PAGES */	396	/* Force slot0 memory size not small than DEFAULT_GUEST_PHY_PAGES */
404	if (slot0_mem_pages < DEFAULT_GUEST_PHY_PAGES)	397	if (slot0_mem_pages < DEFAULT_GUEST_PHY_PAGES)
405	slot0_mem_pages = DEFAULT_GUEST_PHY_PAGES;	398	slot0_mem_pages = DEFAULT_GUEST_PHY_PAGES;

tools/testing/selftests/kvm/lib/x86_64/processor.c+21−6

 	return !!(eax & CPUID_XFD_BIT);
 }
-void vm_xsave_req_perm(void)
+void vm_xsave_req_perm(int bit)
 {
-	unsigned long bitmask;
+	int kvm_fd;
+	u64 bitmask;
 	long rc;
+	struct kvm_device_attr attr = {
+		.group = 0,
+		.attr = KVM_X86_XCOMP_GUEST_SUPP,
+		.addr = (unsigned long) &bitmask
+	};
+	kvm_fd = open_kvm_dev_path_or_exit();
+	rc = ioctl(kvm_fd, KVM_GET_DEVICE_ATTR, &attr);
+	close(kvm_fd);
+	if (rc == -1 && (errno == ENXIO || errno == EINVAL))
+		exit(KSFT_SKIP);
+	TEST_ASSERT(rc == 0, "KVM_GET_DEVICE_ATTR(0, KVM_X86_XCOMP_GUEST_SUPP) error: %ld", rc);
+	if (!(bitmask & (1ULL << bit)))
+		exit(KSFT_SKIP);
 	if (!is_xfd_supported())
-		return;
+		exit(KSFT_SKIP);
+	rc = syscall(SYS_arch_prctl, ARCH_REQ_XCOMP_GUEST_PERM, bit);
-	rc = syscall(SYS_arch_prctl, ARCH_REQ_XCOMP_GUEST_PERM,
-		     XSTATE_XTILE_DATA_BIT);
 	/*
 	 * The older kernel version(<5.15) can't support
 	 * ARCH_REQ_XCOMP_GUEST_PERM and directly return.
 	rc = syscall(SYS_arch_prctl, ARCH_GET_XCOMP_GUEST_PERM, &bitmask);
 	TEST_ASSERT(rc == 0, "prctl(ARCH_GET_XCOMP_GUEST_PERM) error: %ld", rc);
-	TEST_ASSERT(bitmask & XFEATURE_XTILE_MASK,
+	TEST_ASSERT(bitmask & (1ULL << bit),
 		    "prctl(ARCH_REQ_XCOMP_GUEST_PERM) failure bitmask=0x%lx",
 		    bitmask);
 }

tools/testing/selftests/kvm/x86_64/amx_test.c+2−0

@@ -329,6 +329,8 @@ int main(int argc, char *argv[]) · 328 unmodified lines
329	u32 amx_offset;	329	u32 amx_offset;
330	int stage, ret;	330	int stage, ret;
331		331
		332	vm_xsave_req_perm(XSTATE_XTILE_DATA_BIT);
		333
332	/* Create VM */	334	/* Create VM */
333	vm = vm_create_default(VCPU_ID, 0, guest_code);	335	vm = vm_create_default(VCPU_ID, 0, guest_code);
334		336

tools/testing/selftests/kvm/x86_64/smm_test.c+0−1

@@ -105,7 +105,6 @@ static void guest_code(void *arg) · 104 unmodified lines
105		105
106	if (cpu_has_svm()) {	106	if (cpu_has_svm()) {
107	run_guest(svm->vmcb, svm->vmcb_gpa);	107	run_guest(svm->vmcb, svm->vmcb_gpa);
108	svm->vmcb->save.rip += 3;
109	run_guest(svm->vmcb, svm->vmcb_gpa);	108	run_guest(svm->vmcb, svm->vmcb_gpa);
110	} else {	109	} else {
111	vmlaunch();	110	vmlaunch();

tools/testing/selftests/mincore/mincore_selftest.c+14−6

 	errno = 0;
 	fd = open(".", O_TMPFILE | O_RDWR, 0600);
-	ASSERT_NE(-1, fd) {
+	if (fd < 0) {
-		TH_LOG("Can't create temporary file: %s",
+		ASSERT_EQ(errno, EOPNOTSUPP) {
-			strerror(errno));
+			TH_LOG("Can't create temporary file: %s",
+			       strerror(errno));
+		}
+		SKIP(goto out_free, "O_TMPFILE not supported by filesystem.");
 	}
 	errno = 0;
 	retval = fallocate(fd, 0, 0, FILE_SIZE);
-	ASSERT_EQ(0, retval) {
+	if (retval) {
-		TH_LOG("Error allocating space for the temporary file: %s",
+		ASSERT_EQ(errno, EOPNOTSUPP) {
-			strerror(errno));
+			TH_LOG("Error allocating space for the temporary file: %s",
+			       strerror(errno));
+		}
+		SKIP(goto out_close, "fallocate not supported by filesystem.");
 	}
 	/*
 	}
 	munmap(addr, FILE_SIZE);
+out_close:
 	close(fd);
+out_free:
 	free(vec);
 }

tools/testing/selftests/netfilter/nft_concat_range.sh+71−1

@@ -27,7 +27,7 @@ TYPES="net_port port_net net6_port port_proto net6_port_mac net6_port_mac_proto · 26 unmodified lines
27	net6_port_net6_port net_port_mac_proto_net"	27	net6_port_net6_port net_port_mac_proto_net"
28		28
29	# Reported bugs, also described by TYPE_ variables below	29	# Reported bugs, also described by TYPE_ variables below
30	BUGS="flush_remove_add"	30	BUGS="flush_remove_add reload"
31		31
32	# List of possible paths to pktgen script from kernel tree for performance tests	32	# List of possible paths to pktgen script from kernel tree for performance tests
33	PKTGEN_SCRIPT_PATHS="	33	PKTGEN_SCRIPT_PATHS="
@@ -354,6 +354,23 @@ TYPE_flush_remove_add=" · 320 unmodified lines
354	display Add two elements, flush, re-add	354	display Add two elements, flush, re-add
355	"	355	"
356		356
		357	TYPE_reload="
		358	display net,mac with reload
		359	type_spec ipv4_addr . ether_addr
		360	chain_spec ip daddr . ether saddr
		361	dst addr4
		362	src mac
		363	start 1
		364	count 1
		365	src_delta 2000
		366	tools sendip nc bash
		367	proto udp
		368
		369	race_repeat 0
		370
		371	perf_duration 0
		372	"
		373
357	# Set template for all tests, types and rules are filled in depending on test	374	# Set template for all tests, types and rules are filled in depending on test
358	set_template='	375	set_template='
359	flush ruleset	376	flush ruleset
@@ -1473,6 +1490,59 @@ test_bug_flush_remove_add() { · 1113 unmodified lines
1473	nft flush ruleset	1490	nft flush ruleset
1474	}	1491	}
1475		1492
		1493	# - add ranged element, check that packets match it
		1494	# - reload the set, check packets still match
		1495	test_bug_reload() {
		1496	setup veth send_"${proto}" set \|\| return ${KSELFTEST_SKIP}
		1497	rstart=${start}
		1498
		1499	range_size=1
		1500	for i in $(seq "${start}" $((start + count))); do
		1501	end=$((start + range_size))
		1502
		1503	# Avoid negative or zero-sized port ranges
		1504	if [ $((end / 65534)) -gt $((start / 65534)) ]; then
		1505	start=${end}
		1506	end=$((end + 1))
		1507	fi
		1508	srcstart=$((start + src_delta))
		1509	srcend=$((end + src_delta))
		1510
		1511	add "$(format)" \|\| return 1
		1512	range_size=$((range_size + 1))
		1513	start=$((end + range_size))
		1514	done
		1515
		1516	# check kernel does allocate pcpu sctrach map
		1517	# for reload with no elemet add/delete
		1518	( echo flush set inet filter test ;
		1519	nft list set inet filter test ) \| nft -f -
		1520
		1521	start=${rstart}
		1522	range_size=1
		1523
		1524	for i in $(seq "${start}" $((start + count))); do
		1525	end=$((start + range_size))
		1526
		1527	# Avoid negative or zero-sized port ranges
		1528	if [ $((end / 65534)) -gt $((start / 65534)) ]; then
		1529	start=${end}
		1530	end=$((end + 1))
		1531	fi
		1532	srcstart=$((start + src_delta))
		1533	srcend=$((end + src_delta))
		1534
		1535	for j in $(seq ${start} $((range_size / 2 + 1)) ${end}); do
		1536	send_match "${j}" $((j + src_delta)) \|\| return 1
		1537	done
		1538
		1539	range_size=$((range_size + 1))
		1540	start=$((end + range_size))
		1541	done
		1542
		1543	nft flush ruleset
		1544	}
		1545
1476	test_reported_issues() {	1546	test_reported_issues() {
1477	eval test_bug_"${subtest}"	1547	eval test_bug_"${subtest}"
1478	}	1548	}

tools/testing/selftests/netfilter/nft_nat.sh+152−0

@@ -899,6 +899,144 @@ EOF · 898 unmodified lines
899	ip netns exec "$ns0" nft delete table $family nat	899	ip netns exec "$ns0" nft delete table $family nat
900	}	900	}
901		901
		902	test_stateless_nat_ip()
		903	{
		904	local lret=0
		905
		906	ip netns exec "$ns0" sysctl net.ipv4.conf.veth0.forwarding=1 > /dev/null
		907	ip netns exec "$ns0" sysctl net.ipv4.conf.veth1.forwarding=1 > /dev/null
		908
		909	ip netns exec "$ns2" ping -q -c 1 10.0.1.99 > /dev/null # ping ns2->ns1
		910	if [ $? -ne 0 ] ; then
		911	echo "ERROR: cannot ping $ns1 from $ns2 before loading stateless rules"
		912	return 1
		913	fi
		914
		915	ip netns exec "$ns0" nft -f /dev/stdin <<EOF
		916	table ip stateless {
		917	map xlate_in {
		918	typeof meta iifname . ip saddr . ip daddr : ip daddr
		919	elements = {
		920	"veth1" . 10.0.2.99 . 10.0.1.99 : 10.0.2.2,
		921	}
		922	}
		923	map xlate_out {
		924	typeof meta iifname . ip saddr . ip daddr : ip daddr
		925	elements = {
		926	"veth0" . 10.0.1.99 . 10.0.2.2 : 10.0.2.99
		927	}
		928	}
		929
		930	chain prerouting {
		931	type filter hook prerouting priority -400; policy accept;
		932	ip saddr set meta iifname . ip saddr . ip daddr map @xlate_in
		933	ip daddr set meta iifname . ip saddr . ip daddr map @xlate_out
		934	}
		935	}
		936	EOF
		937	if [ $? -ne 0 ]; then
		938	echo "SKIP: Could not add ip statless rules"
		939	return $ksft_skip
		940	fi
		941
		942	reset_counters
		943
		944	ip netns exec "$ns2" ping -q -c 1 10.0.1.99 > /dev/null # ping ns2->ns1
		945	if [ $? -ne 0 ] ; then
		946	echo "ERROR: cannot ping $ns1 from $ns2 with stateless rules"
		947	lret=1
		948	fi
		949
		950	# ns1 should have seen packets from .2.2, due to stateless rewrite.
		951	expect="packets 1 bytes 84"
		952	cnt=$(ip netns exec "$ns1" nft list counter inet filter ns0insl \| grep -q "$expect")
		953	if [ $? -ne 0 ]; then
		954	bad_counter "$ns1" ns0insl "$expect" "test_stateless 1"
		955	lret=1
		956	fi
		957
		958	for dir in "in" "out" ; do
		959	cnt=$(ip netns exec "$ns2" nft list counter inet filter ns1${dir} \| grep -q "$expect")
		960	if [ $? -ne 0 ]; then
		961	bad_counter "$ns2" ns1$dir "$expect" "test_stateless 2"
		962	lret=1
		963	fi
		964	done
		965
		966	# ns1 should not have seen packets from ns2, due to masquerade
		967	expect="packets 0 bytes 0"
		968	for dir in "in" "out" ; do
		969	cnt=$(ip netns exec "$ns1" nft list counter inet filter ns2${dir} \| grep -q "$expect")
		970	if [ $? -ne 0 ]; then
		971	bad_counter "$ns1" ns0$dir "$expect" "test_stateless 3"
		972	lret=1
		973	fi
		974
		975	cnt=$(ip netns exec "$ns0" nft list counter inet filter ns1${dir} \| grep -q "$expect")
		976	if [ $? -ne 0 ]; then
		977	bad_counter "$ns0" ns1$dir "$expect" "test_stateless 4"
		978	lret=1
		979	fi
		980	done
		981
		982	reset_counters
		983
		984	socat -h > /dev/null 2>&1
		985	if [ $? -ne 0 ];then
		986	echo "SKIP: Could not run stateless nat frag test without socat tool"
		987	if [ $lret -eq 0 ]; then
		988	return $ksft_skip
		989	fi
		990
		991	ip netns exec "$ns0" nft delete table ip stateless
		992	return $lret
		993	fi
		994
		995	local tmpfile=$(mktemp)
		996	dd if=/dev/urandom of=$tmpfile bs=4096 count=1 2>/dev/null
		997
		998	local outfile=$(mktemp)
		999	ip netns exec "$ns1" timeout 3 socat -u UDP4-RECV:4233 OPEN:$outfile < /dev/null &
		1000	sc_r=$!
		1001
		1002	sleep 1
		1003	# re-do with large ping -> ip fragmentation
		1004	ip netns exec "$ns2" timeout 3 socat - UDP4-SENDTO:"10.0.1.99:4233" < "$tmpfile" > /dev/null
		1005	if [ $? -ne 0 ] ; then
		1006	echo "ERROR: failed to test udp $ns1 to $ns2 with stateless ip nat" 1>&2
		1007	lret=1
		1008	fi
		1009
		1010	wait
		1011
		1012	cmp "$tmpfile" "$outfile"
		1013	if [ $? -ne 0 ]; then
		1014	ls -l "$tmpfile" "$outfile"
		1015	echo "ERROR: in and output file mismatch when checking udp with stateless nat" 1>&2
		1016	lret=1
		1017	fi
		1018
		1019	rm -f "$tmpfile" "$outfile"
		1020
		1021	# ns1 should have seen packets from 2.2, due to stateless rewrite.
		1022	expect="packets 3 bytes 4164"
		1023	cnt=$(ip netns exec "$ns1" nft list counter inet filter ns0insl \| grep -q "$expect")
		1024	if [ $? -ne 0 ]; then
		1025	bad_counter "$ns1" ns0insl "$expect" "test_stateless 5"
		1026	lret=1
		1027	fi
		1028
		1029	ip netns exec "$ns0" nft delete table ip stateless
		1030	if [ $? -ne 0 ]; then
		1031	echo "ERROR: Could not delete table ip stateless" 1>&2
		1032	lret=1
		1033	fi
		1034
		1035	test $lret -eq 0 && echo "PASS: IP statless for $ns2"
		1036
		1037	return $lret
		1038	}
		1039
902	# ip netns exec "$ns0" ping -c 1 -q 10.0.$i.99	1040	# ip netns exec "$ns0" ping -c 1 -q 10.0.$i.99
903	for i in 0 1 2; do	1041	for i in 0 1 2; do
904	ip netns exec ns$i-$sfx nft -f /dev/stdin <<EOF	1042	ip netns exec ns$i-$sfx nft -f /dev/stdin <<EOF
@@ -965,6 +1103,19 @@ table inet filter { · 60 unmodified lines
965	EOF	1103	EOF
966	done	1104	done
967		1105
		1106	# special case for stateless nat check, counter needs to
		1107	# be done before (input) ip defragmentation
		1108	ip netns exec ns1-$sfx nft -f /dev/stdin <<EOF
		1109	table inet filter {
		1110	counter ns0insl {}
		1111
		1112	chain pre {
		1113	type filter hook prerouting priority -400; policy accept;
		1114	ip saddr 10.0.2.2 counter name "ns0insl"
		1115	}
		1116	}
		1117	EOF
		1118
968	sleep 3	1119	sleep 3
969	# test basic connectivity	1120	# test basic connectivity
970	for i in 1 2; do	1121	for i in 1 2; do
@@ -1019,6 +1170,7 @@ $test_inet_nat && test_redirect inet · 48 unmodified lines
1019	$test_inet_nat && test_redirect6 inet	1170	$test_inet_nat && test_redirect6 inet
1020		1171
1021	test_port_shadowing	1172	test_port_shadowing
		1173	test_stateless_nat_ip
1022		1174
1023	if [ $ret -ne 0 ];then	1175	if [ $ret -ne 0 ];then
1024	echo -n "FAIL: "	1176	echo -n "FAIL: "

tools/testing/selftests/netfilter/nft_zones_many.sh+6−6

@@ -9,7 +9,7 @@ ns="ns-$sfx" · 8 unmodified lines
9	# Kselftest framework requirement - SKIP code is 4.	9	# Kselftest framework requirement - SKIP code is 4.
10	ksft_skip=4	10	ksft_skip=4
11		11
12	zones=20000	12	zones=2000
13	have_ct_tool=0	13	have_ct_tool=0
14	ret=0	14	ret=0
15		15
@@ -75,10 +75,10 @@ EOF · 59 unmodified lines
75		75
76	while [ $i -lt $max_zones ]; do	76	while [ $i -lt $max_zones ]; do
77	local start=$(date +%s%3N)	77	local start=$(date +%s%3N)
78	i=$((i + 10000))	78	i=$((i + 1000))
79	j=$((j + 1))	79	j=$((j + 1))
80	# nft rule in output places each packet in a different zone.	80	# nft rule in output places each packet in a different zone.
81	dd if=/dev/zero of=/dev/stdout bs=8k count=10000 2>/dev/null \| ip netns exec "$ns" socat STDIN UDP:127.0.0.1:12345,sourceport=12345	81	dd if=/dev/zero of=/dev/stdout bs=8k count=1000 2>/dev/null \| ip netns exec "$ns" socat STDIN UDP:127.0.0.1:12345,sourceport=12345
82	if [ $? -ne 0 ] ;then	82	if [ $? -ne 0 ] ;then
83	ret=1	83	ret=1
84	break	84	break
@@ -86,7 +86,7 @@ EOF · 1 unmodified line
86		86
87	stop=$(date +%s%3N)	87	stop=$(date +%s%3N)
88	local duration=$((stop-start))	88	local duration=$((stop-start))
89	echo "PASS: added 10000 entries in $duration ms (now $i total, loop $j)"	89	echo "PASS: added 1000 entries in $duration ms (now $i total, loop $j)"
90	done	90	done
91		91
92	if [ $have_ct_tool -eq 1 ]; then	92	if [ $have_ct_tool -eq 1 ]; then
@@ -128,11 +128,11 @@ test_conntrack_tool() { · 35 unmodified lines
128	break	128	break
129	fi	129	fi
130		130
131	if [ $((i%10000)) -eq 0 ];then	131	if [ $((i%1000)) -eq 0 ];then
132	stop=$(date +%s%3N)	132	stop=$(date +%s%3N)
133		133
134	local duration=$((stop-start))	134	local duration=$((stop-start))
135	echo "PASS: added 10000 entries in $duration ms (now $i total)"	135	echo "PASS: added 1000 entries in $duration ms (now $i total)"
136	start=$stop	136	start=$stop
137	fi	137	fi
138	done	138	done

tools/testing/selftests/openat2/Makefile+1−1

@@ -5,4 +5,4 @@ TEST_GEN_PROGS := openat2_test resolve_test rename_attack_test · 4 unmodified lines
5		5
6	include ../lib.mk	6	include ../lib.mk
7		7
8	$(TEST_GEN_PROGS): helpers.c	8	$(TEST_GEN_PROGS): helpers.c helpers.h

tools/testing/selftests/openat2/helpers.h+7−5

 #define _GNU_SOURCE
 #include <stdint.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <linux/types.h>
 #include "../kselftest.h"
 					(similar to chroot(2)). */
 #endif /* RESOLVE_IN_ROOT */
-#define E_func(func, ...)						\
+#define E_func(func, ...)						      \
-	do {								\
+	do {								      \
-		if (func(__VA_ARGS__) < 0)				\
+		errno = 0;						      \
-			ksft_exit_fail_msg("%s:%d %s failed\n", \
+		if (func(__VA_ARGS__) < 0)				      \
-					   __FILE__, __LINE__, #func);\
+			ksft_exit_fail_msg("%s:%d %s failed - errno:%d\n",    \
+					   __FILE__, __LINE__, #func, errno); \
 	} while (0)
 #define E_asprintf(...)		E_func(asprintf,	__VA_ARGS__)

tools/testing/selftests/openat2/openat2_test.c+11−1

@@ -259,6 +259,16 @@ void test_openat2_flags(void) · 258 unmodified lines
259	unlink(path);	259	unlink(path);
260		260
261	fd = sys_openat2(AT_FDCWD, path, &test->how);	261	fd = sys_openat2(AT_FDCWD, path, &test->how);
		262	if (fd < 0 && fd == -EOPNOTSUPP) {
		263	/*
		264	* Skip the testcase if it failed because not supported
		265	* by FS. (e.g. a valid O_TMPFILE combination on NFS)
		266	*/
		267	ksft_test_result_skip("openat2 with %s fails with %d (%s)\n",
		268	test->name, fd, strerror(-fd));
		269	goto next;
		270	}
		271
262	if (test->err >= 0)	272	if (test->err >= 0)
263	failed = (fd < 0);	273	failed = (fd < 0);
264	else	274	else
@@ -303,7 +313,7 @@ skip: · 38 unmodified lines
303	else	313	else
304	resultfn("openat2 with %s fails with %d (%s)\n",	314	resultfn("openat2 with %s fails with %d (%s)\n",
305	test->name, test->err, strerror(-test->err));	315	test->name, test->err, strerror(-test->err));
306		316	next:
307	free(fdpath);	317	free(fdpath);
308	fflush(stdout);	318	fflush(stdout);
309	}	319	}

tools/testing/selftests/rtc/settings+1−1

@@ -1 +1 @@
1	timeout=90	1	timeout=180

tools/testing/selftests/vDSO/vdso_test_abi.c+62−73

@@ -33,110 +33,114 @@ typedef long (vdso_clock_gettime_t)(clockid_t clk_id, struct timespec ts); · 32 unmodified lines
33	typedef long (vdso_clock_getres_t)(clockid_t clk_id, struct timespec ts);	33	typedef long (vdso_clock_getres_t)(clockid_t clk_id, struct timespec ts);
34	typedef time_t (vdso_time_t)(time_t t);	34	typedef time_t (vdso_time_t)(time_t t);
35		35
36	static int vdso_test_gettimeofday(void)	36	#define VDSO_TEST_PASS_MSG() "\n%s(): PASS\n", __func__
		37	#define VDSO_TEST_FAIL_MSG(x) "\n%s(): %s FAIL\n", __func__, x
		38	#define VDSO_TEST_SKIP_MSG(x) "\n%s(): SKIP: Could not find %s\n", __func__, x
		39
		40	static void vdso_test_gettimeofday(void)
37	{	41	{
38	/* Find gettimeofday. */	42	/* Find gettimeofday. */
39	vdso_gettimeofday_t vdso_gettimeofday =	43	vdso_gettimeofday_t vdso_gettimeofday =
40	(vdso_gettimeofday_t)vdso_sym(version, name[0]);	44	(vdso_gettimeofday_t)vdso_sym(version, name[0]);
41		45
42	if (!vdso_gettimeofday) {	46	if (!vdso_gettimeofday) {
43	printf("Could not find %s\n", name[0]);	47	ksft_test_result_skip(VDSO_TEST_SKIP_MSG(name[0]));
44	return KSFT_SKIP;	48	return;
45	}	49	}
46		50
47	struct timeval tv;	51	struct timeval tv;
48	long ret = vdso_gettimeofday(&tv, 0);	52	long ret = vdso_gettimeofday(&tv, 0);
49		53
50	if (ret == 0) {	54	if (ret == 0) {
51	printf("The time is %lld.%06lld\n",	55	ksft_print_msg("The time is %lld.%06lld\n",
52	(long long)tv.tv_sec, (long long)tv.tv_usec);	56	(long long)tv.tv_sec, (long long)tv.tv_usec);
		57	ksft_test_result_pass(VDSO_TEST_PASS_MSG());
53	} else {	58	} else {
54	printf("%s failed\n", name[0]);	59	ksft_test_result_fail(VDSO_TEST_FAIL_MSG(name[0]));
55	return KSFT_FAIL;
56	}	60	}
57
58	return KSFT_PASS;
59	}	61	}
60		62
61	static int vdso_test_clock_gettime(clockid_t clk_id)	63	static void vdso_test_clock_gettime(clockid_t clk_id)
62	{	64	{
63	/* Find clock_gettime. */	65	/* Find clock_gettime. */
64	vdso_clock_gettime_t vdso_clock_gettime =	66	vdso_clock_gettime_t vdso_clock_gettime =
65	(vdso_clock_gettime_t)vdso_sym(version, name[1]);	67	(vdso_clock_gettime_t)vdso_sym(version, name[1]);
66		68
67	if (!vdso_clock_gettime) {	69	if (!vdso_clock_gettime) {
68	printf("Could not find %s\n", name[1]);	70	ksft_test_result_skip(VDSO_TEST_SKIP_MSG(name[1]));
69	return KSFT_SKIP;	71	return;
70	}	72	}
71		73
72	struct timespec ts;	74	struct timespec ts;
73	long ret = vdso_clock_gettime(clk_id, &ts);	75	long ret = vdso_clock_gettime(clk_id, &ts);
74		76
75	if (ret == 0) {	77	if (ret == 0) {
76	printf("The time is %lld.%06lld\n",	78	ksft_print_msg("The time is %lld.%06lld\n",
77	(long long)ts.tv_sec, (long long)ts.tv_nsec);	79	(long long)ts.tv_sec, (long long)ts.tv_nsec);
		80	ksft_test_result_pass(VDSO_TEST_PASS_MSG());
78	} else {	81	} else {
79	printf("%s failed\n", name[1]);	82	ksft_test_result_fail(VDSO_TEST_FAIL_MSG(name[1]));
80	return KSFT_FAIL;
81	}	83	}
82
83	return KSFT_PASS;
84	}	84	}
85		85
86	static int vdso_test_time(void)	86	static void vdso_test_time(void)
87	{	87	{
88	/* Find time. */	88	/* Find time. */
89	vdso_time_t vdso_time =	89	vdso_time_t vdso_time =
90	(vdso_time_t)vdso_sym(version, name[2]);	90	(vdso_time_t)vdso_sym(version, name[2]);
91		91
92	if (!vdso_time) {	92	if (!vdso_time) {
93	printf("Could not find %s\n", name[2]);	93	ksft_test_result_skip(VDSO_TEST_SKIP_MSG(name[2]));
94	return KSFT_SKIP;	94	return;
95	}	95	}
96		96
97	long ret = vdso_time(NULL);	97	long ret = vdso_time(NULL);
98		98
99	if (ret > 0) {	99	if (ret > 0) {
100	printf("The time in hours since January 1, 1970 is %lld\n",	100	ksft_print_msg("The time in hours since January 1, 1970 is %lld\n",
101	(long long)(ret / 3600));	101	(long long)(ret / 3600));
		102	ksft_test_result_pass(VDSO_TEST_PASS_MSG());
102	} else {	103	} else {
103	printf("%s failed\n", name[2]);	104	ksft_test_result_fail(VDSO_TEST_FAIL_MSG(name[2]));
104	return KSFT_FAIL;
105	}	105	}
106
107	return KSFT_PASS;
108	}	106	}
109		107
110	static int vdso_test_clock_getres(clockid_t clk_id)	108	static void vdso_test_clock_getres(clockid_t clk_id)
111	{	109	{
		110	int clock_getres_fail = 0;
		111
112	/* Find clock_getres. */	112	/* Find clock_getres. */
113	vdso_clock_getres_t vdso_clock_getres =	113	vdso_clock_getres_t vdso_clock_getres =
114	(vdso_clock_getres_t)vdso_sym(version, name[3]);	114	(vdso_clock_getres_t)vdso_sym(version, name[3]);
115		115
116	if (!vdso_clock_getres) {	116	if (!vdso_clock_getres) {
117	printf("Could not find %s\n", name[3]);	117	ksft_test_result_skip(VDSO_TEST_SKIP_MSG(name[3]));
118	return KSFT_SKIP;	118	return;
119	}	119	}
120		120
121	struct timespec ts, sys_ts;	121	struct timespec ts, sys_ts;
122	long ret = vdso_clock_getres(clk_id, &ts);	122	long ret = vdso_clock_getres(clk_id, &ts);
123		123
124	if (ret == 0) {	124	if (ret == 0) {
125	printf("The resolution is %lld %lld\n",	125	ksft_print_msg("The vdso resolution is %lld %lld\n",
126	(long long)ts.tv_sec, (long long)ts.tv_nsec);	126	(long long)ts.tv_sec, (long long)ts.tv_nsec);
127	} else {	127	} else {
128	printf("%s failed\n", name[3]);	128	clock_getres_fail++;
129	return KSFT_FAIL;
130	}	129	}
131		130
132	ret = syscall(SYS_clock_getres, clk_id, &sys_ts);	131	ret = syscall(SYS_clock_getres, clk_id, &sys_ts);
133		132
134	if ((sys_ts.tv_sec != ts.tv_sec) \|\| (sys_ts.tv_nsec != ts.tv_nsec)) {	133	ksft_print_msg("The syscall resolution is %lld %lld\n",
135	printf("%s failed\n", name[3]);	134	(long long)sys_ts.tv_sec, (long long)sys_ts.tv_nsec);
136	return KSFT_FAIL;
137	}
138		135
139	return KSFT_PASS;	136	if ((sys_ts.tv_sec != ts.tv_sec) \|\| (sys_ts.tv_nsec != ts.tv_nsec))
		137	clock_getres_fail++;
		138
		139	if (clock_getres_fail > 0) {
		140	ksft_test_result_fail(VDSO_TEST_FAIL_MSG(name[3]));
		141	} else {
		142	ksft_test_result_pass(VDSO_TEST_PASS_MSG());
		143	}
140	}	144	}
141		145
142	const char *vdso_clock_name[12] = {	146	const char *vdso_clock_name[12] = {
@@ -158,36 +162,23 @@ const char *vdso_clock_name[12] = { · 15 unmodified lines
158	* This function calls vdso_test_clock_gettime and vdso_test_clock_getres	162	* This function calls vdso_test_clock_gettime and vdso_test_clock_getres
159	* with different values for clock_id.	163	* with different values for clock_id.
160	*/	164	*/
161	static inline int vdso_test_clock(clockid_t clock_id)	165	static inline void vdso_test_clock(clockid_t clock_id)
162	{	166	{
163	int ret0, ret1;	167	ksft_print_msg("\nclock_id: %s\n", vdso_clock_name[clock_id]);
164
165	ret0 = vdso_test_clock_gettime(clock_id);
166	/* A skipped test is considered passed */
167	if (ret0 == KSFT_SKIP)
168	ret0 = KSFT_PASS;
169
170	ret1 = vdso_test_clock_getres(clock_id);
171	/* A skipped test is considered passed */
172	if (ret1 == KSFT_SKIP)
173	ret1 = KSFT_PASS;
174		168
175	ret0 += ret1;	169	vdso_test_clock_gettime(clock_id);
176		170
177	printf("clock_id: %s", vdso_clock_name[clock_id]);	171	vdso_test_clock_getres(clock_id);
178
179	if (ret0 > 0)
180	printf(" [FAIL]\n");
181	else
182	printf(" [PASS]\n");
183
184	return ret0;
185	}	172	}
186		173
		174	#define VDSO_TEST_PLAN 16
		175
187	int main(int argc, char **argv)	176	int main(int argc, char **argv)
188	{	177	{
189	unsigned long sysinfo_ehdr = getauxval(AT_SYSINFO_EHDR);	178	unsigned long sysinfo_ehdr = getauxval(AT_SYSINFO_EHDR);
190	int ret;	179
		180	ksft_print_header();
		181	ksft_set_plan(VDSO_TEST_PLAN);
191		182
192	if (!sysinfo_ehdr) {	183	if (!sysinfo_ehdr) {
193	printf("AT_SYSINFO_EHDR is not present!\n");	184	printf("AT_SYSINFO_EHDR is not present!\n");
@@ -201,44 +192,42 @@ int main(int argc, char **argv) · 7 unmodified lines
201		192
202	vdso_init_from_sysinfo_ehdr(getauxval(AT_SYSINFO_EHDR));	193	vdso_init_from_sysinfo_ehdr(getauxval(AT_SYSINFO_EHDR));
203		194
204	ret = vdso_test_gettimeofday();	195	vdso_test_gettimeofday();
205		196
206	#if _POSIX_TIMERS > 0	197	#if _POSIX_TIMERS > 0
207		198
208	#ifdef CLOCK_REALTIME	199	#ifdef CLOCK_REALTIME
209	ret += vdso_test_clock(CLOCK_REALTIME);	200	vdso_test_clock(CLOCK_REALTIME);
210	#endif	201	#endif
211		202
212	#ifdef CLOCK_BOOTTIME	203	#ifdef CLOCK_BOOTTIME
213	ret += vdso_test_clock(CLOCK_BOOTTIME);	204	vdso_test_clock(CLOCK_BOOTTIME);
214	#endif	205	#endif
215		206
216	#ifdef CLOCK_TAI	207	#ifdef CLOCK_TAI
217	ret += vdso_test_clock(CLOCK_TAI);	208	vdso_test_clock(CLOCK_TAI);
218	#endif	209	#endif
219		210
220	#ifdef CLOCK_REALTIME_COARSE	211	#ifdef CLOCK_REALTIME_COARSE
221	ret += vdso_test_clock(CLOCK_REALTIME_COARSE);	212	vdso_test_clock(CLOCK_REALTIME_COARSE);
222	#endif	213	#endif
223		214
224	#ifdef CLOCK_MONOTONIC	215	#ifdef CLOCK_MONOTONIC
225	ret += vdso_test_clock(CLOCK_MONOTONIC);	216	vdso_test_clock(CLOCK_MONOTONIC);
226	#endif	217	#endif
227		218
228	#ifdef CLOCK_MONOTONIC_RAW	219	#ifdef CLOCK_MONOTONIC_RAW
229	ret += vdso_test_clock(CLOCK_MONOTONIC_RAW);	220	vdso_test_clock(CLOCK_MONOTONIC_RAW);
230	#endif	221	#endif
231		222
232	#ifdef CLOCK_MONOTONIC_COARSE	223	#ifdef CLOCK_MONOTONIC_COARSE
233	ret += vdso_test_clock(CLOCK_MONOTONIC_COARSE);	224	vdso_test_clock(CLOCK_MONOTONIC_COARSE);
234	#endif	225	#endif
235		226
236	#endif	227	#endif
237		228
238	ret += vdso_test_time();	229	vdso_test_time();
239
240	if (ret > 0)
241	return KSFT_FAIL;
242		230
243	return KSFT_PASS;	231	ksft_print_cnts();
		232	return ksft_get_fail_cnt() == 0 ? KSFT_PASS : KSFT_FAIL;
244	}	233	}

tools/testing/selftests/zram/zram.sh+1−14

@@ -2,9 +2,6 @@ · 1 unmodified line
2	# SPDX-License-Identifier: GPL-2.0	2	# SPDX-License-Identifier: GPL-2.0
3	TCID="zram.sh"	3	TCID="zram.sh"
4		4
5	# Kselftest framework requirement - SKIP code is 4.
6	ksft_skip=4
7
8	. ./zram_lib.sh	5	. ./zram_lib.sh
9		6
10	run_zram () {	7	run_zram () {
@@ -18,14 +15,4 @@ echo "" · 7 unmodified lines
18		15
19	check_prereqs	16	check_prereqs
20		17
21	# check zram module exists	18	run_zram
22	MODULE_PATH=/lib/modules/`uname -r`/kernel/drivers/block/zram/zram.ko
23	if [ -f $MODULE_PATH ]; then
24	run_zram
25	elif [ -b /dev/zram0 ]; then
26	run_zram
27	else
28	echo "$TCID : No zram.ko module or /dev/zram0 device file not found"
29	echo "$TCID : CONFIG_ZRAM is not set"
30	exit $ksft_skip
31	fi

tools/testing/selftests/zram/zram01.sh+9−24

 zram_fill_fs()
 {
-	local mem_free0=$(free -m | awk 'NR==2 {print $4}')
+	for i in $(seq $dev_start $dev_end); do
-	for i in $(seq 0 $(($dev_num - 1))); do
 		echo "fill zram$i..."
 		local b=0
 		while [ true ]; do
 			b=$(($b + 1))
 		done
 		echo "zram$i can be filled with '$b' KB"
-	done
-	local mem_free1=$(free -m | awk 'NR==2 {print $4}')
+		local mem_used_total=`awk '{print $3}' "/sys/block/zram$i/mm_stat"`
-	local used_mem=$(($mem_free0 - $mem_free1))
+		local v=$((100 * 1024 * $b / $mem_used_total))
+		if [ "$v" -lt 100 ]; then
+			 echo "FAIL compression ratio: 0.$v:1"
+			 ERR_CODE=-1
+			 return
+		fi
-	local total_size=0
+		echo "zram compression ratio: $(echo "scale=2; $v / 100 " | bc):1: OK"
-	for sm in $zram_sizes; do
-		local s=$(echo $sm | sed 's/M//')
-		total_size=$(($total_size + $s))
 	done
-	echo "zram used ${used_mem}M, zram disk sizes ${total_size}M"
-	local v=$((100 * $total_size / $used_mem))
-	if [ "$v" -lt 100 ]; then
-		echo "FAIL compression ratio: 0.$v:1"
-		ERR_CODE=-1
-		zram_cleanup
-		return
-	fi
-	echo "zram compression ratio: $(echo "scale=2; $v / 100 " | bc):1: OK"
 }
 check_prereqs
 zram_fill_fs
 zram_cleanup
-zram_unload
 if [ $ERR_CODE -ne 0 ]; then
 	echo "$TCID : [FAIL]"

tools/testing/selftests/zram/zram02.sh+0−1

@@ -36,7 +36,6 @@ zram_set_memlimit · 35 unmodified lines
36	zram_makeswap	36	zram_makeswap
37	zram_swapoff	37	zram_swapoff
38	zram_cleanup	38	zram_cleanup
39	zram_unload
40		39
41	if [ $ERR_CODE -ne 0 ]; then	40	if [ $ERR_CODE -ne 0 ]; then
42	echo "$TCID : [FAIL]"	41	echo "$TCID : [FAIL]"

tools/testing/selftests/zram/zram_lib.sh+88−46

@@ -5,12 +5,17 @@ · 4 unmodified lines
5	# Author: Alexey Kodanev <alexey.kodanev@oracle.com>	5	# Author: Alexey Kodanev <alexey.kodanev@oracle.com>
6	# Modified: Naresh Kamboju <naresh.kamboju@linaro.org>	6	# Modified: Naresh Kamboju <naresh.kamboju@linaro.org>
7		7
8	MODULE=0
9	dev_makeswap=-1	8	dev_makeswap=-1
10	dev_mounted=-1	9	dev_mounted=-1
11		10	dev_start=0
		11	dev_end=-1
		12	module_load=-1
		13	sys_control=-1
12	# Kselftest framework requirement - SKIP code is 4.	14	# Kselftest framework requirement - SKIP code is 4.
13	ksft_skip=4	15	ksft_skip=4
		16	kernel_version=`uname -r \| cut -d'.' -f1,2`
		17	kernel_major=${kernel_version%.*}
		18	kernel_minor=${kernel_version#*.}
14		19
15	trap INT	20	trap INT
16		21
@@ -25,68 +30,104 @@ check_prereqs() · 8 unmodified lines
25	fi	30	fi
26	}	31	}
27		32
		33	kernel_gte()
		34	{
		35	major=${1%.*}
		36	minor=${1#*.}
		37
		38	if [ $kernel_major -gt $major ]; then
		39	return 0
		40	elif [[ $kernel_major -eq $major && $kernel_minor -ge $minor ]]; then
		41	return 0
		42	fi
		43
		44	return 1
		45	}
		46
28	zram_cleanup()	47	zram_cleanup()
29	{	48	{
30	echo "zram cleanup"	49	echo "zram cleanup"
31	local i=	50	local i=
32	for i in $(seq 0 $dev_makeswap); do	51	for i in $(seq $dev_start $dev_makeswap); do
33	swapoff /dev/zram$i	52	swapoff /dev/zram$i
34	done	53	done
35		54
36	for i in $(seq 0 $dev_mounted); do	55	for i in $(seq $dev_start $dev_mounted); do
37	umount /dev/zram$i	56	umount /dev/zram$i
38	done	57	done
39		58
40	for i in $(seq 0 $(($dev_num - 1))); do	59	for i in $(seq $dev_start $dev_end); do
41	echo 1 > /sys/block/zram${i}/reset	60	echo 1 > /sys/block/zram${i}/reset
42	rm -rf zram$i	61	rm -rf zram$i
43	done	62	done
44		63
45	}	64	if [ $sys_control -eq 1 ]; then
		65	for i in $(seq $dev_start $dev_end); do
		66	echo $i > /sys/class/zram-control/hot_remove
		67	done
		68	fi
46		69
47	zram_unload()	70	if [ $module_load -eq 1 ]; then
48	{
49	if [ $MODULE -ne 0 ] ; then
50	echo "zram rmmod zram"
51	rmmod zram > /dev/null 2>&1	71	rmmod zram > /dev/null 2>&1
52	fi	72	fi
53	}	73	}
54		74
55	zram_load()	75	zram_load()
56	{	76	{
57	# check zram module exists	77	echo "create '$dev_num' zram device(s)"
58	MODULE_PATH=/lib/modules/`uname -r`/kernel/drivers/block/zram/zram.ko	78
59	if [ -f $MODULE_PATH ]; then	79	# zram module loaded, new kernel
60	MODULE=1	80	if [ -d "/sys/class/zram-control" ]; then
61	echo "create '$dev_num' zram device(s)"	81	echo "zram modules already loaded, kernel supports" \
62	modprobe zram num_devices=$dev_num	82	"zram-control interface"
63	if [ $? -ne 0 ]; then	83	dev_start=$(ls /dev/zram* \| wc -w)
64	echo "failed to insert zram module"	84	dev_end=$(($dev_start + $dev_num - 1))
65	exit 1	85	sys_control=1
66	fi	86
67		87	for i in $(seq $dev_start $dev_end); do
68	dev_num_created=$(ls /dev/zram* \| wc -w)	88	cat /sys/class/zram-control/hot_add > /dev/null
		89	done
		90
		91	echo "all zram devices (/dev/zram$dev_start~$dev_end" \
		92	"successfully created"
		93	return 0
		94	fi
69		95
70	if [ "$dev_num_created" -ne "$dev_num" ]; then	96	# detect old kernel or built-in
71	echo "unexpected num of devices: $dev_num_created"	97	modprobe zram num_devices=$dev_num
72	ERR_CODE=-1	98	if [ ! -d "/sys/class/zram-control" ]; then
		99	if grep -q '^zram' /proc/modules; then
		100	rmmod zram > /dev/null 2>&1
		101	if [ $? -ne 0 ]; then
		102	echo "zram module is being used on old kernel" \
		103	"without zram-control interface"
		104	exit $ksft_skip
		105	fi
73	else	106	else
74	echo "zram load module successful"	107	echo "test needs CONFIG_ZRAM=m on old kernel without" \
		108	"zram-control interface"
		109	exit $ksft_skip
75	fi	110	fi
76	elif [ -b /dev/zram0 ]; then	111	modprobe zram num_devices=$dev_num
77	echo "/dev/zram0 device file found: OK"
78	else
79	echo "ERROR: No zram.ko module or no /dev/zram0 device found"
80	echo "$TCID : CONFIG_ZRAM is not set"
81	exit 1
82	fi	112	fi
		113
		114	module_load=1
		115	dev_end=$(($dev_num - 1))
		116	echo "all zram devices (/dev/zram0~$dev_end) successfully created"
83	}	117	}
84		118
85	zram_max_streams()	119	zram_max_streams()
86	{	120	{
87	echo "set max_comp_streams to zram device(s)"	121	echo "set max_comp_streams to zram device(s)"
88		122
89	local i=0	123	kernel_gte 4.7
		124	if [ $? -eq 0 ]; then
		125	echo "The device attribute max_comp_streams was"\
		126	"deprecated in 4.7"
		127	return 0
		128	fi
		129
		130	local i=$dev_start
90	for max_s in $zram_max_streams; do	131	for max_s in $zram_max_streams; do
91	local sys_path="/sys/block/zram${i}/max_comp_streams"	132	local sys_path="/sys/block/zram${i}/max_comp_streams"
92	echo $max_s > $sys_path \|\| \	133	echo $max_s > $sys_path \|\| \
@@ -98,7 +139,7 @@ zram_max_streams() · 5 unmodified lines
98	echo "FAIL can't set max_streams '$max_s', get $max_stream"	139	echo "FAIL can't set max_streams '$max_s', get $max_stream"
99		140
100	i=$(($i + 1))	141	i=$(($i + 1))
101	echo "$sys_path = '$max_streams' ($i/$dev_num)"	142	echo "$sys_path = '$max_streams'"
102	done	143	done
103		144
104	echo "zram max streams: OK"	145	echo "zram max streams: OK"
@@ -108,15 +149,16 @@ zram_compress_alg() · 3 unmodified lines
108	{	149	{
109	echo "test that we can set compression algorithm"	150	echo "test that we can set compression algorithm"
110		151
111	local algs=$(cat /sys/block/zram0/comp_algorithm)	152	local i=$dev_start
		153	local algs=$(cat /sys/block/zram${i}/comp_algorithm)
112	echo "supported algs: $algs"	154	echo "supported algs: $algs"
113	local i=0	155
114	for alg in $zram_algs; do	156	for alg in $zram_algs; do
115	local sys_path="/sys/block/zram${i}/comp_algorithm"	157	local sys_path="/sys/block/zram${i}/comp_algorithm"
116	echo "$alg" > $sys_path \|\| \	158	echo "$alg" > $sys_path \|\| \
117	echo "FAIL can't set '$alg' to $sys_path"	159	echo "FAIL can't set '$alg' to $sys_path"
118	i=$(($i + 1))	160	i=$(($i + 1))
119	echo "$sys_path = '$alg' ($i/$dev_num)"	161	echo "$sys_path = '$alg'"
120	done	162	done
121		163
122	echo "zram set compression algorithm: OK"	164	echo "zram set compression algorithm: OK"
@@ -125,14 +167,14 @@ zram_compress_alg() · 2 unmodified lines
125	zram_set_disksizes()	167	zram_set_disksizes()
126	{	168	{
127	echo "set disk size to zram device(s)"	169	echo "set disk size to zram device(s)"
128	local i=0	170	local i=$dev_start
129	for ds in $zram_sizes; do	171	for ds in $zram_sizes; do
130	local sys_path="/sys/block/zram${i}/disksize"	172	local sys_path="/sys/block/zram${i}/disksize"
131	echo "$ds" > $sys_path \|\| \	173	echo "$ds" > $sys_path \|\| \
132	echo "FAIL can't set '$ds' to $sys_path"	174	echo "FAIL can't set '$ds' to $sys_path"
133		175
134	i=$(($i + 1))	176	i=$(($i + 1))
135	echo "$sys_path = '$ds' ($i/$dev_num)"	177	echo "$sys_path = '$ds'"
136	done	178	done
137		179
138	echo "zram set disksizes: OK"	180	echo "zram set disksizes: OK"
@@ -142,14 +184,14 @@ zram_set_memlimit() · 3 unmodified lines
142	{	184	{
143	echo "set memory limit to zram device(s)"	185	echo "set memory limit to zram device(s)"
144		186
145	local i=0	187	local i=$dev_start
146	for ds in $zram_mem_limits; do	188	for ds in $zram_mem_limits; do
147	local sys_path="/sys/block/zram${i}/mem_limit"	189	local sys_path="/sys/block/zram${i}/mem_limit"
148	echo "$ds" > $sys_path \|\| \	190	echo "$ds" > $sys_path \|\| \
149	echo "FAIL can't set '$ds' to $sys_path"	191	echo "FAIL can't set '$ds' to $sys_path"
150		192
151	i=$(($i + 1))	193	i=$(($i + 1))
152	echo "$sys_path = '$ds' ($i/$dev_num)"	194	echo "$sys_path = '$ds'"
153	done	195	done
154		196
155	echo "zram set memory limit: OK"	197	echo "zram set memory limit: OK"
@@ -158,8 +200,8 @@ zram_set_memlimit() · 2 unmodified lines
158	zram_makeswap()	200	zram_makeswap()
159	{	201	{
160	echo "make swap with zram device(s)"	202	echo "make swap with zram device(s)"
161	local i=0	203	local i=$dev_start
162	for i in $(seq 0 $(($dev_num - 1))); do	204	for i in $(seq $dev_start $dev_end); do
163	mkswap /dev/zram$i > err.log 2>&1	205	mkswap /dev/zram$i > err.log 2>&1
164	if [ $? -ne 0 ]; then	206	if [ $? -ne 0 ]; then
165	cat err.log	207	cat err.log
@@ -182,7 +224,7 @@ zram_makeswap() · 16 unmodified lines
182	zram_swapoff()	224	zram_swapoff()
183	{	225	{
184	local i=	226	local i=
185	for i in $(seq 0 $dev_makeswap); do	227	for i in $(seq $dev_start $dev_end); do
186	swapoff /dev/zram$i > err.log 2>&1	228	swapoff /dev/zram$i > err.log 2>&1
187	if [ $? -ne 0 ]; then	229	if [ $? -ne 0 ]; then
188	cat err.log	230	cat err.log
@@ -196,7 +238,7 @@ zram_swapoff() · 7 unmodified lines
196		238
197	zram_makefs()	239	zram_makefs()
198	{	240	{
199	local i=0	241	local i=$dev_start
200	for fs in $zram_filesystems; do	242	for fs in $zram_filesystems; do
201	# if requested fs not supported default it to ext2	243	# if requested fs not supported default it to ext2
202	which mkfs.$fs > /dev/null 2>&1 \|\| fs=ext2	244	which mkfs.$fs > /dev/null 2>&1 \|\| fs=ext2
@@ -215,7 +257,7 @@ zram_makefs() · 12 unmodified lines
215	zram_mount()	257	zram_mount()
216	{	258	{
217	local i=0	259	local i=0
218	for i in $(seq 0 $(($dev_num - 1))); do	260	for i in $(seq $dev_start $dev_end); do
219	echo "mount /dev/zram$i"	261	echo "mount /dev/zram$i"
220	mkdir zram$i	262	mkdir zram$i
221	mount /dev/zram$i zram$i > /dev/null \|\| \	263	mount /dev/zram$i zram$i > /dev/null \|\| \

tools/tracing/Makefile+14−4

 # SPDX-License-Identifier: GPL-2.0
 include ../scripts/Makefile.include
-all: latency
+all: latency rtla
-clean: latency_clean
+clean: latency_clean rtla_clean
-install: latency_install
+install: latency_install rtla_install
 latency:
 	$(call descend,latency)
 latency_clean:
 	$(call descend,latency,clean)
-.PHONY: all install clean latency latency_install latency_clean
+rtla:
+	$(call descend,rtla)
+rtla_install:
+	$(call descend,rtla,install)
+rtla_clean:
+	$(call descend,rtla,clean)
+.PHONY: all install clean latency latency_install latency_clean \
+	rtla rtla_install rtla_clean

tools/tracing/rtla/Makefile+1−1

@@ -59,7 +59,7 @@ endif · 58 unmodified lines
59	.PHONY: all	59	.PHONY: all
60	all: rtla	60	all: rtla
61		61
62	rtla: $(OBJ) doc	62	rtla: $(OBJ)
63	$(CC) -o rtla $(LDFLAGS) $(OBJ) $(LIBS)	63	$(CC) -o rtla $(LDFLAGS) $(OBJ) $(LIBS)
64		64
65	static: $(OBJ)	65	static: $(OBJ)

usr/include/Makefile+1−0

@@ -28,6 +28,7 @@ no-header-test += linux/am437x-vpfe.h · 27 unmodified lines
28	no-header-test += linux/android/binder.h	28	no-header-test += linux/android/binder.h
29	no-header-test += linux/android/binderfs.h	29	no-header-test += linux/android/binderfs.h
30	no-header-test += linux/coda.h	30	no-header-test += linux/coda.h
		31	no-header-test += linux/cyclades.h
31	no-header-test += linux/errqueue.h	32	no-header-test += linux/errqueue.h
32	no-header-test += linux/fsmap.h	33	no-header-test += linux/fsmap.h
33	no-header-test += linux/hdlc/ioctl.h	34	no-header-test += linux/hdlc/ioctl.h

virt/kvm/eventfd.c+4−4

@@ -463,8 +463,8 @@ bool kvm_irq_has_notifier(struct kvm *kvm, unsigned irqchip, unsigned pin) · 462 unmodified lines
463	idx = srcu_read_lock(&kvm->irq_srcu);	463	idx = srcu_read_lock(&kvm->irq_srcu);
464	gsi = kvm_irq_map_chip_pin(kvm, irqchip, pin);	464	gsi = kvm_irq_map_chip_pin(kvm, irqchip, pin);
465	if (gsi != -1)	465	if (gsi != -1)
466	hlist_for_each_entry_rcu(kian, &kvm->irq_ack_notifier_list,	466	hlist_for_each_entry_srcu(kian, &kvm->irq_ack_notifier_list,
467	link)	467	link, srcu_read_lock_held(&kvm->irq_srcu))
468	if (kian->gsi == gsi) {	468	if (kian->gsi == gsi) {
469	srcu_read_unlock(&kvm->irq_srcu, idx);	469	srcu_read_unlock(&kvm->irq_srcu, idx);
470	return true;	470	return true;
@@ -480,8 +480,8 @@ void kvm_notify_acked_gsi(struct kvm *kvm, int gsi) · 9 unmodified lines
480	{	480	{
481	struct kvm_irq_ack_notifier *kian;	481	struct kvm_irq_ack_notifier *kian;
482		482
483	hlist_for_each_entry_rcu(kian, &kvm->irq_ack_notifier_list,	483	hlist_for_each_entry_srcu(kian, &kvm->irq_ack_notifier_list,
484	link)	484	link, srcu_read_lock_held(&kvm->irq_srcu))
485	if (kian->gsi == gsi)	485	if (kian->gsi == gsi)
486	kian->irq_acked(kian);	486	kian->irq_acked(kian);
487	}	487	}

virt/kvm/kvm_main.c+3−5

 	return NULL;
 }
-EXPORT_SYMBOL_GPL(kvm_vcpu_gfn_to_memslot);
 bool kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn)
 {
 }
 static int hva_to_pfn_remapped(struct vm_area_struct *vma,
-			       unsigned long addr, bool *async,
+			       unsigned long addr, bool write_fault,
-			       bool write_fault, bool *writable,
+			       bool *writable, kvm_pfn_t *p_pfn)
-			       kvm_pfn_t *p_pfn)
 {
 	kvm_pfn_t pfn;
 	pte_t *ptep;
 	if (vma == NULL)
 		pfn = KVM_PFN_ERR_FAULT;
 	else if (vma->vm_flags & (VM_IO | VM_PFNMAP)) {
-		r = hva_to_pfn_remapped(vma, addr, async, write_fault, writable, &pfn);
+		r = hva_to_pfn_remapped(vma, addr, write_fault, writable, &pfn);
 		if (r == -EAGAIN)
 			goto retry;
 		if (r < 0)

@@ -52,6 +52,7 @@ static const struct e1000_info *e1000_info_tbl[] = { · 51 unmodified lines
52	[board_pch_spt] = &e1000_pch_spt_info,	52	[board_pch_spt] = &e1000_pch_spt_info,
53	[board_pch_cnp] = &e1000_pch_cnp_info,	53	[board_pch_cnp] = &e1000_pch_cnp_info,
54	[board_pch_tgp] = &e1000_pch_tgp_info,	54	[board_pch_tgp] = &e1000_pch_tgp_info,
		55	[board_pch_adp] = &e1000_pch_adp_info,
55	};	56	};
56		57
57	struct e1000_reg_info {	58	struct e1000_reg_info {
@@ -6341,7 +6342,8 @@ static void e1000e_s0ix_entry_flow(struct e1000_adapter *adapter) · 6283 unmodified lines
6341	u32 mac_data;	6342	u32 mac_data;
6342	u16 phy_data;	6343	u16 phy_data;
6343		6344
6344	if (er32(FWSM) & E1000_ICH_FWSM_FW_VALID) {	6345	if (er32(FWSM) & E1000_ICH_FWSM_FW_VALID &&
		6346	hw->mac.type >= e1000_pch_adp) {
6345	/* Request ME configure the device for S0ix */	6347	/* Request ME configure the device for S0ix */
6346	mac_data = er32(H2ME);	6348	mac_data = er32(H2ME);
6347	mac_data \|= E1000_H2ME_START_DPG;	6349	mac_data \|= E1000_H2ME_START_DPG;
@@ -6490,7 +6492,8 @@ static void e1000e_s0ix_exit_flow(struct e1000_adapter *adapter) · 142 unmodified lines
6490	u16 phy_data;	6492	u16 phy_data;
6491	u32 i = 0;	6493	u32 i = 0;
6492		6494
6493	if (er32(FWSM) & E1000_ICH_FWSM_FW_VALID) {	6495	if (er32(FWSM) & E1000_ICH_FWSM_FW_VALID &&
		6496	hw->mac.type >= e1000_pch_adp) {
6494	/* Request ME unconfigure the device from S0ix */	6497	/* Request ME unconfigure the device from S0ix */
6495	mac_data = er32(H2ME);	6498	mac_data = er32(H2ME);
6496	mac_data &= ~E1000_H2ME_START_DPG;	6499	mac_data &= ~E1000_H2ME_START_DPG;
@@ -7890,22 +7893,22 @@ static const struct pci_device_id e1000_pci_tbl[] = { · 1393 unmodified lines
7890	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V14), board_pch_tgp },	7893	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V14), board_pch_tgp },
7891	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM15), board_pch_tgp },	7894	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM15), board_pch_tgp },
7892	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V15), board_pch_tgp },	7895	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V15), board_pch_tgp },
7893	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM23), board_pch_tgp },	7896	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM23), board_pch_adp },
7894	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V23), board_pch_tgp },	7897	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V23), board_pch_adp },
7895	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM16), board_pch_tgp },	7898	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM16), board_pch_adp },
7896	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V16), board_pch_tgp },	7899	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V16), board_pch_adp },
7897	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM17), board_pch_tgp },	7900	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM17), board_pch_adp },
7898	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V17), board_pch_tgp },	7901	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V17), board_pch_adp },
7899	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM22), board_pch_tgp },	7902	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM22), board_pch_adp },
7900	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V22), board_pch_tgp },	7903	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V22), board_pch_adp },
7901	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM18), board_pch_tgp },	7904	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM18), board_pch_adp },
7902	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V18), board_pch_tgp },	7905	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V18), board_pch_adp },
7903	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM19), board_pch_tgp },	7906	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM19), board_pch_adp },
7904	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V19), board_pch_tgp },	7907	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V19), board_pch_adp },
7905	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM20), board_pch_tgp },	7908	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM20), board_pch_adp },
7906	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V20), board_pch_tgp },	7909	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V20), board_pch_adp },
7907	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM21), board_pch_tgp },	7910	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM21), board_pch_adp },
7908	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V21), board_pch_tgp },	7911	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V21), board_pch_adp },
7909		7912
7910	{ 0, 0, 0, 0, 0, 0, 0 } /* terminate list */	7913	{ 0, 0, 0, 0, 0, 0, 0 } /* terminate list */
7911	};	7914	};

@@ -363,16 +363,16 @@ static const struct sunxi_desc_pin h616_pins[] = { · 362 unmodified lines
363	SUNXI_FUNCTION(0x0, "gpio_in"),	363	SUNXI_FUNCTION(0x0, "gpio_in"),
364	SUNXI_FUNCTION(0x1, "gpio_out"),	364	SUNXI_FUNCTION(0x1, "gpio_out"),
365	SUNXI_FUNCTION(0x2, "uart2"), /* CTS */	365	SUNXI_FUNCTION(0x2, "uart2"), /* CTS */
366	SUNXI_FUNCTION(0x3, "i2s3"), /* DO0 */	366	SUNXI_FUNCTION(0x3, "i2s3_dout0"), /* DO0 */
367	SUNXI_FUNCTION(0x4, "spi1"), /* MISO */	367	SUNXI_FUNCTION(0x4, "spi1"), /* MISO */
368	SUNXI_FUNCTION(0x5, "i2s3"), /* DI1 */	368	SUNXI_FUNCTION(0x5, "i2s3_din1"), /* DI1 */
369	SUNXI_FUNCTION_IRQ_BANK(0x6, 6, 8)), /* PH_EINT8 */	369	SUNXI_FUNCTION_IRQ_BANK(0x6, 6, 8)), /* PH_EINT8 */
370	SUNXI_PIN(SUNXI_PINCTRL_PIN(H, 9),	370	SUNXI_PIN(SUNXI_PINCTRL_PIN(H, 9),
371	SUNXI_FUNCTION(0x0, "gpio_in"),	371	SUNXI_FUNCTION(0x0, "gpio_in"),
372	SUNXI_FUNCTION(0x1, "gpio_out"),	372	SUNXI_FUNCTION(0x1, "gpio_out"),
373	SUNXI_FUNCTION(0x3, "i2s3"), /* DI0 */	373	SUNXI_FUNCTION(0x3, "i2s3_din0"), /* DI0 */
374	SUNXI_FUNCTION(0x4, "spi1"), /* CS1 */	374	SUNXI_FUNCTION(0x4, "spi1"), /* CS1 */
375	SUNXI_FUNCTION(0x3, "i2s3"), /* DO1 */	375	SUNXI_FUNCTION(0x5, "i2s3_dout1"), /* DO1 */
376	SUNXI_FUNCTION_IRQ_BANK(0x6, 6, 9)), /* PH_EINT9 */	376	SUNXI_FUNCTION_IRQ_BANK(0x6, 6, 9)), /* PH_EINT9 */
377	SUNXI_PIN(SUNXI_PINCTRL_PIN(H, 10),	377	SUNXI_PIN(SUNXI_PINCTRL_PIN(H, 10),
378	SUNXI_FUNCTION(0x0, "gpio_in"),	378	SUNXI_FUNCTION(0x0, "gpio_in"),