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

Samsung mach/soc changes for v5.11

Browse Source 
1. Do not use of_machine_is_compatible() in early CPU hotplug core. Full
    device tree walk causes "suspicious RCU usage" warnings.
 2. Clear prefetch bits in default l2c_aux_val of L310 L2C - they are not
    needed.
 3. Extend cpuidle support to P4 Note boards (Exynos4412).
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAl/Gp/kQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD1+clEACZJlbbkXMJCUSuASr92qw0BG0gdB/QuhwF
 ZaqwI1eC9rDH3WJeGozYEv9yr2slprEGZtc+xRCW0jkNce1zoYNzazj0K0UNsA7H
 TruFZrGnTFFx/WE70gOlMdRipF++dMJ52jusSWd5Pa6vIO9liDfppLHetqrtnIgr
 6ZLfSjkx91Fy1JNuOCUtRgckIRb/Z7OOLDUXYq3I3u/Gxurz/cJRm6KmEirw3hbz
 TH7YQL/LGuPZktW8kEdCor7Eh3c+pSXrIKBD46AKlxRs3UubGGOL1pWmZi9SdJ5O
 K4Wru75oz27tpngSeavwqf12l9sOtP/cOP8eEOyZ6LJrlsWznvhKFm4x0r6NKlCa
 1Po65DFzck4Mbud/JLt22d9x05Ul7OVh7nr1GeJhHSDGH/Uj9NatcjPsThTo+eFy
 358vo9rtfBhdG/+7DSBUqS1MS5pR8jAFLDJ3KIglVCbWZJ0S0He0X/huaEWAZ2+a
 BXO2QnK16zxan4WKr+qNqMRqGhEXeXz0Oun8Kz+KZcw1BYieTZMJl4x4EIiHEjk/
 x7de9kjqsZFbWx7WZMZXg0/enNlQPbuHYgp2UWWZLt/ueXeED71TuOEMiN9Pg2VD
 SWSjo+xiF3m7o3ckXisyqnPm1RYce9M9p1df8zswPfxtb4GK2Lnlsj4Me50WhQwM
 jSBM3YjcuQ==
 =hlj3
 -----END PGP SIGNATURE-----

Merge tag 'samsung-soc-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/soc

Samsung mach/soc changes for v5.11

1. Do not use of_machine_is_compatible() in early CPU hotplug core. Full
   device tree walk causes "suspicious RCU usage" warnings.
2. Clear prefetch bits in default l2c_aux_val of L310 L2C - they are not
   needed.
3. Extend cpuidle support to P4 Note boards (Exynos4412).

* tag 'samsung-soc-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: exynos: extend cpuidle support to P4 Note boards
  ARM: exynos: clear prefetch bits in default l2c_aux_val
  ARM: exynos: Simplify code in Exynos3250 CPU core restart path

Link: https://lore.kernel.org/r/20201201204404.22675-4-krzk@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2020-12-09 16:58:47 +01:00
commit 2efc35dc43
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-exynos/exynos.c
View File

@ -177,7 +177,8 @@ static void __init exynos_dt_machine_init(void)
if (of_machine_is_compatible("samsung,exynos4210") ||
(of_machine_is_compatible("samsung,exynos4412") &&
(of_machine_is_compatible("samsung,trats2") ||
of_machine_is_compatible("samsung,midas"))) ||
of_machine_is_compatible("samsung,midas") ||
of_machine_is_compatible("samsung,p4note"))) ||
of_machine_is_compatible("samsung,exynos3250") ||
of_machine_is_compatible("samsung,exynos5250"))
platform_device_register(&exynos_cpuidle);
@ -206,8 +207,8 @@ static void __init exynos_dt_fixup(void)
}
DT_MACHINE_START(EXYNOS_DT, "Samsung Exynos (Flattened Device Tree)")
.l2c_aux_val = 0x38400000,
.l2c_aux_mask = 0xc60fffff,
.l2c_aux_val = 0x08400000,
.l2c_aux_mask = 0xf60fffff,
.smp = smp_ops(exynos_smp_ops),
.map_io = exynos_init_io,
.init_early = exynos_firmware_init,

2
arch/arm/mach-exynos/platsmp.c
View File

@ -215,7 +215,7 @@ void exynos_core_restart(u32 core_id)
unsigned int timeout = 16;
u32 val;
if (!of_machine_is_compatible("samsung,exynos3250"))
if (!soc_is_exynos3250())
return;
while (timeout && !pmu_raw_readl(S5P_PMU_SPARE2)) {