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 A7B9230E85E for ; Tue, 4 Nov 2025 07:36:49 +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=1762241811; cv=none; b=usKwbe4lyx6JzLxOW27JVaBG/XcbSPYg04NIICG4aXJBifLKJtf4e0wv7EZwRZOHJXONYNm3MaFrvsOdvmEVYdK9+lIJ14IQk9/DxOZ0ph493PBmEvUZXiwBpeUAnNDhFQs5p+JXv0+A4hg83jJlFWmFseSou3rCc+licQkPGoY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762241811; c=relaxed/simple; bh=jHKanraOrHEA4wVchAje3yOn5cqKuVeh1+NXKfMc8NM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iTN8ptY6SA299huHvovioqmDvRM3Ndga+rlFcTDlO66eW5luNjrSqZa8Nu0evJZt8rsfIFD4JGTVjcskypmT0chGGHSLqaiKWFpTvaZqcaHqF1r4kzGLNN1PyRx7ZQ6I4c5kmLSrq4SRkQ8VUynbh+ypCwbz8uDdPy/2wNqIdns= 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=Wzo05kZz; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Qqjl9cL8; 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="Wzo05kZz"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Qqjl9cL8" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5A42rqc73693365 for ; Tue, 4 Nov 2025 07:36:48 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= HeYU+B3c3Q+vTu3kdwO0nN56OnhgVZNR+2+kSV51GUw=; b=Wzo05kZzmTnI2+T8 t5lax0FDgDvSLdKuFTkLC4RmndHp/FsEkLv3g9GJVRnRWi9vTZitYsI3t1dobbhU wZCuc9m3j/pBR2qKeYT7rpoMRD3EtezupynesTVUP7/ii1xbOvyQCc0D4nBXtTiz NkXugQ8insiUgCq/hBLLOTSllylMVMcv2FgIDxoVgGE0hdZJN/JSCY1YR4tGyY0W H3KUBLX6JiuRyuEUc52ZCQSZOs5mJU++iuz4Os3TSsERbOCd0PKUGnbQ0mNV/3CE /YZHmiL5FGeQkQ8NW/Q7uOBuAKBihwM+EvO0a01vYdeEhKrGgVIWZYI+xmQNRTBo qYG3zQ== Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a6u8b31yn-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 04 Nov 2025 07:36:48 +0000 (GMT) Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-b9b9e8b0812so4161226a12.0 for ; Mon, 03 Nov 2025 23:36:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1762241807; x=1762846607; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=HeYU+B3c3Q+vTu3kdwO0nN56OnhgVZNR+2+kSV51GUw=; b=Qqjl9cL8JK3NGIE1ilKJySal3ZG/+uNgqgGv+r3dmyiTRa4beZ+6MQ9JpgbxFVspeM s96dqOzhWMVNWXNzxT3ORl77Mpl4VyvbCK/ZGGIj3rf/UIFiTgmP2hFQt+UtHx4EjzEH xtyQj9P3WOHUno1d2jODyAq8MRyvN9uFZr9VoERoXOREvH6il8BFPNCEaWxcjCkdzvGM C3Fe4b3KKb07uIDz0Ql2ByQcOPcjOR/ckXgQkpF1IpBDi+SP5x8blWZbNc+D72FZ5DxU QOcGtZi+YPljvGqTMMhJWOKDjHoufK/csQknG6VRxgX1zgX1ngmlF9XepdlcN0qLmHPU bpWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762241807; x=1762846607; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HeYU+B3c3Q+vTu3kdwO0nN56OnhgVZNR+2+kSV51GUw=; b=N3QmDHEtITdCrKTi1kOPx9jgLdUoOoxV3XwEdMtgzrDY7yn7pbBeiAGWztGkHfY3CI hkmlekxNeI5xAsVTzFhXcDJAyp2CoIQmnwOfSLYwTSrj0HuIuynRQ1de3/UFidcPyJCm 3xFxnrxGZfrKodvMz9mI3c5mOlO+Iyv23bc+KhT7xRtwxcvcuSTEVV6KNFOezBsAml2L KhpZRnLOEg11V2sVg96uxHjebYUSsO8xUADMosxqMvTU8J7Ox/1LgqX+HdQnfUVFpIy0 Ea+NnF6+Gig+RGXffGXYAL8y+GkMoPrFjaqwKd9ucQRBP4xbIYBFA0PkIJyQgBMXoCww SgWg== X-Forwarded-Encrypted: i=1; AJvYcCX340w0pJKoHeIg2S4mcMUM9pRop9437yzA/VpH+PivfzwaATYSAkJgD+h4eIhcPDcZUuRn38g4VeAD@vger.kernel.org X-Gm-Message-State: AOJu0Yza0GbeMF/Vg8l797Nndrzpx2ZUyzdPUPDOBIwT34w0nDX1y5Dk R2CD+YhKO27pux0RD35tnijZv/PpJKrH2d/D7YatjP7pos3YXFbAO4IPfXoiQ4Dp+bKK2RGluvC //d8mTeWBX5ArAqiQ/h1J3ddSL99NudU1q49S3LBNWhYnPy1eNvyx6R1Q2ydHINtX X-Gm-Gg: ASbGncv5Xdxo6kwQMHf1j3K55qJF8XSS31apZs46u/kP/iGy8A/XXNfzsIpQ424LJpE s2WXFjbf3Kmp8DX/aVVROIErsGycAnKTq4XYmQKrwqC/Fsij/5iZ3Pasi2z3r09AR6HffsGGqea RMif81vrxyL4dz8LWOa5CUYGjNGlzxOroABsrw18RmA2M8VxIT2gxaNT+DHhS4R7+f9/4pmVl9W K9NV2gpGIzELNd+hZWDbl/kihnjNLiQFW4jnz5iirvb7EP4bw7y4kb679c3n5Y3ODjLJ9UCY5fV Ip7moA+lmMJIQZmFvSe2eRWJPefo1tYccUH6e5m6vsoL1Q9YAhpg72omwQVB0oJkj74ZJ5yQhKb ysrRGWWD60YqOAoJNo1GjJLJByQ== X-Received: by 2002:a17:902:d4c4:b0:295:9db1:ff32 with SMTP id d9443c01a7336-2959db2085amr109034335ad.48.1762241807224; Mon, 03 Nov 2025 23:36:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IHpfEAN1PLytB3qEo/p/sLyJSXLV9KSQt6TqyGBqMolto056kpsAwVModwBzcd4TQPHOTiYog== X-Received: by 2002:a17:902:d4c4:b0:295:9db1:ff32 with SMTP id d9443c01a7336-2959db2085amr109033925ad.48.1762241806615; Mon, 03 Nov 2025 23:36:46 -0800 (PST) Received: from hu-mojha-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3415c8b5cfcsm3484367a91.19.2025.11.03.23.36.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Nov 2025 23:36:46 -0800 (PST) From: Mukesh Ojha Date: Tue, 04 Nov 2025 13:05:50 +0530 Subject: [PATCH v6 10/14] firmware: qcom_scm: Add SHM bridge handling for PAS when running without QHEE Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251104-kvm_rproc_v6-v6-10-7017b0adc24e@oss.qualcomm.com> References: <20251104-kvm_rproc_v6-v6-0-7017b0adc24e@oss.qualcomm.com> In-Reply-To: <20251104-kvm_rproc_v6-v6-0-7017b0adc24e@oss.qualcomm.com> To: Bjorn Andersson , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Mukesh Ojha X-Mailer: b4 0.14-dev-f7c49 X-Developer-Signature: v=1; a=ed25519-sha256; t=1762241765; l=2601; i=mukesh.ojha@oss.qualcomm.com; s=20250708; h=from:subject:message-id; bh=jHKanraOrHEA4wVchAje3yOn5cqKuVeh1+NXKfMc8NM=; b=fdvnZ530B5W8QH0VYExztLyTq/xmlM9pRXL2DXQMcol6tCs+zK86Y9+d3dS/Nf5PR5x0xEuGt mLjGZT2lBhQC+RLOL6O5uutQinWdojKunlS+iKFt53e0PWU+3aiGhVb X-Developer-Key: i=mukesh.ojha@oss.qualcomm.com; a=ed25519; pk=eX8dr/7d4HJz/HEXZIpe3c+Ukopa/wZmxH+5YV3gdNc= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTA0MDA2MSBTYWx0ZWRfX+Mlw2KWWEzdj 1JcT8CjbCTZzWPoyfR0l16yr5K8VnB10wzMFGUHAnnUHRzz6pAKv3OuLux8E4v8o+9EReMNdax0 LTT3dgv38eWzjzMn99FE/9YXrtDi9dvIOgRh9yWYKgOmB+Y/tACUn81JAfXP6xdyJ1g82Y9NjIH OZ88YnxDBmEewmUfaQaezEMwnN9vXKajhPsgTV14I9iQyl9iSYGBvGNzOVof5kbuS2zkzRd6XAw j4FaGsvuM8VvoJU4mzorz0I2nSREzwdnut/XCWPjMQz4XRuvZhQ9fGDATO+pqrenamtrMgNTulq +r930UVmo2m3AKE68pMiLOcI75/AlKtk/HwskT/+e+dcrMQk6IXp3YUeVl8o+JdKXCN9rJVH5to /mXXgdO3ePBBkskrIK20CJiWh0lyCg== X-Proofpoint-GUID: frPBLnmolOfPhJU657VVe-H4qxTtNmxR X-Authority-Analysis: v=2.4 cv=Ha8ZjyE8 c=1 sm=1 tr=0 ts=6909ad10 cx=c_pps a=rz3CxIlbcmazkYymdCej/Q==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=08WIqK_J-xaQODWVIAIA:9 a=QEXdDO2ut3YA:10 a=bFCP_H2QrGi7Okbo017w:22 X-Proofpoint-ORIG-GUID: frPBLnmolOfPhJU657VVe-H4qxTtNmxR 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-03_06,2025-11-03_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 priorityscore=1501 spamscore=0 lowpriorityscore=0 malwarescore=0 clxscore=1015 phishscore=0 suspectscore=0 adultscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511040061 On SoCs running with a non-Gunyah-based hypervisor, Linux must take responsibility for creating the SHM bridge both for metadata (before calling qcom_scm_pas_init_image()) and for remoteproc memory (before calling qcom_scm_pas_auth_and_reset()). We have taken care the things required for qcom_scm_pas_auth_and_reset(). Lets put these awareness of above conditions into qcom_scm_pas_init_image() and qcom_scm_pas_metadata_release(). Signed-off-by: Mukesh Ojha --- drivers/firmware/qcom/qcom_scm.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index aabdef295492..9d3e45ec73ac 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -625,6 +625,33 @@ static int __qcom_scm_pas_init_image(u32 pas_id, dma_addr_t mdata_phys, void *me return ret; } +static int qcom_scm_pas_prep_and_init_image(struct qcom_scm_pas_context *ctx, + const void *metadata, size_t size) +{ + struct qcom_scm_pas_metadata *mdt_ctx; + struct qcom_scm_res res; + phys_addr_t mdata_phys; + void *mdata_buf; + int ret; + + mdata_buf = qcom_tzmem_alloc(__scm->mempool, size, GFP_KERNEL); + if (!mdata_buf) + return -ENOMEM; + + memcpy(mdata_buf, metadata, size); + mdata_phys = qcom_tzmem_to_phys(mdata_buf); + + ret = __qcom_scm_pas_init_image(ctx->pas_id, mdata_phys, mdata_buf, size, &res); + if (ret < 0) { + qcom_tzmem_free(mdata_buf); + } else { + mdt_ctx = ctx->metadata; + mdt_ctx->ptr = mdata_buf; + } + + return ret ? : res.result[0]; +} + /** * qcom_scm_pas_init_image() - Initialize peripheral authentication service * state machine for a given peripheral, using the @@ -651,6 +678,9 @@ int qcom_scm_pas_init_image(u32 pas_id, const void *metadata, size_t size, void *mdata_buf; int ret; + if (ctx && ctx->has_iommu) + return qcom_scm_pas_prep_and_init_image(ctx, metadata, size); + /* * During the scm call memory protection will be enabled for the meta * data blob, so make sure it's physically contiguous, 4K aligned and @@ -696,7 +726,10 @@ void qcom_scm_pas_metadata_release(struct qcom_scm_pas_context *ctx) if (!mdt_ctx->ptr) return; - dma_free_coherent(__scm->dev, mdt_ctx->size, mdt_ctx->ptr, mdt_ctx->phys); + if (ctx->has_iommu) + qcom_tzmem_free(mdt_ctx->ptr); + else + dma_free_coherent(__scm->dev, mdt_ctx->size, mdt_ctx->ptr, mdt_ctx->phys); mdt_ctx->ptr = NULL; } -- 2.50.1