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 AD96A25783D for ; Sat, 20 Sep 2025 19:42: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=1758397335; cv=none; b=UxbK++Qg7BHCxpvt+ay4KeL1s4RUrszz7lJUjXlVYwbPmHlqd9Ll2/sFkDa6OXJSFR2hilitYTCa3jc/c2ryMDtdLWSq2fwMC7J0npBGbJ+ecrrzcZrpFk9Ojdx4Z1UmiZoZsbPmAEt4dlpOlGQB5xE0gJ49yMjJfg58xwzdd98= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758397335; c=relaxed/simple; bh=DCAkrbeg7VSOARVBAGpw8sAUXiiiJgS/ed13HN0++XM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dGOQ+7dnTv6QC+OhaXkypb9WJDk0cMZ/64YQeQ2TKJWnTs1j6utEWeSm/xW5WtrkGw5g5FLj3sTPzwQnstv6yAo2amFQkIBPPNVygTmJGsrEbG3i7pXZdS5BgfaDXqtF3ZWf8NNRTgvIoNOy2Qe3GYQFRJargJpMjUb1BztYU5A= 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=CrZQRQWb; 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="CrZQRQWb" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 58KJUNU1024580 for ; Sat, 20 Sep 2025 19:42:12 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= pj/BgSYMd+ehlZUcqfWm3Wt8Oa5dIWUJg+URzA82Bvg=; b=CrZQRQWbXR2sQRlC csTrAc+Tzb6WSJ3rjHVRv7uyrD+36/b+H+btmfjeISwA17IgiOZW08+FdmT7uShc 6GtGEg/UWjY9wzg1eVFiczQLA/8fTBgwSkoVz3fywdekKxfyYy1pP0r5uciSjD9L D1+Amgvq16FmaSkssngU93CUI/E0ObW+dObh0qcLlWUNNHOZFA63PKg+8xuHUnUX b86CkFCMcddxBleBGiI+R7LJZOBgl3AFHAlMOm8fgj+WZbFZTr0oXIChyn3C0KHv IJPK8Q6mEfukgON6MGbfUe/dpnPbrz3NYMqaNaqEoExhK12fCbUR0VjLDobP8TfE +TUP4g== Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 499kkhh97q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sat, 20 Sep 2025 19:42:12 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-32eae48beaaso3215738a91.0 for ; Sat, 20 Sep 2025 12:42:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758397331; x=1759002131; 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=pj/BgSYMd+ehlZUcqfWm3Wt8Oa5dIWUJg+URzA82Bvg=; b=f6yW/Mb6p5utDV50aYiCSg/lZeN8f8tOEiR+94nVcfiDEhKZb0vhtCut0eqdCEOWlG oCfyLEWLqFo2NzbmaMOT8E9KWFkGwlWC9TE+77o5K5RoBNO8WNmXqq2+8DECasf03BNI P0ZU1vI2/4JyOGFuHxsLALl7jeVf8jb5OkxW0lbSas4y2frIWqoKwnWAIWdpuUaW0BvO DLgrYnZvBYq2qDsdBifHaeYrW23y2YLWhxMPF+QPjjcIKTJaU/XPHd6/Fx20C7vE/fEL 6FHa+U3c4vqmwe98HOnVtHKpzimmfQZZ9ZbiHnwVypbW2emPBKgcgoQrhaW9QQgm5V6D axkg== X-Forwarded-Encrypted: i=1; AJvYcCXr1Oa9F8tD/XpbxWSQmDs278SxjXkStb3vepnrSi4JjRSuREHnfBZQTMbEhKx4Gi2jasC75Ts9xwgF@vger.kernel.org X-Gm-Message-State: AOJu0Yw1AcOe1w11fulfy6NXPO+/n5I860RtNmM/gUZToauhc57/srwc l54YrFLonCpCg77uP81zFo6s4hVyvwpWfxFMHnbYFytnbBw4fMCJT0jak+FfVovt5uEYvi99ZtF MN8cMGFfeN260GWo7aWvW4SC3COf1xbCzKxme7I0wxLLUAp8zixARw/bo7LtnTsYf X-Gm-Gg: ASbGncvTYUwOmMgvVDzZ6tESA/YJV0e5f/QuvvrN04oUfs5z2Hh1MuL2J2xN6Sv5eGv lb3KAJh/iN3GlA5Frek+gVEr3vBnRsolUAgL2k3AjbUvHBHOz8wLk04osbh91XqXgIpNvIsWnKS JMzYojuLCttO2lwFoof3qJ+RTE1HQMzosmyVQYENvHQEHWbG9D+t/RHp/zexXFMfMvUg5xRNvJp +t5W4mQOEC7Moa/28WO6O4yPNWMR2ehpEQ7DqEuo5B9s1/9F/y0xuNWh677t18zcbA/Daxn5hlE mSmCDznEdvVjg29+YIUB/62yDlFkCOCxytSv5B4OFE6oA+unPeRTH0SwXNlqz7eaFvc= X-Received: by 2002:a17:90b:3b4b:b0:32e:ef4:bc7c with SMTP id 98e67ed59e1d1-330983417ecmr9161437a91.24.1758397331314; Sat, 20 Sep 2025 12:42:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHsXPhiZq+EnDOg32hHLi7TdPyUKuwR5jLj1GKkzUdXiT9NbgRKwTNf6HFkUYmTR+lRrHf8JA== X-Received: by 2002:a17:90b:3b4b:b0:32e:ef4:bc7c with SMTP id 98e67ed59e1d1-330983417ecmr9161407a91.24.1758397330886; Sat, 20 Sep 2025 12:42:10 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Sep 2025 12:42:10 -0700 (PDT) From: Mukesh Ojha Date: Sun, 21 Sep 2025 01:11:05 +0530 Subject: [PATCH v3 07/12] firmware: qcom_scm: Simplify qcom_scm_pas_init_image() 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-7-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, Bryan O'Donoghue , Mukesh Ojha X-Mailer: b4 0.14-dev-f7c49 X-Developer-Signature: v=1; a=ed25519-sha256; t=1758397299; l=2836; i=mukesh.ojha@oss.qualcomm.com; s=20250708; h=from:subject:message-id; bh=DCAkrbeg7VSOARVBAGpw8sAUXiiiJgS/ed13HN0++XM=; b=wTfDa8mkr3aCDv3ZpWTIWkrvMPhc4CtFWvMjvpe8YLkmi0MJc4R0WKbF0utzZjAspuKJ+brAX 3HLYGJKKA/YCUzB2wjTKsWmAeD3dl9qnSlnl0O8VzRgPEizaKs2Sg6u X-Developer-Key: i=mukesh.ojha@oss.qualcomm.com; a=ed25519; pk=eX8dr/7d4HJz/HEXZIpe3c+Ukopa/wZmxH+5YV3gdNc= X-Proofpoint-ORIG-GUID: oSttHVk9_qHZEs_C9B6Mtkx1rJQi9frk X-Proofpoint-GUID: oSttHVk9_qHZEs_C9B6Mtkx1rJQi9frk X-Authority-Analysis: v=2.4 cv=JMo7s9Kb c=1 sm=1 tr=0 ts=68cf0394 cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=yJojWOMRYYMA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=2f531HYpvKpQLZPe_fYA:9 a=QEXdDO2ut3YA:10 a=rl5im9kqc5Lf4LNbBjHf:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwOTIwMDAyMiBTYWx0ZWRfXwKu/zV9OWG3X LpX4T9xa2bo7oefeXRHZ/34EveSx+1a8CGtFran/C/JDtPxliUS7TAjMk5Y3Zo753yHqqKfjEmY CwTsR7Io4y+lmVd3QKSAZoKsJofjkOH1MOs4RBP0SZurSFrr9ldj2aa5cbe3LtTEzM7QeKkovPi P8gL3s2wuPfv88K1/ubRC4fzDUN7L4TAyl/0N+EUP9WKC+3gvkOTw1G2sTGDqlEWp0zkeZVrpf8 wG0Dld5kFB8fktpsKyjQaGXS4dAIu+rnzqbWANkDfGco0aSLA57j3qnlVmuKEkYBjgy9sFkBhx9 oawhH/skwz8RWmZiXb+eWnLQd55vGOtgteB75+1Yap7s4tFZXQ6iNywHB8nPOPvalCjtT2gWLAF rGvCBqyC 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 impostorscore=0 suspectscore=0 bulkscore=0 priorityscore=1501 phishscore=0 clxscore=1015 adultscore=0 spamscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2507300000 definitions=main-2509200022 Simplify qcom_scm_pas_init_image() by making the memory allocation, copy and free work in a separate function than the actual SMC call. Reviewed-by: Bryan O'Donoghue Signed-off-by: Mukesh Ojha --- drivers/firmware/qcom/qcom_scm.c | 58 +++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index 7a86b27ea666..022529778f84 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -611,6 +611,37 @@ void qcom_scm_pas_ctx_destroy(struct qcom_scm_pas_ctx *ctx) } EXPORT_SYMBOL_GPL(qcom_scm_pas_ctx_destroy); +static int __qcom_scm_pas_init_image(u32 pas_id, dma_addr_t mdata_phys, void *metadata, + size_t size, struct qcom_scm_res *res) +{ + struct qcom_scm_desc desc = { + .svc = QCOM_SCM_SVC_PIL, + .cmd = QCOM_SCM_PIL_PAS_INIT_IMAGE, + .arginfo = QCOM_SCM_ARGS(2, QCOM_SCM_VAL, QCOM_SCM_RW), + .args[0] = pas_id, + .owner = ARM_SMCCC_OWNER_SIP, + }; + int ret; + + ret = qcom_scm_clk_enable(); + if (ret) + return ret; + + ret = qcom_scm_bw_enable(); + if (ret) + goto disable_clk; + + desc.args[1] = mdata_phys; + + ret = qcom_scm_call(__scm->dev, &desc, res); + qcom_scm_bw_disable(); + +disable_clk: + qcom_scm_clk_disable(); + + return ret; +} + /** * qcom_scm_pas_init_image() - Initialize peripheral authentication service * state machine for a given peripheral, using the @@ -632,17 +663,10 @@ int qcom_scm_pas_init_image(u32 pas_id, const void *metadata, size_t size, struct qcom_scm_pas_ctx *ctx) { struct qcom_scm_pas_metadata *mdt_ctx; + struct qcom_scm_res res; dma_addr_t mdata_phys; void *mdata_buf; int ret; - struct qcom_scm_desc desc = { - .svc = QCOM_SCM_SVC_PIL, - .cmd = QCOM_SCM_PIL_PAS_INIT_IMAGE, - .arginfo = QCOM_SCM_ARGS(2, QCOM_SCM_VAL, QCOM_SCM_RW), - .args[0] = pas_id, - .owner = ARM_SMCCC_OWNER_SIP, - }; - struct qcom_scm_res res; /* * During the scm call memory protection will be enabled for the meta @@ -663,23 +687,7 @@ int qcom_scm_pas_init_image(u32 pas_id, const void *metadata, size_t size, memcpy(mdata_buf, metadata, size); - ret = qcom_scm_clk_enable(); - if (ret) - goto out; - - ret = qcom_scm_bw_enable(); - if (ret) - goto disable_clk; - - desc.args[1] = mdata_phys; - - ret = qcom_scm_call(__scm->dev, &desc, &res); - qcom_scm_bw_disable(); - -disable_clk: - qcom_scm_clk_disable(); - -out: + ret = __qcom_scm_pas_init_image(pas_id, mdata_phys, mdata_buf, size, &res); if (ret < 0 || !ctx) { dma_free_coherent(__scm->dev, size, mdata_buf, mdata_phys); } else if (ctx && ctx->metadata) { -- 2.50.1