From nobody Tue Dec 2 00:26:24 2025 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 111A9246335 for ; Mon, 24 Nov 2025 11:29:14 +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=1763983755; cv=none; b=YT31UiX3Es2UGFyk7g3uAvKPZfFggwYD5oG1G92wHLWocwkbV2WXGuwx8955qAPdsTKbU2lr2D62FVV5EZlp/ktrKeocPhaHra9Q1OGj41DwKVcRhGIhC+BvrPWo52A+r20lTA+AvQzaEZu9Ybu7BxAJG0UIQpcwIH8l80Cmv/M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763983755; c=relaxed/simple; bh=Ly7lLYY3bIPXjpAH7bKNc9BZsAhfKZRUM/kCY/y4Aig=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=cIOrDZ3a6fAoi3NUiulW4QsnShAFBT4bLDLuPGkYGZ3wTENuv0I4AJajJZGAI1BPmNpjCPPw/fwA10yhJHOt3UvNkJo5JluWylnEQSXQZC7aAl1wF/VYG3kFh+BsW1DRxsXSJFleeU9Fx7R1RHTbxwg9wmIUVdAbTP6dHaI8xOs= 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=TfgUHrDc; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=UIUA2tsj; 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="TfgUHrDc"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="UIUA2tsj" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5AO8PMRn2273365 for ; Mon, 24 Nov 2025 11:29:13 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=M3M9y8dqcilpF3eUX0QRY29iWzqFVt7BaBs tvCWE+yo=; b=TfgUHrDcnwjv/khYff1QO0rat0iapcvQJqd1qEOSLJHvzUhEgqX /anQwmYe1YnWjJt3x4DFnp36U2vprbH3QP0kIJ3gptTUxqvdSdhh0u9+5lVnmCmx Ub0fhOOf5Flxajm/67G8UezTkCzbAxxb2h8Ihfs3Rr9ZRvJzTl5YTHyYiNayHmpc tUTAE1CG36rzrYniB+KHdPOVEtR3jhr0gt4fD7Cukln+S2jthB4LUkauf587cH3f b+Qyj0aWdCVn25mVKxnqou1vugfJa+EKCU8Ml2LI0P/bzhX35PsLS7AFllJeTOX7 w+8nNXcXrRqrB6ev1iEJHuxe6HkZQP9kpoQ== Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ak694vsx3-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 24 Nov 2025 11:29:13 +0000 (GMT) Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-295fbc7d4abso65189775ad.1 for ; Mon, 24 Nov 2025 03:29:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1763983753; x=1764588553; 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=M3M9y8dqcilpF3eUX0QRY29iWzqFVt7BaBstvCWE+yo=; b=UIUA2tsjydy3TiYLIUS7rF2ZCj3tmJ+TjecnOiY6r8ZEMg41awQBc2c0obdzY+4Ndg qaWuOYMkBFUnJlSeTzH9D+6mtpBkVXfx7uQ31Qfj2Lk/Nuy/bgqCjxlNJidPwbEarPnh qWJj9ndvRmwpkwM8IC5x6rWpPc2yY2Oez2tj8mW/WzHP4YtkkT3rJ/98i56nIiaaI5LI xctUcimnrpglnJmo221NDqEeTtWJ6ck3xib3xlXQF7BNyY0F3NbpwGTMLhHmhOele8d6 CscPnOKWZEVL7FLbUvygnvYkUSZbfRtIxyd8xH5FCUwLKzODQvPAOlEhQWh2NQ0tJeW9 2Dmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763983753; x=1764588553; 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=M3M9y8dqcilpF3eUX0QRY29iWzqFVt7BaBstvCWE+yo=; b=uY2JWPS684yJoz52jng3tMXk28PsO27f2BTR12UxfyaW60MMJRFgrOEZWyTCAXj1gA UoG3gt3pZYU/RssXGIx+i/WQjlDPsnWUE2Sw0r3XRCcgCL3e6wjPPeITIC7ymYStG2sQ LqA/46Yhkq8aIDLl8HNrWJQZgTjrItdhBOI63a3fkfsNxOZmWUqZceZFC2k8SKM5NTiu 9hF0oPHc4TDyJvZD2rmYhg7C4KzEufdqtXL/vb+bSFVMzFc96oo3J25f0b6mrhK/7Pjx ioug8052CRJbRO8m7MOt+3IJhDeaGiRTYnWE/t8vVgTTNVlHnoFM3ptAnraBWadoRxMB yCwA== X-Forwarded-Encrypted: i=1; AJvYcCUta/1ObDX4lzyHU0ODTPdE2H9Yjyl/zBxCN0b5xxz10gWi//2QfdUPa9flCquln69LGcDbvGOOq1uqShc=@vger.kernel.org X-Gm-Message-State: AOJu0YycJr8P/I5xjjZEKf9S1dL2arTvr7d1O1nfYEnXOdcYM8UtK4RH lFy7c01mDQnanBLYdzaui93rTTMOcFH8a9iPIEXe4QcmkpqW9tjWYjk0Psdhn7f2Bc6MP5yfZU+ CpxGBfmNtD3iLn5buhszLlkB4E9DApvewBAbZf9w10RnnA1UX+59pvmZnxmfGwLqWG0A= X-Gm-Gg: ASbGnctrRvJu37gVrRYHv3I5UP+9bQCQ18D6lr6sNk9WrMa3WIDYar/t5F70p9bl4pX QLas23RNSJXwXeKqu2p53lE0JOrHOsrvJitqWkLj1/6eZsWiTFrfY/tYISWBEoDJ7wBwu1TJUuz Lyw+MAGNLk2Nj7ZAzc2dw5gTqnzMmy5hBdxw1RAYSXQQaLO3qZyUr2qSvJ3QpgPPuaypyGagqhc MMfq+Nr3shZtPh8pMMec1EPZydRDtBuUtivPcW18DdXUa8IMmuAnBmKcalFdkr5Wwhbve6t9F1P EPNGdQQYrFPwULp5P1Z043d9vGxs4z0ZxEPNydtKhssV/o8bj9apV9MkzbZJU2paHvOUzFamqyH F02F3Q6aiL8arvuiGhui2b45hHcry2LzEOp0ZyoOC X-Received: by 2002:a17:902:d4d0:b0:295:9383:543 with SMTP id d9443c01a7336-29b6bee2c8emr139460175ad.27.1763983752652; Mon, 24 Nov 2025 03:29:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IF6HDY47fcT6Lp1tR/8iFhrEEnMqzWSigNega4FnN7afcdlOzSJ4ONZeVJtQJ7yGBhH6cXbog== X-Received: by 2002:a17:902:d4d0:b0:295:9383:543 with SMTP id d9443c01a7336-29b6bee2c8emr139459925ad.27.1763983752134; Mon, 24 Nov 2025 03:29:12 -0800 (PST) Received: from hu-neersoni-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29b5b27509dsm132034165ad.78.2025.11.24.03.29.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 03:29:11 -0800 (PST) From: Neeraj Soni To: adrian.hunter@intel.com, ulf.hansson@linaro.org Cc: linux-mmc@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, neeraj.soni@oss.qualcomm.com Subject: [PATCH] mmc: host: sdhci-msm: Add support for wrapped keys Date: Mon, 24 Nov 2025 16:59:08 +0530 Message-Id: <20251124112908.3193211-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-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTI0MDEwMSBTYWx0ZWRfXxL5Zhw/SIaTu 3DKIyTO1u2ARoEA0f07eIiUFhnUH6ILhYhKrUf88HtFMbINBi62kiIaZtprwSbpq1bhswJxhsoi CPeuX/w4vFMX6qVXvDBOMv2tw59yvJkxSOzItpswUFb/vIFGdNyZz6XQgi6NmJfwbAS3oeUXNEK RUIb40iCiG7UeZyCacLGIrdkJliKwS4qwSj/F63nC6yQQhlvowg7TTC6k3S+PYvF2bMldsXBpr8 5XPWX2alxNfh7MA6bqD0MVBLWqmU6bwNnvpTQATAUSlOY/YiAusXsWqQKRCS4zTueOpdQkgct0M oACvod9Mdbnw3fgKr8V97KXi/vIqPSL4I6BrPhRJvMx8LXoqaG6b8GKpwdIa2/ASHzSEqziSWQs WZ7FReJ12MqGzxrLLHKbBqvI0f4JNg== X-Authority-Analysis: v=2.4 cv=YJqSCBGx c=1 sm=1 tr=0 ts=69244189 cx=c_pps a=MTSHoo12Qbhz2p7MsH1ifg==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=VwQbUJbxAAAA:8 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=ZyxRHT4sbPtUm1NgsYkA:9 a=GvdueXVYPmCkWapjIL-Q:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-GUID: aSNdzqf0KKc6Rv1taQQlhT4Cr16WA6LT X-Proofpoint-ORIG-GUID: aSNdzqf0KKc6Rv1taQQlhT4Cr16WA6LT 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=2025-11-24_04,2025-11-21_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 suspectscore=0 phishscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 impostorscore=0 spamscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511240101 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. 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. Signed-off-by: Neeraj Soni --- drivers/mmc/host/sdhci-msm.c | 51 +++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 4e5edbf2fc9b..351f2a77068b 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,53 @@ 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(profile); + + 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(profile); + + 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(profile); + + 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(profile); + + 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