From bdbb8009d19798705352cffdecbb82d97f1da380 Mon Sep 17 00:00:00 2001 From: Ferass El Hafidi Date: Wed, 24 Jun 2026 13:42:11 +0000 Subject: [PATCH] linux-postmarketos-amlogic: temporarily disable etnaviv NPU It is causing Wayland to not work and eglinfo to segfault on boards that have their NPU enabled in their devicetree (VIM3, LC Cottonwood). Ideally we should figure out why that is, but for now let's just disable it to buy us some time. Signed-off-by: Ferass El Hafidi Part-of: --- .../linux-postmarketos-amlogic/APKBUILD | 12 ++++--- .../linux-postmarketos-amlogic/amlogic.config | 3 ++ .../config-postmarketos-amlogic.aarch64 | 33 ++++++++++++------- .../linux-postmarketos-amlogic/pmos.config | 8 +++++ 4 files changed, 40 insertions(+), 16 deletions(-) diff --git a/device/testing/linux-postmarketos-amlogic/APKBUILD b/device/testing/linux-postmarketos-amlogic/APKBUILD index 6fc69a962..ead6d70bd 100644 --- a/device/testing/linux-postmarketos-amlogic/APKBUILD +++ b/device/testing/linux-postmarketos-amlogic/APKBUILD @@ -4,7 +4,7 @@ maintainer="Ferass El Hafidi " pkgname=linux-postmarketos-amlogic pkgver=6.18.28 -pkgrel=1 +pkgrel=2 pkgdesc="Mainline kernel for Amlogic devices" arch="aarch64" _carch="arm64" @@ -20,14 +20,18 @@ makedepends=" bison clang devicepkg-dev + elfutils-dev findutils flex gzip + linux-headers lld llvm openssl-dev + pahole perl postmarketos-installkernel + python3 zstd " _defconfig="defconfig" @@ -88,10 +92,10 @@ package() { sha512sums=" 5acc1a97ae0bca7aeb7fcac04fd3b7bafea5ff976dfe5d42c7015e084d9ee3104c3945880846dfb185a1010d0bad8c7a229b23febdef44306d19fb494a03b1a6 linux-postmarketos-amlogic-6.18.28.tar.xz -40576cd59d1f2f1e7ff3494803fd9eaeade433093f636bfe95f488d9cfc5d790c03444cdc4e5910b8ff241c7df406a345485fd7ac9f1ac94f3f87ab76837c68e config-postmarketos-amlogic.aarch64 -fe81024107a0f2dc5cc86592b0f837cbbdccae13d314fe492d27f39de64e65ab7421002930d9ce534caed4445f05c0536709116a5cf7ef0270fb2be0068190f9 amlogic.config +64f3e77c2cef581bdbbc19dc5029f626c75f706dacfdfe9a3655fb39260751cfae6c2bbe74124075ada207cef103986447cf4c0af70afcd52d8d6d8937814cb8 config-postmarketos-amlogic.aarch64 +3eda7524a4c2cf8bd5fd2105c1971f729a3423a0c5ca2e041c9707b5e12fb0e2fc421ac99a3adf19a2555bacb12354851811eb6817a8c1ef1ae735f8043ec234 amlogic.config 94f07500f17c89d8446082227a157c4bc6a0e79cca87ac9d3112d9ef50f804eac66a3849a94c8e56ba11df1aabfd2d58d7beeae0f516a2b3584219fb5d8b0474 misc.config -f1dc7f39c06383f18266e73dd06b4efb30e6c490edd09d80f7fd7da363fe6323450c406da98ff51a0219044f49e6363b63e5094b72848ba435d6bd16ff2338b7 pmos.config +ba0dbc8fd2355818381d0c719831a9fdd933d875e1bd9b42148666a113dcefbf741521843d25c12c5e4f3277dead1409bfcb9b2da9a5a2c5876c6612f8a9dbc4 pmos.config 4538994c7d3bbb0c4740e8ce108b6838618be239a549e407ca239f3ceca8eed29b5a9ca75d162567dbc06b13ac7caacc61ebf55b247ce6fe122fecc7e5b275d5 0001-add-x96-mini-support.patch 222e7c12dbeb931f325b7d4a306c2f1e835992b5503ba3ab387a0b006e0fb2226291d93f32aec8ac7b2f6cf15704f20ef3285bb9bafe7374b11a034639d786ef 0002-add-initial-support-for-zte-b860hv5.patch f1a3f10c67f491758bbaa2922b3acc84e2abee432ae22a39cb4081c9cea71792c5c740c57df93740e4b9756755e0e32583d23a93485933aeddb01c1d85eb4ccc 0007-meson-g12b-bananapi-cm4-mnt-reform2.dts-fix-audio-an.patch diff --git a/device/testing/linux-postmarketos-amlogic/amlogic.config b/device/testing/linux-postmarketos-amlogic/amlogic.config index 2b5243ae3..25b147322 100644 --- a/device/testing/linux-postmarketos-amlogic/amlogic.config +++ b/device/testing/linux-postmarketos-amlogic/amlogic.config @@ -96,3 +96,6 @@ CONFIG_NVMEM_MESON_EFUSE=m # CONFIG_NVMEM_MESON_MX_EFUSE is not set CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set + +# temporarily disable etnaviv NPU (breaks wayland) +CONFIG_DRM_ETNAVIV=n diff --git a/device/testing/linux-postmarketos-amlogic/config-postmarketos-amlogic.aarch64 b/device/testing/linux-postmarketos-amlogic/config-postmarketos-amlogic.aarch64 index f45014fdf..636baa431 100644 --- a/device/testing/linux-postmarketos-amlogic/config-postmarketos-amlogic.aarch64 +++ b/device/testing/linux-postmarketos-amlogic/config-postmarketos-amlogic.aarch64 @@ -2,15 +2,15 @@ # Automatically generated file; DO NOT EDIT. # Linux/arm64 6.18.28 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="Alpine clang version 22.1.3" +CONFIG_CC_VERSION_TEXT="Alpine clang version 22.1.8" CONFIG_GCC_VERSION=0 CONFIG_CC_IS_CLANG=y -CONFIG_CLANG_VERSION=220103 +CONFIG_CLANG_VERSION=220108 CONFIG_AS_IS_LLVM=y -CONFIG_AS_VERSION=220103 +CONFIG_AS_VERSION=220108 CONFIG_LD_VERSION=0 CONFIG_LD_IS_LLD=y -CONFIG_LLD_VERSION=220103 +CONFIG_LLD_VERSION=220108 CONFIG_RUSTC_VERSION=0 CONFIG_RUSTC_LLVM_VERSION=0 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y @@ -22,7 +22,7 @@ CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_CC_HAS_COUNTED_BY=y CONFIG_CC_HAS_MULTIDIMENSIONAL_NONSTRING=y CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y -CONFIG_PAHOLE_VERSION=0 +CONFIG_PAHOLE_VERSION=131 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -117,6 +117,7 @@ CONFIG_PREEMPT_COUNT=y CONFIG_PREEMPTION=y # CONFIG_PREEMPT_DYNAMIC is not set # CONFIG_SCHED_CORE is not set +# CONFIG_SCHED_CLASS_EXT is not set # # CPU/Task time and stats accounting @@ -1568,6 +1569,7 @@ CONFIG_NET_SCH_MQPRIO=m CONFIG_NET_SCH_INGRESS=m # CONFIG_NET_SCH_PLUG is not set # CONFIG_NET_SCH_ETS is not set +# CONFIG_NET_SCH_BPF is not set # CONFIG_NET_SCH_DUALPI2 is not set # CONFIG_NET_SCH_DEFAULT is not set @@ -5767,8 +5769,7 @@ CONFIG_DRM_DW_HDMI_CEC=m CONFIG_DRM_DW_MIPI_DSI=m # end of Display Interface Bridges -CONFIG_DRM_ETNAVIV=m -CONFIG_DRM_ETNAVIV_THERMAL=y +# CONFIG_DRM_ETNAVIV is not set CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_HISI_KIRIN=m # CONFIG_DRM_LOGICVC is not set @@ -9095,13 +9096,13 @@ CONFIG_SECURITY=y CONFIG_HAS_SECURITY_AUDIT=y CONFIG_SECURITYFS=y # CONFIG_SECURITY_NETWORK is not set -# CONFIG_SECURITY_PATH is not set +CONFIG_SECURITY_PATH=y # CONFIG_STATIC_USERMODEHELPER is not set # CONFIG_SECURITY_SMACK is not set # CONFIG_SECURITY_TOMOYO is not set # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_LOADPIN is not set -# CONFIG_SECURITY_YAMA is not set +CONFIG_SECURITY_YAMA=y # CONFIG_SECURITY_SAFESETID is not set # CONFIG_SECURITY_LOCKDOWN_LSM is not set # CONFIG_SECURITY_LANDLOCK is not set @@ -9598,14 +9599,20 @@ CONFIG_DEBUG_MISC=y CONFIG_DEBUG_INFO=y CONFIG_AS_HAS_NON_CONST_ULEB128=y # CONFIG_DEBUG_INFO_NONE is not set -CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y +# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set # CONFIG_DEBUG_INFO_DWARF4 is not set -# CONFIG_DEBUG_INFO_DWARF5 is not set -CONFIG_DEBUG_INFO_REDUCED=y +CONFIG_DEBUG_INFO_DWARF5=y +# CONFIG_DEBUG_INFO_REDUCED is not set CONFIG_DEBUG_INFO_COMPRESSED_NONE=y # CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_SPLIT is not set +CONFIG_DEBUG_INFO_BTF=y +CONFIG_PAHOLE_HAS_SPLIT_BTF=y +CONFIG_PAHOLE_HAS_BTF_TAG=y +CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y +CONFIG_DEBUG_INFO_BTF_MODULES=y +# CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_GDB_SCRIPTS is not set CONFIG_FRAME_WARN=2048 # CONFIG_STRIP_ASM_SYMS is not set @@ -9790,6 +9797,7 @@ CONFIG_FUNCTION_TRACER=y CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_FUNCTION_GRAPH_RETVAL is not set # CONFIG_FUNCTION_GRAPH_RETADDR is not set +CONFIG_FUNCTION_TRACE_ARGS=y CONFIG_DYNAMIC_FTRACE=y CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y # CONFIG_FPROBE is not set @@ -9807,6 +9815,7 @@ CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set # CONFIG_BLK_DEV_IO_TRACE is not set +CONFIG_PROBE_EVENTS_BTF_ARGS=y CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set CONFIG_UPROBE_EVENTS=y diff --git a/device/testing/linux-postmarketos-amlogic/pmos.config b/device/testing/linux-postmarketos-amlogic/pmos.config index fd21f7fa6..efd9301cd 100644 --- a/device/testing/linux-postmarketos-amlogic/pmos.config +++ b/device/testing/linux-postmarketos-amlogic/pmos.config @@ -11,12 +11,14 @@ CONFIG_DM_CRYPT=y CONFIG_FB=y CONFIG_INPUT_EVDEV=m # CONFIG_KINETO_GAN is not set +CONFIG_NLS_ASCII=y # CONFIG_PFT is not set # CONFIG_SEC_RESTRICT_ROOTING is not set CONFIG_SYN_COOKIES=y CONFIG_SYSVIPC=y CONFIG_TMPFS_POSIX_ACL=y # CONFIG_USE_VFB is not set +CONFIG_VFAT_FS=y CONFIG_VT=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_BINFMT_SCRIPT=y @@ -34,6 +36,10 @@ CONFIG_UDMABUF=y CONFIG_BPF=y CONFIG_BPF_JIT=y CONFIG_BPF_LSM=y +CONFIG_DEBUG_INFO_BTF=y +CONFIG_DEBUG_INFO_BTF_MODULES=y +CONFIG_DEBUG_INFO_DWARF5=y +# CONFIG_DEBUG_INFO_REDUCED is not set CONFIG_IPC_NS=y CONFIG_KPROBES=y CONFIG_KPROBE_EVENTS=y @@ -41,6 +47,7 @@ CONFIG_NET_NS=y CONFIG_PID_NS=y CONFIG_SECURITY=y CONFIG_SECURITYFS=y +CONFIG_SECURITY_PATH=y CONFIG_USER_NS=y CONFIG_UTS_NS=y @@ -478,6 +485,7 @@ CONFIG_DM_VERITY=m # hardening CONFIG_SECURITY_DMESG_RESTRICT=y +CONFIG_SECURITY_YAMA=y CONFIG_SHADOW_CALL_STACK=y CONFIG_CFI=y # CONFIG_CFI_PERMISSIVE is not set