2 files changed, 49 insertions, 67 deletions

diff --git a/include/linux/msi.h b/include/linux/msi.h
new file mode 100644
index 000000000000..c7ef94343673
--- /dev/null
+++ b/include/linux/msi.h
@@ -0,0 +1,49 @@
+#ifndef LINUX_MSI_H
+#define LINUX_MSI_H
+
+struct msi_msg {
+        u32     address_lo;     /* low 32 bits of msi message address */
+        u32     address_hi;     /* high 32 bits of msi message address */
+        u32     data;           /* 16 bits of msi message data */
+};
+
+/* Heper functions */
+extern void mask_msi_irq(unsigned int irq);
+extern void unmask_msi_irq(unsigned int irq);
+extern void read_msi_msg(unsigned int irq, struct msi_msg *msg);
+
+extern void write_msi_msg(unsigned int irq, struct msi_msg *msg);
+
+struct msi_desc {
+        struct {
+                __u8    type    : 5;    /* {0: unused, 5h:MSI, 11h:MSI-X} */
+                __u8    maskbit : 1;    /* mask-pending bit supported ?   */
+                __u8    unused  : 1;
+                __u8    is_64   : 1;    /* Address size: 0=32bit 1=64bit  */
+                __u8    pos;            /* Location of the msi capability */
+                __u16   entry_nr;       /* specific enabled entry         */
+                unsigned default_irq;   /* default pre-assigned irq       */
+        }msi_attrib;
+
+        struct {
+                __u16   head;
+                __u16   tail;
+        }link;
+
+        void __iomem *mask_base;
+        struct pci_dev *dev;
+
+#ifdef CONFIG_PM
+        /* PM save area for MSIX address/data */
+        struct msi_msg msg_save;
+#endif
+};
+
+/*
+ * The arch hook for setup up msi irqs
+ */
+int arch_setup_msi_irq(unsigned int irq, struct pci_dev *dev);
+void arch_teardown_msi_irq(unsigned int irq);
+
+
+#endif /* LINUX_MSI_H */
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 9b34bc8f34e4..0da5a4a8940f 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -595,11 +595,6 @@ struct msix_entry {
         u16     entry;  /* driver uses to specify entry, OS writes */
 };
 
-struct msi_msg {
-        u32     address_lo;     /* low 32 bits of msi message address */
-        u32     address_hi;     /* high 32 bits of msi message address */
-        u32     data;           /* 16 bits of msi message data */
-};
 
 #ifndef CONFIG_PCI_MSI
 static inline void pci_scan_msi_device(struct pci_dev *dev) {}
@@ -617,68 +612,6 @@ extern int pci_enable_msix(struct pci_dev* dev,
         struct msix_entry *entries, int nvec);
 extern void pci_disable_msix(struct pci_dev *dev);
 extern void msi_remove_pci_irq_vectors(struct pci_dev *dev);
-
-/*
- * MSI operation vector.  Used by the msi core code (drivers/pci/msi.c)
- * to abstract platform-specific tasks relating to MSI address generation
- * and resource management.
- */
-struct msi_ops {
-        int needs_64bit_address;
-        /**
-         * setup - generate an MSI bus address and data for a given vector
-         * @pdev: PCI device context (in)
-         * @irq: irq allocated by the msi core (in)
-         * @msg: PCI bus address and data for msi message (out)
-         *
-         * Description: The setup op is used to generate a PCI bus addres and
-         * data which the msi core will program into the card MSI capability
-         * registers.  The setup routine is responsible for picking an initial
-         * cpu to target the MSI at.  The setup routine is responsible for
-         * examining pdev to determine the MSI capabilities of the card and
-         * generating a suitable address/data.  The setup routine is
-         * responsible for allocating and tracking any system resources it
-         * needs to route the MSI to the cpu it picks, and for associating
-         * those resources with the passed in vector.
-         *
-         * Returns 0 if the MSI address/data was successfully setup.
-         **/
-
-        int     (*setup)    (struct pci_dev *pdev, unsigned int irq,
-                             struct msi_msg *msg);
-
-        /**
-         * teardown - release resources allocated by setup
-         * @vector: vector context for resources (in)
-         *
-         * Description:  The teardown op is used to release any resources
-         * that were allocated in the setup routine associated with the passed
-         * in vector.
-         **/
-
-        void    (*teardown) (unsigned int irq);
-
-        /**
-         * target - retarget an MSI at a different cpu
-         * @vector: vector context for resources (in)
-         * @cpu:  new cpu to direct vector at (in)
-         * @addr_hi: new value of PCI bus upper 32 bits (in/out)
-         * @addr_lo: new value of PCI bus lower 32 bits (in/out)
-         *
-         * Description:  The target op is used to redirect an MSI vector
-         * at a different cpu.  addr_hi/addr_lo coming in are the existing
-         * values that the MSI core has programmed into the card.  The
-         * target code is responsible for freeing any resources (if any)
-         * associated with the old address, and generating a new PCI bus
-         * addr_hi/addr_lo that will redirect the vector at the indicated cpu.
-         **/
-
-        void    (*target)   (unsigned int irq, cpumask_t cpumask,
-                             struct msi_msg *msg);
-};
-
-extern int msi_register(struct msi_ops *ops);
-
 #endif
 
 #ifdef CONFIG_HT_IRQ