Current x86 Device Tree implementation does not support multiprocessing.
Use new DT bindings to describe the processors.

Signed-off-by: Ivan Gorinov <ivan.gori...@intel.com>
---
 arch/x86/kernel/devicetree.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index 5cd387f..b28ac84 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -131,6 +131,30 @@ static void __init dtb_setup_hpet(void)
 #endif
 }
 
+static void __init dtb_cpu_setup(void)
+{
+       struct device_node *dn;
+       struct resource r;
+       const void *prop;
+       int apic_id, version;
+       int ret;
+
+       version = GET_APIC_VERSION(apic_read(APIC_LVR));
+       for_each_node_by_type(dn, "cpu") {
+               prop = of_get_property(dn, "intel,apic-id", NULL);
+               if (prop) {
+                       apic_id = be32_to_cpup(prop);
+               } else {
+                       /* use the address field as APIC ID */
+                       ret = of_address_to_resource(dn, 0, &r);
+                       if (WARN_ON_ONCE(ret))
+                               continue;
+                       apic_id = r.start;
+               }
+               generic_processor_info(apic_id, version);
+       }
+}
+
 static void __init dtb_lapic_setup(void)
 {
 #ifdef CONFIG_X86_LOCAL_APIC
@@ -154,8 +178,6 @@ static void __init dtb_lapic_setup(void)
        smp_found_config = 1;
        pic_mode = 1;
        register_lapic_address(r.start);
-       generic_processor_info(boot_cpu_physical_apicid,
-                              GET_APIC_VERSION(apic_read(APIC_LVR)));
 #endif
 }
 
@@ -260,6 +282,7 @@ static void __init dtb_ioapic_setup(void) {}
 static void __init dtb_apic_setup(void)
 {
        dtb_lapic_setup();
+       dtb_cpu_setup();
        dtb_ioapic_setup();
 }
 
-- 
2.7.4

Reply via email to