From nobody Sun Feb 8 18:31:54 2026 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 17602387596 for ; Fri, 16 Jan 2026 12:10:13 +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=1768565415; cv=none; b=Zf4HUQMNafhsFjoXusMsO4wIjUZ7uukNR3p+9YIo14OixE3TMPJyALIfHIdzRcqrA7G69B9hxC9nmw/AESReQRXjWO4iPlhwkud5Dv6CnNMbb81GM1QqBK2oAter3HrBL2pTkbQZWbN3PimvxxY+4mMgVzcw6MV7Taf/5u+0uI0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768565415; c=relaxed/simple; bh=6f1yewdQNAvzhTorAE4vlmfc43dQqF127s3Sj9aOM8M=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=i5ywwxngLo4Jdgdzl4lTBk+kn7c89kp7pC8QuLv9W98NU4COdQUcaH7QuYYob1Vtlshj2kuPLQgxwlYTfQVENf2QBH1w9WRRQEbz4H240bhM/aDmj5z5aNdJq0vPlOdFCiViHm66wL+unTsN8BlXc+7Fmebpn+fdkVKdXh5qkmY= 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=Xl8OXfXQ; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=jvIIle49; 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="Xl8OXfXQ"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="jvIIle49" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60G7munE3075001 for ; Fri, 16 Jan 2026 12:10:12 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=jfVgXHiiwMr5n57sN+arNA+BDgMG+rIWJxI PeANId+s=; b=Xl8OXfXQPq0X6onNu3HI9gqaFB/4yoAD6sV7FiD1Gw+lQgLC+Px TX0rkwTmUrHH2CmbNBVRcrG9gW6qsT5ybqgoYq59qDV/LAne6SMAEoa4AfKBVHcM /hkr8eo4BvVxNmCoJwf1uDJzVlpcu7IpbwLV22QgzRXJJSIZjF0AWZ4+DlSabLsU 3tzeX9zzeMOexzRdDqoj3ozc/VqEIMxdGXBB6MJFTu5QejO/KNQnD8OcP91QSizR 4aI6pQs0iXW5YnvSTgVXdJOMUI6vav8HWYmlmAQ6a8s8i1UOHfzrrcPx1FgOQaUt COf0IaGcymb6FI9lBbTScyHfHrq5we4bx/A== Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bq98jt2wr-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 16 Jan 2026 12:10:12 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-34c2f670a06so1668682a91.3 for ; Fri, 16 Jan 2026 04:10:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1768565411; x=1769170211; 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=jfVgXHiiwMr5n57sN+arNA+BDgMG+rIWJxIPeANId+s=; b=jvIIle49wdLGLYnWe1HwVyq8JleRJk7R4EjQrMfC3jRj+XbBC4dqOm5K8NltuszPkX v70msIt91p3hUcPIRWWH/40E40GXImDFKs37qKGQeX1KdPxO5LIl3iG74WeLfW0y01oU D9Fz6lqYOgHUgDK5MPzAOr28ssnIJwF6/dEroqiGcCAfrcb4pmx4fFo9ZEghDD9zj5x/ Y83XouL5b/7DuqfRTDDZb/5nsol45bhY0ESnVtzgUrA7XMsvWx/+vsc/fkcXDq2nQnWZ AU9gnh18Cq1WbfB6oFKDqQ97xHA/pvowQgGwKKHMXZ94RgVWcGK/9tqxuT/TxsnhlH26 1ncw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768565411; x=1769170211; 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=jfVgXHiiwMr5n57sN+arNA+BDgMG+rIWJxIPeANId+s=; b=YYLZyMnobivWGkoIifTvBd8XchtrJRrNAE2vugdSkBwW+AoDo0SC+mJJpKs1W+zE25 gwdOkGrV10bgFQBkw8JmtLERpPiHd0cO4GbP2Si93oFoqcUhf4c8zzMn6qmAgnNvqbkG 0hzasiu60hnQjAQ2JLWryMw2sY49hmr2yV4iV9lF0DezzC8qE91ceN5YTQj8TB0Xu59Q RDl3JvquoLCxx36xnGmjCuh3vP4ztI3tU87JT5JMu40g5gz7PHRSdUCbRAoQNeqJdLa7 x43MtOJ0MeXeFlaw3TnblP7+OazMdvc55vmpfc25A+3zjEZEQsc9WnzSDRAABy0UftFC Ga1Q== X-Forwarded-Encrypted: i=1; AJvYcCWjHpIet9XXYAnf5apu64WUvdvsBjdOFhCHHbK31M3kdH5JK0pwy4sTfI8SwsTHoQxrXBWfkzshCe3phbM=@vger.kernel.org X-Gm-Message-State: AOJu0YyQRDTioDHpztEWZtoIO71g4hfm5wH6dwsdcH7VLNQpUpuYvLEI Ykyz7mcPNMlTqP86p+q467JacO7vq9cGzrxrZf3LKDzcb8J9C/r4y74F0VhGzA0ehqFSeFBiQ3E CAWBSgVboAYloaZoMiQ+rjhzsINoyTBqOBT0QJod+Qqa9xUI12lXxsgx1B/GnPndz06E= X-Gm-Gg: AY/fxX7ovExEAYayiWg28dltrwC6RaGV8Q5PLxLTqK/s3gY1TeOHoPUeLC79M8jHTVV P2WPW2zuRjXR0JU1kTh3g5+F+VSdnG/cnGWyTTNbEBF5BK/cxi8bRnHEOWCwN/XX8ncqmLeC5fA JOsel/j0BS9c8plFzVQ8iyr7g/6Y9Z/vvILTV13t28uXr72wC4VoosPNTh1K9FEXt0OsMhChHJp +OLpRAwyQm+lTkekMhJs9EjSyL3MuUgAWwlC9mryA2vK/KFW1pbWpATSQwC2CEenF99uvIoLHZw v474XIvro9US/Oz2HLkBF3m69qsOx1etxzIhshzE5rQFLvoHFZEqLl6O+vNDNrY46AYEPEgLNqv Hq4klE2cbW9Ogmgna0moYkfMP1+xxevapXlupjzUF X-Received: by 2002:a17:90b:4d0d:b0:34c:c866:81f2 with SMTP id 98e67ed59e1d1-35272ec4aaemr2154762a91.4.1768565411232; Fri, 16 Jan 2026 04:10:11 -0800 (PST) X-Received: by 2002:a17:90b:4d0d:b0:34c:c866:81f2 with SMTP id 98e67ed59e1d1-35272ec4aaemr2154736a91.4.1768565410744; Fri, 16 Jan 2026 04:10:10 -0800 (PST) Received: from hu-neersoni-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-352677ca9acsm4527093a91.1.2026.01.16.04.10.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jan 2026 04:10:10 -0800 (PST) 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, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, neeraj.soni@oss.qualcomm.com Subject: [PATCH v4] mmc: Avoid reprogram all keys to Inline Crypto Engine for MMC runtime suspend resume Date: Fri, 16 Jan 2026 17:40:04 +0530 Message-Id: <20260116121004.1829223-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=asW/yCZV c=1 sm=1 tr=0 ts=696a2aa4 cx=c_pps a=0uOsjrqzRL749jD1oC5vDA==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=VwQbUJbxAAAA:8 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=d846rY_4ajozEFWswkwA:9 a=mQ_c8vxmzFEMiUWkPHU9:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-ORIG-GUID: xvv1h0B4wDzwuoLs-TP01WgsYnPfInaH X-Proofpoint-GUID: xvv1h0B4wDzwuoLs-TP01WgsYnPfInaH X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTE2MDA4NSBTYWx0ZWRfX1YzgqWp55PIY Z+E7YD4pbadt8+fu6ZA4xC+Wx/gPIE3m7u3vw3oUdcyYhhDOkxjbRMpdCDCW2jlFZ0kdx8upZ9K Rs2oKZDBCfdzDy1FqGS6sfq/VnckbcQE0ylNQqwp5NC0wrH48YxyfmQSQUesuAWkJfxIg1jr5VS lq5/0m58ZqIzxJxStKdLCWJFhqge/yblp6+5KJO58AcR6C/RJCrnCFh/49nmqFO6jrWmOovdekK gxk5MFlKpPbaHMikzg2zbIEXVeQT3qz0cR8iitOEt7fPSoOx7J74bCW6Rt5tX2eXuX1jJd7x7o+ UckG2PK5AX3TuNj53SrawMesV3MTlo4bE8zfs77L6MlVb/cKrgOugIrbnXhyWAmaMaKxAvV5W+x /I1od8p+WLr0LgG3KTz0sMH7Lwvs75pI9KJfO54Epm49nJ7+SUd9pwzZIIcvzTyZVaANWVBqDK3 ZWNvvdG81A/WpgSs+vQ== 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-16_04,2026-01-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 impostorscore=0 bulkscore=0 suspectscore=0 clxscore=1015 adultscore=0 malwarescore=0 priorityscore=1501 spamscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2601160085 Content-Type: text/plain; charset="utf-8" From: Debraj Mukhopadhyay Crypto reprogram all keys is called for each MMC runtime suspend/resume in current upstream design. If this is implemented as a non-interruptible call to TEE for security, the cpu core is blocked for execution while this call executes although the crypto engine already has the keys. For example, glitches in audio/video streaming applications have been observed due to this. 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 Acked-by: Adrian Hunter --- Changes in v4: - Removed the "CONFIG_MMC_CRYPTO" encapsulation for "MMC_CAP2_CRYPTO" and "MMC_CAP2_CRYPTO_NO_REPROG". Changes in v3: - Renamed MMC_CAP2_DONT_REPROGRAM to MMC_CAP2_CRYPTO_NO_REPROG in the commit message for clarity. - Added parentheses around the condition: (host->caps2 & MMC_CAP2_CRYPTO) to improve readability and correctness. - Updated the comment associated with MMC_CAP2_CRYPTO_NO_REPROG to better reflect its purpose. Changes in v2: - Renamed MMC_CAP2_DONT_REPROGRAM to MMC_CAP2_CRYPTO_NO_REPROG for improved clarity. - Defined MMC_CAP2_CRYPTO_NO_REPROG for MMC targets that do not support a Crypto Engine. - Restricted the usage of struct crypto_profile to MMC devices that support a Crypto Engine. Changes in v1: - Addressed the comments from: https://lore.kernel.org/lkml/20241006135530.17363-3- quic_spuppala@quicinc.com/T/#m69c9ab538bd9efd54515646952d0d7d1d7c17690 - Avoided reprogram of keys for Qualcomm SOCs only. - Ensured reprogram of all keys on host controller reset. --- drivers/mmc/core/crypto.c | 2 +- drivers/mmc/host/sdhci-msm.c | 6 ++++++ include/linux/mmc/host.h | 5 +---- 3 files changed, 8 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); } =20 diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 4e5edbf2fc9b..2ccb63dde9c1 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -1949,6 +1949,7 @@ static int sdhci_msm_ice_init(struct sdhci_msm_host *= msm_host, } =20 mmc->caps2 |=3D MMC_CAP2_CRYPTO; + mmc->caps2 |=3D MMC_CAP2_CRYPTO_NO_REPROG; return 0; } =20 @@ -2526,6 +2527,11 @@ static int sdhci_msm_gcc_reset(struct device *dev, s= truct sdhci_host *host) usleep_range(200, 210); reset_control_put(reset); =20 +#ifdef CONFIG_MMC_CRYPTO + if (host->mmc->caps2 & MMC_CAP2_CRYPTO) + blk_crypto_reprogram_all_keys(&host->mmc->crypto_profile); +#endif + return ret; } =20 diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index e0e2c265e5d1..2fd76f966e24 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.3= V */ #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 en= try at a non-standard location */ +#define MMC_CAP2_CRYPTO_NO_REPROG (1 << 29) /* Host handles inline crypto = key reprogramming */ =20 bool uhs2_sd_tran; /* UHS-II flag for SD_TRAN state */ bool uhs2_app_cmd; /* UHS-II flag for APP command */ --=20 2.34.1