Merge tag 'samsung-soc-5.11' of... (2efc35dc) · Commits · 戴 / test

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>

arch/arm/mach-exynos/exynos.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -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,

arch/arm/mach-exynos/platsmp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)) {

Admin message