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

Commit 37c3300f authored by Neeraj Soni's avatar Neeraj Soni Committed by Jiten Patel
Browse files

Add support for block disk encryption 



With new file encryption framework the crypto
vops should support crypto configuration for block
disk encryption feature as well.

Add ice.c and ice.h files, Ported and fixed the merged conflicts in
cqhci-crypto-qti.c file. (cherry picked from mainline kernel_msm-4.14
commit: 3317668)

Conflicts:-
drivers/mmc/host/cqhci-crypto-qti.c
drivers/crypto/msm/iceregs.h
drivers/crypto/msm/ice.c

new files added:-
drivers/crypto/msm/iceregs.h
drivers/crypto/msm/ice.c

Validations done:-
1) Device bootup successfully to UI.
2) Unlock device by PIN set on Q build.
3) adb shell getprop ro.crypto.state: encrypted
   adb shell getprop ro.crypto.type: block
4) After OTA check WIFI and BT scanning success.
5) Launch browser and do browsing(success).
6) Settings-> sound -> check the ringtones(old save ringtones retained).

Change-Id: I1504a023f91376b207d9af19ad097405a3a42c85
Signed-off-by: default avatarNeeraj Soni <neersoni@codeaurora.org>
Signed-off-by: default avatarJiten Patel <jitepate@codeaurora.org>
parent 5dd3350d

arch/arm64/configs/vendor/sdm660-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -675,6 +675,7 @@ CONFIG_CRYPTO_DEV_QCE=y 
CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCEDEV=y

CONFIG_CRYPTO_DEV_QCOM_ICE=y

CONFIG_SYSTEM_TRUSTED_KEYS="verity.x509.pem"

CONFIG_XZ_DEC=y

CONFIG_PRINTK_TIME=y

arch/arm64/configs/vendor/sdm660_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -716,6 +716,7 @@ CONFIG_CRYPTO_DEV_QCE=y 
CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCEDEV=y

CONFIG_CRYPTO_DEV_QCOM_ICE=y

CONFIG_SYSTEM_TRUSTED_KEYS="verity.x509.pem"

CONFIG_XZ_DEC=y

CONFIG_PRINTK_TIME=y

drivers/crypto/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -804,4 +804,14 @@ config CRYPTO_DEV_CCREE 


source "drivers/crypto/hisilicon/Kconfig"



config CRYPTO_DEV_QCOM_ICE

        tristate "Inline Crypto Module"

        default n

        depends on BLK_DEV_DM

        help

          This driver supports Inline Crypto Engine for QTI chipsets, MSM8994

          and later, to accelerate crypto operations for storage needs.

          To compile this driver as a module, choose M here: the

          module will be called ice.



endif # CRYPTO_HW

drivers/crypto/msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ obj-$(CONFIG_CRYPTO_DEV_QCEDEV) += qcedev.o 
obj-$(CONFIG_CRYPTO_DEV_QCEDEV) += qcedev_smmu.o

obj-$(CONFIG_CRYPTO_DEV_QCRYPTO) += qcrypto.o

obj-$(CONFIG_CRYPTO_DEV_OTA_CRYPTO) += ota_crypto.o

obj-$(CONFIG_CRYPTO_DEV_QCOM_ICE) += ice.o

drivers/crypto/msm/ice.c

0 → 100644
+1561 −0

File added.

Preview size limit exceeded, changes collapsed.