From 96a81a5204609d760807ab8675d16751eca5eebb Mon Sep 17 00:00:00 2001 From: Abhinav Gupta Date: Wed, 3 May 2023 10:51:23 +0530 Subject: [PATCH] defconfig: kona: Enable FDE and QSEECOM PROXY Enable FDE support for kona le target, the ice driver will call to sec-kernel qseecom module through QSEECOM PROXY. Change-Id: Ic9299b7a1e0604ee08006808b1dc78dcaf10b886 Signed-off-by: Abhinav Gupta --- arch/arm64/configs/vendor/kona_le_GKI.config | 6 +++++- drivers/soc/qcom/Kconfig | 19 +++++++++++++++++++ modules.list.msm.kona.le | 3 +++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/vendor/kona_le_GKI.config b/arch/arm64/configs/vendor/kona_le_GKI.config index 032dc9ca2ed6..e267a6920af9 100644 --- a/arch/arm64/configs/vendor/kona_le_GKI.config +++ b/arch/arm64/configs/vendor/kona_le_GKI.config @@ -259,12 +259,16 @@ CONFIG_QRTR_NODE_ID=1 CONFIG_QRTR_SMD=m # CONFIG_QRTR_TUN is not set CONFIG_QRTR_WAKEUP_MS=0 +CONFIG_QSEECOM_PROXY=m CONFIG_QTI_BCL_PMIC5=m CONFIG_QTI_BCL_SOC_DRIVER=m CONFIG_QTI_CPUFREQ_CDEV=m CONFIG_QTI_CPU_HOTPLUG_COOLING_DEVICE=m CONFIG_QTI_CPU_PAUSE_COOLING_DEVICE=m -# CONFIG_QTI_CRYPTO_COMMON is not set +CONFIG_QTI_CRYPTO_COMMON=m +CONFIG_QTI_CRYPTO_FDE=m +CONFIG_QTI_CRYPTO_LEGACY_KEY_FDE=m +CONFIG_QTI_CRYPTO_TZ=m CONFIG_QTI_DEVFREQ_CDEV=m CONFIG_QTI_IOMMU_SUPPORT=m # CONFIG_QTI_PMIC_LPM is not set diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index 1405291b96a8..e06f09036068 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -1057,6 +1057,25 @@ config QTI_CRYPTO_TZ programmed and managed through SCM calls to TZ where ICE driver will configure keys. +config QTI_CRYPTO_FDE + tristate "Enable common crypto functionality used for FDE" + depends on QTI_CRYPTO_COMMON + help + Say 'Y' to enable hardware Full Disk Encryption implementation to be used by + different storage layers such as UFS or eMMC. Enabling the FDE will reserve + one slot of KSM(Key Slot Manager) for the FDE. Making one less slot available + for FBE(File based encryption) in case both encryption mechanism are enabled + on device. + +config QTI_CRYPTO_LEGACY_KEY_FDE + tristate "Enable legacy single key for functionality to be used for FDE" + depends on QTI_CRYPTO_FDE + help + Say 'Y' to enable hardware Full Disk Encryption implementation to use the + legacy key generation.Keep using only single slot of KSM with + the legacy key id for all the partitions. + The Legacy support will be deprecated in the future versions. + config QTI_CRYPTO_VIRTUALIZATION tristate "Enable hypervysor to be used for FBE" depends on FS_ENCRYPTION_INLINE_CRYPT diff --git a/modules.list.msm.kona.le b/modules.list.msm.kona.le index 7d3f39d5123b..84b1f697a5f6 100644 --- a/modules.list.msm.kona.le +++ b/modules.list.msm.kona.le @@ -45,6 +45,9 @@ phy-qcom-ufs.ko phy-qcom-ufs-qmp-v4.ko phy-qcom-ufs-qmp-v4-kona.ko ufshcd-crypto-qti.ko +crypto-qti-common.ko +crypto-qti-tz.ko +qseecom_proxy.ko camcc-sm8250.ko videocc-sm8250.ko dispcc-sm8250.ko