From nobody Sun Feb 8 09:27:17 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D0E282D3225 for ; Fri, 2 Jan 2026 12:40:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767357627; cv=none; b=F+b+qBbh0uk8z5mgodlsYtK6lawCyz6q05Au+0fRUcMMqhTIsUyubhQLQVXj+wpO9E0QhRkYn4DU78NV+lV0v4vct2P6l6iO3/byhNUOwyKp6d/Z/mNlCI94qUWxH3TnThBXf82QeQk3NKIVgJqN3Pwmo0+wOPKTcvPnwSbqn1w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767357627; c=relaxed/simple; bh=vV2nmrOl+t4OdYmghvPwINneUWYZKWPyzTh+ELChZx4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=pKAFZ0wbJ+/2vSCi2rRrjuvwApkkMaLO+0hvXSOMuNWFTOzjQl63/Ndu+JACazZM9h4fzyTA6yEb8yfVwIJhTiOARCuuWWSC6duX0AP9NiJObWsjPqLmILPHDNeLdEVST6+IoMQD6NHiEEVmFe+x2eNjpqNciZ8UYLs89r4okpY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=KTS6x8EV; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=jxKAX7jh; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="KTS6x8EV"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="jxKAX7jh" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 602C00cX314483 for ; Fri, 2 Jan 2026 12:40:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=qcppdkim1; bh=wDzocy7j+gQrNEnjx+nc/YBJjQhj3MoB0EM yBICOBZI=; b=KTS6x8EVWsOGxLM+qZHr3aZdLFJC2TdCT89WL7ilH72yRoTOt+E a9Ez0W3y1WTFjdaENTFKDICKGGYhjm3L8PtscP9shdHF5VQBGNqbdlhV3r+uYd7F BVng3GDSG7+UPCYRFq1aBSJw5fO8OoeavoymedQudxaY25G9ILtT1sGy3sK/XZmu BhuJwIk4D+/PvR1YJCaOa6w25FeJf32+0+UAqjF0p8BMQQxBQuoYRd6j6Co9FpXE Ic6K6hpheLmHu0sCHkjQbc0at9fdke7T1lQtFg13DZX70fznSmLez0Zhh1Ss4vZT 497KC/0MKw2S38x45rihSZ+ze82OuqlJc2Q== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bedmxr29v-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 02 Jan 2026 12:40:25 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2a0d058fc56so195061455ad.3 for ; Fri, 02 Jan 2026 04:40:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1767357624; x=1767962424; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=wDzocy7j+gQrNEnjx+nc/YBJjQhj3MoB0EMyBICOBZI=; b=jxKAX7jhbGeoggszZe3rQLYLjzHXHZRjLOEjm4PfLpDu5iqPcB//iOgWWVcQlpLrDh RceTqoIM5k2WE93mBQ4q5Q+76JJK10LZ6v4l805ubXRI2KMR219vY4aR7romSzYnjBJJ xH5xv12vjEdEGgQD2JICEw4COB5gX0phhEn5lDmLudIK8Si+hPlpEQBVnNkiuFC3Ir4m ycZ1FPMKFOlFzLpgScJkfhve7loD3Epw3RDD2CatF+eyoeYl+bNtyeZfKnpQQZjlv1AA JfY2kpM5/PGMKJsQ4tiwWixSqkhSjilGB0dsLXPgXGUKpxe57zL2X5jbPgkzMxdgtUAf xkSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767357624; x=1767962424; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=wDzocy7j+gQrNEnjx+nc/YBJjQhj3MoB0EMyBICOBZI=; b=jlodkXUtXmGEkSpi1fjYrJRjfXe1q8OzXRWS4Q6jAAGqghfzV29SKvegwNUVzYmuRt D6PbvG4VPzWUW0OtF6oHOh0bCjfW/AS1DkEcAsD/BLs2PyGNGTtxovgaAMuuA03YEcbx LIx7HjNgLYOi7VWEOnwMI6x+5w9W0U3eCJvoBR77A+K+8pYV4f+fCrxEOPb6/7BHPMBD R8mZHVA7aCb0jnMGpIyklIPLfVzo09qvrCc1XXUCUBgsW8QMjiEWiUlBReb2mUxYsYIc NMvib0/24MDoTaORmJOyTKVmSJoq5hZ48s5JQznys35mmF2GswtDpwDY+IvH2XBlT/Il zHUg== X-Forwarded-Encrypted: i=1; AJvYcCWllpKSXTkqjgrP/DZAVnQMzbxMTbKbPTkHYFpAfAPm7icXZ31XLjBlAxKf6FoEOmkABsQNIhDVa1gyTVE=@vger.kernel.org X-Gm-Message-State: AOJu0YyvHZF4IlM53LEcP5wxMMoPtshl+Mgp4JLh4mw6s++KXhnsODUJ yKpmk9mrKYw8049l57nWKi4owfZoTrIwA3EtF1ahG5Ke2puSY6aiqCeioqxDO1YKJnM5jQpn/M+ Sd8FVkSurOXVKiDQSTnk3gvHzPpOdeLB3w5Uemo0dT6nbqIhNoBnrj8jbr5VLEM8G0lY= X-Gm-Gg: AY/fxX7Xax7V0H5EBxt/oGAZf6/4pCTE0cwKpB/CCPQEkrp4VDbcqQHNkFcNiG72Lf0 HS+jUi0d1thCXuEbqJmJSK9uzpLsCSfCb7gCKJDJV7kN+IQNbn+LouREYRGfM0XL3yrIqJ0GbW0 3TGih/vbcO6BbZjvKIgNguGqS7YoBGr3hJwUuq6BgEksdCdalxxIojK2JMibjdQqvnjWlkFlrQg AK18D6fq2caHX+zBMRyL0KWaZHDO0XcJFpIfOMcBruz20rvixvOUjCNgvQhvUbB/GorqXh2nb32 CiF5navs6NcS6Mi4cMxSSiQQZIQ8ZcrIRjhu3OadHpUjCw7jK28k5FhThcq9gNMN25gcOItR2yt rVAKPyRvCEUIapc4zVCFqRhSEJ7joJ7stbNoPcAET X-Received: by 2002:a17:902:d488:b0:29f:2b8a:d3d with SMTP id d9443c01a7336-2a2f2202ccamr395490625ad.4.1767357624384; Fri, 02 Jan 2026 04:40:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IE8A/uRbQ2+nH9MV72MQr84R+/Z3/LjbIDBmGCuDgNg5Cy+ibvYVOtw6HxMTm6h0Elj7WTxmg== X-Received: by 2002:a17:902:d488:b0:29f:2b8a:d3d with SMTP id d9443c01a7336-2a2f2202ccamr395490445ad.4.1767357623880; Fri, 02 Jan 2026 04:40:23 -0800 (PST) Received: from hu-neersoni-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c1e7ca0baf3sm36141763a12.34.2026.01.02.04.40.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jan 2026 04:40:23 -0800 (PST) From: Neeraj Soni To: adrian.hunter@intel.com, ulf.hansson@linaro.org, ebiggers@kernel.org, abel.vesa@linaro.org Cc: linux-mmc@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, neeraj.soni@oss.qualcomm.com, Wenjia Zhang Subject: [PATCH v4] mmc: host: sdhci-msm: Add support for wrapped keys Date: Fri, 2 Jan 2026 18:10:18 +0530 Message-Id: <20260102124018.3643243-1-neeraj.soni@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=GupPO01C c=1 sm=1 tr=0 ts=6957bcb9 cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=NEAV23lmAAAA:8 a=VwQbUJbxAAAA:8 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=qqNy_vziDfUGqepx9HcA:9 a=1OuFwYUASf3TG4hYMiVC:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTAyMDExMSBTYWx0ZWRfXwcB76cTwSbae gwXhN5L6ekCA9J5DLG7XDCYWIuubVnU4xGJe6Jt2VUUW09OlgAWU8xsEWSyAl5Gr+e7WZ8fORru iYc+OqU0O4sgx3tOnVLzTvoQtnQNkvlBnO5Ar2X2pQ1Vs1URbrjRtD725OHS0niFRNalgFszaOg 3bIqV21vQXsWxSmM3nRpwyXsg9SdYDaLbb89aUoE5nebN/mHuxBitzR/LmgMg8J8L9LiMJPRJtw VfHunot9JMK2ahw/c/8Jqepb5bg6vlTXq3WO4KVuDulynsFBsSKKQUNk0J/0jxgRV/Vxc0H6AZi jvTMmQ/cjsojQ4JlgaYFePSyS+ijuHnA8F2hKU5S4l0xbPifXPDSIkqOvNVUUm8JGX09GqAvOhO K3OmfCiQULa/2PocLEf5mOEw6LS3LfZ5qunAJ/jceUOlPLdsm995AhNUUI+5q0OWn2V1KyHODbn X3KCL2IWeo1nU62bSrg== X-Proofpoint-GUID: P1HdUHZbMWKzdAGoyxDDreq7MYGcqaDa X-Proofpoint-ORIG-GUID: P1HdUHZbMWKzdAGoyxDDreq7MYGcqaDa X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-02_01,2025-12-31_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 impostorscore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 phishscore=0 malwarescore=0 spamscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2601020111 Content-Type: text/plain; charset="utf-8" Add the wrapped key support for sdhci-msm by implementing the needed methods in struct blk_crypto_ll_ops and setting the appropriate flag in blk_crypto_profile::key_types_supported. Tested on SC7280 eMMC variant. How to test: Use the "v1.3.0" tag from https://github.com/google/fscryptctl and build fscryptctl that supports generating wrapped keys. Enable the following config options: CONFIG_BLK_INLINE_ENCRYPTION=3Dy CONFIG_QCOM_INLINE_CRYPTO_ENGINE=3Dy CONFIG_FS_ENCRYPTION_INLINE_CRYPT=3Dy CONFIG_MMC_CRYPTO=3Dy Enable "qcom_ice.use_wrapped_keys" via kernel command line. $ mkfs.ext4 -F -O encrypt,stable_inodes /dev/disk/by-partlabel/vm-data $ mount /dev/disk/by-partlabel/vm-data -o inlinecrypt /mnt $ fscryptctl generate_hw_wrapped_key /dev/disk/by-partlabel/vm-data > /mnt/= key.longterm $ fscryptctl prepare_hw_wrapped_key /dev/disk/by-partlabel/vm-data < /mnt/k= ey.longterm > /tmp/key.ephemeral $ KEYID=3D$(fscryptctl add_key --hw-wrapped-key < /tmp/key.ephemeral /mnt) $ rm -rf /mnt/dir $ mkdir /mnt/dir $ fscryptctl set_policy --iv-ino-lblk-32 "$KEYID" /mnt/dir $ dmesg > /mnt/dir/test.txt $ sync Reboot the board $ mount /dev/disk/by-partlabel/vm-data -o inlinecrypt /mnt $ ls /mnt/dir # File should be encrypted $ fscryptctl prepare_hw_wrapped_key /dev/disk/by-partlabel/vm-data < /mnt/k= ey.longterm > /tmp/key.ephemeral $ KEYID=3D$(fscryptctl add_key --hw-wrapped-key < /tmp/key.ephemeral /mnt) $ fscryptctl set_policy --iv-ino-lblk-32 "$KEYID" /mnt/dir $ cat /mnt/dir/test.txt # File should now be decrypted Tested-by: Wenjia Zhang Signed-off-by: Neeraj Soni Acked-by: Adrian Hunter Reviewed-by: Eric Biggers --- This is a reworked version of the patchset https://lore.kernel.org/all/20241101031539.13285-1-quic_spuppala@quicinc.co= m/ that was sent by Seshu Madhavi Puppala. My changes rebase it to use the custom crypto profile support. Changes in v4: - Updated the link for fscryptctl tool in commit message to "https://github= .com/google/fscryptctl". - Aligned the indentation at few places. - Unwrapped few lines of code. Changes in v3: - Updated commit message with test details and moved "Signed-off-by" above = the scissors line. Changes in v2: - Updated commit message for clarity. Changes in v1: - Added initial support for wrapped keys. --- drivers/mmc/host/sdhci-msm.c | 47 +++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 4e5edbf2fc9b..8ac4aee2cb3b 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -1911,11 +1911,6 @@ static int sdhci_msm_ice_init(struct sdhci_msm_host = *msm_host, if (IS_ERR_OR_NULL(ice)) return PTR_ERR_OR_ZERO(ice); =20 - if (qcom_ice_get_supported_key_type(ice) !=3D BLK_CRYPTO_KEY_TYPE_RAW) { - dev_warn(dev, "Wrapped keys not supported. Disabling inline encryption s= upport.\n"); - return 0; - } - msm_host->ice =3D ice; =20 /* Initialize the blk_crypto_profile */ @@ -1929,7 +1924,7 @@ static int sdhci_msm_ice_init(struct sdhci_msm_host *= msm_host, =20 profile->ll_ops =3D sdhci_msm_crypto_ops; profile->max_dun_bytes_supported =3D 4; - profile->key_types_supported =3D BLK_CRYPTO_KEY_TYPE_RAW; + profile->key_types_supported =3D qcom_ice_get_supported_key_type(ice); profile->dev =3D dev; =20 /* @@ -2009,9 +2004,49 @@ static int sdhci_msm_ice_keyslot_evict(struct blk_cr= ypto_profile *profile, return qcom_ice_evict_key(msm_host->ice, slot); } =20 +static int sdhci_msm_ice_derive_sw_secret(struct blk_crypto_profile *profi= le, + const u8 *eph_key, size_t eph_key_size, + u8 sw_secret[BLK_CRYPTO_SW_SECRET_SIZE]) +{ + struct sdhci_msm_host *msm_host =3D sdhci_msm_host_from_crypto_profile(pr= ofile); + + return qcom_ice_derive_sw_secret(msm_host->ice, eph_key, eph_key_size, + sw_secret); +} + +static int sdhci_msm_ice_import_key(struct blk_crypto_profile *profile, + const u8 *raw_key, size_t raw_key_size, + u8 lt_key[BLK_CRYPTO_MAX_HW_WRAPPED_KEY_SIZE]) +{ + struct sdhci_msm_host *msm_host =3D sdhci_msm_host_from_crypto_profile(pr= ofile); + + return qcom_ice_import_key(msm_host->ice, raw_key, raw_key_size, lt_key); +} + +static int sdhci_msm_ice_generate_key(struct blk_crypto_profile *profile, + u8 lt_key[BLK_CRYPTO_MAX_HW_WRAPPED_KEY_SIZE]) +{ + struct sdhci_msm_host *msm_host =3D sdhci_msm_host_from_crypto_profile(pr= ofile); + + return qcom_ice_generate_key(msm_host->ice, lt_key); +} + +static int sdhci_msm_ice_prepare_key(struct blk_crypto_profile *profile, + const u8 *lt_key, size_t lt_key_size, + u8 eph_key[BLK_CRYPTO_MAX_HW_WRAPPED_KEY_SIZE]) +{ + struct sdhci_msm_host *msm_host =3D sdhci_msm_host_from_crypto_profile(pr= ofile); + + return qcom_ice_prepare_key(msm_host->ice, lt_key, lt_key_size, eph_key); +} + static const struct blk_crypto_ll_ops sdhci_msm_crypto_ops =3D { .keyslot_program =3D sdhci_msm_ice_keyslot_program, .keyslot_evict =3D sdhci_msm_ice_keyslot_evict, + .derive_sw_secret =3D sdhci_msm_ice_derive_sw_secret, + .import_key =3D sdhci_msm_ice_import_key, + .generate_key =3D sdhci_msm_ice_generate_key, + .prepare_key =3D sdhci_msm_ice_prepare_key, }; =20 #else /* CONFIG_MMC_CRYPTO */ --=20 2.34.1