RK3588 edge kernel: Add support for Linux 6.10 + introduce stable current branch (6.8)

config/kernel/linux-rockchip-rk3588-edge.config → config/kernel/linux-rockchip-rk3588-6.8.config

@@ -2,14 +2,14 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 6.8.12 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 13.2.0-23ubuntu4) 13.2.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=110400
+CONFIG_GCC_VERSION=130200
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23800
+CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23800
+CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
@@ -441,6 +441,7 @@ CONFIG_HZ=300
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
+CONFIG_CC_HAVE_SHADOW_CALL_STACK=y
 CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_ARCH_SUPPORTS_KEXEC=y
@@ -764,6 +765,8 @@ CONFIG_HAVE_ARCH_STACKLEAK=y
 CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_ARCH_SUPPORTS_SHADOW_CALL_STACK=y
+# CONFIG_SHADOW_CALL_STACK is not set
 CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
 CONFIG_LTO_NONE=y
@@ -10042,7 +10045,12 @@ CONFIG_LSM="lockdown,yama,integrity,apparmor"
 #
 # Memory initialization
 #
+CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y
+CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y
+CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
 CONFIG_INIT_STACK_NONE=y
+# CONFIG_INIT_STACK_ALL_PATTERN is not set
+# CONFIG_INIT_STACK_ALL_ZERO is not set
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
@@ -10805,6 +10813,7 @@ CONFIG_FUNCTION_ERROR_INJECTION=y
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
 CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_DHRY is not set
 # CONFIG_LKDTM is not set

config/sources/families/rockchip-rk3588.conf

@@ -39,22 +39,31 @@ case $BRANCH in
  LINUXFAMILY=rk35xx
  ;;
 
+ current)
+ # Branch based on a stable kernel release (will stay on the next LTS kernel release once released, 6.12? LTS)
+ LINUXFAMILY=rockchip-rk3588
+ KERNEL_MAJOR_MINOR="6.8" # Major and minor versions of this kernel.
+ LINUXCONFIG="linux-rockchip-rk3588-${KERNEL_MAJOR_MINOR}" # Attention: not -${BRANCH} (edge/current/legacy), but -${KERNEL_MAJOR_MINOR} thus 6.6 / 6.12 etc
+ # No need to set KERNELPATCHDIR, since default is: KERNELPATCHDIR='archive/rockchip-rk3588-${KERNEL_MAJOR_MINOR}'
+ ;;
+
  edge)
+ # Branch based on the latest kernel release including RC releases, to benefit from the latest RK3588 mainline advancements. Might be unstable!
  LINUXFAMILY=rockchip-rk3588
- LINUXCONFIG='linux-rockchip-rk3588-'$BRANCH
- KERNEL_MAJOR_MINOR="6.8" # Major and minor versions of this kernel.
- KERNELPATCHDIR='rockchip-rk3588-edge'
+ KERNEL_MAJOR_MINOR="6.10" # Major and minor versions of this kernel.
+ LINUXCONFIG="linux-rockchip-rk3588-${KERNEL_MAJOR_MINOR}" # Attention: not -${BRANCH} (edge/current/legacy), but -${KERNEL_MAJOR_MINOR} thus 6.8 / 6.10 etc
+ # No need to set KERNELPATCHDIR, since default is: KERNELPATCHDIR='archive/rockchip-rk3588-${KERNEL_MAJOR_MINOR}'
  ;;
 
  collabora)
  # Collabora's rk3588, where the action is these days
  LINUXFAMILY=rockchip-rk3588
  LINUXCONFIG='linux-rockchip-rk3588-'$BRANCH
  KERNEL_MAJOR_MINOR="6.9" # Major and minor versions of this kernel.
