aboutsummaryrefslogtreecommitdiffstats
path: root/xen/arch/x86/platform_hypercall.c
diff options
context:
space:
mode:
authorKeir Fraser <keir@xen.org>2010-12-07 18:32:04 +0000
committerKeir Fraser <keir@xen.org>2010-12-07 18:32:04 +0000
commitca2570b805c06fa70a3fdc3492bf0ef04060c349 (patch)
treebcb941e47dc184d557e1df8474f64e62221992a7 /xen/arch/x86/platform_hypercall.c
parent80d4ed4bb9f90025c2e4c7fb941621fee2ef09a4 (diff)
downloadxen-ca2570b805c06fa70a3fdc3492bf0ef04060c349.tar.gz
xen-ca2570b805c06fa70a3fdc3492bf0ef04060c349.tar.bz2
xen-ca2570b805c06fa70a3fdc3492bf0ef04060c349.zip
x86: remove BUG_ON() from QUIRK_IOAPIC_*_REGSEL handler
Since (non-pvops, 32-bit only up to 2.6.27) Linux would report "BAD" unconditionally on all SiS chipset versions (it only looks for a PCI device at 0000:00:00.0 with SiS as the vendor), we must not crash if the report on a 64-bit hypervisor doesn't match the #define (which is zero). While we could honor the quirk indication even on 64-bit, it doesn't seem worthwhile, as there's no evidence that newer SiS chipsets (supporting 64-bit CPUs) are actually affected. This should also address bug 1687 (mis-reported, however, afaict). Signed-off-by: Jan Beulich <jbeulich@novell.com>
Diffstat (limited to 'xen/arch/x86/platform_hypercall.c')
-rw-r--r--xen/arch/x86/platform_hypercall.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c
index 4dd6a6f959..0226c7c408 100644
--- a/xen/arch/x86/platform_hypercall.c
+++ b/xen/arch/x86/platform_hypercall.c
@@ -198,7 +198,10 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op)
dprintk(XENLOG_INFO, "Domain 0 says that IO-APIC REGSEL is %s\n",
sis_apic_bug ? "bad" : "good");
#else
- BUG_ON(sis_apic_bug != (quirk_id == QUIRK_IOAPIC_BAD_REGSEL));
+ if ( sis_apic_bug != (quirk_id == QUIRK_IOAPIC_BAD_REGSEL) )
+ dprintk(XENLOG_WARNING,
+ "Domain 0 thinks that IO-APIC REGSEL is %s\n",
+ sis_apic_bug ? "good" : "bad");
#endif
break;
default: