From 49ae695482020a9637d419b1e0279ef5520fd247 Mon Sep 17 00:00:00 2001
From: Stefan Hansson <newbyte@postmarketos.org>
Date: Tue, 30 Jul 2024 12:26:02 +0200
Subject: [PATCH] linux-purism-librem5: enable zstd firmware compression
 support (MR 5402)

See https://gitlab.com/postmarketOS/pmaports/-/merge_requests/5380

[ci:skip-build]: already built successfully in CI
---
 device/main/linux-purism-librem5/APKBUILD          |  4 ++--
 .../config-purism-librem5.aarch64                  | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/device/main/linux-purism-librem5/APKBUILD b/device/main/linux-purism-librem5/APKBUILD
index a9981da93..9fe921f80 100644
--- a/device/main/linux-purism-librem5/APKBUILD
+++ b/device/main/linux-purism-librem5/APKBUILD
@@ -4,7 +4,7 @@
 # Contributor: Clayton Craft <clayton@craftyguy.net>
 pkgname=linux-purism-librem5
 pkgver=6.6.40
-pkgrel=0
+pkgrel=1
 # NOTE: Don't forget to rebase the config! See prepare() for instructions.
 _purismrel=2
 # <kernel ver>.<purism kernel release>
@@ -90,5 +90,5 @@ package() {
 
 sha512sums="
 b16f6d040024d826d4ac7a33ad23137fafbf1ac7ac8adeef3fd80a80dc308b70cf572de6e4a451eb607b1d18ad58c03493108c7a1ff9b26fa2bd03a475002903  linux-purism-librem5-6.6.40pureos2.tar.gz
-9aca7d47b5847f1743a5c43bb7b9505ee17180652f32a4787c0f0bf66398097149af0b6b91a6276e709c9e0a14e3a57096a595599e296e1dca3403200b54d0f0  config-purism-librem5.aarch64
+2982f5950820153cef5167b2cfebff7310b682266fda67fa370cebb8b6a93877f331a0f0877b127fc5ad186a72c9e6ed8b181ceeb6eb9ce74a56a4e9e4805ad2  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 ab0dd2537..3cd18eae2 100644
--- a/device/main/linux-purism-librem5/config-purism-librem5.aarch64
+++ b/device/main/linux-purism-librem5/config-purism-librem5.aarch64
@@ -483,7 +483,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
@@ -496,7 +496,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
 
 #
@@ -507,7 +507,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
 
 #
@@ -620,6 +620,7 @@ CONFIG_CPU_MITIGATIONS=y
 #
 # General architecture-dependent options
 #
+CONFIG_ARCH_HAS_SUBPAGE_FAULTS=y
 CONFIG_HOTPLUG_CORE_SYNC=y
 CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
 CONFIG_KPROBES=y
@@ -936,6 +937,8 @@ CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_ARCH_HAS_ZONE_DMA_SET=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
@@ -1779,7 +1782,9 @@ CONFIG_FW_LOADER=y
 CONFIG_FW_LOADER_DEBUG=y
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_FW_LOADER_USER_HELPER is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_COMPRESS=y
+# CONFIG_FW_LOADER_COMPRESS_XZ is not set
+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
 CONFIG_FW_CACHE=y
 # CONFIG_FW_UPLOAD is not set
 # end of Firmware loader
@@ -7891,6 +7896,7 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=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