Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcc34470 authored by Neeraj Soni's avatar Neeraj Soni Committed by Blagovest Kolenichev
Browse files

defconfig: Enable new file encryption framework 



Following flags are needed to support block crypto based inline
encryption framework:
1. CONFIG_BLK_INLINE_ENCRYPTION=y.
2. CONFIG_SCSI_UFS_CRYPTO=y.
3. CONFIG_SCSI_UFS_CRYPTO_QTI=y.
4. CONFIG_DM_DEFAULT_KEY=y.
5. CONFIG_MMC_CQHCI_CRYPTO=y.
6. CONFIG_MMC_CQHCI_CRYPTO_QTI=y.
7. CONFIG_QTI_CRYPTO_COMMON=y.
8. CONFIG_QTI_CRYPTO_TZ=y.
9. CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y.

Change-Id: Ia583c514b51e6fa66a9d1c5bda9610e5646ce61a
Signed-off-by: default avatarNeeraj Soni <neersoni@codeaurora.org>
parent a88ff8fc

arch/arm/configs/vendor/bengal-perf_defconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -82,6 +82,7 @@ CONFIG_MODULE_SIG=y 
CONFIG_MODULE_SIG_FORCE=y

CONFIG_MODULE_SIG_FORCE=y

CONFIG_MODULE_SIG_SHA512=y

CONFIG_MODULE_SIG_SHA512=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_BSG is not set

CONFIG_BLK_INLINE_ENCRYPTION=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_PARTITION_ADVANCED=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_CFQ_GROUP_IOSCHED=y

CONFIG_CFQ_GROUP_IOSCHED=y
@@ -268,6 +269,8 @@ CONFIG_SCSI_SCAN_ASYNC=y 
CONFIG_SCSI_UFSHCD=y

CONFIG_SCSI_UFSHCD=y

CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_CRYPTO=y

CONFIG_SCSI_UFS_CRYPTO_QTI=y

CONFIG_MD=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

CONFIG_DM_CRYPT=y
@@ -435,6 +438,8 @@ CONFIG_MMC_BLOCK_DEFERRED_RESUME=y 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_CQHCI_CRYPTO=y

CONFIG_MMC_CQHCI_CRYPTO_QTI=y

CONFIG_NEW_LEDS=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_CLASS_FLASH=y

CONFIG_LEDS_CLASS_FLASH=y
@@ -525,6 +530,8 @@ CONFIG_QMP_DEBUGFS_CLIENT=y 
CONFIG_QCOM_CDSP_RM=y

CONFIG_QCOM_CDSP_RM=y

CONFIG_QCOM_QHEE_ENABLE_MEM_PROTECTION=y

CONFIG_QCOM_QHEE_ENABLE_MEM_PROTECTION=y

CONFIG_QCOM_CX_IPEAK=y

CONFIG_QCOM_CX_IPEAK=y

CONFIG_QTI_CRYPTO_COMMON=y

CONFIG_QTI_CRYPTO_TZ=y

CONFIG_ICNSS=y

CONFIG_ICNSS=y

CONFIG_ICNSS_QMI=y

CONFIG_ICNSS_QMI=y

CONFIG_DEVFREQ_GOV_PASSIVE=y

CONFIG_DEVFREQ_GOV_PASSIVE=y
@@ -554,6 +561,7 @@ CONFIG_EXT4_FS_SECURITY=y 
CONFIG_F2FS_FS=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y

CONFIG_QUOTA=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y

CONFIG_QFMT_V2=y

arch/arm/configs/vendor/bengal_defconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -87,6 +87,7 @@ CONFIG_MODULE_SIG=y 
CONFIG_MODULE_SIG_FORCE=y

CONFIG_MODULE_SIG_FORCE=y

CONFIG_MODULE_SIG_SHA512=y

CONFIG_MODULE_SIG_SHA512=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_BSG is not set

CONFIG_BLK_INLINE_ENCRYPTION=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_PARTITION_ADVANCED=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_CFQ_GROUP_IOSCHED=y

CONFIG_CFQ_GROUP_IOSCHED=y
@@ -283,6 +284,8 @@ CONFIG_SCSI_SCAN_ASYNC=y 
CONFIG_SCSI_UFSHCD=y

CONFIG_SCSI_UFSHCD=y

CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_CRYPTO=y

CONFIG_SCSI_UFS_CRYPTO_QTI=y

CONFIG_MD=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

CONFIG_DM_CRYPT=y
@@ -470,6 +473,8 @@ CONFIG_MMC_IPC_LOGGING=y 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_CQHCI_CRYPTO=y

