macb: allow GEM to have configurable receive buffer size

GEM has configurable receive buffer sizes so requires this to be
programmed up.  Any size < 2048 and a multiple of 64 bytes is permitted.

Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Tested-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 38f1932013d1f5d709f731f99f4d41dfb3016de4..64d61461bdc78b65cac6d8995475909fbdd0bd98 100644 (file)
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -856,6 +856,21 @@ static u32 macb_dbw(struct macb *bp)
        }
 }
 
        }
 }
 

+/*
+ * Configure the receive DMA engine to use the correct receive buffer size.
+ * This is a configurable parameter for GEM.
+ */
+static void macb_configure_dma(struct macb *bp)
+{
+       u32 dmacfg;
+
+       if (macb_is_gem(bp)) {
+               dmacfg = gem_readl(bp, DMACFG) & ~GEM_BF(RXBS, -1L);
+               dmacfg |= GEM_BF(RXBS, RX_BUFFER_SIZE / 64);
+               gem_writel(bp, DMACFG, dmacfg);
+       }
+}
+

 static void macb_init_hw(struct macb *bp)
 {
        u32 config;
 static void macb_init_hw(struct macb *bp)
 {
        u32 config;


@@ -874,6 +889,8 @@ static void macb_init_hw(struct macb *bp)
        config |= macb_dbw(bp);
        macb_writel(bp, NCFGR, config);
 
        config |= macb_dbw(bp);
        macb_writel(bp, NCFGR, config);
 

+       macb_configure_dma(bp);
+

        /* Initialize TX and RX buffers */
        macb_writel(bp, RBQP, bp->rx_ring_dma);
        macb_writel(bp, TBQP, bp->tx_ring_dma);
        /* Initialize TX and RX buffers */
        macb_writel(bp, RBQP, bp->rx_ring_dma);
        macb_writel(bp, TBQP, bp->tx_ring_dma);

diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index 71424aae9c50c13b30de3facac0cb1490227e79d..193107884a5af4c2e2d7eb1a787d557f5fb2aa67 100644 (file)
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -64,6 +64,7 @@
 /* GEM register offsets. */
 #define GEM_NCFGR                              0x0004
 #define GEM_USRIO                              0x000c
 /* GEM register offsets. */
 #define GEM_NCFGR                              0x0004
 #define GEM_USRIO                              0x000c

+#define GEM_DMACFG                             0x0010

 #define GEM_HRB                                        0x0080
 #define GEM_HRT                                        0x0084
 #define GEM_SA1B                               0x0088
 #define GEM_HRB                                        0x0080
 #define GEM_HRT                                        0x0084
 #define GEM_SA1B                               0x0088


@@ -154,6 +155,10 @@
 #define GEM_DBW64                              1
 #define GEM_DBW128                             2
 
 #define GEM_DBW64                              1
 #define GEM_DBW128                             2
 

+/* Bitfields in DMACFG. */
+#define GEM_RXBS_OFFSET                                16
+#define GEM_RXBS_SIZE                          8
+

 /* Bitfields in NSR */
 #define MACB_NSR_LINK_OFFSET                   0
 #define MACB_NSR_LINK_SIZE                     1
 /* Bitfields in NSR */
 #define MACB_NSR_LINK_OFFSET                   0
 #define MACB_NSR_LINK_SIZE                     1