From cc7fd734f36de3f8f59a97c4fc5bdb1d052c4141 Mon Sep 17 00:00:00 2001 From: Aster Boese Date: Thu, 28 May 2026 18:24:45 +0200 Subject: [PATCH] linux-postmarketos-qcom-sdm845: enable in-kernel pd-mapper The in-kernel pd-mapper was disabled with https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6032 to work around an issue with call audio on xiaomi-beryllium and oneplus-enchilada. With the pending removal of the userspace pd-mapper from Alpine, the in-kernel pd-mapper must be used. Signed-off-by: Aster Boese Part-of: --- .../linux-postmarketos-qcom-sdm845/APKBUILD | 4 ++-- .../config-postmarketos-qcom-sdm845.aarch64 | 5 ++-- .../pmos.config | 1 + .../sdm845.config | 24 ++++++++----------- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/device/community/linux-postmarketos-qcom-sdm845/APKBUILD b/device/community/linux-postmarketos-qcom-sdm845/APKBUILD index 242062761..c45537f01 100644 --- a/device/community/linux-postmarketos-qcom-sdm845/APKBUILD +++ b/device/community/linux-postmarketos-qcom-sdm845/APKBUILD @@ -5,7 +5,7 @@ maintainer="Casey Connolly " _flavor="postmarketos-qcom-sdm845" pkgname=linux-$_flavor pkgver=7.1_rc1 -pkgrel=1 +pkgrel=2 pkgdesc="Mainline Kernel fork for SDM845 devices" arch="aarch64" _carch="arm64" @@ -84,5 +84,5 @@ package() { sha512sums=" 94da173aaf74dd33ef8ff9015e92759481cd0da5bd8a1e52c8664fd372d48a1155655001ad2e9d26557733c71ae8bc448e4ebdf1372b8f32159907a35f0306a9 linux-sdm845-7.1-rc1-r0.tar.gz -36d173adc2e9225cfa110ddb6775cd5fc24c4712b469df06d61d4d095f0af5ea1e062ac88f951a5d27715389b109ed7bf17a23e207d3d7fe5a69d2eb277d24cd config-postmarketos-qcom-sdm845.aarch64 +1a06ce39a35dc9dbcae82410f71cfbc8f705411bfdd23560eabb61a44ab6ddeee7d54422e6351f0d918cce77d101b9f2d952d65dd25e29aa388b848492714ec0 config-postmarketos-qcom-sdm845.aarch64 " diff --git a/device/community/linux-postmarketos-qcom-sdm845/config-postmarketos-qcom-sdm845.aarch64 b/device/community/linux-postmarketos-qcom-sdm845/config-postmarketos-qcom-sdm845.aarch64 index c5919dc06..6727e1ef3 100644 --- a/device/community/linux-postmarketos-qcom-sdm845/config-postmarketos-qcom-sdm845.aarch64 +++ b/device/community/linux-postmarketos-qcom-sdm845/config-postmarketos-qcom-sdm845.aarch64 @@ -14,6 +14,7 @@ CONFIG_LLD_VERSION=220103 CONFIG_RUSTC_VERSION=0 CONFIG_RUSTC_LLVM_VERSION=0 CONFIG_RUSTC_LLVM_MAJOR_VERSION=0 +CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_TOOLS_SUPPORT_RELR=y @@ -7406,7 +7407,7 @@ CONFIG_QCOM_LLCC=y CONFIG_QCOM_KRYO_L2_ACCESSORS=y CONFIG_QCOM_MDT_LOADER=y CONFIG_QCOM_OCMEM=y -# CONFIG_QCOM_PD_MAPPER is not set +CONFIG_QCOM_PD_MAPPER=m CONFIG_QCOM_PDR_HELPERS=y CONFIG_QCOM_PDR_MSG=y # CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set @@ -8815,7 +8816,7 @@ CONFIG_SECURITYFS=y # 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 diff --git a/device/community/linux-postmarketos-qcom-sdm845/pmos.config b/device/community/linux-postmarketos-qcom-sdm845/pmos.config index 2774659fc..123877cdf 100644 --- a/device/community/linux-postmarketos-qcom-sdm845/pmos.config +++ b/device/community/linux-postmarketos-qcom-sdm845/pmos.config @@ -476,6 +476,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 diff --git a/device/community/linux-postmarketos-qcom-sdm845/sdm845.config b/device/community/linux-postmarketos-qcom-sdm845/sdm845.config index de2f3aa42..6dcc2b911 100644 --- a/device/community/linux-postmarketos-qcom-sdm845/sdm845.config +++ b/device/community/linux-postmarketos-qcom-sdm845/sdm845.config @@ -4,11 +4,6 @@ CONFIG_LOCALVERSION="-sdm845" # Needed everywhere CONFIG_GPIO_SHARED_PROXY=y -# This introduces some weird race conditions. Stick to the -# userspace one for now (6.13). still seem to happen in 7.1rc1. -# makes mic not working in poco f1. no idea why. -CONFIG_QCOM_PD_MAPPER=n - # OnePlus 6 CONFIG_DRM_PANEL_SAMSUNG_SOFEF00=y CONFIG_BATTERY_BQ27XXX=m @@ -77,24 +72,25 @@ CONFIG_QCOM_WDT=y CONFIG_SPI_QCOM_GENI=y # SOC +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_I2C_QCOM_GENI=y +CONFIG_INTERCONNECT_QCOM_OSM_L3=y CONFIG_NR_CPUS=8 -CONFIG_SCSI_UFS_QCOM=y +CONFIG_PHY_QCOM_QMP_PCIE=y +CONFIG_POWER_RESET_QCOM_PON=y +CONFIG_QCOM_APR=y CONFIG_QCOM_GSBI=y CONFIG_QCOM_LLCC=y +CONFIG_QCOM_LMH=y CONFIG_QCOM_OCMEM=y +CONFIG_QCOM_PD_MAPPER=m CONFIG_QCOM_RMTFS_MEM=y CONFIG_QCOM_SOCINFO=y -CONFIG_QCOM_WCNSS_CTRL=y -CONFIG_QCOM_APR=y -CONFIG_POWER_RESET_QCOM_PON=y CONFIG_QCOM_SPMI_TEMP_ALARM=y -CONFIG_QCOM_LMH=y +CONFIG_QCOM_WCNSS_CTRL=y CONFIG_SCHED_CLUSTER=y +CONFIG_SCSI_UFS_QCOM=y CONFIG_SND_SOC_QDSP6_Q6VOICE=m -CONFIG_PHY_QCOM_QMP_PCIE=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_INTERCONNECT_QCOM_OSM_L3=y -CONFIG_I2C_QCOM_GENI=y # Remoteproc CONFIG_SLIMBUS=y