Skip to content

Commit ba5e770

Browse files
krzkvireshk
authored andcommitted
cpufreq: qcom-cpufreq-hw: fix double IO unmap and resource release on exit
Commit 054a3ef ("cpufreq: qcom-hw: Allocate qcom_cpufreq_data during probe") moved getting memory resource and iomap from qcom_cpufreq_hw_cpu_init() to the probe function, however it left untouched cleanup in qcom_cpufreq_hw_cpu_exit(). During device unbind this will lead to doule release of resource and double iounmap(), first by qcom_cpufreq_hw_cpu_exit() and second via managed resources: resource: Trying to free nonexistent resource <0x0000000018593000-0x0000000018593fff> Trying to vunmap() nonexistent vm area (0000000088a7d4dc) ... vunmap (mm/vmalloc.c:2771 (discriminator 1)) iounmap (mm/ioremap.c:60) devm_ioremap_release (lib/devres.c:19) devres_release_all (drivers/base/devres.c:506 drivers/base/devres.c:535) device_unbind_cleanup (drivers/base/dd.c:523) device_release_driver_internal (drivers/base/dd.c:1248 drivers/base/dd.c:1263) device_driver_detach (drivers/base/dd.c:1300) unbind_store (drivers/base/bus.c:243) drv_attr_store (drivers/base/bus.c:127) sysfs_kf_write (fs/sysfs/file.c:137) kernfs_fop_write_iter (fs/kernfs/file.c:334) vfs_write (include/linux/fs.h:1851 fs/read_write.c:491 fs/read_write.c:584) ksys_write (fs/read_write.c:637) __arm64_sys_write (fs/read_write.c:646) invoke_syscall (arch/arm64/include/asm/current.h:19 arch/arm64/kernel/syscall.c:57) el0_svc_common.constprop.0 (arch/arm64/include/asm/daifflags.h:28 arch/arm64/kernel/syscall.c:150) do_el0_svc (arch/arm64/kernel/syscall.c:194) el0_svc (arch/arm64/include/asm/daifflags.h:28 arch/arm64/kernel/entry-common.c:133 arch/arm64/kernel/entry-common.c:142 arch/arm64/kernel/entry-common.c:638) el0t_64_sync_handler (arch/arm64/kernel/entry-common.c:656) el0t_64_sync (arch/arm64/kernel/entry.S:591) Fixes: 054a3ef ("cpufreq: qcom-hw: Allocate qcom_cpufreq_data during probe") Cc: <stable@vger.kernel.org> Cc: Manivannan Sadhasivam <mani@kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Manivannan Sadhasivam <mani@kernel.org> Reviewed-by: Bjorn Andersson <andersson@kernel.org> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
1 parent 0883426 commit ba5e770

1 file changed

Lines changed: 2 additions & 9 deletions

File tree

drivers/cpufreq/qcom-cpufreq-hw.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ struct qcom_cpufreq_soc_data {
4545

4646
struct qcom_cpufreq_data {
4747
void __iomem *base;
48-
struct resource *res;
4948

5049
/*
5150
* Mutex to synchronize between de-init sequence and re-starting LMh
@@ -592,16 +591,12 @@ static int qcom_cpufreq_hw_cpu_exit(struct cpufreq_policy *policy)
592591
{
593592
struct device *cpu_dev = get_cpu_device(policy->cpu);
594593
struct qcom_cpufreq_data *data = policy->driver_data;
595-
struct resource *res = data->res;
596-
void __iomem *base = data->base;
597594

598595
dev_pm_opp_remove_all_dynamic(cpu_dev);
599596
dev_pm_opp_of_cpumask_remove_table(policy->related_cpus);
600597
qcom_cpufreq_hw_lmh_exit(data);
601598
kfree(policy->freq_table);
602599
kfree(data);
603-
iounmap(base);
604-
release_mem_region(res->start, resource_size(res));
605600

606601
return 0;
607602
}
@@ -704,17 +699,15 @@ static int qcom_cpufreq_hw_driver_probe(struct platform_device *pdev)
704699
for (i = 0; i < num_domains; i++) {
705700
struct qcom_cpufreq_data *data = &qcom_cpufreq.data[i];
706701
struct clk_init_data clk_init = {};
707-
struct resource *res;
708702
void __iomem *base;
709703

710-
base = devm_platform_get_and_ioremap_resource(pdev, i, &res);
704+
base = devm_platform_ioremap_resource(pdev, i);
711705
if (IS_ERR(base)) {
712-
dev_err(dev, "Failed to map resource %pR\n", res);
706+
dev_err(dev, "Failed to map resource index %d\n", i);
713707
return PTR_ERR(base);
714708
}
715709

716710
data->base = base;
717-
data->res = res;
718711

719712
/* Register CPU clock for each frequency domain */
720713
clk_init.name = kasprintf(GFP_KERNEL, "qcom_cpufreq%d", i);

0 commit comments

Comments
 (0)