CONFIG_MMC_CQHCI_CRYPTO_QTI=y

CONFIG_NEW_LEDS=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_CLASS_FLASH=y

CONFIG_LEDS_CLASS_FLASH=y
@@ -570,6 +575,8 @@ CONFIG_QMP_DEBUGFS_CLIENT=y 
CONFIG_QCOM_CDSP_RM=y

CONFIG_QCOM_CDSP_RM=y

CONFIG_QCOM_QHEE_ENABLE_MEM_PROTECTION=y

CONFIG_QCOM_QHEE_ENABLE_MEM_PROTECTION=y

CONFIG_QCOM_CX_IPEAK=y

CONFIG_QCOM_CX_IPEAK=y

CONFIG_QTI_CRYPTO_COMMON=y

CONFIG_QTI_CRYPTO_TZ=y

CONFIG_ICNSS=y

CONFIG_ICNSS=y

CONFIG_ICNSS_DEBUG=y

CONFIG_ICNSS_DEBUG=y

CONFIG_ICNSS_QMI=y

CONFIG_ICNSS_QMI=y
@@ -601,6 +608,7 @@ CONFIG_F2FS_FS=y 
CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_CHECK_FS=y

CONFIG_F2FS_CHECK_FS=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y

CONFIG_QUOTA=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y

CONFIG_QFMT_V2=y

arch/arm64/configs/vendor/bengal-perf_defconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -97,6 +97,7 @@ CONFIG_MODULE_SIG=y 
CONFIG_MODULE_SIG_FORCE=y

CONFIG_MODULE_SIG_FORCE=y

CONFIG_MODULE_SIG_SHA512=y

CONFIG_MODULE_SIG_SHA512=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_BSG is not set

CONFIG_BLK_INLINE_ENCRYPTION=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_PARTITION_ADVANCED=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_CFQ_GROUP_IOSCHED=y

CONFIG_CFQ_GROUP_IOSCHED=y
@@ -288,6 +289,8 @@ CONFIG_SCSI_SCAN_ASYNC=y 
CONFIG_SCSI_UFSHCD=y

CONFIG_SCSI_UFSHCD=y

CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_CRYPTO=y

CONFIG_SCSI_UFS_CRYPTO_QTI=y

CONFIG_MD=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

CONFIG_DM_CRYPT=y
@@ -465,6 +468,8 @@ CONFIG_MMC_BLOCK_DEFERRED_RESUME=y 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_CQHCI_CRYPTO=y

CONFIG_MMC_CQHCI_CRYPTO_QTI=y

CONFIG_NEW_LEDS=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_CLASS_FLASH=y

CONFIG_LEDS_CLASS_FLASH=y
@@ -562,6 +567,8 @@ CONFIG_QMP_DEBUGFS_CLIENT=y 
CONFIG_QCOM_CDSP_RM=y

CONFIG_QCOM_CDSP_RM=y

CONFIG_QCOM_QHEE_ENABLE_MEM_PROTECTION=y

CONFIG_QCOM_QHEE_ENABLE_MEM_PROTECTION=y

CONFIG_QCOM_CX_IPEAK=y

CONFIG_QCOM_CX_IPEAK=y

CONFIG_QTI_CRYPTO_COMMON=y

CONFIG_QTI_CRYPTO_TZ=y

CONFIG_ICNSS=y

CONFIG_ICNSS=y

CONFIG_ICNSS_QMI=y

CONFIG_ICNSS_QMI=y

CONFIG_DEVFREQ_GOV_PASSIVE=y

CONFIG_DEVFREQ_GOV_PASSIVE=y
@@ -593,6 +600,7 @@ CONFIG_EXT4_FS_SECURITY=y 
CONFIG_F2FS_FS=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y

CONFIG_QUOTA=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y

CONFIG_QFMT_V2=y

arch/arm64/configs/vendor/bengal_defconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -102,6 +102,7 @@ CONFIG_MODULE_SIG=y 
CONFIG_MODULE_SIG_FORCE=y

CONFIG_MODULE_SIG_FORCE=y

CONFIG_MODULE_SIG_SHA512=y

CONFIG_MODULE_SIG_SHA512=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_BSG is not set

CONFIG_BLK_INLINE_ENCRYPTION=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_PARTITION_ADVANCED=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_CFQ_GROUP_IOSCHED=y

CONFIG_CFQ_GROUP_IOSCHED=y
@@ -299,6 +300,8 @@ CONFIG_SCSI_UFSHCD=y 
CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFSHCD_CMD_LOGGING=y

