x86: unify construct_default_ioirq_mptable

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 21 insertions, 12 deletions

diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index c185065c3ebc..e92c29e5fd4f 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -436,13 +436,13 @@ static void __init construct_default_ioirq_mptable(int mpc_default_type)
          *  If it does, we assume it's valid.
          */
         if (mpc_default_type == 5) {
-                printk(KERN_INFO
-                       "ISA/PCI bus type with no IRQ information... falling back to ELCR\n");
+                printk(KERN_INFO "ISA/PCI bus type with no IRQ information... "
+                       "falling back to ELCR\n");
 
-                if (ELCR_trigger(0) || ELCR_trigger(1) || ELCR_trigger(2)
-                    || ELCR_trigger(13))
-                        printk(KERN_WARNING
-                               "ELCR contains invalid data... not using ELCR\n");
+                if (ELCR_trigger(0) || ELCR_trigger(1) || ELCR_trigger(2) ||
+                    ELCR_trigger(13))
+                        printk(KERN_ERR "ELCR contains invalid data... "
+                               "not using ELCR\n");
                 else {
                         printk(KERN_INFO
                                "Using ELCR to identify PCI interrupts\n");
@@ -523,8 +523,7 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type)
         bus.mpc_busid = 0;
         switch (mpc_default_type) {
         default:
-                printk("???\n");
-                printk(KERN_ERR "Unknown standard configuration %d\n",
+                printk(KERN_ERR "???\nUnknown standard configuration %d\n",
                        mpc_default_type);
                 /* fall through */
         case 1:
diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c
index d188848a893e..11b74c9b8e01 100644
--- a/arch/x86/kernel/mpparse_64.c
+++ b/arch/x86/kernel/mpparse_64.c
@@ -401,10 +401,12 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type)
          * 2 CPUs, numbered 0 & 1.
          */
         processor.mpc_type = MP_PROCESSOR;
-        processor.mpc_apicver = 0;
+        /* Either an integrated APIC or a discrete 82489DX. */
+        processor.mpc_apicver = mpc_default_type > 4 ? 0x10 : 0x01;
         processor.mpc_cpuflag = CPU_ENABLED;
-        processor.mpc_cpufeature = 0;
-        processor.mpc_featureflag = 0;
+        processor.mpc_cpufeature = (boot_cpu_data.x86 << 8) |
+            (boot_cpu_data.x86_model << 4) | boot_cpu_data.x86_mask;
+        processor.mpc_featureflag = boot_cpu_data.x86_capability[0];
         processor.mpc_reserved[0] = 0;
         processor.mpc_reserved[1] = 0;
         for (i = 0; i < 2; i++) {
@@ -423,6 +425,14 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type)
         case 5:
                 memcpy(bus.mpc_bustype, "ISA   ", 6);
                 break;
+        case 2:
+        case 6:
+        case 3:
+                memcpy(bus.mpc_bustype, "EISA  ", 6);
+                break;
+        case 4:
+        case 7:
+                memcpy(bus.mpc_bustype, "MCA   ", 6);
         }
         MP_bus_info(&bus);
         if (mpc_default_type > 4) {
@@ -433,7 +443,7 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type)
 
         ioapic.mpc_type = MP_IOAPIC;
         ioapic.mpc_apicid = 2;
-        ioapic.mpc_apicver = 0;
+        ioapic.mpc_apicver = mpc_default_type > 4 ? 0x10 : 0x01;
         ioapic.mpc_flags = MPC_APIC_USABLE;
         ioapic.mpc_apicaddr = 0xFEC00000;
         MP_ioapic_info(&ioapic);