net: dsa: microchip: add ksz_setup_tc_mode() function

Add ksz_setup_tc_mode() to make queue scheduling and shaping
configuration more visible.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Acked-by: Arun Ramadoss <arun.ramadoss@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index 729b36e..11f2050 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -32,10 +32,6 @@
 #include "ksz9477.h"
 #include "lan937x.h"
 
-#define KSZ_CBS_ENABLE ((MTI_SCHEDULE_STRICT_PRIO << MTI_SCHEDULE_MODE_S) | \
-                       (MTI_SHAPING_SRP << MTI_SHAPING_S))
-#define KSZ_CBS_DISABLE ((MTI_SCHEDULE_WRR << MTI_SCHEDULE_MODE_S) |\
-                        (MTI_SHAPING_OFF << MTI_SHAPING_S))
 #define MIB_COUNTER_NUM 0x20
 
 struct ksz_stats_raw {
@@ -3091,6 +3087,14 @@ static int cinc_cal(s32 idle_slope, s32 send_slope, u32 *bw)
        return 0;
 }
 
+static int ksz_setup_tc_mode(struct ksz_device *dev, int port, u8 scheduler,
+                            u8 shaper)
+{
+       return ksz_pwrite8(dev, port, REG_PORT_MTI_QUEUE_CTRL_0,
+                          FIELD_PREP(MTI_SCHEDULE_MODE_M, scheduler) |
+                          FIELD_PREP(MTI_SHAPING_M, shaper));
+}
+
 static int ksz_setup_tc_cbs(struct dsa_switch *ds, int port,
                            struct tc_cbs_qopt_offload *qopt)
 {
@@ -3110,8 +3114,8 @@ static int ksz_setup_tc_cbs(struct dsa_switch *ds, int port,
                return ret;
 
        if (!qopt->enable)
-               return ksz_pwrite8(dev, port, REG_PORT_MTI_QUEUE_CTRL_0,
-                                  KSZ_CBS_DISABLE);
+               return ksz_setup_tc_mode(dev, port, MTI_SCHEDULE_WRR,
+                                        MTI_SHAPING_OFF);
 
        /* High Credit */
        ret = ksz_pwrite16(dev, port, REG_PORT_MTI_HI_WATER_MARK,
@@ -3136,8 +3140,8 @@ static int ksz_setup_tc_cbs(struct dsa_switch *ds, int port,
                        return ret;
        }
 
-       return ksz_pwrite8(dev, port, REG_PORT_MTI_QUEUE_CTRL_0,
-                          KSZ_CBS_ENABLE);
+       return ksz_setup_tc_mode(dev, port, MTI_SCHEDULE_STRICT_PRIO,
+                                MTI_SHAPING_SRP);
 }
 
 static int ksz_setup_tc(struct dsa_switch *ds, int port,

diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index d2d5761..7d87c9a 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -654,12 +654,10 @@ static inline int is_lan937x(struct ksz_device *dev)
 
 #define REG_PORT_MTI_QUEUE_CTRL_0      0x0914
 
-#define MTI_SCHEDULE_MODE_M            0x3
-#define MTI_SCHEDULE_MODE_S            6
+#define MTI_SCHEDULE_MODE_M            GENMASK(7, 6)
 #define MTI_SCHEDULE_STRICT_PRIO       0
 #define MTI_SCHEDULE_WRR               2
-#define MTI_SHAPING_M                  0x3
-#define MTI_SHAPING_S                  4
+#define MTI_SHAPING_M                  GENMASK(5, 4)
 #define MTI_SHAPING_OFF                        0
 #define MTI_SHAPING_SRP                        1
 #define MTI_SHAPING_TIME_AWARE         2