ARM: highbank: abstract out SCU usage

In preparation for A15 support on ECX-2000, the direct calls to SCU
registers must be conditional. The SCU power mode register is replaced by
a custom register on ECX-2000.

Rather than read the number of cores from the SCU, just hardcode it to 4.
This removes one use of SCU and removes the need for the SCU to be
statically mapped. The cpu initialization will ultimately come from DT.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c
index 40e36a50304c9bdb8994fc0e9ac91b5c06a44578..3da921a1a7f690ae61951dba2b8507f9411ee30d 100644 (file)
--- a/arch/arm/mach-highbank/highbank.c
+++ b/arch/arm/mach-highbank/highbank.c
@@ -28,30 +28,19 @@
 
 #include <asm/cacheflush.h>
 #include <asm/smp_plat.h>
-#include <asm/smp_scu.h>
 #include <asm/smp_twd.h>
 #include <asm/hardware/arm_timer.h>
 #include <asm/hardware/timer-sp.h>
 #include <asm/hardware/gic.h>
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/mach/arch.h>
-#include <asm/mach/map.h>
 #include <asm/mach/time.h>
 
 #include "core.h"
 #include "sysregs.h"
 
 void __iomem *sregs_base;
-
-#define HB_SCU_VIRT_BASE       0xfee00000
-void __iomem *scu_base_addr = ((void __iomem *)(HB_SCU_VIRT_BASE));
-
-static struct map_desc scu_io_desc __initdata = {
-       .virtual        = HB_SCU_VIRT_BASE,
-       .pfn            = 0, /* run-time */
-       .length         = SZ_4K,
-       .type           = MT_DEVICE,
-};
+void __iomem *scu_base_addr;
 
 static void __init highbank_scu_map_io(void)
 {
@@ -60,13 +49,11 @@ static void __init highbank_scu_map_io(void)
        /* Get SCU base */
        asm("mrc p15, 4, %0, c15, c0, 0" : "=r" (base));
 
-       scu_io_desc.pfn = __phys_to_pfn(base);
-       iotable_init(&scu_io_desc, 1);
+       scu_base_addr = ioremap(base, SZ_4K);
 }
 
 static void __init highbank_map_io(void)
 {
-       highbank_scu_map_io();
        highbank_lluart_map_io();
 }
 
