ia64/xen-unstable

changeset 18153:89d05940cc1c

x86: rename MSI option

Also rename the variable and move its declaration to a header.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Jul 24 14:18:05 2008 +0100 (2008-07-24)
parents 07a44e0d2c52
children 0c320ae06d79
files xen/arch/x86/io_apic.c xen/arch/x86/msi.c xen/arch/x86/physdev.c xen/include/asm-x86/io_apic.h
line diff
     1.1 --- a/xen/arch/x86/io_apic.c	Thu Jul 24 14:17:14 2008 +0100
     1.2 +++ b/xen/arch/x86/io_apic.c	Thu Jul 24 14:18:05 2008 +0100
     1.3 @@ -45,12 +45,12 @@
     1.4  int (*ioapic_renumber_irq)(int ioapic, int irq);
     1.5  atomic_t irq_mis_count;
     1.6  
     1.7 -int msi_irq_enable = 0;
     1.8 -boolean_param("msi_irq_enable", msi_irq_enable);
     1.9 +int msi_enable = 0;
    1.10 +boolean_param("msi", msi_enable);
    1.11  
    1.12  int domain_irq_to_vector(struct domain *d, int irq)
    1.13  {
    1.14 -    if ( !msi_irq_enable )
    1.15 +    if ( !msi_enable )
    1.16          return irq_to_vector(irq);
    1.17      else
    1.18          return d->arch.pirq_vector[irq];
    1.19 @@ -58,7 +58,7 @@ int domain_irq_to_vector(struct domain *
    1.20  
    1.21  int domain_vector_to_irq(struct domain *d, int vector)
    1.22  {
    1.23 -    if ( !msi_irq_enable )
    1.24 +    if ( !msi_enable )
    1.25          return vector_to_irq(vector);
    1.26      else
    1.27          return d->arch.vector_pirq[vector];
     2.1 --- a/xen/arch/x86/msi.c	Thu Jul 24 14:17:14 2008 +0100
     2.2 +++ b/xen/arch/x86/msi.c	Thu Jul 24 14:18:05 2008 +0100
     2.3 @@ -27,8 +27,6 @@
     2.4  #include <public/physdev.h>
     2.5  #include <xen/iommu.h>
     2.6  
     2.7 -extern int msi_irq_enable;
     2.8 -
     2.9  /* bitmap indicate which fixed map is free */
    2.10  DEFINE_SPINLOCK(msix_fixmap_lock);
    2.11  DECLARE_BITMAP(msix_fixmap_pages, MAX_MSIX_PAGES);
     3.1 --- a/xen/arch/x86/physdev.c	Thu Jul 24 14:17:14 2008 +0100
     3.2 +++ b/xen/arch/x86/physdev.c	Thu Jul 24 14:18:05 2008 +0100
     3.3 @@ -184,15 +184,14 @@ static int unmap_domain_pirq(struct doma
     3.4      return ret;
     3.5  }
     3.6  
     3.7 -extern int msi_irq_enable;
     3.8  static int physdev_map_pirq(struct physdev_map_pirq *map)
     3.9  {
    3.10      struct domain *d;
    3.11      int vector, pirq, ret = 0;
    3.12      unsigned long flags;
    3.13  
    3.14 -    /* if msi_irq_enable is not enabled,map always success */
    3.15 -    if ( !msi_irq_enable )
    3.16 +    /* if msi_enable is not enabled, map always succeeds */
    3.17 +    if ( !msi_enable )
    3.18          return 0;
    3.19  
    3.20      if ( !IS_PRIV(current->domain) )
    3.21 @@ -304,7 +303,7 @@ static int physdev_unmap_pirq(struct phy
    3.22      unsigned long flags;
    3.23      int ret;
    3.24  
    3.25 -    if ( !msi_irq_enable )
    3.26 +    if ( !msi_enable )
    3.27          return 0;
    3.28  
    3.29      if ( !IS_PRIV(current->domain) )
    3.30 @@ -455,7 +454,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_H
    3.31  
    3.32          ret = 0;
    3.33  
    3.34 -        if ( msi_irq_enable )
    3.35 +        if ( msi_enable )
    3.36          {
    3.37              spin_lock_irqsave(&dom0->arch.irq_lock, flags);
    3.38              if ( irq != AUTO_ASSIGN )
     4.1 --- a/xen/include/asm-x86/io_apic.h	Thu Jul 24 14:17:14 2008 +0100
     4.2 +++ b/xen/include/asm-x86/io_apic.h	Thu Jul 24 14:18:05 2008 +0100
     4.3 @@ -160,6 +160,8 @@ static inline void io_apic_modify(unsign
     4.4  /* 1 if "noapic" boot option passed */
     4.5  extern int skip_ioapic_setup;
     4.6  
     4.7 +extern int msi_enable;
     4.8 +
     4.9  /*
    4.10   * If we use the IO-APIC for IRQ routing, disable automatic
    4.11   * assignment of PCI IRQ's.