github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 10:33:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

RISC-V SoC drivers for v6.2

Browse Source 
SiFive:
 - add probe error handling to the ccache driver
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQRh246EGq/8RLhDjO14tDGHoIJi0gUCY3tKmQAKCRB4tDGHoIJi
 0gpXAP9qFisGpAdCWY4GIYv7ScQQxRHeMFZBJbSh4Pa16kWwPAD/X6MWBhpzqpX0
 1AOeDBcE4d5XnFpjs4d7TCNP+0E9MQc=
 =8F+U
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmN83HAACgkQmmx57+YA
 GNnjTRAAoGo2D5iecRcf+8PYeug7ApEpDMqCknr9gNiz+sErJgPlwWwCvD7AA5L/
 6oY69s/qrNSxdtJbcxpU5tHUJLwluckZzW9rdtBgfLHkqV1Gl4MyTCUZ+EG0CXWV
 wXV3RBA8qcT4ZYaqntEcHS+ouAxzWIQAs2BlqjgZwX/EOkkkQDRLQbTA4A2a78YQ
 sbzxIuyuOlwlkfMBs3cx16xYo5pusaIxRn2XeY8jKrCQ81LkFulUI7xkdzFrNNWH
 HL2esqYzN9GwLE7ehPbOMO7x9KW33taN05Gyl7cJVV4TRrqZ5zIAKiRKayiR04rl
 2GZzdTNCsRIsA0vxk/I4BEC9af74fF3hUrcqRd0W7G1MEOoXXt6bn2nYfuGxQFdR
 gXIm6MixOe0W0EY8MD0v/yTdUVl8J5hjtHjFbtKUK9HuVk3j/UkYUNdj06t47Li7
 FdkXLg8eJim+B6K7GGWD344Zslo4nFC5DjwfhmEwJPH39ngI0OOdvqVu6WSFEZHl
 AIl3yXASBYExzRhXuvB75Juu7pZEu7L+Z6JTp27XCAFbCX4dKLsBRnulhod7fuhm
 gcpAaVomefbkKpVG/VFTns3lOUjhhXp0h3BRcNNyWrq0DLnuJd92+gLLyZPmt53w
 bEiLZpBZ8HO5cdFW3ieQ/fnE1x982HYBy727fTQI5Kq0LtP3qFc=
 =vG8L
 -----END PGP SIGNATURE-----

Merge tag 'riscv-soc-for-v6.2-mw0' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into soc/drivers

RISC-V SoC drivers for v6.2

SiFive:
- add probe error handling to the ccache driver

* tag 'riscv-soc-for-v6.2-mw0' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux:
  soc: sifive: ccache: fix missing of_node_put() in sifive_ccache_init()
  soc: sifive: ccache: fix missing free_irq() in error path in sifive_ccache_init()
  soc: sifive: ccache: fix missing iounmap() in error path in sifive_ccache_init()

Link: https://lore.kernel.org/r/Y3u0Oydiv2Wauda2@spud
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-11-22 15:27:59 +01:00
commit 862fe29b89
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/soc/sifive/sifive_ccache.c
View File

@ -215,20 +215,27 @@ static int __init sifive_ccache_init(void)
if (!np)
return -ENODEV;
if (of_address_to_resource(np, 0, &res))
return -ENODEV;
if (of_address_to_resource(np, 0, &res)) {
rc = -ENODEV;
goto err_node_put;
}
ccache_base = ioremap(res.start, resource_size(&res));
if (!ccache_base)
return -ENOMEM;
if (!ccache_base) {
rc = -ENOMEM;
goto err_node_put;
}
if (of_property_read_u32(np, "cache-level", &level))
return -ENOENT;
if (of_property_read_u32(np, "cache-level", &level)) {
rc = -ENOENT;
goto err_unmap;
}
intr_num = of_property_count_u32_elems(np, "interrupts");
if (!intr_num) {
pr_err("No interrupts property\n");
return -ENODEV;
rc = -ENODEV;
goto err_unmap;
}
for (i = 0; i < intr_num; i++) {
@ -237,9 +244,10 @@ static int __init sifive_ccache_init(void)
NULL);
if (rc) {
pr_err("Could not request IRQ %d\n", g_irq[i]);
return rc;
goto err_free_irq;
}
}
of_node_put(np);
ccache_config_read();
@ -250,6 +258,15 @@ static int __init sifive_ccache_init(void)
setup_sifive_debug();
#endif
return 0;
err_free_irq:
while (--i >= 0)
free_irq(g_irq[i], NULL);
err_unmap:
iounmap(ccache_base);
err_node_put:
of_node_put(np);
return rc;
}
device_initcall(sifive_ccache_init);