This is a note to let you know that I've just added the patch titled
soc: sifive: l2_cache: fix missing iounmap() in error path in sifive_l2_init()
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
soc-sifive-l2_cache-fix-missing-iounmap-in-error-path-in-sifive_l2_init.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From stable-owner@xxxxxxxxxxxxxxx Mon Apr 24 11:19:51 2023
From: Conor Dooley <conor.dooley@xxxxxxxxxxxxx>
Date: Mon, 24 Apr 2023 10:19:02 +0100
Subject: soc: sifive: l2_cache: fix missing iounmap() in error path in sifive_l2_init()
To: <stable@xxxxxxxxxxxxxxx>
Cc: <conor@xxxxxxxxxx>, <conor.dooley@xxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Greentime Hu <greentime.hu@xxxxxxxxxx>, Zong Li <zong.li@xxxxxxxxxx>, Palmer Dabbelt <palmer@xxxxxxxxxxxx>, Sasha Levin <sashal@xxxxxxxxxx>, Yang Yingliang <yangyingliang@xxxxxxxxxx>
Message-ID: <20230424-antonym-petroleum-d9930af1e6c6@wendy>
From: Yang Yingliang <yangyingliang@xxxxxxxxxx>
commit 73e770f085023da327dc9ffeb6cd96b0bb22d97e upstream.
Add missing iounmap() before return error from sifive_l2_init().
Fixes: a967a289f169 ("RISC-V: sifive_l2_cache: Add L2 cache controller driver for SiFive SoCs")
Signed-off-by: Yang Yingliang <yangyingliang@xxxxxxxxxx>
Reviewed-by: Conor Dooley <conor.dooley@xxxxxxxxxxxxx>
Signed-off-by: Conor Dooley <conor.dooley@xxxxxxxxxxxxx>
[conor: ccache -> l2_cache]
Signed-off-by: Conor Dooley <conor.dooley@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/soc/sifive/sifive_l2_cache.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
--- a/drivers/soc/sifive/sifive_l2_cache.c
+++ b/drivers/soc/sifive/sifive_l2_cache.c
@@ -212,7 +212,8 @@ static int __init sifive_l2_init(void)
intr_num = of_property_count_u32_elems(np, "interrupts");
if (!intr_num) {
pr_err("L2CACHE: no interrupts property\n");
- return -ENODEV;
+ rc = -ENODEV;
+ goto err_unmap;
}
for (i = 0; i < intr_num; i++) {
@@ -220,7 +221,7 @@ static int __init sifive_l2_init(void)
rc = request_irq(g_irq[i], l2_int_handler, 0, "l2_ecc", NULL);
if (rc) {
pr_err("L2CACHE: Could not request IRQ %d\n", g_irq[i]);
- return rc;
+ goto err_unmap;
}
}
@@ -233,5 +234,9 @@ static int __init sifive_l2_init(void)
setup_sifive_debug();
#endif
return 0;
+
+err_unmap:
+ iounmap(l2_base);
+ return rc;
}
device_initcall(sifive_l2_init);
Patches currently in stable-queue which might be from stable-owner@xxxxxxxxxxxxxxx are
queue-5.15/sched-fair-detect-capacity-inversion.patch
queue-5.15/soc-sifive-l2_cache-fix-missing-iounmap-in-error-path-in-sifive_l2_init.patch
queue-5.15/pwm-hibvt-explicitly-set-.polarity-in-.get_state.patch
queue-5.15/pwm-iqs620a-explicitly-set-.polarity-in-.get_state.patch
queue-5.15/sched-uclamp-make-cpu_overutilized-use-util_fits_cpu.patch
queue-5.15/sched-uclamp-fix-fits_capacity-check-in-feec.patch
queue-5.15/soc-sifive-l2_cache-fix-missing-of_node_put-in-sifive_l2_init.patch
queue-5.15/sched-fair-consider-capacity-inversion-in-util_fits_cpu.patch
queue-5.15/sched-fair-fixes-for-capacity-inversion-detection.patch
queue-5.15/sched-uclamp-fix-a-uninitialized-variable-warnings.patch
queue-5.15/soc-sifive-l2_cache-fix-missing-free_irq-in-error-path-in-sifive_l2_init.patch
queue-5.15/sched-uclamp-cater-for-uclamp-in-find_energy_efficient_cpu-s-early-exit-condition.patch