- KERNELPATCHDIR='rockchip-rk3588-collabora'
- KERNELSOURCE='https://gitlab.collabora.com/hardware-enablement/rockchip-3588/linux.git'
- KERNELBRANCH='branch:rk3588-v6.9' # Rolling kernel branch, will be rebased
- KERNEL_DRIVERS_SKIP+=(driver_rtw88) # This is a custom kernel, while the rtw88 driver patching expects pure mainline
+ KERNELPATCHDIR='rockchip-rk3588-collabora' # Try to keep this as empty as possible. We won't work on top of Collabora's branch, they rebase all the time. New DTs are ok.
+ KERNELSOURCE='https://gitlab.collabora.com/hardware-enablement/rockchip-3588/linux.git' # Directly from Collabora...
+ KERNELBRANCH='branch:rk3588-v6.9' # Rolling kernel branch, will be rebased
+ KERNEL_DRIVERS_SKIP+=(driver_rtw88) # This is a custom kernel, while the rtw88 driver patching expects pure mainline
  ;;
 esac
 

config/sources/mainline-kernel.conf.sh

@@ -8,7 +8,7 @@
 function mainline_kernel_decide_version__upstream_release_candidate_number() {
  [[ -n "${KERNELBRANCH}" ]] && return 0 # if already set, don't touch it; that way other hooks can run in any order
  if [[ "${KERNEL_MAJOR_MINOR}" == "6.10" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released
- declare -g KERNELBRANCH="tag:v6.10-rc1"
+ declare -g KERNELBRANCH="tag:v6.10-rc3"
  display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info"
  fi
 }

patch/kernel/archive/rockchip-rk3588-6.10/0000.patching_config.yaml

@@ -0,0 +1,47 @@
+config: # This is file 'patch/kernel/rockchip-rk3588-edge/0000.patching_config.yaml'
+
+ # PATCH NUMBERING INFO
+ #
+ # Patches should be ordered in such a way that general kernel patches are applied first, then SoC-related patches and at last board-specific patches
+ #
+ # Patch numbers in this folder are sorted by category:
+ #
+ # 000* for general patches
+ # 01** for GPU/HDMI related patches
+ # 08** for wireless patches
+ # 1*** for board specific patches:
+ # 101* for Rock-5B, 102* for Rock-5A and so on
+
+ # Just some info stuff; not used by the patching scripts
+ name: rockchip-rk3588-edge
+ kind: kernel
+ type: mainline # or: vendor
+ branch: linux-6.10.y
+ last-known-good-tag: v6.10-rc2
+ maintainers:
+ - { github: rpardini, name: Ricardo Pardini, email: [email protected], armbian-forum: rpardini }
+
+ # .dts files in these directories will be copied as-is to the build tree; later ones overwrite earlier ones.
+ # This is meant to provide a way to "add a board DTS" without having to null-patch them in.
+ dts-directories:
+ - { source: "dt", target: "arch/arm64/boot/dts/rockchip" }
+
+ # every file in these directories will be copied as-is to the build tree; later ones overwrite earlier ones
+ # This is meant as a way to have overlays, bare, in a directory, without having to null-patch them in.
+ # @TODO need a solution to auto-Makefile the overlays as well
+ overlay-directories:
+ - { source: "overlay", target: "arch/arm64/boot/dts/rockchip/overlay" }
+
+ # the Makefile in each of these directories will be magically patched to include the dts files copied
+ # or patched-in; overlay subdir will be included "-y" if it exists.
+ # No more Makefile patching needed, yay!
+ auto-patch-dt-makefile:
+ - { directory: "arch/arm64/boot/dts/rockchip", config-var: "CONFIG_ARCH_ROCKCHIP" }
+
+ # configuration for when applying patches to git / auto-rewriting patches (development cycle helpers)
+ patches-to-git:
+ do-not-commit-files:
+ - "MAINTAINERS" # constant churn, drop them. sorry.
+ - "Documentation/devicetree/bindings/arm/rockchip.yaml" # constant churn, conflicts on every bump, drop it. sorry.
+ do-not-commit-regexes: # Python-style regexes
+ - "^arch/([a-zA-Z0-9]+)/boot/dts/([a-zA-Z0-9]+)/Makefile$" # ignore DT Makefile patches, we've an auto-patcher now

patch/kernel/archive/rockchip-rk3588-6.10/0001-general-add-overlay-support.patch

@@ -0,0 +1,69 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Paolo Sabatino <[email protected]>
+Date: Sun, 2 Jun 2024 21:53:01 +0200
+Subject: compile .scr and install overlays in right path
+
+---
+ scripts/Makefile.dtbinst | 13 +++++++++-
+ scripts/Makefile.lib | 8 +++++-
+ 2 files changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
+index 111111111111..222222222222 100644
+--- a/scripts/Makefile.dtbinst
++++ b/scripts/Makefile.dtbinst
+@@ -33,7 +33,18 @@ endef
+
+ $(foreach d, $(sort $(dir $(dtbs))), $(eval $(call gen_install_rules,$(d))))
+
+-dtbs := $(notdir $(dtbs))
++# Very convoluted way to flatten all the device tree
++# directories, but keep the "/overlay/" directory
++
++# topmost directory (ie: from rockchip/overlay/rk322x-emmc.dtbo extracts rockchip)
++topmost_dir = $(firstword $(subst /, ,$(dtbs)))
++# collect dtbs entries which starts with "$topmost_dir/overlay/", then remove "$topmost_dir"
++dtbs_overlays = $(subst $(topmost_dir)/,,$(filter $(topmost_dir)/overlay/%, $(dtbs)))
++# collect the non-overlay dtbs
++dtbs_regular = $(filter-out $(topmost_dir)/overlay/%, $(dtbs))
++# compose the dtbs variable flattening all the non-overlays entries
++# and appending the overlays entries
++dtbs := $(notdir $(dtbs_regular)) $(dtbs_overlays)
+
+ endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL
+
+diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
+index 111111111111..222222222222 100644
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -402,7 +402,7 @@ $(obj)/%.dtbo.S: $(obj)/%.dtbo FORCE
+
+ quiet_cmd_dtc = DTC $@
+ cmd_dtc = $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
+- $(DTC) -o $@ -b 0 \
++ $(DTC) -@ -o $@ -b 0 \
+ $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \
+ -d $(depfile).dtc.tmp $(dtc-tmp) ; \
+ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
+@@ -427,12 +427,18 @@ quiet_cmd_dtb = $(quiet_cmd_dtc)
+ cmd_dtb = $(cmd_dtc)
+ endif
+
++quiet_cmd_scr = MKIMAGE $@
++cmd_scr = mkimage -C none -A $(ARCH) -T script -d $< $@
++
+ $(obj)/%.dtb: $(obj)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE
+ $(call if_changed_dep,dtb)
+
+ $(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE
+ $(call if_changed_dep,dtc)
+
++$(obj)/%.scr: $(src)/%.scr-cmd FORCE
++ $(call if_changed,scr)
++
+ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
+
+ # Bzip2
+-- 
+Armbian
+

patch/kernel/rockchip-rk3588-edge/0010-fix-clk-divisions.patch → patch/kernel/archive/rockchip-rk3588-6.10/0010-fix-clk-divisions.patch

@@ -12,7 +12,7 @@ Signed-off-by: Sebastian Reichel <[email protected]>
  1 file changed, 11 insertions(+)
 
 diff --git a/include/linux/math.h b/include/linux/math.h
-index dd4152711de7..f80bfb375ab9 100644
+index 111111111111..222222222222 100644
 --- a/include/linux/math.h
 +++ b/include/linux/math.h
 @@ -36,6 +36,17 @@
@@ -67,7 +67,7 @@ Signed-off-by: Sebastian Reichel <[email protected]>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
-index a2c2b5203b0a..94b4fb66a60f 100644
+index 111111111111..222222222222 100644
 --- a/drivers/clk/clk-divider.c
 +++ b/drivers/clk/clk-divider.c
 @@ -220,7 +220,7 @@ static int _div_round_up(const struct clk_div_table *table,
@@ -114,7 +114,7 @@ Signed-off-by: Sebastian Reichel <[email protected]>
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
-index 66759fe28fad..478a4e594336 100644
+index 111111111111..222222222222 100644
 --- a/drivers/clk/clk-composite.c
 +++ b/drivers/clk/clk-composite.c
 @@ -6,6 +6,7 @@