From 768f244d9bba3fbbf545aa62168cb19ae0e85ced Mon Sep 17 00:00:00 2001
From: sydarn <sydarn@proton.me>
Date: Fri, 13 Feb 2026 17:54:18 +0100
Subject: [PATCH] rk3566: mali kernel work

---
 .../devices/RK3566/linux/linux.aarch64.conf   | 31 +++++++++++++------
 .../patches/linux/0666-cma-region.patch       | 18 +++++++++++
 .../linux-drivers/mali-bifrost/package.mk     |  4 +--
 3 files changed, 42 insertions(+), 11 deletions(-)
 create mode 100644 projects/ROCKNIX/devices/RK3566/patches/linux/0666-cma-region.patch

diff --git a/projects/ROCKNIX/devices/RK3566/linux/linux.aarch64.conf b/projects/ROCKNIX/devices/RK3566/linux/linux.aarch64.conf
index ba2973dccd..e6c8675937 100644
--- a/projects/ROCKNIX/devices/RK3566/linux/linux.aarch64.conf
+++ b/projects/ROCKNIX/devices/RK3566/linux/linux.aarch64.conf
@@ -11,8 +11,8 @@ CONFIG_AS_VERSION=24400
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=24400
 CONFIG_LLD_VERSION=0
-CONFIG_RUSTC_VERSION=109300
-CONFIG_RUSTC_LLVM_VERSION=210108
+CONFIG_RUSTC_VERSION=0
+CONFIG_RUSTC_LLVM_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
@@ -21,12 +21,7 @@ CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_ASSUME=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
-CONFIG_RUSTC_HAS_COERCE_POINTEE=y
-CONFIG_RUSTC_HAS_SPAN_FILE=y
-CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES=y
-CONFIG_RUSTC_HAS_FILE_WITH_NUL=y
-CONFIG_RUSTC_HAS_FILE_AS_C_STR=y
-CONFIG_PAHOLE_VERSION=0
+CONFIG_PAHOLE_VERSION=131
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -930,6 +925,7 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_GUP_FAST=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
+CONFIG_MEMORY_ISOLATION=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 # CONFIG_MEMORY_HOTPLUG is not set
@@ -942,6 +938,7 @@ CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
 # CONFIG_PAGE_REPORTING is not set
 CONFIG_MIGRATION=y
 CONFIG_ARCH_ENABLE_THP_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
 CONFIG_PCP_BATCH_SCALE_MAX=5
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_KSM=y
@@ -962,7 +959,10 @@ CONFIG_PAGE_MAPCOUNT=y
 CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
 CONFIG_ARCH_SUPPORTS_HUGE_PFNMAP=y
 CONFIG_ARCH_SUPPORTS_PMD_PFNMAP=y
-# CONFIG_CMA is not set
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUGFS is not set
+# CONFIG_CMA_SYSFS is not set
+CONFIG_CMA_AREAS=8
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
@@ -5651,6 +5651,8 @@ CONFIG_UDMABUF=y
 CONFIG_DMABUF_HEAPS=y
 # CONFIG_DMABUF_SYSFS_STATS is not set
 CONFIG_DMABUF_HEAPS_SYSTEM=y
+CONFIG_DMABUF_HEAPS_CMA=y
+CONFIG_DMABUF_HEAPS_CMA_LEGACY=y
 # end of DMABUF options
 
 # CONFIG_UIO is not set
@@ -7387,6 +7389,17 @@ CONFIG_DMA_NEED_SYNC=y
 CONFIG_DMA_NONCOHERENT_MMAP=y
 CONFIG_DMA_COHERENT_POOL=y
 CONFIG_DMA_DIRECT_REMAP=y
+CONFIG_DMA_CMA=y
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=128
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
 CONFIG_SGL_ALLOC=y
diff --git a/projects/ROCKNIX/devices/RK3566/patches/linux/0666-cma-region.patch b/projects/ROCKNIX/devices/RK3566/patches/linux/0666-cma-region.patch
new file mode 100644
index 0000000000..cf6025ae3f
--- /dev/null
+++ b/projects/ROCKNIX/devices/RK3566/patches/linux/0666-cma-region.patch
@@ -0,0 +1,18 @@
+diff --git a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi b/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
+index fd2214b6fad4..6863f5af526d 100644
+--- a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
+@@ -184,6 +184,13 @@ scmi_shmem: shmem@10f000 {
+ 			reg = <0x0 0x0010f000 0x0 0x100>;
+ 			no-map;
+ 		};
++        linux,cma {
++			compatible = "shared-dma-pool";
++			reusable;
++			size = <0x0 0x10000000>;
++			alignment = <0x0 0x400000>;
++			linux,cma-default;
++		};
+ 	};
+ 
+ 	timer {
diff --git a/projects/ROCKNIX/packages/linux-drivers/mali-bifrost/package.mk b/projects/ROCKNIX/packages/linux-drivers/mali-bifrost/package.mk
index 2147b2256b..552b912fab 100644
--- a/projects/ROCKNIX/packages/linux-drivers/mali-bifrost/package.mk
+++ b/projects/ROCKNIX/packages/linux-drivers/mali-bifrost/package.mk
@@ -15,8 +15,8 @@ case ${DEVICE} in
   PKG_PATCH_DIRS+=" 6.12-LTS"
   ;;
   *)
-  PKG_VERSION="f86d3dd4923b5d5de11ae7eaf7a6c4fee136528e"
-  PKG_URL="http://github.com/ROCKNIX/mali_kbase/archive/${PKG_VERSION}.tar.gz"
+  PKG_VERSION="b1405e8f82d26381ce94d79e47586531ea7a54db"
+  PKG_URL="http://github.com/rocknix/mali_kbase/archive/${PKG_VERSION}.tar.gz"
   ;;
 esac