Commit 4287d824 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

PCI: use weak functions for MSI arch-specific functions 



Until now, the MSI architecture-specific functions could be overloaded
using a fairly complex set of #define and compile-time
conditionals. In order to prepare for the introduction of the msi_chip
infrastructure, it is desirable to switch all those functions to use
the 'weak' mechanism. This commit converts all the architectures that
were overidding those MSI functions to use the new strategy.

Note that we keep two separate, non-weak, functions
default_teardown_msi_irqs() and default_restore_msi_irqs() for the
default behavior of the arch_teardown_msi_irqs() and
arch_restore_msi_irqs(), as the default behavior is needed by x86 PCI
code.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tested-by: default avatarDaniel Price <daniel.price@gmail.com>
Tested-by: default avatarThierry Reding <thierry.reding@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux390@de.ibm.com
Cc: linux-s390@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: x86@kernel.org
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-ia64@vger.kernel.org
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: David S. Miller <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Cc: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent ad81f054

arch/mips/include/asm/pci.h

+0 −5
Original line number Diff line number Diff line
@@ -136,11 +136,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 
	return channel ? 15 : 14;

}



#ifdef CONFIG_CPU_CAVIUM_OCTEON

/* MSI arch hook for OCTEON */

#define arch_setup_msi_irqs arch_setup_msi_irqs

#endif



extern char * (*pcibios_plat_setup)(char *str);



#ifdef CONFIG_OF

arch/powerpc/include/asm/pci.h

+0 −5
Original line number Diff line number Diff line
@@ -113,11 +113,6 @@ extern int pci_domain_nr(struct pci_bus *bus); 
/* Decide whether to display the domain number in /proc */

extern int pci_proc_domain(struct pci_bus *bus);



/* MSI arch hooks */

#define arch_setup_msi_irqs arch_setup_msi_irqs

#define arch_teardown_msi_irqs arch_teardown_msi_irqs

#define arch_msi_check_device arch_msi_check_device



struct vm_area_struct;

/* Map a range of PCI memory or I/O space for a device into user space */

int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma,

arch/s390/include/asm/pci.h

+0 −4
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ void pci_iounmap(struct pci_dev *, void __iomem *); 
int pci_domain_nr(struct pci_bus *);

int pci_proc_domain(struct pci_bus *);



/* MSI arch hooks */

#define arch_setup_msi_irqs	arch_setup_msi_irqs

#define arch_teardown_msi_irqs	arch_teardown_msi_irqs



#define ZPCI_BUS_NR			0	/* default bus number */

#define ZPCI_DEVFN			0	/* default device number */

arch/x86/include/asm/pci.h

+0 −30
Original line number Diff line number Diff line
@@ -100,29 +100,6 @@ static inline void early_quirks(void) { } 
extern void pci_iommu_alloc(void);



#ifdef CONFIG_PCI_MSI

/* MSI arch specific hooks */

static inline int x86_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)

{

	return x86_msi.setup_msi_irqs(dev, nvec, type);

}



static inline void x86_teardown_msi_irqs(struct pci_dev *dev)

{

	x86_msi.teardown_msi_irqs(dev);

}



static inline void x86_teardown_msi_irq(unsigned int irq)

{

	x86_msi.teardown_msi_irq(irq);

}

static inline void x86_restore_msi_irqs(struct pci_dev *dev, int irq)

{

	x86_msi.restore_msi_irqs(dev, irq);

}

#define arch_setup_msi_irqs x86_setup_msi_irqs

#define arch_teardown_msi_irqs x86_teardown_msi_irqs

#define arch_teardown_msi_irq x86_teardown_msi_irq

#define arch_restore_msi_irqs x86_restore_msi_irqs

/* implemented in arch/x86/kernel/apic/io_apic. */

struct msi_desc;

int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);
@@ -130,16 +107,9 @@ void native_teardown_msi_irq(unsigned int irq); 
void native_restore_msi_irqs(struct pci_dev *dev, int irq);

int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc,

		  unsigned int irq_base, unsigned int irq_offset);

/* default to the implementation in drivers/lib/msi.c */

#define HAVE_DEFAULT_MSI_TEARDOWN_IRQS

#define HAVE_DEFAULT_MSI_RESTORE_IRQS

void default_teardown_msi_irqs(struct pci_dev *dev);

void default_restore_msi_irqs(struct pci_dev *dev, int irq);

#else

#define native_setup_msi_irqs		NULL

#define native_teardown_msi_irq		NULL

#define default_teardown_msi_irqs	NULL

#define default_restore_msi_irqs	NULL

#endif



#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)

arch/x86/kernel/x86_init.c

+24 −0
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ struct x86_platform_ops x86_platform = { 
};



EXPORT_SYMBOL_GPL(x86_platform);



#if defined(CONFIG_PCI_MSI)

struct x86_msi_ops x86_msi = {

	.setup_msi_irqs		= native_setup_msi_irqs,

	.compose_msi_msg	= native_compose_msi_msg,
@@ -116,6 +118,28 @@ struct x86_msi_ops x86_msi = { 
	.setup_hpet_msi		= default_setup_hpet_msi,

};



/* MSI arch specific hooks */

int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)

{

	return x86_msi.setup_msi_irqs(dev, nvec, type);

}



void arch_teardown_msi_irqs(struct pci_dev *dev)

{

	x86_msi.teardown_msi_irqs(dev);

}



void arch_teardown_msi_irq(unsigned int irq)

{

	x86_msi.teardown_msi_irq(irq);

}



void arch_restore_msi_irqs(struct pci_dev *dev, int irq)

{

	x86_msi.restore_msi_irqs(dev, irq);

}

#endif



struct x86_io_apic_ops x86_io_apic_ops = {

	.init			= native_io_apic_init_mappings,

	.read			= native_io_apic_read,

CRA Git | Maintained and supported by SUSTech CRA and CCSE