linux-toradex: update to lf-5.15-2.1.x

Update the downstream kernel (NXP fork) to lf-5.15-2.1.0 plus fslc
stable patches merges.
I.e. rebase our 5.15-2.0.0 on top of
https://github.com/Freescale/linux-fslc/commit/0dbb0e28ad332aa0955b873beb91190ae05ac655

For the RT kernel, set the matching RT patch plus refresh/add
patches which allow to apply the RT patch and cleanup afterwards.

Related-to: ELB-4873
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit 934f013425879aa5acc7507ddb553448b7a47b66)

12 files changed, 73 insertions, 14 deletions

diff --git a/recipes-kernel/linux/linux-imx-headers_5%.bbappend b/recipes-kernel/linux/linux-imx-headers_5%.bbappend
index 01879ea..e1d8228 100644
--- a/recipes-kernel/linux/linux-imx-headers_5%.bbappend
+++ b/recipes-kernel/linux/linux-imx-headers_5%.bbappend
@@ -1,5 +1,5 @@
 LIC_FILES_CHKSUM:tdx = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-SRCBRANCH:tdx = "toradex_5.15-2.0.x-imx"
+SRCBRANCH:tdx = "toradex_5.15-2.1.x-imx"
 SRC_URI:tdx = "git://git.toradex.com/linux-toradex.git;protocol=https;branch=${SRCBRANCH}"
 # Keep that one stable, i.e. use the exact git hash from the NXP BSP.
-SRCREV:tdx = "fa6c3168595c02bd9d5366fcc28c9e7304947a3d"
+SRCREV:tdx = "36363d8623ba60858e2632b7d2b70dae932c9a8b"
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.0.x/0001-Revert-Revert-ARM-9113-1-uaccess-remove-set_fs-imple.patch b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0001-Revert-Revert-ARM-9113-1-uaccess-remove-set_fs-imple.patch
index 7c94468..b2413e8 100644
--- a/recipes-kernel/linux/linux-toradex-5.15-2.0.x/0001-Revert-Revert-ARM-9113-1-uaccess-remove-set_fs-imple.patch
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0001-Revert-Revert-ARM-9113-1-uaccess-remove-set_fs-imple.patch
@@ -1,7 +1,7 @@
-From 64efc14ff356ae672822e67d42cfc6304228ebd1 Mon Sep 17 00:00:00 2001
+From 8f561f0a27a68205ad7a33b3e0fdaf80fc7f96ea Mon Sep 17 00:00:00 2001
 From: Max Krummenacher <max.krummenacher@toradex.com>
 Date: Tue, 9 Aug 2022 14:47:27 +0200
-Subject: [PATCH 1/3] Revert "Revert "ARM: 9113/1: uaccess: remove set_fs()
+Subject: [PATCH 1/5] Revert "Revert "ARM: 9113/1: uaccess: remove set_fs()
  implementation""
 
 Prepare for applying RT-Patch by partly reverting the conflicting
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.0.x/0001-imx_sc_thermal-prevent-BUG-with-rt-patch.patch b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0001-imx_sc_thermal-prevent-BUG-with-rt-patch.patch
index 4dc1dae..4dc1dae 100644
--- a/recipes-kernel/linux/linux-toradex-5.15-2.0.x/0001-imx_sc_thermal-prevent-BUG-with-rt-patch.patch
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0001-imx_sc_thermal-prevent-BUG-with-rt-patch.patch
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0002-arch-arm-Kconfig-prepare-for-rt-patch.patch b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0002-arch-arm-Kconfig-prepare-for-rt-patch.patch
new file mode 100644
index 0000000..7dfb476
--- /dev/null
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0002-arch-arm-Kconfig-prepare-for-rt-patch.patch
@@ -0,0 +1,28 @@
+From 8e60810e199661b607557e560b329097dc3fea0e Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Sun, 13 Nov 2022 13:30:47 +0100
+Subject: [PATCH 2/5] arch/arm/Kconfig: prepare for rt patch
+
+Prepare for applying the RT patch without fuzz (and revert the
+change after the RT patch is applied.
+
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ arch/arm/Kconfig | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
+index ddeca482323d..a8ae17f5740d 100644
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -125,7 +125,6 @@ config ARM
+ 	select PCI_SYSCALL if PCI
+ 	select PERF_USE_VMALLOC
+ 	select RTC_LIB
+-	select SET_FS
+ 	select SYS_SUPPORTS_APM_EMULATION
+ 	select TRACE_IRQFLAGS_SUPPORT if !CPU_V7M
+ 	# Above selects are sorted alphabetically; please add new ones
+-- 
+2.35.3
+
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.0.x/0002-ddr-perf-prevent-BUG-with-rt-patch.patch b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0002-ddr-perf-prevent-BUG-with-rt-patch.patch
index 9296878..9296878 100644
--- a/recipes-kernel/linux/linux-toradex-5.15-2.0.x/0002-ddr-perf-prevent-BUG-with-rt-patch.patch
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0002-ddr-perf-prevent-BUG-with-rt-patch.patch
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0004-Revert-arch-arm-Kconfig-prepare-for-rt-patch.patch b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0004-Revert-arch-arm-Kconfig-prepare-for-rt-patch.patch
new file mode 100644
index 0000000..5ade25c
--- /dev/null
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0004-Revert-arch-arm-Kconfig-prepare-for-rt-patch.patch
@@ -0,0 +1,28 @@
+From 572fd569bff28f25e83b8466c77ccb821675771a Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Sun, 13 Nov 2022 13:36:24 +0100
+Subject: [PATCH 4/5] Revert "arch/arm/Kconfig: prepare for rt patch"
+
+This reverts commit 8e60810e199661b607557e560b329097dc3fea0e.
+Revert the changes made to make the RT-Patch apply.
+
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ arch/arm/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
+index 0e8631b96e0f..d5b9364334e0 100644
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -128,6 +128,7 @@ config ARM
+ 	select PERF_USE_VMALLOC
+ 	select HAVE_POSIX_CPU_TIMERS_TASK_WORK if !KVM
+ 	select RTC_LIB
++	select SET_FS
+ 	select SYS_SUPPORTS_APM_EMULATION
+ 	select TRACE_IRQFLAGS_SUPPORT if !CPU_V7M
+ 	# Above selects are sorted alphabetically; please add new ones
+-- 
+2.35.3
+
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.0.x/0003-Revert-Revert-Revert-ARM-9113-1-uaccess-remove-set_f.patch b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0005-Revert-Revert-Revert-ARM-9113-1-uaccess-remove-set_f.patch
index 16b2e1c..f98060a 100644
--- a/recipes-kernel/linux/linux-toradex-5.15-2.0.x/0003-Revert-Revert-Revert-ARM-9113-1-uaccess-remove-set_f.patch
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0005-Revert-Revert-Revert-ARM-9113-1-uaccess-remove-set_f.patch
@@ -1,12 +1,13 @@
-From 4763868800d10510c87f3c526aae050429dbb5c1 Mon Sep 17 00:00:00 2001
+From d162134a09f5036bb1d34c8c3ae8091b8851e1f9 Mon Sep 17 00:00:00 2001
 From: Max Krummenacher <max.krummenacher@toradex.com>
 Date: Tue, 9 Aug 2022 14:56:10 +0200
-Subject: [PATCH 3/3] Revert "Revert "Revert "ARM: 9113/1: uaccess: remove
+Subject: [PATCH 5/5] Revert "Revert "Revert "ARM: 9113/1: uaccess: remove
  set_fs() implementation"""
 
-Bring back the changes reverted to make the RT-Patch apply.
+This reverts commit 8f561f0a27a68205ad7a33b3e0fdaf80fc7f96ea
+Revert the changes made to make the RT-Patch apply.
 
-This reverts commit 64efc14ff356ae672822e67d42cfc6304228ebd1.
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
 ---
  arch/arm/include/asm/thread_info.h | 1 +
  arch/arm/kernel/asm-offsets.c      | 1 +
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.0.x/preempt-rt-less-latency.cfg b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/preempt-rt-less-latency.cfg
index a9c88bd..a9c88bd 100644
--- a/recipes-kernel/linux/linux-toradex-5.15-2.0.x/preempt-rt-less-latency.cfg
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/preempt-rt-less-latency.cfg
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.0.x/preempt-rt-less-latency.scc b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/preempt-rt-less-latency.scc
index edd1519..edd1519 100644
--- a/recipes-kernel/linux/linux-toradex-5.15-2.0.x/preempt-rt-less-latency.scc
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/preempt-rt-less-latency.scc
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.0.x/preempt-rt.cfg b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/preempt-rt.cfg
index 17b06b1..17b06b1 100644
--- a/recipes-kernel/linux/linux-toradex-5.15-2.0.x/preempt-rt.cfg
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/preempt-rt.cfg
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.0.x/preempt-rt.scc b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/preempt-rt.scc
index 82d27dc..82d27dc 100644
--- a/recipes-kernel/linux/linux-toradex-5.15-2.0.x/preempt-rt.scc
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.1.x/preempt-rt.scc
diff --git a/recipes-kernel/linux/linux-toradex_5.15-2.0.x.bb b/recipes-kernel/linux/linux-toradex_5.15-2.1.x.bb
index 3bbe069..09ab4cc 100644
--- a/recipes-kernel/linux/linux-toradex_5.15-2.0.x.bb
+++ b/recipes-kernel/linux/linux-toradex_5.15-2.1.x.bb
@@ -14,15 +14,15 @@ SRC_URI = " \
 KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', ' libcomposite', '',d)}"
 
 inherit toradex-kernel-localversion
-LINUX_VERSION = "5.15.40"
+LINUX_VERSION = "5.15.77"
 # skip, as with use-head-next LINUX_VERSION might be set wrongly
 KERNEL_VERSION_SANITY_SKIP:use-head-next = "1"
 
 # Make sure to override LOCALVERSION in linux-imx.inc
 LOCALVERSION = "-${TDX_VERSION}"
 
-SRCBRANCH = "toradex_5.15-2.0.x-imx"
-SRCREV_machine = "b4f7c3c44d8543d5c62b55fa2e23da8743471044"
+SRCBRANCH = "toradex_5.15-2.1.x-imx"
+SRCREV_machine = "0c0607dd1d0758c9444791c77a8c09158328cb4a"
 SRCREV_machine:use-head-next = "${AUTOREV}"
 
 DEPENDS += "bc-native"
@@ -42,10 +42,12 @@ export DTC_FLAGS = "-@"
 MIRRORS:append:preempt-rt = "${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.15/older/ ${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.15/"
 SRC_URI:append:preempt-rt = " \
     file://0001-Revert-Revert-ARM-9113-1-uaccess-remove-set_fs-imple.patch \
-    ${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.15/older/patch-5.15.40-rt43.patch.xz;name=rt-patch \
-    file://0003-Revert-Revert-Revert-ARM-9113-1-uaccess-remove-set_f.patch \
+    file://0002-arch-arm-Kconfig-prepare-for-rt-patch.patch \
+    ${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.15/older/patch-5.15.76-rt53.patch.xz;name=rt-patch \
+    file://0004-Revert-arch-arm-Kconfig-prepare-for-rt-patch.patch \
+    file://0005-Revert-Revert-Revert-ARM-9113-1-uaccess-remove-set_f.patch \
     file://preempt-rt.scc \
     file://preempt-rt-less-latency.scc \
 "
 
-SRC_URI[rt-patch.sha256sum] = "dc9225c538effa9026def0587fae27344a38dc7581658bbabc739bd6883706d4"
+SRC_URI[rt-patch.sha256sum] = "737fc31835e774fe970e7eb9c799df55393bd21e6d5a0136cd5e63fe154805c2"