xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: stmmac: No need to calculate speed divider when offload is disabled

Browse Source 
[ Upstream commit b8c43360f6e424131fa81d3ba8792ad8ff25a09e ]

commit be27b8965297 ("net: stmmac: replace priv->speed with
the portTransmitRate from the tc-cbs parameters") introduced
a problem. When deleting, it prompts "Invalid portTransmitRate
0 (idleSlope - sendSlope)" and exits. Add judgment on cbs.enable.
Only when offload is enabled, speed divider needs to be calculated.

Fixes: be27b8965297 ("net: stmmac: replace priv->speed with the portTransmitRate from the tc-cbs parameters")
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20240617013922.1035854-1-xiaolei.wang@windriver.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Xiaolei Wang
2024-06-17 09:39:22 +08:00
committed by Greg Kroah-Hartman
parent 03f625505e
commit b4bca4722f
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
View File

@@ -325,24 +325,28 @@ static int tc_setup_cbs(struct stmmac_priv *priv,
port_transmit_rate_kbps = qopt->idleslope - qopt->sendslope; port_transmit_rate_kbps = qopt->idleslope - qopt->sendslope;
/* Port Transmit Rate and Speed Divider */ if (qopt->enable) {
switch (div_s64(port_transmit_rate_kbps, 1000)) { /* Port Transmit Rate and Speed Divider */
case SPEED_10000: switch (div_s64(port_transmit_rate_kbps, 1000)) {
case SPEED_5000: case SPEED_10000:
ptr = 32; case SPEED_5000:
break; ptr = 32;
case SPEED_2500: break;
case SPEED_1000: case SPEED_2500:
ptr = 8; case SPEED_1000:
break; ptr = 8;
case SPEED_100: break;
ptr = 4; case SPEED_100:
break; ptr = 4;
default: break;
netdev_err(priv->dev, default:
"Invalid portTransmitRate %lld (idleSlope - sendSlope)\n", netdev_err(priv->dev,
port_transmit_rate_kbps); "Invalid portTransmitRate %lld (idleSlope - sendSlope)\n",
return -EINVAL; port_transmit_rate_kbps);
return -EINVAL;
}
} else {
ptr = 0;
} }
mode_to_use = priv->plat->tx_queues_cfg[queue].mode_to_use; mode_to_use = priv->plat->tx_queues_cfg[queue].mode_to_use;