mirror of
https://github.com/xen-project/xen.git
synced 2026-10-30 03:00:05 +01:00
x86/APIC: Remove esr_disable
It is unconditionally 0 in Xen, and was deleted in Linux somewhere between 2.5 and 2.6. Remove it in Xen too. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Acked-by: Jan Beulich <jbeulich@suse.com> Acked-by: Roger Pau Monné <roger.pau@citrix.com>
This commit is contained in:
Andrew Cooper committed
1 parent
fb0ff49fe9
commit
e07a276976
2 files changed
+14
-37
No files matched your search
+14
-34
@@ -496,14 +496,6 @@ void setup_local_APIC(bool bsp)
|
||||
unsigned long oldvalue, value, maxlvt;
|
||||
int i, j;
|
||||
|
||||
/* Pound the ESR really hard over the head with a big hammer - mbligh */
|
||||
if (esr_disable) {
|
||||
apic_write(APIC_ESR, 0);
|
||||
apic_write(APIC_ESR, 0);
|
||||
apic_write(APIC_ESR, 0);
|
||||
apic_write(APIC_ESR, 0);
|
||||
}
|
||||
|
||||
BUILD_BUG_ON((SPURIOUS_APIC_VECTOR & 0x0f) != 0x0f);
|
||||
|
||||
/*
|
||||
@@ -628,33 +620,21 @@ void setup_local_APIC(bool bsp)
|
||||
value = APIC_DM_NMI | APIC_LVT_MASKED;
|
||||
apic_write(APIC_LVT1, value);
|
||||
|
||||
if (!esr_disable) {
|
||||
maxlvt = get_maxlvt();
|
||||
if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */
|
||||
apic_write(APIC_ESR, 0);
|
||||
oldvalue = apic_read(APIC_ESR);
|
||||
maxlvt = get_maxlvt();
|
||||
if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */
|
||||
apic_write(APIC_ESR, 0);
|
||||
oldvalue = apic_read(APIC_ESR);
|
||||
|
||||
value = ERROR_APIC_VECTOR; // enables sending errors
|
||||
apic_write(APIC_LVTERR, value);
|
||||
/*
|
||||
* spec says clear errors after enabling vector.
|
||||
*/
|
||||
if (maxlvt > 3)
|
||||
apic_write(APIC_ESR, 0);
|
||||
value = apic_read(APIC_ESR);
|
||||
if (value != oldvalue)
|
||||
apic_printk(APIC_VERBOSE, "ESR value before enabling "
|
||||
"vector: %#lx after: %#lx\n",
|
||||
oldvalue, value);
|
||||
} else {
|
||||
/*
|
||||
* Something untraceble is creating bad interrupts on
|
||||
* secondary quads ... for the moment, just leave the
|
||||
* ESR disabled - we can't do anything useful with the
|
||||
* errors anyway - mbligh
|
||||
*/
|
||||
printk("Leaving ESR disabled.\n");
|
||||
}
|
||||
value = ERROR_APIC_VECTOR; // enables sending errors
|
||||
apic_write(APIC_LVTERR, value);
|
||||
/* spec says clear errors after enabling vector. */
|
||||
if (maxlvt > 3)
|
||||
apic_write(APIC_ESR, 0);
|
||||
value = apic_read(APIC_ESR);
|
||||
if (value != oldvalue)
|
||||
apic_printk(APIC_VERBOSE,
|
||||
"ESR value before enabling vector: %#lx after: %#lx\n",
|
||||
oldvalue, value);
|
||||
|
||||
if (nmi_watchdog == NMI_LOCAL_APIC && !bsp)
|
||||
setup_apic_nmi_watchdog();
|
||||
|
||||
@@ -6,9 +6,6 @@
|
||||
#include <asm/genapic.h>
|
||||
#include <asm/smp.h>
|
||||
|
||||
/* ESR was originally disabled in Linux for NUMA-Q. Do we really need to? */
|
||||
#define esr_disable (0)
|
||||
|
||||
/* The following are dependent on APIC delivery mode (logical vs. physical). */
|
||||
#define INT_DELIVERY_MODE (genapic.int_delivery_mode)
|
||||
#define INT_DEST_MODE (genapic.int_dest_mode)
|
||||
|
||||