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@gmail.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/xen/arch/arm/arm32/proc-v7.S b/xen/arch/arm/arm32/proc-v7.S
index 6577a895cafdd9552ff7bef7496d97278b06accd..2c8cb9cdd774b2b00dbd5533804b5eb284911fdf 100644 (file)
--- 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 49f344c0e0f9ed98bed926c11e0333b3dccd0395..7d6e596b6216f2098177e3a8e84baed5970ae551 100644 (file)
--- 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.",