apic, x86: Use BIOS settings for IBS and MCE threshold interrupt LVT offsets

We want the BIOS to setup the EILVT APIC registers. The offsets
were hardcoded and BIOS settings were overwritten by the OS.
Now, the subsystems for MCE threshold and IBS determine the LVT
offset from the registers the BIOS has setup. If the BIOS setup
is buggy on a family 10h system, a workaround enables IBS. If
the OS determines an invalid register setup, a "[Firmware Bug]:
" error message is reported.

We need this change also for upcomming cpu families.

Signed-off-by: Robert Richter <robert.richter@amd.com>
LKML-Reference: <1286360874-1471-3-git-send-email-robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 24 insertions, 3 deletions

diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
index 39aaee5c1ab2..80c482382d5c 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
@@ -131,7 +131,8 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c)
         u32 low = 0, high = 0, address = 0;
         unsigned int bank, block;
         struct thresh_restart tr;
-        u8 lvt_off;
+        int lvt_off = -1;
+        u8 offset;
 
         for (bank = 0; bank < NR_BANKS; ++bank) {
                 for (block = 0; block < NR_BLOCKS; ++block) {
@@ -162,8 +163,28 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c)
                         if (shared_bank[bank] && c->cpu_core_id)
                                 break;
 #endif
-                        lvt_off = setup_APIC_eilvt_mce(THRESHOLD_APIC_VECTOR,
-                                                       APIC_EILVT_MSG_FIX, 0);
+                        offset = (high & MASK_LVTOFF_HI) >> 20;
+                        if (lvt_off < 0) {
+                                if (setup_APIC_eilvt(offset,
+                                                     THRESHOLD_APIC_VECTOR,
+                                                     APIC_EILVT_MSG_FIX, 0)) {
+                                        pr_err(FW_BUG "cpu %d, failed to "
+                                               "setup threshold interrupt "
+                                               "for bank %d, block %d "
+                                               "(MSR%08X=0x%x%08x)",
+                                               smp_processor_id(), bank, block,
+                                               address, high, low);
+                                        continue;
+                                }
+                                lvt_off = offset;
+                        } else if (lvt_off != offset) {
+                                pr_err(FW_BUG "cpu %d, invalid threshold "
+                                       "interrupt offset %d for bank %d,"
+                                       "block %d (MSR%08X=0x%x%08x)",
+                                       smp_processor_id(), lvt_off, bank,
+                                       block, address, high, low);
+                                continue;
+                        }
 
                         high &= ~MASK_LVTOFF_HI;
                         high |= lvt_off << 20;