From mboxrd@z Thu Jan 1 00:00:00 1970 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 99E7336403B for ; Thu, 30 Jul 2026 14:08:40 +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=1785420521; cv=none; b=eZ6fpjVQbMUrikPLJBUfGrrby71qD72UvsF+attA5h/4U9Zf5FPH9xz2FloQwf0TH234jqN6bjUijqxzKKUDneg1KPJJwJKieKf0ekQRWqQQGcnIb4P942r+OvAwv6YqzSejQyxd5c37QkyTG5rwMpzOVNtOIL2Ijf/KnAVjC0A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785420521; c=relaxed/simple; bh=YLPr7TThknuHRweRQd5AnSaQHr9z47c/8vkT2o0DLCI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Q10jOUEPx+7rt+6u0LXUvX/LQIbt1UhCpvfUSYWWUfLoia/DjGzTgapauebCbxu1Gio757X54+IMveHcZbAB5f58P3fsfWpiGE/Bt5TULUxZc6Ptt738kf6ApCTdxjZ63CdBHNhvntzpr0d0JPv+dtHRhQJQie68GwV6ql90kQ0= 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=IW+q6+OK; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=c8rsOiUC; 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="IW+q6+OK"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="c8rsOiUC" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66UDDRIT427138 for ; Thu, 30 Jul 2026 14:08:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=ToOb8xl6bqk 7/mITFay8ShYzRKcgoE8ExL8nP+bjnjQ=; b=IW+q6+OKYM+90L4DKHH9cbtUsEM sBKWqKg/NQqX6PIsR5K3nOMr+IeypAWezfHgXKkaa8xz4g1bNKZ0bBRYCKHRCsv7 NPTF5Ilb38F0dQBnK4ITPoBcvC+MotlHiLqX389bi1jFBLX51JuR7fD6RWytSUVS Z8RkC0IEZm+8Yjn+uB1BMk4ydcNx/F+jWR9rXpvoeycl7k4vz1nth1ZWuaD2kHv3 KpmyhRw2pvfsy0suqTO7bRzg+buCVhE65gASwTsO/OVbSvdP99r+GK0IE6YOza+Z sVH+LYX/up6JUT+FHggb/uL5bu6kq5zHpM8IgoJHtfemjn0b2kG9v8Rhmig== Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fr3tyh782-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 30 Jul 2026 14:08:39 +0000 (GMT) Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-8efe7db1c42so25643686d6.3 for ; Thu, 30 Jul 2026 07:08:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785420519; x=1786025319; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ToOb8xl6bqk7/mITFay8ShYzRKcgoE8ExL8nP+bjnjQ=; b=c8rsOiUCFsqLJA8kvkJg7Gh1+2+QO+HPnr3FxvIDhDCreiYT+l8B0pCR13+rh9R6RX QdlLswVBA2KrHAsy9ZkeqMauEcgozTjbYrjHGPcK7qoqv2FlLwvepcn6NZSwCIVY/hca QgYLrtwhMZ8Rsc5hhHgfUDv0wsda+/EOPGZfDHhJftxmsBcrGL4uljTQKDtFz3Eq06NF bzxRte0Guu6nZ5nD8WaNF/PNdLScomEPSZO4jE3sU4DPqYtEp1QfmCnTqViPr75ykgaz kObkQjaray6nrwfsfSHHfg8z+LNAnhxLtUi8vOMUJreuHRm0Phw+pTsYpRX1T5PeZXeN EKuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785420519; x=1786025319; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=ToOb8xl6bqk7/mITFay8ShYzRKcgoE8ExL8nP+bjnjQ=; b=BKFVfas8HBp30V2s1gOEpmQhyEBu/glH51OMxwHR2Q0Sk66MeZW1LRGqcFDm/N78Wp ze9Nk5BCWCi6Xop53mqwsDgdDMdl4zZUoFFntsx6ve8tgO2fpsOvtnG2y4+yatRo1G7M JeUWepKrnOw0zNRFzklJqW7yRh3H/QHgDktKcnnYMIzh8+pqhv3wUTX4AmSOuYW9t0PC G1AkRNO7X1drBMoZwBno2m9LWw8ui74Iy0w7si2LxtFmc5FqRirI8+LMf51IXSsh5+SY E55xJHFs5uEtoL7agzAfFdr4AbMP/tQuiD0SE4cnvqGMFykTxXTZd4vVtukxkXgQp3Xx 9T8g== X-Forwarded-Encrypted: i=1; AHgh+Rr0zVpQBih0M7EXxFLmjisR6jYnoZ2tLOcoSegxsEmNzh2OX1GvX/cGYA+0sA2wfRia2gopSRiHP6y4n8U=@vger.kernel.org X-Gm-Message-State: AOJu0YzaxSvSXzaYhlc+kD66SbwIuG04kY5ETS1EGKe2VzF3ivRhOIKK +AdoE6axWjtwT0UP3SxV+Cc8++IuQuOyv54QErxnTogFZDvqweFv9b+qEgJTAAuelUuuic7ZFi8 Dl2InoDsecGqaFGwiA3U5Dr4e4G/ElXQRPXOKjfhHR3gocsDPREfNALxPbl/W6muGI+4= X-Gm-Gg: AR+sD11hP4Wr19+Jb6/Lpqw1bR3qte1egNsZMQ1OeH9UhZRvf8G9GwvZ5na2KOKhCeM 65LD/Zr++evR7O75GFRGlYme76yPC1Z+vv2+1mcYpI9MXhova9jL0tovzasjnEFpceMg1q+2USu auS0Z5nCzvIA9846qyEnf/0UnzhsOfcTi8iNLDthY/AIhSd3oHdpvT0w4xeUxrhsNKGev3IY0D2 /Lz/8gLhIX6ChmrLVZSWayoE+r8hrnnc4fMWL+tobdL7ct5++X3D63ymEYR3uvu3KGgM7uGuW8a Td3a8EtjOzU08VARTreUvLgYkN9TFyt9HfpgB9ywKR3t/Mmzh1J+j0Zrl1Fv2cgn1i01hA5o93V t1rn6KZy3g2hrvBA7xpKFtvVzNG0lYvg= X-Received: by 2002:a05:6214:2621:b0:8cc:ee2e:8d9c with SMTP id 6a1803df08f44-9083b8b83damr2439966d6.5.1785420517541; Thu, 30 Jul 2026 07:08:37 -0700 (PDT) X-Received: by 2002:a05:6214:2621:b0:8cc:ee2e:8d9c with SMTP id 6a1803df08f44-9083b8b83damr2438286d6.5.1785420515619; Thu, 30 Jul 2026 07:08:35 -0700 (PDT) Received: from hu-neersoni-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-908325186b7sm18465826d6.43.2026.07.30.07.08.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 07:08:35 -0700 (PDT) From: Neeraj Soni To: ebiggers@kernel.org, ulf.hansson@linaro.org, adrian.hunter@intel.com Cc: quic_dmukhopa@quicinc.com, quic_rampraka@quicinc.com, quic_nitirawa@quicinc.com, quic_sachgupt@quicinc.com, quic_bhaskarv@quicinc.com, quic_gaurkash@quicinc.com, quic_sartgarg@quicinc.com, ram.gupta@oss.qualcomm.com, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, neeraj.soni@oss.qualcomm.com Subject: [PATCH v5 1/4] mmc: Allow host driver to control the re-programming of Crypto keys Date: Thu, 30 Jul 2026 19:38:19 +0530 Message-Id: <20260730140822.1976635-2-neeraj.soni@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260730140822.1976635-1-neeraj.soni@oss.qualcomm.com> References: <20260730140822.1976635-1-neeraj.soni@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: mEtuLLi8b1rUugv25US3q-sxHYAMbnQ_ X-Authority-Analysis: v=2.4 cv=JZOMa0KV c=1 sm=1 tr=0 ts=6a6b5ae7 cx=c_pps a=7E5Bxpl4vBhpaufnMqZlrw==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=qCc5xqAkgSuM58seIEQA:9 a=pJ04lnu7RYOZP9TFuWaZ:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMwMDEwNyBTYWx0ZWRfX5yDOvdJftexS nnDU82oiQ1oI/9e6jNkzl841cLBdwd+QzoxTcDOUJq6fVFhDIgOq1wWLN++DRFsgilGeSyWT8Xb UZ8H7ePkTbFlWBILsq+V+jIKIT6XrOg06DPiT7WTZp3mHL1dMHwLxNZtw1gwSZkVdJ8ypW/3FLa XlFKeFqk7T7FRZBu+d49i+ohW6HFCAgdNqYcUnwY7XrXsXkJ8+efrUK1lYDC6w3W82Pv0WftMJ/ wKJaA5k/ciBEzdzEcZ3JN5k9m5UpUaTFZUZlyVypM8V1oHWfn43GGW0BjsxUESm6hLKt/h8qQX8 iN1rIUuY5uDQzEovTEqxMaiJt5YkqY1zLJMnNq6+QfDBRQIB8EVd4buYvNtXN/zn3GQSsrcwsgP ythU/1rwQDEXf6hjYrOeUzookjwkwOEejWJMc63VtZF9bLfqRZuZiCqRxMoJr27+lBwbzULgYEr Mm3eTTUf1h04C0zWINQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMwMDEwNyBTYWx0ZWRfX7uTyPVFzzTa5 OOzQ7F9i+zSJxOOLnJLDvmkRZlk0maJQRUTVJ66SfL+loEjU5mGGX+r2nJz/UOlzLow6Oyfh5BX hMLanaeedxTvtEwT6TThSvn6vRym/Cc= X-Proofpoint-ORIG-GUID: mEtuLLi8b1rUugv25US3q-sxHYAMbnQ_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-30_04,2026-07-29_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 lowpriorityscore=0 bulkscore=0 adultscore=0 phishscore=0 clxscore=1015 malwarescore=0 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607300107 The register context for the crypto profile belongs to the sdhci/cqhci host and not the mmc card, hence re-programming should be managed by the host driver itself. Add the flag MMC_CAP2_CRYPTO_NO_REPROG as part of host->caps2 to control reprogramming keys to crypto engine for SoCs which dont require this feature. Signed-off-by: Seshu Madhavi Puppala Co-developed-by: Ram Prakash Gupta Signed-off-by: Ram Prakash Gupta Co-developed-by: Sarthak Garg Signed-off-by: Sarthak Garg Signed-off-by: Debraj Mukhopadhyay Signed-off-by: Neeraj Soni --- drivers/mmc/core/crypto.c | 2 +- include/linux/mmc/host.h | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/core/crypto.c b/drivers/mmc/core/crypto.c index fec4fbf16a5b..a5a90bfc634e 100644 --- a/drivers/mmc/core/crypto.c +++ b/drivers/mmc/core/crypto.c @@ -15,7 +15,7 @@ void mmc_crypto_set_initial_state(struct mmc_host *host) { /* Reset might clear all keys, so reprogram all the keys. */ - if (host->caps2 & MMC_CAP2_CRYPTO) + if ((host->caps2 & MMC_CAP2_CRYPTO) && !(host->caps2 & MMC_CAP2_CRYPTO_NO_REPROG)) blk_crypto_reprogram_all_keys(&host->crypto_profile); } diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index ba84f02c2a10..83d92fb64417 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -457,12 +457,9 @@ struct mmc_host { #define MMC_CAP2_CQE_DCMD (1 << 24) /* CQE can issue a direct command */ #define MMC_CAP2_AVOID_3_3V (1 << 25) /* Host must negotiate down from 3.3V */ #define MMC_CAP2_MERGE_CAPABLE (1 << 26) /* Host can merge a segment over the segment size */ -#ifdef CONFIG_MMC_CRYPTO #define MMC_CAP2_CRYPTO (1 << 27) /* Host supports inline encryption */ -#else -#define MMC_CAP2_CRYPTO 0 -#endif #define MMC_CAP2_ALT_GPT_TEGRA (1 << 28) /* Host with eMMC that has GPT entry at a non-standard location */ +#define MMC_CAP2_CRYPTO_NO_REPROG (1 << 29) /* Host handles inline crypto key reprogramming */ bool uhs2_sd_tran; /* UHS-II flag for SD_TRAN state */ bool uhs2_app_cmd; /* UHS-II flag for APP command */ -- 2.34.1