[PATCH] bcm43xx: add functions bcm43xx_dma_read/write, bcm43xx_dma_tx_suspend/resume.

Signed-off-by: Michael Buesch <mbuesch@freenet.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 51 insertions, 28 deletions

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
index 0cd29284795..fbe19b922aa 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
@@ -374,13 +374,11 @@ static int dmacontroller_setup(struct bcm43xx_dmaring *ring)
 
 	if (ring->tx) {
 		/* Set Transmit Control register to "transmit enable" */
-		bcm43xx_write32(ring->bcm,
-				ring->mmio_base + BCM43xx_DMA_TX_CONTROL,
-				BCM43xx_DMA_TXCTRL_ENABLE);
+		bcm43xx_dma_write(ring, BCM43xx_DMA_TX_CONTROL,
+				  BCM43xx_DMA_TXCTRL_ENABLE);
 		/* Set Transmit Descriptor ring address. */
-		bcm43xx_write32(ring->bcm,
-				ring->mmio_base + BCM43xx_DMA_TX_DESC_RING,
-				ring->dmabase + ring->memoffset);
+		bcm43xx_dma_write(ring, BCM43xx_DMA_TX_DESC_RING,
+				  ring->dmabase + ring->memoffset);
 	} else {
 		err = alloc_initial_descbuffers(ring);
 		if (err)
@@ -388,17 +386,12 @@ static int dmacontroller_setup(struct bcm43xx_dmaring *ring)
 		/* Set Receive Control "receive enable" and frame offset */
 		value = (ring->frameoffset << BCM43xx_DMA_RXCTRL_FRAMEOFF_SHIFT);
 		value |= BCM43xx_DMA_RXCTRL_ENABLE;
-		bcm43xx_write32(ring->bcm,
-				ring->mmio_base + BCM43xx_DMA_RX_CONTROL,
-				value);
+		bcm43xx_dma_write(ring, BCM43xx_DMA_RX_CONTROL, value);
 		/* Set Receive Descriptor ring address. */
-		bcm43xx_write32(ring->bcm,
-				ring->mmio_base + BCM43xx_DMA_RX_DESC_RING,
-				ring->dmabase + ring->memoffset);
+		bcm43xx_dma_write(ring, BCM43xx_DMA_RX_DESC_RING,
+				  ring->dmabase + ring->memoffset);
 		/* Init the descriptor pointer. */
-		bcm43xx_write32(ring->bcm,
-				ring->mmio_base + BCM43xx_DMA_RX_DESC_INDEX,
-				200);
+		bcm43xx_dma_write(ring, BCM43xx_DMA_RX_DESC_INDEX, 200);
 	}
 
 out:
@@ -411,15 +404,11 @@ static void dmacontroller_cleanup(struct bcm43xx_dmaring *ring)
 	if (ring->tx) {
 		bcm43xx_dmacontroller_tx_reset(ring->bcm, ring->mmio_base);
 		/* Zero out Transmit Descriptor ring address. */
-		bcm43xx_write32(ring->bcm,
-				ring->mmio_base + BCM43xx_DMA_TX_DESC_RING,
-				0x00000000);
+		bcm43xx_dma_write(ring, BCM43xx_DMA_TX_DESC_RING, 0);
 	} else {
 		bcm43xx_dmacontroller_rx_reset(ring->bcm, ring->mmio_base);
 		/* Zero out Receive Descriptor ring address. */
-		bcm43xx_write32(ring->bcm,
-				ring->mmio_base + BCM43xx_DMA_RX_DESC_RING,
-				0x00000000);
+		bcm43xx_dma_write(ring, BCM43xx_DMA_RX_DESC_RING, 0);
 	}
 }
 
