Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[powerpc.git] / drivers / dma / ioatdma.h

diff --git a/drivers/dma/ioatdma.h b/drivers/dma/ioatdma.h
index a5d3b36..5f9881e 100644 (file)
--- a/drivers/dma/ioatdma.h
+++ b/drivers/dma/ioatdma.h
@@ -28,28 +28,37 @@
 #include <linux/cache.h>
 #include <linux/pci_ids.h>
 
-#define IOAT_LOW_COMPLETION_MASK       0xffffffc0
+#define IOAT_DMA_VERSION "1.26"
+
+enum ioat_interrupt {
+       none = 0,
+       msix_multi_vector = 1,
+       msix_single_vector = 2,
+       msi = 3,
+       intx = 4,
+};
 
-extern struct list_head dma_device_list;
-extern struct list_head dma_client_list;
+#define IOAT_LOW_COMPLETION_MASK       0xffffffc0
 
 /**
- * struct ioat_device - internal representation of a IOAT device
+ * struct ioatdma_device - internal representation of a IOAT device
  * @pdev: PCI-Express device
  * @reg_base: MMIO register space base address
  * @dma_pool: for allocating DMA descriptors
  * @common: embedded struct dma_device
- * @msi: Message Signaled Interrupt number
+ * @version: version of ioatdma device
  */
 
-struct ioat_device {
+struct ioatdma_device {
        struct pci_dev *pdev;
-       void *reg_base;
+       void __iomem *reg_base;
        struct pci_pool *dma_pool;
        struct pci_pool *completion_pool;
-
        struct dma_device common;
-       u8 msi;
+       u8 version;
+       enum ioat_interrupt irq_mode;
+       struct msix_entry msix_entries[4];
+       struct ioat_dma_chan *idx[4];
 };
 
 /**
@@ -73,7 +82,7 @@ struct ioat_device {
 
 struct ioat_dma_chan {
 
-       void *reg_base;
+       void __iomem *reg_base;
 
        dma_cookie_t completed_cookie;
        unsigned long last_completion;
@@ -87,7 +96,7 @@ struct ioat_dma_chan {
 
        int pending;
 
-       struct ioat_device *device;
+       struct ioatdma_device *device;
        struct dma_chan common;
 
        dma_addr_t completion_addr;
@@ -98,6 +107,7 @@ struct ioat_dma_chan {
                        u32 high;
                };
        } *completion_virt;
+       struct tasklet_struct cleanup_task;
 };
 
 /* wrapper around hardware descriptor format + additional software fields */
@@ -105,21 +115,31 @@ struct ioat_dma_chan {
 /**
  * struct ioat_desc_sw - wrapper around hardware descriptor
  * @hw: hardware DMA descriptor
- * @node:
- * @cookie:
- * @phys:
+ * @node: this descriptor will either be on the free list,
+ *     or attached to a transaction list (async_tx.tx_list)
+ * @tx_cnt: number of descriptors required to complete the transaction
+ * @async_tx: the generic software descriptor for all engines
  */
-
 struct ioat_desc_sw {
        struct ioat_dma_descriptor *hw;
        struct list_head node;
-       dma_cookie_t cookie;
-       dma_addr_t phys;
-       DECLARE_PCI_UNMAP_ADDR(src)
-       DECLARE_PCI_UNMAP_LEN(src_len)
-       DECLARE_PCI_UNMAP_ADDR(dst)
-       DECLARE_PCI_UNMAP_LEN(dst_len)
+       int tx_cnt;
+       size_t len;
+       dma_addr_t src;
+       dma_addr_t dst;
+       struct dma_async_tx_descriptor async_tx;
 };
 
-#endif /* IOATDMA_H */
+#if defined(CONFIG_INTEL_IOATDMA) || defined(CONFIG_INTEL_IOATDMA_MODULE)
+struct ioatdma_device *ioat_dma_probe(struct pci_dev *pdev,
+                                     void __iomem *iobase);
+void ioat_dma_remove(struct ioatdma_device *device);
+struct dca_provider *ioat_dca_init(struct pci_dev *pdev,
+                                  void __iomem *iobase);
+#else
+#define ioat_dma_probe(pdev, iobase)    NULL
+#define ioat_dma_remove(device)         do { } while (0)
+#define ioat_dca_init(pdev, iobase)    NULL
+#endif
 
+#endif /* IOATDMA_H */