Skip to content

Commit 80083bd

Browse files
khayash1gregkh
authored andcommitted
net: stmmac: Limit the number of MTL queues to hardware capability
[ Upstream commit f5fb35a ] The number of MTL queues to use is specified by the parameter "snps,{tx,rx}-queues-to-use" from stmmac_platform layer. However, the maximum numbers of queues are constrained by upper limits determined by the capability of each hardware feature. It's appropriate to limit the values not to exceed the upper limit values and display a warning message. This only works if the hardware capability has the upper limit values. Fixes: d976a52 ("net: stmmac: multiple queues dt configuration") Signed-off-by: Kunihiko Hayashi <[email protected]> Reviewed-by: Yanteng Si <[email protected]> Signed-off-by: Paolo Abeni <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 2a6d1e1 commit 80083bd

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7103,6 +7103,21 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
71037103
if (priv->dma_cap.tsoen)
71047104
dev_info(priv->device, "TSO supported\n");
71057105

7106+
if (priv->dma_cap.number_rx_queues &&
7107+
priv->plat->rx_queues_to_use > priv->dma_cap.number_rx_queues) {
7108+
dev_warn(priv->device,
7109+
"Number of Rx queues (%u) exceeds dma capability\n",
7110+
priv->plat->rx_queues_to_use);
7111+
priv->plat->rx_queues_to_use = priv->dma_cap.number_rx_queues;
7112+
}
7113+
if (priv->dma_cap.number_tx_queues &&
7114+
priv->plat->tx_queues_to_use > priv->dma_cap.number_tx_queues) {
7115+
dev_warn(priv->device,
7116+
"Number of Tx queues (%u) exceeds dma capability\n",
7117+
priv->plat->tx_queues_to_use);
7118+
priv->plat->tx_queues_to_use = priv->dma_cap.number_tx_queues;
7119+
}
7120+
71067121
priv->hw->vlan_fail_q_en =
71077122
(priv->plat->flags & STMMAC_FLAG_VLAN_FAIL_Q_EN);
71087123
priv->hw->vlan_fail_q = priv->plat->vlan_fail_q;

0 commit comments

Comments
 (0)