From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Date: Mon, 27 May 2024 12:55:04 +0000 (+0200)
Subject: arm64: defconfig: enable SHM Bridge support for the TZ memory allocator
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f5a27053293fa027349f8fdfe81b314cc709158a;p=users%2Fjedix%2Flinux-maple.git

arm64: defconfig: enable SHM Bridge support for the TZ memory allocator

Enable SHM Bridge support in the Qualcomm TrustZone allocator by default
as even on architectures that don't support it, we automatically fall
back to the generic allocator.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Tested-by: Andrew Halaney <ahalaney@redhat.com> # sc8280xp-lenovo-thinkpad-x13s
Tested-by: Deepti Jaggi <quic_djaggi@quicinc.com> #sa8775p-ride
Reviewed-by: Elliot Berman <quic_eberman@quicinc.com>
Link: https://lore.kernel.org/r/20240527-shm-bridge-v10-14-ce7afaa58d3a@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
---

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 7825075517eca..ed8da3adb6b0a 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -256,6 +256,7 @@ CONFIG_GOOGLE_CBMEM=m
 CONFIG_GOOGLE_COREBOOT_TABLE=m
 CONFIG_EFI_CAPSULE_LOADER=y
 CONFIG_IMX_SCU=y
+CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE=y
 CONFIG_QCOM_QSEECOM=y
 CONFIG_QCOM_QSEECOM_UEFISECAPP=y
 CONFIG_GNSS=m