debuggers.hg

changeset 22839:ca64bd257a6f

Merge
author Tim Deegan <Tim.Deegan@citrix.com>
date Fri Jan 21 16:04:59 2011 +0000 (2011-01-21)
parents e9277ab43947 1637fdbfc21e
children c342aa1476e8
files
line diff
     1.1 --- a/xen/arch/x86/apic.c	Fri Jan 21 15:37:36 2011 +0000
     1.2 +++ b/xen/arch/x86/apic.c	Fri Jan 21 16:04:59 2011 +0000
     1.3 @@ -961,6 +961,22 @@ void __init x2apic_bsp_setup(void)
     1.4      if ( !cpu_has_x2apic )
     1.5          return;
     1.6  
     1.7 +#ifdef __i386__
     1.8 +    clear_bit(X86_FEATURE_X2APIC, boot_cpu_data.x86_capability);
     1.9 +    if ( x2apic_enabled )
    1.10 +    {
    1.11 +        uint64_t msr_content;
    1.12 +        rdmsrl(MSR_IA32_APICBASE, msr_content);
    1.13 +        msr_content &= ~(MSR_IA32_APICBASE_ENABLE | MSR_IA32_APICBASE_EXTD);
    1.14 +        wrmsrl(MSR_IA32_APICBASE, msr_content);
    1.15 +        msr_content |= MSR_IA32_APICBASE_ENABLE;
    1.16 +        wrmsrl(MSR_IA32_APICBASE, msr_content);
    1.17 +        x2apic_enabled = 0;
    1.18 +    }
    1.19 +    printk("x2APIC disabled permanently on x86_32.\n");
    1.20 +    return;
    1.21 +#endif
    1.22 +
    1.23      if ( !opt_x2apic )
    1.24      {
    1.25          if ( !x2apic_enabled )
     2.1 --- a/xen/arch/x86/hvm/svm/svm.c	Fri Jan 21 15:37:36 2011 +0000
     2.2 +++ b/xen/arch/x86/hvm/svm/svm.c	Fri Jan 21 16:04:59 2011 +0000
     2.3 @@ -705,7 +705,7 @@ static void svm_do_resume(struct vcpu *v
     2.4      {
     2.5          v->arch.hvm_svm.launch_core = smp_processor_id();
     2.6          hvm_migrate_timers(v);
     2.7 -
     2.8 +        hvm_migrate_pirqs(v);
     2.9          /* Migrating to another ASID domain.  Request a new ASID. */
    2.10          hvm_asid_flush_vcpu(v);
    2.11      }
     3.1 --- a/xen/arch/x86/x86_32/domain_page.c	Fri Jan 21 15:37:36 2011 +0000
     3.2 +++ b/xen/arch/x86/x86_32/domain_page.c	Fri Jan 21 16:04:59 2011 +0000
     3.3 @@ -53,6 +53,8 @@ void *map_domain_page(unsigned long mfn)
     3.4      perfc_incr(map_domain_page_count);
     3.5  
     3.6      v = mapcache_current_vcpu();
     3.7 +    /* Prevent vcpu pointer being used before initialize. */
     3.8 +    ASSERT((unsigned long)v != 0xfffff000);
     3.9  
    3.10      dcache = &v->domain->arch.mapcache;
    3.11      vcache = &v->arch.mapcache;
     4.1 --- a/xen/drivers/passthrough/vtd/quirks.c	Fri Jan 21 15:37:36 2011 +0000
     4.2 +++ b/xen/drivers/passthrough/vtd/quirks.c	Fri Jan 21 16:04:59 2011 +0000
     4.3 @@ -217,10 +217,15 @@ static void snb_vtd_ops_postamble(struct
     4.4  /*
     4.5   * call before VT-d translation enable and IOTLB flush operations.
     4.6   */
     4.7 +
     4.8 +static int snb_igd_quirk;
     4.9 +boolean_param("snb_igd_quirk", snb_igd_quirk);
    4.10 +
    4.11  void vtd_ops_preamble_quirk(struct iommu* iommu)
    4.12  {
    4.13      cantiga_vtd_ops_preamble(iommu);
    4.14 -    snb_vtd_ops_preamble(iommu);
    4.15 +    if ( snb_igd_quirk )
    4.16 +        snb_vtd_ops_preamble(iommu);
    4.17  }
    4.18  
    4.19  /*
    4.20 @@ -228,7 +233,8 @@ void vtd_ops_preamble_quirk(struct iommu
    4.21   */
    4.22  void vtd_ops_postamble_quirk(struct iommu* iommu)
    4.23  {
    4.24 -    snb_vtd_ops_postamble(iommu);
    4.25 +    if ( snb_igd_quirk )
    4.26 +        snb_vtd_ops_postamble(iommu);
    4.27  }
    4.28  
    4.29  /* initialize platform identification flags */