Remove sun50iw9-btt board family

2024-08-09 12:31:20 +03:00 · 2024-08-09 12:31:20 +03:00 · 04829f611c
parent 02ad725c6f
commit 04829f611c
38 changed files with 0 additions and 275307 deletions
--- a/config/kernel/linux-sun50iw9-btt-legacy.config
+++ b/config/kernel/linux-sun50iw9-btt-legacy.config
--- a/config/sources/families/sun50iw9-btt.conf
+++ b/config/sources/families/sun50iw9-btt.conf
@ -1,65 +0,0 @@
-#
-# SPDX-License-Identifier: GPL-2.0
-#
-# Copyright (c) 2013-2023 Igor Pecovnik, igor@armbian.com
-#
-# This file is a part of the Armbian Build Framework
-# https://github.com/armbian/build/
-#
-# shellcheck source=config/sources/families/include/sunxi64_common.inc
-source "${BASH_SOURCE%/*}/include/sunxi64_common.inc"
-
-[[ -z $CPUMIN ]] && CPUMIN=480000
-[[ -z $CPUMAX ]] && CPUMAX=1512000
-GOVERNOR=ondemand
-
-case $BRANCH in
-
-	legacy)
-		LINUXFAMILY=sun50iw9-btt
-		KERNELSOURCE='https://github.com/bigtreetech/linux.git'
-		declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
-		KERNELBRANCH="branch:linux-6.1.y-cb1"
-		KERNELPATCHDIR="archive/sun50iw9-btt-6.1"
-		BOOTSOURCE='https://github.com/bigtreetech/u-boot.git'
-		BOOTBRANCH='branch:v2023.07-cb1'
-		BOOTPATCHDIR='NEED-NOT'
-		BOOTDELAY=-2
-		ASOUND_STATE='asound.state.sun50iw9-legacy'
-
-		ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware'
-		ATFBRANCH='tag:lts-v2.10.2'
-		ATF_PLAT="sun50i_h616"
-		ATF_TARGET_MAP='PLAT=sun50i_h616 DEBUG=1 bl31;;build/sun50i_h616/debug/bl31.bin'
-		BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
-		KERNEL_DRIVERS_SKIP+=(driver_rtw88) # This is custom 6.1 driver, skip rtw88 to avoid patching failures
-		;;
-
-	current | edge)
-		ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware'
-		ATFBRANCH='tag:lts-v2.10.2'
-		ATF_PLAT="sun50i_h616"
-		ATF_TARGET_MAP='PLAT=sun50i_h616 DEBUG=1 bl31;;build/sun50i_h616/debug/bl31.bin'
-		BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
-
-		;;
-esac
-
-# This build requires busybox (and dos2unix)
-function add_host_dependencies__sun50iw9_add_busybox_hostdep() {
-	display_alert "Adding busybox dep" "for ${BOARD} bootloader compile" "debug"
-	declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} busybox"
-}
-
-function family_tweaks_s() {
-	if [[ -f $SDCARD/lib/systemd/system/hdmi-audio.service ]]; then
-		chroot $SDCARD /bin/bash -c "systemctl --no-reload enable hdmi-audio.service >/dev/null 2>&1"
-	fi
-}
-
-function family_tweaks_bsp() {
-	install -m 755 $SRC/packages/blobs/sunxi/h616/inithdmiaudio $destination/usr/bin/
-	cp $SRC/packages/blobs/sunxi/h616/libtinyalsa.so $destination/usr/lib/
-	cp $SRC/packages/bsp/sunxi/hdmi-audio.service $destination/lib/systemd/system/
-
-}
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.43-44.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.43-44.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.44-45.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.44-45.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.45-46.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.45-46.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.46-47.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.46-47.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.47-48.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.47-48.patch
@ -1,604 +0,0 @@
-diff --git a/Documentation/admin-guide/hw-vuln/srso.rst b/Documentation/admin-guide/hw-vuln/srso.rst
-index 2f923c805802f..f79cb11b080f6 100644
--- a/Documentation/admin-guide/hw-vuln/srso.rst
-+++ b/Documentation/admin-guide/hw-vuln/srso.rst
-@@ -124,8 +124,8 @@ sequence.
- To ensure the safety of this mitigation, the kernel must ensure that the
- safe return sequence is itself free from attacker interference.  In Zen3
- and Zen4, this is accomplished by creating a BTB alias between the
-untraining function srso_untrain_ret_alias() and the safe return
-function srso_safe_ret_alias() which results in evicting a potentially
-+untraining function srso_alias_untrain_ret() and the safe return
-+function srso_alias_safe_ret() which results in evicting a potentially
- poisoned BTB entry and using that safe one for all function returns.
- 
- In older Zen1 and Zen2, this is accomplished using a reinterpretation
-diff --git a/Makefile b/Makefile
-index 375efcfb91f8f..8bb8dd199c552 100644
--- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- VERSION = 6
- PATCHLEVEL = 1
-SUBLEVEL = 47
-+SUBLEVEL = 48
- EXTRAVERSION =
- NAME = Curry Ramen
- 
-diff --git a/arch/x86/include/asm/entry-common.h b/arch/x86/include/asm/entry-common.h
-index 674ed46d3ceda..11203a9fe0a87 100644
--- a/arch/x86/include/asm/entry-common.h
-+++ b/arch/x86/include/asm/entry-common.h
-@@ -92,6 +92,7 @@ static inline void arch_exit_to_user_mode_prepare(struct pt_regs *regs,
- static __always_inline void arch_exit_to_user_mode(void)
- {
- 	mds_user_clear_cpu_buffers();
-+	amd_clear_divider();
- }
- #define arch_exit_to_user_mode arch_exit_to_user_mode
- 
-diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h
-index 31fa631c8587c..2f123d4fb85b5 100644
--- a/arch/x86/include/asm/nospec-branch.h
-+++ b/arch/x86/include/asm/nospec-branch.h
-@@ -168,9 +168,9 @@
- .endm
- 
- #ifdef CONFIG_CPU_UNRET_ENTRY
-#define CALL_ZEN_UNTRAIN_RET	"call zen_untrain_ret"
-+#define CALL_UNTRAIN_RET	"call entry_untrain_ret"
- #else
-#define CALL_ZEN_UNTRAIN_RET	""
-+#define CALL_UNTRAIN_RET	""
- #endif
- 
- /*
-@@ -178,7 +178,7 @@
-  * return thunk isn't mapped into the userspace tables (then again, AMD
-  * typically has NO_MELTDOWN).
-  *
- * While zen_untrain_ret() doesn't clobber anything but requires stack,
-+ * While retbleed_untrain_ret() doesn't clobber anything but requires stack,
-  * entry_ibpb() will clobber AX, CX, DX.
-  *
-  * As such, this must be placed after every *SWITCH_TO_KERNEL_CR3 at a point
-@@ -189,14 +189,9 @@
- 	defined(CONFIG_CPU_SRSO)
- 	ANNOTATE_UNRET_END
- 	ALTERNATIVE_2 "",						\
-	              CALL_ZEN_UNTRAIN_RET, X86_FEATURE_UNRET,		\
-+		      CALL_UNTRAIN_RET, X86_FEATURE_UNRET,		\
- 		      "call entry_ibpb", X86_FEATURE_ENTRY_IBPB
- #endif
-
-#ifdef CONFIG_CPU_SRSO
-	ALTERNATIVE_2 "", "call srso_untrain_ret", X86_FEATURE_SRSO, \
-			  "call srso_untrain_ret_alias", X86_FEATURE_SRSO_ALIAS
-#endif
- .endm
- 
- #else /* __ASSEMBLY__ */
-@@ -210,10 +205,21 @@
- typedef u8 retpoline_thunk_t[RETPOLINE_THUNK_SIZE];
- extern retpoline_thunk_t __x86_indirect_thunk_array[];
- 
-+#ifdef CONFIG_RETHUNK
- extern void __x86_return_thunk(void);
-extern void zen_untrain_ret(void);
-+#else
-+static inline void __x86_return_thunk(void) {}
-+#endif
-+
-+extern void retbleed_return_thunk(void);
-+extern void srso_return_thunk(void);
-+extern void srso_alias_return_thunk(void);
-+
-+extern void retbleed_untrain_ret(void);
- extern void srso_untrain_ret(void);
-extern void srso_untrain_ret_alias(void);
-+extern void srso_alias_untrain_ret(void);
-+
-+extern void entry_untrain_ret(void);
- extern void entry_ibpb(void);
- 
- #ifdef CONFIG_RETPOLINE
-diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
-index 239b302973d7a..f240c978d85e4 100644
--- a/arch/x86/kernel/cpu/amd.c
-+++ b/arch/x86/kernel/cpu/amd.c
-@@ -1295,3 +1295,4 @@ void noinstr amd_clear_divider(void)
- 	asm volatile(ALTERNATIVE("", "div %2\n\t", X86_BUG_DIV0)
- 		     :: "a" (0), "d" (0), "r" (1));
- }
-+EXPORT_SYMBOL_GPL(amd_clear_divider);
-diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
-index d98f33ea57e47..3a893ab398a01 100644
--- a/arch/x86/kernel/cpu/bugs.c
-+++ b/arch/x86/kernel/cpu/bugs.c
-@@ -62,6 +62,8 @@ EXPORT_SYMBOL_GPL(x86_pred_cmd);
- 
- static DEFINE_MUTEX(spec_ctrl_mutex);
- 
-+void (*x86_return_thunk)(void) __ro_after_init = &__x86_return_thunk;
-+
- /* Update SPEC_CTRL MSR and its cached copy unconditionally */
- static void update_spec_ctrl(u64 val)
- {
-@@ -164,8 +166,13 @@ void __init cpu_select_mitigations(void)
- 	md_clear_select_mitigation();
- 	srbds_select_mitigation();
- 	l1d_flush_select_mitigation();
-	gds_select_mitigation();
-+
-+	/*
-+	 * srso_select_mitigation() depends and must run after
-+	 * retbleed_select_mitigation().
-+	 */
- 	srso_select_mitigation();
-+	gds_select_mitigation();
- }
- 
- /*
-@@ -1013,6 +1020,9 @@ do_cmd_auto:
- 		setup_force_cpu_cap(X86_FEATURE_RETHUNK);
- 		setup_force_cpu_cap(X86_FEATURE_UNRET);
- 
-+		if (IS_ENABLED(CONFIG_RETHUNK))
-+			x86_return_thunk = retbleed_return_thunk;
-+
- 		if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD &&
- 		    boot_cpu_data.x86_vendor != X86_VENDOR_HYGON)
- 			pr_err(RETBLEED_UNTRAIN_MSG);
-@@ -2388,9 +2398,10 @@ static void __init srso_select_mitigation(void)
- 		 * Zen1/2 with SMT off aren't vulnerable after the right
- 		 * IBPB microcode has been applied.
- 		 */
-		if ((boot_cpu_data.x86 < 0x19) &&
-		    (!cpu_smt_possible() || (cpu_smt_control == CPU_SMT_DISABLED)))
-+		if (boot_cpu_data.x86 < 0x19 && !cpu_smt_possible()) {
- 			setup_force_cpu_cap(X86_FEATURE_SRSO_NO);
-+			return;
-+		}
- 	}
- 
- 	if (retbleed_mitigation == RETBLEED_MITIGATION_IBPB) {
-@@ -2419,11 +2430,15 @@ static void __init srso_select_mitigation(void)
- 			 * like ftrace, static_call, etc.
- 			 */
- 			setup_force_cpu_cap(X86_FEATURE_RETHUNK);
-+			setup_force_cpu_cap(X86_FEATURE_UNRET);
- 
-			if (boot_cpu_data.x86 == 0x19)
-+			if (boot_cpu_data.x86 == 0x19) {
- 				setup_force_cpu_cap(X86_FEATURE_SRSO_ALIAS);
-			else
-+				x86_return_thunk = srso_alias_return_thunk;
-+			} else {
- 				setup_force_cpu_cap(X86_FEATURE_SRSO);
-+				x86_return_thunk = srso_return_thunk;
-+			}
- 			srso_mitigation = SRSO_MITIGATION_SAFE_RET;
- 		} else {
- 			pr_err("WARNING: kernel not compiled with CPU_SRSO.\n");
-@@ -2672,6 +2687,9 @@ static ssize_t gds_show_state(char *buf)
- 
- static ssize_t srso_show_state(char *buf)
- {
-+	if (boot_cpu_has(X86_FEATURE_SRSO_NO))
-+		return sysfs_emit(buf, "Mitigation: SMT disabled\n");
-+
- 	return sysfs_emit(buf, "%s%s\n",
- 			  srso_strings[srso_mitigation],
- 			  (cpu_has_ibpb_brtype_microcode() ? "" : ", no microcode"));
-diff --git a/arch/x86/kernel/static_call.c b/arch/x86/kernel/static_call.c
-index a9b54b795ebff..3fbb491688275 100644
--- a/arch/x86/kernel/static_call.c
-+++ b/arch/x86/kernel/static_call.c
-@@ -184,6 +184,19 @@ EXPORT_SYMBOL_GPL(arch_static_call_transform);
-  */
- bool __static_call_fixup(void *tramp, u8 op, void *dest)
- {
-+	unsigned long addr = (unsigned long)tramp;
-+	/*
-+	 * Not all .return_sites are a static_call trampoline (most are not).
-+	 * Check if the 3 bytes after the return are still kernel text, if not,
-+	 * then this definitely is not a trampoline and we need not worry
-+	 * further.
-+	 *
-+	 * This avoids the memcmp() below tripping over pagefaults etc..
-+	 */
-+	if (((addr >> PAGE_SHIFT) != ((addr + 7) >> PAGE_SHIFT)) &&
-+	    !kernel_text_address(addr + 7))
-+		return false;
-+
- 	if (memcmp(tramp+5, tramp_ud, 3)) {
- 		/* Not a trampoline site, not our problem. */
- 		return false;
-diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index 7e8795d8b0f17..c0a5a4f225d9a 100644
--- a/arch/x86/kernel/traps.c
-+++ b/arch/x86/kernel/traps.c
-@@ -206,8 +206,6 @@ DEFINE_IDTENTRY(exc_divide_error)
- {
- 	do_error_trap(regs, 0, "divide error", X86_TRAP_DE, SIGFPE,
- 		      FPE_INTDIV, error_get_trap_addr(regs));
-
-	amd_clear_divider();
- }
- 
- DEFINE_IDTENTRY(exc_overflow)
-diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
-index e6939ebb606ab..78ccb5ec3c0e7 100644
--- a/arch/x86/kernel/vmlinux.lds.S
-+++ b/arch/x86/kernel/vmlinux.lds.S
-@@ -134,18 +134,18 @@ SECTIONS
- 		KPROBES_TEXT
- 		ALIGN_ENTRY_TEXT_BEGIN
- #ifdef CONFIG_CPU_SRSO
-		*(.text.__x86.rethunk_untrain)
-+		*(.text..__x86.rethunk_untrain)
- #endif
- 
- 		ENTRY_TEXT
- 
- #ifdef CONFIG_CPU_SRSO
- 		/*
-		 * See the comment above srso_untrain_ret_alias()'s
-+		 * See the comment above srso_alias_untrain_ret()'s
- 		 * definition.
- 		 */
-		. = srso_untrain_ret_alias | (1 << 2) | (1 << 8) | (1 << 14) | (1 << 20);
-		*(.text.__x86.rethunk_safe)
-+		. = srso_alias_untrain_ret | (1 << 2) | (1 << 8) | (1 << 14) | (1 << 20);
-+		*(.text..__x86.rethunk_safe)
- #endif
- 		ALIGN_ENTRY_TEXT_END
- 		SOFTIRQENTRY_TEXT
-@@ -154,8 +154,8 @@ SECTIONS
- 
- #ifdef CONFIG_RETPOLINE
- 		__indirect_thunk_start = .;
-		*(.text.__x86.indirect_thunk)
-		*(.text.__x86.return_thunk)
-+		*(.text..__x86.indirect_thunk)
-+		*(.text..__x86.return_thunk)
- 		__indirect_thunk_end = .;
- #endif
- 	} :text =0xcccc
-@@ -507,8 +507,8 @@ INIT_PER_CPU(irq_stack_backing_store);
-            "fixed_percpu_data is not at start of per-cpu area");
- #endif
- 
- #ifdef CONFIG_RETHUNK
-. = ASSERT((__ret & 0x3f) == 0, "__ret not cacheline-aligned");
-+#ifdef CONFIG_RETHUNK
-+. = ASSERT((retbleed_return_thunk & 0x3f) == 0, "retbleed_return_thunk not cacheline-aligned");
- . = ASSERT((srso_safe_ret & 0x3f) == 0, "srso_safe_ret not cacheline-aligned");
- #endif
- 
-@@ -523,8 +523,8 @@ INIT_PER_CPU(irq_stack_backing_store);
-  * Instead do: (A | B) - (A & B) in order to compute the XOR
-  * of the two function addresses:
-  */
-. = ASSERT(((ABSOLUTE(srso_untrain_ret_alias) | srso_safe_ret_alias) -
-		(ABSOLUTE(srso_untrain_ret_alias) & srso_safe_ret_alias)) == ((1 << 2) | (1 << 8) | (1 << 14) | (1 << 20)),
-+. = ASSERT(((ABSOLUTE(srso_alias_untrain_ret) | srso_alias_safe_ret) -
-+		(ABSOLUTE(srso_alias_untrain_ret) & srso_alias_safe_ret)) == ((1 << 2) | (1 << 8) | (1 << 14) | (1 << 20)),
- 		"SRSO function pair won't alias");
- #endif
- 
-diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
-index fdb6007f2eb86..a96f9a17e8b5d 100644
--- a/arch/x86/kvm/svm/svm.c
-+++ b/arch/x86/kvm/svm/svm.c
-@@ -3947,6 +3947,8 @@ static noinstr void svm_vcpu_enter_exit(struct kvm_vcpu *vcpu, bool spec_ctrl_in
- 
- 	guest_state_enter_irqoff();
- 
-+	amd_clear_divider();
-+
- 	if (sev_es_guest(vcpu->kvm))
- 		__svm_sev_es_vcpu_run(svm, spec_ctrl_intercepted);
- 	else
-diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S
-index 30e76fab678a5..65c5c44f006bc 100644
--- a/arch/x86/lib/retpoline.S
-+++ b/arch/x86/lib/retpoline.S
-@@ -11,7 +11,7 @@
- #include <asm/frame.h>
- #include <asm/nops.h>
- 
-	.section .text.__x86.indirect_thunk
-+	.section .text..__x86.indirect_thunk
- 
- .macro RETPOLINE reg
- 	ANNOTATE_INTRA_FUNCTION_CALL
-@@ -76,75 +76,106 @@ SYM_CODE_END(__x86_indirect_thunk_array)
- #ifdef CONFIG_RETHUNK
- 
- /*
- * srso_untrain_ret_alias() and srso_safe_ret_alias() are placed at
-+ * srso_alias_untrain_ret() and srso_alias_safe_ret() are placed at
-  * special addresses:
-  *
- * - srso_untrain_ret_alias() is 2M aligned
- * - srso_safe_ret_alias() is also in the same 2M page but bits 2, 8, 14
-+ * - srso_alias_untrain_ret() is 2M aligned
-+ * - srso_alias_safe_ret() is also in the same 2M page but bits 2, 8, 14
-  * and 20 in its virtual address are set (while those bits in the
- * srso_untrain_ret_alias() function are cleared).
-+ * srso_alias_untrain_ret() function are cleared).
-  *
-  * This guarantees that those two addresses will alias in the branch
-  * target buffer of Zen3/4 generations, leading to any potential
-  * poisoned entries at that BTB slot to get evicted.
-  *
- * As a result, srso_safe_ret_alias() becomes a safe return.
-+ * As a result, srso_alias_safe_ret() becomes a safe return.
-  */
- #ifdef CONFIG_CPU_SRSO
-	.section .text.__x86.rethunk_untrain
-+	.section .text..__x86.rethunk_untrain
- 
-SYM_START(srso_untrain_ret_alias, SYM_L_GLOBAL, SYM_A_NONE)
-+SYM_START(srso_alias_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE)
-+	UNWIND_HINT_FUNC
- 	ANNOTATE_NOENDBR
- 	ASM_NOP2
- 	lfence
-	jmp __x86_return_thunk
-SYM_FUNC_END(srso_untrain_ret_alias)
-__EXPORT_THUNK(srso_untrain_ret_alias)
-+	jmp srso_alias_return_thunk
-+SYM_FUNC_END(srso_alias_untrain_ret)
-+__EXPORT_THUNK(srso_alias_untrain_ret)
- 
-	.section .text.__x86.rethunk_safe
-+	.section .text..__x86.rethunk_safe
-+#else
-+/* dummy definition for alternatives */
-+SYM_START(srso_alias_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE)
-+	ANNOTATE_UNRET_SAFE
-+	ret
-+	int3
-+SYM_FUNC_END(srso_alias_untrain_ret)
- #endif
- 
-/* Needs a definition for the __x86_return_thunk alternative below. */
-SYM_START(srso_safe_ret_alias, SYM_L_GLOBAL, SYM_A_NONE)
-#ifdef CONFIG_CPU_SRSO
-	add $8, %_ASM_SP
-+SYM_START(srso_alias_safe_ret, SYM_L_GLOBAL, SYM_A_NONE)
-+	lea 8(%_ASM_SP), %_ASM_SP
- 	UNWIND_HINT_FUNC
-#endif
- 	ANNOTATE_UNRET_SAFE
- 	ret
- 	int3
-SYM_FUNC_END(srso_safe_ret_alias)
-+SYM_FUNC_END(srso_alias_safe_ret)
-+
-+	.section .text..__x86.return_thunk
- 
-	.section .text.__x86.return_thunk
-+SYM_CODE_START(srso_alias_return_thunk)
-+	UNWIND_HINT_FUNC
-+	ANNOTATE_NOENDBR
-+	call srso_alias_safe_ret
-+	ud2
-+SYM_CODE_END(srso_alias_return_thunk)
-+
-+/*
-+ * Some generic notes on the untraining sequences:
-+ *
-+ * They are interchangeable when it comes to flushing potentially wrong
-+ * RET predictions from the BTB.
-+ *
-+ * The SRSO Zen1/2 (MOVABS) untraining sequence is longer than the
-+ * Retbleed sequence because the return sequence done there
-+ * (srso_safe_ret()) is longer and the return sequence must fully nest
-+ * (end before) the untraining sequence. Therefore, the untraining
-+ * sequence must fully overlap the return sequence.
-+ *
-+ * Regarding alignment - the instructions which need to be untrained,
-+ * must all start at a cacheline boundary for Zen1/2 generations. That
-+ * is, instruction sequences starting at srso_safe_ret() and
-+ * the respective instruction sequences at retbleed_return_thunk()
-+ * must start at a cacheline boundary.
-+ */
- 
- /*
-  * Safety details here pertain to the AMD Zen{1,2} microarchitecture:
- * 1) The RET at __x86_return_thunk must be on a 64 byte boundary, for
-+ * 1) The RET at retbleed_return_thunk must be on a 64 byte boundary, for
-  *    alignment within the BTB.
- * 2) The instruction at zen_untrain_ret must contain, and not
-+ * 2) The instruction at retbleed_untrain_ret must contain, and not
-  *    end with, the 0xc3 byte of the RET.
-  * 3) STIBP must be enabled, or SMT disabled, to prevent the sibling thread
-  *    from re-poisioning the BTB prediction.
-  */
- 	.align 64
-	.skip 64 - (__ret - zen_untrain_ret), 0xcc
-SYM_START(zen_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE)
-+	.skip 64 - (retbleed_return_thunk - retbleed_untrain_ret), 0xcc
-+SYM_START(retbleed_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE)
- 	ANNOTATE_NOENDBR
- 	/*
-	 * As executed from zen_untrain_ret, this is:
-+	 * As executed from retbleed_untrain_ret, this is:
- 	 *
- 	 *   TEST $0xcc, %bl
- 	 *   LFENCE
-	 *   JMP __x86_return_thunk
-+	 *   JMP retbleed_return_thunk
- 	 *
- 	 * Executing the TEST instruction has a side effect of evicting any BTB
- 	 * prediction (potentially attacker controlled) attached to the RET, as
-	 * __x86_return_thunk + 1 isn't an instruction boundary at the moment.
-+	 * retbleed_return_thunk + 1 isn't an instruction boundary at the moment.
- 	 */
- 	.byte	0xf6
- 
- 	/*
-	 * As executed from __x86_return_thunk, this is a plain RET.
-+	 * As executed from retbleed_return_thunk, this is a plain RET.
- 	 *
- 	 * As part of the TEST above, RET is the ModRM byte, and INT3 the imm8.
- 	 *
-@@ -156,13 +187,13 @@ SYM_START(zen_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE)
- 	 * With SMT enabled and STIBP active, a sibling thread cannot poison
- 	 * RET's prediction to a type of its choice, but can evict the
- 	 * prediction due to competitive sharing. If the prediction is
-	 * evicted, __x86_return_thunk will suffer Straight Line Speculation
-+	 * evicted, retbleed_return_thunk will suffer Straight Line Speculation
- 	 * which will be contained safely by the INT3.
- 	 */
-SYM_INNER_LABEL(__ret, SYM_L_GLOBAL)
-+SYM_INNER_LABEL(retbleed_return_thunk, SYM_L_GLOBAL)
- 	ret
- 	int3
-SYM_CODE_END(__ret)
-+SYM_CODE_END(retbleed_return_thunk)
- 
- 	/*
- 	 * Ensure the TEST decoding / BTB invalidation is complete.
-@@ -173,16 +204,16 @@ SYM_CODE_END(__ret)
- 	 * Jump back and execute the RET in the middle of the TEST instruction.
- 	 * INT3 is for SLS protection.
- 	 */
-	jmp __ret
-+	jmp retbleed_return_thunk
- 	int3
-SYM_FUNC_END(zen_untrain_ret)
-__EXPORT_THUNK(zen_untrain_ret)
-+SYM_FUNC_END(retbleed_untrain_ret)
-+__EXPORT_THUNK(retbleed_untrain_ret)
- 
- /*
- * SRSO untraining sequence for Zen1/2, similar to zen_untrain_ret()
-+ * SRSO untraining sequence for Zen1/2, similar to retbleed_untrain_ret()
-  * above. On kernel entry, srso_untrain_ret() is executed which is a
-  *
- * movabs $0xccccccc308c48348,%rax
-+ * movabs $0xccccc30824648d48,%rax
-  *
-  * and when the return thunk executes the inner label srso_safe_ret()
-  * later, it is a stack manipulation and a RET which is mispredicted and
-@@ -194,22 +225,44 @@ SYM_START(srso_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE)
- 	ANNOTATE_NOENDBR
- 	.byte 0x48, 0xb8
- 
-+/*
-+ * This forces the function return instruction to speculate into a trap
-+ * (UD2 in srso_return_thunk() below).  This RET will then mispredict
-+ * and execution will continue at the return site read from the top of
-+ * the stack.
-+ */
- SYM_INNER_LABEL(srso_safe_ret, SYM_L_GLOBAL)
-	add $8, %_ASM_SP
-+	lea 8(%_ASM_SP), %_ASM_SP
- 	ret
- 	int3
- 	int3
-	int3
-+	/* end of movabs */
- 	lfence
- 	call srso_safe_ret
-	int3
-+	ud2
- SYM_CODE_END(srso_safe_ret)
- SYM_FUNC_END(srso_untrain_ret)
- __EXPORT_THUNK(srso_untrain_ret)
- 
-SYM_FUNC_START(__x86_return_thunk)
-	ALTERNATIVE_2 "jmp __ret", "call srso_safe_ret", X86_FEATURE_SRSO, \
-			"call srso_safe_ret_alias", X86_FEATURE_SRSO_ALIAS
-+SYM_CODE_START(srso_return_thunk)
-+	UNWIND_HINT_FUNC
-+	ANNOTATE_NOENDBR
-+	call srso_safe_ret
-+	ud2
-+SYM_CODE_END(srso_return_thunk)
-+
-+SYM_FUNC_START(entry_untrain_ret)
-+	ALTERNATIVE_2 "jmp retbleed_untrain_ret", \
-+		      "jmp srso_untrain_ret", X86_FEATURE_SRSO, \
-+		      "jmp srso_alias_untrain_ret", X86_FEATURE_SRSO_ALIAS
-+SYM_FUNC_END(entry_untrain_ret)
-+__EXPORT_THUNK(entry_untrain_ret)
-+
-+SYM_CODE_START(__x86_return_thunk)
-+	UNWIND_HINT_FUNC
-+	ANNOTATE_NOENDBR
-+	ANNOTATE_UNRET_SAFE
-+	ret
- 	int3
- SYM_CODE_END(__x86_return_thunk)
- EXPORT_SYMBOL(__x86_return_thunk)
-diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c
-index a60c5efe34b36..29c35279c7ed8 100644
--- a/tools/objtool/arch/x86/decode.c
-+++ b/tools/objtool/arch/x86/decode.c
-@@ -799,5 +799,5 @@ bool arch_is_rethunk(struct symbol *sym)
- 	return !strcmp(sym->name, "__x86_return_thunk") ||
- 	       !strcmp(sym->name, "srso_untrain_ret") ||
- 	       !strcmp(sym->name, "srso_safe_ret") ||
-	       !strcmp(sym->name, "__ret");
-+	       !strcmp(sym->name, "retbleed_return_thunk");
- }
-diff --git a/tools/objtool/check.c b/tools/objtool/check.c
-index c2c350933a237..913bd361c3684 100644
--- a/tools/objtool/check.c
-+++ b/tools/objtool/check.c
-@@ -379,7 +379,7 @@ static int decode_instructions(struct objtool_file *file)
- 
- 		if (!strcmp(sec->name, ".noinstr.text") ||
- 		    !strcmp(sec->name, ".entry.text") ||
-		    !strncmp(sec->name, ".text.__x86.", 12))
-+		    !strncmp(sec->name, ".text..__x86.", 13))
- 			sec->noinstr = true;
- 
- 		for (offset = 0; offset < sec->sh.sh_size; offset += insn->len) {
-@@ -1430,7 +1430,7 @@ static int add_jump_destinations(struct objtool_file *file)
- 			struct symbol *sym = find_symbol_by_offset(dest_sec, dest_off);
- 
- 			/*
-			 * This is a special case for zen_untrain_ret().
-+			 * This is a special case for retbleed_untrain_ret().
- 			 * It jumps to __x86_return_thunk(), but objtool
- 			 * can't find the thunk's starting RET
- 			 * instruction, because the RET is also in the
-@@ -2450,12 +2450,17 @@ static int decode_sections(struct objtool_file *file)
- 	return 0;
- }
- 
-static bool is_fentry_call(struct instruction *insn)
-+static bool is_special_call(struct instruction *insn)
- {
-	if (insn->type == INSN_CALL &&
-	    insn->call_dest &&
-	    insn->call_dest->fentry)
-		return true;
-+	if (insn->type == INSN_CALL) {
-+		struct symbol *dest = insn->call_dest;
-+
-+		if (!dest)
-+			return false;
-+
-+		if (dest->fentry)
-+			return true;
-+	}
- 
- 	return false;
- }
-@@ -3448,7 +3453,7 @@ static int validate_branch(struct objtool_file *file, struct symbol *func,
- 			if (ret)
- 				return ret;
- 
-			if (opts.stackval && func && !is_fentry_call(insn) &&
-+			if (opts.stackval && func && !is_special_call(insn) &&
- 			    !has_valid_stack_frame(&state)) {
- 				WARN_FUNC("call without frame pointer save/setup",
- 					  sec, insn->offset);
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.48-49.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.48-49.patch
@ -1,292 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 8bb8dd199c552..61ebd54aba899 100644
--- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- VERSION = 6
- PATCHLEVEL = 1
-SUBLEVEL = 48
-+SUBLEVEL = 49
- EXTRAVERSION =
- NAME = Curry Ramen
- 
-diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
-index 78f39a78de29a..4d1e48c676fab 100644
--- a/fs/f2fs/f2fs.h
-+++ b/fs/f2fs/f2fs.h
-@@ -3431,6 +3431,7 @@ static inline bool __is_valid_data_blkaddr(block_t blkaddr)
-  * file.c
-  */
- int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync);
-+void f2fs_truncate_data_blocks(struct dnode_of_data *dn);
- int f2fs_do_truncate_blocks(struct inode *inode, u64 from, bool lock);
- int f2fs_truncate_blocks(struct inode *inode, u64 from, bool lock);
- int f2fs_truncate(struct inode *inode);
-diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
-index 3ce6da4fac9c6..7b94f047cbf79 100644
--- a/fs/f2fs/file.c
-+++ b/fs/f2fs/file.c
-@@ -628,6 +628,11 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count)
- 					 dn->ofs_in_node, nr_free);
- }
- 
-+void f2fs_truncate_data_blocks(struct dnode_of_data *dn)
-+{
-+	f2fs_truncate_data_blocks_range(dn, ADDRS_PER_BLOCK(dn->inode));
-+}
-+
- static int truncate_partial_data_page(struct inode *inode, u64 from,
- 								bool cache_only)
- {
-diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
-index 9fe502485930f..a010b4bc36d2c 100644
--- a/fs/f2fs/node.c
-+++ b/fs/f2fs/node.c
-@@ -923,7 +923,6 @@ static int truncate_node(struct dnode_of_data *dn)
- 
- static int truncate_dnode(struct dnode_of_data *dn)
- {
-	struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode);
- 	struct page *page;
- 	int err;
- 
-@@ -931,25 +930,16 @@ static int truncate_dnode(struct dnode_of_data *dn)
- 		return 1;
- 
- 	/* get direct node */
-	page = f2fs_get_node_page(sbi, dn->nid);
-+	page = f2fs_get_node_page(F2FS_I_SB(dn->inode), dn->nid);
- 	if (PTR_ERR(page) == -ENOENT)
- 		return 1;
- 	else if (IS_ERR(page))
- 		return PTR_ERR(page);
- 
-	if (IS_INODE(page) || ino_of_node(page) != dn->inode->i_ino) {
-		f2fs_err(sbi, "incorrect node reference, ino: %lu, nid: %u, ino_of_node: %u",
-				dn->inode->i_ino, dn->nid, ino_of_node(page));
-		set_sbi_flag(sbi, SBI_NEED_FSCK);
-		f2fs_handle_error(sbi, ERROR_INVALID_NODE_REFERENCE);
-		f2fs_put_page(page, 1);
-		return -EFSCORRUPTED;
-	}
-
- 	/* Make dnode_of_data for parameter */
- 	dn->node_page = page;
- 	dn->ofs_in_node = 0;
-	f2fs_truncate_data_blocks_range(dn, ADDRS_PER_BLOCK(dn->inode));
-+	f2fs_truncate_data_blocks(dn);
- 	err = truncate_node(dn);
- 	if (err) {
- 		f2fs_put_page(page, 1);
-diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
-index ff47aad636e5b..b6dad389fa144 100644
--- a/fs/f2fs/super.c
-+++ b/fs/f2fs/super.c
-@@ -1347,12 +1347,6 @@ default_check:
- 		return -EINVAL;
- 	}
- 
-	if ((f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb)) &&
-		test_opt(sbi, FLUSH_MERGE)) {
-		f2fs_err(sbi, "FLUSH_MERGE not compatible with readonly mode");
-		return -EINVAL;
-	}
-
- 	if (f2fs_sb_has_readonly(sbi) && !f2fs_readonly(sbi->sb)) {
- 		f2fs_err(sbi, "Allow to mount readonly mode only");
- 		return -EROFS;
-@@ -1939,10 +1933,8 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root)
- 		seq_puts(seq, ",inline_dentry");
- 	else
- 		seq_puts(seq, ",noinline_dentry");
-	if (test_opt(sbi, FLUSH_MERGE))
-+	if (!f2fs_readonly(sbi->sb) && test_opt(sbi, FLUSH_MERGE))
- 		seq_puts(seq, ",flush_merge");
-	else
-		seq_puts(seq, ",noflush_merge");
- 	if (test_opt(sbi, NOBARRIER))
- 		seq_puts(seq, ",nobarrier");
- 	if (test_opt(sbi, FASTBOOT))
-@@ -2040,22 +2032,9 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root)
- 	return 0;
- }
- 
-static void default_options(struct f2fs_sb_info *sbi, bool remount)
-+static void default_options(struct f2fs_sb_info *sbi)
- {
- 	/* init some FS parameters */
-	if (!remount) {
-		set_opt(sbi, READ_EXTENT_CACHE);
-		clear_opt(sbi, DISABLE_CHECKPOINT);
-
-		if (f2fs_hw_support_discard(sbi) || f2fs_hw_should_discard(sbi))
-			set_opt(sbi, DISCARD);
-
-		if (f2fs_sb_has_blkzoned(sbi))
-			F2FS_OPTION(sbi).discard_unit = DISCARD_UNIT_SECTION;
-		else
-			F2FS_OPTION(sbi).discard_unit = DISCARD_UNIT_BLOCK;
-	}
-
- 	if (f2fs_sb_has_readonly(sbi))
- 		F2FS_OPTION(sbi).active_logs = NR_CURSEG_RO_TYPE;
- 	else
-@@ -2078,16 +2057,22 @@ static void default_options(struct f2fs_sb_info *sbi, bool remount)
- 	set_opt(sbi, INLINE_XATTR);
- 	set_opt(sbi, INLINE_DATA);
- 	set_opt(sbi, INLINE_DENTRY);
-+	set_opt(sbi, READ_EXTENT_CACHE);
- 	set_opt(sbi, NOHEAP);
-+	clear_opt(sbi, DISABLE_CHECKPOINT);
- 	set_opt(sbi, MERGE_CHECKPOINT);
- 	F2FS_OPTION(sbi).unusable_cap = 0;
- 	sbi->sb->s_flags |= SB_LAZYTIME;
-	if (!f2fs_sb_has_readonly(sbi) && !f2fs_readonly(sbi->sb))
-		set_opt(sbi, FLUSH_MERGE);
-	if (f2fs_sb_has_blkzoned(sbi))
-+	set_opt(sbi, FLUSH_MERGE);
-+	if (f2fs_hw_support_discard(sbi) || f2fs_hw_should_discard(sbi))
-+		set_opt(sbi, DISCARD);
-+	if (f2fs_sb_has_blkzoned(sbi)) {
- 		F2FS_OPTION(sbi).fs_mode = FS_MODE_LFS;
-	else
-+		F2FS_OPTION(sbi).discard_unit = DISCARD_UNIT_SECTION;
-+	} else {
- 		F2FS_OPTION(sbi).fs_mode = FS_MODE_ADAPTIVE;
-+		F2FS_OPTION(sbi).discard_unit = DISCARD_UNIT_BLOCK;
-+	}
- 
- #ifdef CONFIG_F2FS_FS_XATTR
- 	set_opt(sbi, XATTR_USER);
-@@ -2259,7 +2244,7 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)
- 			clear_sbi_flag(sbi, SBI_NEED_SB_WRITE);
- 	}
- 
-	default_options(sbi, true);
-+	default_options(sbi);
- 
- 	/* parse mount options */
- 	err = parse_options(sb, data, true);
-@@ -4156,7 +4141,7 @@ try_onemore:
- 		sbi->s_chksum_seed = f2fs_chksum(sbi, ~0, raw_super->uuid,
- 						sizeof(raw_super->uuid));
- 
-	default_options(sbi, false);
-+	default_options(sbi);
- 	/* parse mount options */
- 	options = kstrdup((const char *)data, GFP_KERNEL);
- 	if (data && !options) {
-diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h
-index 77055b239165a..ee0d75d9a302d 100644
--- a/include/linux/f2fs_fs.h
-+++ b/include/linux/f2fs_fs.h
-@@ -104,7 +104,6 @@ enum f2fs_error {
- 	ERROR_INCONSISTENT_SIT,
- 	ERROR_CORRUPTED_VERITY_XATTR,
- 	ERROR_CORRUPTED_XATTR,
-	ERROR_INVALID_NODE_REFERENCE,
- 	ERROR_MAX,
- };
- 
-diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c
-index 29c35279c7ed8..1ed49ab4e871f 100644
--- a/tools/objtool/arch/x86/decode.c
-+++ b/tools/objtool/arch/x86/decode.c
-@@ -796,8 +796,11 @@ bool arch_is_retpoline(struct symbol *sym)
- 
- bool arch_is_rethunk(struct symbol *sym)
- {
-	return !strcmp(sym->name, "__x86_return_thunk") ||
-	       !strcmp(sym->name, "srso_untrain_ret") ||
-	       !strcmp(sym->name, "srso_safe_ret") ||
-	       !strcmp(sym->name, "retbleed_return_thunk");
-+	return !strcmp(sym->name, "__x86_return_thunk");
-+}
-+
-+bool arch_is_embedded_insn(struct symbol *sym)
-+{
-+	return !strcmp(sym->name, "retbleed_return_thunk") ||
-+	       !strcmp(sym->name, "srso_safe_ret");
- }
-diff --git a/tools/objtool/check.c b/tools/objtool/check.c
-index 913bd361c3684..f8008ab31eef0 100644
--- a/tools/objtool/check.c
-+++ b/tools/objtool/check.c
-@@ -1164,16 +1164,33 @@ static int add_ignore_alternatives(struct objtool_file *file)
- 	return 0;
- }
- 
-+/*
-+ * Symbols that replace INSN_CALL_DYNAMIC, every (tail) call to such a symbol
-+ * will be added to the .retpoline_sites section.
-+ */
- __weak bool arch_is_retpoline(struct symbol *sym)
- {
- 	return false;
- }
- 
-+/*
-+ * Symbols that replace INSN_RETURN, every (tail) call to such a symbol
-+ * will be added to the .return_sites section.
-+ */
- __weak bool arch_is_rethunk(struct symbol *sym)
- {
- 	return false;
- }
- 
-+/*
-+ * Symbols that are embedded inside other instructions, because sometimes crazy
-+ * code exists. These are mostly ignored for validation purposes.
-+ */
-+__weak bool arch_is_embedded_insn(struct symbol *sym)
-+{
-+	return false;
-+}
-+
- #define NEGATIVE_RELOC	((void *)-1L)
- 
- static struct reloc *insn_reloc(struct objtool_file *file, struct instruction *insn)
-@@ -1437,7 +1454,7 @@ static int add_jump_destinations(struct objtool_file *file)
- 			 * middle of another instruction.  Objtool only
- 			 * knows about the outer instruction.
- 			 */
-			if (sym && sym->return_thunk) {
-+			if (sym && sym->embedded_insn) {
- 				add_return_call(file, insn, false);
- 				continue;
- 			}
-@@ -2327,6 +2344,9 @@ static int classify_symbols(struct objtool_file *file)
- 			if (arch_is_rethunk(func))
- 				func->return_thunk = true;
- 
-+			if (arch_is_embedded_insn(func))
-+				func->embedded_insn = true;
-+
- 			if (!strcmp(func->name, "__fentry__"))
- 				func->fentry = true;
- 
-diff --git a/tools/objtool/include/objtool/arch.h b/tools/objtool/include/objtool/arch.h
-index beb2f3aa94ffc..861c0c60ac81e 100644
--- a/tools/objtool/include/objtool/arch.h
-+++ b/tools/objtool/include/objtool/arch.h
-@@ -90,6 +90,7 @@ int arch_decode_hint_reg(u8 sp_reg, int *base);
- 
- bool arch_is_retpoline(struct symbol *sym);
- bool arch_is_rethunk(struct symbol *sym);
-+bool arch_is_embedded_insn(struct symbol *sym);
- 
- int arch_rewrite_retpolines(struct objtool_file *file);
- 
-diff --git a/tools/objtool/include/objtool/elf.h b/tools/objtool/include/objtool/elf.h
-index 16f4067b82aea..5d4a841fbd311 100644
--- a/tools/objtool/include/objtool/elf.h
-+++ b/tools/objtool/include/objtool/elf.h
-@@ -60,6 +60,7 @@ struct symbol {
- 	u8 return_thunk      : 1;
- 	u8 fentry            : 1;
- 	u8 profiling_func    : 1;
-+	u8 embedded_insn     : 1;
- 	struct list_head pv_target;
- };
- 
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.49-50.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.49-50.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.50-51.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.50-51.patch
@ -1,550 +0,0 @@
-diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 882b6198dd0d1..31af352b4762d 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
-+++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -6164,10 +6164,6 @@
- 			-1: disable all critical trip points in all thermal zones
- 			<degrees C>: override all critical trip points
- 
-	thermal.nocrt=	[HW,ACPI]
-			Set to disable actions on ACPI thermal zone
-			critical and hot trip points.
-
- 	thermal.off=	[HW,ACPI]
- 			1: disable ACPI thermal control
- 
-diff --git a/Makefile b/Makefile
-index e5e1fdeef8bf0..e7c344d5af156 100644
--- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- VERSION = 6
- PATCHLEVEL = 1
-SUBLEVEL = 50
-+SUBLEVEL = 51
- EXTRAVERSION =
- NAME = Curry Ramen
- 
-diff --git a/arch/arm/kernel/module-plts.c b/arch/arm/kernel/module-plts.c
-index 1fc309b41f944..8d809724cde52 100644
--- a/arch/arm/kernel/module-plts.c
-+++ b/arch/arm/kernel/module-plts.c
-@@ -256,7 +256,7 @@ int module_frob_arch_sections(Elf_Ehdr *ehdr, Elf_Shdr *sechdrs,
- 		/* sort by type and symbol index */
- 		sort(rels, numrels, sizeof(Elf32_Rel), cmp_rel, NULL);
- 
-		if (strncmp(secstrings + dstsec->sh_name, ".init", 5) != 0)
-+		if (!module_init_layout_section(secstrings + dstsec->sh_name))
- 			core_plts += count_plts(syms, dstsec->sh_addr, rels,
- 						numrels, s->sh_info);
- 		else
-diff --git a/arch/arm64/kernel/module-plts.c b/arch/arm64/kernel/module-plts.c
-index 5a0a8f552a610..c703b5db8eb11 100644
--- a/arch/arm64/kernel/module-plts.c
-+++ b/arch/arm64/kernel/module-plts.c
-@@ -7,6 +7,7 @@
- #include <linux/ftrace.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
-+#include <linux/moduleloader.h>
- #include <linux/sort.h>
- 
- static struct plt_entry __get_adrp_add_pair(u64 dst, u64 pc,
-@@ -343,7 +344,7 @@ int module_frob_arch_sections(Elf_Ehdr *ehdr, Elf_Shdr *sechdrs,
- 		if (nents)
- 			sort(rels, nents, sizeof(Elf64_Rela), cmp_rela, NULL);
- 
-		if (!str_has_prefix(secstrings + dstsec->sh_name, ".init"))
-+		if (!module_init_layout_section(secstrings + dstsec->sh_name))
- 			core_plts += count_plts(syms, rels, numrels,
- 						sechdrs[i].sh_info, dstsec);
- 		else
-diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
-index 09a34b07f02e6..9915062d5243c 100644
--- a/arch/parisc/kernel/sys_parisc.c
-+++ b/arch/parisc/kernel/sys_parisc.c
-@@ -24,32 +24,28 @@
- #include <linux/personality.h>
- #include <linux/random.h>
- #include <linux/compat.h>
-+#include <linux/elf-randomize.h>
- 
-/* we construct an artificial offset for the mapping based on the physical
- * address of the kernel mapping variable */
-#define GET_LAST_MMAP(filp)		\
-	(filp ? ((unsigned long) filp->f_mapping) >> 8 : 0UL)
-#define SET_LAST_MMAP(filp, val)	\
-	 { /* nothing */ }
-
-static int get_offset(unsigned int last_mmap)
-{
-	return (last_mmap & (SHM_COLOUR-1)) >> PAGE_SHIFT;
-}
-+/*
-+ * Construct an artificial page offset for the mapping based on the physical
-+ * address of the kernel file mapping variable.
-+ */
-+#define GET_FILP_PGOFF(filp)		\
-+	(filp ? (((unsigned long) filp->f_mapping) >> 8)	\
-+		 & ((SHM_COLOUR-1) >> PAGE_SHIFT) : 0UL)
- 
-static unsigned long shared_align_offset(unsigned int last_mmap,
-+static unsigned long shared_align_offset(unsigned long filp_pgoff,
- 					 unsigned long pgoff)
- {
-	return (get_offset(last_mmap) + pgoff) << PAGE_SHIFT;
-+	return (filp_pgoff + pgoff) << PAGE_SHIFT;
- }
- 
- static inline unsigned long COLOR_ALIGN(unsigned long addr,
-			 unsigned int last_mmap, unsigned long pgoff)
-+			 unsigned long filp_pgoff, unsigned long pgoff)
- {
- 	unsigned long base = (addr+SHM_COLOUR-1) & ~(SHM_COLOUR-1);
- 	unsigned long off  = (SHM_COLOUR-1) &
-		(shared_align_offset(last_mmap, pgoff) << PAGE_SHIFT);
-
-+		shared_align_offset(filp_pgoff, pgoff);
- 	return base + off;
- }
- 
-@@ -98,126 +94,91 @@ static unsigned long mmap_upper_limit(struct rlimit *rlim_stack)
- 	return PAGE_ALIGN(STACK_TOP - stack_base);
- }
- 
-+enum mmap_allocation_direction {UP, DOWN};
- 
-unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
-		unsigned long len, unsigned long pgoff, unsigned long flags)
-+static unsigned long arch_get_unmapped_area_common(struct file *filp,
-+	unsigned long addr, unsigned long len, unsigned long pgoff,
-+	unsigned long flags, enum mmap_allocation_direction dir)
- {
- 	struct mm_struct *mm = current->mm;
- 	struct vm_area_struct *vma, *prev;
-	unsigned long task_size = TASK_SIZE;
-	int do_color_align, last_mmap;
-+	unsigned long filp_pgoff;
-+	int do_color_align;
- 	struct vm_unmapped_area_info info;
- 
-	if (len > task_size)
-+	if (unlikely(len > TASK_SIZE))
- 		return -ENOMEM;
- 
- 	do_color_align = 0;
- 	if (filp || (flags & MAP_SHARED))
- 		do_color_align = 1;
-	last_mmap = GET_LAST_MMAP(filp);
-+	filp_pgoff = GET_FILP_PGOFF(filp);
- 
- 	if (flags & MAP_FIXED) {
-		if ((flags & MAP_SHARED) && last_mmap &&
-		    (addr - shared_align_offset(last_mmap, pgoff))
-+		/* Even MAP_FIXED mappings must reside within TASK_SIZE */
-+		if (TASK_SIZE - len < addr)
-+			return -EINVAL;
-+
-+		if ((flags & MAP_SHARED) && filp &&
-+		    (addr - shared_align_offset(filp_pgoff, pgoff))
- 				& (SHM_COLOUR - 1))
- 			return -EINVAL;
-		goto found_addr;
-+		return addr;
- 	}
- 
- 	if (addr) {
-		if (do_color_align && last_mmap)
-			addr = COLOR_ALIGN(addr, last_mmap, pgoff);
-+		if (do_color_align)
-+			addr = COLOR_ALIGN(addr, filp_pgoff, pgoff);
- 		else
- 			addr = PAGE_ALIGN(addr);
- 
- 		vma = find_vma_prev(mm, addr, &prev);
-		if (task_size - len >= addr &&
-+		if (TASK_SIZE - len >= addr &&
- 		    (!vma || addr + len <= vm_start_gap(vma)) &&
- 		    (!prev || addr >= vm_end_gap(prev)))
-			goto found_addr;
-+			return addr;
- 	}
- 
-	info.flags = 0;
- 	info.length = len;
-+	info.align_mask = do_color_align ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
-+	info.align_offset = shared_align_offset(filp_pgoff, pgoff);
-+
-+	if (dir == DOWN) {
-+		info.flags = VM_UNMAPPED_AREA_TOPDOWN;
-+		info.low_limit = PAGE_SIZE;
-+		info.high_limit = mm->mmap_base;
-+		addr = vm_unmapped_area(&info);
-+		if (!(addr & ~PAGE_MASK))
-+			return addr;
-+		VM_BUG_ON(addr != -ENOMEM);
-+
-+		/*
-+		 * A failed mmap() very likely causes application failure,
-+		 * so fall back to the bottom-up function here. This scenario
-+		 * can happen with large stack limits and large mmap()
-+		 * allocations.
-+		 */
-+	}
-+
-+	info.flags = 0;
- 	info.low_limit = mm->mmap_legacy_base;
- 	info.high_limit = mmap_upper_limit(NULL);
-	info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
-	info.align_offset = shared_align_offset(last_mmap, pgoff);
-	addr = vm_unmapped_area(&info);
-
-found_addr:
-	if (do_color_align && !last_mmap && !(addr & ~PAGE_MASK))
-		SET_LAST_MMAP(filp, addr - (pgoff << PAGE_SHIFT));
-
-	return addr;
-+	return vm_unmapped_area(&info);
- }
- 
-unsigned long
-arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
-			  const unsigned long len, const unsigned long pgoff,
-			  const unsigned long flags)
-+unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
-+	unsigned long len, unsigned long pgoff, unsigned long flags)
- {
-	struct vm_area_struct *vma, *prev;
-	struct mm_struct *mm = current->mm;
-	unsigned long addr = addr0;
-	int do_color_align, last_mmap;
-	struct vm_unmapped_area_info info;
-
-	/* requested length too big for entire address space */
-	if (len > TASK_SIZE)
-		return -ENOMEM;
-
-	do_color_align = 0;
-	if (filp || (flags & MAP_SHARED))
-		do_color_align = 1;
-	last_mmap = GET_LAST_MMAP(filp);
-
-	if (flags & MAP_FIXED) {
-		if ((flags & MAP_SHARED) && last_mmap &&
-		    (addr - shared_align_offset(last_mmap, pgoff))
-			& (SHM_COLOUR - 1))
-			return -EINVAL;
-		goto found_addr;
-	}
-
-	/* requesting a specific address */
-	if (addr) {
-		if (do_color_align && last_mmap)
-			addr = COLOR_ALIGN(addr, last_mmap, pgoff);
-		else
-			addr = PAGE_ALIGN(addr);
-
-		vma = find_vma_prev(mm, addr, &prev);
-		if (TASK_SIZE - len >= addr &&
-		    (!vma || addr + len <= vm_start_gap(vma)) &&
-		    (!prev || addr >= vm_end_gap(prev)))
-			goto found_addr;
-	}
-
-	info.flags = VM_UNMAPPED_AREA_TOPDOWN;
-	info.length = len;
-	info.low_limit = PAGE_SIZE;
-	info.high_limit = mm->mmap_base;
-	info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
-	info.align_offset = shared_align_offset(last_mmap, pgoff);
-	addr = vm_unmapped_area(&info);
-	if (!(addr & ~PAGE_MASK))
-		goto found_addr;
-	VM_BUG_ON(addr != -ENOMEM);
-
-	/*
-	 * A failed mmap() very likely causes application failure,
-	 * so fall back to the bottom-up function here. This scenario
-	 * can happen with large stack limits and large mmap()
-	 * allocations.
-	 */
-	return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
-
-found_addr:
-	if (do_color_align && !last_mmap && !(addr & ~PAGE_MASK))
-		SET_LAST_MMAP(filp, addr - (pgoff << PAGE_SHIFT));
-+	return arch_get_unmapped_area_common(filp,
-+			addr, len, pgoff, flags, UP);
-+}
- 
-	return addr;
-+unsigned long arch_get_unmapped_area_topdown(struct file *filp,
-+	unsigned long addr, unsigned long len, unsigned long pgoff,
-+	unsigned long flags)
-+{
-+	return arch_get_unmapped_area_common(filp,
-+			addr, len, pgoff, flags, DOWN);
- }
- 
- static int mmap_is_legacy(void)
-@@ -379,7 +340,7 @@ asmlinkage long parisc_fallocate(int fd, int mode, u32 offhi, u32 offlo,
- 			      ((u64)lenhi << 32) | lenlo);
- }
- 
-long parisc_personality(unsigned long personality)
-+asmlinkage long parisc_personality(unsigned long personality)
- {
- 	long err;
- 
-diff --git a/arch/x86/include/asm/sections.h b/arch/x86/include/asm/sections.h
-index a6e8373a5170f..3fa87e5e11aba 100644
--- a/arch/x86/include/asm/sections.h
-+++ b/arch/x86/include/asm/sections.h
-@@ -2,8 +2,6 @@
- #ifndef _ASM_X86_SECTIONS_H
- #define _ASM_X86_SECTIONS_H
- 
-#define arch_is_kernel_initmem_freed arch_is_kernel_initmem_freed
-
- #include <asm-generic/sections.h>
- #include <asm/extable.h>
- 
-@@ -18,20 +16,4 @@ extern char __end_of_kernel_reserve[];
- 
- extern unsigned long _brk_start, _brk_end;
- 
-static inline bool arch_is_kernel_initmem_freed(unsigned long addr)
-{
-	/*
-	 * If _brk_start has not been cleared, brk allocation is incomplete,
-	 * and we can not make assumptions about its use.
-	 */
-	if (_brk_start)
-		return 0;
-
-	/*
-	 * After brk allocation is complete, space between _brk_end and _end
-	 * is available for allocation.
-	 */
-	return addr >= _brk_end && addr < (unsigned long)&_end;
-}
-
- #endif	/* _ASM_X86_SECTIONS_H */
-diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
-index 40b07057983e0..40ecb55b52f8c 100644
--- a/drivers/acpi/thermal.c
-+++ b/drivers/acpi/thermal.c
-@@ -59,10 +59,6 @@ static int tzp;
- module_param(tzp, int, 0444);
- MODULE_PARM_DESC(tzp, "Thermal zone polling frequency, in 1/10 seconds.");
- 
-static int nocrt;
-module_param(nocrt, int, 0);
-MODULE_PARM_DESC(nocrt, "Set to take no action upon ACPI thermal zone critical trips points.");
-
- static int off;
- module_param(off, int, 0);
- MODULE_PARM_DESC(off, "Set to disable ACPI thermal support.");
-@@ -1128,7 +1124,7 @@ static int thermal_act(const struct dmi_system_id *d) {
- static int thermal_nocrt(const struct dmi_system_id *d) {
- 	pr_notice("%s detected: disabling all critical thermal trip point actions.\n",
- 		  d->ident);
-	nocrt = 1;
-+	crt = -1;
- 	return 0;
- }
- static int thermal_tzp(const struct dmi_system_id *d) {
-diff --git a/drivers/thunderbolt/tmu.c b/drivers/thunderbolt/tmu.c
-index d9544600b3867..49146f97bb16e 100644
--- a/drivers/thunderbolt/tmu.c
-+++ b/drivers/thunderbolt/tmu.c
-@@ -416,6 +416,7 @@ int tb_switch_tmu_disable(struct tb_switch *sw)
- 		 * mode.
- 		 */
- 		ret = tb_switch_tmu_rate_write(sw, TB_SWITCH_TMU_RATE_OFF);
-+		if (ret)
- 			return ret;
- 
- 		tb_port_tmu_time_sync_disable(up);
-diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
-index 9e09d11ffe5b3..1322652a9d0d9 100644
--- a/include/linux/moduleloader.h
-+++ b/include/linux/moduleloader.h
-@@ -39,6 +39,11 @@ bool module_init_section(const char *name);
-  */
- bool module_exit_section(const char *name);
- 
-+/* Describes whether within_module_init() will consider this an init section
-+ * or not. This behaviour changes with CONFIG_MODULE_UNLOAD.
-+ */
-+bool module_init_layout_section(const char *sname);
-+
- /*
-  * Apply the given relocation to the (simplified) ELF.  Return -error
-  * or 0.
-diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
-index ed8e9deae284a..b0e47fe1eb4bb 100644
--- a/io_uring/io_uring.c
-+++ b/io_uring/io_uring.c
-@@ -72,6 +72,7 @@
- #include <linux/io_uring.h>
- #include <linux/audit.h>
- #include <linux/security.h>
-+#include <asm/shmparam.h>
- 
- #define CREATE_TRACE_POINTS
- #include <trace/events/io_uring.h>
-@@ -3110,6 +3111,49 @@ static __cold int io_uring_mmap(struct file *file, struct vm_area_struct *vma)
- 	return remap_pfn_range(vma, vma->vm_start, pfn, sz, vma->vm_page_prot);
- }
- 
-+static unsigned long io_uring_mmu_get_unmapped_area(struct file *filp,
-+			unsigned long addr, unsigned long len,
-+			unsigned long pgoff, unsigned long flags)
-+{
-+	void *ptr;
-+
-+	/*
-+	 * Do not allow to map to user-provided address to avoid breaking the
-+	 * aliasing rules. Userspace is not able to guess the offset address of
-+	 * kernel kmalloc()ed memory area.
-+	 */
-+	if (addr)
-+		return -EINVAL;
-+
-+	ptr = io_uring_validate_mmap_request(filp, pgoff, len);
-+	if (IS_ERR(ptr))
-+		return -ENOMEM;
-+
-+	/*
-+	 * Some architectures have strong cache aliasing requirements.
-+	 * For such architectures we need a coherent mapping which aliases
-+	 * kernel memory *and* userspace memory. To achieve that:
-+	 * - use a NULL file pointer to reference physical memory, and
-+	 * - use the kernel virtual address of the shared io_uring context
-+	 *   (instead of the userspace-provided address, which has to be 0UL
-+	 *   anyway).
-+	 * - use the same pgoff which the get_unmapped_area() uses to
-+	 *   calculate the page colouring.
-+	 * For architectures without such aliasing requirements, the
-+	 * architecture will return any suitable mapping because addr is 0.
-+	 */
-+	filp = NULL;
-+	flags |= MAP_SHARED;
-+	pgoff = 0;	/* has been translated to ptr above */
-+#ifdef SHM_COLOUR
-+	addr = (uintptr_t) ptr;
-+	pgoff = addr >> PAGE_SHIFT;
-+#else
-+	addr = 0UL;
-+#endif
-+	return current->mm->get_unmapped_area(filp, addr, len, pgoff, flags);
-+}
-+
- #else /* !CONFIG_MMU */
- 
- static int io_uring_mmap(struct file *file, struct vm_area_struct *vma)
-@@ -3324,6 +3368,8 @@ static const struct file_operations io_uring_fops = {
- #ifndef CONFIG_MMU
- 	.get_unmapped_area = io_uring_nommu_get_unmapped_area,
- 	.mmap_capabilities = io_uring_nommu_mmap_capabilities,
-+#else
-+	.get_unmapped_area = io_uring_mmu_get_unmapped_area,
- #endif
- 	.poll		= io_uring_poll,
- #ifdef CONFIG_PROC_FS
-diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
-index 676328a7c8c75..ad3cccb0970f8 100644
--- a/kernel/kallsyms.c
-+++ b/kernel/kallsyms.c
-@@ -188,16 +188,13 @@ static bool cleanup_symbol_name(char *s)
- 
- static int compare_symbol_name(const char *name, char *namebuf)
- {
-	int ret;
-
-	ret = strcmp(name, namebuf);
-	if (!ret)
-		return ret;
-
-	if (cleanup_symbol_name(namebuf) && !strcmp(name, namebuf))
-		return 0;
-
-	return ret;
-+	/* The kallsyms_seqs_of_names is sorted based on names after
-+	 * cleanup_symbol_name() (see scripts/kallsyms.c) if clang lto is enabled.
-+	 * To ensure correct bisection in kallsyms_lookup_names(), do
-+	 * cleanup_symbol_name(namebuf) before comparing name and namebuf.
-+	 */
-+	cleanup_symbol_name(namebuf);
-+	return strcmp(name, namebuf);
- }
- 
- static int kallsyms_lookup_names(const char *name,
-diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 50d4863974e7a..0224b0329d011 100644
--- a/kernel/locking/lockdep.c
-+++ b/kernel/locking/lockdep.c
-@@ -817,34 +817,26 @@ static int very_verbose(struct lock_class *class)
-  * Is this the address of a static object:
-  */
- #ifdef __KERNEL__
-/*
- * Check if an address is part of freed initmem. After initmem is freed,
- * memory can be allocated from it, and such allocations would then have
- * addresses within the range [_stext, _end].
- */
-#ifndef arch_is_kernel_initmem_freed
-static int arch_is_kernel_initmem_freed(unsigned long addr)
-{
-	if (system_state < SYSTEM_FREEING_INITMEM)
-		return 0;
-
-	return init_section_contains((void *)addr, 1);
-}
-#endif
-
- static int static_obj(const void *obj)
- {
-	unsigned long start = (unsigned long) &_stext,
-		      end   = (unsigned long) &_end,
-		      addr  = (unsigned long) obj;
-+	unsigned long addr = (unsigned long) obj;
- 
-	if (arch_is_kernel_initmem_freed(addr))
-		return 0;
-+	if (is_kernel_core_data(addr))
-+		return 1;
-+
-+	/*
-+	 * keys are allowed in the __ro_after_init section.
-+	 */
-+	if (is_kernel_rodata(addr))
-+		return 1;
- 
- 	/*
-	 * static variable?
-+	 * in initdata section and used during bootup only?
-+	 * NOTE: On some platforms the initdata section is
-+	 * outside of the _stext ... _end range.
- 	 */
-	if ((addr >= start) && (addr < end))
-+	if (system_state < SYSTEM_FREEING_INITMEM &&
-+		init_section_contains((void *)addr, 1))
- 		return 1;
- 
- 	/*
-diff --git a/kernel/module/main.c b/kernel/module/main.c
-index 7a627345d4fd9..7a6f43d2b7757 100644
--- a/kernel/module/main.c
-+++ b/kernel/module/main.c
-@@ -1401,7 +1401,7 @@ long module_get_offset(struct module *mod, unsigned int *size,
- 	return ret;
- }
- 
-static bool module_init_layout_section(const char *sname)
-+bool module_init_layout_section(const char *sname)
- {
- #ifndef CONFIG_MODULE_UNLOAD
- 	if (module_exit_section(sname))
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.51-52.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.51-52.patch
@ -1,957 +0,0 @@
-diff --git a/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt b/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt
-index 0fa8e3e43bf80..1a7e4bff0456f 100644
--- a/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt
-+++ b/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt
-@@ -23,6 +23,9 @@ Optional properties:
-     1 = active low.
- - irda-mode-ports: An array that lists the indices of the port that
- 		   should operate in IrDA mode.
-+- nxp,modem-control-line-ports: An array that lists the indices of the port that
-+				should have shared GPIO lines configured as
-+				modem control lines.
- 
- Example:
-         sc16is750: sc16is750@51 {
-@@ -35,6 +38,26 @@ Example:
-                 #gpio-cells = <2>;
-         };
- 
-+	sc16is752: sc16is752@53 {
-+		compatible = "nxp,sc16is752";
-+		reg = <0x53>;
-+		clocks = <&clk20m>;
-+		interrupt-parent = <&gpio3>;
-+		interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
-+		nxp,modem-control-line-ports = <1>; /* Port 1 as modem control lines */
-+		gpio-controller; /* Port 0 as GPIOs */
-+		#gpio-cells = <2>;
-+	};
-+
-+	sc16is752: sc16is752@54 {
-+		compatible = "nxp,sc16is752";
-+		reg = <0x54>;
-+		clocks = <&clk20m>;
-+		interrupt-parent = <&gpio3>;
-+		interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
-+		nxp,modem-control-line-ports = <0 1>; /* Ports 0 and 1 as modem control lines */
-+	};
-+
- * spi as bus
- 
- Required properties:
-@@ -59,6 +82,9 @@ Optional properties:
-     1 = active low.
- - irda-mode-ports: An array that lists the indices of the port that
- 		   should operate in IrDA mode.
-+- nxp,modem-control-line-ports: An array that lists the indices of the port that
-+				should have shared GPIO lines configured as
-+				modem control lines.
- 
- Example:
- 	sc16is750: sc16is750@0 {
-@@ -70,3 +96,23 @@ Example:
- 		gpio-controller;
- 		#gpio-cells = <2>;
- 	};
-+
-+	sc16is752: sc16is752@1 {
-+		compatible = "nxp,sc16is752";
-+		reg = <1>;
-+		clocks = <&clk20m>;
-+		interrupt-parent = <&gpio3>;
-+		interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
-+		nxp,modem-control-line-ports = <1>; /* Port 1 as modem control lines */
-+		gpio-controller; /* Port 0 as GPIOs */
-+		#gpio-cells = <2>;
-+	};
-+
-+	sc16is752: sc16is752@2 {
-+		compatible = "nxp,sc16is752";
-+		reg = <2>;
-+		clocks = <&clk20m>;
-+		interrupt-parent = <&gpio3>;
-+		interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
-+		nxp,modem-control-line-ports = <0 1>; /* Ports 0 and 1 as modem control lines */
-+	};
-diff --git a/Makefile b/Makefile
-index e7c344d5af156..82aaa3ae7395b 100644
--- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- VERSION = 6
- PATCHLEVEL = 1
-SUBLEVEL = 51
-+SUBLEVEL = 52
- EXTRAVERSION =
- NAME = Curry Ramen
- 
-diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
-index a829baf8d9226..05c0a0f6fe630 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
-+++ b/arch/arm/mach-pxa/sharpsl_pm.c
-@@ -220,8 +220,6 @@ void sharpsl_battery_kick(void)
- {
- 	schedule_delayed_work(&sharpsl_bat, msecs_to_jiffies(125));
- }
-EXPORT_SYMBOL(sharpsl_battery_kick);
-
- 
- static void sharpsl_battery_thread(struct work_struct *private_)
- {
-diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
-index 9964729cd428f..937f56bbaf6c6 100644
--- a/arch/arm/mach-pxa/spitz.c
-+++ b/arch/arm/mach-pxa/spitz.c
-@@ -9,7 +9,6 @@
-  */
- 
- #include <linux/kernel.h>
-#include <linux/module.h>	/* symbol_get ; symbol_put */
- #include <linux/platform_device.h>
- #include <linux/delay.h>
- #include <linux/gpio_keys.h>
-@@ -510,17 +509,6 @@ static struct ads7846_platform_data spitz_ads7846_info = {
- 	.wait_for_sync		= spitz_ads7846_wait_for_hsync,
- };
- 
-static void spitz_bl_kick_battery(void)
-{
-	void (*kick_batt)(void);
-
-	kick_batt = symbol_get(sharpsl_battery_kick);
-	if (kick_batt) {
-		kick_batt();
-		symbol_put(sharpsl_battery_kick);
-	}
-}
-
- static struct gpiod_lookup_table spitz_lcdcon_gpio_table = {
- 	.dev_id = "spi2.1",
- 	.table = {
-@@ -548,7 +536,7 @@ static struct corgi_lcd_platform_data spitz_lcdcon_info = {
- 	.max_intensity		= 0x2f,
- 	.default_intensity	= 0x1f,
- 	.limit_mask		= 0x0b,
-	.kick_battery		= spitz_bl_kick_battery,
-+	.kick_battery		= sharpsl_battery_kick,
- };
- 
- static struct spi_board_info spitz_spi_devices[] = {
-diff --git a/arch/mips/alchemy/devboards/db1000.c b/arch/mips/alchemy/devboards/db1000.c
-index 2c52ee27b4f25..50de86eb8784c 100644
--- a/arch/mips/alchemy/devboards/db1000.c
-+++ b/arch/mips/alchemy/devboards/db1000.c
-@@ -14,7 +14,6 @@
- #include <linux/interrupt.h>
- #include <linux/leds.h>
- #include <linux/mmc/host.h>
-#include <linux/module.h>
- #include <linux/platform_device.h>
- #include <linux/pm.h>
- #include <linux/spi/spi.h>
-@@ -167,12 +166,7 @@ static struct platform_device db1x00_audio_dev = {
- 
- static irqreturn_t db1100_mmc_cd(int irq, void *ptr)
- {
-	void (*mmc_cd)(struct mmc_host *, unsigned long);
-	/* link against CONFIG_MMC=m */
-	mmc_cd = symbol_get(mmc_detect_change);
-	mmc_cd(ptr, msecs_to_jiffies(500));
-	symbol_put(mmc_detect_change);
-
-+	mmc_detect_change(ptr, msecs_to_jiffies(500));
- 	return IRQ_HANDLED;
- }
- 
-diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c
-index 1864eb935ca57..76080c71a2a7b 100644
--- a/arch/mips/alchemy/devboards/db1200.c
-+++ b/arch/mips/alchemy/devboards/db1200.c
-@@ -10,7 +10,6 @@
- #include <linux/gpio.h>
- #include <linux/i2c.h>
- #include <linux/init.h>
-#include <linux/module.h>
- #include <linux/interrupt.h>
- #include <linux/io.h>
- #include <linux/leds.h>
-@@ -340,14 +339,7 @@ static irqreturn_t db1200_mmc_cd(int irq, void *ptr)
- 
- static irqreturn_t db1200_mmc_cdfn(int irq, void *ptr)
- {
-	void (*mmc_cd)(struct mmc_host *, unsigned long);
-
-	/* link against CONFIG_MMC=m */
-	mmc_cd = symbol_get(mmc_detect_change);
-	if (mmc_cd) {
-		mmc_cd(ptr, msecs_to_jiffies(200));
-		symbol_put(mmc_detect_change);
-	}
-+	mmc_detect_change(ptr, msecs_to_jiffies(200));
- 
- 	msleep(100);	/* debounce */
- 	if (irq == DB1200_SD0_INSERT_INT)
-@@ -431,14 +423,7 @@ static irqreturn_t pb1200_mmc1_cd(int irq, void *ptr)
- 
- static irqreturn_t pb1200_mmc1_cdfn(int irq, void *ptr)
- {
-	void (*mmc_cd)(struct mmc_host *, unsigned long);
-
-	/* link against CONFIG_MMC=m */
-	mmc_cd = symbol_get(mmc_detect_change);
-	if (mmc_cd) {
-		mmc_cd(ptr, msecs_to_jiffies(200));
-		symbol_put(mmc_detect_change);
-	}
-+	mmc_detect_change(ptr, msecs_to_jiffies(200));
- 
- 	msleep(100);	/* debounce */
- 	if (irq == PB1200_SD1_INSERT_INT)
-diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c
-index e70e529ddd914..ff61901329c62 100644
--- a/arch/mips/alchemy/devboards/db1300.c
-+++ b/arch/mips/alchemy/devboards/db1300.c
-@@ -17,7 +17,6 @@
- #include <linux/interrupt.h>
- #include <linux/ata_platform.h>
- #include <linux/mmc/host.h>
-#include <linux/module.h>
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/platnand.h>
- #include <linux/platform_device.h>
-@@ -459,14 +458,7 @@ static irqreturn_t db1300_mmc_cd(int irq, void *ptr)
- 
- static irqreturn_t db1300_mmc_cdfn(int irq, void *ptr)
- {
-	void (*mmc_cd)(struct mmc_host *, unsigned long);
-
-	/* link against CONFIG_MMC=m.  We can only be called once MMC core has
-	 * initialized the controller, so symbol_get() should always succeed.
-	 */
-	mmc_cd = symbol_get(mmc_detect_change);
-	mmc_cd(ptr, msecs_to_jiffies(200));
-	symbol_put(mmc_detect_change);
-+	mmc_detect_change(ptr, msecs_to_jiffies(200));
- 
- 	msleep(100);	/* debounce */
- 	if (irq == DB1300_SD1_INSERT_INT)
-diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
-index 795be33f2892d..f19d31ee37ea8 100644
--- a/drivers/bluetooth/btsdio.c
-+++ b/drivers/bluetooth/btsdio.c
-@@ -357,6 +357,7 @@ static void btsdio_remove(struct sdio_func *func)
- 	if (!data)
- 		return;
- 
-+	cancel_work_sync(&data->work);
- 	hdev = data->hdev;
- 
- 	sdio_set_drvdata(func, NULL);
-diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
-index 2d674126160fe..cab11af28c231 100644
--- a/drivers/firmware/stratix10-svc.c
-+++ b/drivers/firmware/stratix10-svc.c
-@@ -756,7 +756,7 @@ svc_create_memory_pool(struct platform_device *pdev,
- 	paddr = begin;
- 	size = end - begin;
- 	va = devm_memremap(dev, paddr, size, MEMREMAP_WC);
-	if (!va) {
-+	if (IS_ERR(va)) {
- 		dev_err(dev, "fail to remap shared memory\n");
- 		return ERR_PTR(-EINVAL);
- 	}
-diff --git a/drivers/fsi/fsi-master-ast-cf.c b/drivers/fsi/fsi-master-ast-cf.c
-index 5f608ef8b53ca..cde281ec89d7b 100644
--- a/drivers/fsi/fsi-master-ast-cf.c
-+++ b/drivers/fsi/fsi-master-ast-cf.c
-@@ -1441,3 +1441,4 @@ static struct platform_driver fsi_master_acf = {
- 
- module_platform_driver(fsi_master_acf);
- MODULE_LICENSE("GPL");
-+MODULE_FIRMWARE(FW_FILE_NAME);
-diff --git a/drivers/hid/wacom.h b/drivers/hid/wacom.h
-index 4da50e19808ef..166a76c9bcad3 100644
--- a/drivers/hid/wacom.h
-+++ b/drivers/hid/wacom.h
-@@ -150,6 +150,7 @@ struct wacom_remote {
- 		struct input_dev *input;
- 		bool registered;
- 		struct wacom_battery battery;
-+		ktime_t active_time;
- 	} remotes[WACOM_MAX_REMOTES];
- };
- 
-diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
-index aff4a21a46b6a..af163e8dfec07 100644
--- a/drivers/hid/wacom_sys.c
-+++ b/drivers/hid/wacom_sys.c
-@@ -2527,6 +2527,18 @@ fail:
- 	return;
- }
- 
-+static void wacom_remote_destroy_battery(struct wacom *wacom, int index)
-+{
-+	struct wacom_remote *remote = wacom->remote;
-+
-+	if (remote->remotes[index].battery.battery) {
-+		devres_release_group(&wacom->hdev->dev,
-+				     &remote->remotes[index].battery.bat_desc);
-+		remote->remotes[index].battery.battery = NULL;
-+		remote->remotes[index].active_time = 0;
-+	}
-+}
-+
- static void wacom_remote_destroy_one(struct wacom *wacom, unsigned int index)
- {
- 	struct wacom_remote *remote = wacom->remote;
-@@ -2541,9 +2553,7 @@ static void wacom_remote_destroy_one(struct wacom *wacom, unsigned int index)
- 			remote->remotes[i].registered = false;
- 			spin_unlock_irqrestore(&remote->remote_lock, flags);
- 
-			if (remote->remotes[i].battery.battery)
-				devres_release_group(&wacom->hdev->dev,
-						     &remote->remotes[i].battery.bat_desc);
-+			wacom_remote_destroy_battery(wacom, i);
- 
- 			if (remote->remotes[i].group.name)
- 				devres_release_group(&wacom->hdev->dev,
-@@ -2551,7 +2561,6 @@ static void wacom_remote_destroy_one(struct wacom *wacom, unsigned int index)
- 
- 			remote->remotes[i].serial = 0;
- 			remote->remotes[i].group.name = NULL;
-			remote->remotes[i].battery.battery = NULL;
- 			wacom->led.groups[i].select = WACOM_STATUS_UNKNOWN;
- 		}
- 	}
-@@ -2636,6 +2645,9 @@ static int wacom_remote_attach_battery(struct wacom *wacom, int index)
- 	if (remote->remotes[index].battery.battery)
- 		return 0;
- 
-+	if (!remote->remotes[index].active_time)
-+		return 0;
-+
- 	if (wacom->led.groups[index].select == WACOM_STATUS_UNKNOWN)
- 		return 0;
- 
-@@ -2651,6 +2663,7 @@ static void wacom_remote_work(struct work_struct *work)
- {
- 	struct wacom *wacom = container_of(work, struct wacom, remote_work);
- 	struct wacom_remote *remote = wacom->remote;
-+	ktime_t kt = ktime_get();
- 	struct wacom_remote_data data;
- 	unsigned long flags;
- 	unsigned int count;
-@@ -2677,6 +2690,10 @@ static void wacom_remote_work(struct work_struct *work)
- 		serial = data.remote[i].serial;
- 		if (data.remote[i].connected) {
- 
-+			if (kt - remote->remotes[i].active_time > WACOM_REMOTE_BATTERY_TIMEOUT
-+			    && remote->remotes[i].active_time != 0)
-+				wacom_remote_destroy_battery(wacom, i);
-+
- 			if (remote->remotes[i].serial == serial) {
- 				wacom_remote_attach_battery(wacom, i);
- 				continue;
-diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
-index 15cd0cabee2a9..c1270db121784 100644
--- a/drivers/hid/wacom_wac.c
-+++ b/drivers/hid/wacom_wac.c
-@@ -1129,6 +1129,7 @@ static int wacom_remote_irq(struct wacom_wac *wacom_wac, size_t len)
- 	if (index < 0 || !remote->remotes[index].registered)
- 		goto out;
- 
-+	remote->remotes[i].active_time = ktime_get();
- 	input = remote->remotes[index].input;
- 
- 	input_report_key(input, BTN_0, (data[9] & 0x01));
-diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
-index ee21bb260f22f..2e7cc5e7a0cb7 100644
--- a/drivers/hid/wacom_wac.h
-+++ b/drivers/hid/wacom_wac.h
-@@ -13,6 +13,7 @@
- #define WACOM_NAME_MAX		64
- #define WACOM_MAX_REMOTES	5
- #define WACOM_STATUS_UNKNOWN	255
-+#define WACOM_REMOTE_BATTERY_TIMEOUT	21000000000ll
- 
- /* packet length for individual models */
- #define WACOM_PKGLEN_BBFUN	 9
-diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
-index fb1062a6394c1..9b5a2cb110b3e 100644
--- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -528,11 +528,12 @@ config MMC_ALCOR
- 	  of Alcor Micro PCI-E card reader
- 
- config MMC_AU1X
-	tristate "Alchemy AU1XX0 MMC Card Interface support"
-+	bool "Alchemy AU1XX0 MMC Card Interface support"
- 	depends on MIPS_ALCHEMY
-+	depends on MMC=y
- 	help
- 	  This selects the AMD Alchemy(R) Multimedia card interface.
-	  If you have a Alchemy platform with a MMC slot, say Y or M here.
-+	  If you have a Alchemy platform with a MMC slot, say Y here.
- 
- 	  If unsure, say N.
- 
-diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ptp.c b/drivers/net/ethernet/freescale/enetc/enetc_ptp.c
-index 17c097cef7d45..5243fc0310589 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_ptp.c
-+++ b/drivers/net/ethernet/freescale/enetc/enetc_ptp.c
-@@ -8,7 +8,7 @@
- #include "enetc.h"
- 
- int enetc_phc_index = -1;
-EXPORT_SYMBOL(enetc_phc_index);
-+EXPORT_SYMBOL_GPL(enetc_phc_index);
- 
- static struct ptp_clock_info enetc_ptp_caps = {
- 	.owner		= THIS_MODULE,
-diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
-index 68511597599e3..f7d392fce8c28 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
-+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
-@@ -465,6 +465,7 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,
- 				    BSS_CHANGED_BEACON_ENABLED));
- 	bool inband_disc = !!(changed & (BSS_CHANGED_UNSOL_BCAST_PROBE_RESP |
- 					 BSS_CHANGED_FILS_DISCOVERY));
-+	bool amsdu_en = wcid->amsdu;
- 
- 	if (vif) {
- 		struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
-@@ -524,12 +525,14 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,
- 	txwi[4] = 0;
- 
- 	val = FIELD_PREP(MT_TXD5_PID, pid);
-	if (pid >= MT_PACKET_ID_FIRST)
-+	if (pid >= MT_PACKET_ID_FIRST) {
- 		val |= MT_TXD5_TX_STATUS_HOST;
-+		amsdu_en = amsdu_en && !is_mt7921(dev);
-+	}
- 
- 	txwi[5] = cpu_to_le32(val);
- 	txwi[6] = 0;
-	txwi[7] = wcid->amsdu ? cpu_to_le32(MT_TXD7_HW_AMSDU) : 0;
-+	txwi[7] = amsdu_en ? cpu_to_le32(MT_TXD7_HW_AMSDU) : 0;
- 
- 	if (is_8023)
- 		mt76_connac2_mac_write_txwi_8023(txwi, skb, wcid);
-diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
-index 60fbbd1ac2f78..172ba7199485d 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
-+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
-@@ -1280,7 +1280,7 @@ mt7921_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)
- 		return -EINVAL;
- 
- 	if ((BIT(hweight8(tx_ant)) - 1) != tx_ant)
-		tx_ant = BIT(ffs(tx_ant) - 1) - 1;
-+		return -EINVAL;
- 
- 	mt7921_mutex_acquire(dev);
- 
-diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
-index be6838c252f09..2b6d996e393e0 100644
--- a/drivers/pinctrl/pinctrl-amd.c
-+++ b/drivers/pinctrl/pinctrl-amd.c
-@@ -748,7 +748,7 @@ static int amd_pinconf_get(struct pinctrl_dev *pctldev,
- 		break;
- 
- 	default:
-		dev_err(&gpio_dev->pdev->dev, "Invalid config param %04x\n",
-+		dev_dbg(&gpio_dev->pdev->dev, "Invalid config param %04x\n",
- 			param);
- 		return -ENOTSUPP;
- 	}
-@@ -798,7 +798,7 @@ static int amd_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
- 			break;
- 
- 		default:
-			dev_err(&gpio_dev->pdev->dev,
-+			dev_dbg(&gpio_dev->pdev->dev,
- 				"Invalid config param %04x\n", param);
- 			ret = -ENOTSUPP;
- 		}
-diff --git a/drivers/rtc/rtc-ds1685.c b/drivers/rtc/rtc-ds1685.c
-index 5db9c737c022f..db7216f14164e 100644
--- a/drivers/rtc/rtc-ds1685.c
-+++ b/drivers/rtc/rtc-ds1685.c
-@@ -1434,7 +1434,7 @@ ds1685_rtc_poweroff(struct platform_device *pdev)
- 		unreachable();
- 	}
- }
-EXPORT_SYMBOL(ds1685_rtc_poweroff);
-+EXPORT_SYMBOL_GPL(ds1685_rtc_poweroff);
- /* ----------------------------------------------------------------------- */
- 
- 
-diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c
-index 003e972051240..3ea70d042f9a0 100644
--- a/drivers/staging/rtl8712/os_intfs.c
-+++ b/drivers/staging/rtl8712/os_intfs.c
-@@ -323,6 +323,7 @@ int r8712_init_drv_sw(struct _adapter *padapter)
- 	mp871xinit(padapter);
- 	init_default_value(padapter);
- 	r8712_InitSwLeds(padapter);
-+	mutex_init(&padapter->mutex_start);
- 	return ret;
- }
- 
-diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
-index 37364d3101e21..df05213f922f4 100644
--- a/drivers/staging/rtl8712/usb_intf.c
-+++ b/drivers/staging/rtl8712/usb_intf.c
-@@ -567,7 +567,6 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
- 	if (rtl871x_load_fw(padapter))
- 		goto deinit_drv_sw;
- 	init_completion(&padapter->rx_filter_ready);
-	mutex_init(&padapter->mutex_start);
- 	return 0;
- 
- deinit_drv_sw:
-diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
-index 6f6c4e9b77435..d6f682ed15811 100644
--- a/drivers/tty/serial/qcom_geni_serial.c
-+++ b/drivers/tty/serial/qcom_geni_serial.c
-@@ -129,6 +129,7 @@ struct qcom_geni_serial_port {
- 	u32 tx_fifo_width;
- 	u32 rx_fifo_depth;
- 	bool setup;
-+	unsigned long clk_rate;
- 	int (*handle_rx)(struct uart_port *uport, u32 bytes, bool drop);
- 	unsigned int baud;
- 	void *rx_fifo;
-@@ -1061,6 +1062,7 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport,
- 			baud * sampling_rate, clk_rate, clk_div);
- 
- 	uport->uartclk = clk_rate;
-+	port->clk_rate = clk_rate;
- 	dev_pm_opp_set_rate(uport->dev, clk_rate);
- 	ser_clk_cfg = SER_CLK_EN;
- 	ser_clk_cfg |= clk_div << CLK_DIV_SHFT;
-@@ -1330,10 +1332,13 @@ static void qcom_geni_serial_pm(struct uart_port *uport,
- 
- 	if (new_state == UART_PM_STATE_ON && old_state == UART_PM_STATE_OFF) {
- 		geni_icc_enable(&port->se);
-+		if (port->clk_rate)
-+			dev_pm_opp_set_rate(uport->dev, port->clk_rate);
- 		geni_se_resources_on(&port->se);
- 	} else if (new_state == UART_PM_STATE_OFF &&
- 			old_state == UART_PM_STATE_ON) {
- 		geni_se_resources_off(&port->se);
-+		dev_pm_opp_set_rate(uport->dev, 0);
- 		geni_icc_disable(&port->se);
- 	}
- }
-diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
-index 93cf5f7888172..8411a0f312db0 100644
--- a/drivers/tty/serial/sc16is7xx.c
-+++ b/drivers/tty/serial/sc16is7xx.c
-@@ -1345,9 +1345,18 @@ static int sc16is7xx_gpio_direction_output(struct gpio_chip *chip,
- 		state |= BIT(offset);
- 	else
- 		state &= ~BIT(offset);
-	sc16is7xx_port_write(port, SC16IS7XX_IOSTATE_REG, state);
-+
-+	/*
-+	 * If we write IOSTATE first, and then IODIR, the output value is not
-+	 * transferred to the corresponding I/O pin.
-+	 * The datasheet states that each register bit will be transferred to
-+	 * the corresponding I/O pin programmed as output when writing to
-+	 * IOSTATE. Therefore, configure direction first with IODIR, and then
-+	 * set value after with IOSTATE.
-+	 */
- 	sc16is7xx_port_update(port, SC16IS7XX_IODIR_REG, BIT(offset),
- 			      BIT(offset));
-+	sc16is7xx_port_write(port, SC16IS7XX_IOSTATE_REG, state);
- 
- 	return 0;
- }
-@@ -1439,6 +1448,12 @@ static int sc16is7xx_probe(struct device *dev,
- 		s->p[i].port.fifosize	= SC16IS7XX_FIFO_SIZE;
- 		s->p[i].port.flags	= UPF_FIXED_TYPE | UPF_LOW_LATENCY;
- 		s->p[i].port.iobase	= i;
-+		/*
-+		 * Use all ones as membase to make sure uart_configure_port() in
-+		 * serial_core.c does not abort for SPI/I2C devices where the
-+		 * membase address is not applicable.
-+		 */
-+		s->p[i].port.membase	= (void __iomem *)~0;
- 		s->p[i].port.iotype	= UPIO_PORT;
- 		s->p[i].port.uartclk	= freq;
- 		s->p[i].port.rs485_config = sc16is7xx_config_rs485;
-diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
-index 60b4de0a4f76d..caa91117ba429 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
-+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
-@@ -175,10 +175,12 @@ static struct imx_usbmisc_data *usbmisc_get_init_data(struct device *dev)
- 	if (of_usb_get_phy_mode(np) == USBPHY_INTERFACE_MODE_ULPI)
- 		data->ulpi = 1;
- 
-	of_property_read_u32(np, "samsung,picophy-pre-emp-curr-control",
-			&data->emp_curr_control);
-	of_property_read_u32(np, "samsung,picophy-dc-vol-level-adjust",
-			&data->dc_vol_level_adjust);
-+	if (of_property_read_u32(np, "samsung,picophy-pre-emp-curr-control",
-+			&data->emp_curr_control))
-+		data->emp_curr_control = -1;
-+	if (of_property_read_u32(np, "samsung,picophy-dc-vol-level-adjust",
-+			&data->dc_vol_level_adjust))
-+		data->dc_vol_level_adjust = -1;
- 
- 	return data;
- }
-diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
-index 2318c7906acdb..a2cb4f48c84c6 100644
--- a/drivers/usb/chipidea/usbmisc_imx.c
-+++ b/drivers/usb/chipidea/usbmisc_imx.c
-@@ -657,13 +657,15 @@ static int usbmisc_imx7d_init(struct imx_usbmisc_data *data)
- 			usbmisc->base + MX7D_USBNC_USB_CTRL2);
- 		/* PHY tuning for signal quality */
- 		reg = readl(usbmisc->base + MX7D_USB_OTG_PHY_CFG1);
-		if (data->emp_curr_control && data->emp_curr_control <=
-+		if (data->emp_curr_control >= 0 &&
-+			data->emp_curr_control <=
- 			(TXPREEMPAMPTUNE0_MASK >> TXPREEMPAMPTUNE0_BIT)) {
- 			reg &= ~TXPREEMPAMPTUNE0_MASK;
- 			reg |= (data->emp_curr_control << TXPREEMPAMPTUNE0_BIT);
- 		}
- 
-		if (data->dc_vol_level_adjust && data->dc_vol_level_adjust <=
-+		if (data->dc_vol_level_adjust >= 0 &&
-+			data->dc_vol_level_adjust <=
- 			(TXVREFTUNE0_MASK >> TXVREFTUNE0_BIT)) {
- 			reg &= ~TXVREFTUNE0_MASK;
- 			reg |= (data->dc_vol_level_adjust << TXVREFTUNE0_BIT);
-diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c
-index eaea944ebd2ce..10298b91731eb 100644
--- a/drivers/usb/dwc3/dwc3-meson-g12a.c
-+++ b/drivers/usb/dwc3/dwc3-meson-g12a.c
-@@ -938,6 +938,12 @@ static int __maybe_unused dwc3_meson_g12a_resume(struct device *dev)
- 			return ret;
- 	}
- 
-+	if (priv->drvdata->usb_post_init) {
-+		ret = priv->drvdata->usb_post_init(priv);
-+		if (ret)
-+			return ret;
-+	}
-+
- 	return 0;
- }
- 
-diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
-index 119641761c3b4..f13930b4534c1 100644
--- a/drivers/usb/serial/option.c
-+++ b/drivers/usb/serial/option.c
-@@ -259,6 +259,7 @@ static void option_instat_callback(struct urb *urb);
- #define QUECTEL_PRODUCT_EM05G			0x030a
- #define QUECTEL_PRODUCT_EM060K			0x030b
- #define QUECTEL_PRODUCT_EM05G_CS		0x030c
-+#define QUECTEL_PRODUCT_EM05GV2			0x030e
- #define QUECTEL_PRODUCT_EM05CN_SG		0x0310
- #define QUECTEL_PRODUCT_EM05G_SG		0x0311
- #define QUECTEL_PRODUCT_EM05CN			0x0312
-@@ -1190,6 +1191,8 @@ static const struct usb_device_id option_ids[] = {
- 	  .driver_info = RSVD(6) | ZLP },
- 	{ USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM05G_GR, 0xff),
- 	  .driver_info = RSVD(6) | ZLP },
-+	{ USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM05GV2, 0xff),
-+	  .driver_info = RSVD(4) | ZLP },
- 	{ USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM05G_CS, 0xff),
- 	  .driver_info = RSVD(6) | ZLP },
- 	{ USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM05G_RS, 0xff),
-@@ -2232,6 +2235,10 @@ static const struct usb_device_id option_ids[] = {
- 	  .driver_info = RSVD(0) | RSVD(1) | RSVD(6) },
- 	{ USB_DEVICE_INTERFACE_CLASS(0x0489, 0xe0db, 0xff),			/* Foxconn T99W265 MBIM */
- 	  .driver_info = RSVD(3) },
-+	{ USB_DEVICE_INTERFACE_CLASS(0x0489, 0xe0ee, 0xff),			/* Foxconn T99W368 MBIM */
-+	  .driver_info = RSVD(3) },
-+	{ USB_DEVICE_INTERFACE_CLASS(0x0489, 0xe0f0, 0xff),			/* Foxconn T99W373 MBIM */
-+	  .driver_info = RSVD(3) },
- 	{ USB_DEVICE(0x1508, 0x1001),						/* Fibocom NL668 (IOT version) */
- 	  .driver_info = RSVD(4) | RSVD(5) | RSVD(6) },
- 	{ USB_DEVICE(0x1782, 0x4d10) },						/* Fibocom L610 (AT mode) */
-diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c
-index 72f8d1e876004..816945913ed0d 100644
--- a/drivers/usb/typec/tcpm/tcpci.c
-+++ b/drivers/usb/typec/tcpm/tcpci.c
-@@ -593,6 +593,10 @@ static int tcpci_init(struct tcpc_dev *tcpc)
- 	if (time_after(jiffies, timeout))
- 		return -ETIMEDOUT;
- 
-+	ret = tcpci_write16(tcpci, TCPC_FAULT_STATUS, TCPC_FAULT_STATUS_ALL_REG_RST_TO_DEFAULT);
-+	if (ret < 0)
-+		return ret;
-+
- 	/* Handle vendor init */
- 	if (tcpci->data->init) {
- 		ret = tcpci->data->init(tcpci, tcpci->data);
-diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
-index d5950ef9d1f35..5f45b82dd1914 100644
--- a/drivers/usb/typec/tcpm/tcpm.c
-+++ b/drivers/usb/typec/tcpm/tcpm.c
-@@ -2747,6 +2747,13 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port,
- 			port->sink_cap_done = true;
- 			tcpm_set_state(port, ready_state(port), 0);
- 			break;
-+		/*
-+		 * Some port partners do not support GET_STATUS, avoid soft reset the link to
-+		 * prevent redundant power re-negotiation
-+		 */
-+		case GET_STATUS_SEND:
-+			tcpm_set_state(port, ready_state(port), 0);
-+			break;
- 		case SRC_READY:
- 		case SNK_READY:
- 			if (port->vdm_state > VDM_STATE_READY) {
-diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
-index 361f3c29897e8..1b91ac5be9610 100644
--- a/fs/erofs/zdata.c
-+++ b/fs/erofs/zdata.c
-@@ -869,6 +869,8 @@ hitted:
- 	cur = end - min_t(erofs_off_t, offset + end - map->m_la, end);
- 	if (!(map->m_flags & EROFS_MAP_MAPPED)) {
- 		zero_user_segment(page, cur, end);
-+		++spiltted;
-+		tight = false;
- 		goto next_part;
- 	}
- 	if (map->m_flags & EROFS_MAP_FRAGMENT) {
-diff --git a/fs/nilfs2/alloc.c b/fs/nilfs2/alloc.c
-index 6ce8617b562d5..7342de296ec3c 100644
--- a/fs/nilfs2/alloc.c
-+++ b/fs/nilfs2/alloc.c
-@@ -205,7 +205,8 @@ static int nilfs_palloc_get_block(struct inode *inode, unsigned long blkoff,
- 	int ret;
- 
- 	spin_lock(lock);
-	if (prev->bh && blkoff == prev->blkoff) {
-+	if (prev->bh && blkoff == prev->blkoff &&
-+	    likely(buffer_uptodate(prev->bh))) {
- 		get_bh(prev->bh);
- 		*bhp = prev->bh;
- 		spin_unlock(lock);
-diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
-index d4c0895a88116..f625872321cca 100644
--- a/fs/nilfs2/inode.c
-+++ b/fs/nilfs2/inode.c
-@@ -1025,7 +1025,7 @@ int nilfs_load_inode_block(struct inode *inode, struct buffer_head **pbh)
- 	int err;
- 
- 	spin_lock(&nilfs->ns_inode_lock);
-	if (ii->i_bh == NULL) {
-+	if (ii->i_bh == NULL || unlikely(!buffer_uptodate(ii->i_bh))) {
- 		spin_unlock(&nilfs->ns_inode_lock);
- 		err = nilfs_ifile_get_inode_block(ii->i_root->ifile,
- 						  inode->i_ino, pbh);
-@@ -1034,7 +1034,10 @@ int nilfs_load_inode_block(struct inode *inode, struct buffer_head **pbh)
- 		spin_lock(&nilfs->ns_inode_lock);
- 		if (ii->i_bh == NULL)
- 			ii->i_bh = *pbh;
-		else {
-+		else if (unlikely(!buffer_uptodate(ii->i_bh))) {
-+			__brelse(ii->i_bh);
-+			ii->i_bh = *pbh;
-+		} else {
- 			brelse(*pbh);
- 			*pbh = ii->i_bh;
- 		}
-diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
-index 21e8260112c8f..a4a147a983e0a 100644
--- a/fs/nilfs2/segment.c
-+++ b/fs/nilfs2/segment.c
-@@ -725,6 +725,11 @@ static size_t nilfs_lookup_dirty_data_buffers(struct inode *inode,
- 		struct page *page = pvec.pages[i];
- 
- 		lock_page(page);
-+		if (unlikely(page->mapping != mapping)) {
-+			/* Exclude pages removed from the address space */
-+			unlock_page(page);
-+			continue;
-+		}
- 		if (!page_has_buffers(page))
- 			create_empty_buffers(page, i_blocksize(inode), 0);
- 		unlock_page(page);
-diff --git a/fs/smb/server/auth.c b/fs/smb/server/auth.c
-index 5e5e120edcc22..15e5684e328c1 100644
--- a/fs/smb/server/auth.c
-+++ b/fs/smb/server/auth.c
-@@ -355,6 +355,9 @@ int ksmbd_decode_ntlmssp_auth_blob(struct authenticate_message *authblob,
- 		if (blob_len < (u64)sess_key_off + sess_key_len)
- 			return -EINVAL;
- 
-+		if (sess_key_len > CIFS_KEY_SIZE)
-+			return -EINVAL;
-+
- 		ctx_arc4 = kmalloc(sizeof(*ctx_arc4), GFP_KERNEL);
- 		if (!ctx_arc4)
- 			return -ENOMEM;
-diff --git a/fs/smb/server/oplock.c b/fs/smb/server/oplock.c
-index 4b210cdd75569..c81aee9ce7ec4 100644
--- a/fs/smb/server/oplock.c
-+++ b/fs/smb/server/oplock.c
-@@ -1492,7 +1492,7 @@ struct create_context *smb2_find_context_vals(void *open_req, const char *tag, i
- 		    name_len < 4 ||
- 		    name_off + name_len > cc_len ||
- 		    (value_off & 0x7) != 0 ||
-		    (value_off && (value_off < name_off + name_len)) ||
-+		    (value_len && value_off < name_off + (name_len < 8 ? 8 : name_len)) ||
- 		    ((u64)value_off + value_len > cc_len))
- 			return ERR_PTR(-EINVAL);
- 
-diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
-index f8ca44622d909..9b621fd993bb7 100644
--- a/fs/smb/server/smb2pdu.c
-+++ b/fs/smb/server/smb2pdu.c
-@@ -4322,7 +4322,7 @@ static int smb2_get_ea(struct ksmbd_work *work, struct ksmbd_file *fp,
- 		if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN))
- 			name_len -= XATTR_USER_PREFIX_LEN;
- 
-		ptr = (char *)(&eainfo->name + name_len + 1);
-+		ptr = eainfo->name + name_len + 1;
- 		buf_free_len -= (offsetof(struct smb2_ea_info, name) +
- 				name_len + 1);
- 		/* bailout if xattr can't fit in buf_free_len */
-diff --git a/fs/smb/server/smb2pdu.h b/fs/smb/server/smb2pdu.h
-index dd10f8031606b..665a837378540 100644
--- a/fs/smb/server/smb2pdu.h
-+++ b/fs/smb/server/smb2pdu.h
-@@ -410,7 +410,7 @@ struct smb2_ea_info {
- 	__u8   Flags;
- 	__u8   EaNameLength;
- 	__le16 EaValueLength;
-	char name[1];
-+	char name[];
- 	/* optionally followed by value */
- } __packed; /* level 15 Query */
- 
-diff --git a/fs/smb/server/transport_rdma.c b/fs/smb/server/transport_rdma.c
-index c06efc020bd95..7578200f63b1d 100644
--- a/fs/smb/server/transport_rdma.c
-+++ b/fs/smb/server/transport_rdma.c
-@@ -1366,24 +1366,35 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t,
- 	LIST_HEAD(msg_list);
- 	char *desc_buf;
- 	int credits_needed;
-	unsigned int desc_buf_len;
-	size_t total_length = 0;
-+	unsigned int desc_buf_len, desc_num = 0;
- 
- 	if (t->status != SMB_DIRECT_CS_CONNECTED)
- 		return -ENOTCONN;
- 
-+	if (buf_len > t->max_rdma_rw_size)
-+		return -EINVAL;
-+
- 	/* calculate needed credits */
- 	credits_needed = 0;
- 	desc_buf = buf;
- 	for (i = 0; i < desc_len / sizeof(*desc); i++) {
-+		if (!buf_len)
-+			break;
-+
- 		desc_buf_len = le32_to_cpu(desc[i].length);
-+		if (!desc_buf_len)
-+			return -EINVAL;
-+
-+		if (desc_buf_len > buf_len) {
-+			desc_buf_len = buf_len;
-+			desc[i].length = cpu_to_le32(desc_buf_len);
-+			buf_len = 0;
-+		}
- 
- 		credits_needed += calc_rw_credits(t, desc_buf, desc_buf_len);
- 		desc_buf += desc_buf_len;
-		total_length += desc_buf_len;
-		if (desc_buf_len == 0 || total_length > buf_len ||
-		    total_length > t->max_rdma_rw_size)
-			return -EINVAL;
-+		buf_len -= desc_buf_len;
-+		desc_num++;
- 	}
- 
- 	ksmbd_debug(RDMA, "RDMA %s, len %#x, needed credits %#x\n",
-@@ -1395,7 +1406,7 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t,
- 
- 	/* build rdma_rw_ctx for each descriptor */
- 	desc_buf = buf;
-	for (i = 0; i < desc_len / sizeof(*desc); i++) {
-+	for (i = 0; i < desc_num; i++) {
- 		msg = kzalloc(offsetof(struct smb_direct_rdma_rw_msg, sg_list) +
- 			      sizeof(struct scatterlist) * SG_CHUNK_SIZE, GFP_KERNEL);
- 		if (!msg) {
-diff --git a/include/linux/usb/tcpci.h b/include/linux/usb/tcpci.h
-index 17657451c762c..77eb40b918d7d 100644
--- a/include/linux/usb/tcpci.h
-+++ b/include/linux/usb/tcpci.h
-@@ -103,6 +103,7 @@
- #define TCPC_POWER_STATUS_SINKING_VBUS	BIT(0)
- 
- #define TCPC_FAULT_STATUS		0x1f
-+#define TCPC_FAULT_STATUS_ALL_REG_RST_TO_DEFAULT BIT(7)
- 
- #define TCPC_ALERT_EXTENDED		0x21
- 
-diff --git a/kernel/module/main.c b/kernel/module/main.c
-index 7a6f43d2b7757..7a376e26de85b 100644
--- a/kernel/module/main.c
-+++ b/kernel/module/main.c
-@@ -1214,12 +1214,20 @@ void *__symbol_get(const char *symbol)
- 	};
- 
- 	preempt_disable();
-	if (!find_symbol(&fsa) || strong_try_module_get(fsa.owner)) {
-		preempt_enable();
-		return NULL;
-+	if (!find_symbol(&fsa))
-+		goto fail;
-+	if (fsa.license != GPL_ONLY) {
-+		pr_warn("failing symbol_get of non-GPLONLY symbol %s.\n",
-+			symbol);
-+		goto fail;
- 	}
-+	if (strong_try_module_get(fsa.owner))
-+		goto fail;
- 	preempt_enable();
- 	return (void *)kernel_symbol_value(fsa.sym);
-+fail:
-+	preempt_enable();
-+	return NULL;
- }
- EXPORT_SYMBOL_GPL(__symbol_get);
- 
-diff --git a/sound/usb/stream.c b/sound/usb/stream.c
-index f10f4e6d3fb85..3d4add94e367d 100644
--- a/sound/usb/stream.c
-+++ b/sound/usb/stream.c
-@@ -1093,6 +1093,7 @@ static int __snd_usb_parse_audio_interface(struct snd_usb_audio *chip,
- 	int i, altno, err, stream;
- 	struct audioformat *fp = NULL;
- 	struct snd_usb_power_domain *pd = NULL;
-+	bool set_iface_first;
- 	int num, protocol;
- 
- 	dev = chip->dev;
-@@ -1223,11 +1224,19 @@ static int __snd_usb_parse_audio_interface(struct snd_usb_audio *chip,
- 				return err;
- 		}
- 
-+		set_iface_first = false;
-+		if (protocol == UAC_VERSION_1 ||
-+		    (chip->quirk_flags & QUIRK_FLAG_SET_IFACE_FIRST))
-+			set_iface_first = true;
-+
- 		/* try to set the interface... */
- 		usb_set_interface(chip->dev, iface_no, 0);
-+		if (set_iface_first)
-+			usb_set_interface(chip->dev, iface_no, altno);
- 		snd_usb_init_pitch(chip, fp);
- 		snd_usb_init_sample_rate(chip, fp, fp->rate_max);
-		usb_set_interface(chip->dev, iface_no, altno);
-+		if (!set_iface_first)
-+			usb_set_interface(chip->dev, iface_no, altno);
- 	}
- 	return 0;
- }
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.52-53.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.52-53.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.53-54.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.53-54.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.54-55.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.54-55.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.55-56.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.55-56.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.56-57.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.56-57.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.57-58.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.57-58.patch
@ -1,389 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b435b56594f0f..ce1eec0b5010d 100644
--- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- VERSION = 6
- PATCHLEVEL = 1
-SUBLEVEL = 57
-+SUBLEVEL = 58
- EXTRAVERSION =
- NAME = Curry Ramen
- 
-diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
-index 5a976fa343df1..3bb530d4bb5ce 100644
--- a/fs/nfs/direct.c
-+++ b/fs/nfs/direct.c
-@@ -93,10 +93,12 @@ nfs_direct_handle_truncated(struct nfs_direct_req *dreq,
- 		dreq->max_count = dreq_len;
- 		if (dreq->count > dreq_len)
- 			dreq->count = dreq_len;
-	}
- 
-	if (test_bit(NFS_IOHDR_ERROR, &hdr->flags) && !dreq->error)
-		dreq->error = hdr->error;
-+		if (test_bit(NFS_IOHDR_ERROR, &hdr->flags))
-+			dreq->error = hdr->error;
-+		else /* Clear outstanding error if this is EOF */
-+			dreq->error = 0;
-+	}
- }
- 
- static void
-@@ -118,18 +120,6 @@ nfs_direct_count_bytes(struct nfs_direct_req *dreq,
- 		dreq->count = dreq_len;
- }
- 
-static void nfs_direct_truncate_request(struct nfs_direct_req *dreq,
-					struct nfs_page *req)
-{
-	loff_t offs = req_offset(req);
-	size_t req_start = (size_t)(offs - dreq->io_start);
-
-	if (req_start < dreq->max_count)
-		dreq->max_count = req_start;
-	if (req_start < dreq->count)
-		dreq->count = req_start;
-}
-
- /**
-  * nfs_swap_rw - NFS address space operation for swap I/O
-  * @iocb: target I/O control block
-@@ -500,9 +490,7 @@ static void nfs_direct_add_page_head(struct list_head *list,
- 	kref_get(&head->wb_kref);
- }
- 
-static void nfs_direct_join_group(struct list_head *list,
-				  struct nfs_commit_info *cinfo,
-				  struct inode *inode)
-+static void nfs_direct_join_group(struct list_head *list, struct inode *inode)
- {
- 	struct nfs_page *req, *subreq;
- 
-@@ -524,7 +512,7 @@ static void nfs_direct_join_group(struct list_head *list,
- 				nfs_release_request(subreq);
- 			}
- 		} while ((subreq = subreq->wb_this_page) != req);
-		nfs_join_page_group(req, cinfo, inode);
-+		nfs_join_page_group(req, inode);
- 	}
- }
- 
-@@ -542,15 +530,20 @@ nfs_direct_write_scan_commit_list(struct inode *inode,
- static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq)
- {
- 	struct nfs_pageio_descriptor desc;
-	struct nfs_page *req;
-+	struct nfs_page *req, *tmp;
- 	LIST_HEAD(reqs);
- 	struct nfs_commit_info cinfo;
-+	LIST_HEAD(failed);
- 
- 	nfs_init_cinfo_from_dreq(&cinfo, dreq);
- 	nfs_direct_write_scan_commit_list(dreq->inode, &reqs, &cinfo);
- 
-	nfs_direct_join_group(&reqs, &cinfo, dreq->inode);
-+	nfs_direct_join_group(&reqs, dreq->inode);
- 
-+	dreq->count = 0;
-+	dreq->max_count = 0;
-+	list_for_each_entry(req, &reqs, wb_list)
-+		dreq->max_count += req->wb_bytes;
- 	nfs_clear_pnfs_ds_commit_verifiers(&dreq->ds_cinfo);
- 	get_dreq(dreq);
- 
-@@ -558,40 +551,27 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq)
- 			      &nfs_direct_write_completion_ops);
- 	desc.pg_dreq = dreq;
- 
-	while (!list_empty(&reqs)) {
-		req = nfs_list_entry(reqs.next);
-+	list_for_each_entry_safe(req, tmp, &reqs, wb_list) {
- 		/* Bump the transmission count */
- 		req->wb_nio++;
- 		if (!nfs_pageio_add_request(&desc, req)) {
-			spin_lock(&dreq->lock);
-			if (dreq->error < 0) {
-				desc.pg_error = dreq->error;
-			} else if (desc.pg_error != -EAGAIN) {
-				dreq->flags = 0;
-				if (!desc.pg_error)
-					desc.pg_error = -EIO;
-+			nfs_list_move_request(req, &failed);
-+			spin_lock(&cinfo.inode->i_lock);
-+			dreq->flags = 0;
-+			if (desc.pg_error < 0)
- 				dreq->error = desc.pg_error;
-			} else
-				dreq->flags = NFS_ODIRECT_RESCHED_WRITES;
-			spin_unlock(&dreq->lock);
-			break;
-+			else
-+				dreq->error = -EIO;
-+			spin_unlock(&cinfo.inode->i_lock);
- 		}
- 		nfs_release_request(req);
- 	}
- 	nfs_pageio_complete(&desc);
- 
-	while (!list_empty(&reqs)) {
-		req = nfs_list_entry(reqs.next);
-+	while (!list_empty(&failed)) {
-+		req = nfs_list_entry(failed.next);
- 		nfs_list_remove_request(req);
- 		nfs_unlock_and_release_request(req);
-		if (desc.pg_error == -EAGAIN) {
-			nfs_mark_request_commit(req, NULL, &cinfo, 0);
-		} else {
-			spin_lock(&dreq->lock);
-			nfs_direct_truncate_request(dreq, req);
-			spin_unlock(&dreq->lock);
-			nfs_release_request(req);
-		}
- 	}
- 
- 	if (put_dreq(dreq))
-@@ -611,6 +591,8 @@ static void nfs_direct_commit_complete(struct nfs_commit_data *data)
- 	if (status < 0) {
- 		/* Errors in commit are fatal */
- 		dreq->error = status;
-+		dreq->max_count = 0;
-+		dreq->count = 0;
- 		dreq->flags = NFS_ODIRECT_DONE;
- 	} else {
- 		status = dreq->error;
-@@ -621,12 +603,7 @@ static void nfs_direct_commit_complete(struct nfs_commit_data *data)
- 	while (!list_empty(&data->pages)) {
- 		req = nfs_list_entry(data->pages.next);
- 		nfs_list_remove_request(req);
-		if (status < 0) {
-			spin_lock(&dreq->lock);
-			nfs_direct_truncate_request(dreq, req);
-			spin_unlock(&dreq->lock);
-			nfs_release_request(req);
-		} else if (!nfs_write_match_verf(verf, req)) {
-+		if (status >= 0 && !nfs_write_match_verf(verf, req)) {
- 			dreq->flags = NFS_ODIRECT_RESCHED_WRITES;
- 			/*
- 			 * Despite the reboot, the write was successful,
-@@ -634,7 +611,7 @@ static void nfs_direct_commit_complete(struct nfs_commit_data *data)
- 			 */
- 			req->wb_nio = 0;
- 			nfs_mark_request_commit(req, NULL, &cinfo, 0);
-		} else
-+		} else /* Error or match */
- 			nfs_release_request(req);
- 		nfs_unlock_and_release_request(req);
- 	}
-@@ -687,7 +664,6 @@ static void nfs_direct_write_clear_reqs(struct nfs_direct_req *dreq)
- 	while (!list_empty(&reqs)) {
- 		req = nfs_list_entry(reqs.next);
- 		nfs_list_remove_request(req);
-		nfs_direct_truncate_request(dreq, req);
- 		nfs_release_request(req);
- 		nfs_unlock_and_release_request(req);
- 	}
-@@ -737,8 +713,7 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr)
- 	}
- 
- 	nfs_direct_count_bytes(dreq, hdr);
-	if (test_bit(NFS_IOHDR_UNSTABLE_WRITES, &hdr->flags) &&
-	    !test_bit(NFS_IOHDR_ERROR, &hdr->flags)) {
-+	if (test_bit(NFS_IOHDR_UNSTABLE_WRITES, &hdr->flags)) {
- 		if (!dreq->flags)
- 			dreq->flags = NFS_ODIRECT_DO_COMMIT;
- 		flags = dreq->flags;
-@@ -782,23 +757,18 @@ static void nfs_write_sync_pgio_error(struct list_head *head, int error)
- static void nfs_direct_write_reschedule_io(struct nfs_pgio_header *hdr)
- {
- 	struct nfs_direct_req *dreq = hdr->dreq;
-	struct nfs_page *req;
-	struct nfs_commit_info cinfo;
- 
- 	trace_nfs_direct_write_reschedule_io(dreq);
- 
-	nfs_init_cinfo_from_dreq(&cinfo, dreq);
- 	spin_lock(&dreq->lock);
-	if (dreq->error == 0)
-+	if (dreq->error == 0) {
- 		dreq->flags = NFS_ODIRECT_RESCHED_WRITES;
-	set_bit(NFS_IOHDR_REDO, &hdr->flags);
-	spin_unlock(&dreq->lock);
-	while (!list_empty(&hdr->pages)) {
-		req = nfs_list_entry(hdr->pages.next);
-		nfs_list_remove_request(req);
-		nfs_unlock_request(req);
-		nfs_mark_request_commit(req, NULL, &cinfo, 0);
-+		/* fake unstable write to let common nfs resend pages */
-+		hdr->verf.committed = NFS_UNSTABLE;
-+		hdr->good_bytes = hdr->args.offset + hdr->args.count -
-+			hdr->io_start;
- 	}
-+	spin_unlock(&dreq->lock);
- }
- 
- static const struct nfs_pgio_completion_ops nfs_direct_write_completion_ops = {
-@@ -826,11 +796,9 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq,
- {
- 	struct nfs_pageio_descriptor desc;
- 	struct inode *inode = dreq->inode;
-	struct nfs_commit_info cinfo;
- 	ssize_t result = 0;
- 	size_t requested_bytes = 0;
- 	size_t wsize = max_t(size_t, NFS_SERVER(inode)->wsize, PAGE_SIZE);
-	bool defer = false;
- 
- 	trace_nfs_direct_write_schedule_iovec(dreq);
- 
-@@ -871,39 +839,19 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq,
- 				break;
- 			}
- 
-			pgbase = 0;
-			bytes -= req_len;
-			requested_bytes += req_len;
-			pos += req_len;
-			dreq->bytes_left -= req_len;
-
-			if (defer) {
-				nfs_mark_request_commit(req, NULL, &cinfo, 0);
-				continue;
-			}
-
- 			nfs_lock_request(req);
- 			req->wb_index = pos >> PAGE_SHIFT;
- 			req->wb_offset = pos & ~PAGE_MASK;
-			if (nfs_pageio_add_request(&desc, req))
-				continue;
-
-			/* Exit on hard errors */
-			if (desc.pg_error < 0 && desc.pg_error != -EAGAIN) {
-+			if (!nfs_pageio_add_request(&desc, req)) {
- 				result = desc.pg_error;
- 				nfs_unlock_and_release_request(req);
- 				break;
- 			}
-
-			/* If the error is soft, defer remaining requests */
-			nfs_init_cinfo_from_dreq(&cinfo, dreq);
-			spin_lock(&dreq->lock);
-			dreq->flags = NFS_ODIRECT_RESCHED_WRITES;
-			spin_unlock(&dreq->lock);
-			nfs_unlock_request(req);
-			nfs_mark_request_commit(req, NULL, &cinfo, 0);
-			desc.pg_error = 0;
-			defer = true;
-+			pgbase = 0;
-+			bytes -= req_len;
-+			requested_bytes += req_len;
-+			pos += req_len;
-+			dreq->bytes_left -= req_len;
- 		}
- 		nfs_direct_release_pages(pagevec, npages);
- 		kvfree(pagevec);
-diff --git a/fs/nfs/write.c b/fs/nfs/write.c
-index 0a8aed0ac9945..f41d24b54fd1f 100644
--- a/fs/nfs/write.c
-+++ b/fs/nfs/write.c
-@@ -58,8 +58,7 @@ static const struct nfs_pgio_completion_ops nfs_async_write_completion_ops;
- static const struct nfs_commit_completion_ops nfs_commit_completion_ops;
- static const struct nfs_rw_ops nfs_rw_write_ops;
- static void nfs_inode_remove_request(struct nfs_page *req);
-static void nfs_clear_request_commit(struct nfs_commit_info *cinfo,
-				     struct nfs_page *req);
-+static void nfs_clear_request_commit(struct nfs_page *req);
- static void nfs_init_cinfo_from_inode(struct nfs_commit_info *cinfo,
- 				      struct inode *inode);
- static struct nfs_page *
-@@ -503,8 +502,8 @@ nfs_destroy_unlinked_subrequests(struct nfs_page *destroy_list,
-  * the (former) group.  All subrequests are removed from any write or commit
-  * lists, unlinked from the group and destroyed.
-  */
-void nfs_join_page_group(struct nfs_page *head, struct nfs_commit_info *cinfo,
-			 struct inode *inode)
-+void
-+nfs_join_page_group(struct nfs_page *head, struct inode *inode)
- {
- 	struct nfs_page *subreq;
- 	struct nfs_page *destroy_list = NULL;
-@@ -534,7 +533,7 @@ void nfs_join_page_group(struct nfs_page *head, struct nfs_commit_info *cinfo,
- 	 * Commit list removal accounting is done after locks are dropped */
- 	subreq = head;
- 	do {
-		nfs_clear_request_commit(cinfo, subreq);
-+		nfs_clear_request_commit(subreq);
- 		subreq = subreq->wb_this_page;
- 	} while (subreq != head);
- 
-@@ -568,10 +567,8 @@ nfs_lock_and_join_requests(struct page *page)
- {
- 	struct inode *inode = page_file_mapping(page)->host;
- 	struct nfs_page *head;
-	struct nfs_commit_info cinfo;
- 	int ret;
- 
-	nfs_init_cinfo_from_inode(&cinfo, inode);
- 	/*
- 	 * A reference is taken only on the head request which acts as a
- 	 * reference to the whole page group - the group will not be destroyed
-@@ -588,7 +585,7 @@ nfs_lock_and_join_requests(struct page *page)
- 		return ERR_PTR(ret);
- 	}
- 
-	nfs_join_page_group(head, &cinfo, inode);
-+	nfs_join_page_group(head, inode);
- 
- 	return head;
- }
-@@ -959,16 +956,18 @@ nfs_clear_page_commit(struct page *page)
- }
- 
- /* Called holding the request lock on @req */
-static void nfs_clear_request_commit(struct nfs_commit_info *cinfo,
-				     struct nfs_page *req)
-+static void
-+nfs_clear_request_commit(struct nfs_page *req)
- {
- 	if (test_bit(PG_CLEAN, &req->wb_flags)) {
- 		struct nfs_open_context *ctx = nfs_req_openctx(req);
- 		struct inode *inode = d_inode(ctx->dentry);
-+		struct nfs_commit_info cinfo;
- 
-+		nfs_init_cinfo_from_inode(&cinfo, inode);
- 		mutex_lock(&NFS_I(inode)->commit_mutex);
-		if (!pnfs_clear_request_commit(req, cinfo)) {
-			nfs_request_remove_commit_list(req, cinfo);
-+		if (!pnfs_clear_request_commit(req, &cinfo)) {
-+			nfs_request_remove_commit_list(req, &cinfo);
- 		}
- 		mutex_unlock(&NFS_I(inode)->commit_mutex);
- 		nfs_clear_page_commit(req->wb_page);
-diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
-index e39a8cf8b1797..ba7e2e4b09264 100644
--- a/include/linux/nfs_page.h
-+++ b/include/linux/nfs_page.h
-@@ -145,9 +145,7 @@ extern	void nfs_unlock_request(struct nfs_page *req);
- extern	void nfs_unlock_and_release_request(struct nfs_page *);
- extern	struct nfs_page *nfs_page_group_lock_head(struct nfs_page *req);
- extern	int nfs_page_group_lock_subrequests(struct nfs_page *head);
-extern void nfs_join_page_group(struct nfs_page *head,
-				struct nfs_commit_info *cinfo,
-				struct inode *inode);
-+extern	void nfs_join_page_group(struct nfs_page *head, struct inode *inode);
- extern int nfs_page_group_lock(struct nfs_page *);
- extern void nfs_page_group_unlock(struct nfs_page *);
- extern bool nfs_page_group_sync_on_bit(struct nfs_page *, unsigned int);
-diff --git a/lib/test_meminit.c b/lib/test_meminit.c
-index 0ae35223d7733..85d8dd8e01dc4 100644
--- a/lib/test_meminit.c
-+++ b/lib/test_meminit.c
-@@ -93,7 +93,7 @@ static int __init test_pages(int *total_failures)
- 	int failures = 0, num_tests = 0;
- 	int i;
- 
-	for (i = 0; i <= MAX_ORDER; i++)
-+	for (i = 0; i < MAX_ORDER; i++)
- 		num_tests += do_alloc_pages_order(i, &failures);
- 
- 	REPORT_FAILURES_IN_FN();
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.58-59.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.58-59.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.59-60.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.59-60.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.60-61.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.60-61.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.61-62.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.61-62.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.62-63.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.62-63.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.63-64.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.63-64.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.64-65.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.64-65.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.65-66.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.65-66.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.66-67.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.66-67.patch
@ -1,122 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 5d7e995d686c8..c27600b90cad2 100644
--- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- VERSION = 6
- PATCHLEVEL = 1
-SUBLEVEL = 66
-+SUBLEVEL = 67
- EXTRAVERSION =
- NAME = Curry Ramen
- 
-diff --git a/net/wireless/core.h b/net/wireless/core.h
-index ee980965a7cfb..e1accacc6f233 100644
--- a/net/wireless/core.h
-+++ b/net/wireless/core.h
-@@ -297,7 +297,6 @@ struct cfg80211_cqm_config {
- 	u32 rssi_hyst;
- 	s32 last_rssi_event_value;
- 	enum nl80211_cqm_rssi_threshold_event last_rssi_event_type;
-	bool use_range_api;
- 	int n_rssi_thresholds;
- 	s32 rssi_thresholds[];
- };
-diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
-index 42c858219b341..b19b5acfaf3a9 100644
--- a/net/wireless/nl80211.c
-+++ b/net/wireless/nl80211.c
-@@ -12574,6 +12574,10 @@ static int cfg80211_cqm_rssi_update(struct cfg80211_registered_device *rdev,
- 	int i, n, low_index;
- 	int err;
- 
-+	/* RSSI reporting disabled? */
-+	if (!cqm_config)
-+		return rdev_set_cqm_rssi_range_config(rdev, dev, 0, 0);
-+
- 	/*
- 	 * Obtain current RSSI value if possible, if not and no RSSI threshold
- 	 * event has been received yet, we should receive an event after a
-@@ -12648,6 +12652,18 @@ static int nl80211_set_cqm_rssi(struct genl_info *info,
- 	    wdev->iftype != NL80211_IFTYPE_P2P_CLIENT)
- 		return -EOPNOTSUPP;
- 
-+	if (n_thresholds <= 1 && rdev->ops->set_cqm_rssi_config) {
-+		if (n_thresholds == 0 || thresholds[0] == 0) /* Disabling */
-+			return rdev_set_cqm_rssi_config(rdev, dev, 0, 0);
-+
-+		return rdev_set_cqm_rssi_config(rdev, dev,
-+						thresholds[0], hysteresis);
-+	}
-+
-+	if (!wiphy_ext_feature_isset(&rdev->wiphy,
-+				     NL80211_EXT_FEATURE_CQM_RSSI_LIST))
-+		return -EOPNOTSUPP;
-+
- 	if (n_thresholds == 1 && thresholds[0] == 0) /* Disabling */
- 		n_thresholds = 0;
- 
-@@ -12655,20 +12671,6 @@ static int nl80211_set_cqm_rssi(struct genl_info *info,
- 	old = rcu_dereference_protected(wdev->cqm_config,
- 					lockdep_is_held(&wdev->mtx));
- 
-	/* if already disabled just succeed */
-	if (!n_thresholds && !old)
-		return 0;
-
-	if (n_thresholds > 1) {
-		if (!wiphy_ext_feature_isset(&rdev->wiphy,
-					     NL80211_EXT_FEATURE_CQM_RSSI_LIST) ||
-		    !rdev->ops->set_cqm_rssi_range_config)
-			return -EOPNOTSUPP;
-	} else {
-		if (!rdev->ops->set_cqm_rssi_config)
-			return -EOPNOTSUPP;
-	}
-
- 	if (n_thresholds) {
- 		cqm_config = kzalloc(struct_size(cqm_config, rssi_thresholds,
- 						 n_thresholds),
-@@ -12683,26 +12685,13 @@ static int nl80211_set_cqm_rssi(struct genl_info *info,
- 		memcpy(cqm_config->rssi_thresholds, thresholds,
- 		       flex_array_size(cqm_config, rssi_thresholds,
- 				       n_thresholds));
-		cqm_config->use_range_api = n_thresholds > 1 ||
-					    !rdev->ops->set_cqm_rssi_config;
- 
- 		rcu_assign_pointer(wdev->cqm_config, cqm_config);
-
-		if (cqm_config->use_range_api)
-			err = cfg80211_cqm_rssi_update(rdev, dev, cqm_config);
-		else
-			err = rdev_set_cqm_rssi_config(rdev, dev,
-						       thresholds[0],
-						       hysteresis);
- 	} else {
- 		RCU_INIT_POINTER(wdev->cqm_config, NULL);
-		/* if enabled as range also disable via range */
-		if (old->use_range_api)
-			err = rdev_set_cqm_rssi_range_config(rdev, dev, 0, 0);
-		else
-			err = rdev_set_cqm_rssi_config(rdev, dev, 0, 0);
- 	}
- 
-+	err = cfg80211_cqm_rssi_update(rdev, dev, cqm_config);
- 	if (err) {
- 		rcu_assign_pointer(wdev->cqm_config, old);
- 		kfree_rcu(cqm_config, rcu_head);
-@@ -18769,11 +18758,10 @@ void cfg80211_cqm_rssi_notify_work(struct wiphy *wiphy, struct wiphy_work *work)
- 	wdev_lock(wdev);
- 	cqm_config = rcu_dereference_protected(wdev->cqm_config,
- 					       lockdep_is_held(&wdev->mtx));
-	if (!cqm_config)
-+	if (!wdev->cqm_config)
- 		goto unlock;
- 
-	if (cqm_config->use_range_api)
-		cfg80211_cqm_rssi_update(rdev, wdev->netdev, cqm_config);
-+	cfg80211_cqm_rssi_update(rdev, wdev->netdev, cqm_config);
- 
- 	rssi_level = cqm_config->last_rssi_event_value;
- 	rssi_event = cqm_config->last_rssi_event_type;
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.67-68.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.67-68.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.68-69.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.68-69.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.69-70.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.69-70.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.70-71.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.70-71.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.71-72.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.71-72.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.72-73.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.72-73.patch
@ -1,294 +0,0 @@
-diff --git a/Makefile b/Makefile
-index bad3387b3251c..e4f2d019ca745 100644
--- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- VERSION = 6
- PATCHLEVEL = 1
-SUBLEVEL = 72
-+SUBLEVEL = 73
- EXTRAVERSION =
- NAME = Curry Ramen
- 
-diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
-index b3b4542e31ed5..573de0d49e172 100644
--- a/fs/nfsd/nfsctl.c
-+++ b/fs/nfsd/nfsctl.c
-@@ -716,10 +716,8 @@ static ssize_t __write_ports_addfd(char *buf, struct net *net, const struct cred
- 
- 	err = svc_addsock(nn->nfsd_serv, net, fd, buf, SIMPLE_TRANSACTION_LIMIT, cred);
- 
-	if (err < 0 && !nn->nfsd_serv->sv_nrthreads && !nn->keep_active)
-		nfsd_last_thread(net);
-	else if (err >= 0 &&
-		 !nn->nfsd_serv->sv_nrthreads && !xchg(&nn->keep_active, 1))
-+	if (err >= 0 &&
-+	    !nn->nfsd_serv->sv_nrthreads && !xchg(&nn->keep_active, 1))
- 		svc_get(nn->nfsd_serv);
- 
- 	nfsd_put(net);
-@@ -769,9 +767,6 @@ out_close:
- 		svc_xprt_put(xprt);
- 	}
- out_err:
-	if (!nn->nfsd_serv->sv_nrthreads && !nn->keep_active)
-		nfsd_last_thread(net);
-
- 	nfsd_put(net);
- 	return err;
- }
-diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
-index 53166cce7062c..09726c5b9a317 100644
--- a/fs/nfsd/nfsd.h
-+++ b/fs/nfsd/nfsd.h
-@@ -97,12 +97,7 @@ int		nfsd_pool_stats_open(struct inode *, struct file *);
- int		nfsd_pool_stats_release(struct inode *, struct file *);
- void		nfsd_shutdown_threads(struct net *net);
- 
-static inline void nfsd_put(struct net *net)
-{
-	struct nfsd_net *nn = net_generic(net, nfsd_net_id);
-
-	svc_put(nn->nfsd_serv);
-}
-+void		nfsd_put(struct net *net);
- 
- bool		i_am_nfsd(void);
- 
-@@ -139,7 +134,6 @@ int nfsd_vers(struct nfsd_net *nn, int vers, enum vers_op change);
- int nfsd_minorversion(struct nfsd_net *nn, u32 minorversion, enum vers_op change);
- void nfsd_reset_versions(struct nfsd_net *nn);
- int nfsd_create_serv(struct net *net);
-void nfsd_last_thread(struct net *net);
- 
- extern int nfsd_max_blksize;
- 
-diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
-index 350c6c72f793f..c7695ebd28dc3 100644
--- a/fs/nfsd/nfssvc.c
-+++ b/fs/nfsd/nfssvc.c
-@@ -523,14 +523,9 @@ static struct notifier_block nfsd_inet6addr_notifier = {
- /* Only used under nfsd_mutex, so this atomic may be overkill: */
- static atomic_t nfsd_notifier_refcount = ATOMIC_INIT(0);
- 
-void nfsd_last_thread(struct net *net)
-+static void nfsd_last_thread(struct svc_serv *serv, struct net *net)
- {
- 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);
-	struct svc_serv *serv = nn->nfsd_serv;
-
-	spin_lock(&nfsd_notifier_lock);
-	nn->nfsd_serv = NULL;
-	spin_unlock(&nfsd_notifier_lock);
- 
- 	/* check if the notifier still has clients */
- 	if (atomic_dec_return(&nfsd_notifier_refcount) == 0) {
-@@ -540,8 +535,6 @@ void nfsd_last_thread(struct net *net)
- #endif
- 	}
- 
-	svc_xprt_destroy_all(serv, net);
-
- 	/*
- 	 * write_ports can create the server without actually starting
- 	 * any threads--if we get shut down before any threads are
-@@ -632,8 +625,7 @@ void nfsd_shutdown_threads(struct net *net)
- 	svc_get(serv);
- 	/* Kill outstanding nfsd threads */
- 	svc_set_num_threads(serv, NULL, 0);
-	nfsd_last_thread(net);
-	svc_put(serv);
-+	nfsd_put(net);
- 	mutex_unlock(&nfsd_mutex);
- }
- 
-@@ -663,6 +655,9 @@ int nfsd_create_serv(struct net *net)
- 	serv->sv_maxconn = nn->max_connections;
- 	error = svc_bind(serv, net);
- 	if (error < 0) {
-+		/* NOT nfsd_put() as notifiers (see below) haven't
-+		 * been set up yet.
-+		 */
- 		svc_put(serv);
- 		return error;
- 	}
-@@ -705,6 +700,29 @@ int nfsd_get_nrthreads(int n, int *nthreads, struct net *net)
- 	return 0;
- }
- 
-+/* This is the callback for kref_put() below.
-+ * There is no code here as the first thing to be done is
-+ * call svc_shutdown_net(), but we cannot get the 'net' from
-+ * the kref.  So do all the work when kref_put returns true.
-+ */
-+static void nfsd_noop(struct kref *ref)
-+{
-+}
-+
-+void nfsd_put(struct net *net)
-+{
-+	struct nfsd_net *nn = net_generic(net, nfsd_net_id);
-+
-+	if (kref_put(&nn->nfsd_serv->sv_refcnt, nfsd_noop)) {
-+		svc_xprt_destroy_all(nn->nfsd_serv, net);
-+		nfsd_last_thread(nn->nfsd_serv, net);
-+		svc_destroy(&nn->nfsd_serv->sv_refcnt);
-+		spin_lock(&nfsd_notifier_lock);
-+		nn->nfsd_serv = NULL;
-+		spin_unlock(&nfsd_notifier_lock);
-+	}
-+}
-+
- int nfsd_set_nrthreads(int n, int *nthreads, struct net *net)
- {
- 	int i = 0;
-@@ -755,7 +773,7 @@ int nfsd_set_nrthreads(int n, int *nthreads, struct net *net)
- 		if (err)
- 			break;
- 	}
-	svc_put(nn->nfsd_serv);
-+	nfsd_put(net);
- 	return err;
- }
- 
-@@ -770,7 +788,6 @@ nfsd_svc(int nrservs, struct net *net, const struct cred *cred)
- 	int	error;
- 	bool	nfsd_up_before;
- 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);
-	struct svc_serv *serv;
- 
- 	mutex_lock(&nfsd_mutex);
- 	dprintk("nfsd: creating service\n");
-@@ -790,25 +807,22 @@ nfsd_svc(int nrservs, struct net *net, const struct cred *cred)
- 		goto out;
- 
- 	nfsd_up_before = nn->nfsd_net_up;
-	serv = nn->nfsd_serv;
- 
- 	error = nfsd_startup_net(net, cred);
- 	if (error)
- 		goto out_put;
-	error = svc_set_num_threads(serv, NULL, nrservs);
-+	error = svc_set_num_threads(nn->nfsd_serv, NULL, nrservs);
- 	if (error)
- 		goto out_shutdown;
-	error = serv->sv_nrthreads;
-	if (error == 0)
-		nfsd_last_thread(net);
-+	error = nn->nfsd_serv->sv_nrthreads;
- out_shutdown:
- 	if (error < 0 && !nfsd_up_before)
- 		nfsd_shutdown_net(net);
- out_put:
- 	/* Threads now hold service active */
- 	if (xchg(&nn->keep_active, 0))
-		svc_put(serv);
-	svc_put(serv);
-+		nfsd_put(net);
-+	nfsd_put(net);
- out:
- 	mutex_unlock(&nfsd_mutex);
- 	return error;
-diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c
-index 2e15b182e59fc..7286a56aebfa9 100644
--- a/fs/smb/client/cifsfs.c
-+++ b/fs/smb/client/cifsfs.c
-@@ -1240,7 +1240,7 @@ static int cifs_flush_folio(struct inode *inode, loff_t pos, loff_t *_fstart, lo
- 	int rc = 0;
- 
- 	folio = filemap_get_folio(inode->i_mapping, index);
-	if (IS_ERR(folio))
-+	if (!folio)
- 		return 0;
- 
- 	size = folio_size(folio);
-diff --git a/include/net/dst_ops.h b/include/net/dst_ops.h
-index 88ff7bb2bb9bd..632086b2f644a 100644
--- a/include/net/dst_ops.h
-+++ b/include/net/dst_ops.h
-@@ -16,7 +16,7 @@ struct dst_ops {
- 	unsigned short		family;
- 	unsigned int		gc_thresh;
- 
-	int			(*gc)(struct dst_ops *ops);
-+	void			(*gc)(struct dst_ops *ops);
- 	struct dst_entry *	(*check)(struct dst_entry *, __u32 cookie);
- 	unsigned int		(*default_advmss)(const struct dst_entry *);
- 	unsigned int		(*mtu)(const struct dst_entry *);
-diff --git a/net/core/dst.c b/net/core/dst.c
-index bc9c9be4e0801..d178c564138ee 100644
--- a/net/core/dst.c
-+++ b/net/core/dst.c
-@@ -82,12 +82,8 @@ void *dst_alloc(struct dst_ops *ops, struct net_device *dev,
- 
- 	if (ops->gc &&
- 	    !(flags & DST_NOCOUNT) &&
-	    dst_entries_get_fast(ops) > ops->gc_thresh) {
-		if (ops->gc(ops)) {
-			pr_notice_ratelimited("Route cache is full: consider increasing sysctl net.ipv6.route.max_size.\n");
-			return NULL;
-		}
-	}
-+	    dst_entries_get_fast(ops) > ops->gc_thresh)
-+		ops->gc(ops);
- 
- 	dst = kmem_cache_alloc(ops->kmem_cachep, GFP_ATOMIC);
- 	if (!dst)
-diff --git a/net/ipv6/route.c b/net/ipv6/route.c
-index 0bcdb675ba2c1..7f65dc750feb8 100644
--- a/net/ipv6/route.c
-+++ b/net/ipv6/route.c
-@@ -91,7 +91,7 @@ static struct dst_entry *ip6_negative_advice(struct dst_entry *);
- static void		ip6_dst_destroy(struct dst_entry *);
- static void		ip6_dst_ifdown(struct dst_entry *,
- 				       struct net_device *dev, int how);
-static int		 ip6_dst_gc(struct dst_ops *ops);
-+static void		 ip6_dst_gc(struct dst_ops *ops);
- 
- static int		ip6_pkt_discard(struct sk_buff *skb);
- static int		ip6_pkt_discard_out(struct net *net, struct sock *sk, struct sk_buff *skb);
-@@ -3288,11 +3288,10 @@ out:
- 	return dst;
- }
- 
-static int ip6_dst_gc(struct dst_ops *ops)
-+static void ip6_dst_gc(struct dst_ops *ops)
- {
- 	struct net *net = container_of(ops, struct net, ipv6.ip6_dst_ops);
- 	int rt_min_interval = net->ipv6.sysctl.ip6_rt_gc_min_interval;
-	int rt_max_size = net->ipv6.sysctl.ip6_rt_max_size;
- 	int rt_elasticity = net->ipv6.sysctl.ip6_rt_gc_elasticity;
- 	int rt_gc_timeout = net->ipv6.sysctl.ip6_rt_gc_timeout;
- 	unsigned long rt_last_gc = net->ipv6.ip6_rt_last_gc;
-@@ -3300,11 +3299,10 @@ static int ip6_dst_gc(struct dst_ops *ops)
- 	int entries;
- 
- 	entries = dst_entries_get_fast(ops);
-	if (entries > rt_max_size)
-+	if (entries > ops->gc_thresh)
- 		entries = dst_entries_get_slow(ops);
- 
-	if (time_after(rt_last_gc + rt_min_interval, jiffies) &&
-	    entries <= rt_max_size)
-+	if (time_after(rt_last_gc + rt_min_interval, jiffies))
- 		goto out;
- 
- 	fib6_run_gc(atomic_inc_return(&net->ipv6.ip6_rt_gc_expire), net, true);
-@@ -3314,7 +3312,6 @@ static int ip6_dst_gc(struct dst_ops *ops)
- out:
- 	val = atomic_read(&net->ipv6.ip6_rt_gc_expire);
- 	atomic_set(&net->ipv6.ip6_rt_gc_expire, val - (val >> rt_elasticity));
-	return entries > rt_max_size;
- }
- 
- static int ip6_nh_lookup_table(struct net *net, struct fib6_config *cfg,
-@@ -6517,7 +6514,7 @@ static int __net_init ip6_route_net_init(struct net *net)
- #endif
- 
- 	net->ipv6.sysctl.flush_delay = 0;
-	net->ipv6.sysctl.ip6_rt_max_size = 4096;
-+	net->ipv6.sysctl.ip6_rt_max_size = INT_MAX;
- 	net->ipv6.sysctl.ip6_rt_gc_min_interval = HZ / 2;
- 	net->ipv6.sysctl.ip6_rt_gc_timeout = 60*HZ;
- 	net->ipv6.sysctl.ip6_rt_gc_interval = 30*HZ;
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.73-74.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.73-74.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.74-75.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.74-75.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.75-76.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.75-76.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.76-77.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.76-77.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.77-78.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.77-78.patch
--- a/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.78-79.patch
+++ b/patch/kernel/archive/sun50iw9-btt-6.1/linux-6.1.78-79.patch