@@ -698,9 +687,8 @@ static void dmacontroller_poke_tx(struct bcm43xx_dmaring *ring,
 	 */
 	wmb();
 	slot = next_slot(ring, slot);
-	bcm43xx_write32(ring->bcm,
-			ring->mmio_base + BCM43xx_DMA_TX_DESC_INDEX,
-			(u32)(slot * sizeof(struct bcm43xx_dmadesc)));
+	bcm43xx_dma_write(ring, BCM43xx_DMA_TX_DESC_INDEX,
+			  (u32)(slot * sizeof(struct bcm43xx_dmadesc)));
 }
 
 static int dma_tx_fragment(struct bcm43xx_dmaring *ring,
@@ -940,7 +928,7 @@ void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring)
 #endif
 
 	assert(!ring->tx);
-	status = bcm43xx_read32(ring->bcm, ring->mmio_base + BCM43xx_DMA_RX_STATUS);
+	status = bcm43xx_dma_read(ring, BCM43xx_DMA_RX_STATUS);
 	descptr = (status & BCM43xx_DMA_RXSTAT_DPTR_MASK);
 	current_slot = descptr / sizeof(struct bcm43xx_dmadesc);
 	assert(current_slot >= 0 && current_slot < ring->nr_slots);
@@ -953,10 +941,27 @@ void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring)
 			ring->max_used_slots = used_slots;
 #endif
 	}
-	bcm43xx_write32(ring->bcm,
-			ring->mmio_base + BCM43xx_DMA_RX_DESC_INDEX,
-			(u32)(slot * sizeof(struct bcm43xx_dmadesc)));
+	bcm43xx_dma_write(ring, BCM43xx_DMA_RX_DESC_INDEX,
+			  (u32)(slot * sizeof(struct bcm43xx_dmadesc)));
 	ring->current_slot = slot;
 }
 
+void bcm43xx_dma_tx_suspend(struct bcm43xx_dmaring *ring)
+{
+	assert(ring->tx);
+	bcm43xx_power_saving_ctl_bits(ring->bcm, -1, 1);
+	bcm43xx_dma_write(ring, BCM43xx_DMA_TX_CONTROL,
+			  bcm43xx_dma_read(ring, BCM43xx_DMA_TX_CONTROL)
+			  | BCM43xx_DMA_TXCTRL_SUSPEND);
+}
+
+void bcm43xx_dma_tx_resume(struct bcm43xx_dmaring *ring)
+{
+	assert(ring->tx);
+	bcm43xx_dma_write(ring, BCM43xx_DMA_TX_CONTROL,
+			  bcm43xx_dma_read(ring, BCM43xx_DMA_TX_CONTROL)
+			  & ~BCM43xx_DMA_TXCTRL_SUSPEND);
+	bcm43xx_power_saving_ctl_bits(ring->bcm, -1, -1);
+}
+
 /* vim: set ts=8 sw=8 sts=8: */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.h b/drivers/net/wireless/bcm43xx/bcm43xx_dma.h
index c07e34689be..2d520e4b027 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_dma.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_dma.h
@@ -140,6 +140,21 @@ struct bcm43xx_dmaring {
 };
 
 
+static inline
+u32 bcm43xx_dma_read(struct bcm43xx_dmaring *ring,
+		     u16 offset)
+{
+	return bcm43xx_read32(ring->bcm, ring->mmio_base + offset);
+}
+
+static inline
+void bcm43xx_dma_write(struct bcm43xx_dmaring *ring,
+		       u16 offset, u32 value)
+{
+	bcm43xx_write32(ring->bcm, ring->mmio_base + offset, value);
+}
+
+
 int bcm43xx_dma_init(struct bcm43xx_private *bcm);
 void bcm43xx_dma_free(struct bcm43xx_private *bcm);
 
@@ -148,6 +163,9 @@ int bcm43xx_dmacontroller_rx_reset(struct bcm43xx_private *bcm,
 int bcm43xx_dmacontroller_tx_reset(struct bcm43xx_private *bcm,
 				   u16 dmacontroller_mmio_base);
 
+void bcm43xx_dma_tx_suspend(struct bcm43xx_dmaring *ring);
+void bcm43xx_dma_tx_resume(struct bcm43xx_dmaring *ring);
+
 void bcm43xx_dma_handle_xmitstatus(struct bcm43xx_private *bcm,
 				   struct bcm43xx_xmitstatus *status);