From e0fc08d3c03a823dae67e4e5f8b675256cd5d6bf Mon Sep 17 00:00:00 2001 From: Gaurav Kashyap Date: Fri, 11 Nov 2022 16:21:51 -0800 Subject: [PATCH 1/2] soc: qcom: Decouple hwkm and fbe modules Currently HWKM and FBE module compilations are bound to each other, separate this out to remove the dependencies. Change-Id: I7735e14d95f332eff9e5ad7a6de9947e0ce9420d Signed-off-by: Gaurav Kashyap --- drivers/soc/qcom/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile index 53ac28987861..53d161e75c09 100644 --- a/drivers/soc/qcom/Makefile +++ b/drivers/soc/qcom/Makefile @@ -53,9 +53,11 @@ obj-$(CONFIG_MSM_BOOT_STATS) += boot_stats.o obj-$(CONFIG_QCOM_RUN_QUEUE_STATS) += rq_stats.o obj-$(CONFIG_MSM_CORE_HANG_DETECT) += core_hang_detect.o obj-$(CONFIG_QCOM_CPU_VENDOR_HOOKS) += qcom_cpu_vendor_hooks.o -obj-$(CONFIG_QTI_CRYPTO_COMMON) += crypto-qti-common.o -obj-$(CONFIG_QTI_CRYPTO_TZ) += crypto-qti-tz.o -obj-$(CONFIG_QTI_HW_KEY_MANAGER) += hwkm.o crypto-qti-hwkm.o +obj-$(CONFIG_QTI_CRYPTO_COMMON) += crypto-qti.o +crypto-qti-y += crypto-qti-common.o +crypto-qti-$(CONFIG_QTI_CRYPTO_TZ) += crypto-qti-tz.o +crypto-qti-$(CONFIG_QTI_HW_KEY_MANAGER) += crypto-qti-hwkm.o +obj-$(CONFIG_QTI_HW_KEY_MANAGER) += hwkm.o obj-$(CONFIG_MSM_TMECOM_QMP) += tmecom/ obj-$(CONFIG_QCOM_MINIDUMP) += minidump.o minidump-y += msm_minidump.o minidump_log.o From ec5eb04dfe72f0c556c87080ab5bf0487b830332 Mon Sep 17 00:00:00 2001 From: Gaurav Kashyap Date: Fri, 28 Oct 2022 09:43:28 -0700 Subject: [PATCH 2/2] defconfig: pineapple: enable tmecom and hwkm Enable the following modules on pineapple, required to use HWKM operations in TME. CONFIG_MSM_TMECOM_QMP=m CONFIG_QTI_HW_KEY_MANAGER=m. Change-Id: If587bdd8e0c9d351e26c8fccea5807b01d7231b5 Signed-off-by: Gaurav Kashyap --- arch/arm64/configs/vendor/pineapple_GKI.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/configs/vendor/pineapple_GKI.config b/arch/arm64/configs/vendor/pineapple_GKI.config index 171529c7c970..6ff55fe6342e 100644 --- a/arch/arm64/configs/vendor/pineapple_GKI.config +++ b/arch/arm64/configs/vendor/pineapple_GKI.config @@ -66,6 +66,7 @@ CONFIG_MSM_GPI_DMA=m CONFIG_MSM_PERFORMANCE=m CONFIG_MSM_QMP=m CONFIG_MSM_RDBG=m +CONFIG_MSM_TMECOM_QMP=m # CONFIG_NITRO_ENCLAVES is not set CONFIG_NOP_USB_XCEIV=m CONFIG_NVMEM_SPMI_SDAM=m @@ -160,6 +161,7 @@ CONFIG_QTI_BCL_PMIC5=m CONFIG_QTI_BCL_SOC_DRIVER=m CONFIG_QTI_CHARGER_ULOG_GLINK=m CONFIG_QTI_CPUCP_LOG=m +CONFIG_QTI_HW_KEY_MANAGER=m CONFIG_QTI_PMIC_EUSB2_REPEATER=m CONFIG_QTI_PMIC_GLINK=m # CONFIG_QTI_PMIC_GLINK_CLIENT_DEBUG is not set