lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 177/280] cpufreq: kryo: Release OPP tables on module removal
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Viresh Kumar <viresh.kumar@linaro.org>

    commit 0334906c06967142c8805fbe88acf787f65d3d26 upstream.

    Commit 5ad7346b4ae2 ("cpufreq: kryo: Add module remove and exit") made
    it possible to build the kryo cpufreq driver as a module, but it failed
    to release all the resources, i.e. OPP tables, when the module is
    unloaded.

    This patch fixes it by releasing the OPP tables, by calling
    dev_pm_opp_put_supported_hw() for them, from the
    qcom_cpufreq_kryo_remove() routine. The array of pointers to the OPP
    tables is also allocated dynamically now in qcom_cpufreq_kryo_probe(),
    as the pointers will be required while releasing the resources.

    Compile tested only.

    Cc: 4.18+ <stable@vger.kernel.org> # v4.18+
    Fixes: 5ad7346b4ae2 ("cpufreq: kryo: Add module remove and exit")
    Reviewed-by: Georgi Djakov <georgi.djakov@linaro.org>
    Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/cpufreq/qcom-cpufreq-kryo.c | 20 ++++++++++++++++++--
    1 file changed, 18 insertions(+), 2 deletions(-)

    --- a/drivers/cpufreq/qcom-cpufreq-kryo.c
    +++ b/drivers/cpufreq/qcom-cpufreq-kryo.c
    @@ -75,7 +75,7 @@ static enum _msm8996_version qcom_cpufre

    static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)
    {
    - struct opp_table *opp_tables[NR_CPUS] = {0};
    + struct opp_table **opp_tables;
    enum _msm8996_version msm8996_version;
    struct nvmem_cell *speedbin_nvmem;
    struct device_node *np;
    @@ -133,6 +133,10 @@ static int qcom_cpufreq_kryo_probe(struc
    }
    kfree(speedbin);

    + opp_tables = kcalloc(num_possible_cpus(), sizeof(*opp_tables), GFP_KERNEL);
    + if (!opp_tables)
    + return -ENOMEM;
    +
    for_each_possible_cpu(cpu) {
    cpu_dev = get_cpu_device(cpu);
    if (NULL == cpu_dev) {
    @@ -151,8 +155,10 @@ static int qcom_cpufreq_kryo_probe(struc

    cpufreq_dt_pdev = platform_device_register_simple("cpufreq-dt", -1,
    NULL, 0);
    - if (!IS_ERR(cpufreq_dt_pdev))
    + if (!IS_ERR(cpufreq_dt_pdev)) {
    + platform_set_drvdata(pdev, opp_tables);
    return 0;
    + }

    ret = PTR_ERR(cpufreq_dt_pdev);
    dev_err(cpu_dev, "Failed to register platform device\n");
    @@ -163,13 +169,23 @@ free_opp:
    break;
    dev_pm_opp_put_supported_hw(opp_tables[cpu]);
    }
    + kfree(opp_tables);

    return ret;
    }

    static int qcom_cpufreq_kryo_remove(struct platform_device *pdev)
    {
    + struct opp_table **opp_tables = 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]);
    +
    + kfree(opp_tables);
    +
    return 0;
    }


    \
     
     \ /
      Last update: 2019-03-22 13:42    [W:4.020 / U:0.300 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site