From: Yan Markman <ymark...@marvell.com>

This patch sets the Tx FIFO data size on port 0 to 10kB. This prepares
the PPv2 driver for the Jumbo frame support addition as the hardware
will need big enough Tx FIFO buffers when dealing with frames going
through an interface with an MTU of 9000.

Signed-off-by: Yan Markman <ymark...@marvell.com>
[Antoine: commit message, small reworks.]
Signed-off-by: Antoine Tenart <antoine.ten...@bootlin.com>
---
 drivers/net/ethernet/marvell/mvpp2.c | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/marvell/mvpp2.c 
b/drivers/net/ethernet/marvell/mvpp2.c
index db511dd4249d..39635de51dd7 100644
--- a/drivers/net/ethernet/marvell/mvpp2.c
+++ b/drivers/net/ethernet/marvell/mvpp2.c
@@ -44,6 +44,7 @@
 #define MVPP2_RX_ATTR_FIFO_SIZE_REG(port)      (0x20 + 4 * (port))
 #define MVPP2_RX_MIN_PKT_SIZE_REG              0x60
 #define MVPP2_RX_FIFO_INIT_REG                 0x64
+#define MVPP22_TX_FIFO_THRESH_REG(port)                (0x8840 + 4 * (port))
 #define MVPP22_TX_FIFO_SIZE_REG(port)          (0x8860 + 4 * (port))
 
 /* RX DMA Top Registers */
@@ -542,6 +543,11 @@
 /* TX FIFO constants */
 #define MVPP22_TX_FIFO_DATA_SIZE_10KB          0xa
 #define MVPP22_TX_FIFO_DATA_SIZE_3KB           0x3
+#define MVPP2_TX_FIFO_THRESHOLD_MIN            256
+#define MVPP2_TX_FIFO_THRESHOLD_10KB   \
+       (MVPP22_TX_FIFO_DATA_SIZE_10KB * 1024 - MVPP2_TX_FIFO_THRESHOLD_MIN)
+#define MVPP2_TX_FIFO_THRESHOLD_3KB    \
+       (MVPP22_TX_FIFO_DATA_SIZE_3KB * 1024 - MVPP2_TX_FIFO_THRESHOLD_MIN)
 
 /* RX buffer constants */
 #define MVPP2_SKB_SHINFO_SIZE \
@@ -8456,14 +8462,25 @@ static void mvpp22_rx_fifo_init(struct mvpp2 *priv)
        mvpp2_write(priv, MVPP2_RX_FIFO_INIT_REG, 0x1);
 }
 
-/* Initialize Tx FIFO's */
+/* Initialize Tx FIFO's
+ * The CP110's total tx-fifo size is 19kB.
+ * Use large-size 10kB for fast port but 3kB for others.
+ */
 static void mvpp22_tx_fifo_init(struct mvpp2 *priv)
 {
-       int port;
+       int port, size, thrs;
 
-       for (port = 0; port < MVPP2_MAX_PORTS; port++)
-               mvpp2_write(priv, MVPP22_TX_FIFO_SIZE_REG(port),
-                           MVPP22_TX_FIFO_DATA_SIZE_3KB);
+       for (port = 0; port < MVPP2_MAX_PORTS; port++) {
+               if (port == 0) {
+                       size = MVPP22_TX_FIFO_DATA_SIZE_10KB;
+                       thrs = MVPP2_TX_FIFO_THRESHOLD_10KB;
+               } else {
+                       size = MVPP22_TX_FIFO_DATA_SIZE_3KB;
+                       thrs = MVPP2_TX_FIFO_THRESHOLD_3KB;
+               }
+               mvpp2_write(priv, MVPP22_TX_FIFO_SIZE_REG(port), size);
+               mvpp2_write(priv, MVPP22_TX_FIFO_THRESH_REG(port), thrs);
+       }
 }
 
 static void mvpp2_axi_init(struct mvpp2 *priv)
-- 
2.14.3

Reply via email to