diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h index 08b68441f9c8..120d01c04d61 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -440,6 +440,7 @@ static inline bool stmmac_xdp_is_enabled(struct stmmac_priv *priv) return !!priv->xdp_prog; } +void stmmac_configure_cbs(struct stmmac_priv *priv); void stmmac_disable_rx_queue(struct stmmac_priv *priv, u32 queue); void stmmac_enable_rx_queue(struct stmmac_priv *priv, u32 queue); void stmmac_disable_tx_queue(struct stmmac_priv *priv, u32 queue); diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index afd8f7a9f051..de2db188b45d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -3467,7 +3467,7 @@ static void stmmac_set_tx_queue_weight(struct stmmac_priv *priv) * @priv: driver private structure * Description: It is used for configuring CBS in AVB TX queues */ -static void stmmac_configure_cbs(struct stmmac_priv *priv) +void stmmac_configure_cbs(struct stmmac_priv *priv) { u8 tx_queues_count = priv->plat->tx_queues_to_use; u32 mode_to_use; @@ -7753,14 +7753,6 @@ int stmmac_reinit_queues(struct net_device *dev, u8 rx_cnt, u8 tx_cnt) tx_cnt < priv->xmit_qdisc.num_tx_queues) return -EINVAL; - if (priv->xmit_qdisc.prio_offload) { - for (i = priv->plat->tx_queues_to_use; i < tx_cnt; i++) { - if (priv->plat->tx_queues_cfg[i].mode_to_use == - MTL_QUEUE_AVB) - return -EINVAL; - } - } - if (netif_running(dev)) stmmac_release(dev); diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c index b09e9a89cee8..e137fb9012d4 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c @@ -346,9 +346,6 @@ static int tc_setup_cbs(struct stmmac_priv *priv, if (!priv->dma_cap.av) return -EOPNOTSUPP; - if (qopt->enable && priv->xmit_qdisc.prio_offload) - return -EOPNOTSUPP; - port_transmit_rate_kbps = qopt->idleslope - qopt->sendslope; if (qopt->enable) { @@ -1288,6 +1285,8 @@ static int stmmac_reset_tc_mqprio(struct net_device *ndev, stmmac_prog_mtl_tx_algorithms(priv, priv->hw, priv->plat->tx_sched_algorithm); + /* Re-configure AVB queues if necessary */ + stmmac_configure_cbs(priv); priv->xmit_qdisc.algo = priv->plat->tx_sched_algorithm; priv->xmit_qdisc.prio_offload = false; } @@ -1334,6 +1333,8 @@ static void tc_mqprio_config_queue_prio(struct stmmac_priv *priv, } stmmac_prog_mtl_tx_algorithms(priv, priv->hw, MTL_TX_ALGORITHM_SP); + /* Re-configure AVB queues if necessary */ + stmmac_configure_cbs(priv); priv->xmit_qdisc.algo = MTL_TX_ALGORITHM_SP; priv->xmit_qdisc.prio_offload = true; } @@ -1341,7 +1342,6 @@ static void tc_mqprio_config_queue_prio(struct stmmac_priv *priv, static int tc_mqprio_validate_chan_mode(struct stmmac_priv *priv, struct tc_mqprio_qopt_offload *mqprio) { - struct plat_stmmacenet_data *pdata = priv->plat; struct tc_mqprio_qopt *qopt = &mqprio->qopt; int i; @@ -1351,18 +1351,6 @@ static int tc_mqprio_validate_chan_mode(struct stmmac_priv *priv, return -EOPNOTSUPP; } - /* Forcing strict priority conflicts with the CBS algorithm - * of AVB queues, so reject the offload when any queue is - * configured as AVB. - */ - for (i = 0; i < pdata->tx_queues_to_use; i++) { - if (pdata->tx_queues_cfg[i].mode_to_use == MTL_QUEUE_AVB) { - NL_SET_ERR_MSG_MOD(mqprio->extack, - "SP conflicts with AVB queues"); - return -EOPNOTSUPP; - } - } - for (i = 0; i < qopt->num_tc; i++) { /* The offload switches the MTL scheduler to strict * priority, which only supports a 1:1 TC to TX queue