net: stmmac: support fp parameter of tc-taprio

tc-taprio can select whether traffic classes are express or preemptible.

0) tc qdisc add dev eth1 parent root handle 100 taprio \
        num_tc 4 \
        map 0 1 2 3 2 2 2 2 2 2 2 2 2 2 2 3 \
        queues 1@0 1@1 1@2 1@3 \
        base-time 1000000000 \
        sched-entry S 03 10000000 \
        sched-entry S 0e 10000000 \
        flags 0x2 fp P E E E

1) After some traffic tests, MAC merge layer statistics are all good.

Local device:
[ {
        "ifname": "eth1",
        "pmac-enabled": true,
        "tx-enabled": true,
        "tx-active": true,
        "tx-min-frag-size": 60,
        "rx-min-frag-size": 60,
        "verify-enabled": true,
        "verify-time": 100,
        "max-verify-time": 128,
        "verify-status": "SUCCEEDED",
        "statistics": {
            "MACMergeFrameAssErrorCount": 0,
            "MACMergeFrameSmdErrorCount": 0,
            "MACMergeFrameAssOkCount": 0,
            "MACMergeFragCountRx": 0,
            "MACMergeFragCountTx": 17837,
            "MACMergeHoldCount": 18639
        }
    } ]

Remote device:
[ {
        "ifname": "end1",
        "pmac-enabled": true,
        "tx-enabled": true,
        "tx-active": true,
        "tx-min-frag-size": 60,
        "rx-min-frag-size": 60,
        "verify-enabled": true,
        "verify-time": 100,
        "max-verify-time": 128,
        "verify-status": "SUCCEEDED",
        "statistics": {
            "MACMergeFrameAssErrorCount": 0,
            "MACMergeFrameSmdErrorCount": 0,
            "MACMergeFrameAssOkCount": 17189,
            "MACMergeFragCountRx": 17837,
            "MACMergeFragCountTx": 0,
            "MACMergeHoldCount": 0
        }
    } ]

Tested on DWMAC CORE 5.10a

Signed-off-by: Furong Xu <0x1207@gmail.com>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Link: https://patch.msgid.link/0d21ae356fb3cab77337527e87d46748a4852055.1725631883.git.0x1207@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
index cfdb9ab1fa2a35edc988c3b41289314319e0ee2f..05ffff00a52496471a146782c4ef55bb9dfc5a36 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
@@ -931,9 +931,9 @@ static int tc_taprio_configure(struct stmmac_priv *priv,
                               struct tc_taprio_qopt_offload *qopt)
 {
        u32 size, wid = priv->dma_cap.estwid, dep = priv->dma_cap.estdep;
+       struct netlink_ext_ack *extack = qopt->mqprio.extack;
        struct timespec64 time, current_time, qopt_time;
        ktime_t current_time_ns;
-       bool fpe = false;
        int i, ret = 0;
        u64 ctr;
 
@@ -1018,16 +1018,12 @@ static int tc_taprio_configure(struct stmmac_priv *priv,
 
                switch (qopt->entries[i].command) {
                case TC_TAPRIO_CMD_SET_GATES:
-                       if (fpe)
-                               return -EINVAL;
                        break;
                case TC_TAPRIO_CMD_SET_AND_HOLD:
                        gates |= BIT(0);
-                       fpe = true;
                        break;
                case TC_TAPRIO_CMD_SET_AND_RELEASE:
                        gates &= ~BIT(0);
-                       fpe = true;
                        break;
                default:
                        return -EOPNOTSUPP;
@@ -1058,11 +1054,6 @@ static int tc_taprio_configure(struct stmmac_priv *priv,
 
        tc_taprio_map_maxsdu_txq(priv, qopt);
 
-       if (fpe && !priv->dma_cap.fpesel) {
-               mutex_unlock(&priv->est_lock);
-               return -EOPNOTSUPP;
-       }
-
        ret = stmmac_est_configure(priv, priv, priv->est,
                                   priv->plat->clk_ptp_rate);
        mutex_unlock(&priv->est_lock);
@@ -1071,6 +1062,11 @@ static int tc_taprio_configure(struct stmmac_priv *priv,
                goto disable;
        }
 
+       ret = stmmac_fpe_map_preemption_class(priv, priv->dev, extack,
+                                             qopt->mqprio.preemptible_tcs);
+       if (ret)
+               goto disable;
+
        netdev_info(priv->dev, "configured EST\n");
 
        return 0;
@@ -1089,11 +1085,8 @@ disable:
                mutex_unlock(&priv->est_lock);
        }
 
-       stmmac_fpe_configure(priv, priv->ioaddr,
-                            &priv->fpe_cfg,
-                            priv->plat->tx_queues_to_use,
-                            priv->plat->rx_queues_to_use,
-                            false, false);
+       stmmac_fpe_map_preemption_class(priv, priv->dev, extack, 0);
+
        netdev_info(priv->dev, "disabled FPE\n");
 
        return ret;
@@ -1150,6 +1143,18 @@ static int tc_setup_taprio(struct stmmac_priv *priv,
        return err;
 }
 
+static int tc_setup_taprio_without_fpe(struct stmmac_priv *priv,
+                                      struct tc_taprio_qopt_offload *qopt)
+{
+       if (!qopt->mqprio.preemptible_tcs)
+               return tc_setup_taprio(priv, qopt);
+
+       NL_SET_ERR_MSG_MOD(qopt->mqprio.extack,
+                          "taprio with FPE is not implemented for this MAC");
+
+       return -EOPNOTSUPP;
+}
+
 static int tc_setup_etf(struct stmmac_priv *priv,
                        struct tc_etf_qopt_offload *qopt)
 {
@@ -1266,7 +1271,7 @@ const struct stmmac_tc_ops dwmac4_tc_ops = {
        .setup_cls_u32 = tc_setup_cls_u32,
        .setup_cbs = tc_setup_cbs,
        .setup_cls = tc_setup_cls,
-       .setup_taprio = tc_setup_taprio,
+       .setup_taprio = tc_setup_taprio_without_fpe,
        .setup_etf = tc_setup_etf,
        .query_caps = tc_query_caps,
        .setup_mqprio = tc_setup_mqprio_unimplemented,
@@ -1288,7 +1293,7 @@ const struct stmmac_tc_ops dwxgmac_tc_ops = {
        .setup_cls_u32 = tc_setup_cls_u32,
        .setup_cbs = tc_setup_cbs,
        .setup_cls = tc_setup_cls,
-       .setup_taprio = tc_setup_taprio,
+       .setup_taprio = tc_setup_taprio_without_fpe,
        .setup_etf = tc_setup_etf,
        .query_caps = tc_query_caps,
        .setup_mqprio = tc_setup_mqprio_unimplemented,