Tomasz Figa wrote:
>
> Exynos4412 uses different information register for each core. This patch
> adjusts the bring-up code to take that into account.
>
> Signed-off-by: Tomasz Figa <t.figa@xxxxxxxxxxx>
> Reviewed-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
> ---
> arch/arm/mach-exynos/platsmp.c | 30 ++++++++++++++++++++++++------
> 1 file changed, 24 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
> index f93d820..4ca8ff1 100644
> --- a/arch/arm/mach-exynos/platsmp.c
> +++ b/arch/arm/mach-exynos/platsmp.c
> @@ -36,8 +36,22 @@
>
> extern void exynos4_secondary_startup(void);
>
> -#define CPU1_BOOT_REG (samsung_rev() == EXYNOS4210_REV_1_1 ? \
> - S5P_INFORM5 : S5P_VA_SYSRAM)
> +static inline void __iomem *cpu_boot_reg_base(void)
> +{
> + if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_1_1)
> + return S5P_INFORM5;
> + return S5P_VA_SYSRAM;
> +}
> +
> +static inline void __iomem *cpu_boot_reg(int cpu)
> +{
> + void __iomem *boot_reg;
> +
> + boot_reg = cpu_boot_reg_base();
> + if (soc_is_exynos4412())
> + boot_reg += 4*cpu;
> + return boot_reg;
> +}
>
> /*
> * Write pen_release in a way that is guaranteed to be visible to all
> @@ -84,6 +98,7 @@ static void __cpuinit exynos_secondary_init(unsigned int cpu)
> static int __cpuinit exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
> {
> unsigned long timeout;
> + unsigned long phys_cpu = cpu_logical_map(cpu);
>
> /*
> * Set synchronisation state between this boot processor
> @@ -99,7 +114,7 @@ static int __cpuinit exynos_boot_secondary(unsigned int cpu, struct task_struct
> * Note that "pen_release" is the hardware CPU ID, whereas
> * "cpu" is Linux's internal ID.
> */
> - write_pen_release(cpu_logical_map(cpu));
> + write_pen_release(phys_cpu);
>
> if (!(__raw_readl(S5P_ARM_CORE1_STATUS) & S5P_CORE_LOCAL_PWR_EN)) {
> __raw_writel(S5P_CORE_LOCAL_PWR_EN,
> @@ -133,7 +148,7 @@ static int __cpuinit exynos_boot_secondary(unsigned int cpu, struct task_struct
> smp_rmb();
>
> __raw_writel(virt_to_phys(exynos4_secondary_startup),
> - CPU1_BOOT_REG);
> + cpu_boot_reg(phys_cpu));
> gic_raise_softirq(cpumask_of(cpu), 0);
>
> if (pen_release == -1)
> @@ -181,6 +196,8 @@ static void __init exynos_smp_init_cpus(void)
>
> static void __init exynos_smp_prepare_cpus(unsigned int max_cpus)
> {
> + int i;
> +
> if (!soc_is_exynos5250())
> scu_enable(scu_base_addr());
>
> @@ -190,8 +207,9 @@ static void __init exynos_smp_prepare_cpus(unsigned int max_cpus)
> * until it receives a soft interrupt, and then the
> * secondary CPU branches to this address.
> */
> - __raw_writel(virt_to_phys(exynos4_secondary_startup),
> - CPU1_BOOT_REG);
> + for (i = 1; i < max_cpus; ++i)
> + __raw_writel(virt_to_phys(exynos4_secondary_startup),
> + cpu_boot_reg(cpu_logical_map(i)));
> }
>
> struct smp_operations exynos_smp_ops __initdata = {
> --
> 1.8.0
Looks OK to me, will apply.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@xxxxxxxxxxx>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
