From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.trustedfirmware.org (lists.trustedfirmware.org [18.214.241.189]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 03F59C54F30 for ; Tue, 27 May 2025 07:01:48 +0000 (UTC) Received: from lists.trustedfirmware.org (localhost [127.0.0.1]) by lists.trustedfirmware.org (Postfix) with ESMTP id 4F13243110 for ; Tue, 27 May 2025 07:01:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.trustedfirmware.org; s=2024; t=1748329308; bh=Zth/3P/FjsXFcXOPT+DjG5974NddOP5SrXJoKFpW5WI=; h=Date:Subject:References:In-Reply-To:To:CC:List-Id:List-Archive: List-Help:List-Owner:List-Post:List-Subscribe:List-Unsubscribe: From:Reply-To:From; b=oOQN7D/dGLFlZelXMxYMPPSQtVGf+1pyZZN30+G5/ihwqB5pVgozy+GpMmV0HVJvV bYrg7TeyrCLF+9257CRndTCIcnkOn2HBqZ0vjqeKx2SpilEl2M1fuWKD8lOpjhY+DQ aQ/PMIATZkf9Ba1ZM0+DEZKz6tiYPAdJXQBgj+z3V2hvzqzjTgLc27aeY/94pxwstz IoMWCiZzDSD2gHhQo7Uv4I+6s+Th6GDqcoV8iyYp/Tx1xnuNL0sqRi16zUpzZVs85x B3M0+wRRCSTew/2rso/t4JG6mzOawxN59smNo3B9YeG+m9882h0GNKkcvIVXHzc9i+ V+u4pqDYUosgg== Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lists.trustedfirmware.org (Postfix) with ESMTPS id 952A442FB5 for ; Tue, 27 May 2025 06:57:28 +0000 (UTC) Authentication-Results: lists.trustedfirmware.org; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.a=rsa-sha256 header.s=qcppdkim1 header.b=VWHmPsAS; dkim-atps=neutral Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54QJgGB9013434 for ; Tue, 27 May 2025 06:57:28 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= o8VjfmWoJoDXBpYwZyd2P0w0BU5tyeVntRTG/sihbWg=; b=VWHmPsASvegByRyw WczWGexUVZdgO11kVlRtNY3jNcZlPNDXPu2E4w2nrwXOuhJofYYCofy4N3N3/Zxn c4AF26N76SAmzvNrSzLwMGIG8H3Upcu0LrA//O/bOHJ/FYtKblcA9hq0czTOmLey 7ZAwupKbEEY6OSFqJDyF8A6zdjbckwiWdtfSjCQS1WzhoTHBgS3rpsVB6048CWxA zL/2hYhQlxSBnX2nz0rQhAkvQzvjnas9u/LzVkPb8tFAzN39wkyG8R7iYHTP6eGQ NDD9+Lf53PtxB1XfsRhQzPV9wKmaEuQAjK6UdaD5VB0LMkB39JK0bG76zr4bFLv2 lf8z8A== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46vmgcte71-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 27 May 2025 06:57:28 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-742c7227d7dso2073411b3a.2 for ; Mon, 26 May 2025 23:57:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748329047; x=1748933847; 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=o8VjfmWoJoDXBpYwZyd2P0w0BU5tyeVntRTG/sihbWg=; b=vwP0eDqBfU6yCgxjMq91QNuGXLO7Yxkg8hgVJ/kjnjv00pS7xLdXEzMDRGV0ulENgX vLdmBztgisBlIFfYiTpEtRyleZ4pUFdYwIuFx8CQrx1/hIFt8sdyekV7IuBrbdstuBAK p0NrcUGfDvnjf2nzRaKwAgajhSt5G8w+qjSETmkRbdM0Tt0Ge2aEJNyBZeADM9XZkxIP MR1N1FhPGG8d+lUwaAYbD2JXsQd0QU0uX8nILsexzagdQLlDcE2FC/glmmfw/9259kMg k1O3OLqRZw0CSlvEfwgB1QNVM0SGqCP5/xgz/n+bKOXXUt6t30u8mR4M/cf4HcMML6XH P9/g== X-Forwarded-Encrypted: i=1; AJvYcCXpfXzacij9U8EkxU1lSHYtPfuagNs61p6yTrRhyK6LQK06+qtukgNIy/NBFAOpdAliENqRj4Y=@lists.trustedfirmware.org X-Gm-Message-State: AOJu0Yzr8qvGT010uzNMq127dB6bBhiu5R6M5wti+JtVyc4E69SeHu5s MR8AwTK6bq9wr5d3tpjYuzuqgJwCqhu7KqIRmdNSKZCTLKHYeGohj0b3yfetaR373QmD6xsUatu lKnGlygdQTKaBWjhUA++s9oKDOWA3TQE9YTxqZSJcusUTzDi93N0hoVqzsMQZrOep3KXcE+g= X-Gm-Gg: ASbGncvfL+/LcFejA0GVw8s2DrUbkot1te/QSR5M0kTDbh5CCfo3bXWYuBn4yqvgRLT G0DpxjWKzdDwMu+KIh6axeaBrQunvvyTcmyPPSuXGOrqBUpuS8xln6Je/CNFyFUjIffhp0nGET7 5EAz4x0pNhgd9PAom+SlLtkcKmIqOWGxoHvdYKUYvE+PL2h142dERDW9InRyyKBrj6APqOn8ML6 FnNnNqPqu7RGMl1QaCV0VEss/nu8Osh7VlkpBovtNK/qB2cfOVIe6oXDTAZiNA6J+vVL5GOak6/ 7ElM1wIlGAJ87U89Jy1jlvWh0JecE62H5QTbEIwP7AJFIJxI7utyV2SPcZEUtFnb+99dcZ8= X-Received: by 2002:a05:6a00:801:b0:730:9946:5973 with SMTP id d2e1a72fcca58-745fde6003bmr16336352b3a.5.1748329046830; Mon, 26 May 2025 23:57:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFu3CU3ay8afRL2sXBe8+ebw8AHA7te8dS/i0NED7172wSL2eRoWnyesqmcAWty/3PYQAF30Q== X-Received: by 2002:a05:6a00:801:b0:730:9946:5973 with SMTP id d2e1a72fcca58-745fde6003bmr16336323b3a.5.1748329046422; Mon, 26 May 2025 23:57:26 -0700 (PDT) Received: from hu-azarrabi-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a970954asm18037286b3a.46.2025.05.26.23.57.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 May 2025 23:57:25 -0700 (PDT) Date: Mon, 26 May 2025 23:56:52 -0700 Subject: [PATCH v5 07/12] firmware: qcom: scm: remove unused arguments to the shm_brige MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250526-qcom-tee-using-tee-ss-without-mem-obj-v5-7-024e3221b0b9@oss.qualcomm.com> References: <20250526-qcom-tee-using-tee-ss-without-mem-obj-v5-0-024e3221b0b9@oss.qualcomm.com> In-Reply-To: <20250526-qcom-tee-using-tee-ss-without-mem-obj-v5-0-024e3221b0b9@oss.qualcomm.com> To: Jens Wiklander , Sumit Garg , Bjorn Andersson , Konrad Dybcio , Bartosz Golaszewski , Apurupa Pattapu , Kees Cook , "Gustavo A. R. Silva" , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= X-Mailer: b4 0.13.0 X-Proofpoint-ORIG-GUID: GvMvY0qQwfql8dzw6h1nwzd8i6ne6T-1 X-Proofpoint-GUID: GvMvY0qQwfql8dzw6h1nwzd8i6ne6T-1 X-Authority-Analysis: v=2.4 cv=Ws4rMcfv c=1 sm=1 tr=0 ts=68356258 cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=ViJ-rRY3MSY-B2NivjAA:9 a=QEXdDO2ut3YA:10 a=OpyuDcXvxspvyRM73sMx:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTI3MDA1NCBTYWx0ZWRfX/gbUZl2MWZVq sLzBxNl78C9t4hPaSywLkMUaHwjXrWcK/Rj2YtBiTcIs8X+20H12HVcPWLsWqr0MgvcCnX8paF2 TkWaQn++TA4tmo89LdmnyeyzggqyClGrmZnvER0rf6QjVaCCWN7E1E+QP96+djPYbl0D2mZQtIf d9gSNXlfPmfrt6/syJ0qCXMFjBPSQ3OKZ67rB1MVex9d9e/Ywh3symJn4qaXv/be0IabdO5C6yY MU75ElfiDFlPV+ywWyi/ZyajERTLn9g/ddl9AV0fyvOnrnw9bU7qtdIPZt75SvUF9dY2m/vxHi1 UvmQO1AItOAuvRSoN3/H41b5Hs0r3G+DNNsB0wkdIrPK6D04ZuZjL8DkIC4zHfRBk/V0eEFQCvW lsNuAfmVy9zAPM7FxYqIQpuTDaMqyjB3WsIt6jDaorCSp8SG7Ce5bJE4ZwFLRK2GJnLoamJY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-27_03,2025-05-26_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 clxscore=1015 impostorscore=0 spamscore=0 adultscore=0 phishscore=0 mlxlogscore=999 priorityscore=1501 malwarescore=0 lowpriorityscore=0 bulkscore=0 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505270054 X-Spamd-Bar: ---------- X-Spamd-Result: default: False [-10.80 / 15.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; DWL_DNSWL_MED(-2.00)[qualcomm.com:dkim]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; DMARC_POLICY_ALLOW(-0.50)[qualcomm.com,reject]; R_DKIM_ALLOW(-0.20)[qualcomm.com:s=qcppdkim1]; R_SPF_ALLOW(-0.20)[+ip4:205.220.180.131]; RCVD_IN_DNSWL_MED(-0.20)[129.46.96.20:received]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_LOW(-0.10)[205.220.180.131:from]; RCPT_COUNT_TWELVE(0.00)[20]; RCVD_COUNT_THREE(0.00)[4]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM(-0.00)[-1.000]; RCVD_TLS_LAST(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[op-tee@lists.trustedfirmware.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ASN(0.00)[asn:22843, ipnet:205.220.180.0/24, country:US]; RCVD_IN_DNSWL_NONE(0.00)[209.85.210.199:received]; DKIM_TRACE(0.00)[qualcomm.com:+]; FROM_HAS_DN(0.00)[] X-Rspamd-Action: no action X-Rspamd-Server: lists.trustedfirmware.org X-Rspamd-Queue-Id: 952A442FB5 Message-ID-Hash: QQIQOMQ3OQE5MEEHMBUG4VGWZTMK5XPW X-Message-ID-Hash: QQIQOMQ3OQE5MEEHMBUG4VGWZTMK5XPW X-MailFrom: amirreza.zarrabi@oss.qualcomm.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-op-tee.lists.trustedfirmware.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Harshal Dev , linux-arm-msm@vger.kernel.org, op-tee@lists.trustedfirmware.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-doc@vger.kernel.org, Amirreza Zarrabi , Neil Armstrong X-Mailman-Version: 3.3.5 Precedence: list List-Id: Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Amirreza Zarrabi via OP-TEE Reply-To: Amirreza Zarrabi shm_bridge create/delete functions always use the scm device. There is no need to pass it as an argument. Tested-by: Neil Armstrong Signed-off-by: Amirreza Zarrabi --- drivers/firmware/qcom/qcom_scm.c | 4 ++-- drivers/firmware/qcom/qcom_tzmem.c | 8 ++++---- include/linux/firmware/qcom/qcom_scm.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index e3207a9d2de6..72223d7dc33d 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -1631,7 +1631,7 @@ int qcom_scm_shm_bridge_enable(void) } EXPORT_SYMBOL_GPL(qcom_scm_shm_bridge_enable); -int qcom_scm_shm_bridge_create(struct device *dev, u64 pfn_and_ns_perm_flags, +int qcom_scm_shm_bridge_create(u64 pfn_and_ns_perm_flags, u64 ipfn_and_s_perm_flags, u64 size_and_flags, u64 ns_vmids, u64 *handle) { @@ -1659,7 +1659,7 @@ int qcom_scm_shm_bridge_create(struct device *dev, u64 pfn_and_ns_perm_flags, } EXPORT_SYMBOL_GPL(qcom_scm_shm_bridge_create); -int qcom_scm_shm_bridge_delete(struct device *dev, u64 handle) +int qcom_scm_shm_bridge_delete(u64 handle) { struct qcom_scm_desc desc = { .svc = QCOM_SCM_SVC_MP, diff --git a/drivers/firmware/qcom/qcom_tzmem.c b/drivers/firmware/qcom/qcom_tzmem.c index 94196ad87105..4fe333fd2f07 100644 --- a/drivers/firmware/qcom/qcom_tzmem.c +++ b/drivers/firmware/qcom/qcom_tzmem.c @@ -124,9 +124,9 @@ static int qcom_tzmem_init_area(struct qcom_tzmem_area *area) if (!handle) return -ENOMEM; - ret = qcom_scm_shm_bridge_create(qcom_tzmem_dev, pfn_and_ns_perm, - ipfn_and_s_perm, size_and_flags, - QCOM_SCM_VMID_HLOS, handle); + ret = qcom_scm_shm_bridge_create(pfn_and_ns_perm, ipfn_and_s_perm, + size_and_flags, QCOM_SCM_VMID_HLOS, + handle); if (ret) return ret; @@ -142,7 +142,7 @@ static void qcom_tzmem_cleanup_area(struct qcom_tzmem_area *area) if (!qcom_tzmem_using_shm_bridge) return; - qcom_scm_shm_bridge_delete(qcom_tzmem_dev, *handle); + qcom_scm_shm_bridge_delete(*handle); kfree(handle); } diff --git a/include/linux/firmware/qcom/qcom_scm.h b/include/linux/firmware/qcom/qcom_scm.h index b3a7cc20e617..796de61c7e9e 100644 --- a/include/linux/firmware/qcom/qcom_scm.h +++ b/include/linux/firmware/qcom/qcom_scm.h @@ -149,10 +149,10 @@ bool qcom_scm_lmh_dcvsh_available(void); int qcom_scm_gpu_init_regs(u32 gpu_req); int qcom_scm_shm_bridge_enable(void); -int qcom_scm_shm_bridge_create(struct device *dev, u64 pfn_and_ns_perm_flags, +int qcom_scm_shm_bridge_create(u64 pfn_and_ns_perm_flags, u64 ipfn_and_s_perm_flags, u64 size_and_flags, u64 ns_vmids, u64 *handle); -int qcom_scm_shm_bridge_delete(struct device *dev, u64 handle); +int qcom_scm_shm_bridge_delete(u64 handle); #ifdef CONFIG_QCOM_QSEECOM -- 2.34.1