Skip to content

Commit 9eb3a95

Browse files
khayash1mehmetb0
authored andcommitted
net: stmmac: Limit the number of MTL queues to hardware capability
BugLink: https://bugs.launchpad.net/bugs/2103829 [ Upstream commit f5fb35a3d6b36d378b2e2ecbfb9caa337d5428e6 ] 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]> Signed-off-by: Noah Wager <[email protected]> Signed-off-by: Mehmet Basaran <[email protected]>
1 parent 0245ed5 commit 9eb3a95

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
@@ -7274,6 +7274,21 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
72747274
if (priv->dma_cap.tsoen)
72757275
dev_info(priv->device, "TSO supported\n");
72767276

7277+
if (priv->dma_cap.number_rx_queues &&
7278+
priv->plat->rx_queues_to_use > priv->dma_cap.number_rx_queues) {
7279+
dev_warn(priv->device,
7280+
"Number of Rx queues (%u) exceeds dma capability\n",
7281+
priv->plat->rx_queues_to_use);
7282+
priv->plat->rx_queues_to_use = priv->dma_cap.number_rx_queues;
7283+
}
7284+
if (priv->dma_cap.number_tx_queues &&
7285+
priv->plat->tx_queues_to_use > priv->dma_cap.number_tx_queues) {
7286+
dev_warn(priv->device,
7287+
"Number of Tx queues (%u) exceeds dma capability\n",
7288+
priv->plat->tx_queues_to_use);
7289+
priv->plat->tx_queues_to_use = priv->dma_cap.number_tx_queues;
7290+
}
7291+
72777292
priv->hw->vlan_fail_q_en =
72787293
(priv->plat->flags & STMMAC_FLAG_VLAN_FAIL_Q_EN);
72797294
priv->hw->vlan_fail_q = priv->plat->vlan_fail_q;

0 commit comments

Comments
 (0)