CONFIG_SCSI_UFSHCD_CMD_LOGGING=y

CONFIG_SCSI_UFS_CRYPTO=y

CONFIG_SCSI_UFS_CRYPTO_QTI=y

CONFIG_MD=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

CONFIG_DM_CRYPT=y
@@ -478,6 +481,8 @@ CONFIG_MMC_IPC_LOGGING=y 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_CQHCI_CRYPTO=y

CONFIG_MMC_CQHCI_CRYPTO_QTI=y

CONFIG_NEW_LEDS=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_CLASS_FLASH=y

CONFIG_LEDS_CLASS_FLASH=y
@@ -586,6 +591,8 @@ CONFIG_QMP_DEBUGFS_CLIENT=y 
CONFIG_QCOM_CDSP_RM=y

CONFIG_QCOM_CDSP_RM=y

CONFIG_QCOM_QHEE_ENABLE_MEM_PROTECTION=y

CONFIG_QCOM_QHEE_ENABLE_MEM_PROTECTION=y

CONFIG_QCOM_CX_IPEAK=y

CONFIG_QCOM_CX_IPEAK=y

CONFIG_QTI_CRYPTO_COMMON=y

CONFIG_QTI_CRYPTO_TZ=y

CONFIG_ICNSS=y

CONFIG_ICNSS=y

CONFIG_ICNSS_DEBUG=y

CONFIG_ICNSS_DEBUG=y

CONFIG_ICNSS_QMI=y

CONFIG_ICNSS_QMI=y
@@ -619,6 +626,7 @@ CONFIG_F2FS_FS=y 
CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_CHECK_FS=y

CONFIG_F2FS_CHECK_FS=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y

CONFIG_QUOTA=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y

CONFIG_QFMT_V2=y

arch/arm64/configs/vendor/kona-perf_defconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -97,6 +97,7 @@ CONFIG_MODVERSIONS=y 
CONFIG_MODULE_SIG=y

CONFIG_MODULE_SIG=y

CONFIG_MODULE_SIG_FORCE=y

CONFIG_MODULE_SIG_FORCE=y

CONFIG_MODULE_SIG_SHA512=y

CONFIG_MODULE_SIG_SHA512=y

CONFIG_BLK_INLINE_ENCRYPTION=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_CFQ_GROUP_IOSCHED=y

CONFIG_CFQ_GROUP_IOSCHED=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -297,8 +298,11 @@ CONFIG_SCSI_SCAN_ASYNC=y 
CONFIG_SCSI_UFSHCD=y

CONFIG_SCSI_UFSHCD=y

CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_CRYPTO=y

CONFIG_SCSI_UFS_CRYPTO_QTI=y

CONFIG_MD=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_DEFAULT_KEY=y

CONFIG_DM_SNAPSHOT=y

CONFIG_DM_SNAPSHOT=y

CONFIG_DM_UEVENT=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY=y
@@ -501,6 +505,8 @@ CONFIG_MMC_TEST=y 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_CQHCI_CRYPTO=y

CONFIG_MMC_CQHCI_CRYPTO_QTI=y

CONFIG_NEW_LEDS=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QTI_TRI_LED=y

CONFIG_LEDS_QTI_TRI_LED=y
@@ -613,6 +619,8 @@ CONFIG_MSM_PERFORMANCE=y 
CONFIG_QMP_DEBUGFS_CLIENT=y

CONFIG_QMP_DEBUGFS_CLIENT=y

CONFIG_QCOM_CDSP_RM=y

CONFIG_QCOM_CDSP_RM=y

CONFIG_QCOM_QHEE_ENABLE_MEM_PROTECTION=y

CONFIG_QCOM_QHEE_ENABLE_MEM_PROTECTION=y

CONFIG_QTI_CRYPTO_COMMON=y

CONFIG_QTI_CRYPTO_TZ=y

CONFIG_DEVFREQ_GOV_PASSIVE=y

CONFIG_DEVFREQ_GOV_PASSIVE=y

CONFIG_QCOM_BIMC_BWMON=y

CONFIG_QCOM_BIMC_BWMON=y

CONFIG_ARM_MEMLAT_MON=y

CONFIG_ARM_MEMLAT_MON=y
@@ -651,6 +659,7 @@ CONFIG_EXT4_FS_SECURITY=y 
CONFIG_EXT4_ENCRYPTION=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y

CONFIG_QUOTA=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y

CONFIG_QFMT_V2=y