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 019453C108D for ; Fri, 31 Jul 2026 08:00:59 +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=1785484865; cv=none; b=GU4JQTnpV6OjS4SXjs9bsxaGSoIIWzwPtHSU+oRC2TO2WIugVx6PTEePYXvraD1N22XgRkKfDfxzDOphtxELIOAr/6G6ibl0+YNWBJ6/16HGA8S4kpk32nOeYtIB/sBTCZBWg271LpqjwkxdFzrD4hjqYoZirTlrznGKj+1AUO8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785484865; c=relaxed/simple; bh=BrOiZmqjDQA4SOX/tFJ9OG7jOwQsX4AlgwumHNQ6g7E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dAzv9FyoyazMTDxUBw1i1Bui0DKbWU9Yy5eRvs+THkD7vk2JecpmuAgoAwrhMBLD8eDzRhOfdnvZhvKqA+3ziwuhXzvlX923GS28wwSexSDvMAIXHwc47HDZFeah//aKIQUKwwHqyGyRITLSgEk8mgXGvquO1RnREGoWypzujyM= 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=h4UZLNu2; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=IElzC+1x; 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="h4UZLNu2"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="IElzC+1x" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66V7vXg13672609 for ; Fri, 31 Jul 2026 08:00:58 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= 2pDxPDiiaZcrKgTDQUne5eQDWUVnlE1MaiQL6gCnqsA=; b=h4UZLNu2Rj8N/DBq 8kZdyCEc0SBUs9GU6uZUuw/smkdYBWjqW705IvBxf0Y52nz0foiytR+HiGS2c/pC SvGHtBOJ1cySIrQsypzmRGUnoarhTfVtYUuzP8J4EDANauHPB4FxKWcCJuc/Wynu 5ZKlW2g3j4F45I0K9kb4V+8lA/F97iX1lzLaoMC1dcU2+CVdpSfT5vtO+iSzOC/Q vqihXnivn31fvixoF/+U3oA91YlQFxvifHH5cONy4GJySHAHjFxnfxZlsvCqe1BD DCiEqcWDi+F5SYx2ymuyitgPdCR25Q1iOrfGYvi7mY3OKv6qF+1yiTh50OCg5Yog hSoSxQ== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4frpgk0b49-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 31 Jul 2026 08:00:58 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51c12e43b98so6170271cf.1 for ; Fri, 31 Jul 2026 01:00:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785484858; x=1786089658; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=2pDxPDiiaZcrKgTDQUne5eQDWUVnlE1MaiQL6gCnqsA=; b=IElzC+1x5DVOIpJuY5S7BtOFj8e+VZJnc4K60iCHGm25O1q0c8kS393ZpOEKVk+CZx 360tpNIlfGxDWxf5gA5yVwvFlgqio5vSm4hrhojA7yP9UDF1PwEWpF5D+J1lX8BXbVzZ nW89VStOY/OI1P1BkV/+feUqv7KOWKb9m3aZp1jqBEt2W8PXzaY9EEgFbdo6Dt1Z4+Vz aktdf5KnAFGg15/LrLW0x9bkDBt9aMmgOGRBm1/mbDMFIU0hudTP8Ty505FgjuhJbpx+ Oka8HKth7jB6lPFf2SkmzF2n+LRGvShQtFfP204ytNYrt6Dt32Uub/LqJQHCze7HgYM+ kZDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785484858; x=1786089658; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=2pDxPDiiaZcrKgTDQUne5eQDWUVnlE1MaiQL6gCnqsA=; b=o4rqIn+kdv46f8n71+WXJxGoxkJkSmoAGddVmjzRQK9PX/Rayuau2GKevDCl+vPwpO 9SFQykEgrBmUG0zMmvLneGUSGkyTROBNtF65rxWTmf2zW9SpQEakwEwGDrbsd0ikTnSM YXLD0We6L7mlbCuNLeezRc0lKeHrj8mBiO2JXhGpMaZ9X9IYbBJcAEEZbCQ04YCxhuoE FI89o364HD6pIgqN+mqt6kqRxH/zIwEXygnH0iWJbJjh2rC1a6jthDto3xbAgTxVWTpx MQov35BA/d6SFdLx82h2hHkrP79m8E1Xgy2DB+NEvBE0z+ohohRsO32ejuk3gRh2Cvb/ CGpw== X-Forwarded-Encrypted: i=1; AHgh+RoGsb4juo8YJOYIPioVdDMY1ppLkRymeS4DdtbvVYc0rp5mPwNmTO6YFlF9xySTRr7YC3ztwgvSVwhf7AQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yw1/wRiDwiT4fHgyYPT+8CNMbGub0puOmk0JF2jMmMBPvMumt1L PUML/BpyfpT0tuYQgtgpLSHsIUbcqrf67D1Yr769Q0Y0p72RaeOn012H+k6b/tnHEPpB/sBIbtZ db/n+lLPMLwMnpuGPQUEWVzaIxJ/0aCRm1ZVjIh1yzk+yt8KNO1ZU+mY8qUxrmxe1NGw= X-Gm-Gg: AR+sD10HVP5Ay559Lm+3L2cSJ0h2Zx6IUgfNPAZilYoo5y25lt6RHtIf/uufRBtmwnb ZFgR/8fvyO8qepvPZKAiCEfG4EkOhKLpDYmDYZBKyEW61Z87Xzu4rUwmXGNomCWlkhHDhBR1EDG pBStQrw99Nt08yhmgIPPk3FHs2iJ1NLqh2ZgHq1y8AwvRQUF4T2z96kBiyXTKlx5u1SeWwfRaxx 8tn0QGm2rxwgDwM/GhFegMi7A05cvHtkxf9JrkzrqiaY8XnaQe1GIZgOc1JdKe3M61Syv7+Mumu GIMF1/ZycKAC1vdGWNqK0l38sHrQAf/xIpV7/gCrImGYOhqOPbtaepEQKNHYpou8D4kMPxO6xZU VZRV9VzO42sIzBLeh+klegyRw4MmnLQ== X-Received: by 2002:a05:622a:1f95:b0:51c:1005:d096 with SMTP id d75a77b69052e-52b4af4fbb4mr13030281cf.24.1785484857812; Fri, 31 Jul 2026 01:00:57 -0700 (PDT) X-Received: by 2002:a05:622a:1f95:b0:51c:1005:d096 with SMTP id d75a77b69052e-52b4af4fbb4mr13029631cf.24.1785484857273; Fri, 31 Jul 2026 01:00:57 -0700 (PDT) Received: from brgl-qcom.local ([2a01:cb1d:dc:7e00:40fa:e8e6:4785:ce70]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c1fd4534fc4sm51032966b.51.2026.07.31.01.00.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 01:00:56 -0700 (PDT) From: Bartosz Golaszewski Date: Fri, 31 Jul 2026 10:00:36 +0200 Subject: [PATCH v2 3/4] firmware: qcom: scm: introduce qcom_scm_clk class for clock management 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: 7bit Message-Id: <20260731-qcom-scm-code-shrink-v2-3-4ba76096915f@oss.qualcomm.com> References: <20260731-qcom-scm-code-shrink-v2-0-4ba76096915f@oss.qualcomm.com> In-Reply-To: <20260731-qcom-scm-code-shrink-v2-0-4ba76096915f@oss.qualcomm.com> To: Bartosz Golaszewski , Bjorn Andersson , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Konrad Dybcio , Mukesh Ojha X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5215; i=bartosz.golaszewski@oss.qualcomm.com; h=from:subject:message-id; bh=BrOiZmqjDQA4SOX/tFJ9OG7jOwQsX4AlgwumHNQ6g7E=; b=owEBbQKS/ZANAwAKAQWdLsv/NoTDAcsmYgBqbFYwuGtYO7y/9saNMqx1Ip/1IsVoTDPqMZ7i8 SL+vs3qLaWJAjMEAAEKAB0WIQSR5RMt5bVGHXuiZfwFnS7L/zaEwwUCamxWMAAKCRAFnS7L/zaE wzLLD/97KXFtD7LIQ+56gmRatJ3ybY4StPN3fSpJIBpTfPObNiMTa7OPkyEjxyvnWShXN00ZY7i sgLUl1DAFNa9s8MkyBKTO/xJoTYAfv1ea6UXyOvUkvIspbSe+2S4HgDTa8511pu5uGJ6z0VI/86 lfa469ecD8HVOYOt51gGhTvLJBTGOZu8pfEwEPSBBdfQqRxctjilElcyfl52ZkUDIUwhBrTRYKi ypQmdDm4TZgUyqbCXRg1oTPfDo/XuXzq+WPsh7vxOambi5wjLJtVgqhBfWhNNOU8K9T+U9EZ8Ui iboodhpuBb2+jpVrDalYTxMYTZYWjBzWG3BjRYtHcuTxzVM56d5eQBaQkZu+f9PdLSXbi1PQMzb lDO7v9wbNN5aV1PGG4QmzIoHPV+iTRbM8IqpoScxsclYnuYn9Nbn4+uDmqMa6ylCe///N7T0D10 uD1llJ934755UF7FzmEVnz6e/lqtbW2APF9nNVL787Qy0va/7aFtjKi8MoiH+78Q5UfUHg1krsB BZQ7WEW6v89SxS7dHPMPm8/djr2IUhE9VaqBCcrck4j+t9ykNrNigDv2A5uaT7wRT8XzUWPjdPx 341t8uRCESI/F5FTFCeS770bz4YAZ6Ajb+0BEnW/xkxTZf9L1pNXfQW3DokGtLsXjnfF812a7/D L58IyXLqoLGyZAg== X-Developer-Key: i=bartosz.golaszewski@oss.qualcomm.com; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 X-Proofpoint-ORIG-GUID: 9IY_sTbOPrSrruMir2yYR5pTCeitDOI_ X-Authority-Analysis: v=2.4 cv=P4sKQCAu c=1 sm=1 tr=0 ts=6a6c563a cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=NlXoPVkAUwU2Be_QxucA:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA1NiBTYWx0ZWRfX6TIVlYzNBeoo 6RxpJwFQVcyq6eoZ5USbhMN9B/gR/Ghs0gnwhlL5dKEUKQGBsf1wbxxFygT8kbLSueXoREioIyP nokaQ3tskCKarTlGSoKVkjjm3x05+L8= X-Proofpoint-GUID: 9IY_sTbOPrSrruMir2yYR5pTCeitDOI_ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA1NiBTYWx0ZWRfXxo97OgzVe+mJ Fgd7xRgWYhmGNSYpIWv6V1alwt18nsXa11/ubVs6UGWvVqMwOXYzQjm/C79SDPIqWiBqt54hrE1 puxmhK9Vie/3EJKX09b3yHvI62hnFZlWV52GRmOOTyWjROgeOm93q2a43KGSlQbW1YkH/zzcgcM 2ROCKnaXcwkOpzo1k7KxPIjm2sSLlHLEKP/TWtl1bREfg9h9Bq7PkORzPBfCg8mnHx4mh9PbNjE +tcDCS9zh+PD8FwzFWs9IKfBEF+Ch2LzlPTIgZ1H6YIlLGQ99qIszfRxFSmdT//nsrYdFC2vaQL SXJCkvYWZg1V5p4fFhe3rS4sGyumCzLWl4Vgj4iNtiJbri6pZ/69R/2HcxSJAz+jvoO/gKar0FW 7mydVGOnz7KXFTXwqLIw5ex2CHa4akhJZeYwDFpTKNDNomg0G8DMgm5CGwQ9kJdCKQTA/08F6MP nd/u+/1gQcXhILk9DGQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_03,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 malwarescore=0 adultscore=0 priorityscore=1501 lowpriorityscore=0 phishscore=0 spamscore=0 impostorscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310056 Define DEFINE_CLASS(qcom_scm_clk) that calls qcom_scm_clk_enable() on construction and automatically calls qcom_scm_clk_disable() at scope exit *if* the enable succeeded. This allows us to convert all call sites to using CLASS(qcom_scm_clk, clk)() instead of the manual enable/check/disable pattern and to remove the associated goto labels. Reviewed-by: Konrad Dybcio Reviewed-by: Mukesh Ojha Signed-off-by: Bartosz Golaszewski --- drivers/firmware/qcom/qcom_scm.c | 89 +++++++++++++++------------------------- 1 file changed, 34 insertions(+), 55 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index 10c79d2e59a14af0532c515d332f65bdfea05621..bb213f64703a7adb9ce413ec00524a7d0a1d3856 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -209,6 +209,9 @@ static void qcom_scm_clk_disable(void) clk_disable_unprepare(__scm->bus_clk); } +DEFINE_CLASS(qcom_scm_clk, int, if (!_T) qcom_scm_clk_disable(), + qcom_scm_clk_enable(), void) + static int qcom_scm_bw_enable(void) { int ret = 0; @@ -509,13 +512,11 @@ static int qcom_scm_disable_sdi(void) }; struct qcom_scm_res res; - ret = qcom_scm_clk_enable(); - if (ret) - return ret; + CLASS(qcom_scm_clk, clk)(); + if (clk) + return clk; ret = qcom_scm_call(__scm->dev, &desc, &res); - qcom_scm_clk_disable(); - return ret ? : res.result[0]; } @@ -609,22 +610,19 @@ static int __qcom_scm_pas_init_image(struct device *dev, u32 pas_id, }; int ret; - ret = qcom_scm_clk_enable(); - if (ret) - return ret; + CLASS(qcom_scm_clk, clk)(); + if (clk) + return clk; ret = qcom_scm_bw_enable(); if (ret) - goto disable_clk; + return ret; desc.args[1] = mdata_phys; ret = qcom_scm_call(dev, &desc, res); qcom_scm_bw_disable(); -disable_clk: - qcom_scm_clk_disable(); - return ret; } @@ -734,20 +732,17 @@ static int __qcom_scm_pas_mem_setup(struct device *dev, u32 pas_id, }; struct qcom_scm_res res; - ret = qcom_scm_clk_enable(); - if (ret) - return ret; + CLASS(qcom_scm_clk, clk)(); + if (clk) + return clk; ret = qcom_scm_bw_enable(); if (ret) - goto disable_clk; + return ret; ret = qcom_scm_call(dev, &desc, &res); qcom_scm_bw_disable(); -disable_clk: - qcom_scm_clk_disable(); - return ret ? : res.result[0]; } @@ -819,13 +814,13 @@ static void *__qcom_scm_pas_get_rsc_table2(struct device *dev, void *tbl_ptr; int ret; - ret = qcom_scm_clk_enable(); - if (ret) - return ERR_PTR(ret); + CLASS(qcom_scm_clk, clk)(); + if (clk) + return ERR_PTR(clk); ret = qcom_scm_bw_enable(); if (ret) - goto disable_clk; + return ERR_PTR(ret); /* * TrustZone can not accept buffer as NULL value as argument hence, @@ -872,9 +867,6 @@ static void *__qcom_scm_pas_get_rsc_table2(struct device *dev, disable_scm_bw: qcom_scm_bw_disable(); -disable_clk: - qcom_scm_clk_disable(); - return ret ? ERR_PTR(ret) : tbl_ptr; } @@ -902,20 +894,17 @@ static int __qcom_scm_pas_auth_and_reset(struct device *dev, u32 pas_id) }; struct qcom_scm_res res; - ret = qcom_scm_clk_enable(); - if (ret) - return ret; + CLASS(qcom_scm_clk, clk)(); + if (clk) + return clk; ret = qcom_scm_bw_enable(); if (ret) - goto disable_clk; + return ret; ret = qcom_scm_call(dev, &desc, &res); qcom_scm_bw_disable(); -disable_clk: - qcom_scm_clk_disable(); - return ret ? : res.result[0]; } @@ -997,20 +986,17 @@ static int __qcom_scm_pas_shutdown(struct device *dev, u32 pas_id) }; struct qcom_scm_res res; - ret = qcom_scm_clk_enable(); - if (ret) - return ret; + CLASS(qcom_scm_clk, clk)(); + if (clk) + return clk; ret = qcom_scm_bw_enable(); if (ret) - goto disable_clk; + return ret; ret = qcom_scm_call(dev, &desc, &res); qcom_scm_bw_disable(); -disable_clk: - qcom_scm_clk_disable(); - return ret ? : res.result[0]; } @@ -1780,18 +1766,13 @@ EXPORT_SYMBOL_GPL(qcom_scm_import_ice_key); */ bool qcom_scm_hdcp_available(void) { - bool avail; - int ret = qcom_scm_clk_enable(); + CLASS(qcom_scm_clk, clk)(); - if (ret) - return ret; - - avail = __qcom_scm_is_call_available(__scm->dev, QCOM_SCM_SVC_HDCP, - QCOM_SCM_HDCP_INVOKE); - - qcom_scm_clk_disable(); + if (clk) + return false; - return avail; + return __qcom_scm_is_call_available(__scm->dev, QCOM_SCM_SVC_HDCP, + QCOM_SCM_HDCP_INVOKE); } EXPORT_SYMBOL_GPL(qcom_scm_hdcp_available); @@ -1829,15 +1810,13 @@ int qcom_scm_hdcp_req(struct qcom_scm_hdcp_req *req, u32 req_cnt, u32 *resp) if (req_cnt > QCOM_SCM_HDCP_MAX_REQ_CNT) return -ERANGE; - ret = qcom_scm_clk_enable(); - if (ret) - return ret; + CLASS(qcom_scm_clk, clk)(); + if (clk) + return clk; ret = qcom_scm_call(__scm->dev, &desc, &res); *resp = res.result[0]; - qcom_scm_clk_disable(); - return ret; } EXPORT_SYMBOL_GPL(qcom_scm_hdcp_req); -- 2.47.3