From bd4c1685e7e871405c3c94365dfc61786dd2001e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 20 Sep 2023 05:46:05 +0200
Subject: linux: update to 6.1.53, remove 6.4
---
target/linux/Config.in.kernelversion | 12 +--
.../armnommu-fix-elf-fdpic-personality.patch | 54 -----------
.../6.1.49/armnommu-fix-thread-registers.patch | 57 ------------
.../linux/patches/6.1.49/armnommu-versatile.patch | 101 ---------------------
.../6.1.49/board-rockpi4-0003-arm64-dts-pcie.patch | 35 -------
.../6.1.49/enable-ethernet-bpi-m2-plus.patch | 15 ---
.../linux/patches/6.1.49/hppa-cross-compile.patch | 12 ---
.../6.1.49/m68k-Fix-invalid-.section-syntax.patch | 57 ------------
target/linux/patches/6.1.49/macsonic.patch | 11 ---
target/linux/patches/6.1.49/nios2.patch | 12 ---
target/linux/patches/6.1.49/riscv32.patch | 49 ----------
target/linux/patches/6.1.49/rockchip-115200.patch | 12 ---
.../patches/6.1.49/rockchip-pcie-timeout.patch | 16 ----
.../armnommu-fix-elf-fdpic-personality.patch | 54 +++++++++++
.../6.1.53/armnommu-fix-thread-registers.patch | 57 ++++++++++++
.../linux/patches/6.1.53/armnommu-versatile.patch | 101 +++++++++++++++++++++
.../6.1.53/board-rockpi4-0003-arm64-dts-pcie.patch | 35 +++++++
.../6.1.53/enable-ethernet-bpi-m2-plus.patch | 15 +++
.../linux/patches/6.1.53/hppa-cross-compile.patch | 12 +++
.../6.1.53/m68k-Fix-invalid-.section-syntax.patch | 57 ++++++++++++
target/linux/patches/6.1.53/macsonic.patch | 11 +++
target/linux/patches/6.1.53/nios2.patch | 12 +++
target/linux/patches/6.1.53/riscv32.patch | 49 ++++++++++
target/linux/patches/6.1.53/rockchip-115200.patch | 12 +++
.../patches/6.1.53/rockchip-pcie-timeout.patch | 16 ++++
.../armnommu-fix-elf-fdpic-personality.patch | 54 -----------
.../6.4.12/armnommu-fix-thread-registers.patch | 57 ------------
.../linux/patches/6.4.12/armnommu-versatile.patch | 101 ---------------------
28 files changed, 432 insertions(+), 654 deletions(-)
delete mode 100644 target/linux/patches/6.1.49/armnommu-fix-elf-fdpic-personality.patch
delete mode 100644 target/linux/patches/6.1.49/armnommu-fix-thread-registers.patch
delete mode 100644 target/linux/patches/6.1.49/armnommu-versatile.patch
delete mode 100644 target/linux/patches/6.1.49/board-rockpi4-0003-arm64-dts-pcie.patch
delete mode 100644 target/linux/patches/6.1.49/enable-ethernet-bpi-m2-plus.patch
delete mode 100644 target/linux/patches/6.1.49/hppa-cross-compile.patch
delete mode 100644 target/linux/patches/6.1.49/m68k-Fix-invalid-.section-syntax.patch
delete mode 100644 target/linux/patches/6.1.49/macsonic.patch
delete mode 100644 target/linux/patches/6.1.49/nios2.patch
delete mode 100644 target/linux/patches/6.1.49/riscv32.patch
delete mode 100644 target/linux/patches/6.1.49/rockchip-115200.patch
delete mode 100644 target/linux/patches/6.1.49/rockchip-pcie-timeout.patch
create mode 100644 target/linux/patches/6.1.53/armnommu-fix-elf-fdpic-personality.patch
create mode 100644 target/linux/patches/6.1.53/armnommu-fix-thread-registers.patch
create mode 100644 target/linux/patches/6.1.53/armnommu-versatile.patch
create mode 100644 target/linux/patches/6.1.53/board-rockpi4-0003-arm64-dts-pcie.patch
create mode 100644 target/linux/patches/6.1.53/enable-ethernet-bpi-m2-plus.patch
create mode 100644 target/linux/patches/6.1.53/hppa-cross-compile.patch
create mode 100644 target/linux/patches/6.1.53/m68k-Fix-invalid-.section-syntax.patch
create mode 100644 target/linux/patches/6.1.53/macsonic.patch
create mode 100644 target/linux/patches/6.1.53/nios2.patch
create mode 100644 target/linux/patches/6.1.53/riscv32.patch
create mode 100644 target/linux/patches/6.1.53/rockchip-115200.patch
create mode 100644 target/linux/patches/6.1.53/rockchip-pcie-timeout.patch
delete mode 100644 target/linux/patches/6.4.12/armnommu-fix-elf-fdpic-personality.patch
delete mode 100644 target/linux/patches/6.4.12/armnommu-fix-thread-registers.patch
delete mode 100644 target/linux/patches/6.4.12/armnommu-versatile.patch
(limited to 'target/linux')
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index 7dd28bd5a..2fd58eeab 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -46,18 +46,8 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_6_5
depends on !ADK_TARGET_ARCH_METAG
depends on !ADK_TARGET_ARCH_NDS32
-config ADK_TARGET_LINUX_KERNEL_VERSION_6_4
- bool "6.4.12"
- depends on !ADK_TARGET_ARCH_AVR32
- depends on !ADK_TARGET_ARCH_BFIN
- depends on !ADK_TARGET_ARCH_C6X
- depends on !ADK_TARGET_ARCH_CRIS
- depends on !ADK_TARGET_ARCH_FRV
- depends on !ADK_TARGET_ARCH_METAG
- depends on !ADK_TARGET_ARCH_NDS32
-
config ADK_TARGET_LINUX_KERNEL_VERSION_6_1
- bool "6.1.49"
+ bool "6.1.53"
depends on !ADK_TARGET_ARCH_AVR32
depends on !ADK_TARGET_ARCH_BFIN
depends on !ADK_TARGET_ARCH_C6X
diff --git a/target/linux/patches/6.1.49/armnommu-fix-elf-fdpic-personality.patch b/target/linux/patches/6.1.49/armnommu-fix-elf-fdpic-personality.patch
deleted file mode 100644
index 78b1a10ff..000000000
--- a/target/linux/patches/6.1.49/armnommu-fix-elf-fdpic-personality.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From ab7647c2b04501297c50ce7cdb6f6895b9582d22 Mon Sep 17 00:00:00 2001
-From: Greg Ungerer <gerg@kernel.org>
-Date: Fri, 21 Apr 2023 00:21:38 +1000
-Subject: [PATCH] fs: binfmt_elf_efpic: fix personality for fdpic ELF
-
-The elf-fdpic loader hard sets the process personality to either
-PER_LINUX_FDPIC for true elf-fdpic binaries or to PER_LINUX for
-normal ELF binaries (in this case they would be constant displacement
-compiled with -pie for example). The problem with that is that it
-will lose any other bits that may be in the ELF header personality
-(such as the "bug emulation" bits).
-
-On the ARM architecture the ADDR_LIMIT_32BIT flag is used to signify
-a normal 32bit binary - as opposed to a legacy 26bit address binary.
-This matters since start_thread() will set the ARM CPSR register as
-required based on this flag. If the elf-fdpic loader loses this bit
-the process will be mis-configured and crash out pretty quickly.
-
-Modify elf-fdpic loaders personality setting binaries so that it
-preserves the upper three bytes by using the SET_PERSONALITY macro
-to set it. This macro in the generic case sets PER_LINUX and preserves
-the upper bytes. Architectures can override this for their specific
-use case, and ARM does exactly this.
-
-The problem shows up quite easily runing under qemu, but not necessarily
-on all types of real ARM hardware. If the underlying ARM processor does
-not support the legacy 26-bit addressing mode then everyting will work
-as expected.
-
-Signed-off-by: Greg Ungerer <gerg@kernel.org>
----
- fs/binfmt_elf_fdpic.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
-index a05eafcacfb2..f29ae1d96fd7 100644
---- a/fs/binfmt_elf_fdpic.c
-+++ b/fs/binfmt_elf_fdpic.c
-@@ -345,10 +345,9 @@
- /* there's now no turning back... the old userspace image is dead,
- * defunct, deceased, etc.
- */
-+ SET_PERSONALITY(exec_params.hdr);
- if (elf_check_fdpic(&exec_params.hdr))
-- set_personality(PER_LINUX_FDPIC);
-- else
-- set_personality(PER_LINUX);
-+ current->personality |= PER_LINUX_FDPIC;
- if (elf_read_implies_exec(&exec_params.hdr, executable_stack))
- current->personality |= READ_IMPLIES_EXEC;
-
---
-2.25.1
-
diff --git a/target/linux/patches/6.1.49/armnommu-fix-thread-registers.patch b/target/linux/patches/6.1.49/armnommu-fix-thread-registers.patch
deleted file mode 100644
index 8ab2196dc..000000000
--- a/target/linux/patches/6.1.49/armnommu-fix-thread-registers.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 1410ebe685f13c1699a16bf147ae1332e7fd1983 Mon Sep 17 00:00:00 2001
-From: Greg Ungerer <gerg@kernel.org>
-Date: Thu, 20 Apr 2023 09:52:08 +1000
-Subject: [PATCH] ARM: start_thread: restore registers on ELF load for noMMU
-
-The binfmt_elf-fdpic loader is capable of loading constant displacement
-ELF format binaries (like those compiled -pie) on noMMU systems as well
-as elf-fdpic format binaries. The traditional ELF loader cannot be
-enabled on noMMU systems.
-
-Commit 5e588114329c ("ARM: start_thread(): don't always clear all regs")
-fixed the start_thread() code so that it maintains the required
-elf-fdpic registers through to the new process, but it only does that if
-current has its personality FDPIC_FUNCPTRS bit set. That is true for
-elf-fdpic format binaries but will not be true for non-fdpic ELF
-binaries.
-
-Modify the test of the FDPIC_FUNCPTRS personality bit to also carry out
-the register restore if this is a noMMU system. This is not perfect,
-since it will also preserve these registers on noMMU systems for all
-binary format types (could be flat format for example). That won't break
-anything, but it is potentially leaking some information into the new
-process. But for the noMMU case we need those start time registers set to
-be able to finalize the runtime loading of the -pie style ELF binary
-(carry out its segment and dynamic relocation processing).
-
-Unfortunately the FDPIC_FUNCPTRS flag cannot just be enabled for all
-elf-fdpic loaded binaries. That personality bit is used for other things
-like the controlling the changed behavior for signal handling.
-
-There is no change in behavior for normal ELF loading on MMU systems.
-A -pie style ELF binary built for noMMU systems can be load and run using
-the usual ELF loader on an MMU system (elf-fdpic loader not required in
-this case).
-
-Signed-off-by: Greg Ungerer <gerg@kernel.org>
----
- arch/arm/include/asm/processor.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h
-index 326864f79d18..5074cc3ae4e1 100644
---- a/arch/arm/include/asm/processor.h
-+++ b/arch/arm/include/asm/processor.h
-@@ -60,7 +60,8 @@ static inline void arch_thread_struct_whitelist(unsigned long *offset,
- } \
- memset(regs->uregs, 0, sizeof(regs->uregs)); \
- if (IS_ENABLED(CONFIG_BINFMT_ELF_FDPIC) && \
-- current->personality & FDPIC_FUNCPTRS) { \
-+ ((! IS_ENABLED(CONFIG_MMU)) || \
-+ current->personality & FDPIC_FUNCPTRS)) { \
- regs->ARM_r7 = r7; \
- regs->ARM_r8 = r8; \
- regs->ARM_r9 = r9; \
---
-2.25.1
-
diff --git a/target/linux/patches/6.1.49/armnommu-versatile.patch b/target/linux/patches/6.1.49/armnommu-versatile.patch
deleted file mode 100644
index f8f10f50b..000000000
--- a/target/linux/patches/6.1.49/armnommu-versatile.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 77c038d93769c92ef54cdbb50388564d1b37987b Mon Sep 17 00:00:00 2001
-From: Greg Ungerer <gerg@kernel.org>
-Date: Fri, 23 Sep 2016 13:37:34 +1000
-Subject: [PATCH] ARM: versatile: support configuring versatile machine for no-MMU
-
-Allow the arm versatile machine to be configured for no-MMU operation.
-
-Older kernels had the ability to build the versatile machine with the MMU
-disabled (!CONFIG_MMU). Recent changes to convert the versatile machine
-to device tree lost this ability. (Although older kernels could be built
-they did not run due to a bug in the IO_ADDRESS() mapping on this machine).
-
-The motivation for this is that the versatile machine is well supported
-in qemu. And this provides an excellent platform for development and
-testing no-MMU support on ARM in general.
-
-This patch adds a versatile platform selection in the upper level arm
-system type menu - where it appeared in older kernel versions - when
-configuring for the no-MMU case. There is no visible change to the way
-versatile is selected for the MMU enabled case.
-
-Signed-off-by: Greg Ungerer <gerg@kernel.org>
----
- arch/arm/Kconfig | 13 ++++++++++++-
- arch/arm/include/asm/mach/map.h | 1 +
- arch/arm/mach-versatile/Kconfig | 2 +-
- arch/arm/mach-versatile/versatile.c | 4 ++++
- 4 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-versatile/versatile.c b/arch/arm/mach-versatile/versatile.c
-index 02ba68abe533..835b51bc597b 100644
---- a/arch/arm/mach-versatile/versatile.c
-+++ b/arch/arm/mach-versatile/versatile.c
-@@ -22,7 +22,11 @@
- #include <asm/mach/map.h>
-
- /* macro to get at MMIO space when running virtually */
-+#ifdef CONFIG_MMU
- #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000)
-+#else
-+#define IO_ADDRESS(x) (x)
-+#endif
- #define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n))
-
- /*
-diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
-index 2b8970d8e5a2..41844ab6aec5 100644
---- a/arch/arm/include/asm/mach/map.h
-+++ b/arch/arm/include/asm/mach/map.h
-@@ -60,6 +60,7 @@ extern int ioremap_page(unsigned long virt, unsigned long phys,
- #else
- #define iotable_init(map,num) do { } while (0)
- #define vm_reserve_area_early(a,s,c) do { } while (0)
-+#define debug_ll_io_init() do { } while (0)
- #endif
-
- #endif
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index e24a9820e12f..342e1efa583a 100644
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -307,12 +307,23 @@ config MMU
- Select if you want MMU-based virtualised addressing space
- support by paged memory management. If unsure, say 'Y'.
-
-+choice
-+ prompt "ARM system type"
-+ depends on !MMU
-+ default ARM_SINGLE_ARMV7M
-+
- config ARM_SINGLE_ARMV7M
-- def_bool !MMU
-+ bool "ARMv7-M based platforms (Cortex-M0/M3/M4)"
- select ARM_NVIC
- select CPU_V7M
- select NO_IOPORT_MAP
-
-+config ARM_SINGLE_ARM926
-+ bool "ARM926 based platforms"
-+ select CPU_ARM926T
-+
-+endchoice
-+
- config ARCH_MMAP_RND_BITS_MIN
- default 8
-
-diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
-index b1519b4dc03a..2f1bf95daeb0 100644
---- a/arch/arm/mach-versatile/Kconfig
-+++ b/arch/arm/mach-versatile/Kconfig
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- config ARCH_VERSATILE
- bool "ARM Ltd. Versatile family"
-- depends on ARCH_MULTI_V5
-+ depends on ARCH_MULTI_V5 || ARM_SINGLE_ARM926
- depends on CPU_LITTLE_ENDIAN
- select ARM_AMBA
- select ARM_TIMER_SP804
---
-2.25.1
diff --git a/target/linux/patches/6.1.49/board-rockpi4-0003-arm64-dts-pcie.patch b/target/linux/patches/6.1.49/board-rockpi4-0003-arm64-dts-pcie.patch
deleted file mode 100644
index 1777e7a86..000000000
--- a/target/linux/patches/6.1.49/board-rockpi4-0003-arm64-dts-pcie.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
-index 1ae1ebd4e..2f84397d5 100644
---- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
-@@ -62,6 +62,8 @@
- regulator-name = "vcc3v3_pcie";
- regulator-always-on;
- regulator-boot-on;
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
- vin-supply = <&vcc5v0_sys>;
- };
-
-@@ -434,6 +459,21 @@
- gpio1830-supply = <&vcc_3v0>;
- };
-
-+&pcie0 {
-+ ep-gpios = <&gpio4 RK_PD3 GPIO_ACTIVE_HIGH>;
-+ num-lanes = <4>;
-+ max-link-speed = <1>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pcie_clkreqnb_cpm>;
-+ vpcie12v-supply = <&vcc12v_dcin>;
-+ vpcie3v3-supply = <&vcc3v3_pcie>;
-+ status = "okay";
-+};
-+
-+&pcie_phy {
-+ status = "okay";
-+};
-+
- &pmu_io_domains {
- status = "okay";
-
diff --git a/target/linux/patches/6.1.49/enable-ethernet-bpi-m2-plus.patch b/target/linux/patches/6.1.49/enable-ethernet-bpi-m2-plus.patch
deleted file mode 100644
index 7e9abd9ce..000000000
--- a/target/linux/patches/6.1.49/enable-ethernet-bpi-m2-plus.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur linux-6.0.11.orig/arch/arm/boot/dts/sunxi-h3-h5.dtsi linux-6.0.11/arch/arm/boot/dts/sunxi-h3-h5.dtsi
---- linux-6.0.11.orig/arch/arm/boot/dts/sunxi-h3-h5.dtsi 2022-12-02 17:43:18.000000000 +0100
-+++ linux-6.0.11/arch/arm/boot/dts/sunxi-h3-h5.dtsi 2022-12-19 08:06:16.836436057 +0100
-@@ -532,7 +532,10 @@
- reset-names = "stmmaceth";
- clocks = <&ccu CLK_BUS_EMAC>;
- clock-names = "stmmaceth";
-- status = "disabled";
-+ status = "okay";
-+ phy-handle = <&int_mii_phy>;
-+ phy-mode = "mii";
-+ allwinner,leds-active-low;
-
- mdio: mdio {
- #address-cells = <1>;
diff --git a/target/linux/patches/6.1.49/hppa-cross-compile.patch b/target/linux/patches/6.1.49/hppa-cross-compile.patch
deleted file mode 100644
index 5400e87a0..000000000
--- a/target/linux/patches/6.1.49/hppa-cross-compile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur linux-6.1.41.orig/arch/parisc/Makefile linux-6.1.41/arch/parisc/Makefile
---- linux-6.1.41.orig/arch/parisc/Makefile 2023-07-24 18:55:35.000000000 +0200
-+++ linux-6.1.41/arch/parisc/Makefile 2023-07-25 17:32:20.338363915 +0200
-@@ -41,7 +41,7 @@
-
- # Set default 32 bits cross compilers for vdso
- CC_ARCHES_32 = hppa hppa2.0 hppa1.1
--CC_SUFFIXES = linux linux-gnu unknown-linux-gnu suse-linux
-+CC_SUFFIXES = linux linux-gnu unknown-linux-gnu suse-linux openadk-linux-uclibc
- CROSS32_COMPILE := $(call cc-cross-prefix, \
- $(foreach a,$(CC_ARCHES_32), \
- $(foreach s,$(CC_SUFFIXES),$(a)-$(s)-)))
diff --git a/target/linux/patches/6.1.49/m68k-Fix-invalid-.section-syntax.patch b/target/linux/patches/6.1.49/m68k-Fix-invalid-.section-syntax.patch
deleted file mode 100644
index c2a73d76a..000000000
--- a/target/linux/patches/6.1.49/m68k-Fix-invalid-.section-syntax.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nur linux-6.1.44.orig/arch/m68k/fpsp040/skeleton.S linux-6.1.44/arch/m68k/fpsp040/skeleton.S
---- linux-6.1.44.orig/arch/m68k/fpsp040/skeleton.S 2023-08-08 20:03:51.000000000 +0200
-+++ linux-6.1.44/arch/m68k/fpsp040/skeleton.S 2023-08-14 04:47:03.786841535 +0200
-@@ -499,13 +499,13 @@
- dbf %d0,morein
- rts
-
-- .section .fixup,#alloc,#execinstr
-+ .section .fixup,"ax"
- .even
- 1:
- jbsr fpsp040_die
- jbra .Lnotkern
-
-- .section __ex_table,#alloc
-+ .section __ex_table,"a"
- .align 4
-
- .long in_ea,1b
-diff -Nur linux-6.1.44.orig/arch/m68k/ifpsp060/os.S linux-6.1.44/arch/m68k/ifpsp060/os.S
---- linux-6.1.44.orig/arch/m68k/ifpsp060/os.S 2023-08-08 20:03:51.000000000 +0200
-+++ linux-6.1.44/arch/m68k/ifpsp060/os.S 2023-08-14 04:47:03.798841249 +0200
-@@ -379,11 +379,11 @@
-
-
- | Execption handling for movs access to illegal memory
-- .section .fixup,#alloc,#execinstr
-+ .section .fixup,"ax"
- .even
- 1: moveq #-1,%d1
- rts
--.section __ex_table,#alloc
-+.section __ex_table,"a"
- .align 4
- .long dmrbuae,1b
- .long dmrwuae,1b
-diff -Nur linux-6.1.44.orig/arch/m68k/kernel/relocate_kernel.S linux-6.1.44/arch/m68k/kernel/relocate_kernel.S
---- linux-6.1.44.orig/arch/m68k/kernel/relocate_kernel.S 2023-08-08 20:03:51.000000000 +0200
-+++ linux-6.1.44/arch/m68k/kernel/relocate_kernel.S 2023-08-14 04:47:03.802841154 +0200
-@@ -26,7 +26,7 @@
- lea %pc@(.Lcopy),%a4
- 2: addl #0x00000000,%a4 /* virt_to_phys() */
-
-- .section ".m68k_fixup","aw"
-+ .section .m68k_fixup,"aw"
- .long M68K_FIXUP_MEMOFFSET, 2b+2
- .previous
-
-@@ -49,7 +49,7 @@
- lea %pc@(.Lcont040),%a4
- 5: addl #0x00000000,%a4 /* virt_to_phys() */
-
-- .section ".m68k_fixup","aw"
-+ .section .m68k_fixup,"aw"
- .long M68K_FIXUP_MEMOFFSET, 5b+2
- .previous
-
diff --git a/target/linux/patches/6.1.49/macsonic.patch b/target/linux/patches/6.1.49/macsonic.patch
deleted file mode 100644
index 177397221..000000000
--- a/target/linux/patches/6.1.49/macsonic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur linux-6.1.41.orig/drivers/net/ethernet/natsemi/Kconfig linux-6.1.41/drivers/net/ethernet/natsemi/Kconfig
---- linux-6.1.41.orig/drivers/net/ethernet/natsemi/Kconfig 2023-07-24 18:55:35.000000000 +0200
-+++ linux-6.1.41/drivers/net/ethernet/natsemi/Kconfig 2023-07-26 17:06:27.179154363 +0200
-@@ -19,6 +19,7 @@
- config MACSONIC
- tristate "Macintosh SONIC based ethernet (onboard, NuBus, LC, CS)"
- depends on MAC
-+ select BITREVERSE
- help
- Support for NatSemi SONIC based Ethernet devices. This includes
- the onboard Ethernet in many Quadras as well as some LC-PDS,
diff --git a/target/linux/patches/6.1.49/nios2.patch b/target/linux/patches/6.1.49/nios2.patch
deleted file mode 100644
index 43631971e..000000000
--- a/target/linux/patches/6.1.49/nios2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur linux-6.1.41.orig/arch/nios2/configs/10m50_defconfig linux-6.1.41/arch/nios2/configs/10m50_defconfig
---- linux-6.1.41.orig/arch/nios2/configs/10m50_defconfig 2023-07-24 18:55:35.000000000 +0200
-+++ linux-6.1.41/arch/nios2/configs/10m50_defconfig 2023-07-29 13:12:27.796785539 +0200
-@@ -20,6 +20,8 @@
- CONFIG_NIOS2_DCACHE_SIZE=0x8000
- CONFIG_NIOS2_ICACHE_SIZE=0x8000
- # CONFIG_NIOS2_CMDLINE_IGNORE_DTB is not set
-+CONFIG_NIOS2_DTB_SOURCE_BOOL=y
-+CONFIG_NIOS2_DTB_SOURCE="10m50_devboard.dts"
- CONFIG_NET=y
- CONFIG_PACKET=y
- CONFIG_UNIX=y
diff --git a/target/linux/patches/6.1.49/riscv32.patch b/target/linux/patches/6.1.49/riscv32.patch
deleted file mode 100644
index 648b0de4d..000000000
--- a/target/linux/patches/6.1.49/riscv32.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nur linux-6.0.15.orig/arch/riscv/include/uapi/asm/unistd.h linux-6.0.15/arch/riscv/include/uapi/asm/unistd.h
---- linux-6.0.15.orig/arch/riscv/include/uapi/asm/unistd.h 2022-12-21 17:41:16.000000000 +0100
-+++ linux-6.0.15/arch/riscv/include/uapi/asm/unistd.h 2023-01-09 11:28:16.590796198 +0100
-@@ -15,9 +15,14 @@
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
--#if defined(__LP64__) && !defined(__SYSCALL_COMPAT)
-+#ifndef __SYSCALL_COMPAT
- #define __ARCH_WANT_NEW_STAT
- #define __ARCH_WANT_SET_GET_RLIMIT
-+#endif /* __SYSCALL_COMPAT */
-+
-+#ifndef __LP64__
-+#define __ARCH_WANT_STAT64
-+#define __ARCH_WANT_TIME32_SYSCALLS
- #endif /* __LP64__ */
-
- #define __ARCH_WANT_SYS_CLONE3
-diff -Nur linux-6.0.15.orig/arch/riscv/Kconfig linux-6.0.15/arch/riscv/Kconfig
---- linux-6.0.15.orig/arch/riscv/Kconfig 2022-12-21 17:41:16.000000000 +0100
-+++ linux-6.0.15/arch/riscv/Kconfig 2023-01-09 14:27:16.560750598 +0100
-@@ -163,8 +163,9 @@
-
- config PAGE_OFFSET
- hex
-- default 0xC0000000 if 32BIT
-+ default 0xC0000000 if 32BIT && MMU
- default 0x80000000 if 64BIT && !MMU
-+ default 0x80000000 if !MMU
- default 0xff60000000000000 if 64BIT
-
- config KASAN_SHADOW_OFFSET
-@@ -262,7 +263,6 @@
- select GENERIC_LIB_ASHRDI3
- select GENERIC_LIB_LSHRDI3
- select GENERIC_LIB_UCMPDI2
-- select MMU
-
- config ARCH_RV64I
- bool "RV64I"
-@@ -670,7 +670,6 @@
- default !NONPORTABLE
- select EFI
- select OF
-- select MMU
-
- menu "Power management options"
-
diff --git a/target/linux/patches/6.1.49/rockchip-115200.patch b/target/linux/patches/6.1.49/rockchip-115200.patch
deleted file mode 100644
index ad8a2d7a7..000000000
--- a/target/linux/patches/6.1.49/rockchip-115200.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur linux-5.15.81.orig/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi linux-5.15.81/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
---- linux-5.15.81.orig/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi 2022-12-02 17:41:12.000000000 +0100
-+++ linux-5.15.81/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi 2022-12-22 09:51:57.370394227 +0100
-@@ -17,7 +17,7 @@
- };
-
- chosen {
-- stdout-path = "serial2:1500000n8";
-+ stdout-path = "serial2:115200n8";
- };
-
- clkin_gmac: external-gmac-clock {
diff --git a/target/linux/patches/6.1.49/rockchip-pcie-timeout.patch b/target/linux/patches/6.1.49/rockchip-pcie-timeout.patch
deleted file mode 100644
index 2ef7df2da..000000000
--- a/target/linux/patches/6.1.49/rockchip-pcie-timeout.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur linux-6.0.11.orig/drivers/pci/controller/pcie-rockchip-host.c linux-6.0.11/drivers/pci/controller/pcie-rockchip-host.c
---- linux-6.0.11.orig/drivers/pci/controller/pcie-rockchip-host.c 2022-12-02 17:43:18.000000000 +0100
-+++ linux-6.0.11/drivers/pci/controller/pcie-rockchip-host.c 2022-12-24 11:12:25.753213273 +0100
-@@ -327,10 +327,10 @@
-
- gpiod_set_value_cansleep(rockchip->ep_gpio, 1);
-
-- /* 500ms timeout value should be enough for Gen1/2 training */
-+ /* 1000ms timeout value should be enough for Gen1/2 training */
- err = readl_poll_timeout(rockchip->apb_base + PCIE_CLIENT_BASIC_STATUS1,
- status, PCIE_LINK_UP(status), 20,
-- 500 * USEC_PER_MSEC);
-+ 1000 * USEC_PER_MSEC);
- if (err) {
- dev_err(dev, "PCIe link training gen1 timeout!\n");
- goto err_power_off_phy;
diff --git a/target/linux/patches/6.1.53/armnommu-fix-elf-fdpic-personality.patch b/target/linux/patches/6.1.53/armnommu-fix-elf-fdpic-personality.patch
new file mode 100644
index 000000000..78b1a10ff
--- /dev/null
+++ b/target/linux/patches/6.1.53/armnommu-fix-elf-fdpic-personality.patch
@@ -0,0 +1,54 @@
+From ab7647c2b04501297c50ce7cdb6f6895b9582d22 Mon Sep 17 00:00:00 2001
+From: Greg Ungerer <gerg@kernel.org>
+Date: Fri, 21 Apr 2023 00:21:38 +1000
+Subject: [PATCH] fs: binfmt_elf_efpic: fix personality for fdpic ELF
+
+The elf-fdpic loader hard sets the process personality to either
+PER_LINUX_FDPIC for true elf-fdpic binaries or to PER_LINUX for
+normal ELF binaries (in this case they would be constant displacement
+compiled with -pie for example). The problem with that is that it
+will lose any other bits that may be in the ELF header personality
+(such as the "bug emulation" bits).
+
+On the ARM architecture the ADDR_LIMIT_32BIT flag is used to signify
+a normal 32bit binary - as opposed to a legacy 26bit address binary.
+This matters since start_thread() will set the ARM CPSR register as
+required based on this flag. If the elf-fdpic loader loses this bit
+the process will be mis-configured and crash out pretty quickly.
+
+Modify elf-fdpic loaders personality setting binaries so that it
+preserves the upper three bytes by using the SET_PERSONALITY macro
+to set it. This macro in the generic case sets PER_LINUX and preserves
+the upper bytes. Architectures can override this for their specific
+use case, and ARM does exactly this.
+
+The problem shows up quite easily runing under qemu, but not necessarily
+on all types of real ARM hardware. If the underlying ARM processor does
+not support the legacy 26-bit addressing mode then everyting will work
+as expected.
+
+Signed-off-by: Greg Ungerer <gerg@kernel.org>
+---
+ fs/binfmt_elf_fdpic.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
+index a05eafcacfb2..f29ae1d96fd7 100644
+--- a/fs/binfmt_elf_fdpic.c
++++ b/fs/binfmt_elf_fdpic.c
+@@ -345,10 +345,9 @@
+ /* there's now no turning back... the old userspace image is dead,
+ * defunct, deceased, etc.
+ */
++ SET_PERSONALITY(exec_params.hdr);
+ if (elf_check_fdpic(&exec_params.hdr))
+- set_personality(PER_LINUX_FDPIC);
+- else
+- set_personality(PER_LINUX);
++ current->personality |= PER_LINUX_FDPIC;
+ if (elf_read_implies_exec(&exec_params.hdr, executable_stack))
+ current->personality |= READ_IMPLIES_EXEC;
+
+--
+2.25.1
+
diff --git a/target/linux/patches/6.1.53/armnommu-fix-thread-registers.patch b/target/linux/patches/6.1.53/armnommu-fix-thread-registers.patch
new file mode 100644
index 000000000..8ab2196dc
--- /dev/null
+++ b/target/linux/patches/6.1.53/armnommu-fix-thread-registers.patch
@@ -0,0 +1,57 @@
+From 1410ebe685f13c1699a16bf147ae1332e7fd1983 Mon Sep 17 00:00:00 2001
+From: Greg Ungerer <gerg@kernel.org>
+Date: Thu, 20 Apr 2023 09:52:08 +1000
+Subject: [PATCH] ARM: start_thread: restore registers on ELF load for noMMU
+
+The binfmt_elf-fdpic loader is capable of loading constant displacement
+ELF format binaries (like those compiled -pie) on noMMU systems as well
+as elf-fdpic format binaries. The traditional ELF loader cannot be
+enabled on noMMU systems.
+
+Commit 5e588114329c ("ARM: start_thread(): don't always clear all regs")
+fixed the start_thread() code so that it maintains the required
+elf-fdpic registers through to the new process, but it only does that if
+current has its personality FDPIC_FUNCPTRS bit set. That is true for
+elf-fdpic format binaries but will not be true for non-fdpic ELF
+binaries.
+
+Modify the test of the FDPIC_FUNCPTRS personality bit to also carry out
+the register restore if this is a noMMU system. This is not perfect,
+since it will also preserve these registers on noMMU systems for all
+binary format types (could be flat format for example). That won't break
+anything, but it is potentially leaking some information into the new
+process. But for the noMMU case we need those start time registers set to
+be able to finalize the runtime loading of the -pie style ELF binary
+(carry out its segment and dynamic relocation processing).
+
+Unfortunately the FDPIC_FUNCPTRS flag cannot just be enabled for all
+elf-fdpic loaded binaries. That personality bit is used for other things
+like the controlling the changed behavior for signal handling.
+
+There is no change in behavior for normal ELF loading on MMU systems.
+A -pie style ELF binary built for noMMU systems can be load and run using
+the usual ELF loader on an MMU system (elf-fdpic loader not required in
+this case).
+
+Signed-off-by: Greg Ungerer <gerg@kernel.org>
+---
+ arch/arm/include/asm/processor.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h
+index 326864f79d18..5074cc3ae4e1 100644
+--- a/arch/arm/include/asm/processor.h
++++ b/arch/arm/include/asm/processor.h
+@@ -60,7 +60,8 @@ static inline void arch_thread_struct_whitelist(unsigned long *offset,
+ } \
+ memset(regs->uregs, 0, sizeof(regs->uregs)); \
+ if (IS_ENABLED(CONFIG_BINFMT_ELF_FDPIC) && \
+- current->personality & FDPIC_FUNCPTRS) { \
++ ((! IS_ENABLED(CONFIG_MMU)) || \
++ current->personality & FDPIC_FUNCPTRS)) { \
+ regs->ARM_r7 = r7; \
+ regs->ARM_r8 = r8; \
+ regs->ARM_r9 = r9; \
+--
+2.25.1
+
diff --git a/target/linux/patches/6.1.53/armnommu-versatile.patch b/target/linux/patches/6.1.53/armnommu-versatile.patch
new file mode 100644
index 000000000..f8f10f50b
--- /dev/null
+++ b/target/linux/patches/6.1.53/armnommu-versatile.patch
@@ -0,0 +1,101 @@
+From 77c038d93769c92ef54cdbb50388564d1b37987b Mon Sep 17 00:00:00 2001
+From: Greg Ungerer <gerg@kernel.org>
+Date: Fri, 23 Sep 2016 13:37:34 +1000
+Subject: [PATCH] ARM: versatile: support configuring versatile machine for no-MMU
+
+Allow the arm versatile machine to be configured for no-MMU operation.
+
+Older kernels had the ability to build the versatile machine with the MMU
+disabled (!CONFIG_MMU). Recent changes to convert the versatile machine
+to device tree lost this ability. (Although older kernels could be built
+they did not run due to a bug in the IO_ADDRESS() mapping on this machine).
+
+The motivation for this is that the versatile machine is well supported
+in qemu. And this provides an excellent platform for development and
+testing no-MMU support on ARM in general.
+
+This patch adds a versatile platform selection in the upper level arm
+system type menu - where it appeared in older kernel versions - when
+configuring for the no-MMU case. There is no visible change to the way
+versatile is selected for the MMU enabled case.
+
+Signed-off-by: Greg Ungerer <gerg@kernel.org>
+---
+ arch/arm/Kconfig | 13 ++++++++++++-
+ arch/arm/include/asm/mach/map.h | 1 +
+ arch/arm/mach-versatile/Kconfig | 2 +-
+ arch/arm/mach-versatile/versatile.c | 4 ++++
+ 4 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-versatile/versatile.c b/arch/arm/mach-versatile/versatile.c
+index 02ba68abe533..835b51bc597b 100644
+--- a/arch/arm/mach-versatile/versatile.c
++++ b/arch/arm/mach-versatile/versatile.c
+@@ -22,7 +22,11 @@
+ #include <asm/mach/map.h>
+
+ /* macro to get at MMIO space when running virtually */
++#ifdef CONFIG_MMU
+ #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000)
++#else
++#define IO_ADDRESS(x) (x)
++#endif
+ #define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n))
+
+ /*
+diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
+index 2b8970d8e5a2..41844ab6aec5 100644
+--- a/arch/arm/include/asm/mach/map.h
++++ b/arch/arm/include/asm/mach/map.h
+@@ -60,6 +60,7 @@ extern int ioremap_page(unsigned long virt, unsigned long phys,
+ #else
+ #define iotable_init(map,num) do { } while (0)
+ #define vm_reserve_area_early(a,s,c) do { } while (0)
++#define debug_ll_io_init() do { } while (0)
+ #endif
+
+ #endif
+diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
+index e24a9820e12f..342e1efa583a 100644
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -307,12 +307,23 @@ config MMU
+ Select if you want MMU-based virtualised addressing space
+ support by paged memory management. If unsure, say 'Y'.
+
++choice
++ prompt "ARM system type"
++ depends on !MMU
++ default ARM_SINGLE_ARMV7M
++
+ config ARM_SINGLE_ARMV7M
+- def_bool !MMU
++ bool "ARMv7-M based platforms (Cortex-M0/M3/M4)"
+ select ARM_NVIC
+ select CPU_V7M
+ select NO_IOPORT_MAP
+
++config ARM_SINGLE_ARM926
++ bool "ARM926 based platforms"
++ select CPU_ARM926T
++
++endchoice
++
+ config ARCH_MMAP_RND_BITS_MIN
+ default 8
+
+diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
+index b1519b4dc03a..2f1bf95daeb0 100644
+--- a/arch/arm/mach-versatile/Kconfig
++++ b/arch/arm/mach-versatile/Kconfig
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ config ARCH_VERSATILE
+ bool "ARM Ltd. Versatile family"
+- depends on ARCH_MULTI_V5
++ depends on ARCH_MULTI_V5 || ARM_SINGLE_ARM926
+ depends on CPU_LITTLE_ENDIAN
+ select ARM_AMBA
+ select ARM_TIMER_SP804
+--
+2.25.1
diff --git a/target/linux/patches/6.1.53/board-rockpi4-0003-arm64-dts-pcie.patch b/target/linux/patches/6.1.53/board-rockpi4-0003-arm64-dts-pcie.patch
new file mode 100644
index 000000000..1777e7a86
--- /dev/null
+++ b/target/linux/patches/6.1.53/board-rockpi4-0003-arm64-dts-pcie.patch
@@ -0,0 +1,35 @@
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
+index 1ae1ebd4e..2f84397d5 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
+@@ -62,6 +62,8 @@
+ regulator-name = "vcc3v3_pcie";
+ regulator-always-on;
+ regulator-boot-on;
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
+ vin-supply = <&vcc5v0_sys>;
+ };
+
+@@ -434,6 +459,21 @@
+ gpio1830-supply = <&vcc_3v0>;
+ };
+
++&pcie0 {
++ ep-gpios = <&gpio4 RK_PD3 GPIO_ACTIVE_HIGH>;
++ num-lanes = <4>;
++ max-link-speed = <1>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pcie_clkreqnb_cpm>;
++ vpcie12v-supply = <&vcc12v_dcin>;
++ vpcie3v3-supply = <&vcc3v3_pcie>;
++ status = "okay";
++};
++
++&pcie_phy {
++ status = "okay";
++};
++
+ &pmu_io_domains {
+ status = "okay";
+
diff --git a/target/linux/patches/6.1.53/enable-ethernet-bpi-m2-plus.patch b/target/linux/patches/6.1.53/enable-ethernet-bpi-m2-plus.patch
new file mode 100644
index 000000000..7e9abd9ce
--- /dev/null
+++ b/target/linux/patches/6.1.53/enable-ethernet-bpi-m2-plus.patch
@@ -0,0 +1,15 @@
+diff -Nur linux-6.0.11.orig/arch/arm/boot/dts/sunxi-h3-h5.dtsi linux-6.0.11/arch/arm/boot/dts/sunxi-h3-h5.dtsi
+--- linux-6.0.11.orig/arch/arm/boot/dts/sunxi-h3-h5.dtsi 2022-12-02 17:43:18.000000000 +0100
++++ linux-6.0.11/arch/arm/boot/dts/sunxi-h3-h5.dtsi 2022-12-19 08:06:16.836436057 +0100
+@@ -532,7 +532,10 @@
+ reset-names = "stmmaceth";
+ clocks = <&ccu CLK_BUS_EMAC>;
+ clock-names = "stmmaceth";
+- status = "disabled";
++ status = "okay";
++ phy-handle = <&int_mii_phy>;
++ phy-mode = "mii";
++ allwinner,leds-active-low;
+
+ mdio: mdio {
+ #address-cells = <1>;
diff --git a/target/linux/patches/6.1.53/hppa-cross-compile.patch b/target/linux/patches/6.1.53/hppa-cross-compile.patch
new file mode 100644
index 000000000..5400e87a0
--- /dev/null
+++ b/target/linux/patches/6.1.53/hppa-cross-compile.patch
@@ -0,0 +1,12 @@
+diff -Nur linux-6.1.41.orig/arch/parisc/Makefile linux-6.1.41/arch/parisc/Makefile
+--- linux-6.1.41.orig/arch/parisc/Makefile 2023-07-24 18:55:35.000000000 +0200
++++ linux-6.1.41/arch/parisc/Makefile 2023-07-25 17:32:20.338363915 +0200
+@@ -41,7 +41,7 @@
+
+ # Set default 32 bits cross compilers for vdso
+ CC_ARCHES_32 = hppa hppa2.0 hppa1.1
+-CC_SUFFIXES = linux linux-gnu unknown-linux-gnu suse-linux
++CC_SUFFIXES = linux linux-gnu unknown-linux-gnu suse-linux openadk-linux-uclibc
+ CROSS32_COMPILE := $(call cc-cross-prefix, \
+ $(foreach a,$(CC_ARCHES_32), \
+ $(foreach s,$(CC_SUFFIXES),$(a)-$(s)-)))
diff --git a/target/linux/patches/6.1.53/m68k-Fix-invalid-.section-syntax.patch b/target/linux/patches/6.1.53/m68k-Fix-invalid-.section-syntax.patch
new file mode 100644
index 000000000..c2a73d76a
--- /dev/null
+++ b/target/linux/patches/6.1.53/m68k-Fix-invalid-.section-syntax.patch
@@ -0,0 +1,57 @@
+diff -Nur linux-6.1.44.orig/arch/m68k/fpsp040/skeleton.S linux-6.1.44/arch/m68k/fpsp040/skeleton.S
+--- linux-6.1.44.orig/arch/m68k/fpsp040/skeleton.S 2023-08-08 20:03:51.000000000 +0200
++++ linux-6.1.44/arch/m68k/fpsp040/skeleton.S 2023-08-14 04:47:03.786841535 +0200
+@@ -499,13 +499,13 @@
+ dbf %d0,morein
+ rts
+
+- .section .fixup,#alloc,#execinstr
++ .section .fixup,"ax"
+ .even
+ 1:
+ jbsr fpsp040_die
+ jbra .Lnotkern
+
+- .section __ex_table,#alloc
++ .section __ex_table,"a"
+ .align 4
+
+ .long in_ea,1b
+diff -Nur linux-6.1.44.orig/arch/m68k/ifpsp060/os.S linux-6.1.44/arch/m68k/ifpsp060/os.S
+--- linux-6.1.44.orig/arch/m68k/ifpsp060/os.S 2023-08-08 20:03:51.000000000 +0200
++++ linux-6.1.44/arch/m68k/ifpsp060/os.S 2023-08-14 04:47:03.798841249 +0200
+@@ -379,11 +379,11 @@
+
+
+ | Execption handling for movs access to illegal memory
+- .section .fixup,#alloc,#execinstr
++ .section .fixup,"ax"
+ .even
+ 1: moveq #-1,%d1
+ rts
+-.section __ex_table,#alloc
++.section __ex_table,"a"
+ .align 4
+ .long dmrbuae,1b
+ .long dmrwuae,1b
+diff -Nur linux-6.1.44.orig/arch/m68k/kernel/relocate_kernel.S linux-6.1.44/arch/m68k/kernel/relocate_kernel.S
+--- linux-6.1.44.orig/arch/m68k/kernel/relocate_kernel.S 2023-08-08 20:03:51.000000000 +0200
++++ linux-6.1.44/arch/m68k/kernel/relocate_kernel.S 2023-08-14 04:47:03.802841154 +0200
+@@ -26,7 +26,7 @@
+ lea %pc@(.Lcopy),%a4
+ 2: addl #0x00000000,%a4 /* virt_to_phys() */
+
+- .section ".m68k_fixup","aw"
++ .section .m68k_fixup,"aw"
+ .long M68K_FIXUP_MEMOFFSET, 2b+2
+ .previous
+
+@@ -49,7 +49,7 @@
+ lea %pc@(.Lcont040),%a4
+ 5: addl #0x00000000,%a4 /* virt_to_phys() */
+
+- .section ".m68k_fixup","aw"
++ .section .m68k_fixup,"aw"
+ .long M68K_FIXUP_MEMOFFSET, 5b+2
+ .previous
+
diff --git a/target/linux/patches/6.1.53/macsonic.patch b/target/linux/patches/6.1.53/macsonic.patch
new file mode 100644
index 000000000..177397221
--- /dev/null
+++ b/target/linux/patches/6.1.53/macsonic.patch
@@ -0,0 +1,11 @@
+diff -Nur linux-6.1.41.orig/drivers/net/ethernet/natsemi/Kconfig linux-6.1.41/drivers/net/ethernet/natsemi/Kconfig
+--- linux-6.1.41.orig/drivers/net/ethernet/natsemi/Kconfig 2023-07-24 18:55:35.000000000 +0200
++++ linux-6.1.41/drivers/net/ethernet/natsemi/Kconfig 2023-07-26 17:06:27.179154363 +0200
+@@ -19,6 +19,7 @@
+ config MACSONIC
+ tristate "Macintosh SONIC based ethernet (onboard, NuBus, LC, CS)"
+ depends on MAC
++ select BITREVERSE
+ help
+ Support for NatSemi SONIC based Ethernet devices. This includes
+ the onboard Ethernet in many Quadras as well as some LC-PDS,
diff --git a/target/linux/patches/6.1.53/nios2.patch b/target/linux/patches/6.1.53/nios2.patch
new file mode 100644
index 000000000..43631971e
--- /dev/null
+++ b/target/linux/patches/6.1.53/nios2.patch
@@ -0,0 +1,12 @@
+diff -Nur linux-6.1.41.orig/arch/nios2/configs/10m50_defconfig linux-6.1.41/arch/nios2/configs/10m50_defconfig
+--- linux-6.1.41.orig/arch/nios2/configs/10m50_defconfig 2023-07-24 18:55:35.000000000 +0200
++++ linux-6.1.41/arch/nios2/configs/10m50_defconfig 2023-07-29 13:12:27.796785539 +0200
+@@ -20,6 +20,8 @@
+ CONFIG_NIOS2_DCACHE_SIZE=0x8000
+ CONFIG_NIOS2_ICACHE_SIZE=0x8000
+ # CONFIG_NIOS2_CMDLINE_IGNORE_DTB is not set
++CONFIG_NIOS2_DTB_SOURCE_BOOL=y
++CONFIG_NIOS2_DTB_SOURCE="10m50_devboard.dts"
+ CONFIG_NET=y
+ CONFIG_PACKET=y
+ CONFIG_UNIX=y
diff --git a/target/linux/patches/6.1.53/riscv32.patch b/target/linux/patches/6.1.53/riscv32.patch
new file mode 100644
index 000000000..648b0de4d
--- /dev/null
+++ b/target/linux/patches/6.1.53/riscv32.patch
@@ -0,0 +1,49 @@
+diff -Nur linux-6.0.15.orig/arch/riscv/include/uapi/asm/unistd.h linux-6.0.15/arch/riscv/include/uapi/asm/unistd.h
+--- linux-6.0.15.orig/arch/riscv/include/uapi/asm/unistd.h 2022-12-21 17:41:16.000000000 +0100
++++ linux-6.0.15/arch/riscv/include/uapi/asm/unistd.h 2023-01-09 11:28:16.590796198 +0100
+@@ -15,9 +15,14 @@
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+-#if defined(__LP64__) && !defined(__SYSCALL_COMPAT)
++#ifndef __SYSCALL_COMPAT
+ #define __ARCH_WANT_NEW_STAT
+ #define __ARCH_WANT_SET_GET_RLIMIT
++#endif /* __SYSCALL_COMPAT */
++
++#ifndef __LP64__
++#define __ARCH_WANT_STAT64
++#define __ARCH_WANT_TIME32_SYSCALLS
+ #endif /* __LP64__ */
+
+ #define __ARCH_WANT_SYS_CLONE3
+diff -Nur linux-6.0.15.orig/arch/riscv/Kconfig linux-6.0.15/arch/riscv/Kconfig
+--- linux-6.0.15.orig/arch/riscv/Kconfig 2022-12-21 17:41:16.000000000 +0100
++++ linux-6.0.15/arch/riscv/Kconfig 2023-01-09 14:27:16.560750598 +0100
+@@ -163,8 +163,9 @@
+
+ config PAGE_OFFSET
+ hex
+- default 0xC0000000 if 32BIT
++ default 0xC0000000 if 32BIT && MMU
+ default 0x80000000 if 64BIT && !MMU
++ default 0x80000000 if !MMU
+ default 0xff60000000000000 if 64BIT
+
+ config KASAN_SHADOW_OFFSET
+@@ -262,7 +263,6 @@
+ select GENERIC_LIB_ASHRDI3
+ select GENERIC_LIB_LSHRDI3
+ select GENERIC_LIB_UCMPDI2
+- select MMU
+
+ config ARCH_RV64I
+ bool "RV64I"
+@@ -670,7 +670,6 @@
+ default !NONPORTABLE
+ select EFI
+ select OF
+- select MMU
+
+ menu "Power management options"
+
diff --git a/target/linux/patches/6.1.53/rockchip-115200.patch b/target/linux/patches/6.1.53/rockchip-115200.patch
new file mode 100644
index 000000000..ad8a2d7a7
--- /dev/null
+++ b/target/linux/patches/6.1.53/rockchip-115200.patch
@@ -0,0 +1,12 @@
+diff -Nur linux-5.15.81.orig/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi linux-5.15.81/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
+--- linux-5.15.81.orig/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi 2022-12-02 17:41:12.000000000 +0100
++++ linux-5.15.81/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi 2022-12-22 09:51:57.370394227 +0100
+@@ -17,7 +17,7 @@
+ };
+
+ chosen {
+- stdout-path = "serial2:1500000n8";
++ stdout-path = "serial2:115200n8";
+ };
+
+ clkin_gmac: external-gmac-clock {
diff --git a/target/linux/patches/6.1.53/rockchip-pcie-timeout.patch b/target/linux/patches/6.1.53/rockchip-pcie-timeout.patch
new file mode 100644
index 000000000..2ef7df2da
--- /dev/null
+++ b/target/linux/patches/6.1.53/rockchip-pcie-timeout.patch
@@ -0,0 +1,16 @@
+diff -Nur linux-6.0.11.orig/drivers/pci/controller/pcie-rockchip-host.c linux-6.0.11/drivers/pci/controller/pcie-rockchip-host.c
+--- linux-6.0.11.orig/drivers/pci/controller/pcie-rockchip-host.c 2022-12-02 17:43:18.000000000 +0100
++++ linux-6.0.11/drivers/pci/controller/pcie-rockchip-host.c 2022-12-24 11:12:25.753213273 +0100
+@@ -327,10 +327,10 @@
+
+ gpiod_set_value_cansleep(rockchip->ep_gpio, 1);
+
+- /* 500ms timeout value should be enough for Gen1/2 training */
++ /* 1000ms timeout value should be enough for Gen1/2 training */
+ err = readl_poll_timeout(rockchip->apb_base + PCIE_CLIENT_BASIC_STATUS1,
+ status, PCIE_LINK_UP(status), 20,
+- 500 * USEC_PER_MSEC);
++ 1000 * USEC_PER_MSEC);
+ if (err) {
+ dev_err(dev, "PCIe link training gen1 timeout!\n");
+ goto err_power_off_phy;
diff --git a/target/linux/patches/6.4.12/armnommu-fix-elf-fdpic-personality.patch b/target/linux/patches/6.4.12/armnommu-fix-elf-fdpic-personality.patch
deleted file mode 100644
index 78b1a10ff..000000000
--- a/target/linux/patches/6.4.12/armnommu-fix-elf-fdpic-personality.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From ab7647c2b04501297c50ce7cdb6f6895b9582d22 Mon Sep 17 00:00:00 2001
-From: Greg Ungerer <gerg@kernel.org>
-Date: Fri, 21 Apr 2023 00:21:38 +1000
-Subject: [PATCH] fs: binfmt_elf_efpic: fix personality for fdpic ELF
-
-The elf-fdpic loader hard sets the process personality to either
-PER_LINUX_FDPIC for true elf-fdpic binaries or to PER_LINUX for
-normal ELF binaries (in this case they would be constant displacement
-compiled with -pie for example). The problem with that is that it
-will lose any other bits that may be in the ELF header personality
-(such as the "bug emulation" bits).
-
-On the ARM architecture the ADDR_LIMIT_32BIT flag is used to signify
-a normal 32bit binary - as opposed to a legacy 26bit address binary.
-This matters since start_thread() will set the ARM CPSR register as
-required based on this flag. If the elf-fdpic loader loses this bit
-the process will be mis-configured and crash out pretty quickly.
-
-Modify elf-fdpic loaders personality setting binaries so that it
-preserves the upper three bytes by using the SET_PERSONALITY macro
-to set it. This macro in the generic case sets PER_LINUX and preserves
-the upper bytes. Architectures can override this for their specific
-use case, and ARM does exactly this.
-
-The problem shows up quite easily runing under qemu, but not necessarily
-on all types of real ARM hardware. If the underlying ARM processor does
-not support the legacy 26-bit addressing mode then everyting will work
-as expected.
-
-Signed-off-by: Greg Ungerer <gerg@kernel.org>
----
- fs/binfmt_elf_fdpic.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
-index a05eafcacfb2..f29ae1d96fd7 100644
---- a/fs/binfmt_elf_fdpic.c
-+++ b/fs/binfmt_elf_fdpic.c
-@@ -345,10 +345,9 @@
- /* there's now no turning back... the old userspace image is dead,
- * defunct, deceased, etc.
- */
-+ SET_PERSONALITY(exec_params.hdr);
- if (elf_check_fdpic(&exec_params.hdr))
-- set_personality(PER_LINUX_FDPIC);
-- else
-- set_personality(PER_LINUX);
-+ current->personality |= PER_LINUX_FDPIC;
- if (elf_read_implies_exec(&exec_params.hdr, executable_stack))
- current->personality |= READ_IMPLIES_EXEC;
-
---
-2.25.1
-
diff --git a/target/linux/patches/6.4.12/armnommu-fix-thread-registers.patch b/target/linux/patches/6.4.12/armnommu-fix-thread-registers.patch
deleted file mode 100644
index 8ab2196dc..000000000
--- a/target/linux/patches/6.4.12/armnommu-fix-thread-registers.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 1410ebe685f13c1699a16bf147ae1332e7fd1983 Mon Sep 17 00:00:00 2001
-From: Greg Ungerer <gerg@kernel.org>
-Date: Thu, 20 Apr 2023 09:52:08 +1000
-Subject: [PATCH] ARM: start_thread: restore registers on ELF load for noMMU
-
-The binfmt_elf-fdpic loader is capable of loading constant displacement
-ELF format binaries (like those compiled -pie) on noMMU systems as well
-as elf-fdpic format binaries. The traditional ELF loader cannot be
-enabled on noMMU systems.
-
-Commit 5e588114329c ("ARM: start_thread(): don't always clear all regs")
-fixed the start_thread() code so that it maintains the required
-elf-fdpic registers through to the new process, but it only does that if
-current has its personality FDPIC_FUNCPTRS bit set. That is true for
-elf-fdpic format binaries but will not be true for non-fdpic ELF
-binaries.
-
-Modify the test of the FDPIC_FUNCPTRS personality bit to also carry out
-the register restore if this is a noMMU system. This is not perfect,
-since it will also preserve these registers on noMMU systems for all
-binary format types (could be flat format for example). That won't break
-anything, but it is potentially leaking some information into the new
-process. But for the noMMU case we need those start time registers set to
-be able to finalize the runtime loading of the -pie style ELF binary
-(carry out its segment and dynamic relocation processing).
-
-Unfortunately the FDPIC_FUNCPTRS flag cannot just be enabled for all
-elf-fdpic loaded binaries. That personality bit is used for other things
-like the controlling the changed behavior for signal handling.
-
-There is no change in behavior for normal ELF loading on MMU systems.
-A -pie style ELF binary built for noMMU systems can be load and run using
-the usual ELF loader on an MMU system (elf-fdpic loader not required in
-this case).
-
-Signed-off-by: Greg Ungerer <gerg@kernel.org>
----
- arch/arm/include/asm/processor.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h
-index 326864f79d18..5074cc3ae4e1 100644
---- a/arch/arm/include/asm/processor.h
-+++ b/arch/arm/include/asm/processor.h
-@@ -60,7 +60,8 @@ static inline void arch_thread_struct_whitelist(unsigned long *offset,
- } \
- memset(regs->uregs, 0, sizeof(regs->uregs)); \
- if (IS_ENABLED(CONFIG_BINFMT_ELF_FDPIC) && \
-- current->personality & FDPIC_FUNCPTRS) { \
-+ ((! IS_ENABLED(CONFIG_MMU)) || \
-+ current->personality & FDPIC_FUNCPTRS)) { \
- regs->ARM_r7 = r7; \
- regs->ARM_r8 = r8; \
- regs->ARM_r9 = r9; \
---
-2.25.1
-
diff --git a/target/linux/patches/6.4.12/armnommu-versatile.patch b/target/linux/patches/6.4.12/armnommu-versatile.patch
deleted file mode 100644
index f8f10f50b..000000000
--- a/target/linux/patches/6.4.12/armnommu-versatile.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 77c038d93769c92ef54cdbb50388564d1b37987b Mon Sep 17 00:00:00 2001
-From: Greg Ungerer <gerg@kernel.org>
-Date: Fri, 23 Sep 2016 13:37:34 +1000
-Subject: [PATCH] ARM: versatile: support configuring versatile machine for no-MMU
-
-Allow the arm versatile machine to be configured for no-MMU operation.
-
-Older kernels had the ability to build the versatile machine with the MMU
-disabled (!CONFIG_MMU). Recent changes to convert the versatile machine
-to device tree lost this ability. (Although older kernels could be built
-they did not run due to a bug in the IO_ADDRESS() mapping on this machine).
-
-The motivation for this is that the versatile machine is well supported
-in qemu. And this provides an excellent platform for development and
-testing no-MMU support on ARM in general.
-
-This patch adds a versatile platform selection in the upper level arm
-system type menu - where it appeared in older kernel versions - when
-configuring for the no-MMU case. There is no visible change to the way
-versatile is selected for the MMU enabled case.
-
-Signed-off-by: Greg Ungerer <gerg@kernel.org>
----
- arch/arm/Kconfig | 13 ++++++++++++-
- arch/arm/include/asm/mach/map.h | 1 +
- arch/arm/mach-versatile/Kconfig | 2 +-
- arch/arm/mach-versatile/versatile.c | 4 ++++
- 4 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-versatile/versatile.c b/arch/arm/mach-versatile/versatile.c
-index 02ba68abe533..835b51bc597b 100644
---- a/arch/arm/mach-versatile/versatile.c
-+++ b/arch/arm/mach-versatile/versatile.c
-@@ -22,7 +22,11 @@
- #include <asm/mach/map.h>
-
- /* macro to get at MMIO space when running virtually */
-+#ifdef CONFIG_MMU
- #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000)
-+#else
-+#define IO_ADDRESS(x) (x)
-+#endif
- #define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n))
-
- /*
-diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
-index 2b8970d8e5a2..41844ab6aec5 100644
---- a/arch/arm/include/asm/mach/map.h
-+++ b/arch/arm/include/asm/mach/map.h
-@@ -60,6 +60,7 @@ extern int ioremap_page(unsigned long virt, unsigned long phys,
- #else
- #define iotable_init(map,num) do { } while (0)
- #define vm_reserve_area_early(a,s,c) do { } while (0)
-+#define debug_ll_io_init() do { } while (0)
- #endif
-
- #endif
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index e24a9820e12f..342e1efa583a 100644
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -307,12 +307,23 @@ config MMU
- Select if you want MMU-based virtualised addressing space
- support by paged memory management. If unsure, say 'Y'.
-
-+choice
-+ prompt "ARM system type"
-+ depends on !MMU
-+ default ARM_SINGLE_ARMV7M
-+
- config ARM_SINGLE_ARMV7M
-- def_bool !MMU
-+ bool "ARMv7-M based platforms (Cortex-M0/M3/M4)"
- select ARM_NVIC
- select CPU_V7M
- select NO_IOPORT_MAP
-
-+config ARM_SINGLE_ARM926
-+ bool "ARM926 based platforms"
-+ select CPU_ARM926T
-+
-+endchoice
-+
- config ARCH_MMAP_RND_BITS_MIN
- default 8
-
-diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
-index b1519b4dc03a..2f1bf95daeb0 100644
---- a/arch/arm/mach-versatile/Kconfig
-+++ b/arch/arm/mach-versatile/Kconfig
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- config ARCH_VERSATILE
- bool "ARM Ltd. Versatile family"
-- depends on ARCH_MULTI_V5
-+ depends on ARCH_MULTI_V5 || ARM_SINGLE_ARM926
- depends on CPU_LITTLE_ENDIAN
- select ARM_AMBA
- select ARM_TIMER_SP804
---
-2.25.1
--
cgit v1.2.3