aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Carino <marc.ceeeee@gmail.com>2013-10-16 15:57:06 -0700
committerIan Campbell <ian.campbell@citrix.com>2013-10-18 09:42:16 +0100
commit06afffeffd7a7da83b17ff7f49979d56bbdf6710 (patch)
tree1ceaad67ee5625d911ae28584e7373a2f0c21a80
parentf72cb6bbc10348f4f7671428e5db509731e9e6a5 (diff)
downloadxen-06afffeffd7a7da83b17ff7f49979d56bbdf6710.tar.gz
xen-06afffeffd7a7da83b17ff7f49979d56bbdf6710.tar.bz2
xen-06afffeffd7a7da83b17ff7f49979d56bbdf6710.zip
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>
-rw-r--r--xen/arch/arm/arm32/proc-v7.S8
-rw-r--r--xen/arch/arm/setup.c1
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 6577a895ca..2c8cb9cdd7 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 49f344c0e0..7d6e596b62 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.",