Commit 9a4da8a5 authored by Jan Glauber's avatar Jan Glauber Committed by Martin Schwidefsky
Browse files

s390/pci: PCI adapter interrupts for MSI/MSI-X 



Support PCI adapter interrupts using the Single-IRQ-mode. Single-IRQ-mode
disables an adapter IRQ automatically after delivering it until the SIC
instruction enables it again. This is used to reduce the number of IRQs
for streaming workloads.

Up to 64 MSI handlers can be registered per PCI function.
A hash table is used to map interrupt numbers to MSI descriptors.
The interrupt vector is scanned using the flogr instruction.
Only MSI/MSI-X interrupts are supported, no legacy INTs.

Signed-off-by: default avatarJan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent e56e4e87

arch/s390/include/asm/hw_irq.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
#ifndef _HW_IRQ_H

#define _HW_IRQ_H



#include <linux/msi.h>

#include <linux/pci.h>



static inline struct msi_desc *irq_get_msi_desc(unsigned int irq)

{

	return __irq_get_msi_desc(irq);

}



/* Must be called with msi map lock held */

static inline int irq_set_msi_desc(unsigned int irq, struct msi_desc *msi)

{

	if (!msi)

		return -EINVAL;



	msi->irq = irq;

	return 0;

}



#endif

arch/s390/include/asm/irq.h

+12 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ enum interruption_class { 
	IOINT_APB,

	IOINT_ADM,

	IOINT_CSC,

	IOINT_PCI,

	IOINT_MSI,

	NMI_NMI,

	NR_IRQS,

};
@@ -51,4 +53,14 @@ void service_subclass_irq_unregister(void); 
void measurement_alert_subclass_register(void);

void measurement_alert_subclass_unregister(void);



#ifdef CONFIG_LOCKDEP

#  define disable_irq_nosync_lockdep(irq)	disable_irq_nosync(irq)

#  define disable_irq_nosync_lockdep_irqsave(irq, flags) \

						disable_irq_nosync(irq)

#  define disable_irq_lockdep(irq)		disable_irq(irq)

#  define enable_irq_lockdep(irq)		enable_irq(irq)

#  define enable_irq_lockdep_irqrestore(irq, flags) \

						enable_irq(irq)

#endif



#endif /* _ASM_IRQ_H */

arch/s390/include/asm/isc.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define CHSC_SCH_ISC 7			/* CHSC subchannels */

/* Adapter interrupts. */

#define QDIO_AIRQ_ISC IO_SCH_ISC	/* I/O subchannel in qdio mode */

#define PCI_ISC 2			/* PCI I/O subchannels */

#define AP_ISC 6			/* adjunct processor (crypto) devices */



/* Functions for registration of I/O interruption subclasses */

arch/s390/include/asm/pci.h

+27 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ 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 */
@@ -29,6 +33,15 @@ int pci_proc_domain(struct pci_bus *); 
#define ZPCI_FC_BLOCKED			0x20

#define ZPCI_FC_DMA_ENABLED		0x10



struct msi_map {

	unsigned long irq;

	struct msi_desc *msi;

	struct hlist_node msi_chain;

};



#define ZPCI_NR_MSI_VECS	64

#define ZPCI_MSI_MASK		(ZPCI_NR_MSI_VECS - 1)



enum zpci_state {

	ZPCI_FN_STATE_RESERVED,

	ZPCI_FN_STATE_STANDBY,
@@ -56,6 +69,12 @@ struct zpci_dev { 
	u8		pfgid;		/* function group ID */

	u16		domain;



	/* IRQ stuff */

	u64		msi_addr;	/* MSI address */

	struct zdev_irq_map *irq_map;

	struct msi_map *msi_map[ZPCI_NR_MSI_VECS];

	unsigned int	aisb;		/* number of the summary bit */



	struct zpci_bar_struct bars[PCI_BAR_COUNT];



	enum pci_bus_speed max_bus_speed;
@@ -83,6 +102,14 @@ int clp_add_pci_device(u32, u32, int); 
int clp_enable_fh(struct zpci_dev *, u8);

int clp_disable_fh(struct zpci_dev *);



/* MSI */

struct msi_desc *__irq_get_msi_desc(unsigned int);

int zpci_msi_set_mask_bits(struct msi_desc *, u32, u32);

int zpci_setup_msi_irq(struct zpci_dev *, struct msi_desc *, unsigned int, int);

void zpci_teardown_msi_irq(struct zpci_dev *, struct msi_desc *);

int zpci_msihash_init(void);

void zpci_msihash_exit(void);



/* Helpers */

struct zpci_dev *get_zdev(struct pci_dev *);

struct zpci_dev *get_zdev_by_fid(u32);

arch/s390/kernel/irq.c

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ static const struct irq_class intrclass_names[] = { 
	[IOINT_APB]  = {.name = "APB", .desc = "[I/O] AP Bus"},

	[IOINT_ADM]  = {.name = "ADM", .desc = "[I/O] EADM Subchannel"},

	[IOINT_CSC]  = {.name = "CSC", .desc = "[I/O] CHSC Subchannel"},

	[IOINT_PCI]  = {.name = "PCI", .desc = "[I/O] PCI Interrupt" },

	[IOINT_MSI] =  {.name = "MSI", .desc = "[I/O] MSI Interrupt" },

	[NMI_NMI]    = {.name = "NMI", .desc = "[NMI] Machine Check"},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE