diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-06-25 16:36:29 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-08-22 12:20:03 +0200 |
| commit | 5d0d8f43535bc4e19406ecf158340ccc4027a477 (patch) | |
| tree | 14dedb7e575f97715f51e3c50c3044c804ff0409 /arch/s390/include | |
| parent | s390/pci: cleanup function names (diff) | |
| download | linux-5d0d8f43535bc4e19406ecf158340ccc4027a477.tar.xz linux-5d0d8f43535bc4e19406ecf158340ccc4027a477.zip | |
s390/pci: use adapter interrupt vector helpers
Make use of the adapter interrupt helpers in the PCI code. This is
the first step to convert the MSI interrupt code to PCI domains.
The patch removes the limitation of 64 adapter interrupts per
PCI function.
Reviewed-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/pci.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h index 6e577ba0e5da..7d3295087aa4 100644 --- a/arch/s390/include/asm/pci.h +++ b/arch/s390/include/asm/pci.h @@ -59,8 +59,9 @@ struct msi_map { struct hlist_node msi_chain; }; -#define ZPCI_NR_MSI_VECS 64 -#define ZPCI_MSI_MASK (ZPCI_NR_MSI_VECS - 1) +#define ZPCI_MSI_VEC_BITS 11 +#define ZPCI_MSI_VEC_MAX (1 << ZPCI_MSI_VEC_BITS) +#define ZPCI_MSI_VEC_MASK (ZPCI_MSI_VEC_MAX - 1) enum zpci_state { ZPCI_FN_STATE_RESERVED, @@ -92,7 +93,8 @@ struct zpci_dev { /* IRQ stuff */ u64 msi_addr; /* MSI address */ struct zdev_irq_map *irq_map; - struct msi_map *msi_map[ZPCI_NR_MSI_VECS]; + struct msi_map *msi_map; + struct airq_iv *aibv; /* adapter interrupt bit vector */ unsigned int aisb; /* number of the summary bit */ /* DMA stuff */ |