net: enetc: refactor enetc_setup_tc_taprio() to have a switch/case for cmd

Make enetc_setup_tc_taprio() more amenable to future extensions, like
reporting statistics.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index 63854294ac33e1ff336610b0e8b7852a83e48c15..3aa31a7606572b21cb0d861dc6f80535c7a58bfe 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -2624,7 +2624,7 @@ static void enetc_debug_tx_ring_prios(struct enetc_ndev_priv *priv)
                           priv->tx_ring[i]->prio);
 }
 
-static void enetc_reset_tc_mqprio(struct net_device *ndev)
+void enetc_reset_tc_mqprio(struct net_device *ndev)
 {
        struct enetc_ndev_priv *priv = netdev_priv(ndev);
        struct enetc_hw *hw = &priv->si->hw;
@@ -2649,6 +2649,7 @@ static void enetc_reset_tc_mqprio(struct net_device *ndev)
 
        enetc_change_preemptible_tcs(priv, 0);
 }
+EXPORT_SYMBOL_GPL(enetc_reset_tc_mqprio);
 
 int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)
 {

diff --git a/drivers/net/ethernet/freescale/enetc/enetc.h b/drivers/net/ethernet/freescale/enetc/enetc.h
index c97a8e3d7a7fe4c9f41e182727671431edef8a50..8577cf7699a042d9b4937439bf0104e91b1fcd14 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc.h
@@ -429,6 +429,7 @@ struct net_device_stats *enetc_get_stats(struct net_device *ndev);
 void enetc_set_features(struct net_device *ndev, netdev_features_t features);
 int enetc_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd);
 int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data);
+void enetc_reset_tc_mqprio(struct net_device *ndev);
 int enetc_setup_bpf(struct net_device *ndev, struct netdev_bpf *bpf);
 int enetc_xdp_xmit(struct net_device *ndev, int num_frames,
                   struct xdp_frame **frames, u32 flags);

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_qos.c b/drivers/net/ethernet/freescale/enetc/enetc_qos.c
index 7aad824f4da7d72fc0320674b1c8bb74f08bb679..2b8fdfffd02d8f76e1dde0d6cd49c577e961f8b9 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_qos.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_qos.c
@@ -43,10 +43,9 @@ void enetc_sched_speed_set(struct enetc_ndev_priv *priv, int speed)
        enetc_port_wr(hw, ENETC_PMR, (tmp & ~ENETC_PMR_PSPEED_MASK) | pspeed);
 }
 
-static int enetc_setup_taprio(struct net_device *ndev,
+static int enetc_setup_taprio(struct enetc_ndev_priv *priv,
                              struct tc_taprio_qopt_offload *admin_conf)
 {
-       struct enetc_ndev_priv *priv = netdev_priv(ndev);
        struct enetc_hw *hw = &priv->si->hw;
        struct enetc_cbd cbd = {.cmd = 0};
        struct tgs_gcl_conf *gcl_config;
@@ -60,19 +59,13 @@ static int enetc_setup_taprio(struct net_device *ndev,
        int err;
        int i;
 
+       /* TSD and Qbv are mutually exclusive in hardware */
+       for (i = 0; i < priv->num_tx_rings; i++)
+               if (priv->tx_ring[i]->tsd_enable)
+                       return -EBUSY;
+
        if (admin_conf->num_entries > enetc_get_max_gcl_len(hw))
                return -EINVAL;
-       gcl_len = admin_conf->num_entries;
-
-       tge = enetc_rd(hw, ENETC_PTGCR);
-       if (admin_conf->cmd == TAPRIO_CMD_DESTROY) {
-               enetc_wr(hw, ENETC_PTGCR, tge & ~ENETC_PTGCR_TGE);
-               enetc_reset_ptcmsdur(hw);
-
-               priv->active_offloads &= ~ENETC_F_QBV;
-
-               return 0;
-       }
 
        if (admin_conf->cycle_time > U32_MAX ||
            admin_conf->cycle_time_extension > U32_MAX)
@@ -82,6 +75,7 @@ static int enetc_setup_taprio(struct net_device *ndev,
         * control BD descriptor.
         */
        gcl_config = &cbd.gcl_conf;
+       gcl_len = admin_conf->num_entries;
 
        data_size = struct_size(gcl_data, entry, gcl_len);
        tmp = enetc_cbd_alloc_data_mem(priv->si, &cbd, data_size,
@@ -115,6 +109,7 @@ static int enetc_setup_taprio(struct net_device *ndev,
        cbd.cls = BDCR_CMD_PORT_GCL;
        cbd.status_flags = 0;
 
+       tge = enetc_rd(hw, ENETC_PTGCR);
        enetc_wr(hw, ENETC_PTGCR, tge | ENETC_PTGCR_TGE);
 
        err = enetc_send_cmd(priv->si, &cbd);
@@ -132,29 +127,57 @@ static int enetc_setup_taprio(struct net_device *ndev,
        return 0;
 }
 
-int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data)
+static void enetc_reset_taprio(struct enetc_ndev_priv *priv)
+{
+       struct enetc_hw *hw = &priv->si->hw;
+       u32 val;
+
+       val = enetc_rd(hw, ENETC_PTGCR);
+       enetc_wr(hw, ENETC_PTGCR, val & ~ENETC_PTGCR_TGE);
+       enetc_reset_ptcmsdur(hw);
+
+       priv->active_offloads &= ~ENETC_F_QBV;
+}
+
+static void enetc_taprio_destroy(struct net_device *ndev)
 {
-       struct tc_taprio_qopt_offload *taprio = type_data;
        struct enetc_ndev_priv *priv = netdev_priv(ndev);
-       int err, i;
 
-       if (taprio->cmd != TAPRIO_CMD_REPLACE &&
-           taprio->cmd != TAPRIO_CMD_DESTROY)
-               return -EOPNOTSUPP;
+       enetc_reset_taprio(priv);
+       enetc_reset_tc_mqprio(ndev);
+}
 
-       /* TSD and Qbv are mutually exclusive in hardware */
-       for (i = 0; i < priv->num_tx_rings; i++)
-               if (priv->tx_ring[i]->tsd_enable)
-                       return -EBUSY;
+static int enetc_taprio_replace(struct net_device *ndev,
+                               struct tc_taprio_qopt_offload *offload)
+{
+       struct enetc_ndev_priv *priv = netdev_priv(ndev);
+       int err;
 
-       err = enetc_setup_tc_mqprio(ndev, &taprio->mqprio);
+       err = enetc_setup_tc_mqprio(ndev, &offload->mqprio);
        if (err)
                return err;
 
-       err = enetc_setup_taprio(ndev, taprio);
-       if (err) {
-               taprio->mqprio.qopt.num_tc = 0;
-               enetc_setup_tc_mqprio(ndev, &taprio->mqprio);
+       err = enetc_setup_taprio(priv, offload);
+       if (err)
+               enetc_reset_tc_mqprio(ndev);
+
+       return err;
+}
+
+int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data)
+{
+       struct tc_taprio_qopt_offload *offload = type_data;
+       int err = 0;
+
+       switch (offload->cmd) {
+       case TAPRIO_CMD_REPLACE:
+               err = enetc_taprio_replace(ndev, offload);
+               break;
+       case TAPRIO_CMD_DESTROY:
+               enetc_taprio_destroy(ndev);
+               break;
+       default:
+               err = -EOPNOTSUPP;
        }
 
        return err;