This series adds support for wrapped keys by implementing relevant callbacks MMC core and QCom layer. They patches do the following: - Tested on top of Hardware wrapped key support for QCom ICE and UFS core: https://patchwork.kernel.org/project/linux-scsi/cover/20241011-wrapped-keys-v7-0-e3f7a752059b@xxxxxxxxxx/ Tested on QCM6490. How to test: Use the wip-wrapped-keys branch from https://github.com/ebiggers/fscryptctl to build a custom fscryptctl that supports generating wrapped keys. Enable the following config options: CONFIG_BLK_INLINE_ENCRYPTION=y CONFIG_QCOM_INLINE_CRYPTO_ENGINE=m CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y CONFIG_MMC_CRYPTO=y $ mkfs.ext4 -F -O encrypt,stable_inodes /dev/mmcblk0p12 $ mount /dev/mmcblk0p12 -o inlinecrypt /mnt $ fscryptctl generate_hw_wrapped_key /dev/mmcblk0p12 > /mnt/key.longterm $ fscryptctl prepare_hw_wrapped_key /dev/mmcblk0p12 < /mnt/key.longterm > /tmp/key.ephemeral $ KEYID=$(fscryptctl add_key --hw-wrapped-key < /tmp/key.ephemeral /mnt) $ rm -rf /mnt/dir $ mkdir /mnt/dir $ fscryptctl set_policy --hw-wrapped-key --iv-ino-lblk-32 "$KEYID" /mnt/dir $ dmesg > /mnt/dir/test.txt $ sync Reboot the board $ mount /dev/mmcblk0p12 -o inlinecrypt /mnt $ ls /mnt/dir $ fscryptctl prepare_hw_wrapped_key /dev/mmcblk0p12 < /mnt/key.longterm > /tmp/key.ephemeral $ KEYID=$(fscryptctl add_key --hw-wrapped-key < /tmp/key.ephemeral /mnt) $ fscryptctl set_policy --hw-wrapped-key --iv-ino-lblk-32 "$KEYID" /mnt/dir $ cat /mnt/dir/test.txt # File should now be decrypted Seshu Madhavi Puppala (6): mmc: host: support wrapped keys in mmc mmc: host: add support to derive software secret mmc: host: add support for generate, import and prepare keys mmc: host: wrapped keys support in mmc qcom mmc: host: implement derive sw secret vop in mmc qcom mmc: host: support for generate, import and prepare key drivers/mmc/host/cqhci-crypto.c | 79 +++++++++++++++++++++++++++++---- drivers/mmc/host/cqhci.h | 22 +++++++++ drivers/mmc/host/sdhci-msm.c | 59 +++++++++++++++++++++++- 3 files changed, 151 insertions(+), 9 deletions(-) -- 2.17.1
