From nobody Tue Feb 10 20:48:33 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 4544A2EA157 for ; Tue, 7 Oct 2025 16:49:44 +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=1759855786; cv=none; b=UkrKmefDbuXAF/0s5OILngEd228nZFegY1YcV0XANgqeYOUm3AHv3vBhr8R+awVTf/+F9TAsDOU6TcqrtZO3U8vNRR7ZTJ0VgsHbW4Nh0C4vg/kwMZ2Ej57W2Vl/U4T/zi/PRsb3ABNEuXKtb+1yS8AnQJZVYLW/9S4PlSkPLU0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759855786; c=relaxed/simple; bh=9xHPgyydOeXweGUGYLP/L8fGDVmLTdkNMJ4AMabbVsM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Cqa7rbwnGpaRePJfdq7nFZpa95tKpJNqg8hgoer5c/4juo0qwQ9iX5mjK03ywwGEAhKdPkDGi0YZ8neseesmT4b81PDdWCaMhvQ17UGV7zutZdhxcXR/AbuP1G6uCZbEG8bsoBfVHI5OFx275TX3P0WgIPpL4ZaRrJ/W9iXgcIk= 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=D6elETUG; 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="D6elETUG" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 597ET4Uc017414 for ; Tue, 7 Oct 2025 16:49:43 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= QxNeeJEXNpPeJTacph3hwU9D6rTjPEzDWfJFAW/Pno0=; b=D6elETUGB4FEA2ve v9V8DudIneufWVfS3frJkzM98R1AoAUzuGk4jK0GzFp7xqwrQKiSwWzCvB7AI42p IcesIE8Jfhd35pK93rjlXmIpJE2dsGitL7GaJ7GtPdNluth0Tz1bTt7DFqbFvPqs fV8SriVgyhakGxzUsZDZ3c3kbqfHr70080eck9S8fXxBvkjxNMKarZOyuEzK67yv X0KkZx2/9tUtIaKNuGQWo2DcrRs6UGfpv6Tuz/Oz7d+cr34qsPKOTne21uB+arkF 7oa4vQlbZ3au0l3Vf933sXMz1i32/rrtyWd0kFLaptU5O5XRr3Uv+vOHKjDxLWgR uMDsag== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 49jrxn89na-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 07 Oct 2025 16:49:43 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-26983c4d708so56210585ad.3 for ; Tue, 07 Oct 2025 09:49:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759855782; x=1760460582; 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=QxNeeJEXNpPeJTacph3hwU9D6rTjPEzDWfJFAW/Pno0=; b=Cgeb2NnbpEGgz8POrPjXJ8Y3VPHgFtIMdGpc9CLyMIDmC3sy4+ExjM3TCbIL3/bUHg KiUvQqXowjdZwCoZ6MpXKsPPFBN6piKUgkImDnt8EIBzIRwnmyVl6RfCvlb5KBlFFVz8 b9l8ap16gHRWuL+WKMdZQSoLtrprRpAJff4529txWa6a2lMRxR2EXEF6+92IkjsOCOmE gcur4YK4DWbWE3ueB2SjQyx9RWBEaz+w2DbbxswO8NmM47tMa3YFnoVtgPPDfHht/8J5 A7MERdVLKzeeXudqtEjTbczBNLPaQEqvXUXrRAQ7ErA5AoDLCVMxkDelNOrN3EpYBZMN ihYg== X-Forwarded-Encrypted: i=1; AJvYcCVWkyU/sbN2nVWgPIr61MIZnNAJ0KpMH9stxbjUNjPOVyrEPYwvvAkb8ovBKDKBUCpCrKjgoJXFXADuWQE=@vger.kernel.org X-Gm-Message-State: AOJu0YxepdvjROmRKVDbg7Pt0XZi5UCwoOlSB4VMU/TqnRrD/YB1pvP/ 6QDydQDJajpqRKObYnqE/eKUplC4D4gQTrXar3EzKnQaG1AOpj5KLg7K0IyR0D9ueEdU3+x+Cbr RzWhW5bbKD4CI5nl9Xyw+rxMShE1z+wllhzkAMbWomi499nB7VLYRIoNvSOWN4fZs80E= X-Gm-Gg: ASbGncvYYG2QgYlEXhpkUuo5AO+xjb839UKNdA14Qf6+3EXSAgDaQKfMdqtrqSpXpLS D4ZwZXzhqKkJg2r6qfkHDFBVSBPK7GBovjKeXx6QTnruygGGTT25MbEhR+sEKgBFX0aHX9RrVEG jMIUCv7EyRbs5VKC+J0VuxfB5bOLiBRUKVkB4RY/miiwczwM+r/92tbSP4RSGObQ7MihYu5kDoS OHOobftDQv9xEOg3NdNidk/2A7dizcan1kkLAiEr9xYIZPjuVIw8dyjQ7DGXm10TY5DnzffTfAs TycQ0yUCBJQppiRer2wga9Tc6ISmN1a4tL3a9Yh9PV9ImIk14XpO8hxNFxorcvZM5MdWGccC X-Received: by 2002:a17:903:2c0d:b0:24b:164d:4e61 with SMTP id d9443c01a7336-290272b27b2mr4396665ad.13.1759855781544; Tue, 07 Oct 2025 09:49:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE4ojBOTf4hVzlcnJUwx3Xx5342YcDt22x1MRR6j2P8Ub0QP6gMv4na8Kc9xIoK/FL1oCbYuQ== X-Received: by 2002:a17:903:2c0d:b0:24b:164d:4e61 with SMTP id d9443c01a7336-290272b27b2mr4396425ad.13.1759855780958; Tue, 07 Oct 2025 09:49:40 -0700 (PDT) Received: from hu-mojha-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-28e8d1261e2sm171990825ad.38.2025.10.07.09.49.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 09:49:40 -0700 (PDT) From: Mukesh Ojha Date: Tue, 07 Oct 2025 22:18:52 +0530 Subject: [PATCH v4 07/12] firmware: qcom_scm: Simplify qcom_scm_pas_init_image() 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: quoted-printable Message-Id: <20251007-kvm_rprocv4_next-20251007-v4-7-de841623af3c@oss.qualcomm.com> References: <20251007-kvm_rprocv4_next-20251007-v4-0-de841623af3c@oss.qualcomm.com> In-Reply-To: <20251007-kvm_rprocv4_next-20251007-v4-0-de841623af3c@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=1759855751; l=2863; i=mukesh.ojha@oss.qualcomm.com; s=20250708; h=from:subject:message-id; bh=9xHPgyydOeXweGUGYLP/L8fGDVmLTdkNMJ4AMabbVsM=; b=VrZ32SCvIJGeIMMpBJYfzH1o5GGbYqNyMoNI4YMe/smiKv+k3VJ16nVS2TakCuuqjKkevo5LW HI1UfSpKyOpCoaBSor8MRCK151+NSib1r9s3/zsZMHkmxmBJOkOxH4s X-Developer-Key: i=mukesh.ojha@oss.qualcomm.com; a=ed25519; pk=eX8dr/7d4HJz/HEXZIpe3c+Ukopa/wZmxH+5YV3gdNc= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDA0MDAwMSBTYWx0ZWRfX1VsaL4iD6OsE sb1fY98EyUr/azflYPKHTcqyC2CVol1ihfUXJoi5SiqoF32Nk4ibQXjW7Ko0Li2GXTSP78jugrd WL6+DP0ZaqfGHyjQ98VMW1dqJFbilZX+BYiM5yEmQlK5zaIxKvuaEmd3aQ0XBtrIh+9EKi6lpL7 olQ1IJzWMb3BQw8DwRLkoqYmaQMILoO4LGxoX16XevqReu2cAa7CaEUdvqjecDV5ImVgD/LT5lv 70MlvuaRES6pxgAC5p/6LDyMte+4CqF1kAuPxmOl8+V25nHYJMbxkhjaYHXkdU5YbMSFA4GbiDg OVR5ZCdZ87ih2ZUFrHCeqj6E5IeDRTQLuErqs4Q8wFjYfot9qV9QGKLJLp77tSfOwAzA4JGLX2h uIym49bdtReoLyl+/SQW4wfHpTIHyA== X-Proofpoint-GUID: 6QdCeoIJ3zCXnCCWhJ-5UFK_X6vAwVE_ X-Proofpoint-ORIG-GUID: 6QdCeoIJ3zCXnCCWhJ-5UFK_X6vAwVE_ X-Authority-Analysis: v=2.4 cv=EqnfbCcA c=1 sm=1 tr=0 ts=68e544a7 cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=XvkCMQ9jN2oI-PQncDkA:9 a=QEXdDO2ut3YA:10 a=uG9DUKGECoFWVXl0Dc02:22 a=cvBusfyB2V15izCimMoJ:22 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-10-07_02,2025-10-06_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 priorityscore=1501 spamscore=0 lowpriorityscore=0 malwarescore=0 adultscore=0 suspectscore=0 bulkscore=0 impostorscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2509150000 definitions=main-2510040001 Simplify qcom_scm_pas_init_image() by making the memory allocation, copy and free operations done 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 ab2543d44097..b8626897c8a7 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -612,6 +612,37 @@ void qcom_scm_pas_context_destroy(struct qcom_scm_pas_= context *ctx) } EXPORT_SYMBOL_GPL(qcom_scm_pas_context_destroy); =20 +static int __qcom_scm_pas_init_image(u32 pas_id, dma_addr_t mdata_phys, vo= id *metadata, + size_t size, struct qcom_scm_res *res) +{ + struct qcom_scm_desc desc =3D { + .svc =3D QCOM_SCM_SVC_PIL, + .cmd =3D QCOM_SCM_PIL_PAS_INIT_IMAGE, + .arginfo =3D QCOM_SCM_ARGS(2, QCOM_SCM_VAL, QCOM_SCM_RW), + .args[0] =3D pas_id, + .owner =3D ARM_SMCCC_OWNER_SIP, + }; + int ret; + + ret =3D qcom_scm_clk_enable(); + if (ret) + return ret; + + ret =3D qcom_scm_bw_enable(); + if (ret) + goto disable_clk; + + desc.args[1] =3D mdata_phys; + + ret =3D 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 @@ -633,17 +664,10 @@ int qcom_scm_pas_init_image(u32 pas_id, const void *m= etadata, size_t size, struct qcom_scm_pas_context *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 =3D { - .svc =3D QCOM_SCM_SVC_PIL, - .cmd =3D QCOM_SCM_PIL_PAS_INIT_IMAGE, - .arginfo =3D QCOM_SCM_ARGS(2, QCOM_SCM_VAL, QCOM_SCM_RW), - .args[0] =3D pas_id, - .owner =3D ARM_SMCCC_OWNER_SIP, - }; - struct qcom_scm_res res; =20 /* * During the scm call memory protection will be enabled for the meta @@ -664,23 +688,7 @@ int qcom_scm_pas_init_image(u32 pas_id, const void *me= tadata, size_t size, =20 memcpy(mdata_buf, metadata, size); =20 - ret =3D qcom_scm_clk_enable(); - if (ret) - goto out; - - ret =3D qcom_scm_bw_enable(); - if (ret) - goto disable_clk; - - desc.args[1] =3D mdata_phys; - - ret =3D qcom_scm_call(__scm->dev, &desc, &res); - qcom_scm_bw_disable(); - -disable_clk: - qcom_scm_clk_disable(); - -out: + ret =3D __qcom_scm_pas_init_image(pas_id, mdata_phys, mdata_buf, size, &r= es); if (ret < 0 || !ctx) { dma_free_coherent(__scm->dev, size, mdata_buf, mdata_phys); } else if (ctx && ctx->metadata) { --=20 2.50.1