From: Tomasz Figa <t.figa@samsung.com> To: linux-samsung-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, kyungmin.park@samsung.com, kgene.kim@samsung.com, linux@arm.linux.org.uk, arnd@arndb.de, olof@lixom.net, m.szyprowski@samsung.com, t.figa@samsung.com Subject: [PATCH 3/6] ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412 Date: Mon, 24 Sep 2012 16:28:30 +0200 [thread overview] Message-ID: <1348496913-25422-4-git-send-email-t.figa@samsung.com> (raw) In-Reply-To: <1348496913-25422-1-git-send-email-t.figa@samsung.com> 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@samsung.com> --- arch/arm/mach-exynos/platsmp.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index 36c3984..a7f4031 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c @@ -34,8 +34,21 @@ 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; +} /* * control for which core is the next to come out of the secondary @@ -89,6 +102,7 @@ void __cpuinit platform_secondary_init(unsigned int cpu) int __cpuinit 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 @@ -104,7 +118,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) * 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, @@ -138,7 +152,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) smp_rmb(); __raw_writel(virt_to_phys(exynos4_secondary_startup), - CPU1_BOOT_REG); + cpu_boot_reg(phys_cpu)); gic_raise_softirq(cpumask_of(cpu), 1); if (pen_release == -1) @@ -186,6 +200,8 @@ void __init smp_init_cpus(void) void __init platform_smp_prepare_cpus(unsigned int max_cpus) { + int i; + if (!soc_is_exynos5250()) scu_enable(scu_base_addr()); @@ -195,6 +211,7 @@ void __init platform_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))); } -- 1.7.12
WARNING: multiple messages have this Message-ID (diff)
From: t.figa@samsung.com (Tomasz Figa) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/6] ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412 Date: Mon, 24 Sep 2012 16:28:30 +0200 [thread overview] Message-ID: <1348496913-25422-4-git-send-email-t.figa@samsung.com> (raw) In-Reply-To: <1348496913-25422-1-git-send-email-t.figa@samsung.com> 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@samsung.com> --- arch/arm/mach-exynos/platsmp.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index 36c3984..a7f4031 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c @@ -34,8 +34,21 @@ 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; +} /* * control for which core is the next to come out of the secondary @@ -89,6 +102,7 @@ void __cpuinit platform_secondary_init(unsigned int cpu) int __cpuinit 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 @@ -104,7 +118,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) * 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, @@ -138,7 +152,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) smp_rmb(); __raw_writel(virt_to_phys(exynos4_secondary_startup), - CPU1_BOOT_REG); + cpu_boot_reg(phys_cpu)); gic_raise_softirq(cpumask_of(cpu), 1); if (pen_release == -1) @@ -186,6 +200,8 @@ void __init smp_init_cpus(void) void __init platform_smp_prepare_cpus(unsigned int max_cpus) { + int i; + if (!soc_is_exynos5250()) scu_enable(scu_base_addr()); @@ -195,6 +211,7 @@ void __init platform_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))); } -- 1.7.12
next prev parent reply other threads:[~2012-09-24 14:29 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-09-24 14:28 [PATCH v2 0/6] ARM: EXYNOS: Add secure firmware support Tomasz Figa 2012-09-24 14:28 ` Tomasz Figa 2012-09-24 14:28 ` [PATCH 1/6] ARM: Add interface for registering and calling firmware-specific operations Tomasz Figa 2012-09-24 14:28 ` Tomasz Figa 2012-09-24 14:28 ` [PATCH 2/6] ARM: EXYNOS: Add support for secure monitor calls Tomasz Figa 2012-09-24 14:28 ` Tomasz Figa 2012-09-24 14:28 ` Tomasz Figa [this message] 2012-09-24 14:28 ` [PATCH 3/6] ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412 Tomasz Figa 2012-09-24 14:28 ` [PATCH 4/6] ARM: EXYNOS: Add IO mapping for non-secure SYSRAM Tomasz Figa 2012-09-24 14:28 ` Tomasz Figa 2012-09-24 14:28 ` [PATCH 5/6] ARM: EXYNOS: Add support for Exynos secure firmware Tomasz Figa 2012-09-24 14:28 ` Tomasz Figa 2012-10-10 16:00 ` Olof Johansson 2012-10-10 16:00 ` Olof Johansson 2012-10-11 13:18 ` Tomasz Figa 2012-10-11 13:18 ` Tomasz Figa 2012-09-24 14:28 ` [PATCH 6/6] ARM: EXYNOS: Add secure firmware support to secondary CPU bring-up Tomasz Figa 2012-09-24 14:28 ` Tomasz Figa 2012-10-10 16:08 ` Olof Johansson 2012-10-10 16:08 ` Olof Johansson 2012-10-02 9:13 ` [PATCH v2 0/6] ARM: EXYNOS: Add secure firmware support Tomasz Figa 2012-10-02 9:13 ` Tomasz Figa 2012-10-10 15:35 ` Kyungmin Park 2012-10-10 15:35 ` Kyungmin Park 2012-10-10 16:11 ` Olof Johansson 2012-10-10 16:11 ` Olof Johansson 2012-10-11 13:19 ` Tomasz Figa 2012-10-11 13:19 ` Tomasz Figa 2012-10-15 13:59 ` Kukjin Kim 2012-10-15 13:59 ` Kukjin Kim 2012-10-10 16:09 ` Olof Johansson 2012-10-10 16:09 ` Olof Johansson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1348496913-25422-4-git-send-email-t.figa@samsung.com \ --to=t.figa@samsung.com \ --cc=arnd@arndb.de \ --cc=kgene.kim@samsung.com \ --cc=kyungmin.park@samsung.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=m.szyprowski@samsung.com \ --cc=olof@lixom.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.