Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1754c42e authored by Olof Johansson's avatar Olof Johansson Committed by Arnd Bergmann
Browse files

ARM: exynos: move sysram info to exynos.c 



This solves a problem with building with CONFIG_SMP=n due to missing
sysram_base_addr (or sysram_ns_base_addr) variables.

The new setup method is more awkward than I'd like for it to be, but
it can't be done in init_early() since ioremap is not yet available,
but it needs to happen before SMP.

Reported-by: default avatarRussell King <linux@arm.linux.org.uk>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Reviewed-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 1ad58443

arch/arm/mach-exynos/common.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -118,6 +118,7 @@ extern void __iomem *sysram_ns_base_addr; 
extern void __iomem *sysram_base_addr;

extern void __iomem *sysram_base_addr;

void exynos_init_io(void);

void exynos_init_io(void);

void exynos_restart(enum reboot_mode mode, const char *cmd);

void exynos_restart(enum reboot_mode mode, const char *cmd);

void exynos_sysram_init(void);

void exynos_cpuidle_init(void);

void exynos_cpuidle_init(void);

void exynos_cpufreq_init(void);

void exynos_cpufreq_init(void);

void exynos_init_late(void);

void exynos_init_late(void);

arch/arm/mach-exynos/exynos.c

+29 −0
Original line number Original line Diff line number Diff line
@@ -184,6 +184,28 @@ void __init exynos_cpufreq_init(void) 
	platform_device_register_simple("exynos-cpufreq", -1, NULL, 0);

	platform_device_register_simple("exynos-cpufreq", -1, NULL, 0);

}

}





void __iomem *sysram_base_addr;

void __iomem *sysram_ns_base_addr;



void __init exynos_sysram_init(void)

{

	struct device_node *node;



	for_each_compatible_node(node, NULL, "samsung,exynos4210-sysram") {

		if (!of_device_is_available(node))

			continue;

		sysram_base_addr = of_iomap(node, 0);

		break;

	}



	for_each_compatible_node(node, NULL, "samsung,exynos4210-sysram-ns") {

		if (!of_device_is_available(node))

			continue;

		sysram_ns_base_addr = of_iomap(node, 0);

		break;

	}

}



void __init exynos_init_late(void)

void __init exynos_init_late(void)

{

{

	if (of_machine_is_compatible("samsung,exynos5440"))

	if (of_machine_is_compatible("samsung,exynos5440"))
@@ -271,6 +293,13 @@ static void __init exynos_dt_machine_init(void) 
		}

		}

	}

	}





	/*

	 * This is called from smp_prepare_cpus if we've built for SMP, but

	 * we still need to set it up for PM and firmware ops if not.

	 */

	if (!IS_ENABLED(SMP))

		exynos_sysram_init();



	exynos_cpuidle_init();

	exynos_cpuidle_init();

	exynos_cpufreq_init();

	exynos_cpufreq_init();

arch/arm/mach-exynos/platsmp.c

+2 −24
Original line number Original line Diff line number Diff line
@@ -32,28 +32,6 @@ 




extern void exynos4_secondary_startup(void);

extern void exynos4_secondary_startup(void);





void __iomem *sysram_base_addr;

void __iomem *sysram_ns_base_addr;



static void __init exynos_smp_prepare_sysram(void)

{

	struct device_node *node;



	for_each_compatible_node(node, NULL, "samsung,exynos4210-sysram") {

		if (!of_device_is_available(node))

			continue;

		sysram_base_addr = of_iomap(node, 0);

		break;

	}



	for_each_compatible_node(node, NULL, "samsung,exynos4210-sysram-ns") {

		if (!of_device_is_available(node))

			continue;

		sysram_ns_base_addr = of_iomap(node, 0);

		break;

	}

}



static inline void __iomem *cpu_boot_reg_base(void)

static inline void __iomem *cpu_boot_reg_base(void)

{

{

	if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_1_1)

	if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_1_1)
@@ -234,11 +212,11 @@ static void __init exynos_smp_prepare_cpus(unsigned int max_cpus) 
{

{

	int i;

	int i;





	exynos_sysram_init();



	if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)

	if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)

		scu_enable(scu_base_addr());

		scu_enable(scu_base_addr());





	exynos_smp_prepare_sysram();



	/*

	/*

	 * Write the address of secondary startup into the

	 * Write the address of secondary startup into the

	 * system-wide flags register. The boot monitor waits

	 * system-wide flags register. The boot monitor waits