From nobody Thu Apr 9 03:15:09 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F9C3C433FE for ; Wed, 2 Nov 2022 08:33:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230324AbiKBIdF (ORCPT ); Wed, 2 Nov 2022 04:33:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230328AbiKBIdB (ORCPT ); Wed, 2 Nov 2022 04:33:01 -0400 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EB5227B00 for ; Wed, 2 Nov 2022 01:32:58 -0700 (PDT) Received: by mail-pl1-x62e.google.com with SMTP id 4so15926126pli.0 for ; Wed, 02 Nov 2022 01:32:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=q2nlS3XahONFZFIAHmPH/AavNAlCb2gKg69yTobdo08=; b=oeMpWeKeP0rveiNwGyuAN4gNDf6JHLEQ6H7aQ7WK5bkqfCdJaus2WQZ0Cae7Uv/Whj hmjZj5wn7hGNTy92X9wOPaRdkvK5gElRihTmougdTTd7kQBjrQ/HWqxFvIm3NXe/53vZ /SQ1IHi4fWZ58LmeMC1USf5Uq+5gMHU1LqUhXWz3TMYL1nHemu91jJfDFV+ajlNoMTzo GfzjJXaoOZki5KVPJqwoTs1/cyFJErlvsvAVrnNxt+YtFn/gvzH+qakawhw4p2zIkdwH /+4D2LsTgiMw+MsE5eC8g+SWurCzNG9cLvqhQaK/J6hujAy5tHtDjb7Fih6Lael72zk9 i8uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=q2nlS3XahONFZFIAHmPH/AavNAlCb2gKg69yTobdo08=; b=RAlAIOdqtn6c0B8CDWOQ5uH/1pV/nA9+63BsZmfoPmCOntRCVT6trRCRhktBMS7eqX U0JgWdRESsbMe5miiwGLqJ8vTICEjn01cQLyq4MxMr/Kz1dOOs3rw0TApN5lhXWupYIb XEK+IvPL5QK+ajkkj5cwlXaOw3J/9Vyx8M6isyRXa4uW9/TibiOqQEp6+2fI2mJTyuxC QroipdCCEKYb3FIgHgf++knLduqvR/TC733F18cVgVWgiw3eiR1IG0pMC+XoPxoBPjGp hf8ymlc6WAhZnaEwXULbABJkUW6nvZXudE2H9YBSnAGjRbemNzo8qqN+61qbhke4N6Dt oNHg== X-Gm-Message-State: ACrzQf0zs8Iiq4eXfUVwY0AiBxlZV95zAeVgI7feCj5Qc7tCGs8RLTNp f0RBuFUKo+4OWWCKqhEGlakH X-Google-Smtp-Source: AMsMyM4ElgaogpH3aOKa4/LTBdF1aWHexA+c5wQiud780R9cduZbExY/WAmOT8CGQs/Mp9sUBCfPpQ== X-Received: by 2002:a17:90a:6d22:b0:213:7e1e:9be0 with SMTP id z31-20020a17090a6d2200b002137e1e9be0mr24188999pjj.17.1667377977781; Wed, 02 Nov 2022 01:32:57 -0700 (PDT) Received: from localhost.localdomain ([117.193.209.178]) by smtp.gmail.com with ESMTPSA id d12-20020a170902654c00b00176acd80f69sm7682256pln.102.2022.11.02.01.32.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Nov 2022 01:32:56 -0700 (PDT) From: Manivannan Sadhasivam To: andersson@kernel.org, viresh.kumar@linaro.org, rafael@kernel.org Cc: johan@kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Manivannan Sadhasivam Subject: [PATCH 1/3] cpufreq: qcom-hw: Allocate qcom_cpufreq_data during probe Date: Wed, 2 Nov 2022 14:02:37 +0530 Message-Id: <20221102083239.53826-2-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221102083239.53826-1-manivannan.sadhasivam@linaro.org> References: <20221102083239.53826-1-manivannan.sadhasivam@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" qcom_cpufreq_data is allocated based on the number of frequency domains defined in DT which is static and won't change during runtime. There is no real reason to allocate it during the CPU init() callback and deallocate it during exit(). Hence, move the allocation to probe() and use the allocated memory during init(). This also allows us to use devm_platform_get_and_ioremap_resource() helper for acquiring the freq-domain resources from DT. Signed-off-by: Manivannan Sadhasivam --- drivers/cpufreq/qcom-cpufreq-hw.c | 86 +++++++++++++------------------ 1 file changed, 37 insertions(+), 49 deletions(-) diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufr= eq-hw.c index a5b3b8d0e164..1842e9facaa1 100644 --- a/drivers/cpufreq/qcom-cpufreq-hw.c +++ b/drivers/cpufreq/qcom-cpufreq-hw.c @@ -58,6 +58,10 @@ struct qcom_cpufreq_data { bool per_core_dcvs; }; =20 +static struct { + struct qcom_cpufreq_data *data; +} qcom_cpufreq; + static unsigned long cpu_hw_rate, xo_rate; static bool icc_scaling_enabled; =20 @@ -489,8 +493,6 @@ static int qcom_cpufreq_hw_cpu_init(struct cpufreq_poli= cy *policy) struct of_phandle_args args; struct device_node *cpu_np; struct device *cpu_dev; - struct resource *res; - void __iomem *base; struct qcom_cpufreq_data *data; int ret, index; =20 @@ -512,43 +514,16 @@ static int qcom_cpufreq_hw_cpu_init(struct cpufreq_po= licy *policy) return ret; =20 index =3D args.args[0]; - - res =3D platform_get_resource(pdev, IORESOURCE_MEM, index); - if (!res) { - dev_err(dev, "failed to get mem resource %d\n", index); - return -ENODEV; - } - - if (!request_mem_region(res->start, resource_size(res), res->name)) { - dev_err(dev, "failed to request resource %pR\n", res); - return -EBUSY; - } - - base =3D ioremap(res->start, resource_size(res)); - if (!base) { - dev_err(dev, "failed to map resource %pR\n", res); - ret =3D -ENOMEM; - goto release_region; - } - - data =3D kzalloc(sizeof(*data), GFP_KERNEL); - if (!data) { - ret =3D -ENOMEM; - goto unmap_base; - } - data->soc_data =3D of_device_get_match_data(&pdev->dev); - data->base =3D base; - data->res =3D res; + data =3D &qcom_cpufreq.data[index]; =20 /* HW should be in enabled state to proceed */ - if (!(readl_relaxed(base + data->soc_data->reg_enable) & 0x1)) { + if (!(readl_relaxed(data->base + data->soc_data->reg_enable) & 0x1)) { dev_err(dev, "Domain-%d cpufreq hardware not enabled\n", index); - ret =3D -ENODEV; - goto error; + return -ENODEV; } =20 - if (readl_relaxed(base + data->soc_data->reg_dcvs_ctrl) & 0x1) + if (readl_relaxed(data->base + data->soc_data->reg_dcvs_ctrl) & 0x1) data->per_core_dcvs =3D true; =20 qcom_get_related_cpus(index, policy->cpus); @@ -559,14 +534,13 @@ static int qcom_cpufreq_hw_cpu_init(struct cpufreq_po= licy *policy) ret =3D qcom_cpufreq_hw_read_lut(cpu_dev, policy); if (ret) { dev_err(dev, "Domain-%d failed to read LUT\n", index); - goto error; + return ret; } =20 ret =3D dev_pm_opp_get_opp_count(cpu_dev); if (ret <=3D 0) { dev_err(cpu_dev, "Failed to add OPPs\n"); - ret =3D -ENODEV; - goto error; + return -ENODEV; } =20 if (policy_has_boost_freq(policy)) { @@ -575,18 +549,7 @@ static int qcom_cpufreq_hw_cpu_init(struct cpufreq_pol= icy *policy) dev_warn(cpu_dev, "failed to enable boost: %d\n", ret); } =20 - ret =3D qcom_cpufreq_hw_lmh_init(policy, index); - if (ret) - goto error; - - return 0; -error: - kfree(data); -unmap_base: - iounmap(base); -release_region: - release_mem_region(res->start, resource_size(res)); - return ret; + return qcom_cpufreq_hw_lmh_init(policy, index); } =20 static int qcom_cpufreq_hw_cpu_exit(struct cpufreq_policy *policy) @@ -643,7 +606,7 @@ static int qcom_cpufreq_hw_driver_probe(struct platform= _device *pdev) { struct device *cpu_dev; struct clk *clk; - int ret; + int ret, i, num_domains; =20 clk =3D clk_get(&pdev->dev, "xo"); if (IS_ERR(clk)) @@ -670,6 +633,31 @@ static int qcom_cpufreq_hw_driver_probe(struct platfor= m_device *pdev) if (ret) return ret; =20 + /* Allocate qcom_cpufreq_data based on the available frequency domains in= DT */ + num_domains =3D of_property_count_elems_of_size(pdev->dev.of_node, "reg",= sizeof(u32) * 4); + if (num_domains <=3D 0) + return num_domains; + + qcom_cpufreq.data =3D devm_kzalloc(&pdev->dev, sizeof(struct qcom_cpufreq= _data) * num_domains, + GFP_KERNEL); + if (!qcom_cpufreq.data) + return -ENOMEM; + + for (i =3D 0; i < num_domains; i++) { + struct qcom_cpufreq_data *data =3D &qcom_cpufreq.data[i]; + struct resource *res; + void __iomem *base; + + base =3D devm_platform_get_and_ioremap_resource(pdev, i, &res); + if (IS_ERR(base)) { + dev_err(&pdev->dev, "Failed to map resource %pR\n", res); + return PTR_ERR(base); + } + + data->base =3D base; + data->res =3D res; + } + ret =3D cpufreq_register_driver(&cpufreq_qcom_hw_driver); if (ret) dev_err(&pdev->dev, "CPUFreq HW driver failed to register\n"); --=20 2.25.1 From nobody Thu Apr 9 03:15:09 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1344FC4332F for ; Wed, 2 Nov 2022 08:33:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229772AbiKBIdN (ORCPT ); Wed, 2 Nov 2022 04:33:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230338AbiKBIdE (ORCPT ); Wed, 2 Nov 2022 04:33:04 -0400 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C753E2793B for ; Wed, 2 Nov 2022 01:33:02 -0700 (PDT) Received: by mail-pl1-x62d.google.com with SMTP id c2so15877094plz.11 for ; Wed, 02 Nov 2022 01:33:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=3UeGRLt0I6Ca0YYYt9StoKBqh2LnPMLZ6623L26cNAw=; b=IH0U1tsxJITrnpwgUR/Hzctz5g/bXvQYOc1TdCZde+I0rJQPoXhlaI+SRAOLsOUEZr AOaBS0r+QFPEOqsT+mb35BORHxvc8zXuTai8otYkmJS+JBg/Wkkcrgz9bIj8Q1DsO1iN /4FrWb+0BS3j9gm6nJmkGgowOh8h+Fxrkqdotw9vlY/IfM++mED0fWloaRZyPUvNlTPG vrrQgUkmes2d7/c5RoGR304O0OfECoowUSggvz2LjCPR7KY7LaOglXkb77Kv8x1YIsLI 7woxPdKQlviakM3Vil07FTjQjgH3B3GdgPvpwDkEgQ4y9akdsvgsZEI1cas6dDQU3mHz fP+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3UeGRLt0I6Ca0YYYt9StoKBqh2LnPMLZ6623L26cNAw=; b=c7LlKItPy/Ydkp5MaHwkwudIOd5Erg8ZElVpcgblEddmTCLkGmpOCVIrz1Sa4CbUry JSpGhBpmBwVpxP+95uTLRIv6h0RAhG/2UGf+MUBaJ8mtTlNzgmeuNOcRNd4bmbz3OicE 1odf8HmPtovINdv3wlOPbaQSkWqj5fX0X7OPJdcaZXLO7Ato69DiQY+oJwpnlvcdVd+4 q9PGZUqk1h3Z5/wzTTTSefnBDRhmdsVFWTBBjJAgw5Ter1JA99q56dHORhobk0oDQXlY c7vu/7eruKjcj8tPfolv9GAUicuV3LfNUiYS9ciFCiJOd7yzBbW+5xEGe4+UlRpiwz98 +n8A== X-Gm-Message-State: ACrzQf0BTkwzZYDAfGTvlBFYgQ6WAjc9NhkpxLDywFJ+MED1nIzrUa01 NKG/l8dkr3lBDzFr4/zOVhQLfz0xZ+nA X-Google-Smtp-Source: AMsMyM5t0U7P8BEhY2X9jqqV+oFtJTEnd/5oerb6BW5BVAAOZBz/FMM4/sXo/NGticgGEmBMQqFZBg== X-Received: by 2002:a17:90a:1c02:b0:1e0:df7:31f2 with SMTP id s2-20020a17090a1c0200b001e00df731f2mr40598415pjs.222.1667377982313; Wed, 02 Nov 2022 01:33:02 -0700 (PDT) Received: from localhost.localdomain ([117.193.209.178]) by smtp.gmail.com with ESMTPSA id d12-20020a170902654c00b00176acd80f69sm7682256pln.102.2022.11.02.01.32.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Nov 2022 01:33:01 -0700 (PDT) From: Manivannan Sadhasivam To: andersson@kernel.org, viresh.kumar@linaro.org, rafael@kernel.org Cc: johan@kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Manivannan Sadhasivam Subject: [PATCH 2/3] cpufreq: qcom-hw: Use cached dev pointer in probe() Date: Wed, 2 Nov 2022 14:02:38 +0530 Message-Id: <20221102083239.53826-3-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221102083239.53826-1-manivannan.sadhasivam@linaro.org> References: <20221102083239.53826-1-manivannan.sadhasivam@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" There are multiple instances of dev pointer used in the probe() function. Instead of referencing pdev->dev all the time, let's use a cached dev pointer to simplify the code. Signed-off-by: Manivannan Sadhasivam --- drivers/cpufreq/qcom-cpufreq-hw.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufr= eq-hw.c index 1842e9facaa1..bc991ef10c05 100644 --- a/drivers/cpufreq/qcom-cpufreq-hw.c +++ b/drivers/cpufreq/qcom-cpufreq-hw.c @@ -604,18 +604,19 @@ static struct cpufreq_driver cpufreq_qcom_hw_driver = =3D { =20 static int qcom_cpufreq_hw_driver_probe(struct platform_device *pdev) { + struct device *dev =3D &pdev->dev; struct device *cpu_dev; struct clk *clk; int ret, i, num_domains; =20 - clk =3D clk_get(&pdev->dev, "xo"); + clk =3D clk_get(dev, "xo"); if (IS_ERR(clk)) return PTR_ERR(clk); =20 xo_rate =3D clk_get_rate(clk); clk_put(clk); =20 - clk =3D clk_get(&pdev->dev, "alternate"); + clk =3D clk_get(dev, "alternate"); if (IS_ERR(clk)) return PTR_ERR(clk); =20 @@ -634,11 +635,11 @@ static int qcom_cpufreq_hw_driver_probe(struct platfo= rm_device *pdev) return ret; =20 /* Allocate qcom_cpufreq_data based on the available frequency domains in= DT */ - num_domains =3D of_property_count_elems_of_size(pdev->dev.of_node, "reg",= sizeof(u32) * 4); + num_domains =3D of_property_count_elems_of_size(dev->of_node, "reg", size= of(u32) * 4); if (num_domains <=3D 0) return num_domains; =20 - qcom_cpufreq.data =3D devm_kzalloc(&pdev->dev, sizeof(struct qcom_cpufreq= _data) * num_domains, + qcom_cpufreq.data =3D devm_kzalloc(dev, sizeof(struct qcom_cpufreq_data) = * num_domains, GFP_KERNEL); if (!qcom_cpufreq.data) return -ENOMEM; @@ -650,7 +651,7 @@ static int qcom_cpufreq_hw_driver_probe(struct platform= _device *pdev) =20 base =3D devm_platform_get_and_ioremap_resource(pdev, i, &res); if (IS_ERR(base)) { - dev_err(&pdev->dev, "Failed to map resource %pR\n", res); + dev_err(dev, "Failed to map resource %pR\n", res); return PTR_ERR(base); } =20 @@ -660,9 +661,9 @@ static int qcom_cpufreq_hw_driver_probe(struct platform= _device *pdev) =20 ret =3D cpufreq_register_driver(&cpufreq_qcom_hw_driver); if (ret) - dev_err(&pdev->dev, "CPUFreq HW driver failed to register\n"); + dev_err(dev, "CPUFreq HW driver failed to register\n"); else - dev_dbg(&pdev->dev, "QCOM CPUFreq HW driver initialized\n"); + dev_dbg(dev, "QCOM CPUFreq HW driver initialized\n"); =20 return ret; } --=20 2.25.1 From nobody Thu Apr 9 03:15:09 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DD0CC433FE for ; Wed, 2 Nov 2022 08:33:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230401AbiKBIdS (ORCPT ); Wed, 2 Nov 2022 04:33:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230175AbiKBIdJ (ORCPT ); Wed, 2 Nov 2022 04:33:09 -0400 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F09C2793F for ; Wed, 2 Nov 2022 01:33:07 -0700 (PDT) Received: by mail-pj1-x102b.google.com with SMTP id o7so12358384pjj.1 for ; Wed, 02 Nov 2022 01:33:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=947eFVQOjYHgL69E/eIjVgvNC7z93QCjfG2CSFXyEag=; b=ZlZBCMG3hTFoKhBTsKDelt14pOhhDhQwNLJuZVILPGvSSm/nKjpgUH0SC3S//UWYMM b4+Kie7lVlJBe38UhOuCgLLsICw2QemD9iu6sJsXIO37Wme0GNAqfQzfpe0qkysXe04Y eY59mAdBIHJ15nGX9SfLLiUyrRKJ/KQJdCSlsRehKq/azSXqHmlrNA9WNPjDyZ/Vu5iP j3zMjoLYGIVN4X7pQSD5bj4NgxjfNI0oYwRrXMhkOhCYXjB9/V5+FoRA5QdMvwq1Ddou 8auZYtuyuuQe6w8vf/gWZrJrnczHQFhcFPbHS5o5wS16ykWMDpr6N+25KHMvWkBWGK4g Fw9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=947eFVQOjYHgL69E/eIjVgvNC7z93QCjfG2CSFXyEag=; b=Pk1XODpw0NIbP0uTBJK1t8wjldqepHN506zdNJM66FVRVtbstuirEDB7WIqSsruHKp ILVmImpU/fx3lxr5qW6TOFEfCfc/kWR6j7qu1UGyNJXC6XmXniTphigzRzkpDkrjs8yi y266EkGmj9r1Dkplf6UDoZrYCtMwGsF7btvRf951lmBDLA54gbMWa7JGVh8+rGa3TQ4n NdhAHgx2eoGJyOw1wO2qoThx8xhzU2L+XSMUHpyQwAspI7MfBdzYgkY3LnYt9KMEUyAG TTRcdldGYpckdnQCy7ANYv7RxGcw11eW0lZTa5D6dxNefiL7gfd4wN40OfYtPeNj/HTh GsxA== X-Gm-Message-State: ACrzQf3sus2ZvANS7iIZVPZhEVblVMQM/l299B3oW8lRYHgYpUXp9j8O 2nT4/zhm5VfFaCpUOGKE97m0 X-Google-Smtp-Source: AMsMyM5gDKOO3lqyI/YAvYQSnfyq9wcrwBZZlYPm3grO8jtjTBef9KLxteQ/K9YzMfEoW4OsUBnjpw== X-Received: by 2002:a17:90b:3103:b0:213:2578:e5c5 with SMTP id gc3-20020a17090b310300b002132578e5c5mr24150338pjb.217.1667377986731; Wed, 02 Nov 2022 01:33:06 -0700 (PDT) Received: from localhost.localdomain ([117.193.209.178]) by smtp.gmail.com with ESMTPSA id d12-20020a170902654c00b00176acd80f69sm7682256pln.102.2022.11.02.01.33.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Nov 2022 01:33:05 -0700 (PDT) From: Manivannan Sadhasivam To: andersson@kernel.org, viresh.kumar@linaro.org, rafael@kernel.org Cc: johan@kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Manivannan Sadhasivam Subject: [PATCH 3/3] cpufreq: qcom-hw: Move soc_data to struct qcom_cpufreq Date: Wed, 2 Nov 2022 14:02:39 +0530 Message-Id: <20221102083239.53826-4-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221102083239.53826-1-manivannan.sadhasivam@linaro.org> References: <20221102083239.53826-1-manivannan.sadhasivam@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" soc_data is a static info of the driver and thus no need to cache it inside the qcom_cpufreq_data struct which is allocated per frequency domain. So, move it inside qcom_cpufreq struct. Signed-off-by: Manivannan Sadhasivam --- drivers/cpufreq/qcom-cpufreq-hw.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufr= eq-hw.c index bc991ef10c05..76f840636828 100644 --- a/drivers/cpufreq/qcom-cpufreq-hw.c +++ b/drivers/cpufreq/qcom-cpufreq-hw.c @@ -42,7 +42,6 @@ struct qcom_cpufreq_soc_data { struct qcom_cpufreq_data { void __iomem *base; struct resource *res; - const struct qcom_cpufreq_soc_data *soc_data; =20 /* * Mutex to synchronize between de-init sequence and re-starting LMh @@ -60,6 +59,7 @@ struct qcom_cpufreq_data { =20 static struct { struct qcom_cpufreq_data *data; + const struct qcom_cpufreq_soc_data *soc_data; } qcom_cpufreq; =20 static unsigned long cpu_hw_rate, xo_rate; @@ -110,7 +110,7 @@ static int qcom_cpufreq_hw_target_index(struct cpufreq_= policy *policy, unsigned int index) { struct qcom_cpufreq_data *data =3D policy->driver_data; - const struct qcom_cpufreq_soc_data *soc_data =3D data->soc_data; + const struct qcom_cpufreq_soc_data *soc_data =3D qcom_cpufreq.soc_data; unsigned long freq =3D policy->freq_table[index].frequency; unsigned int i; =20 @@ -138,7 +138,7 @@ static unsigned int qcom_cpufreq_hw_get(unsigned int cp= u) return 0; =20 data =3D policy->driver_data; - soc_data =3D data->soc_data; + soc_data =3D qcom_cpufreq.soc_data; =20 index =3D readl_relaxed(data->base + soc_data->reg_perf_state); index =3D min(index, LUT_MAX_ENTRIES - 1); @@ -150,7 +150,7 @@ static unsigned int qcom_cpufreq_hw_fast_switch(struct = cpufreq_policy *policy, unsigned int target_freq) { struct qcom_cpufreq_data *data =3D policy->driver_data; - const struct qcom_cpufreq_soc_data *soc_data =3D data->soc_data; + const struct qcom_cpufreq_soc_data *soc_data =3D qcom_cpufreq.soc_data; unsigned int index; unsigned int i; =20 @@ -174,7 +174,7 @@ static int qcom_cpufreq_hw_read_lut(struct device *cpu_= dev, unsigned long rate; int ret; struct qcom_cpufreq_data *drv_data =3D policy->driver_data; - const struct qcom_cpufreq_soc_data *soc_data =3D drv_data->soc_data; + const struct qcom_cpufreq_soc_data *soc_data =3D qcom_cpufreq.soc_data; =20 table =3D kcalloc(LUT_MAX_ENTRIES + 1, sizeof(*table), GFP_KERNEL); if (!table) @@ -291,10 +291,10 @@ static unsigned long qcom_lmh_get_throttle_freq(struc= t qcom_cpufreq_data *data) { unsigned int lval; =20 - if (data->soc_data->reg_current_vote) - lval =3D readl_relaxed(data->base + data->soc_data->reg_current_vote) & = 0x3ff; + if (qcom_cpufreq.soc_data->reg_current_vote) + lval =3D readl_relaxed(data->base + qcom_cpufreq.soc_data->reg_current_v= ote) & 0x3ff; else - lval =3D readl_relaxed(data->base + data->soc_data->reg_domain_state) & = 0xff; + lval =3D readl_relaxed(data->base + qcom_cpufreq.soc_data->reg_domain_st= ate) & 0xff; =20 return lval * xo_rate; } @@ -366,9 +366,9 @@ static irqreturn_t qcom_lmh_dcvs_handle_irq(int irq, vo= id *data) disable_irq_nosync(c_data->throttle_irq); schedule_delayed_work(&c_data->throttle_work, 0); =20 - if (c_data->soc_data->reg_intr_clr) + if (qcom_cpufreq.soc_data->reg_intr_clr) writel_relaxed(GT_IRQ_STATUS, - c_data->base + c_data->soc_data->reg_intr_clr); + c_data->base + qcom_cpufreq.soc_data->reg_intr_clr); =20 return IRQ_HANDLED; } @@ -514,16 +514,15 @@ static int qcom_cpufreq_hw_cpu_init(struct cpufreq_po= licy *policy) return ret; =20 index =3D args.args[0]; - data->soc_data =3D of_device_get_match_data(&pdev->dev); data =3D &qcom_cpufreq.data[index]; =20 /* HW should be in enabled state to proceed */ - if (!(readl_relaxed(data->base + data->soc_data->reg_enable) & 0x1)) { + if (!(readl_relaxed(data->base + qcom_cpufreq.soc_data->reg_enable) & 0x1= )) { dev_err(dev, "Domain-%d cpufreq hardware not enabled\n", index); return -ENODEV; } =20 - if (readl_relaxed(data->base + data->soc_data->reg_dcvs_ctrl) & 0x1) + if (readl_relaxed(data->base + qcom_cpufreq.soc_data->reg_dcvs_ctrl) & 0x= 1) data->per_core_dcvs =3D true; =20 qcom_get_related_cpus(index, policy->cpus); @@ -644,6 +643,8 @@ static int qcom_cpufreq_hw_driver_probe(struct platform= _device *pdev) if (!qcom_cpufreq.data) return -ENOMEM; =20 + qcom_cpufreq.soc_data =3D of_device_get_match_data(dev); + for (i =3D 0; i < num_domains; i++) { struct qcom_cpufreq_data *data =3D &qcom_cpufreq.data[i]; struct resource *res; --=20 2.25.1