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 BE46034DB72 for ; Wed, 17 Dec 2025 16:35:46 +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=1765989348; cv=none; b=Xg0hMB5ylJHRZllUFbkXp/FZvAzZRtVQCyWcBCG1J9z9MVFaqIetzWgTbF8IGuIpERo4kMSgQaHKOuetum246FrbL4rXED4dCHLIBRFbCc0FyL5cVCgUTNLgJeC6c1OaM7hHUagNGO53wHg3209LnN44qbnKGNws/22VzNE76gU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765989348; c=relaxed/simple; bh=ZJpp3JWRDZ2GnhkciNneFccjAnU3FfTec7KHfaDs7Ss=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=T50IWUWN72aTOFjEPQDmB0jFkW0nIVDjhOk4rhukqjnwwXwXXS1VIvgvc4Yd9hC72IjdkE20lLHw7F2v6dLHod/FcUP1fK0Hz8SrUgr8+E4eWbWrn5B5TieqlgPZ3kgsMcwXp93ndAbgSuMOSGA5kiDn1XeA4kmklGPfFB1LxWs= 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=mX1ZrzeA; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=cFiHlo5X; 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="mX1ZrzeA"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="cFiHlo5X" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5BHCKr5I3048747 for ; Wed, 17 Dec 2025 16:35:45 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= Y+OM//gLCwtklbAUofXvGKyOMQPiApxnK1IIT6gaceE=; b=mX1ZrzeAwTjRfsKB 7IjMf9+Ynvme+QAGQwlV8Q9OwEDWIW/9qOzZJxQOuInTSui6++aw5QLvNwyCnMtu t+PJJggc6bgsxOjYzRXeRSLIzpgQzo5CYNSnHirchv7ZEiv9HAjZ/JQ0lxJtj+7k 8LcoZm8PaR8lvKnCnQkJyRjDqxefqsdc73SJSCGwbjcP/JlHMUNwiY6jOcdHnmrI JJkuZ0Hwgq2iZiipX6HktKH5kChs055bulIk69S8fkTLszUf6SuHeMeYlpHCYP4I 6wH70fKar8/C5NEluN/ZMnMPQgBvqOGcrsZ3aPOGuhXqwE7/faf3Fnlo++DU08HZ pqLXpQ== Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4b3jgqar9h-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 17 Dec 2025 16:35:45 +0000 (GMT) Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2a0c495fc7aso54925185ad.3 for ; Wed, 17 Dec 2025 08:35:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1765989345; x=1766594145; 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=Y+OM//gLCwtklbAUofXvGKyOMQPiApxnK1IIT6gaceE=; b=cFiHlo5XvrG5AjoJZIKKhkwDcz+7d+UrvelnQBWwLS1PksqN0kIGKclX+kBgFqav90 bQ42w194U2F+PyTsa/gdEPzJnPhXqixZO9pWlWHGYIwIIdXPxggZNrA73+tuNOJsJcSo rLaupyKM7B1YO+H5iSyIfDvuDnu14l7p3shwAm3+n50hrpcJRyLadg5bHG9m4ZjyJzJ7 h+UDBkuujDrMzHlwtNcQB/atJbvxk6GINPTganEvBtp7AIi5LT4jiQZxzK2zWcxnIIxu jTdt9mcYRI/G51EZQb8vr1Ygq/QJBru+bkh0EEq3ASdVKMVYtTG1KVTbMETBToUW+0vA DGbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765989345; x=1766594145; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Y+OM//gLCwtklbAUofXvGKyOMQPiApxnK1IIT6gaceE=; b=avlrNCiEVEgWSzYM9GT3H7kUS1ahla8QftLNrUgA68DbtSD5ZUbsypx4Ix9wpA1orv kiLhSbr5CK8t+LjwncPv6h2N5M1TDROr0+bHIlx1XVtAx+YiMmQQKDndEga/u4UScujA 1qU6BYHWNeLXyCe77B5IRSnTYapUNl+WgQpSDTKSZOl87KQd27wbH0huwSxXyYnrVUPY wUgSyVmii3Q6c6ga5uqd3gCex52QCaaDwfuiCIw4ROiG8jgTYmwYQeCP8ddJec/6eypQ af2styKCsI/qoKsvs18AHEdYIoRSavnk2YSuiXwkwCigYyDn3+hPLVsizRJZeIDdMgDw ccOw== X-Forwarded-Encrypted: i=1; AJvYcCVTXPbZaW59plPLIaZNvNlrEe6SpP5OpN0AIBrZNOATtv4CQ71EUcIBfmV9DUgpon+jtPFC7BXnZZ40FqY=@vger.kernel.org X-Gm-Message-State: AOJu0YxFbjrU6OofiAiJNpKm2O/6uJpyzREdicWcjGMf+U+Zf/b35em0 6opkkoJjdaa4RW0wyvhoQcxRfuWUhX4GmV1+X/Q2rgil3T1VWfCbsNHWCcS9XzpleIzDAQ2WJRy jFKxYT+xR7V/71UZylyuANljXdsS4b2orNrR0FDh2rE3Et0ZtayuSxlU+0+k8xzqNl7g= X-Gm-Gg: AY/fxX7M5xdJJ2H6z+/NOjULQnmf7Qy+4+z+kPwMFP17VODIIxnepOJ5SFOqiPBaX5B ItgFba6w8fiW3EVwboGr53lZmwJBkNY7WC+FgyZf7SCD3qUxp4Zz8YQw03k4tAV0XRfohCO9L8P jmBmCskOEVxR9rMNnJGT2fiafNo8nzdGcDk83YIntlZdbegtDEjcyC7ot6q38QBVyINdpfn7hgZ PGg01+nlSkH0TrGEYdSWjkHRhN1N/7rcQhN9wddadsNZhzCDIX2RVx18YBf00NbrtClIajc5kTt XQoo1KUHire2MZZpjw+xOhMgFRW3WtdpMAqZBYpWgG5R8x2OhIGUFe6cH1jyjtGb5JfgiveP+MH pbJelbPaZ0uVwju11Y06l9i8j8tN6CoDIKcj2 X-Received: by 2002:a17:902:da8c:b0:2a0:bd93:4dbf with SMTP id d9443c01a7336-2a0bda2946cmr136309985ad.13.1765989344208; Wed, 17 Dec 2025 08:35:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IGxk8EC2iuBNKVxQi6FD2QZfoSwG++mxObmlHXqMkY+kzfmt2HFyK6oOK+NSSC19kzQ4oZPmA== X-Received: by 2002:a17:902:da8c:b0:2a0:bd93:4dbf with SMTP id d9443c01a7336-2a0bda2946cmr136309675ad.13.1765989343577; Wed, 17 Dec 2025 08:35:43 -0800 (PST) Received: from hu-mojha-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29ee9b36af7sm204721055ad.18.2025.12.17.08.35.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Dec 2025 08:35:43 -0800 (PST) From: Mukesh Ojha Date: Wed, 17 Dec 2025 22:04:46 +0530 Subject: [PATCH v9 10/14] firmware: qcom_scm: Add SHM bridge handling for PAS when running without QHEE Precedence: bulk X-Mailing-List: linux-kernel@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: <20251217-kvm_rproc_v9-v9-10-ab7ac03e0ff1@oss.qualcomm.com> References: <20251217-kvm_rproc_v9-v9-0-ab7ac03e0ff1@oss.qualcomm.com> In-Reply-To: <20251217-kvm_rproc_v9-v9-0-ab7ac03e0ff1@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, Konrad Dybcio , Mukesh Ojha X-Mailer: b4 0.14-dev-f7c49 X-Developer-Signature: v=1; a=ed25519-sha256; t=1765989299; l=2509; i=mukesh.ojha@oss.qualcomm.com; s=20250708; h=from:subject:message-id; bh=ZJpp3JWRDZ2GnhkciNneFccjAnU3FfTec7KHfaDs7Ss=; b=UHye5xh8LIVlYeAJ0tlM5lFW90FxijLZBwYiUBeuwTCEld1f9pnWwQGlVafxE2HEPF0caPqZC aZbBWgM6h0XA/W1Y1C5xwPwQcAU/wytk8AG+ahm9HcYvAIOpFSJtOB/ X-Developer-Key: i=mukesh.ojha@oss.qualcomm.com; a=ed25519; pk=eX8dr/7d4HJz/HEXZIpe3c+Ukopa/wZmxH+5YV3gdNc= X-Authority-Analysis: v=2.4 cv=VLjQXtPX c=1 sm=1 tr=0 ts=6942dbe1 cx=c_pps a=MTSHoo12Qbhz2p7MsH1ifg==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=wP3pNCr1ah4A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=08WIqK_J-xaQODWVIAIA:9 a=QEXdDO2ut3YA:10 a=GvdueXVYPmCkWapjIL-Q:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjE3MDEzMSBTYWx0ZWRfX4Z2UNUonmmKS kCangxyL+GV2339uq8EZiGjpQQqi8XcxGccA45rncLMf1NlKmuojXWznkJCPG32tBD7Owj6ves6 1UwISYiZBqPXj/5TyqjtP6Aj6PLxISGVu0FGqdMM+ITgR9OhLqI0l/DFyz+zRe/bmmZ9Tt7MXUw MsE3hiL2Y/g9RhcwELvq49TU+Z2Hz4Z1+ChGlBkAes/C4EgfNVH4pRI84UFANhhIjBywI1FNQz9 JllblNXkDJlZnWnBMtiPY4g7LPpL6Tq/fTtCjOrDwIPxEd4HzsKwCKNFseG0t4j4PygfwS1bEb2 hAQce9T1gXzUHVOUm+LX5tU2rNvHVz4HAQyPDR42GQwXUw4HeqabPxhtghda6wwtNGBTrHSbVDs DwmRgO8gWVV4I8sQYRSUltaksEN/QQ== X-Proofpoint-ORIG-GUID: xYGrOph_RoC-ddlEmFIy5Gzxe4bRf_6E X-Proofpoint-GUID: xYGrOph_RoC-ddlEmFIy5Gzxe4bRf_6E 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-12-17_03,2025-12-16_05,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 suspectscore=0 bulkscore=0 malwarescore=0 priorityscore=1501 impostorscore=0 clxscore=1015 lowpriorityscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2512170131 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(). Reviewed-by: Konrad Dybcio Signed-off-by: Mukesh Ojha --- drivers/firmware/qcom/qcom_scm.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index bc3b8dc7d3e4..4ce892d8fb25 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -623,6 +623,30 @@ static int __qcom_scm_pas_init_image(u32 pas_id, dma_addr_t mdata_phys, 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_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, &res); + if (ret < 0) + qcom_tzmem_free(mdata_buf); + else + 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 @@ -648,6 +672,9 @@ int qcom_scm_pas_init_image(u32 pas_id, const void *metadata, size_t size, void *mdata_buf; int ret; + if (ctx && ctx->use_tzmem) + 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 @@ -689,7 +716,10 @@ void qcom_scm_pas_metadata_release(struct qcom_scm_pas_context *ctx) if (!ctx->ptr) return; - dma_free_coherent(__scm->dev, ctx->size, ctx->ptr, ctx->phys); + if (ctx->use_tzmem) + qcom_tzmem_free(ctx->ptr); + else + dma_free_coherent(__scm->dev, ctx->size, ctx->ptr, ctx->phys); ctx->ptr = NULL; } -- 2.50.1