[Xen-changelog] [xen master] xen/arm: Add CPU ID for Broadcom Brahma-B15

[patchbot@xxxxxxx]

commit 06afffeffd7a7da83b17ff7f49979d56bbdf6710
Author:     Marc Carino <marc.ceeeee@xxxxxxxxx>
AuthorDate: Wed Oct 16 15:57:06 2013 -0700
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Fri Oct 18 09:42:16 2013 +0100

    xen/arm: Add CPU ID for Broadcom Brahma-B15
    
    Let Xen recognize the Broadcom Brahma-B15 CPU by adding the appropriate
    MIDR mask to the initialization phase. Further, ensure that the console
    output properly reports the CPU manufacturer as "Broadcom Corporation".
    
    Signed-off-by: Marc Carino <marc.ceeeee@xxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 xen/arch/arm/arm32/proc-v7.S |    8 ++++++++
 xen/arch/arm/setup.c         |    1 +
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/xen/arch/arm/arm32/proc-v7.S b/xen/arch/arm/arm32/proc-v7.S
index 6577a89..2c8cb9c 100644
--- a/xen/arch/arm/arm32/proc-v7.S
+++ b/xen/arch/arm/arm32/proc-v7.S
@@ -43,6 +43,14 @@ __v7_ca7mp_proc_info:
         .long v7_init
         .size __v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info
 
+        .section ".init.proc.info", #alloc, #execinstr
+        .type __v7_brahma15mp_proc_info, #object
+__v7_brahma15mp_proc_info:
+        .long 0x420F00F2             /* Broadcom Brahma-B15 */
+        .long 0xFF0FFFFF             /* Mask */
+        .long v7_init
+        .size __v7_brahma15mp_proc_info, . - __v7_brahma15mp_proc_info
+
 /*
  * Local variables:
  * mode: ASM
diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index 49f344c..7d6e596 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -61,6 +61,7 @@ static void __init init_idle_domain(void)
 
 static const char * __initdata processor_implementers[] = {
     ['A'] = "ARM Limited",
+    ['B'] = "Broadcom Corporation",
     ['D'] = "Digital Equipment Corp",
     ['M'] = "Motorola, Freescale Semiconductor Inc.",
     ['Q'] = "Qualcomm Inc.",
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog