Skip to content

Commit f5fb35a

Browse files
khayash1Paolo Abeni
authored andcommitted
net: stmmac: Limit the number of MTL queues to hardware capability
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]>
1 parent 4f5a52a commit f5fb35a

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

7224+
if (priv->dma_cap.number_rx_queues &&
7225+
priv->plat->rx_queues_to_use > priv->dma_cap.number_rx_queues) {
7226+
dev_warn(priv->device,
7227+
"Number of Rx queues (%u) exceeds dma capability\n",
7228+
priv->plat->rx_queues_to_use);
7229+
priv->plat->rx_queues_to_use = priv->dma_cap.number_rx_queues;
7230+
}
7231+
if (priv->dma_cap.number_tx_queues &&
7232+
priv->plat->tx_queues_to_use > priv->dma_cap.number_tx_queues) {
7233+
dev_warn(priv->device,
7234+
"Number of Tx queues (%u) exceeds dma capability\n",
7235+
priv->plat->tx_queues_to_use);
7236+
priv->plat->tx_queues_to_use = priv->dma_cap.number_tx_queues;
7237+
}
7238+
72247239
priv->hw->vlan_fail_q_en =
72257240
(priv->plat->flags & STMMAC_FLAG_VLAN_FAIL_Q_EN);
72267241
priv->hw->vlan_fail_q = priv->plat->vlan_fail_q;

0 commit comments

Comments
 (0)