* [PATCH 1/2] ARM: EXYNOS: enable all secondary cores for exynos5440
@ 2013-03-11 10:57 Amit Daniel Kachhap
2013-03-11 10:57 ` [PATCH 2/2] ARM: EXYNOS: Support CPU hotplug " Amit Daniel Kachhap
0 siblings, 1 reply; 2+ messages in thread
From: Amit Daniel Kachhap @ 2013-03-11 10:57 UTC (permalink / raw)
To: linux-samsung-soc; +Cc: linux-kernel, linux-pm, linux-arm-kernel, Kukjin Kim
This patch enables four cores on exynos5440. Also this patch skips the non
exynos5440 pmu control changes.
Cc: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
---
arch/arm/mach-exynos/platsmp.c | 44 ++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
index 60f7c5b..087b73f 100644
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@ -40,6 +40,8 @@ static inline void __iomem *cpu_boot_reg_base(void)
{
if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_1_1)
return S5P_INFORM5;
+ else if (soc_is_exynos5440())
+ return S5P_VA_CHIPID + 0x560;
return S5P_VA_SYSRAM;
}
@@ -116,27 +118,29 @@ static int __cpuinit exynos_boot_secondary(unsigned int cpu, struct task_struct
*/
write_pen_release(phys_cpu);
- if (!(__raw_readl(S5P_ARM_CORE1_STATUS) & S5P_CORE_LOCAL_PWR_EN)) {
- __raw_writel(S5P_CORE_LOCAL_PWR_EN,
- S5P_ARM_CORE1_CONFIGURATION);
-
- timeout = 10;
-
- /* wait max 10 ms until cpu1 is on */
- while ((__raw_readl(S5P_ARM_CORE1_STATUS)
- & S5P_CORE_LOCAL_PWR_EN) != S5P_CORE_LOCAL_PWR_EN) {
- if (timeout-- == 0)
- break;
-
- mdelay(1);
- }
-
- if (timeout == 0) {
- printk(KERN_ERR "cpu1 power enable failed");
- spin_unlock(&boot_lock);
- return -ETIMEDOUT;
+ timeout = 10;
+ if (!soc_is_exynos5440()) {
+ if (!(__raw_readl(S5P_ARM_CORE1_STATUS) &
+ S5P_CORE_LOCAL_PWR_EN)) {
+
+ __raw_writel(S5P_CORE_LOCAL_PWR_EN,
+ S5P_ARM_CORE1_CONFIGURATION);
+
+ /* wait max 10 ms until this cpu is on */
+ while (!(__raw_readl(S5P_ARM_CORE1_STATUS) &
+ S5P_CORE_LOCAL_PWR_EN)) {
+ if (timeout-- == 0)
+ break;
+ mdelay(1);
+ }
}
}
+ if (timeout == 0) {
+ pr_err("cpu%d power enable failed", cpu);
+ spin_unlock(&boot_lock);
+ return -ETIMEDOUT;
+ }
+
/*
* Send the secondary CPU a soft interrupt, thereby causing
* the boot monitor to read the system wide flags register,
@@ -178,6 +182,8 @@ static void __init exynos_smp_init_cpus(void)
if (soc_is_exynos5250())
ncores = 2;
+ else if (soc_is_exynos5440())
+ ncores = 4;
else
ncores = scu_base ? scu_get_core_count(scu_base) : 1;
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 2/2] ARM: EXYNOS: Support CPU hotplug for exynos5440
2013-03-11 10:57 [PATCH 1/2] ARM: EXYNOS: enable all secondary cores for exynos5440 Amit Daniel Kachhap
@ 2013-03-11 10:57 ` Amit Daniel Kachhap
0 siblings, 0 replies; 2+ messages in thread
From: Amit Daniel Kachhap @ 2013-03-11 10:57 UTC (permalink / raw)
To: linux-samsung-soc; +Cc: linux-kernel, linux-pm, linux-arm-kernel, Kukjin Kim
This patch adds support for CPU hotlpug for the 3 secondary cores
of the exynos5440 SOC. The command to hotplug out/in is,
echo 0 > /sys/devices/system/cpu/cpu[1-3]/online
echo 1 > /sys/devices/system/cpu/cpu[1-3]/online
Cc: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
---
arch/arm/mach-exynos/hotplug.c | 14 +++++++++++---
arch/arm/mach-exynos/platsmp.c | 26 +++++++++++++++++++++++++-
2 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-exynos/hotplug.c b/arch/arm/mach-exynos/hotplug.c
index c3f825b..fbee967 100644
--- a/arch/arm/mach-exynos/hotplug.c
+++ b/arch/arm/mach-exynos/hotplug.c
@@ -93,11 +93,19 @@ static inline void cpu_leave_lowpower(void)
static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
{
+ unsigned int val;
for (;;) {
- /* make cpu1 to be turned off at next WFI command */
- if (cpu == 1)
- __raw_writel(0, S5P_ARM_CORE1_CONFIGURATION);
+ /* make cpu to be turned off at next WFI command */
+ if (soc_is_exynos5440()) {
+ void __iomem *pmu_ctrl2_reg = S5P_VA_CHIPID + 0xc4;
+ val = __raw_readl(pmu_ctrl2_reg);
+ val |= (1 << (cpu + 8));
+ __raw_writel(val, pmu_ctrl2_reg);
+ } else {
+ if (cpu == 1)
+ __raw_writel(0, S5P_ARM_CORE1_CONFIGURATION);
+ }
/*
* here's the WFI
diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
index 087b73f..8a5eb80 100644
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@ -101,6 +101,7 @@ static int __cpuinit exynos_boot_secondary(unsigned int cpu, struct task_struct
{
unsigned long timeout;
unsigned long phys_cpu = cpu_logical_map(cpu);
+ unsigned int val;
/*
* Set synchronisation state between this boot processor
@@ -119,7 +120,30 @@ static int __cpuinit exynos_boot_secondary(unsigned int cpu, struct task_struct
write_pen_release(phys_cpu);
timeout = 10;
- if (!soc_is_exynos5440()) {
+ if (soc_is_exynos5440()) {
+ void __iomem *pmu_status_reg = S5P_VA_CHIPID + 0xbc;
+ void __iomem *pmu_ctrl_reg = S5P_VA_CHIPID + 0xc0;
+ void __iomem *pmu_ctrl2_reg = S5P_VA_CHIPID + 0xc4;
+
+ if (!(__raw_readl(pmu_status_reg) & (1 << cpu))) {
+ val = __raw_readl(pmu_ctrl_reg);
+ val |= (1 << cpu);
+ __raw_writel(val, pmu_ctrl_reg);
+ /* wait max 10 ms until cpu1 is on */
+ while (!(__raw_readl(pmu_status_reg) & (1 << cpu))) {
+ if (timeout-- == 0)
+ break;
+
+ mdelay(1);
+ }
+ }
+ /* clear the ctrl2 powerdown */
+ val = __raw_readl(pmu_ctrl2_reg);
+ if (val & (1 << (cpu + 8))) {
+ val &= ~(1 << (cpu + 8));
+ __raw_writel(val, pmu_ctrl2_reg);
+ }
+ } else {
if (!(__raw_readl(S5P_ARM_CORE1_STATUS) &
S5P_CORE_LOCAL_PWR_EN)) {
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-03-11 10:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-11 10:57 [PATCH 1/2] ARM: EXYNOS: enable all secondary cores for exynos5440 Amit Daniel Kachhap
2013-03-11 10:57 ` [PATCH 2/2] ARM: EXYNOS: Support CPU hotplug " Amit Daniel Kachhap
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).