From nobody Mon Dec 1 22:07:23 2025 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 B04C93C1F for ; Thu, 27 Nov 2025 07:27:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764228427; cv=none; b=VlA9EtpfKMwqYy+cOYZK66mWR5OLEyCJCQbzSSSSbsVSNJkZIhQRtbAqp49OQcBDAZefYK+G0/i5YePVxV4HP/iSUHg0EMYNxg4LCrrhWdpedDUjxgBmUb8eQFjSEwP4s4I8mB0sRPa3PlYndgGjiq6KCRHyicOsxd9jKhqjuAs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764228427; c=relaxed/simple; bh=/HqXxzUq6RnJYu48ZoJP0fcWuWCt+4vybB3tnbONtlE=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Rl7HkhyclrudwyP2Q/m5K7/nAqIeoy37EvEmGB2j2nCD2BO8dI6uTwlq/snqqXrHzZn49+9qokRBbH/tA8BGDtu+uQq9B4AMgj/VlhqfbHhKAkUbg0P+RBWrWOmZ9fVCxzLbWMnBBMmsE/ny4TcYXNli2FtIecrtcz8gt7nUf4I= 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=jvSPqMI0; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Pym2pRcI; arc=none smtp.client-ip=205.220.180.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="jvSPqMI0"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Pym2pRcI" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5AR253BL3840302 for ; Thu, 27 Nov 2025 07:27:03 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=oqFyPtIZkLJnIdiBLjjAW8uXCSO1QldO+0G b72ywrxM=; b=jvSPqMI05o7CW7tOHZKrBCfzCublF4EJ54snyr0ZSWJBoNyxA5h WbnM8zy4S66/vOfBuVSbU2rh9RF72z69ikSieVnBj8savnOh/MOIg+mocwk4XMIw 39ozbb1VRy0tc4wgdc0qChYGAVExJuqNPgSR7PWmr3NUSu5f6ecCla4sG33boElC tsQQNZIWJOktw5UD13usOhLh0kvlLgi7zEY+J64mGVPmWyhxwqLvrfldeR3Lt9Rz 8FrpxRtGO8EiYIqcZAn3bWmkvLBLi88MPPaTwAMh6QrxLBWgUC9ssQkQBUIPxJBf 7UygLFx6sSlHIuYsfOOJlcDdSQ8r4WK6oXw== 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 4apdj08re3-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 27 Nov 2025 07:27:03 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-299d221b749so10867695ad.3 for ; Wed, 26 Nov 2025 23:27:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1764228422; x=1764833222; 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=oqFyPtIZkLJnIdiBLjjAW8uXCSO1QldO+0Gb72ywrxM=; b=Pym2pRcIJ44xM9Pb4ospwvpgPIKkyZ0NYybHlWOMyEZADXRrgr9/5p7rIhf73Wkhvq JNI5BE994kZVqhl3EnhVIUvylatJDcXyFOjgRQxP9cdmgGKx5335UQmUdBWLAGQmuWjc d7SOmCV8A+X60faCl/Aspr/hg5A5prwp7oOnBMdvIU/auHxU1n+xwsNOEXJ2GSNg+mxz iL31T8CkghwGhs/qApuIBULpb1QydK3+Udmwoa2t5VRP9G1LQg7gXJswrvlITaZoTVnd opZzVZelFinOt6JGZExfBPtHc5G1nt+MXrWAqIcph7P6SBbK1KLbpEUOEEEObY5trgQ5 zIfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764228422; x=1764833222; 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=oqFyPtIZkLJnIdiBLjjAW8uXCSO1QldO+0Gb72ywrxM=; b=hXdD5D/osg4t4OzJTh0CqpSs0k4QIw91/ueCJVXUViX7D1gB03O20lVbFV0xPlVWJ8 toBrmCKH5dToBguLKfuYWZQOCAxWGd1fciLK6gJvHNXYxorkeHeMICczUjF5VyVPf6/N TnQ7HVWtHh4MIzySfEX/VJrGW7WWMhQY7IEXvIYGC5tofaLVXVdIV/ffZhExYmxq771J VVu03dNWhZgv9IBagk0w+kEfTK4G02W4lyOcQ8URlShzGfxXceFFh67DZMOC0gCSGeth VResPI7E42g0dTf59BEt4dPBAIQQtgBcLqLRekU80Pfs9P2OUaqfqfAJYwKTHUi7lJe3 W78g== X-Forwarded-Encrypted: i=1; AJvYcCX3MEia+BPRT/VRKmwRl4ntVCM/xGNF03CpB4rmCpuXqBaiWsTxILHyU6xJfEvkpUm8bjgxGwjYtNygKog=@vger.kernel.org X-Gm-Message-State: AOJu0Yzbz8yBTM+ZpbeJY2Rn6nOJtdvcpjm1Coso1xBf0Xi7v6dttpE1 AOimTozsoj406oita3Yt10MRchVJTIKrvG1JSvZWzE39Pl9NbtKP7yBDaXyq7Xp6nHjXzNK1bEt NNNxDZvgdii/OUH9J859RxOhRftxU1oqDL8qcimW/KE9lqZxg5LjUO5ZBU6yy2BHtBqk= X-Gm-Gg: ASbGncuKA6XRBNPRGoSaVB4Jv7Y+mKa8pKOVZhtMJRehYf+B5ARN6ZGizeb/mErLn3R D6FXTMG5eOGbk6Ivl0uBY/34z9zo18Ym9WqJKTCRbgTjXxz88leqFPN6uw3DrpGU1AdFcKCwQq3 l6j4g5e/Uu8u7kfehncCBYeK+7DSo+0qdPisv8f9ZIkxIHn4bab72JCn3uJsuRkj1tqrwOhRLiE M2OUwfH/YEA3gcjg3cvz6jXsJDYdiBd+57hZo8Xj6BzLFuD8HA7PAIy342aOh0EagxG/0drvHeR 7vBv9Dh8RKZCAl1Sltnd47V/CY9MbEYZ+mF+8pRiOyGU33WmjbDIBIwPj+bAKXcMwfSZRaKjEMZ Foa8Ghw0StpKtFNSAdrhYM3zYVitYUEDa0my2SHPD X-Received: by 2002:a17:902:e5c8:b0:295:987d:f7ff with SMTP id d9443c01a7336-29b6c6925c1mr284666235ad.42.1764228422445; Wed, 26 Nov 2025 23:27:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IELYQqGkB99TK63vcv4nYkMbNC7kIgCg02DD3dbWmRRPljsea7e1w0hT+HzLPsmDdC9Upzz9Q== X-Received: by 2002:a17:902:e5c8:b0:295:987d:f7ff with SMTP id d9443c01a7336-29b6c6925c1mr284665985ad.42.1764228422002; Wed, 26 Nov 2025 23:27:02 -0800 (PST) Received: from hu-neersoni-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29bce40ac99sm8044715ad.7.2025.11.26.23.26.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 23:27:01 -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 v2] mmc: host: sdhci-msm: Add support for wrapped keys Date: Thu, 27 Nov 2025 12:56:57 +0530 Message-Id: <20251127072657.2755050-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: AW1haW4tMjUxMTI3MDA1MiBTYWx0ZWRfX+F+93vwoqdS3 0EaxeXOfUbuoeMNW6Vh9YFr8bJK35L06mQ1BamuFI8d21spoqJWirkuTVx5Nydxma8+L/UGAqCz 7ZvD5B0E6FI0WjnW1p6L2pU+QbCL22cl3/2vmwmimV3BuZ1krtBoQMZ9UfJu5eMoiX8lYCFEdzR fayAkWXcmLvveBeL6/sXvIlI2fusHzzBizpNBwTxKfaNixWZs75HJaklWR6/fsjcldbpdh5ur1O cdwYL8gAGr1nJHZdsm/QjUgsCHblyHUZeOJbI6iQ2s4YUiJNyoq+VymVgbiD12jLHmBwJtFecNL UoAY4mErySpv4KjvakPX1jkhmcE00dFyRz8Fdu/VNjUtQ2WIIc8z8VmiPGmbcka3LOB0xh8HAM5 PLU/IO3J9fUUwjSYNukv93SI0fEPiA== X-Proofpoint-GUID: 6R6_J1_Zo861jKIVM_ZigwnNQwS9Nx9J X-Proofpoint-ORIG-GUID: 6R6_J1_Zo861jKIVM_ZigwnNQwS9Nx9J X-Authority-Analysis: v=2.4 cv=PJoCOPqC c=1 sm=1 tr=0 ts=6927fd47 cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==: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=1OuFwYUASf3TG4hYMiVC:22 a=TjNXssC_j7lpFel5tvFf:22 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-25_02,2025-11-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 suspectscore=0 phishscore=0 priorityscore=1501 clxscore=1015 adultscore=0 impostorscore=0 malwarescore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511270052 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 --- Changes in v2: - Updated commit message for clarity. Changes in v1: - Added initial support for wrapped keys. --- 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