From mboxrd@z Thu Jan 1 00:00:00 1970 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 D87EC27A130 for ; Thu, 27 Nov 2025 06:51:25 +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=1764226287; cv=none; b=hrOCAzZUnZzOnaYqHsEZKvGVkx7c+ufCcGYyCQGXceWHoSIBrfVxrBFf6ZB34q/aYNu1xt3ToEew5YHXN3gsz27ni/V+JiEviEpuDTYtpKqjF19+d/cmlmFTeGjjo/FKVh0d3gsmGaTnloxDsQis/YIOHN3lJnA2r1jpskDoG2s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764226287; c=relaxed/simple; bh=L1GAdhVCihpmpHLfPJHmD6AbI9JsJs9i/wcsLfRPRTc=; h=Subject:To:Cc:References:From:Message-ID:Date:MIME-Version: In-Reply-To:Content-Type; b=vFyJjOrIPD8aDovlEwfNMBUO7HVAJaOXq6TRZZDURBmhsEsrkM0cGiOvYonXigXi9JMG+jhECxlU0ERmFJfd2YBW0a4vNi4BgsgF9fuccbV0L3ad+vzeFjfmfhF8yDXQMT4UAsqV8xUlvRybdRpQBr2ltbYs/JLQeYuimkqLAY8= 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=MK8GrMFj; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=VMTQu0t+; 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="MK8GrMFj"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="VMTQu0t+" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5AR50o3g1457983 for ; Thu, 27 Nov 2025 06:51:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= vahAyuTYrvrhMLTAvF1gOvLM5O0cDCumCwFOtxYrDIQ=; b=MK8GrMFjiz7lFsZd E+MxbrHw58jUIoHqTMRtm/yS4uAtdfXZkzATgqP+gQ40CAWZJsLEASeWzafwfh0x nz+kDslADO7Pkqj0QXLpnXeqfWf+X6X1ftwp70pSK34lUhgSGAnUsm+vKb3ezWea Y1hoebxU+lknJSBMyBiZ010D5kg4vZFo1oPtnSgWUKUWkYDEmSX3bBzeXM9eOyZR 6c1UGAk9xvaUrZduNojCpAI3/q5Du6XjSVGNiltZtPNPd/kyfPHMLuI5F7e1zJ3N ZAhUf7an3r3GpA9j4lrjqhmwvTdWfHd3HiKclAzTdV9ODIw2Ki3bSKJ5e1u30xtu jpJrzw== Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4anvqvkgp9-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 27 Nov 2025 06:51:24 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-34378c914b4so1114801a91.1 for ; Wed, 26 Nov 2025 22:51:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1764226284; x=1764831084; darn=vger.kernel.org; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject:from:to:cc :subject:date:message-id:reply-to; bh=vahAyuTYrvrhMLTAvF1gOvLM5O0cDCumCwFOtxYrDIQ=; b=VMTQu0t+msSoIyA325f8XKX4tVOYPRWM+mLbk9nk4fGMkm1bYUGE5tsqDrfbslVvSk pmcAc2prT1PhCS98bowb5e1IHksoA5S7H0hsoUjXLLjsF+nLkY0h0wrPt6jYdHf9R6IT ziTL/DG9iH2uwA6mbXRyJ6OGFpKrmj7/L4+FM2RNIBPjCnMAByuAwRP7EDnBZSO4EkfB mdxvs7wNJo0i1hwY8BpbgrW8BYpoSDMPRShsKN9VcmEFdfEuZ9m71MmQX2+VLSkBrb/O MssPLr4MYT1mELy1r0gpDI+YBWwP5Xh7p7FeQDYHGHqcoVRP9inxexywFK38RCbFybbo 7+Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764226284; x=1764831084; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vahAyuTYrvrhMLTAvF1gOvLM5O0cDCumCwFOtxYrDIQ=; b=jReEjAH/1hU2sobtAPZOwxXhWdNNLGjTp8RSIE4cd9gQOdoKNbCmjoiddfU0W1Ocn/ sR9g4WoBkQ2DOeJ8cBPi0Wj7m8VTqeK0icovmRKrLNI4P9SKQZkQV6u09qdnk2VveCxH oYUg3oH5YaFZwM+wb5XZ5nHlJDw3pyPpGpnBedI9v3GNpYCbViUsj2rPaEpK39X0RZ/0 Rr0du+hKHXbb9t+G9uimvoQ8kPEGwVIiOk7q4L3IsLjDPLQmKHyDrXCEYy5XS1UCvykM U6aniY/qakf3w7+DicyLATZL8rGHJBjfReV8jjAEnsHpRhBS4452XQnMg79ziranP4bV AeIA== X-Forwarded-Encrypted: i=1; AJvYcCWEtfuiF8caPDiux31kzMmalXpEA1Jw/cWEJXyMkycKEepGp8ANBork5qgSr0IckIGju4srN9MFtYab61s=@vger.kernel.org X-Gm-Message-State: AOJu0YwQ+/42kviTbna97KKExTvhRfRMaAi0hs5jdKVGJQ/PgWNeiO8O gamFRfmQuBPtehJyQ1T7+PFxFeI9wpbzyQ31Dd8tYXZ5NyCbXYkEoYNUzT+YL1WOcPz2/i+WJPA 0Lh4BCSgGSMLWv6QAGGa0KxAszr5/FgotX8mKNm2xPX7F8PozOgxsrxlZMt5Dy2dCtxvZ3C+YOs g= X-Gm-Gg: ASbGncvQH42AKMpeu6yS8I1h+vcGVVj3/K83jq65O8NfujQmGNZHyo3axRpu6mXW285 k90ecUixZj3Wegz8sJenffn5CM8Ffo/jR1WnZrSyu86eH15A7AOvU8a8RkEY70P6jnnFz1nr+3k HRzxl8b99sTA/8VNMwE1c3XtgWFM+W9+4j1SDMbBYRd+rRk/RX5fJvme7tas1CkvxSoyx0r/bhw LhdCy9voWT/DA3arfaxpYdZhYCwxmDk2tYy5NCuWH5tkeQ0M1EBN25Ni9aFU/p8HnHyRWOJmFWI czhPT04DXDhghdlQh02YyAFXxOm8DYwV5mqfRdYwMXGg7H08GW07Ky7jLa5eabbbXYfK4dcCfc1 rtD282qwypWvIZyYfvfTaeW3l+80dM/sNc9GcQ7g= X-Received: by 2002:a17:90b:5628:b0:335:2747:a9b3 with SMTP id 98e67ed59e1d1-34733f36422mr18223535a91.32.1764226283639; Wed, 26 Nov 2025 22:51:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IFbkHs8wfFHSMpupo4SEwLS1CnXrCsqUHPf6SUc1+BRhBVG1r7PDra++zJJbY6CvkMQVUI+7A== X-Received: by 2002:a17:90b:5628:b0:335:2747:a9b3 with SMTP id 98e67ed59e1d1-34733f36422mr18223520a91.32.1764226283128; Wed, 26 Nov 2025 22:51:23 -0800 (PST) Received: from [10.217.223.198] ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-be4fc5a0957sm868740a12.16.2025.11.26.22.51.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Nov 2025 22:51:22 -0800 (PST) Subject: Re: [PATCH] mmc: host: sdhci-msm: Add support for wrapped keys To: Ulf Hansson Cc: adrian.hunter@intel.com, linux-mmc@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org References: <20251124112908.3193211-1-neeraj.soni@oss.qualcomm.com> From: Neeraj Soni Message-ID: Date: Thu, 27 Nov 2025 12:21:19 +0530 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTI3MDA0OSBTYWx0ZWRfX78kbQLgAuscw Tzq/i4XudK8kzqArgLKu4AvC5bjN3BHf2Ho1cFsDocqCarNcRJjsaW26386/6dZnw7ZdJJ2+cCd YReJSl27pJ0A4txTK5ksnr08RRF8E32AWJm2Aj4SkWwLO+txUbrky22N0rk1h1YdBLeF6T9GBfq TygIppkPE29HgUKeTL2HHxjNE8HraUC4bdKw0losPjgcDn53Aa5fRCtJ0QuMWug9Cd+cO6qB0n/ aw4+tRtkt+jQS3SSZsKKpC3p7rxW1ydCwJ1GOEu0ISRDSnalw4V5LBdOkEIeTX4dnyV7b6BzQTC S+HMQ7IDlOY+LPBRImOtORXqjftX13q1fw2QCkGZ/BTfxPko5RUBQr8u64ZbH/ItRZoQZR6MrJT FzrI62J2+OtRPJRcfo9Db/jjaJLXUg== X-Proofpoint-GUID: fKHqdAlfGa_vEKPJ5as43FAP8NFjKO7k X-Proofpoint-ORIG-GUID: fKHqdAlfGa_vEKPJ5as43FAP8NFjKO7k X-Authority-Analysis: v=2.4 cv=feugCkQF c=1 sm=1 tr=0 ts=6927f4ec cx=c_pps a=RP+M6JBNLl+fLTcSJhASfg==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=VwQbUJbxAAAA:8 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=6BEkEVLclD1p8vPHoFMA:9 a=QEXdDO2ut3YA:10 a=iS9zxrgQBfv6-_F4QbHw: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 adultscore=0 priorityscore=1501 suspectscore=0 bulkscore=0 clxscore=1015 impostorscore=0 lowpriorityscore=0 phishscore=0 spamscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511270049 Hi, On 11/25/2025 6:25 PM, Ulf Hansson wrote: > On Mon, 24 Nov 2025 at 12:29, Neeraj Soni wrote: >> >> 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.com/ >> that was sent by Seshu Madhavi Puppala. >> >> My changes rebase it to use the custom crypto profile support. > > Part of the above is good information but doesn't belong in the commit > message. Instead make them part of the patch-information below "---". Thanks for the comment. I will update this in next patch. > >> >> Signed-off-by: Neeraj Soni > > Please add Eric Biggers and Abel Vesa for any changes related to ICE. > At least, if they have the time we would appreciate their input to > these kind of changes. > > Kind regards > Uffe Okay i will add them as well in next patch. > >> --- >> 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); >> >> - if (qcom_ice_get_supported_key_type(ice) != BLK_CRYPTO_KEY_TYPE_RAW) { >> - dev_warn(dev, "Wrapped keys not supported. Disabling inline encryption support.\n"); >> - return 0; >> - } >> - >> msm_host->ice = ice; >> >> /* Initialize the blk_crypto_profile */ >> @@ -1929,7 +1924,7 @@ static int sdhci_msm_ice_init(struct sdhci_msm_host *msm_host, >> >> profile->ll_ops = sdhci_msm_crypto_ops; >> profile->max_dun_bytes_supported = 4; >> - profile->key_types_supported = BLK_CRYPTO_KEY_TYPE_RAW; >> + profile->key_types_supported = qcom_ice_get_supported_key_type(ice); >> profile->dev = dev; >> >> /* >> @@ -2009,9 +2004,53 @@ static int sdhci_msm_ice_keyslot_evict(struct blk_crypto_profile *profile, >> return qcom_ice_evict_key(msm_host->ice, slot); >> } >> >> +static int sdhci_msm_ice_derive_sw_secret(struct blk_crypto_profile *profile, >> + const u8 *eph_key, size_t eph_key_size, >> + u8 sw_secret[BLK_CRYPTO_SW_SECRET_SIZE]) >> +{ >> + struct sdhci_msm_host *msm_host = >> + 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 = >> + 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 = >> + 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 = >> + 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 = { >> .keyslot_program = sdhci_msm_ice_keyslot_program, >> .keyslot_evict = sdhci_msm_ice_keyslot_evict, >> + .derive_sw_secret = sdhci_msm_ice_derive_sw_secret, >> + .import_key = sdhci_msm_ice_import_key, >> + .generate_key = sdhci_msm_ice_generate_key, >> + .prepare_key = sdhci_msm_ice_prepare_key, >> }; >> >> #else /* CONFIG_MMC_CRYPTO */ >> -- >> 2.34.1 >> Regards Neeraj