@@ -99,6 +86,9 @@ static void __init highbank_init_irq(void)
 {
        of_irq_init(irq_match);
 
+       if (of_find_compatible_node(NULL, NULL, "arm,cortex-a9"))
+               highbank_scu_map_io();
+
 #ifdef CONFIG_CACHE_L2X0
        /* Enable PL310 L2 Cache controller */
        highbank_smc1(0x102, 0x1);
@@ -145,7 +135,6 @@ static struct sys_timer highbank_timer = {
 static void highbank_power_off(void)
 {
        hignbank_set_pwr_shutdown();
-       scu_power_mode(scu_base_addr, SCU_PM_POWEROFF);
 
        while (1)
                cpu_do_idle();

diff --git a/arch/arm/mach-highbank/hotplug.c b/arch/arm/mach-highbank/hotplug.c
index 2c1b8c3c8e4543d75f1e947fc28b78f8ed117ca3..7b60faccd5518da90c6bc404e32636cb3631be49 100644 (file)
--- a/arch/arm/mach-highbank/hotplug.c
+++ b/arch/arm/mach-highbank/hotplug.c
@@ -14,13 +14,11 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/smp.h>
 
-#include <asm/smp_scu.h>
 #include <asm/cacheflush.h>
 
 #include "core.h"
+#include "sysregs.h"
 
 extern void secondary_startup(void);
 
@@ -33,7 +31,7 @@ void __ref highbank_cpu_die(unsigned int cpu)
        flush_cache_all();
 
        highbank_set_cpu_jump(cpu, secondary_startup);
-       scu_power_mode(scu_base_addr, SCU_PM_POWEROFF);
+       highbank_set_core_pwr();
 
        cpu_do_idle();
 

diff --git a/arch/arm/mach-highbank/platsmp.c b/arch/arm/mach-highbank/platsmp.c
index fa9560ec6e7018e0dbb0a7dcf0650bcaa7e785ad..1129957f6c1df90cdc10a90a4b6b0f4c6e5a2c37 100644 (file)
--- a/arch/arm/mach-highbank/platsmp.c
+++ b/arch/arm/mach-highbank/platsmp.c
@@ -42,9 +42,7 @@ static int __cpuinit highbank_boot_secondary(unsigned int cpu, struct task_struc
  */
 static void __init highbank_smp_init_cpus(void)
 {
-       unsigned int i, ncores;
-
-       ncores = scu_get_core_count(scu_base_addr);
+       unsigned int i, ncores = 4;
 
        /* sanity check */
        if (ncores > NR_CPUS) {
@@ -65,7 +63,8 @@ static void __init highbank_smp_prepare_cpus(unsigned int max_cpus)
 {
        int i;
 
-       scu_enable(scu_base_addr);
+       if (scu_base_addr)
+               scu_enable(scu_base_addr);
 
        /*
         * Write the address of secondary startup into the jump table

diff --git a/arch/arm/mach-highbank/pm.c b/arch/arm/mach-highbank/pm.c
index de866f21331f4ed4c2258723ccbd9b24f1886eb7..74aa135966f00c87716ca537df45e65c825d3273 100644 (file)
--- a/arch/arm/mach-highbank/pm.c
+++ b/arch/arm/mach-highbank/pm.c
@@ -19,7 +19,6 @@
 #include <linux/suspend.h>
 
 #include <asm/proc-fns.h>
-#include <asm/smp_scu.h>
 #include <asm/suspend.h>
 
 #include "core.h"
@@ -35,8 +34,6 @@ static int highbank_pm_enter(suspend_state_t state)
 {
        hignbank_set_pwr_suspend();
        highbank_set_cpu_jump(0, cpu_resume);
-
-       scu_power_mode(scu_base_addr, SCU_PM_POWEROFF);
        cpu_suspend(0, highbank_suspend_finish);
 
        return 0;

diff --git a/arch/arm/mach-highbank/sysregs.h b/arch/arm/mach-highbank/sysregs.h
index 0e913389f4452bac94f147db5024dc47fc17ae6b..e13e8ea7c6cb30fdf5863c668765d39904984754 100644 (file)
--- a/arch/arm/mach-highbank/sysregs.h
+++ b/arch/arm/mach-highbank/sysregs.h
@@ -17,6 +17,10 @@
 #define _MACH_HIGHBANK__SYSREGS_H_
 
 #include <linux/io.h>
+#include <linux/smp.h>
+#include <asm/smp_plat.h>
+#include <asm/smp_scu.h>
+#include "core.h"
 
 extern void __iomem *sregs_base;
 
@@ -29,24 +33,39 @@ extern void __iomem *sregs_base;
 #define HB_PWR_HARD_RESET              2
 #define HB_PWR_SHUTDOWN                        3
 
+#define SREG_CPU_PWR_CTRL(c)           (0x200 + ((c) * 4))
+
+static inline void highbank_set_core_pwr(void)
+{
+       int cpu = cpu_logical_map(smp_processor_id());
+       if (scu_base_addr)
+               scu_power_mode(scu_base_addr, SCU_PM_POWEROFF);
+       else
+               writel_relaxed(1, sregs_base + SREG_CPU_PWR_CTRL(cpu));
+}
+
 static inline void hignbank_set_pwr_suspend(void)
 {
        writel(HB_PWR_SUSPEND, sregs_base + HB_SREG_A9_PWR_REQ);
+       highbank_set_core_pwr();
 }
 
 static inline void hignbank_set_pwr_shutdown(void)
 {
        writel(HB_PWR_SHUTDOWN, sregs_base + HB_SREG_A9_PWR_REQ);
+       highbank_set_core_pwr();
 }
 
 static inline void hignbank_set_pwr_soft_reset(void)
 {
        writel(HB_PWR_SOFT_RESET, sregs_base + HB_SREG_A9_PWR_REQ);
+       highbank_set_core_pwr();
 }
 
 static inline void hignbank_set_pwr_hard_reset(void)
 {
        writel(HB_PWR_HARD_RESET, sregs_base + HB_SREG_A9_PWR_REQ);
+       highbank_set_core_pwr();
 }
 
 #endif

diff --git a/arch/arm/mach-highbank/system.c b/arch/arm/mach-highbank/system.c
index 82c27230d4a93e657ca4c4a4e1e79439c422bbae..194a5bbb73634c9f55238e27aa002635d51d2bac 100644 (file)
--- a/arch/arm/mach-highbank/system.c
+++ b/arch/arm/mach-highbank/system.c
@@ -14,7 +14,6 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <linux/io.h>
-#include <asm/smp_scu.h>
 #include <asm/proc-fns.h>
 
 #include "core.h"
@@ -27,7 +26,6 @@ void highbank_restart(char mode, const char *cmd)
        else
                hignbank_set_pwr_soft_reset();
 
-       scu_power_mode(scu_base_addr, SCU_PM_POWEROFF);
        cpu_do_idle();
 }