propagate SiS APIC bug info from dom0 to kernel
PATCH 1/1 propagate SiS APIC bug info from dom0 to kernel
This was commented as possibly needing propagation from Dom0, and we now had a bug report where the native Linux workaround indeed appears to help.
Signed-off-by Jan Beulich <[email protected]>
linux-2.6-xen-sparse/arch/i386/kernel/io_apic-xen.c renamed from linux-2.6-xen-sparse/arch/i386/kernel/io_apic-xen.c.0 +10 -1
@@ -2483,8 +2483,17 @@ __setup("enable_8254_timer", setup_enablstatic int __init io_apic_bug_finalize (void ) { -if (sis_apic_bug ==-1 ) +if (sis_apic_bug ==-1 ) { +if (xen_start_info->flags &SIF_INITDOMAIN ) { +dom0_op_t op = { + .cmd =DOM0_PLATFORM_QUIRK , + .u.platform_quirk.quirk_id =QUIRK_IOAPICMODIFY + }; + +HYPERVISOR_dom0_op (&op); + } sis_apic_bug =0 ; + }return 0 ; }
xen/arch/x86/dom0_ops.c renamed from xen/arch/x86/dom0_ops.c.0 +6 -0
@@ -386,6 +386,12 @@ long arch_do_dom0_op(struct dom0_op *op, opt_noirqbalance =1 ;setup_ioapic_dest ();break ; +case QUIRK_IOAPICMODIFY : +#ifndef sis_apic_bug +printk ("Platform info -- Allowing fast IO-APIC updates.\n" ); + sis_apic_bug =0 ; +#endif +break ;default : ret = -EINVAL ;break ;
xen/arch/x86/io_apic.c renamed from xen/arch/x86/io_apic.c.0 +8 -0
@@ -51,6 +51,14 @@ static DEFINE_SPINLOCK(vector_lock);int skip_ioapic_setup; +#ifndef sis_apic_bug +/* +* Is the SiS APIC rmw bug present ? +* -1 = don't know, 0 = no, 1 = yes +*/ +int sis_apic_bug =-1 ; +#endif +/* * # of IRQ routing registers */
xen/include/public/dom0_ops.h renamed from xen/include/public/dom0_ops.h.0 +1 -0
@@ -405,6 +405,7 @@ DEFINE_GUEST_HANDLE(dom0_getdomaininfoli#define DOM0_PLATFORM_QUIRK 39#define QUIRK_NOIRQBALANCING 1 +#define QUIRK_IOAPICMODIFY 2 typedef struct dom0_platform_quirk { /* IN variables. */ uint32_t quirk_id;
xen/include/asm-x86/io_apic.h renamed from xen/include/asm-x86/io_apic.h.0 +5 -1
@@ -139,7 +139,11 @@ static inline void io_apic_write(unsigne* * Older SiS APIC requires we rewrite the index regiser */ -#define sis_apic_bug 0/* This may need propagating from domain0. */ +#ifdef __i386__ +extern int sis_apic_bug; +#else +# define sis_apic_bug 0 +#endif static inline void io_apic_modify (unsigned int apic,unsigned int reg,unsigned int value) {if (sis_apic_bug)
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel