Commit 099b81bb authored by Kunihiko Hayashi's avatar Kunihiko Hayashi Committed by Wentao Guan
Browse files

net: stmmac: Limit FIFO size by hardware capability 

stable inclusion
from stable-v6.6.76
commit 6d3693d402a81043d6231fcb31e2bf6acb4cb4ef
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBW08Q

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=6d3693d402a81043d6231fcb31e2bf6acb4cb4ef



--------------------------------

[ Upstream commit 044f2fbaa2725696ecbf1f02ba7ab0a8ccb7e1ae ]

Tx/Rx FIFO size is specified by the parameter "{tx,rx}-fifo-depth" from
stmmac_platform layer.

However, these values are constrained by upper limits determined by the
capabilities of each hardware feature. There is a risk that the upper
bits will be truncated due to the calculation, so it's appropriate to
limit them to the upper limit values and display a warning message.

This only works if the hardware capability has the upper limit values.

Fixes: e7877f52 ("stmmac: Read tx-fifo-depth and rx-fifo-depth from the devicetree")
Signed-off-by: default avatarKunihiko Hayashi <hayashi.kunihiko@socionext.com>
Reviewed-by: default avatarYanteng Si <si.yanteng@linux.dev>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
(cherry picked from commit 6d3693d402a81043d6231fcb31e2bf6acb4cb4ef)
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent a28a279e

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

+15 −0
Original line number Diff line number Diff line
@@ -7135,6 +7135,21 @@ static int stmmac_hw_init(struct stmmac_priv *priv) 
		priv->plat->tx_queues_to_use = priv->dma_cap.number_tx_queues;

	}



	if (priv->dma_cap.rx_fifo_size &&

	    priv->plat->rx_fifo_size > priv->dma_cap.rx_fifo_size) {

		dev_warn(priv->device,

			 "Rx FIFO size (%u) exceeds dma capability\n",

			 priv->plat->rx_fifo_size);

		priv->plat->rx_fifo_size = priv->dma_cap.rx_fifo_size;

	}

	if (priv->dma_cap.tx_fifo_size &&

	    priv->plat->tx_fifo_size > priv->dma_cap.tx_fifo_size) {

		dev_warn(priv->device,

			 "Tx FIFO size (%u) exceeds dma capability\n",

			 priv->plat->tx_fifo_size);

		priv->plat->tx_fifo_size = priv->dma_cap.tx_fifo_size;

	}



	priv->hw->vlan_fail_q_en =

		(priv->plat->flags & STMMAC_FLAG_VLAN_FAIL_Q_EN);

	priv->hw->vlan_fail_q = priv->plat->vlan_fail_q;