diff options
Diffstat (limited to 'include/linux/msi.h')
-rw-r--r-- | include/linux/msi.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/include/linux/msi.h b/include/linux/msi.h index c7ef94343673..e38fe6822cb4 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h | |||
@@ -7,18 +7,17 @@ struct msi_msg { | |||
7 | u32 data; /* 16 bits of msi message data */ | 7 | u32 data; /* 16 bits of msi message data */ |
8 | }; | 8 | }; |
9 | 9 | ||
10 | /* Heper functions */ | 10 | /* Helper functions */ |
11 | extern void mask_msi_irq(unsigned int irq); | 11 | extern void mask_msi_irq(unsigned int irq); |
12 | extern void unmask_msi_irq(unsigned int irq); | 12 | extern void unmask_msi_irq(unsigned int irq); |
13 | extern void read_msi_msg(unsigned int irq, struct msi_msg *msg); | 13 | extern void read_msi_msg(unsigned int irq, struct msi_msg *msg); |
14 | |||
15 | extern void write_msi_msg(unsigned int irq, struct msi_msg *msg); | 14 | extern void write_msi_msg(unsigned int irq, struct msi_msg *msg); |
16 | 15 | ||
17 | struct msi_desc { | 16 | struct msi_desc { |
18 | struct { | 17 | struct { |
19 | __u8 type : 5; /* {0: unused, 5h:MSI, 11h:MSI-X} */ | 18 | __u8 type : 5; /* {0: unused, 5h:MSI, 11h:MSI-X} */ |
20 | __u8 maskbit : 1; /* mask-pending bit supported ? */ | 19 | __u8 maskbit : 1; /* mask-pending bit supported ? */ |
21 | __u8 unused : 1; | 20 | __u8 masked : 1; |
22 | __u8 is_64 : 1; /* Address size: 0=32bit 1=64bit */ | 21 | __u8 is_64 : 1; /* Address size: 0=32bit 1=64bit */ |
23 | __u8 pos; /* Location of the msi capability */ | 22 | __u8 pos; /* Location of the msi capability */ |
24 | __u16 entry_nr; /* specific enabled entry */ | 23 | __u16 entry_nr; /* specific enabled entry */ |
@@ -33,16 +32,14 @@ struct msi_desc { | |||
33 | void __iomem *mask_base; | 32 | void __iomem *mask_base; |
34 | struct pci_dev *dev; | 33 | struct pci_dev *dev; |
35 | 34 | ||
36 | #ifdef CONFIG_PM | 35 | /* Last set MSI message */ |
37 | /* PM save area for MSIX address/data */ | 36 | struct msi_msg msg; |
38 | struct msi_msg msg_save; | ||
39 | #endif | ||
40 | }; | 37 | }; |
41 | 38 | ||
42 | /* | 39 | /* |
43 | * The arch hook for setup up msi irqs | 40 | * The arch hook for setup up msi irqs |
44 | */ | 41 | */ |
45 | int arch_setup_msi_irq(unsigned int irq, struct pci_dev *dev); | 42 | int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc); |
46 | void arch_teardown_msi_irq(unsigned int irq); | 43 | void arch_teardown_msi_irq(unsigned int irq); |
47 | 44 | ||
48 | 45 | ||