Add / remove odroid xu4 patches

patch/kernel/odroidxu4-current/patch-5.4.62-63.patch

@@ -1,931 +0,0 @@
-diff --git a/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt b/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt
-index 2cf3affa1be70..96c0b1440c9c5 100644
---- a/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt
-+++ b/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt
-@@ -15,8 +15,15 @@ Required properties:
-   - "nvidia,tegra210-sdhci": for Tegra210
-   - "nvidia,tegra186-sdhci": for Tegra186
-   - "nvidia,tegra194-sdhci": for Tegra194
--- clocks : Must contain one entry, for the module clock.
--  See ../clocks/clock-bindings.txt for details.
-+- clocks: For Tegra210, Tegra186 and Tegra194 must contain two entries.
-+	  One for the module clock and one for the timeout clock.
-+	  For all other Tegra devices, must contain a single entry for
-+	  the module clock. See ../clocks/clock-bindings.txt for details.
-+- clock-names: For Tegra210, Tegra186 and Tegra194 must contain the
-+	       strings 'sdhci' and 'tmclk' to represent the module and
-+	       the timeout clocks, respectively.
-+	       For all other Tegra devices must contain the string 'sdhci'
-+	       to represent the module clock.
- - resets : Must contain an entry for each entry in reset-names.
-   See ../reset/reset.txt for details.
- - reset-names : Must include the following entries:
-@@ -99,7 +106,7 @@ Optional properties for Tegra210, Tegra186 and Tegra194:
- 
- Example:
- sdhci@700b0000 {
--	compatible = "nvidia,tegra210-sdhci", "nvidia,tegra124-sdhci";
-+	compatible = "nvidia,tegra124-sdhci";
- 	reg = <0x0 0x700b0000 0x0 0x200>;
- 	interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
- 	clocks = <&tegra_car TEGRA210_CLK_SDMMC1>;
-@@ -115,3 +122,22 @@ sdhci@700b0000 {
- 	nvidia,pad-autocal-pull-down-offset-1v8 = <0x7b>;
- 	status = "disabled";
- };
-+
-+sdhci@700b0000 {
-+	compatible = "nvidia,tegra210-sdhci";
-+	reg = <0x0 0x700b0000 0x0 0x200>;
-+	interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
-+	clocks = <&tegra_car TEGRA210_CLK_SDMMC1>,
-+		 <&tegra_car TEGRA210_CLK_SDMMC_LEGACY>;
-+	clock-names = "sdhci", "tmclk";
-+	resets = <&tegra_car 14>;
-+	reset-names = "sdhci";
-+	pinctrl-names = "sdmmc-3v3", "sdmmc-1v8";
-+	pinctrl-0 = <&sdmmc1_3v3>;
-+	pinctrl-1 = <&sdmmc1_1v8>;
-+	nvidia,pad-autocal-pull-up-offset-3v3 = <0x00>;
-+	nvidia,pad-autocal-pull-down-offset-3v3 = <0x7d>;
-+	nvidia,pad-autocal-pull-up-offset-1v8 = <0x7b>;
-+	nvidia,pad-autocal-pull-down-offset-1v8 = <0x7b>;
-+	status = "disabled";
-+};
-diff --git a/Makefile b/Makefile
-index aece56450bd9d..418814b108ae6 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- VERSION = 5
- PATCHLEVEL = 4
--SUBLEVEL = 62
-+SUBLEVEL = 63
- EXTRAVERSION =
- NAME = Kleptomaniac Octopus
- 
-diff --git a/arch/arm64/boot/dts/nvidia/tegra186.dtsi b/arch/arm64/boot/dts/nvidia/tegra186.dtsi
-index 47cd831fcf445..9abf0cb1dd67f 100644
---- a/arch/arm64/boot/dts/nvidia/tegra186.dtsi
-+++ b/arch/arm64/boot/dts/nvidia/tegra186.dtsi
-@@ -309,8 +309,9 @@
- 		compatible = "nvidia,tegra186-sdhci";
- 		reg = <0x0 0x03400000 0x0 0x10000>;
- 		interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
--		clocks = <&bpmp TEGRA186_CLK_SDMMC1>;
--		clock-names = "sdhci";
-+		clocks = <&bpmp TEGRA186_CLK_SDMMC1>,
-+			 <&bpmp TEGRA186_CLK_SDMMC_LEGACY_TM>;
-+		clock-names = "sdhci", "tmclk";
- 		resets = <&bpmp TEGRA186_RESET_SDMMC1>;
- 		reset-names = "sdhci";
- 		iommus = <&smmu TEGRA186_SID_SDMMC1>;
-@@ -335,8 +336,9 @@
- 		compatible = "nvidia,tegra186-sdhci";
- 		reg = <0x0 0x03420000 0x0 0x10000>;
- 		interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
--		clocks = <&bpmp TEGRA186_CLK_SDMMC2>;
--		clock-names = "sdhci";
-+		clocks = <&bpmp TEGRA186_CLK_SDMMC2>,
-+			 <&bpmp TEGRA186_CLK_SDMMC_LEGACY_TM>;
-+		clock-names = "sdhci", "tmclk";
- 		resets = <&bpmp TEGRA186_RESET_SDMMC2>;
- 		reset-names = "sdhci";
- 		iommus = <&smmu TEGRA186_SID_SDMMC2>;
-@@ -356,8 +358,9 @@
- 		compatible = "nvidia,tegra186-sdhci";
- 		reg = <0x0 0x03440000 0x0 0x10000>;
- 		interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
--		clocks = <&bpmp TEGRA186_CLK_SDMMC3>;
--		clock-names = "sdhci";
-+		clocks = <&bpmp TEGRA186_CLK_SDMMC3>,
-+			 <&bpmp TEGRA186_CLK_SDMMC_LEGACY_TM>;
-+		clock-names = "sdhci", "tmclk";
- 		resets = <&bpmp TEGRA186_RESET_SDMMC3>;
- 		reset-names = "sdhci";
- 		iommus = <&smmu TEGRA186_SID_SDMMC3>;
-@@ -379,8 +382,9 @@
- 		compatible = "nvidia,tegra186-sdhci";
- 		reg = <0x0 0x03460000 0x0 0x10000>;
- 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
--		clocks = <&bpmp TEGRA186_CLK_SDMMC4>;
--		clock-names = "sdhci";
-+		clocks = <&bpmp TEGRA186_CLK_SDMMC4>,
-+			 <&bpmp TEGRA186_CLK_SDMMC_LEGACY_TM>;
-+		clock-names = "sdhci", "tmclk";
- 		assigned-clocks = <&bpmp TEGRA186_CLK_SDMMC4>,
- 				  <&bpmp TEGRA186_CLK_PLLC4_VCO>;
- 		assigned-clock-parents = <&bpmp TEGRA186_CLK_PLLC4_VCO>;
-diff --git a/arch/arm64/boot/dts/nvidia/tegra194.dtsi b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
-index 2f3926719434a..5728255bd0c1a 100644
---- a/arch/arm64/boot/dts/nvidia/tegra194.dtsi
-+++ b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
-@@ -403,8 +403,9 @@
- 			compatible = "nvidia,tegra194-sdhci", "nvidia,tegra186-sdhci";
- 			reg = <0x03400000 0x10000>;
- 			interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
--			clocks = <&bpmp TEGRA194_CLK_SDMMC1>;
--			clock-names = "sdhci";
-+			clocks = <&bpmp TEGRA194_CLK_SDMMC1>,
-+				 <&bpmp TEGRA194_CLK_SDMMC_LEGACY_TM>;
-+			clock-names = "sdhci", "tmclk";
- 			resets = <&bpmp TEGRA194_RESET_SDMMC1>;
- 			reset-names = "sdhci";
- 			nvidia,pad-autocal-pull-up-offset-3v3-timeout =
-@@ -425,8 +426,9 @@
- 			compatible = "nvidia,tegra194-sdhci", "nvidia,tegra186-sdhci";
- 			reg = <0x03440000 0x10000>;
- 			interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
--			clocks = <&bpmp TEGRA194_CLK_SDMMC3>;
--			clock-names = "sdhci";
-+			clocks = <&bpmp TEGRA194_CLK_SDMMC3>,
-+				 <&bpmp TEGRA194_CLK_SDMMC_LEGACY_TM>;
-+			clock-names = "sdhci", "tmclk";
- 			resets = <&bpmp TEGRA194_RESET_SDMMC3>;
- 			reset-names = "sdhci";
- 			nvidia,pad-autocal-pull-up-offset-1v8 = <0x00>;
-@@ -448,8 +450,9 @@
- 			compatible = "nvidia,tegra194-sdhci", "nvidia,tegra186-sdhci";
- 			reg = <0x03460000 0x10000>;
- 			interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
--			clocks = <&bpmp TEGRA194_CLK_SDMMC4>;
--			clock-names = "sdhci";
-+			clocks = <&bpmp TEGRA194_CLK_SDMMC4>,
-+				 <&bpmp TEGRA194_CLK_SDMMC_LEGACY_TM>;
-+			clock-names = "sdhci", "tmclk";
- 			assigned-clocks = <&bpmp TEGRA194_CLK_SDMMC4>,
- 					  <&bpmp TEGRA194_CLK_PLLC4>;
- 			assigned-clock-parents =
-diff --git a/arch/arm64/boot/dts/nvidia/tegra210.dtsi b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
-index 659753118e96f..078d2506365c0 100644
---- a/arch/arm64/boot/dts/nvidia/tegra210.dtsi
-+++ b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
-@@ -1116,8 +1116,9 @@
- 		compatible = "nvidia,tegra210-sdhci", "nvidia,tegra124-sdhci";
- 		reg = <0x0 0x700b0000 0x0 0x200>;
- 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
--		clocks = <&tegra_car TEGRA210_CLK_SDMMC1>;
--		clock-names = "sdhci";
-+		clocks = <&tegra_car TEGRA210_CLK_SDMMC1>,
-+			 <&tegra_car TEGRA210_CLK_SDMMC_LEGACY>;
-+		clock-names = "sdhci", "tmclk";
- 		resets = <&tegra_car 14>;
- 		reset-names = "sdhci";
- 		pinctrl-names = "sdmmc-3v3", "sdmmc-1v8",
-@@ -1144,8 +1145,9 @@
- 		compatible = "nvidia,tegra210-sdhci", "nvidia,tegra124-sdhci";
- 		reg = <0x0 0x700b0200 0x0 0x200>;
- 		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
--		clocks = <&tegra_car TEGRA210_CLK_SDMMC2>;
--		clock-names = "sdhci";
-+		clocks = <&tegra_car TEGRA210_CLK_SDMMC2>,
-+			 <&tegra_car TEGRA210_CLK_SDMMC_LEGACY>;
-+		clock-names = "sdhci", "tmclk";
- 		resets = <&tegra_car 9>;
- 		reset-names = "sdhci";
- 		pinctrl-names = "sdmmc-1v8-drv";
-@@ -1161,8 +1163,9 @@
- 		compatible = "nvidia,tegra210-sdhci", "nvidia,tegra124-sdhci";
- 		reg = <0x0 0x700b0400 0x0 0x200>;
- 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
--		clocks = <&tegra_car TEGRA210_CLK_SDMMC3>;
--		clock-names = "sdhci";
-+		clocks = <&tegra_car TEGRA210_CLK_SDMMC3>,
-+			 <&tegra_car TEGRA210_CLK_SDMMC_LEGACY>;
-+		clock-names = "sdhci", "tmclk";
- 		resets = <&tegra_car 69>;
- 		reset-names = "sdhci";
- 		pinctrl-names = "sdmmc-3v3", "sdmmc-1v8",
-@@ -1184,8 +1187,9 @@
- 		compatible = "nvidia,tegra210-sdhci", "nvidia,tegra124-sdhci";
- 		reg = <0x0 0x700b0600 0x0 0x200>;
- 		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
--		clocks = <&tegra_car TEGRA210_CLK_SDMMC4>;
--		clock-names = "sdhci";
-+		clocks = <&tegra_car TEGRA210_CLK_SDMMC4>,
-+			 <&tegra_car TEGRA210_CLK_SDMMC_LEGACY>;
-+		clock-names = "sdhci", "tmclk";
- 		resets = <&tegra_car 15>;
- 		reset-names = "sdhci";
- 		pinctrl-names = "sdmmc-3v3-drv", "sdmmc-1v8-drv";
-diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h
-index ddf9d762ac622..a4ffd9b55e72c 100644
---- a/arch/arm64/include/asm/kvm_arm.h
-+++ b/arch/arm64/include/asm/kvm_arm.h
-@@ -72,11 +72,12 @@
-  * IMO:		Override CPSR.I and enable signaling with VI
-  * FMO:		Override CPSR.F and enable signaling with VF
-  * SWIO:	Turn set/way invalidates into set/way clean+invalidate
-+ * PTW:		Take a stage2 fault if a stage1 walk steps in device memory
-  */
- #define HCR_GUEST_FLAGS (HCR_TSC | HCR_TSW | HCR_TWE | HCR_TWI | HCR_VM | \
- 			 HCR_TVM | HCR_BSU_IS | HCR_FB | HCR_TAC | \
- 			 HCR_AMO | HCR_SWIO | HCR_TIDCP | HCR_RW | HCR_TLOR | \
--			 HCR_FMO | HCR_IMO)
-+			 HCR_FMO | HCR_IMO | HCR_PTW )
- #define HCR_VIRT_EXCP_MASK (HCR_VSE | HCR_VI | HCR_VF)
- #define HCR_HOST_NVHE_FLAGS (HCR_RW | HCR_API | HCR_APK)
- #define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H)
-diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h
-index 44a243754c1b8..64d79b2884344 100644
---- a/arch/arm64/include/asm/kvm_asm.h
-+++ b/arch/arm64/include/asm/kvm_asm.h
-@@ -88,6 +88,34 @@ extern u32 __kvm_get_mdcr_el2(void);
- 		*__hyp_this_cpu_ptr(sym);				\
- 	 })
- 
-+#define __KVM_EXTABLE(from, to)						\
-+	"	.pushsection	__kvm_ex_table, \"a\"\n"		\
-+	"	.align		3\n"					\
-+	"	.long		(" #from " - .), (" #to " - .)\n"	\
-+	"	.popsection\n"
-+
-+
-+#define __kvm_at(at_op, addr)						\
-+( { 									\
-+	int __kvm_at_err = 0;						\
-+	u64 spsr, elr;							\
-+	asm volatile(							\
-+	"	mrs	%1, spsr_el2\n"					\
-+	"	mrs	%2, elr_el2\n"					\
-+	"1:	at	"at_op", %3\n"					\
-+	"	isb\n"							\
-+	"	b	9f\n"						\
-+	"2:	msr	spsr_el2, %1\n"					\
-+	"	msr	elr_el2, %2\n"					\
-+	"	mov	%w0, %4\n"					\
-+	"9:\n"								\
-+	__KVM_EXTABLE(1b, 2b)						\
-+	: "+r" (__kvm_at_err), "=&r" (spsr), "=&r" (elr)		\
-+	: "r" (addr), "i" (-EFAULT));					\
-+	__kvm_at_err;							\
-+} )
-+
-+
- #else /* __ASSEMBLY__ */
- 
- .macro hyp_adr_this_cpu reg, sym, tmp
-@@ -113,6 +141,21 @@ extern u32 __kvm_get_mdcr_el2(void);
- 	kern_hyp_va	\vcpu
- .endm
- 
-+/*
-+ * KVM extable for unexpected exceptions.
-+ * In the same format _asm_extable, but output to a different section so that
-+ * it can be mapped to EL2. The KVM version is not sorted. The caller must
-+ * ensure:
-+ * x18 has the hypervisor value to allow any Shadow-Call-Stack instrumented
-+ * code to write to it, and that SPSR_EL2 and ELR_EL2 are restored by the fixup.
-+ */
-+.macro	_kvm_extable, from, to
-+	.pushsection	__kvm_ex_table, "a"
-+	.align		3
-+	.long		(\from - .), (\to - .)
-+	.popsection
-+.endm
-+
- #endif
- 
- #endif /* __ARM_KVM_ASM_H__ */
-diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
-index 8d0374ffdd2d6..4f77de8ce1384 100644
---- a/arch/arm64/kernel/vmlinux.lds.S
-+++ b/arch/arm64/kernel/vmlinux.lds.S
-@@ -24,6 +24,13 @@ ENTRY(_text)
- 
- jiffies = jiffies_64;
- 
-+
-+#define HYPERVISOR_EXTABLE					\
-+	. = ALIGN(SZ_8);					\
-+	__start___kvm_ex_table = .;				\
-+	*(__kvm_ex_table)					\
-+	__stop___kvm_ex_table = .;
-+
- #define HYPERVISOR_TEXT					\
- 	/*						\
- 	 * Align to 4 KB so that			\
-@@ -39,6 +46,7 @@ jiffies = jiffies_64;
- 	__hyp_idmap_text_end = .;			\
- 	__hyp_text_start = .;				\
- 	*(.hyp.text)					\
-+	HYPERVISOR_EXTABLE				\
- 	__hyp_text_end = .;
- 
- #define IDMAP_TEXT					\
-diff --git a/arch/arm64/kvm/hyp/entry.S b/arch/arm64/kvm/hyp/entry.S
-index e5cc8d66bf537..dc3d7bc2292fd 100644
---- a/arch/arm64/kvm/hyp/entry.S
-+++ b/arch/arm64/kvm/hyp/entry.S
-@@ -173,20 +173,23 @@ alternative_endif
- 	// This is our single instruction exception window. A pending
- 	// SError is guaranteed to occur at the earliest when we unmask
- 	// it, and at the latest just after the ISB.
--	.global	abort_guest_exit_start
- abort_guest_exit_start:
- 
- 	isb
- 
--	.global	abort_guest_exit_end
- abort_guest_exit_end:
- 
- 	msr	daifset, #4	// Mask aborts
-+	ret
-+
-+	_kvm_extable	abort_guest_exit_start, 9997f
-+	_kvm_extable	abort_guest_exit_end, 9997f
-+9997:
-+	msr	daifset, #4	// Mask aborts
-+	mov	x0, #(1 << ARM_EXIT_WITH_SERROR_BIT)
- 
--	// If the exception took place, restore the EL1 exception
--	// context so that we can report some information.
--	// Merge the exception code with the SError pending bit.
--	tbz	x0, #ARM_EXIT_WITH_SERROR_BIT, 1f
-+	// restore the EL1 exception context so that we can report some
-+	// information. Merge the exception code with the SError pending bit.
- 	msr	elr_el2, x2
- 	msr	esr_el2, x3
- 	msr	spsr_el2, x4
-diff --git a/arch/arm64/kvm/hyp/hyp-entry.S b/arch/arm64/kvm/hyp/hyp-entry.S
-index ffa68d5713f1d..f36aad0f207bb 100644
---- a/arch/arm64/kvm/hyp/hyp-entry.S
-+++ b/arch/arm64/kvm/hyp/hyp-entry.S
-@@ -15,6 +15,30 @@
- #include <asm/kvm_mmu.h>
- #include <asm/mmu.h>
- 
-+.macro save_caller_saved_regs_vect
-+	/* x0 and x1 were saved in the vector entry */
-+	stp	x2, x3,   [sp, #-16]!
-+	stp	x4, x5,   [sp, #-16]!
-+	stp	x6, x7,   [sp, #-16]!
-+	stp	x8, x9,   [sp, #-16]!
-+	stp	x10, x11, [sp, #-16]!
-+	stp	x12, x13, [sp, #-16]!
-+	stp	x14, x15, [sp, #-16]!
-+	stp	x16, x17, [sp, #-16]!
-+.endm
-+
-+.macro restore_caller_saved_regs_vect
-+	ldp	x16, x17, [sp], #16
-+	ldp	x14, x15, [sp], #16
-+	ldp	x12, x13, [sp], #16
-+	ldp	x10, x11, [sp], #16
-+	ldp	x8, x9,   [sp], #16
-+	ldp	x6, x7,   [sp], #16
-+	ldp	x4, x5,   [sp], #16
-+	ldp	x2, x3,   [sp], #16
-+	ldp	x0, x1,   [sp], #16
-+.endm
-+
- 	.text
- 	.pushsection	.hyp.text, "ax"
- 
-@@ -142,13 +166,19 @@ el1_error:
- 	b	__guest_exit
- 
- el2_sync:
--	/* Check for illegal exception return, otherwise panic */
-+	/* Check for illegal exception return */
- 	mrs	x0, spsr_el2
-+	tbnz	x0, #20, 1f
- 
--	/* if this was something else, then panic! */
--	tst	x0, #PSR_IL_BIT
--	b.eq	__hyp_panic
-+	save_caller_saved_regs_vect
-+	stp     x29, x30, [sp, #-16]!
-+	bl	kvm_unexpected_el2_exception
-+	ldp     x29, x30, [sp], #16
-+	restore_caller_saved_regs_vect
- 
-+	eret
-+
-+1:
- 	/* Let's attempt a recovery from the illegal exception return */
- 	get_vcpu_ptr	x1, x0
- 	mov	x0, #ARM_EXCEPTION_IL
-@@ -156,27 +186,14 @@ el2_sync:
- 
- 
- el2_error:
--	ldp	x0, x1, [sp], #16
-+	save_caller_saved_regs_vect
-+	stp     x29, x30, [sp, #-16]!
-+
-+	bl	kvm_unexpected_el2_exception
-+
-+	ldp     x29, x30, [sp], #16
-+	restore_caller_saved_regs_vect
- 
--	/*
--	 * Only two possibilities:
--	 * 1) Either we come from the exit path, having just unmasked
--	 *    PSTATE.A: change the return code to an EL2 fault, and
--	 *    carry on, as we're already in a sane state to handle it.
--	 * 2) Or we come from anywhere else, and that's a bug: we panic.
--	 *
--	 * For (1), x0 contains the original return code and x1 doesn't
--	 * contain anything meaningful at that stage. We can reuse them
--	 * as temp registers.
--	 * For (2), who cares?
--	 */
--	mrs	x0, elr_el2
--	adr	x1, abort_guest_exit_start
--	cmp	x0, x1
--	adr	x1, abort_guest_exit_end
--	ccmp	x0, x1, #4, ne
--	b.ne	__hyp_panic
--	mov	x0, #(1 << ARM_EXIT_WITH_SERROR_BIT)
- 	eret
- 	sb
- 
-diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c
-index 6f4838b475d0d..65660b6144740 100644
---- a/arch/arm64/kvm/hyp/switch.c
-+++ b/arch/arm64/kvm/hyp/switch.c
-@@ -14,6 +14,7 @@
- 
- #include <asm/arch_gicv3.h>
- #include <asm/cpufeature.h>
-+#include <asm/extable.h>
- #include <asm/kprobes.h>
- #include <asm/kvm_asm.h>
- #include <asm/kvm_emulate.h>
-@@ -25,6 +26,9 @@
- #include <asm/processor.h>
- #include <asm/thread_info.h>
- 
-+extern struct exception_table_entry __start___kvm_ex_table;
-+extern struct exception_table_entry __stop___kvm_ex_table;
-+
- /* Check whether the FP regs were dirtied while in the host-side run loop: */
- static bool __hyp_text update_fp_enabled(struct kvm_vcpu *vcpu)
- {
-@@ -257,10 +261,10 @@ static bool __hyp_text __translate_far_to_hpfar(u64 far, u64 *hpfar)
- 	 * saved the guest context yet, and we may return early...
- 	 */
- 	par = read_sysreg(par_el1);
--	asm volatile("at s1e1r, %0" : : "r" (far));
--	isb();
--
--	tmp = read_sysreg(par_el1);
-+	if (!__kvm_at("s1e1r", far))
-+		tmp = read_sysreg(par_el1);
-+	else
-+		tmp = SYS_PAR_EL1_F; /* back to the guest */
- 	write_sysreg(par, par_el1);
- 
- 	if (unlikely(tmp & SYS_PAR_EL1_F))
-@@ -791,3 +795,30 @@ void __hyp_text __noreturn hyp_panic(struct kvm_cpu_context *host_ctxt)
- 
- 	unreachable();
- }
-+
-+asmlinkage void __hyp_text kvm_unexpected_el2_exception(void)
-+{
-+	unsigned long addr, fixup;
-+	struct kvm_cpu_context *host_ctxt;
-+	struct exception_table_entry *entry, *end;
-+	unsigned long elr_el2 = read_sysreg(elr_el2);
-+
-+	entry = hyp_symbol_addr(__start___kvm_ex_table);
-+	end = hyp_symbol_addr(__stop___kvm_ex_table);
-+	host_ctxt = &__hyp_this_cpu_ptr(kvm_host_data)->host_ctxt;
-+
-+	while (entry < end) {
-+		addr = (unsigned long)&entry->insn + entry->insn;
-+		fixup = (unsigned long)&entry->fixup + entry->fixup;
-+
-+		if (addr != elr_el2) {
-+			entry++;
-+			continue;
-+		}
-+
-+		write_sysreg(fixup, elr_el2);
-+		return;
-+	}
-+
-+	hyp_panic(host_ctxt);
-+}
-diff --git a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c
-index 7e4e2959bf4f7..0c9c40720ca9a 100644
---- a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c
-+++ b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c
-@@ -12,6 +12,7 @@
- 
- #include "common.xml.h"
- #include "state.xml.h"
-+#include "state_blt.xml.h"
- #include "state_hi.xml.h"
- #include "state_3d.xml.h"
- #include "cmdstream.xml.h"
-@@ -233,6 +234,8 @@ void etnaviv_buffer_end(struct etnaviv_gpu *gpu)
- 	struct etnaviv_cmdbuf *buffer = &gpu->buffer;
- 	unsigned int waitlink_offset = buffer->user_size - 16;
- 	u32 link_target, flush = 0;
-+	bool has_blt = !!(gpu->identity.minor_features5 &
-+			  chipMinorFeatures5_BLT_ENGINE);
- 
- 	lockdep_assert_held(&gpu->lock);
- 
-@@ -248,16 +251,38 @@ void etnaviv_buffer_end(struct etnaviv_gpu *gpu)
- 	if (flush) {
- 		unsigned int dwords = 7;
- 
-+		if (has_blt)
-+			dwords += 10;
-+
- 		link_target = etnaviv_buffer_reserve(gpu, buffer, dwords);
- 
- 		CMD_SEM(buffer, SYNC_RECIPIENT_FE, SYNC_RECIPIENT_PE);
- 		CMD_STALL(buffer, SYNC_RECIPIENT_FE, SYNC_RECIPIENT_PE);
-+		if (has_blt) {
-+			CMD_LOAD_STATE(buffer, VIVS_BLT_ENABLE, 0x1);
-+			CMD_SEM(buffer, SYNC_RECIPIENT_FE, SYNC_RECIPIENT_BLT);
-+			CMD_STALL(buffer, SYNC_RECIPIENT_FE, SYNC_RECIPIENT_BLT);
-+			CMD_LOAD_STATE(buffer, VIVS_BLT_ENABLE, 0x0);
-+		}
- 		CMD_LOAD_STATE(buffer, VIVS_GL_FLUSH_CACHE, flush);
--		if (gpu->exec_state == ETNA_PIPE_3D)
--			CMD_LOAD_STATE(buffer, VIVS_TS_FLUSH_CACHE,
--				       VIVS_TS_FLUSH_CACHE_FLUSH);
-+		if (gpu->exec_state == ETNA_PIPE_3D) {
-+			if (has_blt) {
-+				CMD_LOAD_STATE(buffer, VIVS_BLT_ENABLE, 0x1);
-+				CMD_LOAD_STATE(buffer, VIVS_BLT_SET_COMMAND, 0x1);
-+				CMD_LOAD_STATE(buffer, VIVS_BLT_ENABLE, 0x0);
-+			} else {
-+				CMD_LOAD_STATE(buffer, VIVS_TS_FLUSH_CACHE,
-+					       VIVS_TS_FLUSH_CACHE_FLUSH);
-+			}
-+		}
- 		CMD_SEM(buffer, SYNC_RECIPIENT_FE, SYNC_RECIPIENT_PE);
- 		CMD_STALL(buffer, SYNC_RECIPIENT_FE, SYNC_RECIPIENT_PE);
-+		if (has_blt) {
-+			CMD_LOAD_STATE(buffer, VIVS_BLT_ENABLE, 0x1);
-+			CMD_SEM(buffer, SYNC_RECIPIENT_FE, SYNC_RECIPIENT_BLT);
-+			CMD_STALL(buffer, SYNC_RECIPIENT_FE, SYNC_RECIPIENT_BLT);
-+			CMD_LOAD_STATE(buffer, VIVS_BLT_ENABLE, 0x0);
-+		}
- 		CMD_END(buffer);
- 
- 		etnaviv_buffer_replace_wait(buffer, waitlink_offset,
-@@ -323,6 +348,8 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state,
- 	bool switch_mmu_context = gpu->mmu_context != mmu_context;
- 	unsigned int new_flush_seq = READ_ONCE(gpu->mmu_context->flush_seq);
- 	bool need_flush = switch_mmu_context || gpu->flush_seq != new_flush_seq;
-+	bool has_blt = !!(gpu->identity.minor_features5 &
-+			  chipMinorFeatures5_BLT_ENGINE);
- 
- 	lockdep_assert_held(&gpu->lock);
- 
-@@ -433,6 +460,15 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state,
- 	 * 2 semaphore stall + 1 event + 1 wait + 1 link.
- 	 */
- 	return_dwords = 7;
-+
-+	/*
-+	 * When the BLT engine is present we need 6 more dwords in the return
-+	 * target: 3 enable/flush/disable + 4 enable/semaphore stall/disable,
-+	 * but we don't need the normal TS flush state.
-+	 */
-+	if (has_blt)
-+		return_dwords += 6;
-+
- 	return_target = etnaviv_buffer_reserve(gpu, buffer, return_dwords);
- 	CMD_LINK(cmdbuf, return_dwords, return_target);
- 
-@@ -447,11 +483,25 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state,
- 		CMD_LOAD_STATE(buffer, VIVS_GL_FLUSH_CACHE,
- 				       VIVS_GL_FLUSH_CACHE_DEPTH |
- 				       VIVS_GL_FLUSH_CACHE_COLOR);
--		CMD_LOAD_STATE(buffer, VIVS_TS_FLUSH_CACHE,
--				       VIVS_TS_FLUSH_CACHE_FLUSH);
-+		if (has_blt) {
-+			CMD_LOAD_STATE(buffer, VIVS_BLT_ENABLE, 0x1);
-+			CMD_LOAD_STATE(buffer, VIVS_BLT_SET_COMMAND, 0x1);
-+			CMD_LOAD_STATE(buffer, VIVS_BLT_ENABLE, 0x0);
-+		} else {
-+			CMD_LOAD_STATE(buffer, VIVS_TS_FLUSH_CACHE,
-+					       VIVS_TS_FLUSH_CACHE_FLUSH);
-+		}
- 	}
- 	CMD_SEM(buffer, SYNC_RECIPIENT_FE, SYNC_RECIPIENT_PE);
- 	CMD_STALL(buffer, SYNC_RECIPIENT_FE, SYNC_RECIPIENT_PE);
-+
-+	if (has_blt) {
-+		CMD_LOAD_STATE(buffer, VIVS_BLT_ENABLE, 0x1);
-+		CMD_SEM(buffer, SYNC_RECIPIENT_FE, SYNC_RECIPIENT_BLT);
-+		CMD_STALL(buffer, SYNC_RECIPIENT_FE, SYNC_RECIPIENT_BLT);
-+		CMD_LOAD_STATE(buffer, VIVS_BLT_ENABLE, 0x0);
-+	}
-+
- 	CMD_LOAD_STATE(buffer, VIVS_GL_EVENT, VIVS_GL_EVENT_EVENT_ID(event) |
- 		       VIVS_GL_EVENT_FROM_PE);
- 	CMD_WAIT(buffer);
-diff --git a/drivers/gpu/drm/etnaviv/state_blt.xml.h b/drivers/gpu/drm/etnaviv/state_blt.xml.h
-index daae55995def0..0e8bcf9dcc93b 100644
---- a/drivers/gpu/drm/etnaviv/state_blt.xml.h
-+++ b/drivers/gpu/drm/etnaviv/state_blt.xml.h
-@@ -46,6 +46,8 @@ DEALINGS IN THE SOFTWARE.
- 
- /* This is a cut-down version of the state_blt.xml.h file */
- 
-+#define VIVS_BLT_SET_COMMAND					0x000140ac
-+
- #define VIVS_BLT_ENABLE						0x000140b8
- #define VIVS_BLT_ENABLE_ENABLE					0x00000001
- 
-diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c
-index dfb29e6eeff1e..30c5ddd6d081c 100644
---- a/drivers/gpu/drm/scheduler/sched_main.c
-+++ b/drivers/gpu/drm/scheduler/sched_main.c
-@@ -496,8 +496,10 @@ void drm_sched_resubmit_jobs(struct drm_gpu_scheduler *sched)
- 		fence = sched->ops->run_job(s_job);
- 
- 		if (IS_ERR_OR_NULL(fence)) {
-+			if (IS_ERR(fence))
-+				dma_fence_set_error(&s_fence->finished, PTR_ERR(fence));
-+
- 			s_job->s_fence->parent = NULL;
--			dma_fence_set_error(&s_fence->finished, PTR_ERR(fence));
- 		} else {
- 			s_job->s_fence->parent = fence;
- 		}
-@@ -748,8 +750,9 @@ static int drm_sched_main(void *param)
- 					  r);
- 			dma_fence_put(fence);
- 		} else {
-+			if (IS_ERR(fence))
-+				dma_fence_set_error(&s_fence->finished, PTR_ERR(fence));
- 
--			dma_fence_set_error(&s_fence->finished, PTR_ERR(fence));
- 			drm_sched_process_job(NULL, &sched_job->cb);
- 		}
- 
-diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index 359616e3efbbb..d2ecc9c452554 100644
---- a/drivers/hid/hid-core.c
-+++ b/drivers/hid/hid-core.c
-@@ -1597,6 +1597,17 @@ static void hid_output_field(const struct hid_device *hid,
- 	}
- }
- 
-+/*
-+ * Compute the size of a report.
-+ */
-+static size_t hid_compute_report_size(struct hid_report *report)
-+{
-+	if (report->size)
-+		return ((report->size - 1) >> 3) + 1;
-+
-+	return 0;
-+}
-+
- /*
-  * Create a report. 'data' has to be allocated using
-  * hid_alloc_report_buf() so that it has proper size.
-@@ -1609,7 +1620,7 @@ void hid_output_report(struct hid_report *report, __u8 *data)
- 	if (report->id > 0)
- 		*data++ = report->id;
- 
--	memset(data, 0, ((report->size - 1) >> 3) + 1);
-+	memset(data, 0, hid_compute_report_size(report));
- 	for (n = 0; n < report->maxfield; n++)
- 		hid_output_field(report->device, report->field[n], data);
- }
-@@ -1739,7 +1750,7 @@ int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, u32 size,
- 		csize--;
- 	}
- 
--	rsize = ((report->size - 1) >> 3) + 1;
-+	rsize = hid_compute_report_size(report);
- 
- 	if (report_enum->numbered && rsize >= HID_MAX_BUFFER_SIZE)
- 		rsize = HID_MAX_BUFFER_SIZE - 1;
-diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
-index e8641ce677e47..e3d475f4baf66 100644
---- a/drivers/hid/hid-input.c
-+++ b/drivers/hid/hid-input.c
-@@ -1132,6 +1132,10 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
- 	}
- 
- mapped:
-+	/* Mapping failed, bail out */
-+	if (!bit)
-+		return;
-+
- 	if (device->driver->input_mapped &&
- 	    device->driver->input_mapped(device, hidinput, field, usage,
- 					 &bit, &max) < 0) {
-diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index 39e4da7468e11..128d8f4319b9f 100644
---- a/drivers/hid/hid-multitouch.c
-+++ b/drivers/hid/hid-multitouch.c
-@@ -864,6 +864,8 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
- 			code = BTN_0  + ((usage->hid - 1) & HID_USAGE);
- 
- 		hid_map_usage(hi, usage, bit, max, EV_KEY, code);
-+		if (!*bit)
-+			return -1;
- 		input_set_capability(hi->input, EV_KEY, code);
- 		return 1;
- 
-diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
-index a25c3a4d3f6cb..e37d271ca9636 100644
---- a/drivers/mmc/host/sdhci-tegra.c
-+++ b/drivers/mmc/host/sdhci-tegra.c
-@@ -1370,7 +1370,6 @@ static const struct sdhci_ops tegra210_sdhci_ops = {
- 
- static const struct sdhci_pltfm_data sdhci_tegra210_pdata = {
- 	.quirks = SDHCI_QUIRK_BROKEN_TIMEOUT_VAL |
--		  SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |
- 		  SDHCI_QUIRK_SINGLE_POWER_WRITE |
- 		  SDHCI_QUIRK_NO_HISPD_BIT |
- 		  SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC |
-@@ -1407,7 +1406,6 @@ static const struct sdhci_ops tegra186_sdhci_ops = {
- 
- static const struct sdhci_pltfm_data sdhci_tegra186_pdata = {
- 	.quirks = SDHCI_QUIRK_BROKEN_TIMEOUT_VAL |
--		  SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |
- 		  SDHCI_QUIRK_SINGLE_POWER_WRITE |
- 		  SDHCI_QUIRK_NO_HISPD_BIT |
- 		  SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC |
-diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
-index 8888cdf3eead9..ea925b102b322 100644
---- a/drivers/target/target_core_user.c
-+++ b/drivers/target/target_core_user.c
-@@ -676,8 +676,10 @@ static void scatter_data_area(struct tcmu_dev *udev,
- 		from = kmap_atomic(sg_page(sg)) + sg->offset;
- 		while (sg_remaining > 0) {
- 			if (block_remaining == 0) {
--				if (to)
-+				if (to) {
-+					flush_dcache_page(page);
- 					kunmap_atomic(to);
-+				}
- 
- 				block_remaining = DATA_BLOCK_SIZE;
- 				dbi = tcmu_cmd_get_dbi(tcmu_cmd);
-@@ -722,7 +724,6 @@ static void scatter_data_area(struct tcmu_dev *udev,
- 				memcpy(to + offset,
- 				       from + sg->length - sg_remaining,
- 				       copy_bytes);
--				tcmu_flush_dcache_range(to, copy_bytes);
- 			}
- 
- 			sg_remaining -= copy_bytes;
-@@ -731,8 +732,10 @@ static void scatter_data_area(struct tcmu_dev *udev,
- 		kunmap_atomic(from - sg->offset);
- 	}
- 
--	if (to)
-+	if (to) {
-+		flush_dcache_page(page);
- 		kunmap_atomic(to);
-+	}
- }
- 
- static void gather_data_area(struct tcmu_dev *udev, struct tcmu_cmd *cmd,
-@@ -778,13 +781,13 @@ static void gather_data_area(struct tcmu_dev *udev, struct tcmu_cmd *cmd,
- 				dbi = tcmu_cmd_get_dbi(cmd);
- 				page = tcmu_get_block_page(udev, dbi);
- 				from = kmap_atomic(page);
-+				flush_dcache_page(page);
- 			}
- 			copy_bytes = min_t(size_t, sg_remaining,
- 					block_remaining);
- 			if (read_len < copy_bytes)
- 				copy_bytes = read_len;
- 			offset = DATA_BLOCK_SIZE - block_remaining;
--			tcmu_flush_dcache_range(from, copy_bytes);
- 			memcpy(to + sg->length - sg_remaining, from + offset,
- 					copy_bytes);
- 
-@@ -1007,7 +1010,7 @@ static int queue_cmd_ring(struct tcmu_cmd *tcmu_cmd, sense_reason_t *scsi_err)
- 		entry->hdr.cmd_id = 0; /* not used for PAD */
- 		entry->hdr.kflags = 0;
- 		entry->hdr.uflags = 0;
--		tcmu_flush_dcache_range(entry, sizeof(*entry));
-+		tcmu_flush_dcache_range(entry, sizeof(entry->hdr));
- 
- 		UPDATE_HEAD(mb->cmd_head, pad_size, udev->cmdr_size);
- 		tcmu_flush_dcache_range(mb, sizeof(*mb));
-@@ -1072,7 +1075,7 @@ static int queue_cmd_ring(struct tcmu_cmd *tcmu_cmd, sense_reason_t *scsi_err)
- 	cdb_off = CMDR_OFF + cmd_head + base_command_size;
- 	memcpy((void *) mb + cdb_off, se_cmd->t_task_cdb, scsi_command_size(se_cmd->t_task_cdb));
- 	entry->req.cdb_off = cdb_off;
--	tcmu_flush_dcache_range(entry, sizeof(*entry));
-+	tcmu_flush_dcache_range(entry, command_size);
- 
- 	UPDATE_HEAD(mb->cmd_head, command_size, udev->cmdr_size);
- 	tcmu_flush_dcache_range(mb, sizeof(*mb));
-diff --git a/include/linux/hid.h b/include/linux/hid.h
-index 875f71132b142..c7044a14200ea 100644
---- a/include/linux/hid.h
-+++ b/include/linux/hid.h
-@@ -959,34 +959,49 @@ static inline void hid_device_io_stop(struct hid_device *hid) {
-  * @max: maximal valid usage->code to consider later (out parameter)
-  * @type: input event type (EV_KEY, EV_REL, ...)
-  * @c: code which corresponds to this usage and type
-+ *
-+ * The value pointed to by @bit will be set to NULL if either @type is
-+ * an unhandled event type, or if @c is out of range for @type. This
-+ * can be used as an error condition.
-  */
- static inline void hid_map_usage(struct hid_input *hidinput,
- 		struct hid_usage *usage, unsigned long **bit, int *max,
--		__u8 type, __u16 c)
-+		__u8 type, unsigned int c)
- {
- 	struct input_dev *input = hidinput->input;
--
--	usage->type = type;
--	usage->code = c;
-+	unsigned long *bmap = NULL;
-+	unsigned int limit = 0;
- 
- 	switch (type) {
- 	case EV_ABS:
--		*bit = input->absbit;
--		*max = ABS_MAX;
-+		bmap = input->absbit;
-+		limit = ABS_MAX;
- 		break;
- 	case EV_REL:
--		*bit = input->relbit;
--		*max = REL_MAX;
-+		bmap = input->relbit;
-+		limit = REL_MAX;
- 		break;
- 	case EV_KEY:
--		*bit = input->keybit;
--		*max = KEY_MAX;
-+		bmap = input->keybit;
-+		limit = KEY_MAX;
- 		break;
- 	case EV_LED:
--		*bit = input->ledbit;
--		*max = LED_MAX;
-+		bmap = input->ledbit;
-+		limit = LED_MAX;
- 		break;
- 	}
-+
-+	if (unlikely(c > limit || !bmap)) {
-+		pr_warn_ratelimited("%s: Invalid code %d type %d\n",
-+				    input->name, c, type);
-+		*bit = NULL;
-+		return;
-+	}
-+
-+	usage->type = type;
-+	usage->code = c;
-+	*max = limit;
-+	*bit = bmap;
- }
- 
- /**
-@@ -1000,7 +1015,8 @@ static inline void hid_map_usage_clear(struct hid_input *hidinput,
- 		__u8 type, __u16 c)
- {
- 	hid_map_usage(hidinput, usage, bit, max, type, c);
--	clear_bit(c, *bit);
-+	if (*bit)
-+		clear_bit(usage->code, *bit);
- }
- 
- /**
-diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt
-index c6f9f31b60398..15fd108afbe63 100644
---- a/tools/perf/Documentation/perf-record.txt
-+++ b/tools/perf/Documentation/perf-record.txt
-@@ -33,6 +33,10 @@ OPTIONS
-         - a raw PMU event (eventsel+umask) in the form of rNNN where NNN is a
- 	  hexadecimal event descriptor.
- 
-+        - a symbolic or raw PMU event followed by an optional colon
-+	  and a list of event modifiers, e.g., cpu-cycles:p.  See the
-+	  linkperf:perf-list[1] man page for details on event modifiers.
-+
- 	- a symbolically formed PMU event like 'pmu/param1=0x3,param2/' where
- 	  'param1', 'param2', etc are defined as formats for the PMU in
- 	  /sys/bus/event_source/devices/<pmu>/format/*.
-diff --git a/tools/perf/Documentation/perf-stat.txt b/tools/perf/Documentation/perf-stat.txt
-index 930c51c01201a..9abf1cf217e28 100644
---- a/tools/perf/Documentation/perf-stat.txt
-+++ b/tools/perf/Documentation/perf-stat.txt
-@@ -39,6 +39,10 @@ report::
- 	- a raw PMU event (eventsel+umask) in the form of rNNN where NNN is a
- 	  hexadecimal event descriptor.
- 
-+        - a symbolic or raw PMU event followed by an optional colon
-+	  and a list of event modifiers, e.g., cpu-cycles:p.  See the
-+	  linkperf:perf-list[1] man page for details on event modifiers.
-+
- 	- a symbolically formed event like 'pmu/param1=0x3,param2/' where
- 	  param1 and param2 are defined as formats for the PMU in
- 	  /sys/bus/event_source/devices/<pmu>/format/*

patch/kernel/odroidxu4-current/patch-5.4.64-65.patch

@@ -1,356 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 7bdfb21bb9269..4cb68164b79ee 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- VERSION = 5
- PATCHLEVEL = 4
--SUBLEVEL = 64
-+SUBLEVEL = 65
- EXTRAVERSION =
- NAME = Kleptomaniac Octopus
- 
-diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
-index b91f92e4e5f22..915ac75b55fc7 100644
---- a/drivers/net/usb/dm9601.c
-+++ b/drivers/net/usb/dm9601.c
-@@ -625,6 +625,10 @@ static const struct usb_device_id products[] = {
- 	 USB_DEVICE(0x0a46, 0x1269),	/* DM9621A USB to Fast Ethernet Adapter */
- 	 .driver_info = (unsigned long)&dm9601_info,
- 	},
-+	{
-+	 USB_DEVICE(0x0586, 0x3427),	/* ZyXEL Keenetic Plus DSL xDSL modem */
-+	 .driver_info = (unsigned long)&dm9601_info,
-+	},
- 	{},			// END
- };
- 
-diff --git a/net/core/dev.c b/net/core/dev.c
-index 56cd7b83a3829..cdc1c3a144e1f 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -6231,12 +6231,13 @@ void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
- 		netdev_err_once(dev, "%s() called with weight %d\n", __func__,
- 				weight);
- 	napi->weight = weight;
--	list_add(&napi->dev_list, &dev->napi_list);
- 	napi->dev = dev;
- #ifdef CONFIG_NETPOLL
- 	napi->poll_owner = -1;
- #endif
- 	set_bit(NAPI_STATE_SCHED, &napi->state);
-+	set_bit(NAPI_STATE_NPSVC, &napi->state);
-+	list_add_rcu(&napi->dev_list, &dev->napi_list);
- 	napi_hash_add(napi);
- }
- EXPORT_SYMBOL(netif_napi_add);
-diff --git a/net/core/netpoll.c b/net/core/netpoll.c
-index 849380a622ef9..cb67d36f3adb0 100644
---- a/net/core/netpoll.c
-+++ b/net/core/netpoll.c
-@@ -161,7 +161,7 @@ static void poll_napi(struct net_device *dev)
- 	struct napi_struct *napi;
- 	int cpu = smp_processor_id();
- 
--	list_for_each_entry(napi, &dev->napi_list, dev_list) {
-+	list_for_each_entry_rcu(napi, &dev->napi_list, dev_list) {
- 		if (cmpxchg(&napi->poll_owner, -1, cpu) == -1) {
- 			poll_one_napi(napi);
- 			smp_store_release(&napi->poll_owner, -1);
-diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
-index 47b6d73d30e55..51673d00bbeac 100644
---- a/net/ipv4/fib_trie.c
-+++ b/net/ipv4/fib_trie.c
-@@ -2010,7 +2010,8 @@ void fib_info_notify_update(struct net *net, struct nl_info *info)
- 		struct hlist_head *head = &net->ipv4.fib_table_hash[h];
- 		struct fib_table *tb;
- 
--		hlist_for_each_entry_rcu(tb, head, tb_hlist)
-+		hlist_for_each_entry_rcu(tb, head, tb_hlist,
-+					 lockdep_rtnl_is_held())
- 			__fib_info_notify_update(net, tb, info);
- 	}
- }
-diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
-index ec8fcfc60a27b..73842054bfe68 100644
---- a/net/ipv6/sysctl_net_ipv6.c
-+++ b/net/ipv6/sysctl_net_ipv6.c
-@@ -21,6 +21,7 @@
- #include <net/calipso.h>
- #endif
- 
-+static int two = 2;
- static int flowlabel_reflect_max = 0x7;
- static int auto_flowlabels_min;
- static int auto_flowlabels_max = IP6_AUTO_FLOW_LABEL_MAX;
-@@ -151,7 +152,7 @@ static struct ctl_table ipv6_table_template[] = {
- 		.mode		= 0644,
- 		.proc_handler   = proc_rt6_multipath_hash_policy,
- 		.extra1		= SYSCTL_ZERO,
--		.extra2		= SYSCTL_ONE,
-+		.extra2		= &two,
- 	},
- 	{
- 		.procname	= "seg6_flowlabel",
-diff --git a/net/netlabel/netlabel_domainhash.c b/net/netlabel/netlabel_domainhash.c
-index f5d34da0646ed..12aa803b2f689 100644
---- a/net/netlabel/netlabel_domainhash.c
-+++ b/net/netlabel/netlabel_domainhash.c
-@@ -85,6 +85,7 @@ static void netlbl_domhsh_free_entry(struct rcu_head *entry)
- 			kfree(netlbl_domhsh_addr6_entry(iter6));
- 		}
- #endif /* IPv6 */
-+		kfree(ptr->def.addrsel);
- 	}
- 	kfree(ptr->domain);
- 	kfree(ptr);
-@@ -536,6 +537,8 @@ int netlbl_domhsh_add(struct netlbl_dom_map *entry,
- 				goto add_return;
- 		}
- #endif /* IPv6 */
-+		/* cleanup the new entry since we've moved everything over */
-+		netlbl_domhsh_free_entry(&entry->rcu);
- 	} else
- 		ret_val = -EINVAL;
- 
-@@ -579,6 +582,12 @@ int netlbl_domhsh_remove_entry(struct netlbl_dom_map *entry,
- {
- 	int ret_val = 0;
- 	struct audit_buffer *audit_buf;
-+	struct netlbl_af4list *iter4;
-+	struct netlbl_domaddr4_map *map4;
-+#if IS_ENABLED(CONFIG_IPV6)
-+	struct netlbl_af6list *iter6;
-+	struct netlbl_domaddr6_map *map6;
-+#endif /* IPv6 */
- 
- 	if (entry == NULL)
- 		return -ENOENT;
-@@ -596,6 +605,9 @@ int netlbl_domhsh_remove_entry(struct netlbl_dom_map *entry,
- 		ret_val = -ENOENT;
- 	spin_unlock(&netlbl_domhsh_lock);
- 
-+	if (ret_val)
-+		return ret_val;
-+
- 	audit_buf = netlbl_audit_start_common(AUDIT_MAC_MAP_DEL, audit_info);
- 	if (audit_buf != NULL) {
- 		audit_log_format(audit_buf,
-@@ -605,40 +617,29 @@ int netlbl_domhsh_remove_entry(struct netlbl_dom_map *entry,
- 		audit_log_end(audit_buf);
- 	}
- 
--	if (ret_val == 0) {
--		struct netlbl_af4list *iter4;
--		struct netlbl_domaddr4_map *map4;
--#if IS_ENABLED(CONFIG_IPV6)
--		struct netlbl_af6list *iter6;
--		struct netlbl_domaddr6_map *map6;
--#endif /* IPv6 */
--
--		switch (entry->def.type) {
--		case NETLBL_NLTYPE_ADDRSELECT:
--			netlbl_af4list_foreach_rcu(iter4,
--					     &entry->def.addrsel->list4) {
--				map4 = netlbl_domhsh_addr4_entry(iter4);
--				cipso_v4_doi_putdef(map4->def.cipso);
--			}
-+	switch (entry->def.type) {
-+	case NETLBL_NLTYPE_ADDRSELECT:
-+		netlbl_af4list_foreach_rcu(iter4, &entry->def.addrsel->list4) {
-+			map4 = netlbl_domhsh_addr4_entry(iter4);
-+			cipso_v4_doi_putdef(map4->def.cipso);
-+		}
- #if IS_ENABLED(CONFIG_IPV6)
--			netlbl_af6list_foreach_rcu(iter6,
--					     &entry->def.addrsel->list6) {
--				map6 = netlbl_domhsh_addr6_entry(iter6);
--				calipso_doi_putdef(map6->def.calipso);
--			}
-+		netlbl_af6list_foreach_rcu(iter6, &entry->def.addrsel->list6) {
-+			map6 = netlbl_domhsh_addr6_entry(iter6);
-+			calipso_doi_putdef(map6->def.calipso);
-+		}
- #endif /* IPv6 */
--			break;
--		case NETLBL_NLTYPE_CIPSOV4:
--			cipso_v4_doi_putdef(entry->def.cipso);
--			break;
-+		break;
-+	case NETLBL_NLTYPE_CIPSOV4:
-+		cipso_v4_doi_putdef(entry->def.cipso);
-+		break;
- #if IS_ENABLED(CONFIG_IPV6)
--		case NETLBL_NLTYPE_CALIPSO:
--			calipso_doi_putdef(entry->def.calipso);
--			break;
-+	case NETLBL_NLTYPE_CALIPSO:
-+		calipso_doi_putdef(entry->def.calipso);
-+		break;
- #endif /* IPv6 */
--		}
--		call_rcu(&entry->rcu, netlbl_domhsh_free_entry);
- 	}
-+	call_rcu(&entry->rcu, netlbl_domhsh_free_entry);
- 
- 	return ret_val;
- }
-diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
-index b1eb12d33b9a6..6a5086e586efb 100644
---- a/net/sched/sch_taprio.c
-+++ b/net/sched/sch_taprio.c
-@@ -1177,9 +1177,27 @@ static void taprio_offload_config_changed(struct taprio_sched *q)
- 	spin_unlock(&q->current_entry_lock);
- }
- 
--static void taprio_sched_to_offload(struct taprio_sched *q,
-+static u32 tc_map_to_queue_mask(struct net_device *dev, u32 tc_mask)
-+{
-+	u32 i, queue_mask = 0;
-+
-+	for (i = 0; i < dev->num_tc; i++) {
-+		u32 offset, count;
-+
-+		if (!(tc_mask & BIT(i)))
-+			continue;
-+
-+		offset = dev->tc_to_txq[i].offset;
-+		count = dev->tc_to_txq[i].count;
-+
-+		queue_mask |= GENMASK(offset + count - 1, offset);
-+	}
-+
-+	return queue_mask;
-+}
-+
-+static void taprio_sched_to_offload(struct net_device *dev,
- 				    struct sched_gate_list *sched,
--				    const struct tc_mqprio_qopt *mqprio,
- 				    struct tc_taprio_qopt_offload *offload)
- {
- 	struct sched_entry *entry;
-@@ -1194,7 +1212,8 @@ static void taprio_sched_to_offload(struct taprio_sched *q,
- 
- 		e->command = entry->command;
- 		e->interval = entry->interval;
--		e->gate_mask = entry->gate_mask;
-+		e->gate_mask = tc_map_to_queue_mask(dev, entry->gate_mask);
-+
- 		i++;
- 	}
- 
-@@ -1202,7 +1221,6 @@ static void taprio_sched_to_offload(struct taprio_sched *q,
- }
- 
- static int taprio_enable_offload(struct net_device *dev,
--				 struct tc_mqprio_qopt *mqprio,
- 				 struct taprio_sched *q,
- 				 struct sched_gate_list *sched,
- 				 struct netlink_ext_ack *extack)
-@@ -1224,7 +1242,7 @@ static int taprio_enable_offload(struct net_device *dev,
- 		return -ENOMEM;
- 	}
- 	offload->enable = 1;
--	taprio_sched_to_offload(q, sched, mqprio, offload);
-+	taprio_sched_to_offload(dev, sched, offload);
- 
- 	err = ops->ndo_setup_tc(dev, TC_SETUP_QDISC_TAPRIO, offload);
- 	if (err < 0) {
-@@ -1486,7 +1504,7 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt,
- 	}
- 
- 	if (FULL_OFFLOAD_IS_ENABLED(q->flags))
--		err = taprio_enable_offload(dev, mqprio, q, new_admin, extack);
-+		err = taprio_enable_offload(dev, q, new_admin, extack);
- 	else
- 		err = taprio_disable_offload(dev, q, extack);
- 	if (err)
-diff --git a/net/sctp/socket.c b/net/sctp/socket.c
-index 58fe6556cdf5b..3a11212bb4c0e 100644
---- a/net/sctp/socket.c
-+++ b/net/sctp/socket.c
-@@ -8176,8 +8176,6 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
- 
- 	pr_debug("%s: begins, snum:%d\n", __func__, snum);
- 
--	local_bh_disable();
--
- 	if (snum == 0) {
- 		/* Search for an available port. */
- 		int low, high, remaining, index;
-@@ -8196,20 +8194,21 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
- 				continue;
- 			index = sctp_phashfn(sock_net(sk), rover);
- 			head = &sctp_port_hashtable[index];
--			spin_lock(&head->lock);
-+			spin_lock_bh(&head->lock);
- 			sctp_for_each_hentry(pp, &head->chain)
- 				if ((pp->port == rover) &&
- 				    net_eq(sock_net(sk), pp->net))
- 					goto next;
- 			break;
- 		next:
--			spin_unlock(&head->lock);
-+			spin_unlock_bh(&head->lock);
-+			cond_resched();
- 		} while (--remaining > 0);
- 
- 		/* Exhausted local port range during search? */
- 		ret = 1;
- 		if (remaining <= 0)
--			goto fail;
-+			return ret;
- 
- 		/* OK, here is the one we will use.  HEAD (the port
- 		 * hash table list entry) is non-NULL and we hold it's
-@@ -8224,7 +8223,7 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
- 		 * port iterator, pp being NULL.
- 		 */
- 		head = &sctp_port_hashtable[sctp_phashfn(sock_net(sk), snum)];
--		spin_lock(&head->lock);
-+		spin_lock_bh(&head->lock);
- 		sctp_for_each_hentry(pp, &head->chain) {
- 			if ((pp->port == snum) && net_eq(pp->net, sock_net(sk)))
- 				goto pp_found;
-@@ -8324,10 +8323,7 @@ success:
- 	ret = 0;
- 
- fail_unlock:
--	spin_unlock(&head->lock);
--
--fail:
--	local_bh_enable();
-+	spin_unlock_bh(&head->lock);
- 	return ret;
- }
- 
-diff --git a/net/tipc/socket.c b/net/tipc/socket.c
-index aea951a1f805b..5318bb6611abc 100644
---- a/net/tipc/socket.c
-+++ b/net/tipc/socket.c
-@@ -2616,18 +2616,21 @@ static int tipc_shutdown(struct socket *sock, int how)
- 
- 	trace_tipc_sk_shutdown(sk, NULL, TIPC_DUMP_ALL, " ");
- 	__tipc_shutdown(sock, TIPC_CONN_SHUTDOWN);
--	sk->sk_shutdown = SEND_SHUTDOWN;
-+	if (tipc_sk_type_connectionless(sk))
-+		sk->sk_shutdown = SHUTDOWN_MASK;
-+	else
-+		sk->sk_shutdown = SEND_SHUTDOWN;
- 
- 	if (sk->sk_state == TIPC_DISCONNECTING) {
- 		/* Discard any unreceived messages */
- 		__skb_queue_purge(&sk->sk_receive_queue);
- 
--		/* Wake up anyone sleeping in poll */
--		sk->sk_state_change(sk);
- 		res = 0;
- 	} else {
- 		res = -ENOTCONN;
- 	}
-+	/* Wake up anyone sleeping in poll. */
-+	sk->sk_state_change(sk);
- 
- 	release_sock(sk);
- 	return res;