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

HiSilicon ARMv7 SoC updates for v5.19

Browse Source 
- Add of_node_put to avoid the refcount leak
 -----BEGIN PGP SIGNATURE-----
 
 iQJJBAABCgAzFiEEQeMYD8qOQTc1R/snC8hXbtmJZlwFAmJ00gUVHHh1d2VpNUBo
 aXNpbGljb24uY29tAAoJEAvIV27ZiWZc9FAQAIqDJ8yqfJHuilRUB3Hte4M8dTUp
 4IlNAMQVthNWQZdODTH9UzIusOh24CvaOiZv78kq0bwgZeWwfDlWAjWjr6o2x/4u
 x6Blnl+9+TdCaDBJDHDtXbD2GNt5EKkKtg2C6rc5SMIaYnB8iKIFG84fftCtuNAy
 8AFVWqRMCxaVzC4B3Dbqg81My1jxlQlo66Aas8f0QRRjbZAcDm+hG8P6wJTUkM0A
 rJDlqVS6LOB9HnmN57gTQxKCugt+Xn5FxDzDSOvaubPgpV9VanUV9MblDGM7pfzT
 +eCj/yIGl8KCDeEb9OsbRkNldst2XWce+ssdY84je34Ggri1GhhKq7wA1g2hhkdt
 76WwFgb8CDwQKrkxtfA7qk2/mlCfg8kgYISwZ8ec44BFWPbZB11Oqk3njJgGX7QJ
 +S4DzpqVgqXZogI1cub2GQluphxB2IiM99cCMRmOwdcmSCFIa30oo28+bq6m5CFa
 NB8mw8Xfw/mR+HUu3f717VCeMgJTvTfSM3RAflgDTYL+JDLPLkWgwdD1l9kejnq7
 9gdkpkeYw6De7KBNpaZJB+hckszabl+e/Jj316W5kpW3p6Rt+SYnjbOFLyBtS1hq
 y5kDtlO2y/0DJ7pVDpqdAyA41vqLGUYMo+cBN62TW6LWY+L5GYeckOtevePSWZUV
 ST+79f/rft7R07C6
 =d6i+
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmJ5gp0ACgkQmmx57+YA
 GNmglQ/+O05UAHL6AoeHLLtgwhDLScjaoTk/fF11OTz3nhxZD680AYkEZTQZH/pi
 iZSpmaOQSIjMjp7aoCGD2JL3brGTgEjqQqVlUIxuhrcFd0wubPV/smJQcCLemEKh
 MwxNFIK9sQ7Krw1cEwZgiCq3MckZzwq2GqGQmHRrJnZQeBQUiCTkWb0SnsSUIfLT
 oSAN/o9s0E4u5WRvm3/fFsqJKdUMCQR/Z5FYY+2qu6sKRL5egb6u2K39KpcMqvSy
 4Nth4lpM3qveH2GlxTcPLkwEazxwDHBZt5exp0pQYuiXuxiAV8+rB4uIlOm/4g0y
 O5jgxS4yp650yJ4D9xyqU+F0oLn65OoPvtLlj1a0q/0T41jOAIWtvoiBY15Feytg
 /BNKqsNw4YM62j7DtvblHN5cdhKwjaaRwf7iPLO2KgEk0OtY9UaP51M7Svdte420
 I1hQdNTp7Bcu6dmhb0lW3HRjXjHc5YD/wNgYku076w5U9vH4pBY4mNswmIsH2Ggd
 xE3drVoEmODIwYJwD5KQr+j1YIj40mxuHrY84ONrjoHyfXdVtNplSmHSn9LQC7j2
 uYPRAzHuYSp7imrUWHh0+gYlBm1Kpp56905p/IuXX9HzLF0zW8qA3fYIaXJKKjMW
 Bmxu/ksC0EbIamS3HSjRBKNE3z+W6Euty8DH9bWjFbdjj/w43UM=
 =/DkJ
 -----END PGP SIGNATURE-----

Merge tag 'hisi-armv7soc-for-5.19' of https://github.com/hisilicon/linux-hisi into arm/soc

HiSilicon ARMv7 SoC updates for v5.19

- Add of_node_put to avoid the refcount leak

* tag 'hisi-armv7soc-for-5.19' of https://github.com/hisilicon/linux-hisi:
  ARM: hisi: Add missing of_node_put after of_find_compatible_node

Link: https://lore.kernel.org/r/62762DF0.30602@hisilicon.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-05-09 23:07:41 +02:00
commit 60166b3c69
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-hisi/platsmp.c
View File

@ -67,14 +67,17 @@ static void __init hi3xxx_smp_prepare_cpus(unsigned int max_cpus)
}
ctrl_base = of_iomap(np, 0);
if (!ctrl_base) {
of_node_put(np);
pr_err("failed to map address\n");
return;
}
if (of_property_read_u32(np, "smp-offset", &offset) < 0) {
of_node_put(np);
pr_err("failed to find smp-offset property\n");
return;
}
ctrl_base += offset;
of_node_put(np);
}
}
@ -160,6 +163,7 @@ static int hip01_boot_secondary(unsigned int cpu, struct task_struct *idle)
if (WARN_ON(!node))
return -1;
ctrl_base = of_iomap(node, 0);
of_node_put(node);
/* set the secondary core boot from DDR */
remap_reg_value = readl_relaxed(ctrl_base + REG_SC_CTRL);