linux/pci-msi: translate Xen-provided PIRQs
Subsystems (3)
PATCH 1/1 linux/pci-msi: translate Xen-provided PIRQs
Previously, the kernel depended upon Xen's NR_IRQS to be no larger than the kernel's NR_PIRQS.
As usual, written and tested on 2.6.27-rc5 and made apply to the 2.6.18 tree without further testing.
Signed-off-by Jan Beulich <[email protected]>
arch/i386/kernel/io_apic-xen.c +2 -1
@@ -52,6 +52,7 @@#include <xen/interface/xen.h> #include <xen/interface/physdev.h> +#include <xen/evtchn.h> /* Fake i8259 */ #define make_8259A_irq (_irq) (io_apic_irqs &= ~(1UL<<(_irq)))
@@ -1275,7 +1276,7 @@ static void ioapic_register_intr(int irq set_intr_gate(vector, interrupt[idx]); }#else -#define ioapic_register_intr (_irq,_vector,_trigger) ((void)0) +#define ioapic_register_intr (irq, vector, trigger) evtchn_register_pirq(irq)#endif static void __init setup_IO_APIC_irqs (void )
arch/x86_64/kernel/io_apic-xen.c +2 -1
@@ -81,6 +81,7 @@ int sis_apic_bug; /* not actually suppor#include <xen/interface/xen.h> #include <xen/interface/physdev.h> +#include <xen/evtchn.h> /* Fake i8259 */ #define make_8259A_irq (_irq) (io_apic_irqs &= ~(1UL<<(_irq)))
@@ -840,7 +841,7 @@ static void ioapic_register_intr(int irq set_intr_gate(vector, interrupt[idx]); }#else -#define ioapic_register_intr (_irq,_vector,_trigger) ((void)0) +#define ioapic_register_intr (irq, vector, trigger) evtchn_register_pirq(irq)#endif /* !CONFIG_XEN */ static void __init setup_IO_APIC_irqs (void )
drivers/pci/msi-xen.c +11 -3
@@ -17,6 +17,8 @@#include <linux/pci.h> #include <linux/proc_fs.h> +#include <xen/evtchn.h> +#include <asm/errno.h> #include <asm/io.h> #include <asm/smp.h>
@@ -231,13 +233,15 @@ static int msi_unmap_pirq(struct pci_devint rc; unmap.domid =msi_get_dev_owner (dev); - unmap.pirq = pirq; + unmap.pirq =evtchn_get_xen_pirq (pirq);if ((rc =HYPERVISOR_physdev_op (PHYSDEVOP_unmap_pirq, &unmap)))printk (KERN_WARNING "unmap irq %x failed\n" , pirq);if (rc <0 )return rc; + +evtchn_map_pirq (pirq,0 );return 0 ; }
@@ -272,7 +276,7 @@ static int msi_map_pirq_to_vector(struct map_irq.domid = domid; map_irq.type =MAP_PIRQ_TYPE_MSI ; map_irq.index =-1 ; - map_irq.pirq = pirq; + map_irq.pirq = pirq <0 ?-1 :evtchn_get_xen_pirq (pirq); map_irq.bus = dev->bus->number; map_irq.devfn = dev->devfn; map_irq.entry_nr = entry_nr;
@@ -283,8 +287,12 @@ static int msi_map_pirq_to_vector(structif (rc <0 )return rc; +/* This happens when MSI support is not enabled in Xen. */ +if (rc ==0 && map_irq.pirq <0 ) +return -ENOSYS ; -return map_irq.pirq; +BUG_ON (map_irq.pirq <=0 ); +return evtchn_map_pirq (pirq, map_irq.pirq); }static int msi_map_vector (struct pci_dev *dev,int entry_nr,u64 table_base)
drivers/xen/core/evtchn.c +76 -8
133 lines not on this page · raw message
include/asm-i386/mach-xen/irq_vectors.h +5 -1
@@ -37,7 +37,11 @@*/ #define PIRQ_BASE 0 -#define NR_PIRQS 256 +#if NR_CPUS <MAX_IO_APICS +# define NR_PIRQS (NR_VECTORS + 32 * NR_CPUS) +#else +# define NR_PIRQS (NR_VECTORS + 32 * MAX_IO_APICS) +#endif #define DYNIRQ_BASE (PIRQ_BASE + NR_PIRQS)#define NR_DYNIRQS 256
include/xen/evtchn.h +7 -0
@@ -117,6 +117,13 @@ asmlinkage void evtchn_do_upcall(struct/* Entry point for notifications into the userland character device. */ void evtchn_device_upcall (int port); +/* Mark a PIRQ as unavailable for dynamic allocation. */ +void evtchn_register_pirq (int irq); +/* Map a Xen-supplied PIRQ to a dynamically allocated one. */ +int evtchn_map_pirq (int irq,int xen_pirq); +/* Look up a Xen-supplied PIRQ for a dynamically allocated one. */ +int evtchn_get_xen_pirq (int irq); +void mask_evtchn (int port);void disable_all_local_evtchn (void );void unmask_evtchn (int port);