[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] PCI: properly abstract out per-architecture extensions to struct pci_dev
# HG changeset patch # User Jan Beulich <jbeulich@xxxxxxxx> # Date 1326121199 -3600 # Node ID a7c763a92ba1eac1407257f6accf74a8d4f7e619 # Parent bfbfd2006ffcfe56b46909bd8fe2c553ebc43eda PCI: properly abstract out per-architecture extensions to struct pci_dev x86's used_vectors member was both misplaced (in struct pci_dev_info, which acts as a hypercall input data passing container only) and improperly abstracted (requiring a CONFIG_X86 conditional in a generic header). The adjustment requires hiding several more lines in IA64's pci.h, but as a benefit this allows removing one of the "null" headers. Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx> Acked-by: Keir Fraser <keir@xxxxxxx> --- diff -r bfbfd2006ffc -r a7c763a92ba1 xen/arch/x86/irq.c --- a/xen/arch/x86/irq.c Mon Jan 09 15:55:00 2012 +0100 +++ b/xen/arch/x86/irq.c Mon Jan 09 15:59:59 2012 +0100 @@ -1877,7 +1877,7 @@ if ( opt_irq_vector_map == OPT_IRQ_VECTOR_MAP_PERDEV && !desc->arch.used_vectors ) { - desc->arch.used_vectors = &pdev->info.used_vectors; + desc->arch.used_vectors = &pdev->arch.used_vectors; if ( desc->arch.vector != IRQ_VECTOR_UNASSIGNED ) { int vector = desc->arch.vector; diff -r bfbfd2006ffc -r a7c763a92ba1 xen/include/asm-ia64/linux-null/asm-generic/pci-dma-compat.h --- a/xen/include/asm-ia64/linux-null/asm-generic/pci-dma-compat.h Mon Jan 09 15:55:00 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -/* This file is intentionally left empty. */ diff -r bfbfd2006ffc -r a7c763a92ba1 xen/include/asm-ia64/linux-xen/asm/pci.h --- a/xen/include/asm-ia64/linux-xen/asm/pci.h Mon Jan 09 15:55:00 2012 +0100 +++ b/xen/include/asm-ia64/linux-xen/asm/pci.h Mon Jan 09 15:59:59 2012 +0100 @@ -28,6 +28,10 @@ struct pci_dev; +#ifdef XEN +struct arch_pci_dev {}; +#endif + /* * PCI_DMA_BUS_IS_PHYS should be set to 1 if there is _necessarily_ a direct correspondence * between device bus addresses and CPU physical addresses. Platforms with a hardware I/O @@ -43,6 +47,7 @@ extern unsigned long ia64_max_iommu_merge_mask; #define PCI_DMA_BUS_IS_PHYS (ia64_max_iommu_merge_mask == ~0UL) +#ifndef XEN static inline void pcibios_set_master (struct pci_dev *dev) { @@ -110,7 +115,6 @@ #define HAVE_PCI_LEGACY extern int pci_mmap_legacy_page_range(struct pci_bus *bus, struct vm_area_struct *vma); -#ifndef XEN extern ssize_t pci_read_legacy_io(struct kobject *kobj, char *buf, loff_t off, size_t count); extern ssize_t pci_write_legacy_io(struct kobject *kobj, char *buf, loff_t off, @@ -144,6 +148,7 @@ #define PCI_CONTROLLER(busdev) ((struct pci_controller *) busdev->sysdata) #define pci_domain_nr(busdev) (PCI_CONTROLLER(busdev)->segment) +#ifndef XEN extern struct pci_ops pci_root_ops; static inline int pci_proc_domain(struct pci_bus *bus) @@ -161,7 +166,6 @@ extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, struct pci_bus_region *region); -#ifndef XEN static inline struct resource * pcibios_select_root(struct pci_dev *pdev, struct resource *res) { diff -r bfbfd2006ffc -r a7c763a92ba1 xen/include/asm-x86/pci.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xen/include/asm-x86/pci.h Mon Jan 09 15:59:59 2012 +0100 @@ -0,0 +1,8 @@ +#ifndef __X86_PCI_H__ +#define __X86_PCI_H__ + +struct arch_pci_dev { + vmask_t used_vectors; +}; + +#endif /* __X86_PCI_H__ */ diff -r bfbfd2006ffc -r a7c763a92ba1 xen/include/xen/pci.h --- a/xen/include/xen/pci.h Mon Jan 09 15:55:00 2012 +0100 +++ b/xen/include/xen/pci.h Mon Jan 09 15:59:59 2012 +0100 @@ -12,6 +12,7 @@ #include <xen/list.h> #include <xen/spinlock.h> #include <xen/irq.h> +#include <asm/pci.h> /* * The PCI interface treats multi-function devices as independent @@ -39,9 +40,6 @@ u8 bus; u8 devfn; } physfn; -#ifdef CONFIG_X86 - vmask_t used_vectors; -#endif }; struct pci_dev { @@ -62,6 +60,7 @@ const u8 bus; const u8 devfn; struct pci_dev_info info; + struct arch_pci_dev arch; u64 vf_rlen[6]; }; _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |