From patchwork Thu Apr 4 05:09:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Cassel X-Patchwork-Id: 10884931 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8F38C1390 for ; Thu, 4 Apr 2019 05:10:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70C4B28A1E for ; Thu, 4 Apr 2019 05:10:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6168D289BE; Thu, 4 Apr 2019 05:10:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE5AB289BE for ; Thu, 4 Apr 2019 05:10:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726829AbfDDFKN (ORCPT ); Thu, 4 Apr 2019 01:10:13 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:37297 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726475AbfDDFKM (ORCPT ); Thu, 4 Apr 2019 01:10:12 -0400 Received: by mail-pg1-f194.google.com with SMTP id e6so617850pgc.4 for ; Wed, 03 Apr 2019 22:10:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TwZwcfQZmyrQh4osKkmpWYd/wJZhOgCuylNR0zMT/RE=; b=sbAT5d8jHLX0Y2LokpDIv98MIwAZ/VaN2rk89O34Ti1oWVd98AtCEanCie7K8Dq/Z3 hggcB0rHomr46Chchxx0pofgmgODT5v1K3ToZfsS2b+Zw4i9w+lWgskc1CeuUP/eC95K FRpGzuFsp1J+i/N7dsltQW+dYxbOr1qiiZ+xBUag41o5Au3BrBD8hqegSgaHNv+cU5JM RRsx4sYxjpdVx95DV7DO80muxgm3QX+mXe8taS06wEjvRb2Zdos+piWLasXuERBL72sy y4FXgU+8yocCUHGnoH1lD9p12CNP32rQZsBDyU2sPRTad2Cz1eGKfPr+R4OaYX8nA3cF pe3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TwZwcfQZmyrQh4osKkmpWYd/wJZhOgCuylNR0zMT/RE=; b=HQYjo5HXuPRYOdFyutyK+ug0NoMYVXy526k6RF/1Ibs+6arAFkjmNGqJQ1rNhSPo6a IPs86txxXaiI/XsLXeeA6U/RlafHeRkw7DPBDCOUwkbEoW5rgAmXJHmVP9d+wTXHCye7 NoBX6nOXkkKD52mC78tROch1rU+Va5P/oZy7tw9gFSveRQpKrQVQxH6TnD8Lf9Wtzgee VK8hn2W0af6eTVI49HgVUWrC8RVToIzAu+Z/EUxlzRV8+78Z+NvyBGgDieGGt/0iRvAv 8CEuD7Sfhti0pq5sUFMWNi+Xpm8kiwiihXBR04THyOxRRLUDUNq2T89t3q8z5zVO1dn9 QMSw== X-Gm-Message-State: APjAAAWgOAPOWlgSMglxiWvB3eaDB+JSp4aRIiyKWQCzc4wsTwiPlIIG bCloYrIzDaTsWcxGaSEOEP+aXg== X-Google-Smtp-Source: APXvYqyuUjfszpJzIVdXZNVy6yQ7cbguUYd4mcVyy6+xdxtvjjh4AOYCoP3a+AsldvOWPvNGqodFZA== X-Received: by 2002:a65:654c:: with SMTP id a12mr3799647pgw.101.1554354612126; Wed, 03 Apr 2019 22:10:12 -0700 (PDT) Received: from centauri.imgcgcw.net ([147.50.13.10]) by smtp.gmail.com with ESMTPSA id q80sm27623011pfa.66.2019.04.03.22.10.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Apr 2019 22:10:11 -0700 (PDT) From: Niklas Cassel To: Andy Gross , David Brown , "Rafael J. Wysocki" , Viresh Kumar Cc: linux-arm-msm@vger.kernel.org, jorge.ramirez-ortiz@linaro.org, Niklas Cassel , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 3/9] cpufreq: qcom: create a driver struct Date: Thu, 4 Apr 2019 07:09:24 +0200 Message-Id: <20190404050931.9812-4-niklas.cassel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190404050931.9812-1-niklas.cassel@linaro.org> References: <20190404050931.9812-1-niklas.cassel@linaro.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP create a driver struct to make it easier to free up all common resources, and only call dev_pm_opp_set_supported_hw() if the implementation has dynamically allocated versions. Co-developed-by: Jorge Ramirez-Ortiz Signed-off-by: Jorge Ramirez-Ortiz Signed-off-by: Niklas Cassel --- drivers/cpufreq/qcom-cpufreq-nvmem.c | 69 ++++++++++++++++++---------- 1 file changed, 46 insertions(+), 23 deletions(-) diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c index 652a1de2a5d4..366c65a7132a 100644 --- a/drivers/cpufreq/qcom-cpufreq-nvmem.c +++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c @@ -43,6 +43,11 @@ enum _msm8996_version { NUM_OF_MSM8996_VERSIONS, }; +struct qcom_cpufreq_drv { + struct opp_table **opp_tables; + u32 *versions; +}; + static struct platform_device *cpufreq_dt_pdev, *cpufreq_pdev; static enum _msm8996_version qcom_cpufreq_get_msm_id(void) @@ -76,12 +81,16 @@ static enum _msm8996_version qcom_cpufreq_get_msm_id(void) static int qcom_cpufreq_kryo_name_version(struct device *cpu_dev, struct nvmem_cell *speedbin_nvmem, - u32 *versions) + struct qcom_cpufreq_drv *drv) { size_t len; u8 *speedbin; enum _msm8996_version msm8996_version; + drv->versions = kzalloc(sizeof(*drv->versions), GFP_KERNEL); + if (!drv->versions) + return -ENOMEM; + msm8996_version = qcom_cpufreq_get_msm_id(); if (NUM_OF_MSM8996_VERSIONS == msm8996_version) { dev_err(cpu_dev, "Not Snapdragon 820/821!"); @@ -94,10 +103,10 @@ static int qcom_cpufreq_kryo_name_version(struct device *cpu_dev, switch (msm8996_version) { case MSM8996_V3: - *versions = 1 << (unsigned int)(*speedbin); + *drv->versions = 1 << (unsigned int)(*speedbin); break; case MSM8996_SG: - *versions = 1 << ((unsigned int)(*speedbin) + 4); + *drv->versions = 1 << ((unsigned int)(*speedbin) + 4); break; default: BUG(); @@ -110,15 +119,14 @@ static int qcom_cpufreq_kryo_name_version(struct device *cpu_dev, static int qcom_cpufreq_probe(struct platform_device *pdev) { - struct opp_table **opp_tables; + struct qcom_cpufreq_drv *drv; int (*get_version)(struct device *cpu_dev, struct nvmem_cell *speedbin_nvmem, - u32 *versions); + struct qcom_cpufreq_drv *drv); struct nvmem_cell *speedbin_nvmem; struct device_node *np; struct device *cpu_dev; unsigned cpu; - u32 versions; const struct of_device_id *match; int ret; @@ -141,23 +149,31 @@ static int qcom_cpufreq_probe(struct platform_device *pdev) return -ENOENT; } + drv = kzalloc(sizeof(*drv), GFP_KERNEL); + if (!drv) + return -ENOMEM; + speedbin_nvmem = of_nvmem_cell_get(np, NULL); of_node_put(np); if (IS_ERR(speedbin_nvmem)) { if (PTR_ERR(speedbin_nvmem) != -EPROBE_DEFER) dev_err(cpu_dev, "Could not get nvmem cell: %ld\n", PTR_ERR(speedbin_nvmem)); - return PTR_ERR(speedbin_nvmem); + ret = PTR_ERR(speedbin_nvmem); + goto free_drv; } - ret = get_version(cpu_dev, speedbin_nvmem, &versions); + ret = get_version(cpu_dev, speedbin_nvmem, drv); nvmem_cell_put(speedbin_nvmem); if (ret) - return ret; + goto free_drv; - opp_tables = kcalloc(num_possible_cpus(), sizeof(*opp_tables), GFP_KERNEL); - if (!opp_tables) - return -ENOMEM; + drv->opp_tables = kcalloc(num_possible_cpus(), sizeof(*drv->opp_tables), + GFP_KERNEL); + if (!drv->opp_tables) { + ret = -ENOMEM; + goto free_drv; + } for_each_possible_cpu(cpu) { cpu_dev = get_cpu_device(cpu); @@ -166,10 +182,12 @@ static int qcom_cpufreq_probe(struct platform_device *pdev) goto free_opp; } - opp_tables[cpu] = dev_pm_opp_set_supported_hw(cpu_dev, - &versions, 1); - if (IS_ERR(opp_tables[cpu])) { - ret = PTR_ERR(opp_tables[cpu]); + if (drv->versions) + drv->opp_tables[cpu] = + dev_pm_opp_set_supported_hw(cpu_dev, + drv->versions, 1); + if (IS_ERR(drv->opp_tables[cpu])) { + ret = PTR_ERR(drv->opp_tables[cpu]); dev_err(cpu_dev, "Failed to set supported hardware\n"); goto free_opp; } @@ -178,7 +196,7 @@ static int qcom_cpufreq_probe(struct platform_device *pdev) cpufreq_dt_pdev = platform_device_register_simple("cpufreq-dt", -1, NULL, 0); if (!IS_ERR(cpufreq_dt_pdev)) { - platform_set_drvdata(pdev, opp_tables); + platform_set_drvdata(pdev, drv); return 0; } @@ -187,26 +205,31 @@ static int qcom_cpufreq_probe(struct platform_device *pdev) free_opp: for_each_possible_cpu(cpu) { - if (IS_ERR_OR_NULL(opp_tables[cpu])) + if (IS_ERR_OR_NULL(drv->opp_tables[cpu])) break; - dev_pm_opp_put_supported_hw(opp_tables[cpu]); + dev_pm_opp_put_supported_hw(drv->opp_tables[cpu]); } - kfree(opp_tables); + kfree(drv->opp_tables); +free_drv: + kfree(drv->versions); + kfree(drv); return ret; } static int qcom_cpufreq_remove(struct platform_device *pdev) { - struct opp_table **opp_tables = platform_get_drvdata(pdev); + struct qcom_cpufreq_drv *drv = platform_get_drvdata(pdev); unsigned int cpu; platform_device_unregister(cpufreq_dt_pdev); for_each_possible_cpu(cpu) - dev_pm_opp_put_supported_hw(opp_tables[cpu]); + dev_pm_opp_put_supported_hw(drv->opp_tables[cpu]); - kfree(opp_tables); + kfree(drv->opp_tables); + kfree(drv->versions); + kfree(drv); return 0; }