net: dsa: microchip: add support for Credit based shaper
cover net: dsa: microchip: add support for Credit based shaper
LAN937x switch family, KSZ9477, KSZ9567, KSZ8567, KSZ9563 and KSZ8563 supports the credit based shaper. But there were few difference between LAN937x and KSZ switch like
- number of queue for LAN937x is 8 and for others it is 4.
- Size of credit increment register for LAN937x is 24 and for other is 16-bit. This patch series add the credit based shaper with common implementation for LAN937x and KSZ swithes.
Arun Ramadoss (2):
net: dsa: microchip: enable port queues for tc mqprio
net: dsa: microchip: add support for credit based shaper
drivers/net/dsa/microchip/ksz9477.c | 11 +++ drivers/net/dsa/microchip/ksz9477.h | 1 + drivers/net/dsa/microchip/ksz9477_reg.h | 32 ++---- drivers/net/dsa/microchip/ksz_common.c | 121 +++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_common.h | 21 ++++ drivers/net/dsa/microchip/lan937x.h | 1 + drivers/net/dsa/microchip/lan937x_main.c | 9 ++ drivers/net/dsa/microchip/lan937x_reg.h | 9 +- net/dsa/tag_ksz.c | 15 +++ 9 files changed, 193 insertions(+), 27 deletions(-)
Signature · 1 line
2.36.1
RFC PATCH 1/2 net: dsa: microchip: enable port queues for tc mqprio
LAN937x family of switches has 8 queues per port where all the ksz switches has 4 queues per port. By default, only one queue per port is enabled. The queues are configurable in 2, 4 or 8. This patch add 8 number of queues for LAN937x and 4 for other switches.
In the tag_ksz.c file, prioirty of the packet is queried using the skb buffer and the corresponding value is updated in the tag.
--- drivers/net/dsa/microchip/ksz9477.c | 4 ++++ drivers/net/dsa/microchip/ksz9477_reg.h | 5 ++++- drivers/net/dsa/microchip/ksz_common.c | 17 +++++++++++++++++ drivers/net/dsa/microchip/ksz_common.h | 1 + drivers/net/dsa/microchip/lan937x_main.c | 4 ++++ drivers/net/dsa/microchip/lan937x_reg.h | 6 +++++- net/dsa/tag_ksz.c | 15 +++++++++++++++ 7 files changed, 50 insertions(+), 2 deletions(-)
drivers/net/dsa/microchip/ksz9477.c +4 -0
@@ -1000,6 +1000,10 @@ void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port)ksz_port_cfg (dev, port,REG_PORT_CTRL_0 ,PORT_TAIL_TAG_ENABLE , true); +/* Enable the Port Queue split */ +ksz_prmw8 (dev, port,REG_PORT_CTRL_0 ,PORT_QUEUE_SPLIT_MASK , +PORT_FOUR_QUEUE ); +ksz_port_cfg (dev, port,REG_PORT_CTRL_0 ,PORT_MAC_LOOPBACK , false);/* set back pressure */
drivers/net/dsa/microchip/ksz9477_reg.h +4 -1
@@ -850,7 +850,10 @@#define PORT_FORCE_TX_FLOW_CTRL BIT(4)#define PORT_FORCE_RX_FLOW_CTRL BIT(3)#define PORT_TAIL_TAG_ENABLE BIT(2) -#define PORT_QUEUE_SPLIT_ENABLE 0x3 +#define PORT_QUEUE_SPLIT_MASK GENMASK(1, 0) +#define PORT_FOUR_QUEUE 0x2 +#define PORT_TWO_QUEUE 0x1 +#define PORT_SINGLE_QUEUE 0x0#define REG_PORT_CTRL_1 0x0021
drivers/net/dsa/microchip/ksz_common.c +17 -0
@@ -1040,6 +1040,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .cpu_ports = 0x07, /* can be configured as cpu port */ .port_cnt = 3, /* total port count */ .port_nirqs = 3, + .num_tx_queues = 4, .ops = &ksz9477_dev_ops, .mib_names = ksz9477_mib_names, .mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
@@ -1066,6 +1067,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .num_statics = 8, .cpu_ports = 0x10, /* can be configured as cpu port */ .port_cnt = 5, /* total cpu and user ports */ + .num_tx_queues = 4, .ops = &ksz8_dev_ops, .ksz87xx_eee_link_erratum = true, .mib_names = ksz9477_mib_names,
@@ -1104,6 +1106,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .num_statics = 8, .cpu_ports = 0x10, /* can be configured as cpu port */ .port_cnt = 5, /* total cpu and user ports */ + .num_tx_queues = 4, .ops = &ksz8_dev_ops, .ksz87xx_eee_link_erratum = true, .mib_names = ksz9477_mib_names,
@@ -1128,6 +1131,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .num_statics = 8, .cpu_ports = 0x10, /* can be configured as cpu port */ .port_cnt = 5, /* total cpu and user ports */ + .num_tx_queues = 4, .ops = &ksz8_dev_ops, .ksz87xx_eee_link_erratum = true, .mib_names = ksz9477_mib_names,
@@ -1152,6 +1156,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .num_statics = 8, .cpu_ports = 0x4, /* can be configured as cpu port */ .port_cnt = 3, + .num_tx_queues = 4, .ops = &ksz8_dev_ops, .mib_names = ksz88xx_mib_names, .mib_cnt = ARRAY_SIZE(ksz88xx_mib_names),
@@ -1173,6 +1178,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .cpu_ports = 0x7F, /* can be configured as cpu port */ .port_cnt = 7, /* total physical port count */ .port_nirqs = 4, + .num_tx_queues = 4, .ops = &ksz9477_dev_ops, .phy_errata_9477 = true, .mib_names = ksz9477_mib_names,
@@ -1205,6 +1211,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .cpu_ports = 0x3F, /* can be configured as cpu port */ .port_cnt = 6, /* total physical port count */ .port_nirqs = 2, + .num_tx_queues = 4, .ops = &ksz9477_dev_ops, .phy_errata_9477 = true, .mib_names = ksz9477_mib_names,
@@ -1237,6 +1244,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .cpu_ports = 0x7F, /* can be configured as cpu port */ .port_cnt = 7, /* total physical port count */ .port_nirqs = 2, + .num_tx_queues = 4, .ops = &ksz9477_dev_ops, .phy_errata_9477 = true, .mib_names = ksz9477_mib_names,
@@ -1267,6 +1275,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .cpu_ports = 0x07, /* can be configured as cpu port */ .port_cnt = 3, /* total port count */ .port_nirqs = 2, + .num_tx_queues = 4, .ops = &ksz9477_dev_ops, .mib_names = ksz9477_mib_names, .mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
@@ -1317,6 +1326,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .cpu_ports = 0x7F, /* can be configured as cpu port */ .port_cnt = 7, /* total physical port count */ .port_nirqs = 3, + .num_tx_queues = 4, .ops = &ksz9477_dev_ops, .phy_errata_9477 = true, .mib_names = ksz9477_mib_names,
@@ -1347,6 +1357,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .cpu_ports = 0x10, /* can be configured as cpu port */ .port_cnt = 5, /* total physical port count */ .port_nirqs = 6, + .num_tx_queues = 8, .ops = &lan937x_dev_ops, .mib_names = ksz9477_mib_names, .mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
@@ -1371,6 +1382,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .cpu_ports = 0x30, /* can be configured as cpu port */ .port_cnt = 6, /* total physical port count */ .port_nirqs = 6, + .num_tx_queues = 8, .ops = &lan937x_dev_ops, .mib_names = ksz9477_mib_names, .mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
@@ -1395,6 +1407,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .cpu_ports = 0x30, /* can be configured as cpu port */ .port_cnt = 8, /* total physical port count */ .port_nirqs = 6, + .num_tx_queues = 8, .ops = &lan937x_dev_ops, .mib_names = ksz9477_mib_names, .mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
@@ -1423,6 +1436,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .cpu_ports = 0x38, /* can be configured as cpu port */ .port_cnt = 5, /* total physical port count */ .port_nirqs = 6, + .num_tx_queues = 8, .ops = &lan937x_dev_ops, .mib_names = ksz9477_mib_names, .mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
@@ -1451,6 +1465,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .cpu_ports = 0x30, /* can be configured as cpu port */ .port_cnt = 8, /* total physical port count */ .port_nirqs = 6, + .num_tx_queues = 8, .ops = &lan937x_dev_ops, .mib_names = ksz9477_mib_names, .mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
@@ -1983,6 +1998,8 @@ static int ksz_setup(struct dsa_switch *ds) dev->dev_ops->enable_stp_addr (dev); + ds->num_tx_queues = dev->info->num_tx_queues; +regmap_update_bits (dev->regmap[0 ], regs[S_MULTICAST_CTRL ],MULTICAST_STORM_DISABLE ,MULTICAST_STORM_DISABLE );
drivers/net/dsa/microchip/ksz_common.h +1 -0
@@ -46,6 +46,7 @@ struct ksz_chip_data {int cpu_ports;int port_cnt;u8 port_nirqs; +u8 num_tx_queues;const struct ksz_dev_ops *ops;bool phy_errata_9477;bool ksz87xx_eee_link_erratum;
drivers/net/dsa/microchip/lan937x_main.c +4 -0
@@ -180,6 +180,10 @@ void lan937x_port_setup(struct ksz_device *dev, int port, bool cpu_port)lan937x_port_cfg (dev, port,REG_PORT_CTRL_0 ,PORT_TAIL_TAG_ENABLE , true); +/* Enable the Port Queue split */ +ksz_prmw8 (dev, port,REG_PORT_CTRL_0 ,PORT_QUEUE_SPLIT_MASK , +PORT_EIGHT_QUEUE ); +/* set back pressure for half duplex */ lan937x_port_cfg (dev, port,REG_PORT_MAC_CTRL_1 ,PORT_BACK_PRESSURE , true);
drivers/net/dsa/microchip/lan937x_reg.h +5 -1
@@ -143,7 +143,11 @@#define PORT_K2L_INSERT_ENABLE BIT(5)#define PORT_K2L_DEBUG_ENABLE BIT(4)#define PORT_TAIL_TAG_ENABLE BIT(2) -#define PORT_QUEUE_SPLIT_ENABLE 0x3 +#define PORT_QUEUE_SPLIT_MASK GENMASK(1, 0) +#define PORT_EIGHT_QUEUE 0x3 +#define PORT_FOUR_QUEUE 0x2 +#define PORT_TWO_QUEUE 0x1 +#define PORT_SINGLE_QUEUE 0x0/* 1 - Phy */ #define REG_PORT_T1_PHY_CTRL_BASE 0x0100
net/dsa/tag_ksz.c +15 -0
@@ -106,10 +106,13 @@ MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_KSZ8795);#define KSZ9477_TAIL_TAG_OVERRIDE BIT(9)#define KSZ9477_TAIL_TAG_LOOKUP BIT(10) +#define KSZ9477_TAIL_TAG_PRIO 7static struct sk_buff *ksz9477_xmit (struct sk_buff *skb,struct net_device *dev) { +u16 queue_mapping =skb_get_queue_mapping (skb); +u8 prio =netdev_txq_to_tc (dev, queue_mapping);struct dsa_port *dp =dsa_slave_to_port (dev);__be16 *tag;u8 *addr;
@@ -124,6 +127,8 @@ static struct sk_buff *ksz9477_xmit(struct sk_buff *skb, val =BIT (dp->index); + val |= (prio <<KSZ9477_TAIL_TAG_PRIO ); +if (is_link_local_ether_addr (addr)) val |=KSZ9477_TAIL_TAG_OVERRIDE ;
@@ -159,10 +164,13 @@ MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_KSZ9477);#define KSZ9893_TAIL_TAG_OVERRIDE BIT(5)#define KSZ9893_TAIL_TAG_LOOKUP BIT(6) +#define KSZ9893_TAIL_TAG_PRIO 3static struct sk_buff *ksz9893_xmit (struct sk_buff *skb,struct net_device *dev) { +u16 queue_mapping =skb_get_queue_mapping (skb); +u8 prio =netdev_txq_to_tc (dev, queue_mapping);struct dsa_port *dp =dsa_slave_to_port (dev);u8 *addr;u8 *tag;
@@ -176,6 +184,8 @@ static struct sk_buff *ksz9893_xmit(struct sk_buff *skb, *tag =BIT (dp->index); + *tag |= (prio <<KSZ9893_TAIL_TAG_PRIO ); +if (is_link_local_ether_addr (addr)) *tag |=KSZ9893_TAIL_TAG_OVERRIDE ;
@@ -212,11 +222,14 @@ MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_KSZ9893);#define LAN937X_TAIL_TAG_BLOCKING_OVERRIDE BIT(11)#define LAN937X_TAIL_TAG_LOOKUP BIT(12)#define LAN937X_TAIL_TAG_VALID BIT(13) +#define LAN937X_TAIL_TAG_PRIO 8#define LAN937X_TAIL_TAG_PORT_MASK 7static struct sk_buff *lan937x_xmit (struct sk_buff *skb,struct net_device *dev) { +u16 queue_mapping =skb_get_queue_mapping (skb); +u8 prio =netdev_txq_to_tc (dev, queue_mapping);struct dsa_port *dp =dsa_slave_to_port (dev);const struct ethhdr *hdr =eth_hdr (skb);__be16 *tag;
@@ -229,6 +242,8 @@ static struct sk_buff *lan937x_xmit(struct sk_buff *skb, val =BIT (dp->index); + val |= (prio <<LAN937X_TAIL_TAG_PRIO ); +if (is_link_local_ether_addr (hdr->h_dest)) val |=LAN937X_TAIL_TAG_BLOCKING_OVERRIDE ;
Signature · 1 line
2.36.1
RFC PATCH 2/2 net: dsa: microchip: add support for credit based shaper
In reply to Arun RamadossKSZ9477, KSZ9567, KSZ8567, KSZ9563, KSZ8563 and LAN937x supports Credit based shaper. To differentiate the chip supporting cbs, tc_cbs_supported flag is introduced in ksz_chip_data.
And KSZ series has 16bit Credit increment registers whereas LAN937x has 24bit register. The value to be programmed in the credit increment is determined using the successive multiplication method to convert decimal fraction to hexadecimal fraction.
For example: if idleslope is 10000 and sendslope is -90000, then bandwidth is 10000 - (-90000) = 100000.
The 10% bandwidth of 100Mbps means 10/100 = 0.1(decimal). This value has to be converted to hexa.
1) 0.1 * 16 = 1.6 --> fraction 0.6 Carry = 1 (MSB) 2) 0.6 * 16 = 9.6 --> fraction 0.6 Carry = 9 3) 0.6 * 16 = 9.6 --> fraction 0.6 Carry = 9 4) 0.6 * 16 = 9.6 --> fraction 0.6 Carry = 9 5) 0.6 * 16 = 9.6 --> fraction 0.6 Carry = 9 6) 0.6 * 16 = 9.6 --> fraction 0.6 Carry = 9 (LSB)
Now 0.1(decimal) becomes 0.199999(Hex).
If it is LAN937x, 24 bit value will be programmed to Credit Inc register, 0x199999. For others 16 bit value will be prgrammed, 0x1999.
--- drivers/net/dsa/microchip/ksz9477.c | 7 ++ drivers/net/dsa/microchip/ksz9477.h | 1 + drivers/net/dsa/microchip/ksz9477_reg.h | 27 +----- drivers/net/dsa/microchip/ksz_common.c | 104 +++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_common.h | 20 +++++ drivers/net/dsa/microchip/lan937x.h | 1 + drivers/net/dsa/microchip/lan937x_main.c | 5 ++ drivers/net/dsa/microchip/lan937x_reg.h | 3 + 8 files changed, 143 insertions(+), 25 deletions(-)
drivers/net/dsa/microchip/ksz9477.c +7 -0
@@ -1177,6 +1177,13 @@ u32 ksz9477_get_port_addr(int port, int offset)return PORT_CTRL_ADDR (port, offset); } +int ksz9477_tc_cbs_set_cinc (struct ksz_device *dev,int port,u32 val) +{ + val = val >>8 ; + +return ksz_pwrite16 (dev, port,REG_PORT_MTI_CREDIT_INCREMENT , val); +} +int ksz9477_switch_init (struct ksz_device *dev) {u8 data8;
drivers/net/dsa/microchip/ksz9477.h +1 -0
@@ -52,6 +52,7 @@ int ksz9477_mdb_del(struct ksz_device *dev, int port,int ksz9477_change_mtu (struct ksz_device *dev,int port,int mtu);int ksz9477_max_mtu (struct ksz_device *dev,int port);void ksz9477_config_cpu_port (struct dsa_switch *ds); +int ksz9477_tc_cbs_set_cinc (struct ksz_device *dev,int port,u32 val);int ksz9477_enable_stp_addr (struct ksz_device *dev);int ksz9477_reset_switch (struct ksz_device *dev);int ksz9477_dsa_init (struct ksz_device *dev);
drivers/net/dsa/microchip/ksz9477_reg.h +2 -25
@@ -1483,33 +1483,10 @@/* 9 - Shaping */ -#define REG_PORT_MTI_QUEUE_INDEX__4 0x0900 +#define REG_PORT_MTI_QUEUE_CTRL_0__4 0x0904 -#define REG_PORT_MTI_QUEUE_CTRL_0__4 0x0904 +#define MTI_PVID_REPLACE BIT(0) -#define MTI_PVID_REPLACE BIT(0) - -#define REG_PORT_MTI_QUEUE_CTRL_0 0x0914 - -#define MTI_SCHEDULE_MODE_M 0x3 -#define MTI_SCHEDULE_MODE_S 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_OFF 0 -#define MTI_SHAPING_SRP 1 -#define MTI_SHAPING_TIME_AWARE 2 - -#define REG_PORT_MTI_QUEUE_CTRL_1 0x0915 - -#define MTI_TX_RATIO_M (BIT(7) - 1) - -#define REG_PORT_MTI_QUEUE_CTRL_2__2 0x0916 -#define REG_PORT_MTI_HI_WATER_MARK 0x0916 -#define REG_PORT_MTI_QUEUE_CTRL_3__2 0x0918 -#define REG_PORT_MTI_LO_WATER_MARK 0x0918 -#define REG_PORT_MTI_QUEUE_CTRL_4__2 0x091A#define REG_PORT_MTI_CREDIT_INCREMENT 0x091A/* A - QM */
drivers/net/dsa/microchip/ksz_common.c +104 -0
188 lines not on this page · raw message
drivers/net/dsa/microchip/ksz_common.h +20 -0
@@ -47,6 +47,7 @@ struct ksz_chip_data {int port_cnt;u8 port_nirqs;u8 num_tx_queues; +bool tc_cbs_supported;const struct ksz_dev_ops *ops;bool phy_errata_9477;bool ksz87xx_eee_link_erratum;
@@ -335,6 +336,7 @@ struct ksz_dev_ops { struct phy_device *phydev, int speed, int duplex, bool tx_pause, bool rx_pause);void (*setup_rgmii_delay)(struct ksz_device *dev,int port); +int (*tc_cbs_set_cinc)(struct ksz_device *dev,int port,u32 val);void (*config_cpu_port)(struct dsa_switch *ds);int (*enable_stp_addr)(struct ksz_device *dev);int (*reset)(struct ksz_device *dev);
@@ -589,6 +591,24 @@ static inline int is_lan937x(struct ksz_device *dev)#define PORT_SRC_PHY_INT 1 +/* CBS related registers */ +#define REG_PORT_MTI_QUEUE_INDEX__4 0x0900 + +#define REG_PORT_MTI_QUEUE_CTRL_0 0x0914 + +#define MTI_SCHEDULE_MODE_M 0x3 +#define MTI_SCHEDULE_MODE_S 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_OFF 0 +#define MTI_SHAPING_SRP 1 +#define MTI_SHAPING_TIME_AWARE 2 + +#define REG_PORT_MTI_HI_WATER_MARK 0x0916 +#define REG_PORT_MTI_LO_WATER_MARK 0x0918 +/* Regmap tables generation */ #define KSZ_SPI_OP_RD 3#define KSZ_SPI_OP_WR 2
drivers/net/dsa/microchip/lan937x.h +1 -0
@@ -20,4 +20,5 @@ void lan937x_phylink_get_caps(struct ksz_device *dev, int port, struct phylink_config *config);void lan937x_setup_rgmii_delay (struct ksz_device *dev,int port);int lan937x_set_ageing_time (struct ksz_device *dev,unsigned int msecs); +int lan937x_tc_cbs_set_cinc (struct ksz_device *dev,int port,u32 val);#endif
drivers/net/dsa/microchip/lan937x_main.c +5 -0
@@ -340,6 +340,11 @@ void lan937x_setup_rgmii_delay(struct ksz_device *dev, int port) } } +int lan937x_tc_cbs_set_cinc (struct ksz_device *dev,int port,u32 val) +{ +return ksz_pwrite32 (dev, port,REG_PORT_MTI_CREDIT_INCREMENT , val); +} +int lan937x_switch_init (struct ksz_device *dev) { dev->port_mask = (1 << dev->info->port_cnt) -1 ;
drivers/net/dsa/microchip/lan937x_reg.h +3 -0
@@ -189,6 +189,9 @@#define P_PRIO_CTRL REG_PORT_MRI_PRIO_CTRL +/* 9 - Shaping */ +#define REG_PORT_MTI_CREDIT_INCREMENT 0x091C +/* The port number as per the datasheet */ #define RGMII_2_PORT_NUM 5#define RGMII_1_PORT_NUM 6
Signature · 1 line
2.36.1