Skip to content

Commit 5d0d8f4

Browse files
author
Martin Schwidefsky
committed
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 <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
1 parent 9389339 commit 5d0d8f4

File tree

3 files changed

+165
-208
lines changed

3 files changed

+165
-208
lines changed

arch/s390/include/asm/pci.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@ struct msi_map {
5959
struct hlist_node msi_chain;
6060
};
6161

62-
#define ZPCI_NR_MSI_VECS 64
63-
#define ZPCI_MSI_MASK (ZPCI_NR_MSI_VECS - 1)
62+
#define ZPCI_MSI_VEC_BITS 11
63+
#define ZPCI_MSI_VEC_MAX (1 << ZPCI_MSI_VEC_BITS)
64+
#define ZPCI_MSI_VEC_MASK (ZPCI_MSI_VEC_MAX - 1)
6465

6566
enum zpci_state {
6667
ZPCI_FN_STATE_RESERVED,
@@ -92,7 +93,8 @@ struct zpci_dev {
9293
/* IRQ stuff */
9394
u64 msi_addr; /* MSI address */
9495
struct zdev_irq_map *irq_map;
95-
struct msi_map *msi_map[ZPCI_NR_MSI_VECS];
96+
struct msi_map *msi_map;
97+
struct airq_iv *aibv; /* adapter interrupt bit vector */
9698
unsigned int aisb; /* number of the summary bit */
9799

98100
/* DMA stuff */

0 commit comments

Comments
 (0)