Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 294ee6f8 authored by Stefano Stabellini's avatar Stefano Stabellini Committed by Konrad Rzeszutek Wilk
Browse files

x86: Introduce x86_msi_ops 



Introduce an x86 specific indirect mechanism to setup MSIs.
The MSI setup functions become function pointers in an x86_msi_ops
struct, that defaults to the implementation in io_apic.c and msi.c.

[v2: Use HAVE_DEFAULT_* knobs]
Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
parent 1525bf0d

arch/x86/include/asm/pci.h

+31 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/string.h>

#include <asm/scatterlist.h>

#include <asm/io.h>

#include <asm/x86_init.h>



#ifdef __KERNEL__
@@ -94,8 +95,36 @@ static inline void early_quirks(void) { } 


extern void pci_iommu_alloc(void);



/* MSI arch hook */

#define arch_setup_msi_irqs arch_setup_msi_irqs

#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);

}

#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

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

int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);

void native_teardown_msi_irq(unsigned int irq);

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

#define HAVE_DEFAULT_MSI_TEARDOWN_IRQS

void default_teardown_msi_irqs(struct pci_dev *dev);

#else

#define native_setup_msi_irqs		NULL

#define native_teardown_msi_irq		NULL

#define default_teardown_msi_irqs	NULL

#endif



#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)

arch/x86/include/asm/x86_init.h

+9 −0
Original line number Diff line number Diff line
@@ -154,9 +154,18 @@ struct x86_platform_ops { 
	int (*i8042_detect)(void);

};



struct pci_dev;



struct x86_msi_ops {

	int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);

	void (*teardown_msi_irq)(unsigned int irq);

	void (*teardown_msi_irqs)(struct pci_dev *dev);

};



extern struct x86_init_ops x86_init;

extern struct x86_cpuinit_ops x86_cpuinit;

extern struct x86_platform_ops x86_platform;

extern struct x86_msi_ops x86_msi;



extern void x86_init_noop(void);

extern void x86_init_uint_noop(unsigned int unused);

arch/x86/kernel/apic/io_apic.c

+2 −2
Original line number Diff line number Diff line
@@ -3330,7 +3330,7 @@ static int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int irq) 
	return 0;

}



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

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

{

	int node, ret, sub_handle, index = 0;

	unsigned int irq, irq_want;
@@ -3388,7 +3388,7 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 
	return ret;

}



void arch_teardown_msi_irq(unsigned int irq)

void native_teardown_msi_irq(unsigned int irq)

{

	destroy_irq(irq);

}

arch/x86/kernel/x86_init.c

+7 −0
Original line number Diff line number Diff line
@@ -6,10 +6,12 @@ 
#include <linux/init.h>

#include <linux/ioport.h>

#include <linux/module.h>

#include <linux/pci.h>



#include <asm/bios_ebda.h>

#include <asm/paravirt.h>

#include <asm/pci_x86.h>

#include <asm/pci.h>

#include <asm/mpspec.h>

#include <asm/setup.h>

#include <asm/apic.h>
@@ -99,3 +101,8 @@ struct x86_platform_ops x86_platform = { 
};



EXPORT_SYMBOL_GPL(x86_platform);

struct x86_msi_ops x86_msi = {

	.setup_msi_irqs = native_setup_msi_irqs,

	.teardown_msi_irq = native_teardown_msi_irq,

	.teardown_msi_irqs = default_teardown_msi_irqs,

};