Skip to content

Commit aca0e23

Browse files
stefanchulskidavem330
authored andcommitted
net: mvpp2: add PPv23 RX FIFO flow control
New FIFO flow control feature was added in PPv23. PPv2 FIFO polled by HW and trigger pause frame if FIFO fill level is below threshold. FIFO HW flow control enabled with CM3 RXQ&BM flow control with ethtool. Current FIFO thresholds is: 9KB for port with maximum speed 10Gb/s port 4KB for port with maximum speed 5Gb/s port 2KB for port with maximum speed 1Gb/s port Signed-off-by: Stefan Chulski <[email protected]> Acked-by: Marcin Wojtas <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent eb30b26 commit aca0e23

File tree

2 files changed

+68
-0
lines changed

2 files changed

+68
-0
lines changed

drivers/net/ethernet/marvell/mvpp2/mvpp2.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -770,6 +770,18 @@
770770
#define MVPP2_TX_FIFO_THRESHOLD(kb) \
771771
((kb) * 1024 - MVPP2_TX_FIFO_THRESHOLD_MIN)
772772

773+
/* RX FIFO threshold in 1KB granularity */
774+
#define MVPP23_PORT0_FIFO_TRSH (9 * 1024)
775+
#define MVPP23_PORT1_FIFO_TRSH (4 * 1024)
776+
#define MVPP23_PORT2_FIFO_TRSH (2 * 1024)
777+
778+
/* RX Flow Control Registers */
779+
#define MVPP2_RX_FC_REG(port) (0x150 + 4 * (port))
780+
#define MVPP2_RX_FC_EN BIT(24)
781+
#define MVPP2_RX_FC_TRSH_OFFS 16
782+
#define MVPP2_RX_FC_TRSH_MASK (0xFF << MVPP2_RX_FC_TRSH_OFFS)
783+
#define MVPP2_RX_FC_TRSH_UNIT 256
784+
773785
/* MSS Flow control */
774786
#define MSS_FC_COM_REG 0
775787
#define FLOW_CONTROL_ENABLE_BIT BIT(0)
@@ -1498,6 +1510,8 @@ void mvpp2_dbgfs_init(struct mvpp2 *priv, const char *name);
14981510

14991511
void mvpp2_dbgfs_cleanup(struct mvpp2 *priv);
15001512

1513+
void mvpp23_rx_fifo_fc_en(struct mvpp2 *priv, int port, bool en);
1514+
15011515
#ifdef CONFIG_MVPP2_PTP
15021516
int mvpp22_tai_probe(struct device *dev, struct mvpp2 *priv);
15031517
void mvpp22_tai_tstamp(struct mvpp2_tai *tai, u32 tstamp,
@@ -1530,4 +1544,5 @@ static inline bool mvpp22_rx_hwtstamping(struct mvpp2_port *port)
15301544
{
15311545
return IS_ENABLED(CONFIG_MVPP2_PTP) && port->rx_hwtstamp;
15321546
}
1547+
15331548
#endif

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6537,6 +6537,8 @@ static void mvpp2_mac_link_up(struct phylink_config *config,
65376537
mvpp2_bm_pool_update_fc(port, port->pool_long, tx_pause);
65386538
mvpp2_bm_pool_update_fc(port, port->pool_short, tx_pause);
65396539
}
6540+
if (port->priv->hw_version == MVPP23)
6541+
mvpp23_rx_fifo_fc_en(port->priv, port->id, tx_pause);
65406542
}
65416543

65426544
mvpp2_port_enable(port);
@@ -7005,6 +7007,55 @@ static void mvpp22_rx_fifo_init(struct mvpp2 *priv)
70057007
mvpp2_write(priv, MVPP2_RX_FIFO_INIT_REG, 0x1);
70067008
}
70077009

7010+
/* Configure Rx FIFO Flow control thresholds */
7011+
static void mvpp23_rx_fifo_fc_set_tresh(struct mvpp2 *priv)
7012+
{
7013+
int port, val;
7014+
7015+
/* Port 0: maximum speed -10Gb/s port
7016+
* required by spec RX FIFO threshold 9KB
7017+
* Port 1: maximum speed -5Gb/s port
7018+
* required by spec RX FIFO threshold 4KB
7019+
* Port 2: maximum speed -1Gb/s port
7020+
* required by spec RX FIFO threshold 2KB
7021+
*/
7022+
7023+
/* Without loopback port */
7024+
for (port = 0; port < (MVPP2_MAX_PORTS - 1); port++) {
7025+
if (port == 0) {
7026+
val = (MVPP23_PORT0_FIFO_TRSH / MVPP2_RX_FC_TRSH_UNIT)
7027+
<< MVPP2_RX_FC_TRSH_OFFS;
7028+
val &= MVPP2_RX_FC_TRSH_MASK;
7029+
mvpp2_write(priv, MVPP2_RX_FC_REG(port), val);
7030+
} else if (port == 1) {
7031+
val = (MVPP23_PORT1_FIFO_TRSH / MVPP2_RX_FC_TRSH_UNIT)
7032+
<< MVPP2_RX_FC_TRSH_OFFS;
7033+
val &= MVPP2_RX_FC_TRSH_MASK;
7034+
mvpp2_write(priv, MVPP2_RX_FC_REG(port), val);
7035+
} else {
7036+
val = (MVPP23_PORT2_FIFO_TRSH / MVPP2_RX_FC_TRSH_UNIT)
7037+
<< MVPP2_RX_FC_TRSH_OFFS;
7038+
val &= MVPP2_RX_FC_TRSH_MASK;
7039+
mvpp2_write(priv, MVPP2_RX_FC_REG(port), val);
7040+
}
7041+
}
7042+
}
7043+
7044+
/* Configure Rx FIFO Flow control thresholds */
7045+
void mvpp23_rx_fifo_fc_en(struct mvpp2 *priv, int port, bool en)
7046+
{
7047+
int val;
7048+
7049+
val = mvpp2_read(priv, MVPP2_RX_FC_REG(port));
7050+
7051+
if (en)
7052+
val |= MVPP2_RX_FC_EN;
7053+
else
7054+
val &= ~MVPP2_RX_FC_EN;
7055+
7056+
mvpp2_write(priv, MVPP2_RX_FC_REG(port), val);
7057+
}
7058+
70087059
static void mvpp22_tx_fifo_set_hw(struct mvpp2 *priv, int port, int size)
70097060
{
70107061
int threshold = MVPP2_TX_FIFO_THRESHOLD(size);
@@ -7156,6 +7207,8 @@ static int mvpp2_init(struct platform_device *pdev, struct mvpp2 *priv)
71567207
} else {
71577208
mvpp22_rx_fifo_init(priv);
71587209
mvpp22_tx_fifo_init(priv);
7210+
if (priv->hw_version == MVPP23)
7211+
mvpp23_rx_fifo_fc_set_tresh(priv);
71597212
}
71607213

71617214
if (priv->hw_version == MVPP21)

0 commit comments

Comments
 (0)