ARM: 8110/1: do CPU-specific init for Broadcom Brahma15 cores

[karo-tx-linux.git] / arch / arm / mm / proc-v7.S

diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index c8726abe9babb0d9cbab6b55f63b49265ae9543e..b5d67db2089779c9a1ba1580ec078ee9bce07dad 100644 (file)
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -152,6 +152,40 @@ ENTRY(cpu_v7_do_resume)
 ENDPROC(cpu_v7_do_resume)
 #endif
 
+/*
+ * Cortex-A9 processor functions
+ */
+       globl_equ       cpu_ca9mp_proc_init,    cpu_v7_proc_init
+       globl_equ       cpu_ca9mp_proc_fin,     cpu_v7_proc_fin
+       globl_equ       cpu_ca9mp_reset,        cpu_v7_reset
+       globl_equ       cpu_ca9mp_do_idle,      cpu_v7_do_idle
+       globl_equ       cpu_ca9mp_dcache_clean_area, cpu_v7_dcache_clean_area
+       globl_equ       cpu_ca9mp_switch_mm,    cpu_v7_switch_mm
+       globl_equ       cpu_ca9mp_set_pte_ext,  cpu_v7_set_pte_ext
+.globl cpu_ca9mp_suspend_size
+.equ   cpu_ca9mp_suspend_size, cpu_v7_suspend_size + 4 * 2
+#ifdef CONFIG_ARM_CPU_SUSPEND
+ENTRY(cpu_ca9mp_do_suspend)
+       stmfd   sp!, {r4 - r5}
+       mrc     p15, 0, r4, c15, c0, 1          @ Diagnostic register
+       mrc     p15, 0, r5, c15, c0, 0          @ Power register
+       stmia   r0!, {r4 - r5}
+       ldmfd   sp!, {r4 - r5}
+       b       cpu_v7_do_suspend
+ENDPROC(cpu_ca9mp_do_suspend)
+
+ENTRY(cpu_ca9mp_do_resume)
+       ldmia   r0!, {r4 - r5}
+       mrc     p15, 0, r10, c15, c0, 1         @ Read Diagnostic register
+       teq     r4, r10                         @ Already restored?
+       mcrne   p15, 0, r4, c15, c0, 1          @ No, so restore it
+       mrc     p15, 0, r10, c15, c0, 0         @ Read Power register
+       teq     r5, r10                         @ Already restored?
+       mcrne   p15, 0, r5, c15, c0, 0          @ No, so restore it
+       b       cpu_v7_do_resume
+ENDPROC(cpu_ca9mp_do_resume)
+#endif
+
 #ifdef CONFIG_CPU_PJ4B
        globl_equ       cpu_pj4b_switch_mm,     cpu_v7_switch_mm
        globl_equ       cpu_pj4b_set_pte_ext,   cpu_v7_set_pte_ext
@@ -216,6 +250,7 @@ __v7_cr7mp_setup:
 __v7_ca7mp_setup:
 __v7_ca12mp_setup:
 __v7_ca15mp_setup:
+__v7_b15mp_setup:
 __v7_ca17mp_setup:
        mov     r10, #0
 1:
@@ -418,6 +453,7 @@ __v7_setup_stack:
 
        @ define struct processor (see <asm/proc-fns.h> and proc-macros.S)
        define_processor_functions v7, dabort=v7_early_abort, pabort=v7_pabort, suspend=1
+       define_processor_functions ca9mp, dabort=v7_early_abort, pabort=v7_pabort, suspend=1
 #ifdef CONFIG_CPU_PJ4B
        define_processor_functions pj4b, dabort=v7_early_abort, pabort=v7_pabort, suspend=1
 #endif
@@ -470,7 +506,7 @@ __v7_ca5mp_proc_info:
 __v7_ca9mp_proc_info:
        .long   0x410fc090
        .long   0xff0ffff0
-       __v7_proc __v7_ca9mp_setup
+       __v7_proc __v7_ca9mp_setup, proc_fns = ca9mp_processor_functions
        .size   __v7_ca9mp_proc_info, . - __v7_ca9mp_proc_info
 
 #endif /* CONFIG_ARM_LPAE */
@@ -527,6 +563,16 @@ __v7_ca15mp_proc_info:
        __v7_proc __v7_ca15mp_setup
        .size   __v7_ca15mp_proc_info, . - __v7_ca15mp_proc_info
 
+       /*
+        * Broadcom Corporation Brahma-B15 processor.
+        */
+       .type   __v7_b15mp_proc_info, #object
+__v7_b15mp_proc_info:
+       .long   0x420f00f0
+       .long   0xff0ffff0
+       __v7_proc __v7_b15mp_setup, hwcaps = HWCAP_IDIV
+       .size   __v7_b15mp_proc_info, . - __v7_b15mp_proc_info
+
        /*
         * ARM Ltd. Cortex A17 processor.
         */