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 017524E06F1 for ; Fri, 25 Sep 2026 15:59:25 +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=1790351967; cv=none; b=NvLpmQ3zw1tUwMj4UwZU/fChahbv5Yg1sYO+YJ6okQF2Od6dQgC3onEhrxLwxwTEhuSj2Hm8U35OlfxId0JHPRM7CSFzLjd1CZ3V/+0NrmZ1Fdz7JfkL7za4N657Ju/r+dj408z7ek/z/Ie4CfJc+BYjjWrhlPGIxjbLFT7YAlw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790351967; c=relaxed/simple; bh=zDuJCdpny4nvDijWnjUood5Ogh4JDdDd4/+inxDkgqY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ga84bUOs+1GGYb8ynWfgPjhrc2s3Irjcst/oOozjTgKVMHUe/79zw8gKQiRZPIKI1VakZ12ng4X3u0VnA+smE2E4E7ri6Eh7ARI3TJFfQkyFipq7mzsepAxwyde3EVR4vwWUtTEXrbXObnnQbPdA48M4Rr+vONhQ3nW11kQ8wWE= 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=QI86Rg99; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=YKzPcWLD; 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="QI86Rg99"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="YKzPcWLD" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68PBLdYQ900279 for ; Fri, 25 Sep 2026 15:59:24 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=9+1rwJEQXq1 lO/cD3GiWTUUYzCO5JaKWtBAY2RhYZaI=; b=QI86Rg99O/cQBiooeAMdGH6d2qr /2ApE7DEiMzD3YrXNmwz+AFIQiuSiyeU538+94tBUEGoj2itMo2gej/TfPXlqIaF zZ72GNYlwbjhiqHnwtDgSSGltE9iecu43LiWKRH0DKQEAzXnXEZewprdY2FRNWfm 3wweR+e6s0j74nJNxeHevQQbBp3T3hxokyJL8PRt6yueJf2AFuxy/RkmsnSgBBNn TXc9twwC6JYh28lCZk+wcQNgeeVN+eTQiS0oTdNHyZe+4VJlNRsnfvPoTUwC1OCN 6/DfLq+X7JrgAdJpeU7WAmXzD0xZrYB28w+K3rYTyvBwyJiFwLIJro0IqDg== 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 4gwr100xb5-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 25 Sep 2026 15:59:24 +0000 (GMT) Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-86a74698972so948946b3a.0 for ; Fri, 25 Sep 2026 08:59:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1790351964; x=1790956764; 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:content-type; bh=9+1rwJEQXq1lO/cD3GiWTUUYzCO5JaKWtBAY2RhYZaI=; b=YKzPcWLDNXe3MtN5nPHe7AMahJJfC5aAzY9RgQ0E4OiQIqAJ5vJdPBdBcC929Gnu+s KTwauVDtIPN/1zQCsSLhh/EcGWoY0UMe/DOpIEJd4X36TvF/bWxj0cnRsgEYZR+yT9FH qGej+XZmWs7RJYd7pcolOjn1AkYeuTrgBcKOWaP11r8f8vmHPFD6Rmhm5cggK84OD5P9 8sU5h6PpV6xrHzL4q03gFW6tdhsDrKsH8BD0m7P/ONKNbBfkMCYjd/IFo63NkAEvxLEi xmOXBS7lGJRzaLk0949U2R7jkxnOA1wz8SinQxt9cuN0481cxNnVjSmW+ATTlluhBGJV T5Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790351964; x=1790956764; 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:content-type; bh=9+1rwJEQXq1lO/cD3GiWTUUYzCO5JaKWtBAY2RhYZaI=; b=BwUzkzpa6j8H1JWFq1gFXqplPbhbFrHnaO5hj8l7LyNDRJLXI2JbBYArPp9FTm/icY ynI9Q1eBxm8hsflZiGEHoja/9SRXbTq9Cr9d6Bfrc1f0OfN9pbk4H077NVpYqy5SxDA/ v6ufWaS4Ib9HIvL16V39m37l5c/6bCE9g8eMhSsOP3FfHQLs7AIKxRogOhVXlIgE+7FV 4Z1k8TbW2MpdYtNFiWGpzpup5ls3IEdAHhaPX03k7C2HAz64Ct8DoByWZzE9WIKAUFHU BTpQ50F9vUKqvdyIeDKMwiUapgdrm1Qk2MPNdi8ZU2RdIPJMjuiKwK8JTt76TbS9KqBB GWXw== X-Forwarded-Encrypted: i=1; AKwUvBwqU6esq4FYirtSH1P8+jrPHalobsboDLXYps7NVuOc28YzRgAqVAECCN3H3TJ+R9VJMsLores=@vger.kernel.org X-Gm-Message-State: AFuF++ksTXzTfekpbbGTyAnF81abW7gDMOxTZQ1DRx/WLcmMCM0Hktls K+hx2i/SygdjykBvxx+Gpw6YGdiW57QDbnEXuTyy1lr7ZG0b1cDFF2lqsRk/WLBmrlYIr7uOAMQ KglX2XuVUbQWzHVm5cI5s9vzIMK7k5dxpjp2b9tY/Wsk1mFVCiogq4wnafkE= X-Gm-Gg: AYBFou3ZqnXXpKnhcbuBv6K0Dvr1jcbh5On4sht1j2RM7f9mF1Z5RjbDu6pCuFC5cLU 9z7y6/owW8WtKzcJQtISXP8dQo6+kB4JMq3BfyWpeTkL8xkwTCC85rC2eO0CJ3Gy4gGnwzcZpFi yqilQwp6sHwYyafY8X9M5m5mRjV84m2l3WTOx/0O1UwO2ZuSVsVAUCQgrH249CtZD7dEGEG9DUM Dpz66y/3bwABNuerNmFcAXgy6GHU862AxUKqDOMW2wpZlRQ84QA0Z1aik0SbDYZWZxlrINyz6fQ QpssTsGMZIqMnMcIpQ+6kY1YgCV8Ca6moF5BPUV87YsthUZx4g3CrwAORKVposXHz6ocuFJfLll 3jbAXpWslaINgW4bd38e3MZlCxDY= X-Received: by 2002:a05:6a00:6f12:b0:880:a842:bb06 with SMTP id d2e1a72fcca58-880a842c13cmr905883b3a.45.1790351963302; Fri, 25 Sep 2026 08:59:23 -0700 (PDT) X-Received: by 2002:a05:6a00:6f12:b0:880:a842:bb06 with SMTP id d2e1a72fcca58-880a842c13cmr905860b3a.45.1790351962748; Fri, 25 Sep 2026 08:59:22 -0700 (PDT) Received: from hu-mojha-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87ff354d854sm1361299b3a.2.2026.09.25.08.59.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 08:59:21 -0700 (PDT) From: Mukesh Ojha To: Sumit Garg , Bjorn Andersson , Konrad Dybcio , Rob Clark , Dmitry Baryshkov , David Airlie , Simona Vetter , Vikash Garodia , Dikshita Agarwal , "Bryan O'Donoghue" , Mauro Carvalho Chehab , Alex Elder , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jeff Johnson , Mathieu Poirier Cc: Abel Vesa , Sean Paul , Akhil P Oommen , Abhinav Kumar , Jessica Zhang , Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-media@vger.kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, ath12k@lists.infradead.org, linux-remoteproc@vger.kernel.org, Mukesh Ojha Subject: [PATCH 8/8] firmware: qcom: pas: remove qcom_pas_auth_and_reset() Date: Fri, 25 Sep 2026 21:27:37 +0530 Message-ID: <20260925155737.4161358-9-mukesh.ojha@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260925155737.4161358-1-mukesh.ojha@oss.qualcomm.com> References: <20260925155737.4161358-1-mukesh.ojha@oss.qualcomm.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTI1MDA2MyBTYWx0ZWRfXxutIyB8HbWi4 nhKDWYzZ3byn9TBU4K4GhYUARfSkwOQ98UbIm4OlF1dWgtCylE/A8u+u+NX4zNRX8SubKeApTG/ LBRPBNcvBKNRN3n9TWRbOL3PFd6jn2glLzO1K2me+RJ/QDDhp1T490EfmaI5Te8xkava/gLhlLu KejAvGBjgeG3B3PUvciMnohmIlgC2iXAJm7wqFjUpkC6Im8K+T0ZIyWl/+yG0sCeocAeHzMGSak cspLwdVfaHKG0RHfVzwicnGxYgjkQiB52MNO5GxOBOUXqzflHqRg6F/uV+Ep48KacEbzVIxxC1V XUmEyxA6qo4bLl+LiO4NsdNCCyBBfOV0gmZVcjs5Rj529J+d5r+AHpnYQ/IZMQ2niSpqRdfnZEn etTiL1RMTVOtaSgDdJqM+paZ55pigYfur/1UvfaFytgRzreMV48ksvAAEOXB09QsUsXfwNIetCg DW5u3AAE8mKgPYu1OAg== X-Authority-Analysis: v=2.4 cv=ZfKIpcVA c=1 sm=1 tr=0 ts=6ab69a5c cx=c_pps a=rEQLjTOiSrHUhVqRoksmgQ==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=sV0Ut8U-cAKt8JUqj3YA:9 a=2VI0MkxyNR6bbpdq8BZq:22 X-Proofpoint-ORIG-GUID: 9xll7xnBBKuiqTxnV1klx-7UMhMZqz-E X-Proofpoint-GUID: 9xll7xnBBKuiqTxnV1klx-7UMhMZqz-E X-Proofpoint-Spam-Info: AW1haW4tMjYwOTI1MDA2MyBTYWx0ZWRfX0B8HJhJzKVp4 DqGCCMCl82wXvgpWbuAKAIZTjQK4R+jcUS7tdv+Hu1HQrVy6dP0RyYLsQ8bQAa3f03mn64jrbJJ ekknNbEf2Rem21yIUbyiIcvcsnY9K+U= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-25_02,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 impostorscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 adultscore=0 bulkscore=0 lowpriorityscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609250063 All callers have been migrated to qcom_pas_prepare_and_auth_reset(), which additionally sets up a shmbridge over firmware memory before TrustZone authentication. Remove the bare pas_id-only wrapper, its EXPORT_SYMBOL_GPL, the header declaration, the auth_and_reset ops slot from struct qcom_pas_ops and both backend implementations. The internal helper functions (__qcom_scm_pas_auth_and_reset, __qcom_pas_tee_auth_and_reset) remain as they are called directly by their respective prepare_and_auth_reset implementations. Signed-off-by: Mukesh Ojha --- drivers/firmware/qcom/qcom_pas.c | 16 ---------------- drivers/firmware/qcom/qcom_pas.h | 3 --- drivers/firmware/qcom/qcom_pas_tee.c | 6 ------ drivers/firmware/qcom/qcom_scm.c | 7 +++---- include/linux/firmware/qcom/qcom_pas.h | 1 - 5 files changed, 3 insertions(+), 30 deletions(-) diff --git a/drivers/firmware/qcom/qcom_pas.c b/drivers/firmware/qcom/qcom_pas.c index 93d78a5c1201..6de6d62adfde 100644 --- a/drivers/firmware/qcom/qcom_pas.c +++ b/drivers/firmware/qcom/qcom_pas.c @@ -166,22 +166,6 @@ struct resource_table *qcom_pas_get_rsc_table(struct qcom_pas_context *ctx, } EXPORT_SYMBOL_GPL(qcom_pas_get_rsc_table); -/** - * qcom_pas_auth_and_reset() - Authenticate the given peripheral firmware - * and reset the remote processor - * @pas_id: peripheral authentication service id - * - * Return: 0 on success. - */ -int qcom_pas_auth_and_reset(u32 pas_id) -{ - if (!ops_ptr) - return -ENODEV; - - return ops_ptr->auth_and_reset(ops_ptr->dev, pas_id); -} -EXPORT_SYMBOL_GPL(qcom_pas_auth_and_reset); - /** * qcom_pas_prepare_and_auth_reset() - Prepare, authenticate, and reset the * remote processor diff --git a/drivers/firmware/qcom/qcom_pas.h b/drivers/firmware/qcom/qcom_pas.h index 8643e2760602..a296be2be8c0 100644 --- a/drivers/firmware/qcom/qcom_pas.h +++ b/drivers/firmware/qcom/qcom_pas.h @@ -18,8 +18,6 @@ struct device; * @get_rsc_table: Peripheral get resource table callback. * @prepare_and_auth_reset: Peripheral prepare firmware authentication and * reset callback. - * @auth_and_reset: Peripheral firmware authentication and reset - * callback. * @set_remote_state: Peripheral set remote state callback. * @shutdown: Peripheral shutdown callback. * @metadata_release: Image metadata release callback. @@ -37,7 +35,6 @@ struct qcom_pas_ops { size_t *output_rt_size); int (*prepare_and_auth_reset)(struct device *dev, struct qcom_pas_context *ctx); - int (*auth_and_reset)(struct device *dev, u32 pas_id); int (*set_remote_state)(struct device *dev, u32 state, u32 pas_id); int (*shutdown)(struct device *dev, u32 pas_id); void (*metadata_release)(struct device *dev, diff --git a/drivers/firmware/qcom/qcom_pas_tee.c b/drivers/firmware/qcom/qcom_pas_tee.c index ac33a00687aa..dbab9a43e6ca 100644 --- a/drivers/firmware/qcom/qcom_pas_tee.c +++ b/drivers/firmware/qcom/qcom_pas_tee.c @@ -320,11 +320,6 @@ static int __qcom_pas_tee_auth_and_reset(struct device *dev, u32 pas_id, return ret; } -static int qcom_pas_tee_auth_and_reset(struct device *dev, u32 pas_id) -{ - return __qcom_pas_tee_auth_and_reset(dev, pas_id, 0, 0); -} - static int qcom_pas_tee_prepare_and_auth_reset(struct device *dev, struct qcom_pas_context *ctx) { @@ -401,7 +396,6 @@ static struct qcom_pas_ops qcom_pas_ops_tee = { .init_image = qcom_pas_tee_init_image, .mem_setup = qcom_pas_tee_mem_setup, .get_rsc_table = qcom_pas_tee_get_rsc_table, - .auth_and_reset = qcom_pas_tee_auth_and_reset, .prepare_and_auth_reset = qcom_pas_tee_prepare_and_auth_reset, .set_remote_state = qcom_pas_tee_set_remote_state, .shutdown = qcom_pas_tee_shutdown, diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index dc57c87870cf..08b9c5049dd9 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -845,7 +845,7 @@ static void *qcom_scm_pas_get_rsc_table(struct device *dev, return ret ? ERR_PTR(ret) : tbl_ptr; } -static int qcom_scm_pas_auth_and_reset(struct device *dev, u32 pas_id) +static int __qcom_scm_pas_auth_and_reset(struct device *dev, u32 pas_id) { int ret; struct qcom_scm_desc desc = { @@ -886,7 +886,7 @@ static int qcom_scm_pas_prepare_and_auth_reset(struct device *dev, * memory region and then invokes a call to TrustZone to authenticate. */ if (!ctx->use_tzmem) - return qcom_scm_pas_auth_and_reset(dev, ctx->pas_id); + return __qcom_scm_pas_auth_and_reset(dev, ctx->pas_id); /* * When Linux runs @ EL2 Linux must create the shmbridge itself and then @@ -896,7 +896,7 @@ static int qcom_scm_pas_prepare_and_auth_reset(struct device *dev, if (ret) return ret; - ret = qcom_scm_pas_auth_and_reset(dev, ctx->pas_id); + ret = __qcom_scm_pas_auth_and_reset(dev, ctx->pas_id); qcom_tzmem_shm_bridge_delete(handle); return ret; @@ -977,7 +977,6 @@ static struct qcom_pas_ops qcom_pas_ops_scm = { .init_image = qcom_scm_pas_init_image, .mem_setup = qcom_scm_pas_mem_setup, .get_rsc_table = qcom_scm_pas_get_rsc_table, - .auth_and_reset = qcom_scm_pas_auth_and_reset, .prepare_and_auth_reset = qcom_scm_pas_prepare_and_auth_reset, .set_remote_state = qcom_scm_pas_set_remote_state, .shutdown = qcom_scm_pas_shutdown, diff --git a/include/linux/firmware/qcom/qcom_pas.h b/include/linux/firmware/qcom/qcom_pas.h index 1d132e89536e..07d0f1fad85f 100644 --- a/include/linux/firmware/qcom/qcom_pas.h +++ b/include/linux/firmware/qcom/qcom_pas.h @@ -46,7 +46,6 @@ struct resource_table *qcom_pas_get_rsc_table(struct qcom_pas_context *ctx, void *input_rt, size_t input_rt_size, size_t *output_rt_size); int qcom_pas_mem_setup(u32 pas_id, phys_addr_t addr, phys_addr_t size); -int qcom_pas_auth_and_reset(u32 pas_id); int qcom_pas_prepare_and_auth_reset(struct qcom_pas_context *ctx); int qcom_pas_set_remote_state(u32 state, u32 pas_id); int qcom_pas_shutdown(u32 pas_id); -- 2.55.0