net: dsa: microchip: add support for phylink mac config and link up
v2 cover net: dsa: microchip: add support for phylink mac config and link up
This patch series add support common phylink mac config and link up for the ksz series switches. At present, ksz8795 and ksz9477 doesn't implement the phylink mac config and link up. It configures the mac interface in the port setup hook. ksz8830 series switch does not mac link configuration. For lan937x switches, in the part support patch series has support only for MII and RMII configuration. Some group of switches have some register address and bit fields common and others are different. So, this patch aims to have common phylink implementation which configures the register based on the chip id.
Changes in v2
- combined the modification of duplex, tx_pause and rx_pause into single function.
Changes in v1
- Squash the reading rgmii value from dt to patch which apply the rgmii value
- Created the new function ksz_port_set_xmii_speed
- Seperated the namespace values for xmii_ctrl_0 and xmii_ctrl_1 register
- Applied the rgmii delay value based on the rx/tx-internal-delay-ps
Arun Ramadoss (9):
net: dsa: microchip: add common gigabit set and get function
net: dsa: microchip: add common ksz port xmii speed selection function
net: dsa: microchip: add common duplex and flow control function
net: dsa: microchip: add support for common phylink mac link up
net: dsa: microchip: lan937x: add support for configuing xMII register
net: dsa: microchip: apply rgmii tx and rx delay in phylink mac config
net: dsa: microchip: ksz9477: use common xmii function
net: dsa: microchip: ksz8795: use common xmii function
net: dsa: microchip: add support for phylink mac config
drivers/net/dsa/microchip/ksz8795.c | 40 --- drivers/net/dsa/microchip/ksz8795_reg.h | 8 - drivers/net/dsa/microchip/ksz9477.c | 183 +------------ drivers/net/dsa/microchip/ksz9477_reg.h | 24 -- drivers/net/dsa/microchip/ksz_common.c | 312 ++++++++++++++++++++++- drivers/net/dsa/microchip/ksz_common.h | 54 ++++ drivers/net/dsa/microchip/lan937x.h | 8 +- drivers/net/dsa/microchip/lan937x_main.c | 125 +++------ drivers/net/dsa/microchip/lan937x_reg.h | 32 ++- 9 files changed, 431 insertions(+), 355 deletions(-)
base-commit: 502c6f8cedcce7889ccdefeb88ce36b39acd522f
Signature · 1 line
2.36.1
PATCH v2 1/9 net: dsa: microchip: add common gigabit set and get function
This patch add helper function for setting and getting the gigabit enable for the ksz series switch. KSZ8795 switch has different register address compared to all other ksz switches. KSZ8795 series uses the Port 5 Interface control 6 Bit 6 for configuring the 1Gbps or 100/10Mbps speed selection. All other switches uses the xMII control 1 0xN301 register Bit6 for gigabit.
Further, for KSZ8795 & KSZ9893 switches if bit 1 then 1Gbps is chosen and if bit 0 then 100/10Mbps is chosen. It is other way around for other switches bit 0 is for 1Gbps. So, this patch implements the common function for configuring the gigabit set and get capability.
--- drivers/net/dsa/microchip/ksz9477.c | 36 ++------------ drivers/net/dsa/microchip/ksz9477_reg.h | 4 -- drivers/net/dsa/microchip/ksz_common.c | 61 ++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_common.h | 12 +++++ drivers/net/dsa/microchip/lan937x_main.c | 16 ++----- drivers/net/dsa/microchip/lan937x_reg.h | 1 - 6 files changed, 82 insertions(+), 48 deletions(-)
drivers/net/dsa/microchip/ksz9477.c +5 -31
@@ -866,32 +866,6 @@ void ksz9477_port_mirror_del(struct ksz_device *dev, int port, PORT_MIRROR_SNIFFER, false); } -static bool ksz9477_get_gbit (struct ksz_device *dev,u8 data) -{ -bool gbit; - -if (dev->features &NEW_XMII ) - gbit = !(data &PORT_MII_NOT_1GBIT ); -else - gbit = !!(data &PORT_MII_1000MBIT_S1 ); -return gbit; -} - -static void ksz9477_set_gbit (struct ksz_device *dev,bool gbit,u8 *data) -{ -if (dev->features &NEW_XMII ) { -if (gbit) - *data &= ~PORT_MII_NOT_1GBIT ; -else - *data |=PORT_MII_NOT_1GBIT ; - }else { -if (gbit) - *data |=PORT_MII_1000MBIT_S1 ; -else - *data &= ~PORT_MII_1000MBIT_S1 ; - } -} -static int ksz9477_get_xmii (struct ksz_device *dev,u8 data) {int mode;
@@ -977,7 +951,7 @@ static phy_interface_t ksz9477_get_interface(struct ksz_device *dev, int port)if (port < dev->phy_port_cnt)return PHY_INTERFACE_MODE_NA ;ksz_pread8 (dev, port,REG_PORT_XMII_CTRL_1 , &data8); - gbit =ksz9477_get_gbit (dev, data8); + gbit =ksz_get_gbit (dev, port); mode =ksz9477_get_xmii (dev, data8);switch (mode) {case 2 :
@@ -1122,22 +1096,22 @@ void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port)switch (p->interface) {case PHY_INTERFACE_MODE_MII :ksz9477_set_xmii (dev,0 , &data8); -ksz9477_set_gbit (dev, false, &data8); +ksz_set_gbit (dev, port, false); p->phydev.speed =SPEED_100 ;break ;case PHY_INTERFACE_MODE_RMII :ksz9477_set_xmii (dev,1 , &data8); -ksz9477_set_gbit (dev, false, &data8); +ksz_set_gbit (dev, port, false); p->phydev.speed =SPEED_100 ;break ;case PHY_INTERFACE_MODE_GMII :ksz9477_set_xmii (dev,2 , &data8); -ksz9477_set_gbit (dev, true, &data8); +ksz_set_gbit (dev, port, true); p->phydev.speed =SPEED_1000 ;break ;default :ksz9477_set_xmii (dev,3 , &data8); -ksz9477_set_gbit (dev, true, &data8); +ksz_set_gbit (dev, port, true); data8 &= ~PORT_RGMII_ID_IG_ENABLE ; data8 &= ~PORT_RGMII_ID_EG_ENABLE ; if (p->interface == PHY_INTERFACE_MODE_RGMII_ID ||
drivers/net/dsa/microchip/ksz9477_reg.h +0 -4
@@ -1185,10 +1185,6 @@#define REG_PORT_XMII_CTRL_1 0x0301#define PORT_RMII_CLK_SEL BIT(7) -/* S1 */ -#define PORT_MII_1000MBIT_S1 BIT(6) -/* S2 */ -#define PORT_MII_NOT_1GBIT BIT(6)#define PORT_MII_SEL_EDGE BIT(5)#define PORT_RGMII_ID_IG_ENABLE BIT(4)#define PORT_RGMII_ID_EG_ENABLE BIT(3)
drivers/net/dsa/microchip/ksz_common.c +61 -0
163 lines not on this page · raw message
drivers/net/dsa/microchip/ksz_common.h +12 -0
@@ -51,6 +51,7 @@ struct ksz_chip_data {const u16 *regs;const u32 *masks;const u8 *shifts; +const u8 *xmii_ctrl1;int stp_ctrl_reg;int broadcast_ctrl_reg;int multicast_ctrl_reg;
@@ -169,6 +170,7 @@ enum ksz_regs {S_START_CTRL ,S_BROADCAST_CTRL ,S_MULTICAST_CTRL , + P_XMII_CTRL_1, }; enum ksz_masks {
@@ -208,6 +210,11 @@ enum ksz_shifts { ALU_STAT_INDEX, }; +enum ksz_xmii_ctrl1 { +P_GMII_1GBIT , +P_GMII_NOT_1GBIT , +}; +struct alu_struct {/* entry 1 */ u8 is_static:1 ;
@@ -293,6 +300,8 @@ void ksz_switch_remove(struct ksz_device *dev);void ksz_init_mib_timer (struct ksz_device *dev);void ksz_r_mib_stats64 (struct ksz_device *dev,int port);void ksz_port_stp_state_set (struct dsa_switch *ds,int port,u8 state); +bool ksz_get_gbit (struct ksz_device *dev,int port); +void ksz_set_gbit (struct ksz_device *dev,int port,bool gbit);extern const struct ksz_chip_data ksz_switch_chips[];/* Common register access functions */
@@ -456,6 +465,9 @@ static inline int is_lan937x(struct ksz_device *dev)#define SW_START 0x01 +/* xMII configuration */ +#define P_GMII_1GBIT_M BIT(6) +/* Regmap tables generation */ #define KSZ_SPI_OP_RD 3#define KSZ_SPI_OP_WR 2
drivers/net/dsa/microchip/lan937x_main.c +4 -12
@@ -312,14 +312,6 @@ int lan937x_change_mtu(struct ksz_device *dev, int port, int new_mtu)return 0 ; } -static void lan937x_config_gbit (struct ksz_device *dev,bool gbit,u8 *data) -{ -if (gbit) - *data &= ~PORT_MII_NOT_1GBIT ; -else - *data |=PORT_MII_NOT_1GBIT ; -} -static void lan937x_mac_config (struct ksz_device *dev,int port,phy_interface_t interface) {
@@ -333,11 +325,11 @@ static void lan937x_mac_config(struct ksz_device *dev, int port,/* configure MAC based on interface */ switch (interface) {case PHY_INTERFACE_MODE_MII : -lan937x_config_gbit (dev, false, &data8); +ksz_set_gbit (dev, port, false); data8 |=PORT_MII_SEL ;break ;case PHY_INTERFACE_MODE_RMII : -lan937x_config_gbit (dev, false, &data8); +ksz_set_gbit (dev, port, false); data8 |=PORT_RMII_SEL ;break ;default :
@@ -363,9 +355,9 @@ static void lan937x_config_interface(struct ksz_device *dev, int port, PORT_MII_TX_FLOW_CTRL | PORT_MII_RX_FLOW_CTRL);if (speed ==SPEED_1000 ) -lan937x_config_gbit (dev, true, &xmii_ctrl1); +ksz_set_gbit (dev, port, true);else -lan937x_config_gbit (dev, false, &xmii_ctrl1); +ksz_set_gbit (dev, port, false);if (speed ==SPEED_100 ) xmii_ctrl0 |=PORT_MII_100MBIT ;
drivers/net/dsa/microchip/lan937x_reg.h +0 -1
@@ -140,7 +140,6 @@#define PORT_GRXC_ENABLE BIT(0)#define REG_PORT_XMII_CTRL_1 0x0301 -#define PORT_MII_NOT_1GBIT BIT(6)#define PORT_MII_SEL_EDGE BIT(5)#define PORT_RGMII_ID_IG_ENABLE BIT(4)#define PORT_RGMII_ID_EG_ENABLE BIT(3)
Signature · 1 line
2.36.1
PATCH v2 2/9 net: dsa: microchip: add common ksz port xmii speed selection function
In reply to Arun RamadossThis patch adds the function for configuring the 100/10Mbps speed selection for the ksz switches. KSZ8795 switch uses Global control 4 register 0x06 bit 4 for choosing 100/10Mpbs. Other switches uses xMII control 1 0xN300 for it.
For KSZ8795, if the bit is set then 10Mbps is chosen and if bit is clear then 100Mbps chosen. For all other switches it is other way around, if the bit is set then 100Mbps is chosen.
So, this patch add the generic function for ksz switch to select the 100/10Mbps speed selection. While configuring, first it disables the gigabit functionality and then configure the respective speed.
--- drivers/net/dsa/microchip/ksz9477_reg.h | 1 - drivers/net/dsa/microchip/ksz_common.c | 54 ++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_common.h | 10 +++++ drivers/net/dsa/microchip/lan937x_main.c | 18 +++----- drivers/net/dsa/microchip/lan937x_reg.h | 1 - 5 files changed, 69 insertions(+), 15 deletions(-)
drivers/net/dsa/microchip/ksz9477_reg.h +0 -1
@@ -1179,7 +1179,6 @@#define PORT_SGMII_SEL BIT(7)#define PORT_MII_FULL_DUPLEX BIT(6) -#define PORT_MII_100MBIT BIT(4)#define PORT_GRXC_ENABLE BIT(0)#define REG_PORT_XMII_CTRL_1 0x0301
drivers/net/dsa/microchip/ksz_common.c +54 -0
156 lines not on this page · raw message
drivers/net/dsa/microchip/ksz_common.h +10 -0
@@ -51,6 +51,7 @@ struct ksz_chip_data {const u16 *regs;const u32 *masks;const u8 *shifts; +const u8 *xmii_ctrl0;const u8 *xmii_ctrl1;int stp_ctrl_reg;int broadcast_ctrl_reg;
@@ -170,6 +171,7 @@ enum ksz_regs {S_START_CTRL ,S_BROADCAST_CTRL ,S_MULTICAST_CTRL , +P_XMII_CTRL_0 , P_XMII_CTRL_1, };
@@ -210,6 +212,11 @@ enum ksz_shifts { ALU_STAT_INDEX, }; +enum ksz_xmii_ctrl0 { +P_MII_100MBIT , +P_MII_10MBIT , +}; +enum ksz_xmii_ctrl1 {P_GMII_1GBIT ,P_GMII_NOT_1GBIT ,
@@ -302,6 +309,7 @@ void ksz_r_mib_stats64(struct ksz_device *dev, int port);void ksz_port_stp_state_set (struct dsa_switch *ds,int port,u8 state);bool ksz_get_gbit (struct ksz_device *dev,int port);void ksz_set_gbit (struct ksz_device *dev,int port,bool gbit); +void ksz_port_set_xmii_speed (struct ksz_device *dev,int port,int speed);extern const struct ksz_chip_data ksz_switch_chips[];/* Common register access functions */
@@ -466,6 +474,8 @@ static inline int is_lan937x(struct ksz_device *dev)#define SW_START 0x01/* xMII configuration */ +#define P_MII_100MBIT_M BIT(4) +#define P_GMII_1GBIT_M BIT(6)/* Regmap tables generation */
drivers/net/dsa/microchip/lan937x_main.c +5 -13
@@ -346,21 +346,14 @@ static void lan937x_config_interface(struct ksz_device *dev, int port, int speed, int duplex, bool tx_pause, bool rx_pause) { - u8 xmii_ctrl0, xmii_ctrl1; + u8 xmii_ctrl0; -ksz_pread8 (dev, port,REG_PORT_XMII_CTRL_0 , &xmii_ctrl0); -ksz_pread8 (dev, port,REG_PORT_XMII_CTRL_1 , &xmii_ctrl1); - - xmii_ctrl0 &= ~(PORT_MII_100MBIT |PORT_MII_FULL_DUPLEX | -PORT_MII_TX_FLOW_CTRL |PORT_MII_RX_FLOW_CTRL ); +ksz_port_set_xmii_speed (dev, port, speed); -if (speed ==SPEED_1000 ) -ksz_set_gbit (dev, port, true); -else -ksz_set_gbit (dev, port, false); +ksz_pread8 (dev, port,REG_PORT_XMII_CTRL_0 , &xmii_ctrl0); -if (speed ==SPEED_100 ) - xmii_ctrl0 |=PORT_MII_100MBIT ; + xmii_ctrl0 &= ~(PORT_MII_FULL_DUPLEX |PORT_MII_TX_FLOW_CTRL | +PORT_MII_RX_FLOW_CTRL );if (duplex) xmii_ctrl0 |=PORT_MII_FULL_DUPLEX ;
@@ -372,7 +365,6 @@ static void lan937x_config_interface(struct ksz_device *dev, int port, xmii_ctrl0 |=PORT_MII_RX_FLOW_CTRL ;ksz_pwrite8 (dev, port,REG_PORT_XMII_CTRL_0 , xmii_ctrl0); -ksz_pwrite8 (dev, port,REG_PORT_XMII_CTRL_1 , xmii_ctrl1); } void lan937x_phylink_get_caps(struct ksz_device *dev, int port,
drivers/net/dsa/microchip/lan937x_reg.h +0 -1
@@ -135,7 +135,6 @@#define PORT_SGMII_SEL BIT(7)#define PORT_MII_FULL_DUPLEX BIT(6)#define PORT_MII_TX_FLOW_CTRL BIT(5) -#define PORT_MII_100MBIT BIT(4)#define PORT_MII_RX_FLOW_CTRL BIT(3)#define PORT_GRXC_ENABLE BIT(0)
Signature · 1 line
2.36.1
PATCH v2 3/9 net: dsa: microchip: add common duplex and flow control function
In reply to Arun RamadossThis patch add common function for configuring the Full/Half duplex and transmit/receive flow control. KSZ8795 uses the Global control register 4 for configuring the duplex and flow control, whereas all other KSZ9477 based switch uses the xMII Control 0 register.
--- drivers/net/dsa/microchip/ksz9477_reg.h | 1 - drivers/net/dsa/microchip/ksz_common.c | 36 ++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_common.h | 15 ++++++++++ drivers/net/dsa/microchip/lan937x_main.c | 25 ++++------------ drivers/net/dsa/microchip/lan937x_reg.h | 3 -- 5 files changed, 57 insertions(+), 23 deletions(-)
drivers/net/dsa/microchip/ksz9477_reg.h +0 -1
@@ -1178,7 +1178,6 @@#define REG_PORT_XMII_CTRL_0 0x0300#define PORT_SGMII_SEL BIT(7) -#define PORT_MII_FULL_DUPLEX BIT(6)#define PORT_GRXC_ENABLE BIT(0)#define REG_PORT_XMII_CTRL_1 0x0301
drivers/net/dsa/microchip/ksz_common.c +36 -0
@@ -281,11 +281,15 @@ static const u32 ksz8795_masks[] = { [DYNAMIC_MAC_TABLE_FID] = GENMASK(26, 20), [DYNAMIC_MAC_TABLE_SRC_PORT] = GENMASK(26, 24), [DYNAMIC_MAC_TABLE_TIMESTAMP] = GENMASK(28, 27), + [P_MII_TX_FLOW_CTRL] = BIT(5), + [P_MII_RX_FLOW_CTRL] = BIT(5), };static const u8 ksz8795_xmii_ctrl0[] = { [P_MII_100MBIT ] =0 , [P_MII_10MBIT ] =1 , + [P_MII_FULL_DUPLEX ] =0 , + [P_MII_HALF_DUPLEX ] =1 , };static const u8 ksz8795_xmii_ctrl1[] = {
@@ -370,6 +374,8 @@ static const u16 ksz9477_regs[] = {static const u32 ksz9477_masks[] = { [ALU_STAT_WRITE ] =0 , [ALU_STAT_READ ] =1 , + [P_MII_TX_FLOW_CTRL ] =BIT (5 ), + [P_MII_RX_FLOW_CTRL ] =BIT (3 ), };static const u8 ksz9477_shifts[] = {
@@ -379,6 +385,8 @@ static const u8 ksz9477_shifts[] = {static const u8 ksz9477_xmii_ctrl0[] = { [P_MII_100MBIT ] =1 , [P_MII_10MBIT ] =0 , + [P_MII_FULL_DUPLEX ] =1 , + [P_MII_HALF_DUPLEX ] =0 , };static const u8 ksz9477_xmii_ctrl1[] = {
@@ -389,6 +397,8 @@ static const u8 ksz9477_xmii_ctrl1[] = {static const u32 lan937x_masks[] = { [ALU_STAT_WRITE ] =1 , [ALU_STAT_READ ] =2 , + [P_MII_TX_FLOW_CTRL ] =BIT (5 ), + [P_MII_RX_FLOW_CTRL ] =BIT (3 ), };static const u8 lan937x_shifts[] = {
@@ -1468,6 +1478,32 @@ void ksz_port_set_xmii_speed(struct ksz_device *dev, int port, int speed)ksz_set_100_10mbit (dev, port, speed); } +void ksz_duplex_flowctrl (struct ksz_device *dev,int port,int duplex, +bool tx_pause,bool rx_pause) +{ +const u8 *bitval = dev->info->xmii_ctrl0; +const u32 *masks = dev->info->masks; +const u16 *regs = dev->info->regs; +u8 mask; +u8 val; + + mask =P_MII_DUPLEX_M | masks[P_MII_TX_FLOW_CTRL ] | + masks[P_MII_RX_FLOW_CTRL ]; + +if (duplex ==DUPLEX_FULL ) + val =FIELD_PREP (P_MII_DUPLEX_M , bitval[P_MII_FULL_DUPLEX ]); +else + val =FIELD_PREP (P_MII_DUPLEX_M , bitval[P_MII_HALF_DUPLEX ]); + +if (tx_pause) + val |= masks[P_MII_TX_FLOW_CTRL ]; + +if (rx_pause) + val |= masks[P_MII_RX_FLOW_CTRL ]; + +ksz_prmw8 (dev, port, regs[P_XMII_CTRL_0 ], mask, val); +} + static void ksz_phylink_mac_link_up(struct dsa_switch *ds, int port, unsigned int mode, phy_interface_t interface,
drivers/net/dsa/microchip/ksz_common.h +15 -0
@@ -197,6 +197,8 @@ enum ksz_masks {DYNAMIC_MAC_TABLE_TIMESTAMP ,ALU_STAT_WRITE ,ALU_STAT_READ , +P_MII_TX_FLOW_CTRL , + P_MII_RX_FLOW_CTRL, }; enum ksz_shifts {
@@ -215,6 +217,8 @@ enum ksz_shifts {enum ksz_xmii_ctrl0 {P_MII_100MBIT ,P_MII_10MBIT , +P_MII_FULL_DUPLEX , +P_MII_HALF_DUPLEX , };enum ksz_xmii_ctrl1 {
@@ -310,6 +314,8 @@ void ksz_port_stp_state_set(struct dsa_switch *ds, int port, u8 state);bool ksz_get_gbit (struct ksz_device *dev,int port);void ksz_set_gbit (struct ksz_device *dev,int port,bool gbit);void ksz_port_set_xmii_speed (struct ksz_device *dev,int port,int speed); +void ksz_duplex_flowctrl (struct ksz_device *dev,int port,int duplex, +bool tx_pause,bool rx_pause);extern const struct ksz_chip_data ksz_switch_chips[];/* Common register access functions */
@@ -416,6 +422,14 @@ static inline void ksz_pwrite32(struct ksz_device *dev, int port, int offset,ksz_write32 (dev, dev->dev_ops->get_port_addr (port, offset), data); } +static inline void ksz_prmw8 (struct ksz_device *dev,int port,int offset, +u8 mask,u8 val) +{ +regmap_update_bits (dev->regmap[0 ], + dev->dev_ops->get_port_addr (port, offset), + mask, val); +} +static inline void ksz_regmap_lock (void *__mtx) {struct mutex *mtx = __mtx;
@@ -474,6 +488,7 @@ static inline int is_lan937x(struct ksz_device *dev)#define SW_START 0x01/* xMII configuration */ +#define P_MII_DUPLEX_M BIT(6)#define P_MII_100MBIT_M BIT(4)#define P_GMII_1GBIT_M BIT(6)
drivers/net/dsa/microchip/lan937x_main.c +6 -19
@@ -234,6 +234,8 @@ int lan937x_reset_switch(struct ksz_device *dev)void lan937x_port_setup (struct ksz_device *dev,int port,bool cpu_port) { +const u32 *masks = dev->info->masks; +const u16 *regs = dev->info->regs;struct dsa_switch *ds = dev->ds;u8 member;
@@ -254,8 +256,9 @@ void lan937x_port_setup(struct ksz_device *dev, int port, bool cpu_port)lan937x_port_cfg (dev, port,P_PRIO_CTRL ,PORT_802_1P_PRIO_ENABLE , true);if (!dev->info->internal_phy[port]) -lan937x_port_cfg (dev, port,REG_PORT_XMII_CTRL_0 , -PORT_MII_TX_FLOW_CTRL |PORT_MII_RX_FLOW_CTRL , +lan937x_port_cfg (dev, port, regs[P_XMII_CTRL_0 ], + masks[P_MII_TX_FLOW_CTRL ] | + masks[P_MII_RX_FLOW_CTRL ], true);if (cpu_port)
@@ -346,25 +349,9 @@ static void lan937x_config_interface(struct ksz_device *dev, int port, int speed, int duplex, bool tx_pause, bool rx_pause) { - u8 xmii_ctrl0; -ksz_port_set_xmii_speed (dev ,port ,speed ); -ksz_pread8 (dev, port,REG_PORT_XMII_CTRL_0 , &xmii_ctrl0); - - xmii_ctrl0 &= ~(PORT_MII_FULL_DUPLEX |PORT_MII_TX_FLOW_CTRL | -PORT_MII_RX_FLOW_CTRL ); - -if (duplex) - xmii_ctrl0 |=PORT_MII_FULL_DUPLEX ; - -if (tx_pause) - xmii_ctrl0 |=PORT_MII_TX_FLOW_CTRL ; - -if (rx_pause) - xmii_ctrl0 |=PORT_MII_RX_FLOW_CTRL ; - -ksz_pwrite8 (dev, port,REG_PORT_XMII_CTRL_0 , xmii_ctrl0); +ksz_duplex_flowctrl (dev, port, duplex, tx_pause, rx_pause); } void lan937x_phylink_get_caps(struct ksz_device *dev, int port,
drivers/net/dsa/microchip/lan937x_reg.h +0 -3
@@ -133,9 +133,6 @@/* 3 - xMII */ #define REG_PORT_XMII_CTRL_0 0x0300#define PORT_SGMII_SEL BIT(7) -#define PORT_MII_FULL_DUPLEX BIT(6) -#define PORT_MII_TX_FLOW_CTRL BIT(5) -#define PORT_MII_RX_FLOW_CTRL BIT(3)#define PORT_GRXC_ENABLE BIT(0)#define REG_PORT_XMII_CTRL_1 0x0301
Signature · 1 line
2.36.1
PATCH v2 4/9 net: dsa: microchip: add support for common phylink mac link up
In reply to Arun RamadossThis patch add the support for common phylink mac link up for the ksz series switch. The register address, bit position and values are configured based on the chip id to the dev->info structure.
--- drivers/net/dsa/microchip/ksz_common.c | 20 ++++++++++++++++---- drivers/net/dsa/microchip/ksz_common.h | 3 --- drivers/net/dsa/microchip/lan937x.h | 4 ---- drivers/net/dsa/microchip/lan937x_main.c | 22 ---------------------- 4 files changed, 16 insertions(+), 33 deletions(-)
drivers/net/dsa/microchip/ksz_common.c +16 -4
@@ -223,7 +223,6 @@ static const struct ksz_dev_ops lan937x_dev_ops = { .mirror_del = ksz9477_port_mirror_del, .get_caps = lan937x_phylink_get_caps, .phylink_mac_config = lan937x_phylink_mac_config, - .phylink_mac_link_up = lan937x_phylink_mac_link_up, .fdb_dump = ksz9477_fdb_dump, .fdb_add = ksz9477_fdb_add, .fdb_del = ksz9477_fdb_del,
@@ -1467,7 +1466,7 @@ static void ksz_set_100_10mbit(struct ksz_device *dev, int port, int speed)ksz_pwrite8 (dev, port, regs[P_XMII_CTRL_0 ], data8); } -void ksz_port_set_xmii_speed (struct ksz_device *dev,int port,int speed) +static void ksz_port_set_xmii_speed (struct ksz_device *dev,int port,int speed) {if (speed ==SPEED_1000 )ksz_set_gbit (dev, port, true);
@@ -1478,8 +1477,8 @@ void ksz_port_set_xmii_speed(struct ksz_device *dev, int port, int speed)ksz_set_100_10mbit (dev, port, speed); } -void ksz_duplex_flowctrl (struct ksz_device *dev,int port,int duplex, -bool tx_pause,bool rx_pause) +static void ksz_duplex_flowctrl (struct ksz_device *dev,int port,int duplex, +bool tx_pause,bool rx_pause) {const u8 *bitval = dev->info->xmii_ctrl0;const u32 *masks = dev->info->masks;
@@ -1511,6 +1510,19 @@ static void ksz_phylink_mac_link_up(struct dsa_switch *ds, int port, int duplex, bool tx_pause, bool rx_pause) { struct ksz_device *dev = ds->priv; +struct ksz_port *p; + + p = &dev->ports[port]; + +/* Internal PHYs */ +if (dev->info->internal_phy[port]) +return ; + + p->phydev.speed = speed; + +ksz_port_set_xmii_speed (dev, port, speed); + +ksz_duplex_flowctrl (dev, port, duplex, tx_pause, rx_pause); if (dev->dev_ops->phylink_mac_link_up) dev->dev_ops->phylink_mac_link_up(dev, port, mode, interface,
drivers/net/dsa/microchip/ksz_common.h +0 -3
@@ -313,9 +313,6 @@ void ksz_r_mib_stats64(struct ksz_device *dev, int port);void ksz_port_stp_state_set (struct dsa_switch *ds,int port,u8 state);bool ksz_get_gbit (struct ksz_device *dev,int port);void ksz_set_gbit (struct ksz_device *dev,int port,bool gbit); -void ksz_port_set_xmii_speed (struct ksz_device *dev,int port,int speed); -void ksz_duplex_flowctrl (struct ksz_device *dev,int port,int duplex, -bool tx_pause,bool rx_pause);extern const struct ksz_chip_data ksz_switch_chips[];/* Common register access functions */
drivers/net/dsa/microchip/lan937x.h +0 -4
@@ -17,10 +17,6 @@ void lan937x_w_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 val);int lan937x_change_mtu (struct ksz_device *dev,int port,int new_mtu);void lan937x_phylink_get_caps (struct ksz_device *dev,int port,struct phylink_config *config); -void lan937x_phylink_mac_link_up (struct ksz_device *dev,int port, -unsigned int mode,phy_interface_t interface, -struct phy_device *phydev,int speed, -int duplex,bool tx_pause,bool rx_pause);void lan937x_phylink_mac_config (struct ksz_device *dev,int port,unsigned int mode,const struct phylink_link_state *state);
drivers/net/dsa/microchip/lan937x_main.c +0 -22
@@ -345,15 +345,6 @@ static void lan937x_mac_config(struct ksz_device *dev, int port,ksz_pwrite8 (dev, port,REG_PORT_XMII_CTRL_1 , data8); } -static void lan937x_config_interface (struct ksz_device *dev,int port, -int speed,int duplex, -bool tx_pause,bool rx_pause) -{ -ksz_port_set_xmii_speed (dev, port, speed); - -ksz_duplex_flowctrl (dev, port, duplex, tx_pause, rx_pause); -} -void lan937x_phylink_get_caps (struct ksz_device *dev,int port,struct phylink_config *config) {
@@ -366,19 +357,6 @@ void lan937x_phylink_get_caps(struct ksz_device *dev, int port, } } -void lan937x_phylink_mac_link_up (struct ksz_device *dev,int port, -unsigned int mode,phy_interface_t interface, -struct phy_device *phydev,int speed, -int duplex,bool tx_pause,bool rx_pause) -{ -/* Internal PHYs */ -if (dev->info->internal_phy[port]) -return ; - -lan937x_config_interface (dev, port, speed, duplex, - tx_pause, rx_pause); -} -void lan937x_phylink_mac_config (struct ksz_device *dev,int port,unsigned int mode,const struct phylink_link_state *state)
Signature · 1 line
2.36.1
PATCH v2 5/9 net: dsa: microchip: lan937x: add support for configuing xMII register
In reply to Arun RamadossThis patch add the common ksz_set_xmii function for ksz series switch and update the lan937x code phylink mac config. The register address for the ksz8795 is Port 5 Interface control 6 and for all other switch is xMII Control 1.
The bit value for selecting the interface is same for KSZ8795 and KSZ9893 are same. The bit values for KSZ9477 and lan973x are same. So, this patch add the bit value for each switches in ksz_chip_data and configure the registers based on the chip id.
--- drivers/net/dsa/microchip/ksz_common.c | 44 ++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_common.h | 8 +++++ drivers/net/dsa/microchip/lan937x_main.c | 32 +---------------- drivers/net/dsa/microchip/lan937x_reg.h | 9 ----- 4 files changed, 53 insertions(+), 40 deletions(-)
drivers/net/dsa/microchip/ksz_common.c +44 -0
@@ -292,6 +292,10 @@ static const u8 ksz8795_xmii_ctrl0[] = { };static const u8 ksz8795_xmii_ctrl1[] = { + [P_RGMII_SEL ] =3 , + [P_GMII_SEL ] =2 , + [P_RMII_SEL ] =1 , + [P_MII_SEL ] =0 , [P_GMII_1GBIT ] =1 , [P_GMII_NOT_1GBIT ] =0 , };
@@ -389,6 +393,10 @@ static const u8 ksz9477_xmii_ctrl0[] = { };static const u8 ksz9477_xmii_ctrl1[] = { + [P_RGMII_SEL ] =0 , + [P_RMII_SEL ] =1 , + [P_GMII_SEL ] =2 , + [P_MII_SEL ] =3 , [P_GMII_1GBIT ] =0 , [P_GMII_NOT_1GBIT ] =1 , };
@@ -1400,6 +1408,42 @@ static int ksz_max_mtu(struct dsa_switch *ds, int port)return dev->dev_ops->max_mtu (dev, port); } +void ksz_set_xmii (struct ksz_device *dev,int port,phy_interface_t interface) +{ +const u8 *bitval = dev->info->xmii_ctrl1; +const u16 *regs = dev->info->regs; +u8 data8; + +ksz_pread8 (dev, port, regs[P_XMII_CTRL_1 ], &data8); + + data8 &= ~P_MII_SEL_M ; + +switch (interface) { +case PHY_INTERFACE_MODE_MII : + data8 |= bitval[P_MII_SEL ]; +break ; +case PHY_INTERFACE_MODE_RMII : + data8 |= bitval[P_RMII_SEL ]; +break ; +case PHY_INTERFACE_MODE_GMII : + data8 |= bitval[P_GMII_SEL ]; +break ; +case PHY_INTERFACE_MODE_RGMII : +case PHY_INTERFACE_MODE_RGMII_ID : +case PHY_INTERFACE_MODE_RGMII_TXID : +case PHY_INTERFACE_MODE_RGMII_RXID : + data8 |= bitval[P_RGMII_SEL ]; +break ; +default : +dev_err (dev->dev,"Unsupported interface '%s' for port %d\n" , +phy_modes (interface), port); +return ; + } + +/* Write the updated value */ +ksz_pwrite8 (dev, port, regs[P_XMII_CTRL_1 ], data8); +} +static void ksz_phylink_mac_config (struct dsa_switch *ds,int port,unsigned int mode,const struct phylink_link_state *state)
drivers/net/dsa/microchip/ksz_common.h +8 -0
@@ -222,6 +222,10 @@ enum ksz_xmii_ctrl0 { };enum ksz_xmii_ctrl1 { +P_RGMII_SEL , +P_RMII_SEL , +P_GMII_SEL , +P_MII_SEL ,P_GMII_1GBIT ,P_GMII_NOT_1GBIT , };
@@ -313,6 +317,7 @@ void ksz_r_mib_stats64(struct ksz_device *dev, int port);void ksz_port_stp_state_set (struct dsa_switch *ds,int port,u8 state);bool ksz_get_gbit (struct ksz_device *dev,int port);void ksz_set_gbit (struct ksz_device *dev,int port,bool gbit); +void ksz_set_xmii (struct ksz_device *dev,int port,phy_interface_t interface);extern const struct ksz_chip_data ksz_switch_chips[];/* Common register access functions */
@@ -489,6 +494,9 @@ static inline int is_lan937x(struct ksz_device *dev)#define P_MII_100MBIT_M BIT(4)#define P_GMII_1GBIT_M BIT(6) +#define P_RGMII_ID_IG_ENABLE BIT(4) +#define P_RGMII_ID_EG_ENABLE BIT(3) +#define P_MII_SEL_M 0x3/* Regmap tables generation */ #define KSZ_SPI_OP_RD 3
drivers/net/dsa/microchip/lan937x_main.c +1 -31
@@ -315,36 +315,6 @@ int lan937x_change_mtu(struct ksz_device *dev, int port, int new_mtu)return 0 ; } -static void lan937x_mac_config (struct ksz_device *dev,int port, -phy_interface_t interface) -{ -u8 data8; - -ksz_pread8 (dev, port,REG_PORT_XMII_CTRL_1 , &data8); - -/* clear MII selection & set it based on interface later */ - data8 &= ~PORT_MII_SEL_M ; - -/* configure MAC based on interface */ -switch (interface) { -case PHY_INTERFACE_MODE_MII : -ksz_set_gbit (dev, port, false); - data8 |=PORT_MII_SEL ; -break ; -case PHY_INTERFACE_MODE_RMII : -ksz_set_gbit (dev, port, false); - data8 |=PORT_RMII_SEL ; -break ; -default : -dev_err (dev->dev,"Unsupported interface '%s' for port %d\n" , -phy_modes (interface), port); -return ; - } - -/* Write the updated value */ -ksz_pwrite8 (dev, port,REG_PORT_XMII_CTRL_1 , data8); -} -void lan937x_phylink_get_caps (struct ksz_device *dev,int port,struct phylink_config *config) {
@@ -370,7 +340,7 @@ void lan937x_phylink_mac_config(struct ksz_device *dev, int port,return ; } -lan937x_mac_config (dev, port, state->interface); +ksz_set_xmii (dev, port, state->interface); }int lan937x_setup (struct dsa_switch *ds)
drivers/net/dsa/microchip/lan937x_reg.h +0 -9
@@ -131,19 +131,10 @@#define REG_PORT_T1_PHY_CTRL_BASE 0x0100/* 3 - xMII */ -#define REG_PORT_XMII_CTRL_0 0x0300#define PORT_SGMII_SEL BIT(7)#define PORT_GRXC_ENABLE BIT(0) -#define REG_PORT_XMII_CTRL_1 0x0301#define PORT_MII_SEL_EDGE BIT(5) -#define PORT_RGMII_ID_IG_ENABLE BIT(4) -#define PORT_RGMII_ID_EG_ENABLE BIT(3) -#define PORT_MII_MAC_MODE BIT(2) -#define PORT_MII_SEL_M 0x3 -#define PORT_RGMII_SEL 0x0 -#define PORT_RMII_SEL 0x1 -#define PORT_MII_SEL 0x2/* 4 - MAC */ #define REG_PORT_MAC_CTRL_0 0x0400
Signature · 1 line
2.36.1
PATCH v2 6/9 net: dsa: microchip: apply rgmii tx and rx delay in phylink mac config
In reply to Arun RamadossThis patch read the rgmii tx and rx delay from device tree and stored it in the ksz_port. It applies the rgmii delay to the xmii tune adjust register based on the interface selected in phylink mac config. There are two rgmii port in LAN937x and value to be loaded in the register vary depends on the port selected.
--- drivers/net/dsa/microchip/ksz_common.c | 53 +++++++++++++++++++++- drivers/net/dsa/microchip/ksz_common.h | 3 ++ drivers/net/dsa/microchip/lan937x.h | 1 + drivers/net/dsa/microchip/lan937x_main.c | 56 ++++++++++++++++++++++++ drivers/net/dsa/microchip/lan937x_reg.h | 18 ++++++++ 5 files changed, 130 insertions(+), 1 deletion(-)
drivers/net/dsa/microchip/ksz_common.c +52 -1
@@ -223,6 +223,7 @@ static const struct ksz_dev_ops lan937x_dev_ops = { .mirror_del = ksz9477_port_mirror_del, .get_caps = lan937x_phylink_get_caps, .phylink_mac_config = lan937x_phylink_mac_config, + .setup_rgmii_delay = lan937x_setup_rgmii_delay, .fdb_dump = ksz9477_fdb_dump, .fdb_add = ksz9477_fdb_add, .fdb_del = ksz9477_fdb_del,
@@ -1411,12 +1412,14 @@ static int ksz_max_mtu(struct dsa_switch *ds, int port)void ksz_set_xmii (struct ksz_device *dev,int port,phy_interface_t interface) {const u8 *bitval = dev->info->xmii_ctrl1; +struct ksz_port *p = &dev->ports[port];const u16 *regs = dev->info->regs;u8 data8;ksz_pread8 (dev, port, regs[P_XMII_CTRL_1 ], &data8); - data8 &= ~P_MII_SEL_M ; + data8 &= ~(P_MII_SEL_M |P_RGMII_ID_IG_ENABLE | +P_RGMII_ID_EG_ENABLE );switch (interface) {case PHY_INTERFACE_MODE_MII :
@@ -1440,6 +1443,12 @@ void ksz_set_xmii(struct ksz_device *dev, int port, phy_interface_t interface)return ; } +if (p->rgmii_tx_val) + data8 |=P_RGMII_ID_EG_ENABLE ; + +if (p->rgmii_rx_val) + data8 |=P_RGMII_ID_IG_ENABLE ; +/* Write the updated value */ ksz_pwrite8 (dev, port, regs[P_XMII_CTRL_1 ], data8); }
@@ -1452,6 +1461,9 @@ static void ksz_phylink_mac_config(struct dsa_switch *ds, int port,if (dev->dev_ops->phylink_mac_config) dev->dev_ops->phylink_mac_config (dev, port, mode, state); + +if (dev->dev_ops->setup_rgmii_delay) + dev->dev_ops->setup_rgmii_delay (dev, port); }bool ksz_get_gbit (struct ksz_device *dev,int port)
@@ -1701,6 +1713,43 @@ struct ksz_device *ksz_switch_alloc(struct device *base, void *priv) }EXPORT_SYMBOL (ksz_switch_alloc); +static void ksz_parse_rgmii_delay (struct ksz_device *dev,int port_num, +struct device_node *port_dn) +{ +phy_interface_t phy_mode = dev->ports[port_num].interface; +int rx_delay =-1 , tx_delay =-1 ; + +if (!phy_interface_mode_is_rgmii (phy_mode)) +return ; + +of_property_read_u32 (port_dn,"rx-internal-delay-ps" , &rx_delay); +of_property_read_u32 (port_dn,"tx-internal-delay-ps" , &tx_delay); + +if (rx_delay ==-1 && tx_delay ==-1 ) { +dev_warn (dev->dev, +"Port %d interpreting RGMII delay settings based on \"phy-mode\" property, " +"please update device tree to specify \"rx-internal-delay-ps\" and " +"\"tx-internal-delay-ps\"" , + port_num); + +if (phy_mode ==PHY_INTERFACE_MODE_RGMII_RXID || + phy_mode ==PHY_INTERFACE_MODE_RGMII_ID ) + rx_delay =2000 ; + +if (phy_mode ==PHY_INTERFACE_MODE_RGMII_TXID || + phy_mode ==PHY_INTERFACE_MODE_RGMII_ID ) + tx_delay =2000 ; + } + +if (rx_delay <0 ) + rx_delay =0 ; +if (tx_delay <0 ) + tx_delay =0 ; + + dev->ports[port_num].rgmii_rx_val = rx_delay; + dev->ports[port_num].rgmii_tx_val = tx_delay; +} +int ksz_switch_register (struct ksz_device *dev) {const struct ksz_chip_data *info;
@@ -1798,6 +1847,8 @@ int ksz_switch_register(struct ksz_device *dev) }of_get_phy_mode (port, &dev->ports[port_num].interface); + +ksz_parse_rgmii_delay (dev, port_num, port); }of_node_put (ports); }
drivers/net/dsa/microchip/ksz_common.h +3 -0
@@ -79,6 +79,8 @@ struct ksz_port {struct ksz_port_mib mib;phy_interface_t interface;u16 max_frame; +u32 rgmii_tx_val; +u32 rgmii_rx_val; };struct ksz_device {
@@ -301,6 +303,7 @@ struct ksz_dev_ops {phy_interface_t interface, struct phy_device *phydev, int speed, int duplex, bool tx_pause, bool rx_pause); +void (*setup_rgmii_delay)(struct ksz_device *dev,int port);void (*config_cpu_port)(struct dsa_switch *ds);int (*enable_stp_addr)(struct ksz_device *dev);int (*reset)(struct ksz_device *dev);
drivers/net/dsa/microchip/lan937x.h +1 -0
@@ -20,4 +20,5 @@ void lan937x_phylink_get_caps(struct ksz_device *dev, int port,void lan937x_phylink_mac_config (struct ksz_device *dev,int port,unsigned int mode,const struct phylink_link_state *state); +void lan937x_setup_rgmii_delay (struct ksz_device *dev,int port);#endif
drivers/net/dsa/microchip/lan937x_main.c +56 -0
68 lines not on this page · raw message
drivers/net/dsa/microchip/lan937x_reg.h +18 -0
@@ -136,6 +136,12 @@#define PORT_MII_SEL_EDGE BIT(5) +#define REG_PORT_XMII_CTRL_4 0x0304 +#define REG_PORT_XMII_CTRL_5 0x0306 + +#define PORT_DLL_RESET BIT(15) +#define PORT_TUNE_ADJ GENMASK(13, 7) +/* 4 - MAC */ #define REG_PORT_MAC_CTRL_0 0x0400#define PORT_CHECK_LENGTH BIT(2)
@@ -161,6 +167,18 @@#define P_PRIO_CTRL REG_PORT_MRI_PRIO_CTRL +/* The port number as per the datasheet */ +#define RGMII_2_PORT_NUM 5 +#define RGMII_1_PORT_NUM 6 + +#define LAN937X_RGMII_2_PORT (RGMII_2_PORT_NUM - 1) +#define LAN937X_RGMII_1_PORT (RGMII_1_PORT_NUM - 1) + +#define RGMII_1_TX_DELAY_2NS 2 +#define RGMII_2_TX_DELAY_2NS 0 +#define RGMII_1_RX_DELAY_2NS 0x1B +#define RGMII_2_RX_DELAY_2NS 0x14 +#define LAN937X_TAG_LEN 2#endif
Signature · 1 line
2.36.1
PATCH v2 7/9 net: dsa: microchip: ksz9477: use common xmii function
In reply to Arun RamadossIn ksz9477.c file, configuring the xmii register is performed based on the flag NEW_XMII. The flag is reset for ksz9893 switch and set for other switch. This patch uses the ksz common xmii set and get function. The bit values are configured based on the chip id.
--- drivers/net/dsa/microchip/ksz9477.c | 153 +----------------------- drivers/net/dsa/microchip/ksz9477_reg.h | 18 --- drivers/net/dsa/microchip/ksz_common.c | 38 +++++- drivers/net/dsa/microchip/ksz_common.h | 7 +- 4 files changed, 49 insertions(+), 167 deletions(-)
drivers/net/dsa/microchip/ksz9477.c +6 -147
@@ -19,11 +19,6 @@#include "ksz_common.h" #include "ksz9477.h" -/* Used with variable features to indicate capabilities. */ -#define GBIT_SUPPORT BIT(0) -#define NEW_XMII BIT(1) -#define IS_9893 BIT(2) -static void ksz_cfg (struct ksz_device *dev,u32 addr,u8 bits,bool set) {regmap_update_bits (dev->regmap[0 ], addr, bits, set ? bits :0 );
@@ -866,116 +861,18 @@ void ksz9477_port_mirror_del(struct ksz_device *dev, int port, PORT_MIRROR_SNIFFER, false); } -static int ksz9477_get_xmii (struct ksz_device *dev,u8 data) -{ -int mode; - -if (dev->features &NEW_XMII ) { -switch (data &PORT_MII_SEL_M ) { -case PORT_MII_SEL : - mode =0 ; -break ; -case PORT_RMII_SEL : - mode =1 ; -break ; -case PORT_GMII_SEL : - mode =2 ; -break ; -default : - mode =3 ; - } - }else { -switch (data &PORT_MII_SEL_M ) { -case PORT_MII_SEL_S1 : - mode =0 ; -break ; -case PORT_RMII_SEL_S1 : - mode =1 ; -break ; -case PORT_GMII_SEL_S1 : - mode =2 ; -break ; -default : - mode =3 ; - } - } -return mode; -} - -static void ksz9477_set_xmii (struct ksz_device *dev,int mode,u8 *data) -{ -u8 xmii; - -if (dev->features &NEW_XMII ) { -switch (mode) { -case 0 : - xmii =PORT_MII_SEL ; -break ; -case 1 : - xmii =PORT_RMII_SEL ; -break ; -case 2 : - xmii =PORT_GMII_SEL ; -break ; -default : - xmii =PORT_RGMII_SEL ; -break ; - } - }else { -switch (mode) { -case 0 : - xmii =PORT_MII_SEL_S1 ; -break ; -case 1 : - xmii =PORT_RMII_SEL_S1 ; -break ; -case 2 : - xmii =PORT_GMII_SEL_S1 ; -break ; -default : - xmii =PORT_RGMII_SEL_S1 ; -break ; - } - } - *data &= ~PORT_MII_SEL_M ; - *data |= xmii; -} -static phy_interface_t ksz9477_get_interface (struct ksz_device *dev,int port) {phy_interface_t interface;bool gbit; -int mode; -u8 data8;if (port < dev->phy_port_cnt)return PHY_INTERFACE_MODE_NA ; -ksz_pread8 (dev, port,REG_PORT_XMII_CTRL_1 , &data8); + gbit =ksz_get_gbit (dev, port); - mode =ksz9477_get_xmii (dev, data8); -switch (mode) { -case 2 : - interface =PHY_INTERFACE_MODE_GMII ; -if (gbit) -break ; - fallthrough; -case 0 : - interface =PHY_INTERFACE_MODE_MII ; -break ; -case 1 : - interface =PHY_INTERFACE_MODE_RMII ; -break ; -default : - interface =PHY_INTERFACE_MODE_RGMII ; -if (data8 &PORT_RGMII_ID_EG_ENABLE ) - interface =PHY_INTERFACE_MODE_RGMII_TXID ; -if (data8 &PORT_RGMII_ID_IG_ENABLE ) { - interface =PHY_INTERFACE_MODE_RGMII_RXID ; -if (data8 &PORT_RGMII_ID_EG_ENABLE ) - interface =PHY_INTERFACE_MODE_RGMII_ID ; - } -break ; - } + + interface =ksz_get_xmii (dev, port, gbit); +return interface; }
@@ -1049,8 +946,8 @@ void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port) {struct ksz_port *p = &dev->ports[port];struct dsa_switch *ds = dev->ds; -u8 data8, member;u16 data16; +u8 member;/* enable tag tail for host port */ if (cpu_port)
@@ -1092,42 +989,7 @@ void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port) true);/* configure MAC to 1G & RGMII mode */ -ksz_pread8 (dev, port,REG_PORT_XMII_CTRL_1 , &data8); -switch (p->interface) { -case PHY_INTERFACE_MODE_MII : -ksz9477_set_xmii (dev,0 , &data8); -ksz_set_gbit (dev, port, false); - p->phydev.speed =SPEED_100 ; -break ; -case PHY_INTERFACE_MODE_RMII : -ksz9477_set_xmii (dev,1 , &data8); -ksz_set_gbit (dev, port, false); - p->phydev.speed =SPEED_100 ; -break ; -case PHY_INTERFACE_MODE_GMII : -ksz9477_set_xmii (dev,2 , &data8); -ksz_set_gbit (dev, port, true); - p->phydev.speed =SPEED_1000 ; -break ; -default : -ksz9477_set_xmii (dev,3 , &data8); -ksz_set_gbit (dev, port, true); - data8 &= ~PORT_RGMII_ID_IG_ENABLE ; - data8 &= ~PORT_RGMII_ID_EG_ENABLE ; -if (p->interface ==PHY_INTERFACE_MODE_RGMII_ID || - p->interface ==PHY_INTERFACE_MODE_RGMII_RXID ) - data8 |=PORT_RGMII_ID_IG_ENABLE ; -if (p->interface ==PHY_INTERFACE_MODE_RGMII_ID || - p->interface ==PHY_INTERFACE_MODE_RGMII_TXID ) - data8 |=PORT_RGMII_ID_EG_ENABLE ; -/* On KSZ9893, disable RGMII in-band status support */ -if (dev->features &IS_9893 ) - data8 &= ~PORT_MII_MAC_MODE ; - p->phydev.speed =SPEED_1000 ; -break ; - } -ksz_pwrite8 (dev, port,REG_PORT_XMII_CTRL_1 , data8); - p->phydev.duplex =1 ; +ksz_set_xmii (dev, port, p->interface); }if (cpu_port)
@@ -1315,9 +1177,6 @@ int ksz9477_switch_init(struct ksz_device *dev) dev->features &= ~GBIT_SUPPORT ; dev->phy_port_cnt =2 ; }else { -/* Chip uses new XMII register definitions. */ - dev->features |=NEW_XMII ; -/* Chip does not support gigabit. */ if (!(data8 &SW_GIGABIT_ABLE )) dev->features &= ~GBIT_SUPPORT ;
drivers/net/dsa/microchip/ksz9477_reg.h +0 -18
@@ -1175,29 +1175,11 @@#define PORT_LINK_STATUS_FAIL BIT(0)/* 3 - xMII */ -#define REG_PORT_XMII_CTRL_0 0x0300 -#define PORT_SGMII_SEL BIT(7)#define PORT_GRXC_ENABLE BIT(0) -#define REG_PORT_XMII_CTRL_1 0x0301 -#define PORT_RMII_CLK_SEL BIT(7)#define PORT_MII_SEL_EDGE BIT(5) -#define PORT_RGMII_ID_IG_ENABLE BIT(4) -#define PORT_RGMII_ID_EG_ENABLE BIT(3) -#define PORT_MII_MAC_MODE BIT(2) -#define PORT_MII_SEL_M 0x3 -/* S1 */ -#define PORT_MII_SEL_S1 0x0 -#define PORT_RMII_SEL_S1 0x1 -#define PORT_GMII_SEL_S1 0x2 -#define PORT_RGMII_SEL_S1 0x3 -/* S2 */ -#define PORT_RGMII_SEL 0x0 -#define PORT_RMII_SEL 0x1 -#define PORT_GMII_SEL 0x2 -#define PORT_MII_SEL 0x3/* 4 - MAC */ #define REG_PORT_MAC_CTRL_0 0x0400
drivers/net/dsa/microchip/ksz_common.c +37 -1
@@ -1436,6 +1436,9 @@ void ksz_set_xmii(struct ksz_device *dev, int port, phy_interface_t interface)case PHY_INTERFACE_MODE_RGMII_TXID :case PHY_INTERFACE_MODE_RGMII_RXID : data8 |= bitval[P_RGMII_SEL ]; +/* On KSZ9893, disable RGMII in-band status support */ +if (dev->features &IS_9893 ) + data8 &= ~P_MII_MAC_MODE ;break ;default : dev_err(dev->dev, "Unsupported interface '%s' for port %d\n",
@@ -1453,6 +1456,39 @@ void ksz_set_xmii(struct ksz_device *dev, int port, phy_interface_t interface)ksz_pwrite8 (dev, port, regs[P_XMII_CTRL_1 ], data8); } +phy_interface_t ksz_get_xmii (struct ksz_device *dev,int port,bool gbit) +{ +const u8 *bitval = dev->info->xmii_ctrl1; +const u16 *regs = dev->info->regs; +phy_interface_t interface; +u8 data8; +u8 val; + +ksz_pread8 (dev, port, regs[P_XMII_CTRL_1 ], &data8); + + val =FIELD_GET (P_MII_SEL_M , data8); + +if (val == bitval[P_MII_SEL ]) { +if (gbit) + interface =PHY_INTERFACE_MODE_GMII ; +else + interface =PHY_INTERFACE_MODE_MII ; + }else if (val == bitval[P_RMII_SEL ]) { + interface =PHY_INTERFACE_MODE_RGMII ; + }else { + interface =PHY_INTERFACE_MODE_RGMII ; +if (data8 &P_RGMII_ID_EG_ENABLE ) + interface =PHY_INTERFACE_MODE_RGMII_TXID ; +if (data8 &P_RGMII_ID_IG_ENABLE ) { + interface =PHY_INTERFACE_MODE_RGMII_RXID ; +if (data8 &P_RGMII_ID_EG_ENABLE ) + interface =PHY_INTERFACE_MODE_RGMII_ID ; + } + } + +return interface; +} +static void ksz_phylink_mac_config (struct dsa_switch *ds,int port,unsigned int mode,const struct phylink_link_state *state)
@@ -1484,7 +1520,7 @@ bool ksz_get_gbit(struct ksz_device *dev, int port)return gbit; } -void ksz_set_gbit (struct ksz_device *dev,int port,bool gbit) +static void ksz_set_gbit (struct ksz_device *dev,int port,bool gbit) {const u8 *bitval = dev->info->xmii_ctrl1;const u16 *regs = dev->info->regs;
drivers/net/dsa/microchip/ksz_common.h +6 -1
@@ -319,8 +319,8 @@ void ksz_init_mib_timer(struct ksz_device *dev);void ksz_r_mib_stats64 (struct ksz_device *dev,int port);void ksz_port_stp_state_set (struct dsa_switch *ds,int port,u8 state);bool ksz_get_gbit (struct ksz_device *dev,int port); -void ksz_set_gbit (struct ksz_device *dev,int port,bool gbit);void ksz_set_xmii (struct ksz_device *dev,int port,phy_interface_t interface); +phy_interface_t ksz_get_xmii (struct ksz_device *dev,int port,bool gbit);extern const struct ksz_chip_data ksz_switch_chips[];/* Common register access functions */
@@ -492,6 +492,10 @@ static inline int is_lan937x(struct ksz_device *dev)#define SW_START 0x01 +/* Used with variable features to indicate capabilities. */ +#define GBIT_SUPPORT BIT(0) +#define IS_9893 BIT(2) +/* xMII configuration */ #define P_MII_DUPLEX_M BIT(6)#define P_MII_100MBIT_M BIT(4)
@@ -499,6 +503,7 @@ static inline int is_lan937x(struct ksz_device *dev)#define P_GMII_1GBIT_M BIT(6)#define P_RGMII_ID_IG_ENABLE BIT(4)#define P_RGMII_ID_EG_ENABLE BIT(3) +#define P_MII_MAC_MODE BIT(2)#define P_MII_SEL_M 0x3/* Regmap tables generation */
Signature · 1 line
2.36.1
PATCH v2 8/9 net: dsa: microchip: ksz8795: use common xmii function
In reply to Arun RamadossThis patch updates the ksz8795 cpu configuration to use the ksz common xmii set functions.
--- drivers/net/dsa/microchip/ksz8795.c | 35 +------------------------ drivers/net/dsa/microchip/ksz8795_reg.h | 8 ------ 2 files changed, 1 insertion(+), 42 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +1 -34
@@ -1116,7 +1116,6 @@ void ksz8_port_mirror_del(struct ksz_device *dev, int port,static void ksz8795_cpu_interface_select (struct ksz_device *dev,int port) {struct ksz_port *p = &dev->ports[port]; -u8 data8;if (!p->interface && dev->compat_interface) { dev_warn(dev->dev,
@@ -1126,39 +1125,7 @@ static void ksz8795_cpu_interface_select(struct ksz_device *dev, int port) p->interface = dev->compat_interface; } -/* Configure MII interface for proper network communication. */ -ksz_read8 (dev,REG_PORT_5_CTRL_6 , &data8); - data8 &= ~PORT_INTERFACE_TYPE ; - data8 &= ~PORT_GMII_1GPS_MODE ; -switch (p->interface) { -case PHY_INTERFACE_MODE_MII : - p->phydev.speed =SPEED_100 ; -break ; -case PHY_INTERFACE_MODE_RMII : - data8 |=PORT_INTERFACE_RMII ; - p->phydev.speed =SPEED_100 ; -break ; -case PHY_INTERFACE_MODE_GMII : - data8 |=PORT_GMII_1GPS_MODE ; - data8 |=PORT_INTERFACE_GMII ; - p->phydev.speed =SPEED_1000 ; -break ; -default : - data8 &= ~PORT_RGMII_ID_IN_ENABLE ; - data8 &= ~PORT_RGMII_ID_OUT_ENABLE ; -if (p->interface ==PHY_INTERFACE_MODE_RGMII_ID || - p->interface ==PHY_INTERFACE_MODE_RGMII_RXID ) - data8 |=PORT_RGMII_ID_IN_ENABLE ; -if (p->interface ==PHY_INTERFACE_MODE_RGMII_ID || - p->interface ==PHY_INTERFACE_MODE_RGMII_TXID ) - data8 |=PORT_RGMII_ID_OUT_ENABLE ; - data8 |=PORT_GMII_1GPS_MODE ; - data8 |=PORT_INTERFACE_RGMII ; - p->phydev.speed =SPEED_1000 ; -break ; - } -ksz_write8 (dev,REG_PORT_5_CTRL_6 , data8); - p->phydev.duplex =1 ; +ksz_set_xmii (dev, port, p->interface); }void ksz8_port_setup (struct ksz_device *dev,int port,bool cpu_port)
drivers/net/dsa/microchip/ksz8795_reg.h +0 -8
@@ -170,15 +170,7 @@#define REG_PORT_5_CTRL_6 0x56#define PORT_MII_INTERNAL_CLOCK BIT(7) -#define PORT_GMII_1GPS_MODE BIT(6) -#define PORT_RGMII_ID_IN_ENABLE BIT(4) -#define PORT_RGMII_ID_OUT_ENABLE BIT(3)#define PORT_GMII_MAC_MODE BIT(2) -#define PORT_INTERFACE_TYPE 0x3 -#define PORT_INTERFACE_MII 0 -#define PORT_INTERFACE_RMII 1 -#define PORT_INTERFACE_GMII 2 -#define PORT_INTERFACE_RGMII 3#define REG_PORT_1_CTRL_7 0x17#define REG_PORT_2_CTRL_7 0x27
Signature · 1 line
2.36.1
PATCH v2 9/9 net: dsa: microchip: add support for phylink mac config
In reply to Arun RamadossThis patch add support for phylink mac config for ksz series of switches. All the files ksz8795, ksz9477 and lan937x uses the ksz common xmii function. Instead of calling from the individual files, it is moved to the ksz common phylink mac config function.
--- drivers/net/dsa/microchip/ksz8795.c | 7 ------- drivers/net/dsa/microchip/ksz9477.c | 4 ---- drivers/net/dsa/microchip/ksz_common.c | 18 ++++++++++++++++-- drivers/net/dsa/microchip/ksz_common.h | 6 +++++- drivers/net/dsa/microchip/lan937x.h | 3 --- drivers/net/dsa/microchip/lan937x_main.c | 16 ---------------- 6 files changed, 21 insertions(+), 33 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +0 -7
@@ -26,11 +26,6 @@#include "ksz8795_reg.h" #include "ksz8.h" -static bool ksz_is_ksz88x3 (struct ksz_device *dev) -{ -return dev->chip_id ==0x8830 ; -} -static void ksz_cfg (struct ksz_device *dev,u32 addr,u8 bits,bool set) {regmap_update_bits (dev->regmap[0 ], addr, bits, set ? bits :0 );
@@ -1124,8 +1119,6 @@ static void ksz8795_cpu_interface_select(struct ksz_device *dev, int port) port); p->interface = dev->compat_interface; } - -ksz_set_xmii (dev, port, p->interface); }void ksz8_port_setup (struct ksz_device *dev,int port,bool cpu_port)
drivers/net/dsa/microchip/ksz9477.c +0 -4
@@ -944,7 +944,6 @@ void ksz9477_get_caps(struct ksz_device *dev, int port,void ksz9477_port_setup (struct ksz_device *dev,int port,bool cpu_port) { -struct ksz_port *p = &dev->ports[port];struct dsa_switch *ds = dev->ds;u16 data16;u8 member;
@@ -987,9 +986,6 @@ void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port)ksz_port_cfg (dev, port,REG_PORT_CTRL_0 ,PORT_FORCE_TX_FLOW_CTRL |PORT_FORCE_RX_FLOW_CTRL , true); - -/* configure MAC to 1G & RGMII mode */ -ksz_set_xmii (dev, port, p->interface); }if (cpu_port)
drivers/net/dsa/microchip/ksz_common.c +16 -2
@@ -222,7 +222,6 @@ static const struct ksz_dev_ops lan937x_dev_ops = { .mirror_add = ksz9477_port_mirror_add, .mirror_del = ksz9477_port_mirror_del, .get_caps = lan937x_phylink_get_caps, - .phylink_mac_config = lan937x_phylink_mac_config, .setup_rgmii_delay = lan937x_setup_rgmii_delay, .fdb_dump = ksz9477_fdb_dump, .fdb_add = ksz9477_fdb_add,
@@ -1409,7 +1408,8 @@ static int ksz_max_mtu(struct dsa_switch *ds, int port)return dev->dev_ops->max_mtu (dev, port); } -void ksz_set_xmii (struct ksz_device *dev,int port,phy_interface_t interface) +static void ksz_set_xmii (struct ksz_device *dev,int port, +phy_interface_t interface) {const u8 *bitval = dev->info->xmii_ctrl1;struct ksz_port *p = &dev->ports[port];
@@ -1495,6 +1495,20 @@ static void ksz_phylink_mac_config(struct dsa_switch *ds, int port, {struct ksz_device *dev = ds->priv; +if (ksz_is_ksz88x3 (dev)) +return ; + +/* Internal PHYs */ +if (dev->info->internal_phy[port]) +return ; + +if (phylink_autoneg_inband (mode)) { +dev_err (dev->dev,"In-band AN not supported!\n" ); +return ; + } + +ksz_set_xmii (dev, port, state->interface); +if (dev->dev_ops->phylink_mac_config) dev->dev_ops->phylink_mac_config (dev, port, mode, state);
drivers/net/dsa/microchip/ksz_common.h +5 -1
@@ -319,7 +319,6 @@ void ksz_init_mib_timer(struct ksz_device *dev);void ksz_r_mib_stats64 (struct ksz_device *dev,int port);void ksz_port_stp_state_set (struct dsa_switch *ds,int port,u8 state);bool ksz_get_gbit (struct ksz_device *dev,int port); -void ksz_set_xmii (struct ksz_device *dev,int port,phy_interface_t interface);phy_interface_t ksz_get_xmii (struct ksz_device *dev,int port,bool gbit);extern const struct ksz_chip_data ksz_switch_chips[];
@@ -447,6 +446,11 @@ static inline void ksz_regmap_unlock(void *__mtx)mutex_unlock (mtx); } +static inline bool ksz_is_ksz88x3 (struct ksz_device *dev) +{ +return dev->chip_id ==KSZ8830_CHIP_ID ; +} +static inline int is_lan937x (struct ksz_device *dev) { return dev->chip_id == LAN9370_CHIP_ID ||
drivers/net/dsa/microchip/lan937x.h +0 -3
@@ -17,8 +17,5 @@ void lan937x_w_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 val);int lan937x_change_mtu (struct ksz_device *dev,int port,int new_mtu);void lan937x_phylink_get_caps (struct ksz_device *dev,int port,struct phylink_config *config); -void lan937x_phylink_mac_config (struct ksz_device *dev,int port, -unsigned int mode, -const struct phylink_link_state *state);void lan937x_setup_rgmii_delay (struct ksz_device *dev,int port);#endif
drivers/net/dsa/microchip/lan937x_main.c +0 -16
@@ -383,22 +383,6 @@ void lan937x_setup_rgmii_delay(struct ksz_device *dev, int port) } } -void lan937x_phylink_mac_config (struct ksz_device *dev,int port, -unsigned int mode, -const struct phylink_link_state *state) -{ -/* Internal PHYs */ -if (dev->info->internal_phy[port]) -return ; - -if (phylink_autoneg_inband (mode)) { -dev_err (dev->dev,"In-band AN not supported!\n" ); -return ; - } - -ksz_set_xmii (dev, port, state->interface); -} -int lan937x_setup (struct dsa_switch *ds) {struct ksz_device *dev = ds->priv;
Signature · 1 line
2.36.1
Quoted 8 lines · Arun Ramadoss
This patch series add support common phylink mac config and link up for the ksz series switches. At present, ksz8795 and ksz9477 doesn't implement the phylink mac config and link up. It configures the mac interface in the port setup hook. ksz8830 series switch does not mac link configuration. For lan937x switches, in the part support patch series has support only for MII and RMII configuration. Some group of switches have some register address and bit fields common and others are different. So, this patch aims to have common phylink implementation which configures the register based on the chip id.
I don't see something problematic with this patch set.
Quoted 38 lines
Changes in v2
- combined the modification of duplex,tx_pauseandrx_pauseinto single function.Changes in v1
- Squash the reading rgmii value from dt to patch which apply the rgmii value
- Created the new functionksz_port_set_xmii_speed
- Seperated the namespace values forxmii_ctrl_0andxmii_ctrl_1register
- Applied the rgmii delay value based on the rx/tx-internal-delay-psArun Ramadoss (9):
net: dsa: microchip: add common gigabit set and get function
net: dsa: microchip: add common ksz port xmii speed selection function
net: dsa: microchip: add common duplex and flow control function
net: dsa: microchip: add support for common phylink mac link up
net: dsa: microchip: lan937x: add support for configuing xMII register
net: dsa: microchip: apply rgmii tx and rx delay in phylink mac config
net: dsa: microchip: ksz9477: use common xmii function
net: dsa: microchip: ksz8795: use common xmii function
net: dsa: microchip: add support for phylink mac configdrivers/net/dsa/microchip/ksz8795.c | 40 --- drivers/net/dsa/microchip/ksz8795_reg.h | 8 - drivers/net/dsa/microchip/ksz9477.c | 183 +------------ drivers/net/dsa/microchip/ksz9477_reg.h | 24 -- drivers/net/dsa/microchip/ksz_common.c | 312 ++++++++++++++++++++++- drivers/net/dsa/microchip/ksz_common.h | 54 ++++ drivers/net/dsa/microchip/lan937x.h | 8 +- drivers/net/dsa/microchip/lan937x_main.c | 125 +++------ drivers/net/dsa/microchip/lan937x_reg.h | 32 ++- 9 files changed, 431 insertions(+), 355 deletions(-)base-commit:
502c6f8cedcce7889ccdefeb88ce36b39acd522fSignature · 1 line
2.36.1
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 10 lines · On Sun, 24 Jul 2022 14:58:14 +0530 you wrote:
This patch series add support common phylink mac config and link up for the ksz series switches. At present, ksz8795 and ksz9477 doesn't implement the phylink mac config and link up. It configures the mac interface in the port setup hook. ksz8830 series switch does not mac link configuration. For lan937x switches, in the part support patch series has support only for MII and RMII configuration. Some group of switches have some register address and bit fields common and others are different. So, this patch aims to have common phylink implementation which configures the register based on the chip id.
[...]
Here is the summary with links:
- [net-next,v2,1/9] net: dsa: microchip: add common gigabit set and get function
https://git.kernel.org/netdev/net-next/c/46f80fa8981b - [net-next,v2,2/9] net: dsa: microchip: add common ksz port xmii speed selection function https://git.kernel.org/netdev/net-next/c/aa5b8b73d4bd - [net-next,v2,3/9] net: dsa: microchip: add common duplex and flow control function https://git.kernel.org/netdev/net-next/c/8560664fd32a - [net-next,v2,4/9] net: dsa: microchip: add support for common phylink mac link up https://git.kernel.org/netdev/net-next/c/da8cd08520f3 - [net-next,v2,5/9] net: dsa: microchip: lan937x: add support for configuing xMII register https://git.kernel.org/netdev/net-next/c/dc1c596edba5 - [net-next,v2,6/9] net: dsa: microchip: apply rgmii tx and rx delay in phylink mac config https://git.kernel.org/netdev/net-next/c/b19ac41faa3f - [net-next,v2,7/9] net: dsa: microchip: ksz9477: use common xmii function https://git.kernel.org/netdev/net-next/c/0ab7f6bf1675 - [net-next,v2,8/9] net: dsa: microchip: ksz8795: use common xmii function https://git.kernel.org/netdev/net-next/c/c476bede4b0f - [net-next,v2,9/9] net: dsa: microchip: add support for phylink mac config https://git.kernel.org/netdev/net-next/c/f3d890f5f90e
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Hi Arun,
starting with this patch set I have following regression on ksz8873 switch. Can you please take a look at it:
8<--- cut here ---
Unable to handle kernel NULL pointer dereference at virtual address 00000005 ksz8863-switch gpio-0:00: nonfatal error -34 setting MTU to 1500 on port 0 ... Modules linked in: CPU: 0 PID: 16 Comm: kworker/0:1 Not tainted 6.0.0-rc2-00436-g3da285df1324 #74 Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree) Workqueue: events_power_efficient phylink_resolve PC is at ksz_set_gbit+0x5c/0xa4 LR is at arch_atomic_cmpxchg_relaxed+0x1c/0x38 .... Backtrace: ksz_set_gbit from ksz_phylink_mac_link_up+0x15c/0x1c8 ksz_phylink_mac_link_up from dsa_port_phylink_mac_link_up+0x7c/0x80 dsa_port_phylink_mac_link_up from phylink_resolve+0x304/0x3d0 phylink_resolve from process_one_work+0x214/0x31c process_one_work from worker_thread+0x254/0x2d4 worker_thread from kthread+0xfc/0x108 kthread from ret_from_fork+0x14/0x2c
...
ksz8863-switch gpio-0:00 lan2 (uninitialized): PHY [dsa-0.0:01] driver [Micrel KSZ8851 Ethernet MAC or KSZ886X Switch] (irq=POLL) ksz8863-switch gpio-0:00: nonfatal error -34 setting MTU to 1500 on port 1
device eth0 entered promiscuous mode
DSA: tree 0 setup
---[ end trace 0000000000000000 ]---
Regards,
Oleksij
Quoted 46 lines · Arun Ramadoss
This patch series add support common phylink mac config and link up for the ksz series switches. At present, ksz8795 and ksz9477 doesn't implement the phylink mac config and link up. It configures the mac interface in the port setup hook. ksz8830 series switch does not mac link configuration. For lan937x switches, in the part support patch series has support only for MII and RMII configuration. Some group of switches have some register address and bit fields common and others are different. So, this patch aims to have common phylink implementation which configures the register based on the chip id.
Changes in v2
- combined the modification of duplex,tx_pauseandrx_pauseinto single function.Changes in v1
- Squash the reading rgmii value from dt to patch which apply the rgmii value
- Created the new functionksz_port_set_xmii_speed
- Seperated the namespace values forxmii_ctrl_0andxmii_ctrl_1register
- Applied the rgmii delay value based on the rx/tx-internal-delay-psArun Ramadoss (9):
net: dsa: microchip: add common gigabit set and get function
net: dsa: microchip: add common ksz port xmii speed selection function
net: dsa: microchip: add common duplex and flow control function
net: dsa: microchip: add support for common phylink mac link up
net: dsa: microchip: lan937x: add support for configuing xMII register
net: dsa: microchip: apply rgmii tx and rx delay in phylink mac config
net: dsa: microchip: ksz9477: use common xmii function
net: dsa: microchip: ksz8795: use common xmii function
net: dsa: microchip: add support for phylink mac configdrivers/net/dsa/microchip/ksz8795.c | 40 --- drivers/net/dsa/microchip/ksz8795_reg.h | 8 - drivers/net/dsa/microchip/ksz9477.c | 183 +------------ drivers/net/dsa/microchip/ksz9477_reg.h | 24 -- drivers/net/dsa/microchip/ksz_common.c | 312 ++++++++++++++++++++++- drivers/net/dsa/microchip/ksz_common.h | 54 ++++ drivers/net/dsa/microchip/lan937x.h | 8 +- drivers/net/dsa/microchip/lan937x_main.c | 125 +++------ drivers/net/dsa/microchip/lan937x_reg.h | 32 ++- 9 files changed, 431 insertions(+), 355 deletions(-)base-commit:
502c6f8cedcce7889ccdefeb88ce36b39acd522fSignature · 1 line
2.36.1
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Hi Oleksij,
Is this Bug related to fix in
https://lore.kernel.org/lkml/[email protected]/
.
It is observed in ksz8794 switch. I think after applying this bug fix patch it should work. I don't have ksz8 series to test. I ran the regression only for ksz9 series switches.
Quoted 112 lines · Oleksij Rempel
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Hi Arun,
starting with this patch set I have following regression on ksz8873 switch. Can you please take a look at it:
8<--- cut here ---Unable to handle kernel NULL pointer dereference at virtual address00000005
ksz8863-switch gpio-0:00: nonfatal error -34 setting MTU to 1500 on
port 0
...Modules linked in: CPU: 0 PID: 16 Comm: kworker/0:1 Not tainted 6.0.0-rc2-00436- g3da285df1324 #74 Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree) Workqueue: events_power_efficient phylink_resolve PC is at ksz_set_gbit+0x5c/0xa4 LR is at arch_atomic_cmpxchg_relaxed+0x1c/0x38 .... Backtrace: ksz_set_gbit from ksz_phylink_mac_link_up+0x15c/0x1c8 ksz_phylink_mac_link_up from dsa_port_phylink_mac_link_up+0x7c/0x80 dsa_port_phylink_mac_link_up from phylink_resolve+0x304/0x3d0 phylink_resolve from process_one_work+0x214/0x31c process_one_work from worker_thread+0x254/0x2d4 worker_thread from kthread+0xfc/0x108 kthread from ret_from_fork+0x14/0x2c...
ksz8863-switch gpio-0:00 lan2 (uninitialized): PHY [dsa-0.0:01]
driver [Micrel KSZ8851 Ethernet MAC or KSZ886X Switch] (irq=POLL)
ksz8863-switch gpio-0:00: nonfatal error -34 setting MTU to 1500 on
port 1
device eth0 entered promiscuous mode
DSA: tree 0 setup---[ end trace 0000000000000000 ]---Regards,
OleksijQuoted 56 lines · Arun Ramadoss
This patch series add support common phylink mac config and link up for the ksz
series switches. At present, ksz8795 and ksz9477 doesn't implement the phylink
mac config and link up. It configures the mac interface in the port setup hook.
ksz8830 series switch does not mac link configuration. For lan937x switches, in
the part support patch series has support only for MII and RMII configuration.
Some group of switches have some register address and bit fields common and
others are different. So, this patch aims to have common phylink implementation
which configures the register based on the chip id. Changes in v2
- combined the modification of duplex,tx_pauseandrx_pauseinto single
function.Changes in v1
- Squash the reading rgmii value from dt to patch which apply the rgmii value
- Created the new functionksz_port_set_xmii_speed
- Seperated the namespace values forxmii_ctrl_0andxmii_ctrl_1register
- Applied the rgmii delay value based on the rx/tx-internal-delay- psArun Ramadoss (9):
net: dsa: microchip: add common gigabit set and get function
net: dsa: microchip: add common ksz port xmii speed selection
function
net: dsa: microchip: add common duplex and flow control function
net: dsa: microchip: add support for common phylink mac link up
net: dsa: microchip: lan937x: add support for configuing xMII
register
net: dsa: microchip: apply rgmii tx and rx delay in phylink mac
config
net: dsa: microchip: ksz9477: use common xmii function
net: dsa: microchip: ksz8795: use common xmii function
net: dsa: microchip: add support for phylink mac configdrivers/net/dsa/microchip/ksz8795.c | 40 --- drivers/net/dsa/microchip/ksz8795_reg.h | 8 - drivers/net/dsa/microchip/ksz9477.c | 183 +------------ drivers/net/dsa/microchip/ksz9477_reg.h | 24 -- drivers/net/dsa/microchip/ksz_common.c | 312 ++++++++++++++++++++++- drivers/net/dsa/microchip/ksz_common.h | 54 ++++ drivers/net/dsa/microchip/lan937x.h | 8 +- drivers/net/dsa/microchip/lan937x_main.c | 125 +++------ drivers/net/dsa/microchip/lan937x_reg.h | 32 ++- 9 files changed, 431 insertions(+), 355 deletions(-)Quoted 4 lines
base-commit:
502c6f8cedcce7889ccdefeb88ce36b39acd522f--
2.36.1--
Pengutronix
e.K. | |
Steuerwalder Str. 21 |
http://www.pengutronix.de/e/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-
0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-
5555 |
Vladimir Oltean
maintainerHello,
Quoted 32 lines · On Tue, Aug 30, 2022 at 08:15:59AM +0000, [email protected] wrote:
Quoted 24 lines · Oleksij Rempel
Hi Arun,
starting with this patch set I have following regression on ksz8873 switch. Can you please take a look at it:
8<--- cut here ---Unable to handle kernel NULL pointer dereference at virtual address 00000005 ksz8863-switch gpio-0:00: nonfatal error -34 setting MTU to 1500 on port 0 ... Modules linked in: CPU: 0 PID: 16 Comm: kworker/0:1 Not tainted 6.0.0-rc2-00436- g3da285df1324 #74 Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree) Workqueue: events_power_efficient phylink_resolve PC is at ksz_set_gbit+0x5c/0xa4 LR is at arch_atomic_cmpxchg_relaxed+0x1c/0x38 .... Backtrace: ksz_set_gbit from ksz_phylink_mac_link_up+0x15c/0x1c8 ksz_phylink_mac_link_up from dsa_port_phylink_mac_link_up+0x7c/0x80 dsa_port_phylink_mac_link_up from phylink_resolve+0x304/0x3d0 phylink_resolve from process_one_work+0x214/0x31c process_one_work from worker_thread+0x254/0x2d4 worker_thread from kthread+0xfc/0x108 kthread from ret_from_fork+0x14/0x2cQuoted 6 lines
...
ksz8863-switch gpio-0:00 lan2 (uninitialized): PHY [dsa-0.0:01] driver [Micrel KSZ8851 Ethernet MAC or KSZ886X Switch] (irq=POLL) ksz8863-switch gpio-0:00: nonfatal error -34 setting MTU to 1500 on port 1
device eth0 entered promiscuous mode
DSA: tree 0 setup---[ end trace 0000000000000000 ]---
Quoted 7 lines
Hi Oleksij,
Is this Bug related to fix in
https://lore.kernel.org/lkml/[email protected]/
.
It is observed in ksz8794 switch. I think after applying this bug fix patch it should work. I don't have ksz8 series to test. I ran the regression only for ksz9 series switches.
I find it unlikely that the cited patch will fix a NULL pointer dereference in ksz_get_gbit(). But rather, some pointer to a structure is NULL, and we then dereference a member located at its offset 0x5, no?
My eyes are on this:
const u8 *bitval = dev->info->xmii_ctrl1; data8 |= FIELD_PREP(P_GMII_1GBIT_M, bitval[P_GMII_NOT_1GBIT]); ~~~~~~~~~~~~~~~~ this is coincidentally also 5
See, looking at the struct ksz_chip_data[] array element for KSZ8873 that Oleksij mentions as broken, I do not see xmii_ctrl1 and xmii_ctrl2 as being pointers to anything.
[KSZ8830] = {
.chip_id = KSZ8830_CHIP_ID,
.dev_name = "KSZ8863/KSZ8873",
.num_vlans = 16,
.num_alus = 0,
.num_statics = 8,
.cpu_ports = 0x4, /* can be configured as cpu port */
.port_cnt = 3,
.ops = &ksz8_dev_ops,
.mib_names = ksz88xx_mib_names,
.mib_cnt = ARRAY_SIZE(ksz88xx_mib_names),
.reg_mib_cnt = MIB_COUNTER_NUM,
.regs = ksz8863_regs,
.masks = ksz8863_masks,
.shifts = ksz8863_shifts,
.supports_mii = {false, false, true},
.supports_rmii = {false, false, true},
.internal_phy = {true, true, false},
},Should we point them to ksz8795_xmii_ctrl0 and ksz8795_xmii_ctrl1? I don't know. Could you find out what these should be set to?
Quoted 3 lines · Vladimir Oltean
Hello,
On Tue, Aug 30, 2022 at 08:15:59AM +0000, [email protected] wrote:
...
Quoted 12 lines
Quoted 7 lines
Hi Oleksij,
Is this Bug related to fix in
https://lore.kernel.org/lkml/[email protected]/
.
It is observed in ksz8794 switch. I think after applying this bug fix patch it should work. I don't have ksz8 series to test. I ran the regression only for ksz9 series switches.I find it unlikely that the cited patch will fix a NULL pointer dereference in
ksz_get_gbit(). But rather, some pointer to a structure is NULL, and we then dereference a member located at its offset0x5, no?
Quoted 8 lines
My eyes are on this:
const u8 *bitval = dev->info->xmii_ctrl1; data8 |= FIELD_PREP(P_GMII_1GBIT_M, bitval[P_GMII_NOT_1GBIT]); ~~~~~~~~~~~~~~~~ this is coincidentally also 5
ack.
Quoted 24 lines
See, looking at the struct ksz_chip_data[] array element for KSZ8873 that Oleksij mentions as broken, I do not see
xmii_ctrl1andxmii_ctrl2as being pointers to anything.[KSZ8830] = { .chip_id = KSZ8830_CHIP_ID, .dev_name = "KSZ8863/KSZ8873", .num_vlans = 16, .num_alus = 0, .num_statics = 8, .cpu_ports = 0x4, /* can be configured as cpu port */ .port_cnt = 3, .ops = &ksz8_dev_ops, .mib_names = ksz88xx_mib_names, .mib_cnt = ARRAY_SIZE(ksz88xx_mib_names), .reg_mib_cnt = MIB_COUNTER_NUM, .regs = ksz8863_regs, .masks = ksz8863_masks, .shifts = ksz8863_shifts, .supports_mii = {false, false, true}, .supports_rmii = {false, false, true}, .internal_phy = {true, true, false}, },
Quoted 2 lines
Should we point them to
ksz8795_xmii_ctrl0andksz8795_xmii_ctrl1? I don't know. Could you find out what these should be set to?
xmii_ctrl0/1 are missing and it make no sense to add it. KSZ8873 switch is controlling CPU port MII configuration over global, not port based register.
I'll better define separate ops for this chip.
Regards,
Oleksij
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Quoted 52 lines · Oleksij Rempel
Quoted 3 lines · Vladimir Oltean
Hello,
On Tue, Aug 30, 2022 at 08:15:59AM +0000, [email protected] wrote:
...
Quoted 12 lines
Quoted 7 lines
Hi Oleksij,
Is this Bug related to fix in
https://lore.kernel.org/lkml/[email protected]/
.
It is observed in ksz8794 switch. I think after applying this bug fix patch it should work. I don't have ksz8 series to test. I ran the regression only for ksz9 series switches.I find it unlikely that the cited patch will fix a NULL pointer dereference in
ksz_get_gbit(). But rather, some pointer to a structure is NULL, and we then dereference a member located at its offset0x5, no?Quoted 8 lines
My eyes are on this:
const u8 *bitval = dev->info->xmii_ctrl1; data8 |= FIELD_PREP(P_GMII_1GBIT_M, bitval[P_GMII_NOT_1GBIT]); ~~~~~~~~~~~~~~~~ this is coincidentally also 5ack.
Quoted 24 lines
See, looking at the struct ksz_chip_data[] array element for KSZ8873 that Oleksij mentions as broken, I do not see
xmii_ctrl1andxmii_ctrl2as being pointers to anything.[KSZ8830] = { .chip_id = KSZ8830_CHIP_ID, .dev_name = "KSZ8863/KSZ8873", .num_vlans = 16, .num_alus = 0, .num_statics = 8, .cpu_ports = 0x4, /* can be configured as cpu port */ .port_cnt = 3, .ops = &ksz8_dev_ops, .mib_names = ksz88xx_mib_names, .mib_cnt = ARRAY_SIZE(ksz88xx_mib_names), .reg_mib_cnt = MIB_COUNTER_NUM, .regs = ksz8863_regs, .masks = ksz8863_masks, .shifts = ksz8863_shifts, .supports_mii = {false, false, true}, .supports_rmii = {false, false, true}, .internal_phy = {true, true, false}, },
Quoted 8 lines
Quoted 2 lines
Should we point them to
ksz8795_xmii_ctrl0andksz8795_xmii_ctrl1? I don't know. Could you find out what these should be set to?xmii_ctrl0/1 are missing and it make no sense to add it. KSZ8873 switch is controlling CPU port MII configuration over global, not port based register.
I'll better define separate ops for this chip.
Hm, not only KSZ8830/KSZ8863/KSZ8873 are affected. ksz8795 compatible series with defined .xmii_ctrl0/.xmii_ctrl1 are broken too. Because it is writing to the global config register over ksz_pwrite8 function. It means, we are writing to 0xa6 instead of 0x06. And to 0xf6 instead of 0x56.
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Vladimir Oltean
maintainerQuoted 7 lines · Oleksij Rempel
Quoted 7 lines
Quoted 2 lines
Should we point them to
ksz8795_xmii_ctrl0andksz8795_xmii_ctrl1? I don't know. Could you find out what these should be set to?xmii_ctrl0/1 are missing and it make no sense to add it. KSZ8873 switch is controlling CPU port MII configuration over global, not port based register.
Quoted 7 lines
Quoted 1 line
I'll better define separate ops for this chip.
Hm, not only KSZ8830/KSZ8863/KSZ8873 are affected. ksz8795 compatible series with defined .xmii_ctrl0/.xmii_ctrl1 are broken too. Because it is writing to the global config register over
ksz_pwrite8function. It means, we are writing to0xa6instead of0x06. And to0xf6instead of0x56.
What do you mean by "global config register"? The Is_1Gbps bit is still part of a port register, it's just that this particular register is only defined for the 5th port (port #4, the only xMII port on KSZ7895 AFAIU). That doesn't necessarily make it a "global" register.
Datasheet says:
Register 22 (0x16): Reserved
Register 38 (0x26): Reserved
Register 54 (0x36): Reserved
Register 70 (0x46): Reserved
Register 86 (0x56): Port 5 Interface Control 6
I wonder if it's ok to modify the regs table like this, because we should then only touch P_XMII_CTRL_1 using port 4:
static const u16 ksz8795_regs[] = {
[REG_IND_CTRL_0] = 0x6E,
[REG_IND_DATA_8] = 0x70,
[REG_IND_DATA_CHECK] = 0x72,
[REG_IND_DATA_HI] = 0x71,
[REG_IND_DATA_LO] = 0x75,
[REG_IND_MIB_CHECK] = 0x74,
[REG_IND_BYTE] = 0xA0,
[P_FORCE_CTRL] = 0x0C,
[P_LINK_STATUS] = 0x0E,
[P_LOCAL_CTRL] = 0x07,
[P_NEG_RESTART_CTRL] = 0x0D,
[P_REMOTE_STATUS] = 0x08,
[P_SPEED_STATUS] = 0x09,
[S_TAIL_TAG_CTRL] = 0x0C,
[P_STP_CTRL] = 0x02,
[S_START_CTRL] = 0x01,
[S_BROADCAST_CTRL] = 0x06,
[S_MULTICAST_CTRL] = 0x04,
[P_XMII_CTRL_0] = 0x06,
- [P_XMII_CTRL_1] = 0x56,
+ [P_XMII_CTRL_1] = 0x06,
};
Arun, what is your proposed solution?
Quoted 46 lines · Vladimir Oltean
Quoted 7 lines · Oleksij Rempel
Quoted 7 lines
Quoted 2 lines
Should we point them to
ksz8795_xmii_ctrl0andksz8795_xmii_ctrl1? I don't know. Could you find out what these should be set to?xmii_ctrl0/1 are missing and it make no sense to add it. KSZ8873 switch is controlling CPU port MII configuration over global, not port based register.
Quoted 7 lines
Quoted 1 line
I'll better define separate ops for this chip.
Hm, not only KSZ8830/KSZ8863/KSZ8873 are affected. ksz8795 compatible series with defined .xmii_ctrl0/.xmii_ctrl1 are broken too. Because it is writing to the global config register over
ksz_pwrite8function. It means, we are writing to0xa6instead of0x06. And to0xf6instead of0x56.What do you mean by "global config register"? The
Is_1Gbpsbit is still part of a port register, it's just that this particular register is only defined for the 5th port (port #4, the only xMII port on KSZ7895 AFAIU). That doesn't necessarily make it a "global" register.Datasheet says:
Register 22 (
0x16): Reserved
Register 38 (0x26): Reserved
Register 54 (0x36): Reserved
Register 70 (0x46): Reserved
Register 86 (0x56): Port 5 Interface Control 6I wonder if it's ok to modify the regs table like this, because we should then only touch
P_XMII_CTRL_1using port 4:static const u16 ksz8795_regs[] = {
(quoted diff) +0
-0[REG_IND_CTRL_0] = 0x6E, [REG_IND_DATA_8] = 0x70, [REG_IND_DATA_CHECK] = 0x72, [REG_IND_DATA_HI] = 0x71, [REG_IND_DATA_LO] = 0x75, [REG_IND_MIB_CHECK] = 0x74, [REG_IND_BYTE] = 0xA0, [P_FORCE_CTRL] = 0x0C, [P_LINK_STATUS] = 0x0E, [P_LOCAL_CTRL] = 0x07, [P_NEG_RESTART_CTRL] = 0x0D, [P_REMOTE_STATUS] = 0x08,
Review
Quoted 10 lines
(quoted diff) +1
-1[P_SPEED_STATUS] = 0x09, [S_TAIL_TAG_CTRL] = 0x0C, [P_STP_CTRL] = 0x02, [S_START_CTRL] = 0x01, [S_BROADCAST_CTRL] = 0x06, [S_MULTICAST_CTRL] = 0x04, [P_XMII_CTRL_0] = 0x06, - [P_XMII_CTRL_1] = 0x56, + [P_XMII_CTRL_1] = 0x06, };
Speed configuration on ksz8795 is done over two registers:
Register 86 (0x56): Port 5 Interface Control 6: Is_1Gbps - BIT(6) and
Register 6 (0x06): Global Control 4: Switch SW5-MII/RMII Speed -BIT(4)
both are accessed on wrong offsets.
I would prefer to do following steps:
- remove everything from ksz_phylink_mac_link_up() except of dev->dev_ops->phylink_mac_link_up
- move ksz_duplex_flowctrl(), ksz_port_set_xmii_speed()... to ksz9477.c and rename them. Assign ksz9477_phylink_mac_link_up() dev->dev_ops->phylink_mac_link_up
- create separate function ksz8795_phylink_mac_link_up()
- use documented, not generic register names.
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Quoted 77 lines · Oleksij Rempel
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Quoted 61 lines · Vladimir Oltean
Quoted 11 lines · Oleksij Rempel
Quoted 10 lines
Quoted 3 lines
Should we point them to
ksz8795_xmii_ctrl0andksz8795_xmii_ctrl1? I don't know.
Could you find out what these should be set to?xmii_ctrl0/1 are missing and it make no sense to add it. KSZ8873 switch is controlling CPU port MII configuration over global,
not port based register.I'll better define separate ops for this chip.
Quoted 9 lines
Hm, not only KSZ8830/KSZ8863/KSZ8873 are affected. ksz8795 compatible
series with defined .xmii_ctrl0/.xmii_ctrl1 are broken too. Because it
is writing to the global config register overksz_pwrite8function. It
means, we are writing to0xa6instead of0x06. And to0xf6instead of0x56.What do you mean by "global config register"? The
Is_1Gbpsbit is still
part of a port register, it's just that this particular register is only
defined for the 5th port (port #4, the only xMII port on KSZ7895 AFAIU).
That doesn't necessarily make it a "global" register.Datasheet says:
Register 22 (
0x16): Reserved
Register 38 (0x26): Reserved
Register 54 (0x36): Reserved
Register 70 (0x46): Reserved
Register 86 (0x56): Port 5 Interface Control 6I wonder if it's ok to modify the regs table like this, because we should then only touch
P_XMII_CTRL_1using port 4:static const u16 ksz8795_regs[] = { [REG_IND_CTRL_0] = 0x6E, [REG_IND_DATA_8] = 0x70, [REG_IND_DATA_CHECK] = 0x72, [REG_IND_DATA_HI] = 0x71, [REG_IND_DATA_LO] = 0x75, [REG_IND_MIB_CHECK] = 0x74, [REG_IND_BYTE] = 0xA0, [P_FORCE_CTRL] = 0x0C, [P_LINK_STATUS] = 0x0E, [P_LOCAL_CTRL] = 0x07, [P_NEG_RESTART_CTRL] = 0x0D, [P_REMOTE_STATUS] = 0x08, [P_SPEED_STATUS] = 0x09, [S_TAIL_TAG_CTRL] = 0x0C, [P_STP_CTRL] = 0x02, [S_START_CTRL] = 0x01, [S_BROADCAST_CTRL] = 0x06, [S_MULTICAST_CTRL] = 0x04, [P_XMII_CTRL_0] = 0x06,Review
Quoted 3 lines
(quoted diff) +1
-1- [P_XMII_CTRL_1] = 0x56, + [P_XMII_CTRL_1] = 0x06, };Speed configuration on ksz8795 is done over two registers:
Register 86 (0x56): Port 5 Interface Control 6:Is_1Gbps- BIT(6) and
Register 6 (0x06): Global Control 4: Switch SW5-MII/RMII Speed -BIT(4)both are accessed on wrong offsets.
Quoted 10 lines
I would prefer to do following steps:
- remove everything fromksz_phylink_mac_link_up()except ofdev->dev_ops->phylink_mac_link_up
- moveksz_duplex_flowctrl(),ksz_port_set_xmii_speed()... toksz9477.c
and rename them. Assignksz9477_phylink_mac_link_up()dev->dev_ops->phylink_mac_link_up
- create separate functionksz8795_phylink_mac_link_up()
- use documented, not generic register names.
In the original code, the ksz8795_cpu_interface_select (which does the xmii and speed configuration) is called only ksz87xx switch not for the ksz88x3.
During refactoring, I intentionally did not add the P_XMII_CTRL0/1 for the ksz88xx in the chip_data structure.
I added check that if switch belong to ksz88x3 then return in the phylink_mac_config function but I missed to add in the phylink_mac_link_up. Thats the mistake I have done. So, for the ksz88xx switch code breakage, it could be fixed by adding the check in the phylink_mac_link_up as well.
For the code breakage in ksz8795/ksz8794, the original code has only provision for configuring xmii mode and choosing the 100/1000Mbps speed selection which could be selected using is_1Gbps bit of port5_interface_control6 register (0x56). But it didn't have provision to select speed between 10/100Mbps, flow control and duplex.
As per vladimir suggestion, P_XMII_CTRL1 can be changed from 0x56 to 0x06. It fixes the problem for ksz_set_xmii, ksz_set_gbit since this is the port based register not the global register.
The global register 0x06 responsibilities are bit 4 for 10/100mbps speed selection, bit 5 for flow control and bit 6 for duplex operation. Since these three are new features added during refactoring I overlooked it.
To fix this, either I need to return from the ksz_set_100_10mbit & ksz_duplex_flowctrl function if the chip_id is ksz87xx or add dev-
Quoted 1 line
dev_opsfor this alone.
Kindly suggest on how to proceed.
Quoted 9 lines
--
Pengutronix
e.K. | |
Steuerwalder Str. 21 |
http://www.pengutronix.de/e/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-
0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-
5555 |
Quoted 110 lines · On Thu, Sep 01, 2022 at 08:51:44AM +0000, [email protected] wrote:
Quoted 77 lines · Oleksij Rempel
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Quoted 61 lines · Vladimir Oltean
Quoted 11 lines · Oleksij Rempel
Quoted 10 lines
Quoted 3 lines
Should we point them to
ksz8795_xmii_ctrl0andksz8795_xmii_ctrl1? I don't know.
Could you find out what these should be set to?xmii_ctrl0/1 are missing and it make no sense to add it. KSZ8873 switch is controlling CPU port MII configuration over global,
not port based register.I'll better define separate ops for this chip.
Quoted 9 lines
Hm, not only KSZ8830/KSZ8863/KSZ8873 are affected. ksz8795 compatible
series with defined .xmii_ctrl0/.xmii_ctrl1 are broken too. Because it
is writing to the global config register overksz_pwrite8function. It
means, we are writing to0xa6instead of0x06. And to0xf6instead of0x56.What do you mean by "global config register"? The
Is_1Gbpsbit is still
part of a port register, it's just that this particular register is only
defined for the 5th port (port #4, the only xMII port on KSZ7895 AFAIU).
That doesn't necessarily make it a "global" register.Datasheet says:
Register 22 (
0x16): Reserved
Register 38 (0x26): Reserved
Register 54 (0x36): Reserved
Register 70 (0x46): Reserved
Register 86 (0x56): Port 5 Interface Control 6I wonder if it's ok to modify the regs table like this, because we should then only touch
P_XMII_CTRL_1using port 4:static const u16 ksz8795_regs[] = { [REG_IND_CTRL_0] = 0x6E, [REG_IND_DATA_8] = 0x70, [REG_IND_DATA_CHECK] = 0x72, [REG_IND_DATA_HI] = 0x71, [REG_IND_DATA_LO] = 0x75, [REG_IND_MIB_CHECK] = 0x74, [REG_IND_BYTE] = 0xA0, [P_FORCE_CTRL] = 0x0C, [P_LINK_STATUS] = 0x0E, [P_LOCAL_CTRL] = 0x07, [P_NEG_RESTART_CTRL] = 0x0D, [P_REMOTE_STATUS] = 0x08, [P_SPEED_STATUS] = 0x09, [S_TAIL_TAG_CTRL] = 0x0C, [P_STP_CTRL] = 0x02, [S_START_CTRL] = 0x01, [S_BROADCAST_CTRL] = 0x06, [S_MULTICAST_CTRL] = 0x04, [P_XMII_CTRL_0] = 0x06,Review
Quoted 3 lines
(quoted diff) +1
-1- [P_XMII_CTRL_1] = 0x56, + [P_XMII_CTRL_1] = 0x06, };Speed configuration on ksz8795 is done over two registers:
Register 86 (0x56): Port 5 Interface Control 6:Is_1Gbps- BIT(6) and
Register 6 (0x06): Global Control 4: Switch SW5-MII/RMII Speed -BIT(4)both are accessed on wrong offsets.
Quoted 10 lines
I would prefer to do following steps:
- remove everything fromksz_phylink_mac_link_up()except ofdev->dev_ops->phylink_mac_link_up
- moveksz_duplex_flowctrl(),ksz_port_set_xmii_speed()... toksz9477.c
and rename them. Assignksz9477_phylink_mac_link_up()dev->dev_ops->phylink_mac_link_up
- create separate functionksz8795_phylink_mac_link_up()
- use documented, not generic register names.In the original code, the
ksz8795_cpu_interface_select(which does the xmii and speed configuration) is called only ksz87xx switch not for the ksz88x3.
During refactoring, I intentionally did not add the P_XMII_CTRL0/1 for the ksz88xx in thechip_datastructure.
I added check that if switch belong to ksz88x3 then return in thephylink_mac_configfunction but I missed to add in thephylink_mac_link_up. Thats the mistake I have done. So, for the ksz88xx switch code breakage, it could be fixed by adding the check in thephylink_mac_link_upas well.For the code breakage in ksz8795/ksz8794, the original code has only provision for configuring xmii mode and choosing the 100/1000Mbps speed selection which could be selected using
is_1Gbpsbit ofport5_interface_control6register (0x56). But it didn't have provision to select speed between 10/100Mbps, flow control and duplex.As per vladimir suggestion,
P_XMII_CTRL1can be changed from0x56to0x06. It fixes the problem forksz_set_xmii,ksz_set_gbitsince this is the port based register not the global register.
Quoted 8 lines
The global register
0x06responsibilities are bit 4 for 10/100mbps speed selection, bit 5 for flow control and bit 6 for duplex operation. Since these three are new features added during refactoring I overlooked it.
To fix this, either I need to return from theksz_set_100_10mbit&ksz_duplex_flowctrlfunction if thechip_idis ksz87xx or add dev-Quoted 1 line
dev_opsfor this alone.Kindly suggest on how to proceed.
Do not worry, every one makes mistakes ;)
I just scared how easy it is to make them in this driver. I assume, that initially the good idea to make things more generic in this driver is working against us. The register- and bit-mapping functionally is already biting us:
- it is hard to review, due to different register naming schema for different switch families. Especially the old ones.
- we are using naming from one documentation to map to other documentation.
- some times we need to map some registers multiple times with different
names: P_REMOTE_STATUS and P_LINK_STATUS
I would prefer to got ops way, to clean things up.
Regards,
Oleksij
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Vladimir Oltean
maintainerQuoted 9 lines · Oleksij Rempel
Quoted 7 lines
The global register
0x06responsibilities are bit 4 for 10/100mbps speed selection, bit 5 for flow control and bit 6 for duplex operation. Since these three are new features added during refactoring I overlooked it.
To fix this, either I need to return from theksz_set_100_10mbit&ksz_duplex_flowctrlfunction if thechip_idis ksz87xx or adddev->dev_opsfor this alone. Kindly suggest on how to proceed.I would prefer to got ops way, to clean things up.
I can't say that that one approach is better or worse than the other. Indirect function calls are going to be more expensive than conditionals on dev->chip_id, but we aren't in a fast path here, so it doesn't matter too much.
Having indirect function calls will in theory help simplify the logic of the main function, but will require good forethought for what constitutes an atom of functionality, in a high enough level such as to abstract switch differences. Whereas conditionals don't require thinking that far, you put them where you need them.
Also, indirect function calls will move the bloat somewhere else. I have seen complaints in the past about the mv88e6xxx driver's layered structure, making it difficult to see exactly what gets done for a certain chip.
It is probable that we don't want to mix these styles too much within a single driver, so if work has already started towards dev_ops for everything, then dev_ops be it, I guess.
Oleksij, are you going to submit patches with your proposal?
Hi Vladimir,
Quoted 26 lines · Vladimir Oltean
Quoted 9 lines · Oleksij Rempel
Quoted 7 lines
The global register
0x06responsibilities are bit 4 for 10/100mbps speed selection, bit 5 for flow control and bit 6 for duplex operation. Since these three are new features added during refactoring I overlooked it.
To fix this, either I need to return from theksz_set_100_10mbit&ksz_duplex_flowctrlfunction if thechip_idis ksz87xx or adddev->dev_opsfor this alone. Kindly suggest on how to proceed.I would prefer to got ops way, to clean things up.
I can't say that that one approach is better or worse than the other. Indirect function calls are going to be more expensive than conditionals on
dev->chip_id, but we aren't in a fast path here, so it doesn't matter too much.Having indirect function calls will in theory help simplify the logic of the main function, but will require good forethought for what constitutes an atom of functionality, in a high enough level such as to abstract switch differences. Whereas conditionals don't require thinking that far, you put them where you need them.
Also, indirect function calls will move the bloat somewhere else. I have seen complaints in the past about the mv88e6xxx driver's layered structure, making it difficult to see exactly what gets done for a certain chip.
Quoted 5 lines
It is probable that we don't want to mix these styles too much within a single driver, so if work has already started towards
dev_opsfor everything, thendev_opsbe it, I guess.Oleksij, are you going to submit patches with your proposal?
I have send one simple patch for net to make it work. After this one will pop-up in then net-next i'll send other patches depending on this patch.
Regards,
Oleksij
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |