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 F3F9547DD4C for ; Thu, 30 Apr 2026 19:13:30 +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=1777576412; cv=none; b=kDcgWMZg2cJF2vdUE0C4RF+kXlTx/A0LTIyc4AiBj/weZ8wp316QQgzpLUvO78Ttf4/EurtzbozkT/nH9Lz7Pncaf+ovGDJ8MHDxihor+dDeExoalluzQMeZuZOL1y0hKt7SxBm5nF+p0hbbQdLT62HTIuVWHz858qdMlrvkucQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777576412; c=relaxed/simple; bh=zTTihws/0VZvak5g01RFclHQtHBO7VYsS3WuK2DBoeM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=btS5YlGuff1YEbDrx4nRfdtGq+LDHgDQna9TiyrqOGbDT8/geUdZ6wchHAvF+U3XovbKgqYzU5zGyeBtOYjCTa8o0B0Bsc58krqhjdGF7r816BkIrqE5BSAiazI+G6Jhk/K81mhxEg/jeRwBQXQbTMHCaX7L/IWCF2HA/8GfsTE= 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=hCMi/HFe; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=OkJF+nbs; 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="hCMi/HFe"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="OkJF+nbs" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63UGImwo2122425 for ; Thu, 30 Apr 2026 19:13:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=+S5J50qjEa5 nRH2WIvLHmY5/93dfYCrgfWlwwfYk/Nw=; b=hCMi/HFeWHlXYjcVGLd6I6mof1+ Ef3EGREmiXZTXHoJcQ4XGGRGpzymyDxk4klDaca3EQXVQa6XloXXikwfwNM9v38P QBokLjrr06mZXBLmJCrbHa1m4WEGtVJ5rXQw2f53ZeW1dWxX3SgxSw7O9IXSE4vQ p8l1zxwfdpVomSBUlouEz7NnofxuvhsTU/kYtvSFc/dUq9OUg4WT2WpBqMDZHIYZ v+RQviVJflKk247y9ibuL4Hfn//BBSmfVgN+NwZVfcq3iizw8yygxxPe8hStyReB STIibXD9eebMgHy6OaouhejKxgH96ogylGP2p8+XH6mWyTMHbapX/FfgcUg== Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dvag4rw9m-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 30 Apr 2026 19:13:30 +0000 (GMT) Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-c7989b7cdd0so1571972a12.1 for ; Thu, 30 Apr 2026 12:13:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1777576409; x=1778181209; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+S5J50qjEa5nRH2WIvLHmY5/93dfYCrgfWlwwfYk/Nw=; b=OkJF+nbsNz5tcLXWDbIU4MKc/xBmhhedKhDPhhOpIsuVFztopJNTTMETwfhbh5QRB+ BOeVKXrKjieEp4g2yzWagzTbT8DOJNpKgf8ers180P/esPOItVgMwXIWhkmILCTJsh2V +fNwX+gM/bIbLbDE9bk7+aZA+PwCBUp0+XnwuZtwd2K6VdEFZO2ZeDmDULCdg5JNBz5t 3//BYLGO3kjhe6GTJhr0xDWcn9bDbLqcj5ly+WtZNINu1AKxT4u9iir42lOuB0KwPvf8 B7bYtgS59p+vus8QGUXWSbABIFgDqO7g21mKPdOQx8gofd27lhU0/JvfE5gDHf37RpHF +Q5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777576409; x=1778181209; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=+S5J50qjEa5nRH2WIvLHmY5/93dfYCrgfWlwwfYk/Nw=; b=Rhf5srj9Uu6tqNrwy662oygoM1aPjrjCdf3FtPq8NuXYwgLDkPfMb2IZ28lBQoanib JVnAOe7pyERrAeGil6z6WLdFDTzjrAT7h5W76fLlOZPq8Su8whK8Rv2/Gmpg8eIrMzZb GbR37dY9CV9W7MO0oc+upBBgKDRg9moiFyMLEFMCE5gjd2m4G3Rx26VSMYdSmbB2m2LP LYmA4Agq2BI342b5V4b88ZKsWPknHZZq2x+r8Nx9M7h5R7YLldOw7vFFLbNRQrEuKWw4 A2g0pcoe8Y6r4Gpaptnx4v/wn0N17cG1FxrDCyP59BugVJH5ozJHRzaFeIwPYToIkkeW S5mw== X-Forwarded-Encrypted: i=1; AFNElJ+dZghudD1+5Fd5wlFoDVPUd1rXdD2bjDpLmMP/VPq/SO/jqLLimJ6gAMdo4qcVbTuzkMknKMvq1SsXM9A=@vger.kernel.org X-Gm-Message-State: AOJu0YxJS1+Q0p0AXFD1XirpvnUs2gU+ySwkEpZ+Lc5siS8TdsV8lFrH CMyyJHOPdFoceXqhcwOiThGHYcO1TVeOKDP48G2mGr8ZIWT5eit0puCpfjHZCb2xFsStgQaEBr/ k3wULbI7thmg6CNFRpzUcpFThz4xVhfmFouhMa9Rz0RrmFWasPSqBCeOjcAQ6dH3aQvY= X-Gm-Gg: AeBDiet5yLzeXSCmzUV09rWacEW5Pv/VZFAuOKCZrhO3gCPn6cGIqfYR6h+1HiivbdJ DygQf2Kbq0sBLca1CMr41CwdBl8UJX1oIWPSHt8+Ao+3uncb27EWX/73U5hncYYcI69jTtJMO3e o2MCMkL7tytJ5t/8m7ediZR+GrrIpelt72gH54RzpmYeo99gb19N6LAGQZeG/3acHbueLgC3ZPe 13vT+s087WwKIrXroEW8yp6t7h/OVBuC8PX37T6dBuzCk9K4FlJu5X8rUeXB7pG6pqXYty18MiB n6ltA+I8NCRbtQWA3g/4t+weZ7iiTReZCCGvZYLbhnPg+FKZBELgPKJQOfzbz+onIWq5dJnyaEW fGypeKdLZoplDoEcwALzKZtU3W9UsP54RvZKX+IpqonQVVWdWQEjDC0ycjpM= X-Received: by 2002:a05:6a00:22cc:b0:82c:20be:57e6 with SMTP id d2e1a72fcca58-834fdb2ab1cmr4870734b3a.11.1777576409436; Thu, 30 Apr 2026 12:13:29 -0700 (PDT) X-Received: by 2002:a05:6a00:22cc:b0:82c:20be:57e6 with SMTP id d2e1a72fcca58-834fdb2ab1cmr4870705b3a.11.1777576408796; Thu, 30 Apr 2026 12:13:28 -0700 (PDT) Received: from hu-mojha-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83515b485eesm373640b3a.48.2026.04.30.12.13.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2026 12:13:28 -0700 (PDT) From: Mukesh Ojha To: Bjorn Andersson , Konrad Dybcio , Mathieu Poirier Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org, Mukesh Ojha , Konrad Dybcio Subject: [PATCH v4 2/6] remoteproc: qcom: pas: Guard dtb metadata release with dtb_pas_id check Date: Fri, 1 May 2026 00:42:49 +0530 Message-ID: <20260430191253.4052025-3-mukesh.ojha@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260430191253.4052025-1-mukesh.ojha@oss.qualcomm.com> References: <20260430191253.4052025-1-mukesh.ojha@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: gUTdJ_YNFegHlxHuEauCkj8v8QGkfiDf X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDMwMDE5OSBTYWx0ZWRfX6l1bScGjoWgs 9j5ewaGiceaUHDwCwZ/k1ePLYKme7W5A2O/r/d8UjD8gi5Ewzgt+JAJxtf//G63Tq2LIdO/HJMt 7XlaPH1L4ASWVlUDpLYDM/1DvUbetI7QdlsWnar1W2eOhnFo4UNWAb6p4O6Q7okWBo+hcZCzcfG 2VtWBrqzAnsIYocntqjiBbE4NiH4eaO/8L8bmRfitZbYH/wMFg9T6xV9aKdbjRperyIp+/sjj2s 7T/dYg0JpMunNPE0WGYIW0vsTyGw81CvLpBGCvgiN5zVQY7NVW0CtKEXGwZKClaWJRigjr5NFXH xSMP99uDhik6gL9YCDnS72wxypmDTBtlzjfVeEbV/Z3/DyYlMkXv2VKjAJfHe7CDaG8VE6I1phX ZvENihnsWG1LkE77vKbG9IEELL3oaAuRBrZElqs0Q/Y0UWgvBaIutn6icGwRFE+8a4IpX1CnnhP 81o9VToqoABxAUz7PSQ== X-Authority-Analysis: v=2.4 cv=UcxhjqSN c=1 sm=1 tr=0 ts=69f3a9da cx=c_pps a=Qgeoaf8Lrialg5Z894R3/Q==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=LDFLutnZx2YFYSqWXWMA:9 a=x9snwWr2DeNwDh03kgHS:22 X-Proofpoint-ORIG-GUID: gUTdJ_YNFegHlxHuEauCkj8v8QGkfiDf X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-30_05,2026-04-30_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 bulkscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 impostorscore=0 adultscore=0 spamscore=0 phishscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2604300199 All other call sites of qcom_scm_pas_metadata_release() for the DTB context are guarded by a check on pas->dtb_pas_id, but the call inside qcom_pas_load() was not. Fix this by moving the call to the guarded block. Reviewed-by: Konrad Dybcio Signed-off-by: Mukesh Ojha --- drivers/remoteproc/qcom_q6v5_pas.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index 45be8c5049e1..2785d19408d1 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -243,17 +243,14 @@ static int qcom_pas_load(struct rproc *rproc, const struct firmware *fw) ret = qcom_mdt_pas_load(pas->dtb_pas_ctx, pas->dtb_firmware, pas->dtb_firmware_name, (__force void *)pas->dtb_mem_region, &pas->dtb_mem_reloc); - if (ret) - goto release_dtb_metadata; + if (ret) { + qcom_scm_pas_metadata_release(pas->dtb_pas_ctx); + release_firmware(pas->dtb_firmware); + return ret; + } } return 0; - -release_dtb_metadata: - qcom_scm_pas_metadata_release(pas->dtb_pas_ctx); - release_firmware(pas->dtb_firmware); - - return ret; } static void qcom_pas_unmap_carveout(struct rproc *rproc, phys_addr_t mem_phys, size_t size) -- 2.53.0