This currently has 4 patches with another coming in shortly for MMC. 1. Moves ICE functionality to a common library, so that different storage controllers can use it. 2. Adds a SCM call for derive raw secret needed for wrapped keys. 3. Adds a hardware key manager library needed for wrapped keys. 4. Adds wrapped key support in ufs for storage encryption Gaurav Kashyap (4): ufs: move ICE functionality to a common library qcom_scm: scm call for deriving a software secret soc: qcom: add HWKM library for storage encryption soc: qcom: add wrapped key support for ICE drivers/firmware/qcom_scm.c | 61 +++++++ drivers/firmware/qcom_scm.h | 1 + drivers/scsi/ufs/ufs-qcom-ice.c | 200 ++++++----------------- drivers/scsi/ufs/ufs-qcom.c | 1 + drivers/scsi/ufs/ufs-qcom.h | 5 + drivers/scsi/ufs/ufshcd-crypto.c | 47 ++++-- drivers/scsi/ufs/ufshcd.h | 5 + drivers/soc/qcom/Kconfig | 14 ++ drivers/soc/qcom/Makefile | 2 + drivers/soc/qcom/qti-ice-common.c | 215 +++++++++++++++++++++++++ drivers/soc/qcom/qti-ice-hwkm.c | 77 +++++++++ drivers/soc/qcom/qti-ice-regs.h | 257 ++++++++++++++++++++++++++++++ include/linux/qcom_scm.h | 5 + include/linux/qti-ice-common.h | 37 +++++ 14 files changed, 766 insertions(+), 161 deletions(-) create mode 100644 drivers/soc/qcom/qti-ice-common.c create mode 100644 drivers/soc/qcom/qti-ice-hwkm.c create mode 100644 drivers/soc/qcom/qti-ice-regs.h create mode 100644 include/linux/qti-ice-common.h -- 2.17.1