From 53ca7c81f226ce2c0260dddc35b8bbef4b38ceec Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Tue, 6 Feb 2024 14:03:53 +0100
Subject: [PATCH] linux-purism-librem5: enable new community kconfig options
 (MR 4795)

[ci:skip-build] # too many packages
---
 device/main/linux-purism-librem5/APKBUILD      |  4 ++--
 .../config-purism-librem5.aarch64              | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/device/main/linux-purism-librem5/APKBUILD b/device/main/linux-purism-librem5/APKBUILD
index e869fdb13..c094298a0 100644
--- a/device/main/linux-purism-librem5/APKBUILD
+++ b/device/main/linux-purism-librem5/APKBUILD
@@ -4,7 +4,7 @@
 # Co-Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=linux-purism-librem5
 pkgver=6.6.13
-pkgrel=0
+pkgrel=1
 # NOTE: Don't forget to rebase the config! See prepare() for instructions.
 _purismrel=1
 # <kernel ver>.<purism kernel release>
@@ -84,5 +84,5 @@ package() {
 
 sha512sums="
 83f4329cdf2c8d31386a9ff12ac054341345bf6c889c711d69ab5be6d2ea013a9769d72594ffd0dca55890673dec091c549eb36bbd7f1831661b398252c453c7  linux-purism-librem5-6.6.13pureos1.tar.gz
-336bbf465a5ed51147722bea843393ad3581700ab2ed3e4dfc019e8150e75aa82d2c1695d9379497f92cd0141deceb92680d08750462b7b40872dd6e4cb5ed3a  config-purism-librem5.aarch64
+f6f5fb894d94d2bba66bf0976f97d7d4e36e36c746531e21c1cc262627625e3929c5ee47f6cac58deb0f8b3bc76043c8f3ca715f45d44c3c297505df2b42b2e9  config-purism-librem5.aarch64
 "
diff --git a/device/main/linux-purism-librem5/config-purism-librem5.aarch64 b/device/main/linux-purism-librem5/config-purism-librem5.aarch64
index fae70ddd8..d9e4128ba 100644
--- a/device/main/linux-purism-librem5/config-purism-librem5.aarch64
+++ b/device/main/linux-purism-librem5/config-purism-librem5.aarch64
@@ -165,7 +165,8 @@ CONFIG_GENERIC_SCHED_CLOCK=y
 #
 # Scheduler features
 #
-# CONFIG_UCLAMP_TASK is not set
+CONFIG_UCLAMP_TASK=y
+CONFIG_UCLAMP_BUCKETS_COUNT=5
 # end of Scheduler features
 
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
@@ -187,6 +188,7 @@ CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_SCHED_MM_CID=y
+CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
 # CONFIG_CGROUP_RDMA is not set
 CONFIG_CGROUP_FREEZER=y
@@ -475,7 +477,7 @@ CONFIG_ARM64_CNP=y
 # ARMv8.3 architectural features
 #
 CONFIG_ARM64_PTR_AUTH=y
-# CONFIG_ARM64_PTR_AUTH_KERNEL is not set
+CONFIG_ARM64_PTR_AUTH_KERNEL=y
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y
 CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
 CONFIG_AS_HAS_ARMV8_3=y
@@ -488,7 +490,7 @@ CONFIG_AS_HAS_LDAPR=y
 #
 CONFIG_ARM64_AMU_EXTN=y
 CONFIG_AS_HAS_ARMV8_4=y
-# CONFIG_ARM64_TLB_RANGE is not set
+CONFIG_ARM64_TLB_RANGE=y
 # end of ARMv8.4 architectural features
 
 #
@@ -499,7 +501,7 @@ CONFIG_ARM64_BTI=y
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
 CONFIG_ARM64_E0PD=y
 CONFIG_ARM64_AS_HAS_MTE=y
-# CONFIG_ARM64_MTE is not set
+CONFIG_ARM64_MTE=y
 # end of ARMv8.5 architectural features
 
 #
@@ -536,7 +538,9 @@ CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_AUTOSLEEP is not set
 # CONFIG_PM_USERSPACE_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
 CONFIG_PM=y
 CONFIG_PM_DEBUG=y
 # CONFIG_PM_ADVANCED_DEBUG is not set
@@ -613,6 +617,7 @@ CONFIG_HAVE_KVM=y
 #
 # General architecture-dependent options
 #
+CONFIG_ARCH_HAS_SUBPAGE_FAULTS=y
 CONFIG_HOTPLUG_CORE_SYNC=y
 CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
 # CONFIG_KPROBES is not set
@@ -925,6 +930,8 @@ CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
 CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA32=y
+CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
+CONFIG_ARCH_USES_PG_ARCH_X=y
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
@@ -7535,6 +7542,7 @@ CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
+CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y
 CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_CC_HAS_KASAN_SW_TAGS=y