1 files changed, 219 insertions, 77 deletions

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.h b/drivers/net/wireless/bcm43xx/bcm43xx_dma.h
index b7d77638ba8c..e04bcaddd1d0 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_dma.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_dma.h
@@ -14,63 +14,179 @@
 #define BCM43xx_DMAIRQ_NONFATALMASK     (1 << 13)
 #define BCM43xx_DMAIRQ_RX_DONE          (1 << 16)
 
-/* DMA controller register offsets. (relative to BCM43xx_DMA#_BASE) */
-#define BCM43xx_DMA_TX_CONTROL          0x00
-#define BCM43xx_DMA_TX_DESC_RING        0x04
-#define BCM43xx_DMA_TX_DESC_INDEX       0x08
-#define BCM43xx_DMA_TX_STATUS           0x0c
-#define BCM43xx_DMA_RX_CONTROL          0x10
-#define BCM43xx_DMA_RX_DESC_RING        0x14
-#define BCM43xx_DMA_RX_DESC_INDEX       0x18
-#define BCM43xx_DMA_RX_STATUS           0x1c
-
-/* DMA controller channel control word values. */
-#define BCM43xx_DMA_TXCTRL_ENABLE               (1 << 0)
-#define BCM43xx_DMA_TXCTRL_SUSPEND              (1 << 1)
-#define BCM43xx_DMA_TXCTRL_LOOPBACK             (1 << 2)
-#define BCM43xx_DMA_TXCTRL_FLUSH                (1 << 4)
-#define BCM43xx_DMA_RXCTRL_ENABLE               (1 << 0)
-#define BCM43xx_DMA_RXCTRL_FRAMEOFF_MASK        0x000000fe
-#define BCM43xx_DMA_RXCTRL_FRAMEOFF_SHIFT       1
-#define BCM43xx_DMA_RXCTRL_PIO                  (1 << 8)
-/* DMA controller channel status word values. */
-#define BCM43xx_DMA_TXSTAT_DPTR_MASK            0x00000fff
-#define BCM43xx_DMA_TXSTAT_STAT_MASK            0x0000f000
-#define BCM43xx_DMA_TXSTAT_STAT_DISABLED        0x00000000
-#define BCM43xx_DMA_TXSTAT_STAT_ACTIVE          0x00001000
-#define BCM43xx_DMA_TXSTAT_STAT_IDLEWAIT        0x00002000
-#define BCM43xx_DMA_TXSTAT_STAT_STOPPED         0x00003000
-#define BCM43xx_DMA_TXSTAT_STAT_SUSP            0x00004000
-#define BCM43xx_DMA_TXSTAT_ERROR_MASK           0x000f0000
-#define BCM43xx_DMA_TXSTAT_FLUSHED              (1 << 20)
-#define BCM43xx_DMA_RXSTAT_DPTR_MASK            0x00000fff
-#define BCM43xx_DMA_RXSTAT_STAT_MASK            0x0000f000
-#define BCM43xx_DMA_RXSTAT_STAT_DISABLED        0x00000000
-#define BCM43xx_DMA_RXSTAT_STAT_ACTIVE          0x00001000
-#define BCM43xx_DMA_RXSTAT_STAT_IDLEWAIT        0x00002000
-#define BCM43xx_DMA_RXSTAT_STAT_RESERVED        0x00003000
-#define BCM43xx_DMA_RXSTAT_STAT_ERRORS          0x00004000
-#define BCM43xx_DMA_RXSTAT_ERROR_MASK           0x000f0000
-
-/* DMA descriptor control field values. */
-#define BCM43xx_DMADTOR_BYTECNT_MASK            0x00001fff
-#define BCM43xx_DMADTOR_DTABLEEND               (1 << 28) /* End of descriptor table */
-#define BCM43xx_DMADTOR_COMPIRQ                 (1 << 29) /* IRQ on completion request */
-#define BCM43xx_DMADTOR_FRAMEEND                (1 << 30)
-#define BCM43xx_DMADTOR_FRAMESTART              (1 << 31)
+
+/*** 32-bit DMA Engine. ***/
+
+/* 32-bit DMA controller registers. */
+#define BCM43xx_DMA32_TXCTL                             0x00
+#define         BCM43xx_DMA32_TXENABLE                  0x00000001
+#define         BCM43xx_DMA32_TXSUSPEND                 0x00000002
+#define         BCM43xx_DMA32_TXLOOPBACK                0x00000004
+#define         BCM43xx_DMA32_TXFLUSH                   0x00000010
+#define         BCM43xx_DMA32_TXADDREXT_MASK            0x00030000
+#define         BCM43xx_DMA32_TXADDREXT_SHIFT           16
+#define BCM43xx_DMA32_TXRING                            0x04
+#define BCM43xx_DMA32_TXINDEX                           0x08
+#define BCM43xx_DMA32_TXSTATUS                          0x0C
+#define         BCM43xx_DMA32_TXDPTR                    0x00000FFF
+#define         BCM43xx_DMA32_TXSTATE                   0x0000F000
+#define                 BCM43xx_DMA32_TXSTAT_DISABLED   0x00000000
+#define                 BCM43xx_DMA32_TXSTAT_ACTIVE     0x00001000
+#define                 BCM43xx_DMA32_TXSTAT_IDLEWAIT   0x00002000
+#define                 BCM43xx_DMA32_TXSTAT_STOPPED    0x00003000
+#define                 BCM43xx_DMA32_TXSTAT_SUSP       0x00004000
+#define         BCM43xx_DMA32_TXERROR                   0x000F0000
+#define                 BCM43xx_DMA32_TXERR_NOERR       0x00000000
+#define                 BCM43xx_DMA32_TXERR_PROT        0x00010000
+#define                 BCM43xx_DMA32_TXERR_UNDERRUN    0x00020000
+#define                 BCM43xx_DMA32_TXERR_BUFREAD     0x00030000
+#define                 BCM43xx_DMA32_TXERR_DESCREAD    0x00040000
+#define         BCM43xx_DMA32_TXACTIVE                  0xFFF00000
+#define BCM43xx_DMA32_RXCTL                             0x10
+#define         BCM43xx_DMA32_RXENABLE                  0x00000001
+#define         BCM43xx_DMA32_RXFROFF_MASK              0x000000FE
+#define         BCM43xx_DMA32_RXFROFF_SHIFT             1
+#define         BCM43xx_DMA32_RXDIRECTFIFO              0x00000100
+#define         BCM43xx_DMA32_RXADDREXT_MASK            0x00030000
+#define         BCM43xx_DMA32_RXADDREXT_SHIFT           16
+#define BCM43xx_DMA32_RXRING                            0x14
+#define BCM43xx_DMA32_RXINDEX                           0x18
+#define BCM43xx_DMA32_RXSTATUS                          0x1C
+#define         BCM43xx_DMA32_RXDPTR                    0x00000FFF
+#define         BCM43xx_DMA32_RXSTATE                   0x0000F000
+#define                 BCM43xx_DMA32_RXSTAT_DISABLED   0x00000000
+#define                 BCM43xx_DMA32_RXSTAT_ACTIVE     0x00001000
+#define                 BCM43xx_DMA32_RXSTAT_IDLEWAIT   0x00002000
+#define                 BCM43xx_DMA32_RXSTAT_STOPPED    0x00003000
+#define         BCM43xx_DMA32_RXERROR                   0x000F0000
+#define                 BCM43xx_DMA32_RXERR_NOERR       0x00000000
+#define                 BCM43xx_DMA32_RXERR_PROT        0x00010000
+#define                 BCM43xx_DMA32_RXERR_OVERFLOW    0x00020000
+#define                 BCM43xx_DMA32_RXERR_BUFWRITE    0x00030000
+#define                 BCM43xx_DMA32_RXERR_DESCREAD    0x00040000
+#define         BCM43xx_DMA32_RXACTIVE                  0xFFF00000
+
+/* 32-bit DMA descriptor. */
+struct bcm43xx_dmadesc32 {
+        __le32 control;
+        __le32 address;
+} __attribute__((__packed__));
+#define BCM43xx_DMA32_DCTL_BYTECNT              0x00001FFF
+#define BCM43xx_DMA32_DCTL_ADDREXT_MASK         0x00030000
+#define BCM43xx_DMA32_DCTL_ADDREXT_SHIFT        16
+#define BCM43xx_DMA32_DCTL_DTABLEEND            0x10000000
+#define BCM43xx_DMA32_DCTL_IRQ                  0x20000000
+#define BCM43xx_DMA32_DCTL_FRAMEEND             0x40000000
+#define BCM43xx_DMA32_DCTL_FRAMESTART           0x80000000
+
+/* Address field Routing value. */
+#define BCM43xx_DMA32_ROUTING                   0xC0000000
+#define BCM43xx_DMA32_ROUTING_SHIFT             30
+#define         BCM43xx_DMA32_NOTRANS           0x00000000
+#define         BCM43xx_DMA32_CLIENTTRANS       0x40000000
+
+
+
+/*** 64-bit DMA Engine. ***/
+
+/* 64-bit DMA controller registers. */
+#define BCM43xx_DMA64_TXCTL                             0x00
+#define         BCM43xx_DMA64_TXENABLE                  0x00000001
+#define         BCM43xx_DMA64_TXSUSPEND                 0x00000002
+#define         BCM43xx_DMA64_TXLOOPBACK                0x00000004
+#define         BCM43xx_DMA64_TXFLUSH                   0x00000010
+#define         BCM43xx_DMA64_TXADDREXT_MASK            0x00030000
+#define         BCM43xx_DMA64_TXADDREXT_SHIFT           16
+#define BCM43xx_DMA64_TXINDEX                           0x04
+#define BCM43xx_DMA64_TXRINGLO                          0x08
+#define BCM43xx_DMA64_TXRINGHI                          0x0C
+#define BCM43xx_DMA64_TXSTATUS                          0x10
+#define         BCM43xx_DMA64_TXSTATDPTR                0x00001FFF
+#define         BCM43xx_DMA64_TXSTAT                    0xF0000000
+#define                 BCM43xx_DMA64_TXSTAT_DISABLED   0x00000000
+#define                 BCM43xx_DMA64_TXSTAT_ACTIVE     0x10000000
+#define                 BCM43xx_DMA64_TXSTAT_IDLEWAIT   0x20000000
+#define                 BCM43xx_DMA64_TXSTAT_STOPPED    0x30000000
+#define                 BCM43xx_DMA64_TXSTAT_SUSP       0x40000000
+#define BCM43xx_DMA64_TXERROR                           0x14
+#define         BCM43xx_DMA64_TXERRDPTR                 0x0001FFFF
+#define         BCM43xx_DMA64_TXERR                     0xF0000000
+#define                 BCM43xx_DMA64_TXERR_NOERR       0x00000000
+#define                 BCM43xx_DMA64_TXERR_PROT        0x10000000
+#define                 BCM43xx_DMA64_TXERR_UNDERRUN    0x20000000
+#define                 BCM43xx_DMA64_TXERR_TRANSFER    0x30000000
+#define                 BCM43xx_DMA64_TXERR_DESCREAD    0x40000000
+#define                 BCM43xx_DMA64_TXERR_CORE        0x50000000
+#define BCM43xx_DMA64_RXCTL                             0x20
+#define         BCM43xx_DMA64_RXENABLE                  0x00000001
+#define         BCM43xx_DMA64_RXFROFF_MASK              0x000000FE
+#define         BCM43xx_DMA64_RXFROFF_SHIFT             1
+#define         BCM43xx_DMA64_RXDIRECTFIFO              0x00000100
+#define         BCM43xx_DMA64_RXADDREXT_MASK            0x00030000
+#define         BCM43xx_DMA64_RXADDREXT_SHIFT           16
+#define BCM43xx_DMA64_RXINDEX                           0x24
+#define BCM43xx_DMA64_RXRINGLO                          0x28
+#define BCM43xx_DMA64_RXRINGHI                          0x2C
+#define BCM43xx_DMA64_RXSTATUS                          0x30
+#define         BCM43xx_DMA64_RXSTATDPTR                0x00001FFF
+#define         BCM43xx_DMA64_RXSTAT                    0xF0000000
+#define                 BCM43xx_DMA64_RXSTAT_DISABLED   0x00000000
+#define                 BCM43xx_DMA64_RXSTAT_ACTIVE     0x10000000
+#define                 BCM43xx_DMA64_RXSTAT_IDLEWAIT   0x20000000
+#define                 BCM43xx_DMA64_RXSTAT_STOPPED    0x30000000
+#define                 BCM43xx_DMA64_RXSTAT_SUSP       0x40000000
+#define BCM43xx_DMA64_RXERROR                           0x34
+#define         BCM43xx_DMA64_RXERRDPTR                 0x0001FFFF
+#define         BCM43xx_DMA64_RXERR                     0xF0000000
+#define                 BCM43xx_DMA64_RXERR_NOERR       0x00000000
+#define                 BCM43xx_DMA64_RXERR_PROT        0x10000000
+#define                 BCM43xx_DMA64_RXERR_UNDERRUN    0x20000000
+#define                 BCM43xx_DMA64_RXERR_TRANSFER    0x30000000
+#define                 BCM43xx_DMA64_RXERR_DESCREAD    0x40000000
+#define                 BCM43xx_DMA64_RXERR_CORE        0x50000000
+
+/* 64-bit DMA descriptor. */
+struct bcm43xx_dmadesc64 {
+        __le32 control0;
+        __le32 control1;
+        __le32 address_low;
+        __le32 address_high;
+} __attribute__((__packed__));
+#define BCM43xx_DMA64_DCTL0_DTABLEEND           0x10000000
+#define BCM43xx_DMA64_DCTL0_IRQ                 0x20000000
+#define BCM43xx_DMA64_DCTL0_FRAMEEND            0x40000000
+#define BCM43xx_DMA64_DCTL0_FRAMESTART          0x80000000
+#define BCM43xx_DMA64_DCTL1_BYTECNT             0x00001FFF
+#define BCM43xx_DMA64_DCTL1_ADDREXT_MASK        0x00030000
+#define BCM43xx_DMA64_DCTL1_ADDREXT_SHIFT       16
+
+/* Address field Routing value. */
+#define BCM43xx_DMA64_ROUTING                   0xC0000000
+#define BCM43xx_DMA64_ROUTING_SHIFT             30
+#define         BCM43xx_DMA64_NOTRANS           0x00000000
+#define         BCM43xx_DMA64_CLIENTTRANS       0x80000000
+
+
+
+struct bcm43xx_dmadesc_generic {
+        union {
+                struct bcm43xx_dmadesc32 dma32;
+                struct bcm43xx_dmadesc64 dma64;
+        } __attribute__((__packed__));
+} __attribute__((__packed__));
+
 
 /* Misc DMA constants */
 #define BCM43xx_DMA_RINGMEMSIZE         PAGE_SIZE
