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 E4F2F258EFE for ; Sat, 20 Sep 2025 19:42:16 +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=1758397338; cv=none; b=D40BIBhvrSf9dk55zyICdEp4y4Xpkm5CHpTTX8dy78h18l25fMhRK8vMO4ViDcdpdCmFr1p/s2S1Qam1aVkM918BvSmKGsvGGJe7vygYXs2wCuDvH48+LGl8hs9NDg1Ruo1pvxg1fuUkVYijs6OKm9F6VL5HNTEsK3EC0xfGlAs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758397338; c=relaxed/simple; bh=mBK4xWLjc9TvI3NeWK+E9cswJ+S05RkyGn/yLnOBu0k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZSdaASEHMyD/EGSL9GcqpSfeQACaI1j/piHaps36dpoqF6tgKg54GyHxM5xysi7jGhWBAQo2RIcgBFHj+c/ByKzYEk958w9lUXMtbZcR3HDibX8ww3uwCfipLmZEr2hzGKfboB70MVrEy5+T8aqmnYLSqeYoNIWTvAT7I9dQTqw= 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=K1n6KilZ; 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="K1n6KilZ" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 58KIgMqL024558 for ; Sat, 20 Sep 2025 19:42:16 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= krWOjnzkrbH0g6vYLA5+TbCnPOx5zLg6rDU2gNyS5OE=; b=K1n6KilZMmzWEgTT NwAoCJ3phSjsYv744K4nTRkvuxf4IaWMRYjEqKibkzmD3GYI61NaPDvppqjU+HEX nmOr3dL5QCRfQ773iKQZNwtXisS5qweBSeiDK9T41FOzc2+NIKzPC6/Cu/gVqb4J PKupKrGSoeWOxgEdtu7wjPjU8qSUbVAc3HYhGlb3daw/tUMrn31IByxnC0FZsSce z9E/3mjyj7+riHpHwwo2EjlJkriq5Hc+In6VuogMJQ636LVtPTLxaRw6bhPM4uEM svG4hVpskv1ldw3sAPK9tCN4vzq0AI+e033ZU+gXg4ToIXOxbSNFKp/zh4FJe8yF SXNySw== Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 499mg316c5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sat, 20 Sep 2025 19:42:16 +0000 (GMT) Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-77c3fca2db2so3099926b3a.3 for ; Sat, 20 Sep 2025 12:42:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758397335; x=1759002135; 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=krWOjnzkrbH0g6vYLA5+TbCnPOx5zLg6rDU2gNyS5OE=; b=Dedo+wBut+cUGwFgYeOl+9/0jyb9UnPAx/zHn/rWXHo3ygc4u/R0C7aQuEj0/AgfcS aL/m3vqLk8SNII0JlXS5Pt35RnB6eYXhHlNHblL2DP4bPg/XU9zD9/IMT3Yjsq6DD7uR TQvTl/MiHi9tYVdRg15Bi+4SRx/mYh2LRatqF21IIYcrYM/APjfVjOC2BpPrHTAyHaZ1 cn/nYJ4npZLeh42m2UR8ynXT3RVxxEOeefLCL5QsNLijtILHBf3XWczsEfDtZdTI7fHf mSZFcoSIIM7Fx4NRlEnU4UAizDFIAmTAGI1zs++gJNi5NP8qNiYRrnWQdrtYttR1qice Au9Q== X-Forwarded-Encrypted: i=1; AJvYcCW1fZc+f9bDOl1LfcST/7d8eh4ea46SF8zibm6p3Ju0rgflb6WIrIMgZIhFlYGS1twEBJf2yRDyUAki@vger.kernel.org X-Gm-Message-State: AOJu0YzS6GUL5+W4k0HjBs+gFaiWrQmhj5A3X+aHUL/2FZXJ+bnKEK6h AYSAHJodK6qhqvDekHmiNNQ6qY3Fv/lZ8iGYop4CaUVpk7F7fyf5pZi7R58dWL2NbWBSFH526U1 +i811MjQxj9PNuYvwqXwLvFOfAx3P1Zu3FW+mJg/p6zZjkE7A9BMQ5Wwzs9pImJS3 X-Gm-Gg: ASbGncvUFozZl7hRXDi6DozA9UI9tEQneEYa1+XHlRhvtm7eDJDYCWs5y+xr4MtnyT9 FGNoA1cHc2SxSKGYUDdzfD7qjeQRoJCAERFGwVL2teUJ0qVBXyQlIFVSAawEVLhBCaei2jTxikf fBNZu7F5fZt9skPdPGr7B5FxP1urV8JJ6vCTLqekCnJBync1WV8u17KGWm4wjhnHPKLwHTlAGV+ 1AOb7DKiBOzBOQQ7U6oZ9uWVhaRlIoZsfj4P/hy7w4AMFHmCE8lzPLSp8lGLCuTCgHzGXz6yFDg r+g1aLKbiBzWyPPd+Y8hxyU67az9/z5OFZfbCD8PXLmKYqCUo8rQTDTaT7i5pHlAJ50= X-Received: by 2002:a05:6a00:1887:b0:77f:1a7e:7bc0 with SMTP id d2e1a72fcca58-77f1a7e85b8mr3754463b3a.31.1758397335132; Sat, 20 Sep 2025 12:42:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGV35Jn9czRic6iek7gBq+/mlLZBS+H4J2dQxank8bmcsZ9RqYi8lJrTvOkhjVCMIyNxrsldg== X-Received: by 2002:a05:6a00:1887:b0:77f:1a7e:7bc0 with SMTP id d2e1a72fcca58-77f1a7e85b8mr3754440b3a.31.1758397334649; Sat, 20 Sep 2025 12:42:14 -0700 (PDT) Received: from hu-mojha-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77f2c8aa554sm143767b3a.34.2025.09.20.12.42.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Sep 2025 12:42:14 -0700 (PDT) From: Mukesh Ojha Date: Sun, 21 Sep 2025 01:11:06 +0530 Subject: [PATCH v3 08/12] firmware: qcom_scm: Add shmbridge support to pas_init/release function 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: <20250921-kvm_rproc_pas-v3-8-458f09647920@oss.qualcomm.com> References: <20250921-kvm_rproc_pas-v3-0-458f09647920@oss.qualcomm.com> In-Reply-To: <20250921-kvm_rproc_pas-v3-0-458f09647920@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=1758397299; l=4327; i=mukesh.ojha@oss.qualcomm.com; s=20250708; h=from:subject:message-id; bh=mBK4xWLjc9TvI3NeWK+E9cswJ+S05RkyGn/yLnOBu0k=; b=z06YF6QW6ueOYS8siinVNpmEvicINaR6G79VHDCfpn2owna8zBLYNRBMIE21hyFult04e4oit p+BH6vHPaBiAjNIgbzwS5c8rBWh5+cfg4BVR/e26XZQu1rhsS+DaaLj X-Developer-Key: i=mukesh.ojha@oss.qualcomm.com; a=ed25519; pk=eX8dr/7d4HJz/HEXZIpe3c+Ukopa/wZmxH+5YV3gdNc= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwOTIwMDAzMiBTYWx0ZWRfX7OW0PcUWGAf/ o9uw65C+lC1OGGnk0TC7kn9LKeZrNQR28iwYVaLF9958t4cOc9GT49xTJtlLe4mS5eIM20NWQND AYx/GsmmXoWHdSwxI/B2p7o/Pm5fz8i6XZHe8rmUWBQeoBRdcByDmaVv8ZMG/po1EvNALvROTFL Kn3ezs6885geQTh7DpYl6QgruROSod13iTDQtssrPsgpbOxBBfwYU9iD/8+VW2bOD0yTjh6zwh8 nKGA2DfqNXS5/yFKyP/J0pV6AZcdJVrlSqPTXGHtax11XgAzBr1++OfSXf3kH0nUVwHlrpYBWDn gZxNBCS5mfMDnn609tQQ3u7kPq2XceNQKNpwCTd5cRaIuhKiWEzNr+bnye7xnLsj1KHwgohJ1iD sEuMzDzt X-Proofpoint-GUID: uvrzhoGROTfbXvLq8549Ozefm5YuXSQk X-Authority-Analysis: v=2.4 cv=UvtjN/wB c=1 sm=1 tr=0 ts=68cf0398 cx=c_pps a=rEQLjTOiSrHUhVqRoksmgQ==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=yJojWOMRYYMA:10 a=EUspDBNiAAAA:8 a=PUsy4RtU_kHwXTlAi2MA:9 a=QEXdDO2ut3YA:10 a=2VI0MkxyNR6bbpdq8BZq:22 X-Proofpoint-ORIG-GUID: uvrzhoGROTfbXvLq8549Ozefm5YuXSQk X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-09-20_07,2025-09-19_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 adultscore=0 impostorscore=0 bulkscore=0 malwarescore=0 suspectscore=0 clxscore=1015 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2507300000 definitions=main-2509200032 For memory passed to Qualcomm TrustZone, it must either be part of a pool registered with TZ or be directly registered via SHMbridge SMC calls. When QHEE is present, PAS SMC calls from Linux running at EL1 are trapped by QHEE (running at EL2), which then creates or retrieves memory from the SHM bridge for both metadata and remoteproc carveout memory before passing them to TZ. However, when the SoC runs with a non-QHEE-based hypervisor, Linux must create the SHM bridge for both metadata (before it is passed to TZ in qcom_scm_pas_init_image()) and for remoteproc memory (before the call is made to TZ in qcom_scm_pas_auth_and_reset()). When QHEE is present, it takes care of programming firmware stream and mapping resources for a remote processor which Linux need to take care on its absence. Remote processor driver should appropriately set ctx->has_iommu to let PAS SMC function to know and creating shmbridge for the call to work Lets put this awareness into qcom_scm_pas_init_image() and qcom_scm_pas_metadata_release(). Signed-off-by: Mukesh Ojha --- drivers/firmware/qcom/qcom_scm.c | 46 +++++++++++++++++++++++++++++++--- include/linux/firmware/qcom/qcom_scm.h | 5 +++- 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index 022529778f84..6376a58a059c 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -642,6 +642,35 @@ 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_ctx *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; + + mdt_ctx = ctx->metadata; + 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 || !mdt_ctx) { + qcom_tzmem_free(mdata_buf); + } else if (mdt_ctx) { + mdt_ctx->ptr = mdata_buf; + mdt_ctx->addr.phys_addr = mdata_phys; + mdt_ctx->size = size; + } + + return ret ? : res.result[0]; +} + /** * qcom_scm_pas_init_image() - Initialize peripheral authentication service * state machine for a given peripheral, using the @@ -668,6 +697,11 @@ 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) { + ret = qcom_scm_pas_prep_and_init_image(ctx, metadata, size); + return ret; + } + /* * During the scm call memory protection will be enabled for the meta * data blob, so make sure it's physically contiguous, 4K aligned and @@ -693,7 +727,7 @@ int qcom_scm_pas_init_image(u32 pas_id, const void *metadata, size_t size, } else if (ctx && ctx->metadata) { mdt_ctx = ctx->metadata; mdt_ctx->ptr = mdata_buf; - mdt_ctx->phys = mdata_phys; + mdt_ctx->addr.dma_addr = mdata_phys; mdt_ctx->size = size; } @@ -713,9 +747,15 @@ void qcom_scm_pas_metadata_release(struct qcom_scm_pas_ctx *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); + mdt_ctx->addr.phys_addr = 0; + } else { + dma_free_coherent(__scm->dev, mdt_ctx->size, mdt_ctx->ptr, + mdt_ctx->addr.dma_addr); + mdt_ctx->addr.dma_addr = 0; + } mdt_ctx->ptr = NULL; - mdt_ctx->phys = 0; mdt_ctx->size = 0; } EXPORT_SYMBOL_GPL(qcom_scm_pas_metadata_release); diff --git a/include/linux/firmware/qcom/qcom_scm.h b/include/linux/firmware/qcom/qcom_scm.h index 1774584ff5e3..2fd42493d07c 100644 --- a/include/linux/firmware/qcom/qcom_scm.h +++ b/include/linux/firmware/qcom/qcom_scm.h @@ -68,7 +68,10 @@ int qcom_scm_set_remote_state(u32 state, u32 id); struct qcom_scm_pas_metadata { void *ptr; - dma_addr_t phys; + union { + dma_addr_t dma_addr; + phys_addr_t phys_addr; + } addr; ssize_t size; }; -- 2.50.1