-#define BCM43xx_DMA_BUSADDRMAX          0x3FFFFFFF
-#define BCM43xx_DMA_DMABUSADDROFFSET    (1 << 30)
-#define BCM43xx_DMA1_RX_FRAMEOFFSET     30
-#define BCM43xx_DMA4_RX_FRAMEOFFSET     0
+#define BCM43xx_DMA0_RX_FRAMEOFFSET     30
+#define BCM43xx_DMA3_RX_FRAMEOFFSET     0
+
 
 /* DMA engine tuning knobs */
 #define BCM43xx_TXRING_SLOTS            512
 #define BCM43xx_RXRING_SLOTS            64
-#define BCM43xx_DMA1_RXBUFFERSIZE       (2304 + 100)
-#define BCM43xx_DMA4_RXBUFFERSIZE       16
+#define BCM43xx_DMA0_RX_BUFFERSIZE      (2304 + 100)
+#define BCM43xx_DMA3_RX_BUFFERSIZE      16
 /* Suspend the tx queue, if less than this percent slots are free. */
 #define BCM43xx_TXSUSPEND_PERCENT       20
 /* Resume the tx queue, if more than this percent slots are free. */
@@ -86,17 +202,6 @@ struct bcm43xx_private;
 struct bcm43xx_xmitstatus;
 
 
-struct bcm43xx_dmadesc {
-        __le32 _control;
-        __le32 _address;
-} __attribute__((__packed__));
-
-/* Macros to access the bcm43xx_dmadesc struct */
-#define get_desc_ctl(desc)              le32_to_cpu((desc)->_control)
-#define set_desc_ctl(desc, ctl)         do { (desc)->_control = cpu_to_le32(ctl); } while (0)
-#define get_desc_addr(desc)             le32_to_cpu((desc)->_address)
-#define set_desc_addr(desc, addr)       do { (desc)->_address = cpu_to_le32(addr); } while (0)
-
 struct bcm43xx_dmadesc_meta {
         /* The kernel DMA-able buffer. */
         struct sk_buff *skb;
@@ -105,15 +210,14 @@ struct bcm43xx_dmadesc_meta {
 };
 
 struct bcm43xx_dmaring {
-        struct bcm43xx_private *bcm;
         /* Kernel virtual base address of the ring memory. */
-        struct bcm43xx_dmadesc *vbase;
-        /* DMA memory offset */
-        dma_addr_t memoffset;
-        /* (Unadjusted) DMA base bus-address of the ring memory. */
-        dma_addr_t dmabase;
+        void *descbase;
         /* Meta data about all descriptors. */
         struct bcm43xx_dmadesc_meta *meta;
+        /* DMA Routing value. */
+        u32 routing;
+        /* (Unadjusted) DMA base bus-address of the ring memory. */
+        dma_addr_t dmabase;
         /* Number of descriptor slots in the ring. */
         int nr_slots;
         /* Number of used descriptor slots. */
@@ -127,12 +231,17 @@ struct bcm43xx_dmaring {
         u32 frameoffset;
         /* Descriptor buffer size. */
         u16 rx_buffersize;
-        /* The MMIO base register of the DMA controller, this
-         * ring is posted to.
-         */
+        /* The MMIO base register of the DMA controller. */
         u16 mmio_base;
-        u8 tx:1,        /* TRUE, if this is a TX ring. */
-           suspended:1; /* TRUE, if transfers are suspended on this ring. */
+        /* DMA controller index number (0-5). */
+        int index;
+        /* Boolean. Is this a TX ring? */
+        u8 tx;
+        /* Boolean. 64bit DMA if true, 32bit DMA otherwise. */
+        u8 dma64;
+        /* Boolean. Are transfers suspended on this ring? */
+        u8 suspended;
+        struct bcm43xx_private *bcm;
 #ifdef CONFIG_BCM43XX_DEBUG
         /* Maximum number of used slots. */
         int max_used_slots;
@@ -141,6 +250,34 @@ struct bcm43xx_dmaring {
 
 
 static inline
+int bcm43xx_dma_desc2idx(struct bcm43xx_dmaring *ring,
+                         struct bcm43xx_dmadesc_generic *desc)
+{
+        if (ring->dma64) {
+                struct bcm43xx_dmadesc64 *dd64 = ring->descbase;
+                return (int)(&(desc->dma64) - dd64);
+        } else {
+                struct bcm43xx_dmadesc32 *dd32 = ring->descbase;
+                return (int)(&(desc->dma32) - dd32);
+        }
+}
+
+static inline
+struct bcm43xx_dmadesc_generic * bcm43xx_dma_idx2desc(struct bcm43xx_dmaring *ring,
+                                                      int slot,
+                                                      struct bcm43xx_dmadesc_meta **meta)
+{
+        *meta = &(ring->meta[slot]);
+        if (ring->dma64) {
+                struct bcm43xx_dmadesc64 *dd64 = ring->descbase;
+                return (struct bcm43xx_dmadesc_generic *)(&(dd64[slot]));
+        } else {
+                struct bcm43xx_dmadesc32 *dd32 = ring->descbase;
+                return (struct bcm43xx_dmadesc_generic *)(&(dd32[slot]));
+        }
+}
+
+static inline
 u32 bcm43xx_dma_read(struct bcm43xx_dmaring *ring,
                      u16 offset)
 {
@@ -159,9 +296,13 @@ int bcm43xx_dma_init(struct bcm43xx_private *bcm);
 void bcm43xx_dma_free(struct bcm43xx_private *bcm);
 
 int bcm43xx_dmacontroller_rx_reset(struct bcm43xx_private *bcm,
-                                   u16 dmacontroller_mmio_base);
+                                   u16 dmacontroller_mmio_base,
+                                   int dma64);
 int bcm43xx_dmacontroller_tx_reset(struct bcm43xx_private *bcm,
-                                   u16 dmacontroller_mmio_base);
+                                   u16 dmacontroller_mmio_base,
+                                   int dma64);
+
+u16 bcm43xx_dmacontroller_base(int dma64bit, int dmacontroller_idx);
 
 void bcm43xx_dma_tx_suspend(struct bcm43xx_dmaring *ring);
 void bcm43xx_dma_tx_resume(struct bcm43xx_dmaring *ring);
@@ -173,7 +314,6 @@ int bcm43xx_dma_tx(struct bcm43xx_private *bcm,
                    struct ieee80211_txb *txb);
 void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring);
 
-
 #else /* CONFIG_BCM43XX_DMA */
 
 
@@ -188,13 +328,15 @@ void bcm43xx_dma_free(struct bcm43xx_private *bcm)
 }
 static inline
 int bcm43xx_dmacontroller_rx_reset(struct bcm43xx_private *bcm,
-                                   u16 dmacontroller_mmio_base)
+                                   u16 dmacontroller_mmio_base,
+                                   int dma64)
 {
         return 0;
 }
 static inline
 int bcm43xx_dmacontroller_tx_reset(struct bcm43xx_private *bcm,
-                                   u16 dmacontroller_mmio_base)
+                                   u16 dmacontroller_mmio_base,
+                                   int dma64)
 {
         return 0;
 }