Add support for mv88e6393x family of Marvell.
Subsystems (6)
A message that is not in the archive (sent off-list or not yet received): [email protected]; [email protected][PATCH v2] Add support for mv88e6393x family of Marvell.
PATCH v3 1/1 Add support for mv88e6393x family of Marvell.
The Marvell 88E6393X device is a single-chip integration of a 11-port Ethernet switch with eight integrated Gigabit Ethernet (GbE) transceivers and three 10-Gigabit interfaces.
This patch adds functionalities specific to mv88e6393x family (88E6393X, 88E6193X and 88E6191X)
---
Changes in v2:
- Fix a warning (Reported-by: kernel test robot <[email protected]>)
Changes in v3:
- Fix 'unused function' warning
--- drivers/net/dsa/mv88e6xxx/chip.c | 90 +++++++++ drivers/net/dsa/mv88e6xxx/chip.h | 2 + drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 302 ++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/port.h | 39 +++- drivers/net/dsa/mv88e6xxx/serdes.c | 239 ++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/serdes.h | 39 ++++ 8 files changed, 720 insertions(+), 1 deletion(-)
drivers/net/dsa/mv88e6xxx/chip.c +90 -0
@@ -634,6 +634,23 @@ static void mv88e6390x_phylink_validate(struct mv88e6xxx_chip *chip, int port,mv88e6390_phylink_validate (chip, port, mask, state); } +static void mv88e6393x_phylink_validate (struct mv88e6xxx_chip *chip,int port, +unsigned long *mask, +struct phylink_link_state *state) +{ +if (port ==0 || port >=9 ) { + phylink_set(mask, 10000baseT_Full); + phylink_set(mask, 10000baseKR_Full); + phylink_set(mask, 2500baseX_Full); + phylink_set(mask, 2500baseT_Full); + } + + phylink_set(mask, 1000baseT_Full); + phylink_set(mask, 1000baseX_Full); + +mv88e6065_phylink_validate (chip, port, mask, state); +} +static void mv88e6xxx_validate (struct dsa_switch *ds,int port,unsigned long *supported,struct phylink_link_state *state)
@@ -4141,6 +4158,56 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { .phylink_validate = mv88e6390_phylink_validate, }; +static const struct mv88e6xxx_ops mv88e6193x_ops = { +/* MV88E6XXX_FAMILY_6393X */ + .setup_errata = mv88e6393x_setup_errata, + .irl_init_all = mv88e6390_g2_irl_init_all, + .get_eeprom = mv88e6xxx_g2_get_eeprom8, + .set_eeprom = mv88e6xxx_g2_set_eeprom8, + .set_switch_mac = mv88e6xxx_g2_set_switch_mac, + .phy_read = mv88e6xxx_g2_smi_phy_read, + .phy_write = mv88e6xxx_g2_smi_phy_write, + .port_set_link = mv88e6xxx_port_set_link, + .port_set_speed_duplex = mv88e6393x_port_set_speed_duplex, + .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, + .port_tag_remap = mv88e6390_port_tag_remap, + .port_set_frame_mode = mv88e6351_port_set_frame_mode, + .port_set_egress_floods = mv88e6352_port_set_egress_floods, + .port_set_ether_type = mv88e6393x_port_set_ether_type, + .port_set_jumbo_size = mv88e6165_port_set_jumbo_size, + .port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting, + .port_pause_limit = mv88e6390_port_pause_limit, + .port_set_cmode = mv88e6393x_port_set_cmode, + .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit, + .port_disable_pri_override = mv88e6xxx_port_disable_pri_override, + .port_get_cmode = mv88e6352_port_get_cmode, + .stats_snapshot = mv88e6390_g1_stats_snapshot, + .stats_set_histogram = mv88e6390_g1_stats_set_histogram, + .stats_get_sset_count = mv88e6320_stats_get_sset_count, + .stats_get_strings = mv88e6320_stats_get_strings, + .stats_get_stats = mv88e6390_stats_get_stats, + .set_cpu_port = mv88e6393x_port_set_cpu_dest, + .set_egress_port = mv88e6393x_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, + .mgmt_rsvd2cpu = mv88e6393x_port_mgmt_rsvd2cpu, + .pot_clear = mv88e6xxx_g2_pot_clear, + .reset = mv88e6352_g1_reset, + .rmu_disable = mv88e6390_g1_rmu_disable, + .vtu_getnext = mv88e6390_g1_vtu_getnext, + .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge, + .serdes_power = mv88e6393x_serdes_power, + .serdes_get_lane = mv88e6393x_serdes_get_lane, +/* Check status register pause & lpa register */ + .serdes_pcs_get_state = mv88e6390_serdes_pcs_get_state, + .serdes_irq_mapping = mv88e6390_serdes_irq_mapping, + .serdes_irq_enable = mv88e6393x_serdes_irq_enable, + .serdes_irq_status = mv88e6393x_serdes_irq_status, + .gpio_ops = &mv88e6352_gpio_ops, + .avb_ops = &mv88e6390_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, + .phylink_validate = mv88e6393x_phylink_validate, +}; +static const struct mv88e6xxx_ops mv88e6240_ops = {/* MV88E6XXX_FAMILY_6352 */ .ieee_pri_map = mv88e6085_g1_ieee_pri_map,
@@ -5073,6 +5140,29 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .ops = &mv88e6191_ops, }, + [MV88E6193X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6193X, + .family = MV88E6XXX_FAMILY_6393X, + .name = "Marvell 88E6193X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6193x_ops, + }, + [MV88E6220] = { .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6220, .family = MV88E6XXX_FAMILY_6250,
drivers/net/dsa/mv88e6xxx/chip.h +2 -0
@@ -63,6 +63,7 @@ enum mv88e6xxx_model {MV88E6190 ,MV88E6190X ,MV88E6191 , +MV88E6193X ,MV88E6220 ,MV88E6240 , MV88E6250,
@@ -90,6 +91,7 @@ enum mv88e6xxx_family {MV88E6XXX_FAMILY_6351 ,/* 6171 6175 6350 6351 */ MV88E6XXX_FAMILY_6352 ,/* 6172 6176 6240 6352 */ MV88E6XXX_FAMILY_6390 ,/* 6190 6190X 6191 6290 6390 6390X */ + MV88E6XXX_FAMILY_6393X, /* 6191X 6193X 6393X */ };struct mv88e6xxx_ops ;
drivers/net/dsa/mv88e6xxx/global1.h +2 -0
@@ -22,6 +22,7 @@#define MV88E6185_G1_STS_PPU_STATE_DISABLED 0x8000#define MV88E6185_G1_STS_PPU_STATE_POLLING 0xc000#define MV88E6XXX_G1_STS_INIT_READY 0x0800 +#define MV88E6193X_G1_STS_IRQ_DEVICE_2 9#define MV88E6XXX_G1_STS_IRQ_AVB 8#define MV88E6XXX_G1_STS_IRQ_DEVICE 7#define MV88E6XXX_G1_STS_IRQ_STATS 6
@@ -59,6 +60,7 @@#define MV88E6185_G1_CTL1_SCHED_PRIO 0x0800#define MV88E6185_G1_CTL1_MAX_FRAME_1632 0x0400#define MV88E6185_G1_CTL1_RELOAD_EEPROM 0x0200 +#define MV88E6193X_G1_CTL1_DEVICE2_EN 0x0200#define MV88E6XXX_G1_CTL1_DEVICE_EN 0x0080#define MV88E6XXX_G1_CTL1_STATS_DONE_EN 0x0040#define MV88E6XXX_G1_CTL1_VTU_PROBLEM_EN 0x0020
drivers/net/dsa/mv88e6xxx/global2.h +8 -0
@@ -38,9 +38,15 @@/* Offset 0x02: MGMT Enable Register 2x */ #define MV88E6XXX_G2_MGMT_EN_2X 0x02 +/* Offset 0x02: MAC LINK change IRQ Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_SRC 0x02 +/* Offset 0x03: MGMT Enable Register 0x */ #define MV88E6XXX_G2_MGMT_EN_0X 0x03 +/* Offset 0x03: MAC LINK change IRQ Mask Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_MASK 0x03 +/* Offset 0x04: Flow Control Delay Register */ #define MV88E6XXX_G2_FLOW_CTL 0x04
@@ -52,6 +58,8 @@#define MV88E6XXX_G2_SWITCH_MGMT_FORCE_FLOW_CTL_PRI 0x0080#define MV88E6XXX_G2_SWITCH_MGMT_RSVD2CPU 0x0008 +#define MV88E6393X_G2_EGRESS_MONITOR_DEST 0x05 +/* Offset 0x06: Device Mapping Table Register */ #define MV88E6XXX_G2_DEVICE_MAPPING 0x06#define MV88E6XXX_G2_DEVICE_MAPPING_UPDATE 0x8000
drivers/net/dsa/mv88e6xxx/port.c +302 -0
326 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/port.h +38 -1
@@ -49,6 +49,9 @@#define MV88E6XXX_PORT_STS_CMODE_2500BASEX 0x000b#define MV88E6XXX_PORT_STS_CMODE_XAUI 0x000c#define MV88E6XXX_PORT_STS_CMODE_RXAUI 0x000d +#define MV88E6XXX_PORT_STS_CMODE_5GBASER 0x000c +#define MV88E6XXX_PORT_STS_CMODE_10GBASER 0x000d +#define MV88E6XXX_PORT_STS_CMODE_USXGMII 0x000e#define MV88E6185_PORT_STS_CDUPLEX 0x0008#define MV88E6185_PORT_STS_CMODE_MASK 0x0007#define MV88E6185_PORT_STS_CMODE_GMII_FD 0x0000
@@ -117,6 +120,7 @@#define MV88E6XXX_PORT_SWITCH_ID_PROD_6176 0x1760#define MV88E6XXX_PORT_SWITCH_ID_PROD_6190 0x1900#define MV88E6XXX_PORT_SWITCH_ID_PROD_6191 0x1910 +#define MV88E6XXX_PORT_SWITCH_ID_PROD_6193X 0x1930#define MV88E6XXX_PORT_SWITCH_ID_PROD_6185 0x1a70#define MV88E6XXX_PORT_SWITCH_ID_PROD_6220 0x2200#define MV88E6XXX_PORT_SWITCH_ID_PROD_6240 0x2400
@@ -129,6 +133,7 @@#define MV88E6XXX_PORT_SWITCH_ID_PROD_6350 0x3710#define MV88E6XXX_PORT_SWITCH_ID_PROD_6351 0x3750#define MV88E6XXX_PORT_SWITCH_ID_PROD_6390 0x3900 +#define MV88E6XXX_PORT_SWITCH_ID_PROD_6393X 0x3930#define MV88E6XXX_PORT_SWITCH_ID_REV_MASK 0x000f/* Offset 0x04: Port Control Register */
@@ -236,6 +241,19 @@#define MV88E6XXX_PORT_POLICY_CTL_TRAP 0x0002#define MV88E6XXX_PORT_POLICY_CTL_DISCARD 0x0003 +/* Offset 0x0E: Policy & MGMT Control Register (FAMILY_6393X)*/ +#define MV88E6393X_PORT_POLICY_MGMT_CTL 0x0e +#define MV88E6393X_PORT_POLICY_MGMT_CTL_UPDATE 0x8000 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_MASK 0x3f00 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000000XLO 0x2000 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000000XHI 0x2100 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000002XLO 0x2400 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000002XHI 0x2500 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_INGRESS_DEST 0x3000 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_CPU_DEST 0x3800 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_DATA_MASK 0x00ff +#define MV88E6393X_PORT_POLICY_MGMT_CTL_CPU_DEST_MGMTPRI 0x00e0 +/* Offset 0x0F: Port Special Ether Type */ #define MV88E6XXX_PORT_ETH_TYPE 0x0f#define MV88E6XXX_PORT_ETH_TYPE_DEFAULT 0x9100
@@ -243,6 +261,15 @@/* Offset 0x10: InDiscards Low Counter */ #define MV88E6XXX_PORT_IN_DISCARD_LO 0x10 +/* Offset 0x10: Extended Port Control Command */ +#define MV88E6393X_PORT_EPC_CMD 0x10 +#define MV88E6393X_PORT_EPC_CMD_BUSY 0x8000 +#define MV88E6393X_PORT_EPC_CMD_WRITE 0x0300 +#define MV88E6393X_PORT_EPC_INDEX_PORT_ETYPE 0x02 + +/* Offset 0x11: Extended Port Control Data */ +#define MV88E6393X_PORT_EPC_DATA 0x11 +/* Offset 0x11: InDiscards High Counter */ #define MV88E6XXX_PORT_IN_DISCARD_HI 0x11
@@ -312,7 +339,8 @@ int mv88e6390_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, int speed, int duplex);int mv88e6390x_port_set_speed_duplex (struct mv88e6xxx_chip *chip,int port,int speed,int duplex); - +int mv88e6393x_port_set_speed_duplex (struct mv88e6xxx_chip *chip,int port, +int speed,int duplex);phy_interface_t mv88e6341_port_max_speed_mode (int port);phy_interface_t mv88e6390_port_max_speed_mode (int port);phy_interface_t mv88e6390x_port_max_speed_mode (int port);
@@ -346,6 +374,13 @@ int mv88e6352_port_set_policy(struct mv88e6xxx_chip *chip, int port, enum mv88e6xxx_policy_action action);int mv88e6351_port_set_ether_type (struct mv88e6xxx_chip *chip,int port,u16 etype); +int mv88e6393x_set_egress_port (struct mv88e6xxx_chip *chip, +enum mv88e6xxx_egress_direction direction, +int port); +int mv88e6393x_port_set_cpu_dest (struct mv88e6xxx_chip *chip,int port); +int mv88e6393x_port_mgmt_rsvd2cpu (struct mv88e6xxx_chip *chip); +int mv88e6393x_port_set_ether_type (struct mv88e6xxx_chip *chip,int port, +u16 etype);int mv88e6xxx_port_set_message_port (struct mv88e6xxx_chip *chip,int port,bool message_port); int mv88e6165_port_set_jumbo_size(struct mv88e6xxx_chip *chip, int port,
@@ -362,6 +397,8 @@ int mv88e6390_port_set_cmode(struct mv88e6xxx_chip *chip, int port, phy_interface_t mode);int mv88e6390x_port_set_cmode (struct mv88e6xxx_chip *chip,int port,phy_interface_t mode); +int mv88e6393x_port_set_cmode (struct mv88e6xxx_chip *chip,int port, +phy_interface_t mode);int mv88e6185_port_get_cmode (struct mv88e6xxx_chip *chip,int port,u8 *cmode);int mv88e6352_port_get_cmode (struct mv88e6xxx_chip *chip,int port,u8 *cmode);int mv88e6xxx_port_set_map_da (struct mv88e6xxx_chip *chip,int port);
drivers/net/dsa/mv88e6xxx/serdes.c +239 -0
254 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +39 -0
@@ -68,15 +68,47 @@#define MV88E6390_SGMII_PHY_STATUS_LINK BIT(10)#define MV88E6390_SGMII_PHY_STATUS_TX_PAUSE BIT(3)#define MV88E6390_SGMII_PHY_STATUS_RX_PAUSE BIT(2) +#define MV88E6390_SGMII_STATUS_AN_ABLE BIT(3) +#define MV88E6390_SGMII_ANAR 0x2004 +#define MV88E6390_SGMII_ANAR_1000BASEX_FD BIT(5) +#define MV88E6390_SGMII_CONTROL 0x2000 +#define MV88E6390_SGMII_CONTROL_RESET BIT(15) +#define MV88E6390_SGMII_CONTROL_LOOPBACK BIT(14) +#define MV88E6390_SGMII_CONTROL_PDOWN BIT(11) +#define MV88E6390_SGMII_STATUS 0x2001/* Packet generator pad packet checker */ #define MV88E6390_PG_CONTROL 0xf010#define MV88E6390_PG_CONTROL_ENABLE_PC BIT(0) +#define MV88E6393X_PORT0_LANE 0x00 +#define MV88E6393X_PORT9_LANE 0x09 +#define MV88E6393X_PORT10_LANE 0x0a + +/* Port Operational Configuration */ +#define MV88E6393X_PCS_SELECT_1000BASEX 0x0000 +#define MV88E6393X_PCS_SELECT_2500BASEX 0x0001 +#define MV88E6393X_PCS_SELECT_SGMII_PHY 0x0002 +#define MV88E6393X_PCS_SELECT_SGMII_MAC 0x0003 +#define MV88E6393X_PCS_SELECT_5GBASER 0x0004 +#define MV88E6393X_PCS_SELECT_10GBASER 0x0005 +#define MV88E6393X_PCS_SELECT_USXGMII_PHY 0x0006 +#define MV88E6393X_PCS_SELECT_USXGMII_MAC 0x0007 + +#define MV88E6393X_SERDES_POC 0xf002 +#define MV88E6393X_SERDES_POC_PCS_MODE_MASK 0x0007 +#define MV88E6393X_SERDES_POC_RESET BIT(15) +#define MV88E6393X_SERDES_POC_PDOWN BIT(5) +#define MV88E6393X_SERDES_POC_ANEG BIT(3) + +#define MV88E6393X_ERRATA_1000BASEX_SGMII 0xF074 +#define MV88E6393X_ERRATA_1000BASEX_SGMII_BIT BIT(14) +u8 mv88e6341_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);u8 mv88e6352_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);u8 mv88e6390_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);u8 mv88e6390x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port); +u8 mv88e6393x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port); int mv88e6352_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, u8 lane, unsigned int mode, phy_interface_t interface,
@@ -105,14 +137,21 @@ int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, u8 lane, bool on);int mv88e6390_serdes_power (struct mv88e6xxx_chip *chip,int port,u8 lane,bool on); +int mv88e6393x_serdes_power (struct mv88e6xxx_chip *chip,int port,u8 lane, +bool on); +int mv88e6393x_setup_errata (struct mv88e6xxx_chip *chip);int mv88e6352_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port,u8 lane,bool enable);int mv88e6390_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port,u8 lane,bool enable); +int mv88e6393x_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port, +u8 lane,bool enable);irqreturn_t mv88e6352_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,u8 lane);irqreturn_t mv88e6390_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,u8 lane); +irqreturn_t mv88e6393x_serdes_irq_status (struct mv88e6xxx_chip *chip,int port, +u8 lane);int mv88e6352_serdes_get_sset_count (struct mv88e6xxx_chip *chip,int port);int mv88e6352_serdes_get_strings (struct mv88e6xxx_chip *chip,int port,uint8_t *data);
Signature · 1 line
2.17.1
Quoted 8 lines · Pavana Sharma
The Marvell 88E6393X device is a single-chip integration of a 11-port Ethernet switch with eight integrated Gigabit Ethernet (GbE) transceivers and three 10-Gigabit interfaces.
This patch adds functionalities specific to mv88e6393x family (88E6393X, 88E6193X and 88E6191X)
Signed-off-by Pavana Sharma <[email protected]>
The subject of your patch should be:
net: dsa: mv88e6xxx: Add support for mv88e6393x family
to be consistent with the previous changes done to these files. I don't have the datasheet for that switch so cannot confirm if the changes appear to be correct or not, Vivien and Andrew might though.
Signature · 1 line
Florian
Andrew Lunn
maintainerQuoted 21 lines
drivers/net/dsa/mv88e6xxx/chip.c +17
-0+static void mv88e6393x_phylink_validate (struct mv88e6xxx_chip *chip,int port, +unsigned long *mask, +struct phylink_link_state *state) +{ +if (port ==0 || port >=9 ) { + phylink_set(mask, 10000baseT_Full); + phylink_set(mask, 10000baseKR_Full); + phylink_set(mask, 2500baseX_Full); + phylink_set(mask, 2500baseT_Full); + } + + phylink_set(mask, 1000baseT_Full); + phylink_set(mask, 1000baseX_Full); + +mv88e6065_phylink_validate (chip, port, mask, state); +} +static void mv88e6xxx_validate (struct dsa_switch *ds,int port,unsigned long *supported,struct phylink_link_state *state)
drivers/net/dsa/mv88e6xxx/chip.c static const struct mv88e6xxx_ops mv88e6191_ops = { · line 4162
Quoted 5 lines
drivers/net/dsa/mv88e6xxx/chip.c +2
-0@@ -4141,6 +4158,56 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { .phylink_validate = mv88e6390_phylink_validate, }; +static const struct mv88e6xxx_ops mv88e6193x_ops = { +/* MV88E6XXX_FAMILY_6393X */
Please add support for the 6393X and the 6391X. Most of the differences are in mv88e6X93x_phylink_validate() functions, given the different number of multiG ports. Just a best effort, since i guess you do not have the hardware to test on.
Quoted 13 lines
drivers/net/dsa/mv88e6xxx/chip.h +1
-0@@ -63,6 +63,7 @@ enum mv88e6xxx_model {MV88E6190 ,MV88E6190X ,MV88E6191 , +MV88E6193X ,MV88E6220 ,MV88E6240 , MV88E6250,
drivers/net/dsa/mv88e6xxx/chip.h enum mv88e6xxx_family { · line 95
Quoted 5 lines
drivers/net/dsa/mv88e6xxx/chip.h +1
-0@@ -90,6 +91,7 @@ enum mv88e6xxx_family {MV88E6XXX_FAMILY_6351 ,/* 6171 6175 6350 6351 */ MV88E6XXX_FAMILY_6352 ,/* 6172 6176 6240 6352 */ MV88E6XXX_FAMILY_6390 ,/* 6190 6190X 6191 6290 6390 6390X */ + MV88E6XXX_FAMILY_6393X, /* 6191X 6193X 6393X */ };
Are there any 6393 devices, i.e. not X? I just wondering if we want to call the family plain 6393? In general, it would be nicer to use the name 6393, not 6393X.
Quoted 4 lines
drivers/net/dsa/mv88e6xxx/chip.h +4
-0+int mv88e6393x_port_set_cmode (struct mv88e6xxx_chip *chip,int port, +phy_interface_t mode) +{ +if (lane >=0 ) {
drivers/net/dsa/mv88e6xxx/chip.h enum mv88e6xxx_family {
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/chip.h +10
-0+if (chip->ports[port].serdes_irq) { + err =mv88e6393x_serdes_irq_enable (chip, port, lane, false); +if (err) +return err; + } + + err =mv88e6393x_serdes_power (chip, port, lane, false); +if (err) +return err; + }
Something wrong with the indentation here.
Please can you also look at trying to refactor mv88e6xxx_port_set_cmode() so you don't have to duplicate so much.
drivers/net/dsa/mv88e6xxx/chip.h
Quoted 8 lines
drivers/net/dsa/mv88e6xxx/chip.h +8
-0+/* Offset 0x0E: Policy & MGMT Control Register for FAMILY 6191X 6193X 6393X*/ + +static int mv88e6393x_port_policy_write (struct mv88e6xxx_chip *chip,u16 pointer, +u8 data) +{ +u16 reg; +int port; +int err =0 ;
Reverse Christmas tree please, here and everywhere.
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/chip.h +10
-0+static int mv88e6393x_epc_wait_ready (struct mv88e6xxx_chip *chip,int port) +{ +const unsigned long timeout = jiffies +1 *HZ ; +u16 val; +int err; + +while (time_before (jiffies, timeout)) { + err =mv88e6xxx_port_read (chip, port,MV88E6393X_PORT_EPC_CMD , &val); +if (err) +return err;
drivers/net/dsa/mv88e6xxx/chip.h
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/chip.h +10
-0+if (!(val &MV88E6393X_PORT_EPC_CMD_BUSY )) +break ; +usleep_range (1000 ,2000 ); + } + +if (time_after (jiffies, timeout)) +return -ETIMEDOUT ; + +return 0 ; +}
Please build something on top of mv88e6xxx_wait_bit(). Look at global1.c as an example for its _wait_ functions.
Quoted 4 lines
drivers/net/dsa/mv88e6xxx/chip.h +4
-0+/* Return the SERDES lane address a port is using. Only Ports 0, 9 and 10 +* have SERDES lanes. Returns -ENODEV if a port does not have a lane. +*/ +u8 mv88e6393x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port)
drivers/net/dsa/mv88e6xxx/chip.h
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/chip.h +10
-0+{ +u8 cmode = chip->ports[port].cmode; + +switch (port) { +case 0 : +if (cmode ==MV88E6XXX_PORT_STS_CMODE_1000BASEX || + cmode ==MV88E6XXX_PORT_STS_CMODE_2500BASEX || + cmode ==MV88E6XXX_PORT_STS_CMODE_10GBASER ) +return MV88E6393X_PORT0_LANE ; +return ENODEV ;
Missing the - in -ENODEV.
Quoted 7 lines
drivers/net/dsa/mv88e6xxx/chip.h +7
-0+case 9 : +if (cmode ==MV88E6XXX_PORT_STS_CMODE_1000BASEX || + cmode ==MV88E6XXX_PORT_STS_CMODE_2500BASEX || + cmode ==MV88E6XXX_PORT_STS_CMODE_10GBASER ) +return MV88E6393X_PORT9_LANE ; +return ENODEV ; +case 10 :
drivers/net/dsa/mv88e6xxx/chip.h
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/chip.h +10
-0+if (cmode ==MV88E6XXX_PORT_STS_CMODE_1000BASEX || + cmode ==MV88E6XXX_PORT_STS_CMODE_2500BASEX || + cmode ==MV88E6XXX_PORT_STS_CMODE_10GBASER ) +return MV88E6393X_PORT10_LANE ; +return ENODEV ; +default : +return ENODEV ; + } +} +
Andrew
v4 cover Add support for mv88e6393x family of Marvell.
Hi,
Thanks for the review.
Following is the updated patchset.
The 6393X family has MV88E6191X, MV88E6193X and MV88E6393X products listed in Gigabit Ethernet and Gigabit 10G+ Ethernet categories. There are no 6393 devices (without X) but there is 6191 device (without X)from a different family. The product id is listed with the 'X' in the name so I prefer to retain the product name 6393X in the driver whereas we can define the family name as 'MV88E6XXX_FAMILY_6393' without 'X'.
The patchset adds support for modes 5GBASE-R, 10GBASE-R and USXGMII on ports 0, 9 and 10.
Tested on MV88E6193X device.
Pavana
Pavana Sharma (3):
Add support for mv88e6393x family of Marvell. Add phy interface for 5GBASER mode
Change serdes lane parameter from u8 type to int.
drivers/net/dsa/mv88e6xxx/chip.c | 119 +++++++++-- drivers/net/dsa/mv88e6xxx/chip.h | 20 +- drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 239 +++++++++++++++++++++- drivers/net/dsa/mv88e6xxx/port.h | 40 +++- drivers/net/dsa/mv88e6xxx/serdes.c | 297 ++++++++++++++++++++++++---- drivers/net/dsa/mv88e6xxx/serdes.h | 89 ++++++--- include/linux/phy.h | 3 + 9 files changed, 730 insertions(+), 87 deletions(-)
Signature · 1 line
2.17.1
PATCH v4 1/3 Add support for mv88e6393x family of Marvell.
The Marvell 88E6393X device is a single-chip integration of a 11-port Ethernet switch with eight integrated Gigabit Ethernet (GbE) transceivers and three 10-Gigabit interfaces.
This patch adds functionalities specific to mv88e6393x family (88E6393X, 88E6193X and 88E6191X)
---
Changes in v2:
- Fix a warning (Reported-by: kernel test robot <[email protected]>)
Changes in v3:
- Fix 'unused function' warning
Changes in v4:
- Incorporated feedback from maintainers.
--- drivers/net/dsa/mv88e6xxx/chip.c | 91 +++++++++++ drivers/net/dsa/mv88e6xxx/chip.h | 4 + drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 233 ++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/port.h | 40 ++++- drivers/net/dsa/mv88e6xxx/serdes.c | 227 +++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/serdes.h | 39 +++++ 8 files changed, 643 insertions(+), 1 deletion(-)
drivers/net/dsa/mv88e6xxx/chip.c +91 -0
@@ -634,6 +634,24 @@ static void mv88e6390x_phylink_validate(struct mv88e6xxx_chip *chip, int port,mv88e6390_phylink_validate (chip, port, mask, state); } +static void mv88e6393x_phylink_validate (struct mv88e6xxx_chip *chip,int port, +unsigned long *mask, +struct phylink_link_state *state) +{ +if (port ==0 || port ==9 || port ==10 ) { + phylink_set(mask, 10000baseT_Full); + phylink_set(mask, 10000baseKR_Full); + phylink_set(mask, 5000baseT_Full); + phylink_set(mask, 2500baseX_Full); + phylink_set(mask, 2500baseT_Full); + } + + phylink_set(mask, 1000baseT_Full); + phylink_set(mask, 1000baseX_Full); + +mv88e6065_phylink_validate (chip, port, mask, state); +} +static void mv88e6xxx_validate (struct dsa_switch *ds,int port,unsigned long *supported,struct phylink_link_state *state)
@@ -4141,6 +4159,56 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { .phylink_validate = mv88e6390_phylink_validate, }; +static const struct mv88e6xxx_ops mv88e6193x_ops = { +/* MV88E6XXX_FAMILY_6393 */ + .setup_errata = mv88e6393x_setup_errata, + .irl_init_all = mv88e6390_g2_irl_init_all, + .get_eeprom = mv88e6xxx_g2_get_eeprom8, + .set_eeprom = mv88e6xxx_g2_set_eeprom8, + .set_switch_mac = mv88e6xxx_g2_set_switch_mac, + .phy_read = mv88e6xxx_g2_smi_phy_read, + .phy_write = mv88e6xxx_g2_smi_phy_write, + .port_set_link = mv88e6xxx_port_set_link, + .port_set_speed_duplex = mv88e6393x_port_set_speed_duplex, + .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, + .port_tag_remap = mv88e6390_port_tag_remap, + .port_set_frame_mode = mv88e6351_port_set_frame_mode, + .port_set_egress_floods = mv88e6352_port_set_egress_floods, + .port_set_ether_type = mv88e6393x_port_set_ether_type, + .port_set_jumbo_size = mv88e6165_port_set_jumbo_size, + .port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting, + .port_pause_limit = mv88e6390_port_pause_limit, + .port_set_cmode = mv88e6393x_port_set_cmode, + .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit, + .port_disable_pri_override = mv88e6xxx_port_disable_pri_override, + .port_get_cmode = mv88e6352_port_get_cmode, + .stats_snapshot = mv88e6390_g1_stats_snapshot, + .stats_set_histogram = mv88e6390_g1_stats_set_histogram, + .stats_get_sset_count = mv88e6320_stats_get_sset_count, + .stats_get_strings = mv88e6320_stats_get_strings, + .stats_get_stats = mv88e6390_stats_get_stats, + .set_cpu_port = mv88e6393x_port_set_cpu_dest, + .set_egress_port = mv88e6393x_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, + .mgmt_rsvd2cpu = mv88e6393x_port_mgmt_rsvd2cpu, + .pot_clear = mv88e6xxx_g2_pot_clear, + .reset = mv88e6352_g1_reset, + .rmu_disable = mv88e6390_g1_rmu_disable, + .vtu_getnext = mv88e6390_g1_vtu_getnext, + .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge, + .serdes_power = mv88e6393x_serdes_power, + .serdes_get_lane = mv88e6393x_serdes_get_lane, +/* Check status register pause & lpa register */ + .serdes_pcs_get_state = mv88e6390_serdes_pcs_get_state, + .serdes_irq_mapping = mv88e6390_serdes_irq_mapping, + .serdes_irq_enable = mv88e6393x_serdes_irq_enable, + .serdes_irq_status = mv88e6393x_serdes_irq_status, + .gpio_ops = &mv88e6352_gpio_ops, + .avb_ops = &mv88e6390_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, + .phylink_validate = mv88e6393x_phylink_validate, +}; +static const struct mv88e6xxx_ops mv88e6240_ops = {/* MV88E6XXX_FAMILY_6352 */ .ieee_pri_map = mv88e6085_g1_ieee_pri_map,
@@ -5073,6 +5141,29 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .ops = &mv88e6191_ops, }, + [MV88E6193X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6193X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6193X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6193x_ops, + }, + [MV88E6220] = { .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6220, .family = MV88E6XXX_FAMILY_6250,
drivers/net/dsa/mv88e6xxx/chip.h +4 -0
@@ -63,6 +63,8 @@ enum mv88e6xxx_model {MV88E6190 ,MV88E6190X ,MV88E6191 , +MV88E6191X , +MV88E6193X ,MV88E6220 ,MV88E6240 , MV88E6250,
@@ -75,6 +77,7 @@ enum mv88e6xxx_model {MV88E6352 ,MV88E6390 ,MV88E6390X , + MV88E6393X, }; enum mv88e6xxx_family {
@@ -90,6 +93,7 @@ enum mv88e6xxx_family {MV88E6XXX_FAMILY_6351 ,/* 6171 6175 6350 6351 */ MV88E6XXX_FAMILY_6352 ,/* 6172 6176 6240 6352 */ MV88E6XXX_FAMILY_6390 ,/* 6190 6190X 6191 6290 6390 6390X */ + MV88E6XXX_FAMILY_6393, /* 6191X 6193X 6393X */ };struct mv88e6xxx_ops ;
drivers/net/dsa/mv88e6xxx/global1.h +2 -0
@@ -22,6 +22,7 @@#define MV88E6185_G1_STS_PPU_STATE_DISABLED 0x8000#define MV88E6185_G1_STS_PPU_STATE_POLLING 0xc000#define MV88E6XXX_G1_STS_INIT_READY 0x0800 +#define MV88E6193X_G1_STS_IRQ_DEVICE_2 9#define MV88E6XXX_G1_STS_IRQ_AVB 8#define MV88E6XXX_G1_STS_IRQ_DEVICE 7#define MV88E6XXX_G1_STS_IRQ_STATS 6
@@ -59,6 +60,7 @@#define MV88E6185_G1_CTL1_SCHED_PRIO 0x0800#define MV88E6185_G1_CTL1_MAX_FRAME_1632 0x0400#define MV88E6185_G1_CTL1_RELOAD_EEPROM 0x0200 +#define MV88E6193X_G1_CTL1_DEVICE2_EN 0x0200#define MV88E6XXX_G1_CTL1_DEVICE_EN 0x0080#define MV88E6XXX_G1_CTL1_STATS_DONE_EN 0x0040#define MV88E6XXX_G1_CTL1_VTU_PROBLEM_EN 0x0020
drivers/net/dsa/mv88e6xxx/global2.h +8 -0
@@ -38,9 +38,15 @@/* Offset 0x02: MGMT Enable Register 2x */ #define MV88E6XXX_G2_MGMT_EN_2X 0x02 +/* Offset 0x02: MAC LINK change IRQ Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_SRC 0x02 +/* Offset 0x03: MGMT Enable Register 0x */ #define MV88E6XXX_G2_MGMT_EN_0X 0x03 +/* Offset 0x03: MAC LINK change IRQ Mask Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_MASK 0x03 +/* Offset 0x04: Flow Control Delay Register */ #define MV88E6XXX_G2_FLOW_CTL 0x04
@@ -52,6 +58,8 @@#define MV88E6XXX_G2_SWITCH_MGMT_FORCE_FLOW_CTL_PRI 0x0080#define MV88E6XXX_G2_SWITCH_MGMT_RSVD2CPU 0x0008 +#define MV88E6393X_G2_EGRESS_MONITOR_DEST 0x05 +/* Offset 0x06: Device Mapping Table Register */ #define MV88E6XXX_G2_DEVICE_MAPPING 0x06#define MV88E6XXX_G2_DEVICE_MAPPING_UPDATE 0x8000
drivers/net/dsa/mv88e6xxx/port.c +233 -0
269 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/port.h +39 -1
@@ -49,6 +49,9 @@#define MV88E6XXX_PORT_STS_CMODE_2500BASEX 0x000b#define MV88E6XXX_PORT_STS_CMODE_XAUI 0x000c#define MV88E6XXX_PORT_STS_CMODE_RXAUI 0x000d +#define MV88E6XXX_PORT_STS_CMODE_5GBASER 0x000c +#define MV88E6XXX_PORT_STS_CMODE_10GBASER 0x000d +#define MV88E6XXX_PORT_STS_CMODE_USXGMII 0x000e#define MV88E6185_PORT_STS_CDUPLEX 0x0008#define MV88E6185_PORT_STS_CMODE_MASK 0x0007#define MV88E6185_PORT_STS_CMODE_GMII_FD 0x0000
@@ -117,6 +120,8 @@#define MV88E6XXX_PORT_SWITCH_ID_PROD_6176 0x1760#define MV88E6XXX_PORT_SWITCH_ID_PROD_6190 0x1900#define MV88E6XXX_PORT_SWITCH_ID_PROD_6191 0x1910 +#define MV88E6XXX_PORT_SWITCH_ID_PROD_6191X 0x1920 +#define MV88E6XXX_PORT_SWITCH_ID_PROD_6193X 0x1930#define MV88E6XXX_PORT_SWITCH_ID_PROD_6185 0x1a70#define MV88E6XXX_PORT_SWITCH_ID_PROD_6220 0x2200#define MV88E6XXX_PORT_SWITCH_ID_PROD_6240 0x2400
@@ -129,6 +134,7 @@#define MV88E6XXX_PORT_SWITCH_ID_PROD_6350 0x3710#define MV88E6XXX_PORT_SWITCH_ID_PROD_6351 0x3750#define MV88E6XXX_PORT_SWITCH_ID_PROD_6390 0x3900 +#define MV88E6XXX_PORT_SWITCH_ID_PROD_6393X 0x3930#define MV88E6XXX_PORT_SWITCH_ID_REV_MASK 0x000f/* Offset 0x04: Port Control Register */
@@ -236,6 +242,19 @@#define MV88E6XXX_PORT_POLICY_CTL_TRAP 0x0002#define MV88E6XXX_PORT_POLICY_CTL_DISCARD 0x0003 +/* Offset 0x0E: Policy & MGMT Control Register (FAMILY_6393X)*/ +#define MV88E6393X_PORT_POLICY_MGMT_CTL 0x0e +#define MV88E6393X_PORT_POLICY_MGMT_CTL_UPDATE 0x8000 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_MASK 0x3f00 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000000XLO 0x2000 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000000XHI 0x2100 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000002XLO 0x2400 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000002XHI 0x2500 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_INGRESS_DEST 0x3000 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_CPU_DEST 0x3800 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_DATA_MASK 0x00ff +#define MV88E6393X_PORT_POLICY_MGMT_CTL_CPU_DEST_MGMTPRI 0x00e0 +/* Offset 0x0F: Port Special Ether Type */ #define MV88E6XXX_PORT_ETH_TYPE 0x0f#define MV88E6XXX_PORT_ETH_TYPE_DEFAULT 0x9100
@@ -243,6 +262,15 @@/* Offset 0x10: InDiscards Low Counter */ #define MV88E6XXX_PORT_IN_DISCARD_LO 0x10 +/* Offset 0x10: Extended Port Control Command */ +#define MV88E6393X_PORT_EPC_CMD 0x10 +#define MV88E6393X_PORT_EPC_CMD_BUSY 0x8000 +#define MV88E6393X_PORT_EPC_CMD_WRITE 0x0300 +#define MV88E6393X_PORT_EPC_INDEX_PORT_ETYPE 0x02 + +/* Offset 0x11: Extended Port Control Data */ +#define MV88E6393X_PORT_EPC_DATA 0x11 +/* Offset 0x11: InDiscards High Counter */ #define MV88E6XXX_PORT_IN_DISCARD_HI 0x11
@@ -312,7 +340,8 @@ int mv88e6390_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, int speed, int duplex);int mv88e6390x_port_set_speed_duplex (struct mv88e6xxx_chip *chip,int port,int speed,int duplex); - +int mv88e6393x_port_set_speed_duplex (struct mv88e6xxx_chip *chip,int port, +int speed,int duplex);phy_interface_t mv88e6341_port_max_speed_mode (int port);phy_interface_t mv88e6390_port_max_speed_mode (int port);phy_interface_t mv88e6390x_port_max_speed_mode (int port);
@@ -346,6 +375,13 @@ int mv88e6352_port_set_policy(struct mv88e6xxx_chip *chip, int port, enum mv88e6xxx_policy_action action);int mv88e6351_port_set_ether_type (struct mv88e6xxx_chip *chip,int port,u16 etype); +int mv88e6393x_set_egress_port (struct mv88e6xxx_chip *chip, +enum mv88e6xxx_egress_direction direction, +int port); +int mv88e6393x_port_set_cpu_dest (struct mv88e6xxx_chip *chip,int port); +int mv88e6393x_port_mgmt_rsvd2cpu (struct mv88e6xxx_chip *chip); +int mv88e6393x_port_set_ether_type (struct mv88e6xxx_chip *chip,int port, +u16 etype);int mv88e6xxx_port_set_message_port (struct mv88e6xxx_chip *chip,int port,bool message_port); int mv88e6165_port_set_jumbo_size(struct mv88e6xxx_chip *chip, int port,
@@ -362,6 +398,8 @@ int mv88e6390_port_set_cmode(struct mv88e6xxx_chip *chip, int port, phy_interface_t mode);int mv88e6390x_port_set_cmode (struct mv88e6xxx_chip *chip,int port,phy_interface_t mode); +int mv88e6393x_port_set_cmode (struct mv88e6xxx_chip *chip,int port, +phy_interface_t mode);int mv88e6185_port_get_cmode (struct mv88e6xxx_chip *chip,int port,u8 *cmode);int mv88e6352_port_get_cmode (struct mv88e6xxx_chip *chip,int port,u8 *cmode);int mv88e6xxx_port_set_map_da (struct mv88e6xxx_chip *chip,int port);
drivers/net/dsa/mv88e6xxx/serdes.c +227 -0
242 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +39 -0
@@ -68,15 +68,47 @@#define MV88E6390_SGMII_PHY_STATUS_LINK BIT(10)#define MV88E6390_SGMII_PHY_STATUS_TX_PAUSE BIT(3)#define MV88E6390_SGMII_PHY_STATUS_RX_PAUSE BIT(2) +#define MV88E6390_SGMII_STATUS_AN_ABLE BIT(3) +#define MV88E6390_SGMII_ANAR 0x2004 +#define MV88E6390_SGMII_ANAR_1000BASEX_FD BIT(5) +#define MV88E6390_SGMII_CONTROL 0x2000 +#define MV88E6390_SGMII_CONTROL_RESET BIT(15) +#define MV88E6390_SGMII_CONTROL_LOOPBACK BIT(14) +#define MV88E6390_SGMII_CONTROL_PDOWN BIT(11) +#define MV88E6390_SGMII_STATUS 0x2001/* Packet generator pad packet checker */ #define MV88E6390_PG_CONTROL 0xf010#define MV88E6390_PG_CONTROL_ENABLE_PC BIT(0) +#define MV88E6393X_PORT0_LANE 0x00 +#define MV88E6393X_PORT9_LANE 0x09 +#define MV88E6393X_PORT10_LANE 0x0a + +/* Port Operational Configuration */ +#define MV88E6393X_PCS_SELECT_1000BASEX 0x0000 +#define MV88E6393X_PCS_SELECT_2500BASEX 0x0001 +#define MV88E6393X_PCS_SELECT_SGMII_PHY 0x0002 +#define MV88E6393X_PCS_SELECT_SGMII_MAC 0x0003 +#define MV88E6393X_PCS_SELECT_5GBASER 0x0004 +#define MV88E6393X_PCS_SELECT_10GBASER 0x0005 +#define MV88E6393X_PCS_SELECT_USXGMII_PHY 0x0006 +#define MV88E6393X_PCS_SELECT_USXGMII_MAC 0x0007 + +#define MV88E6393X_SERDES_POC 0xf002 +#define MV88E6393X_SERDES_POC_PCS_MODE_MASK 0x0007 +#define MV88E6393X_SERDES_POC_RESET BIT(15) +#define MV88E6393X_SERDES_POC_PDOWN BIT(5) +#define MV88E6393X_SERDES_POC_ANEG BIT(3) + +#define MV88E6393X_ERRATA_1000BASEX_SGMII 0xF074 +#define MV88E6393X_ERRATA_1000BASEX_SGMII_BIT BIT(14) +u8 mv88e6341_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);u8 mv88e6352_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);u8 mv88e6390_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);u8 mv88e6390x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port); +u8 mv88e6393x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port); int mv88e6352_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, u8 lane, unsigned int mode, phy_interface_t interface,
@@ -105,14 +137,21 @@ int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, u8 lane, bool on);int mv88e6390_serdes_power (struct mv88e6xxx_chip *chip,int port,u8 lane,bool on); +int mv88e6393x_serdes_power (struct mv88e6xxx_chip *chip,int port,u8 lane, +bool on); +int mv88e6393x_setup_errata (struct mv88e6xxx_chip *chip);int mv88e6352_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port,u8 lane,bool enable);int mv88e6390_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port,u8 lane,bool enable); +int mv88e6393x_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port, +u8 lane,bool enable);irqreturn_t mv88e6352_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,u8 lane);irqreturn_t mv88e6390_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,u8 lane); +irqreturn_t mv88e6393x_serdes_irq_status (struct mv88e6xxx_chip *chip,int port, +u8 lane);int mv88e6352_serdes_get_sset_count (struct mv88e6xxx_chip *chip,int port);int mv88e6352_serdes_get_strings (struct mv88e6xxx_chip *chip,int port,uint8_t *data);
Signature · 1 line
2.17.1
kernel test robot
build botThank you for the patch! Perhaps something to improve:
Hi Pavana,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on sparc-next/master linux/master v5.10-rc1 next-20201026] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Pavana-Sharma/Add-support-for-mv88e6393x-family-of-Marvell/20201026-140237 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 3650b228f83adda7e5ee532e2b90429c03f7b9ec config: xtensa-allyesconfig (attached as .config) compiler: xtensa-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/6bac8985349e1ceedb3d4e9bba18563fb15613c0
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Pavana-Sharma/Add-support-for-mv88e6393x-family-of-Marvell/20201026-140237 git checkout 6bac8985349e1ceedb3d4e9bba18563fb15613c0
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=xtensa
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/net/dsa/mv88e6xxx/port.c:29:5: warning: no previous prototype for 'mv88e6xxx_port_wait_bit' [-Wmissing-prototypes]
29 | int mv88e6xxx_port_wait_bit(struct mv88e6xxx_chip *chip, int port, int reg,
| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/net/dsa/mv88e6xxx/port.c: In function 'mv88e6xxx_port_set_cmode':
drivers/net/dsa/mv88e6xxx/port.c:513:7: error: 'PHY_INTERFACE_MODE_5GBASER' undeclared (first use in this function); did you mean 'PHY_INTERFACE_MODE_10GBASER'?
513 | case PHY_INTERFACE_MODE_5GBASER:
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
| PHY_INTERFACE_MODE_10GBASER drivers/net/dsa/mv88e6xxx/port.c:513:7: note: each undeclared identifier is reported only once for each function it appears in
vim +/mv88e6xxx_port_wait_bit +29 drivers/net/dsa/mv88e6xxx/port.c
28
> 29 int mv88e6xxx_port_wait_bit(struct mv88e6xxx_chip *chip, int port, int reg,
30 int bit, int val)
31 {
32 int addr = chip->info->port_base_addr + port;
33 return mv88e6xxx_wait_bit(chip, addr, reg, bit, val);
34 }
35 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botThank you for the patch! Perhaps something to improve:
Hi Pavana,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on linux/master v5.10-rc1 next-20201027] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Pavana-Sharma/Add-support-for-mv88e6393x-family-of-Marvell/20201026-140237 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 3650b228f83adda7e5ee532e2b90429c03f7b9ec config: arm-randconfig-r013-20201026 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project f2c25c70791de95d2466e09b5b58fc37f6ccd7a4)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm cross compiling tool for clang build
# apt-get install binutils-arm-linux-gnueabi
# https://github.com/0day-ci/linux/commit/6bac8985349e1ceedb3d4e9bba18563fb15613c0
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Pavana-Sharma/Add-support-for-mv88e6393x-family-of-Marvell/20201026-140237 git checkout 6bac8985349e1ceedb3d4e9bba18563fb15613c0
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/net/dsa/mv88e6xxx/port.c:29:5: warning: no previous prototype for function 'mv88e6xxx_port_wait_bit' [-Wmissing-prototypes]
int mv88e6xxx_port_wait_bit(struct mv88e6xxx_chip *chip, int port, int reg,
^
drivers/net/dsa/mv88e6xxx/port.c:29:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
int mv88e6xxx_port_wait_bit(struct mv88e6xxx_chip *chip, int port, int reg,
^
static
drivers/net/dsa/mv88e6xxx/port.c:513:7: error: use of undeclared identifier 'PHY_INTERFACE_MODE_5GBASER'; did you mean 'PHY_INTERFACE_MODE_10GBASER'?
case PHY_INTERFACE_MODE_5GBASER:
^~~~~~~~~~~~~~~~~~~~~~~~~~
PHY_INTERFACE_MODE_10GBASER
include/linux/phy.h:143:2: note: 'PHY_INTERFACE_MODE_10GBASER' declared here
PHY_INTERFACE_MODE_10GBASER,
^
drivers/net/dsa/mv88e6xxx/port.c:516:7: error: duplicate case value 'PHY_INTERFACE_MODE_10GBASER'
case PHY_INTERFACE_MODE_10GBASER:
^
drivers/net/dsa/mv88e6xxx/port.c:513:7: note: previous case defined here
case PHY_INTERFACE_MODE_5GBASER:
^1 warning and 2 errors generated.
vim +/mv88e6xxx_port_wait_bit +29 drivers/net/dsa/mv88e6xxx/port.c
28
> 29 int mv88e6xxx_port_wait_bit(struct mv88e6xxx_chip *chip, int port, int reg,
30 int bit, int val)
31 {
32 int addr = chip->info->port_base_addr + port;
33 return mv88e6xxx_wait_bit(chip, addr, reg, bit, val);
34 }
35 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v4 2/3 Add phy interface for 5GBASER mode
In reply to Pavana Sharma--- include/linux/phy.h | 3 +++ 1 file changed, 3 insertions(+)
include/linux/phy.h +3 -0
@@ -107,6 +107,7 @@ typedef enum {PHY_INTERFACE_MODE_2500BASEX ,PHY_INTERFACE_MODE_RXAUI ,PHY_INTERFACE_MODE_XAUI , +PHY_INTERFACE_MODE_5GBASER ,/* 10GBASE-R, XFI, SFI - single lane 10G Serdes */ PHY_INTERFACE_MODE_10GBASER , PHY_INTERFACE_MODE_USXGMII,
@@ -187,6 +188,8 @@ static inline const char *phy_modes(phy_interface_t interface)return "rxaui" ;case PHY_INTERFACE_MODE_XAUI :return "xaui" ; +case PHY_INTERFACE_MODE_5GBASER : +return "5gbase-r" ;case PHY_INTERFACE_MODE_10GBASER :return "10gbase-r" ;case PHY_INTERFACE_MODE_USXGMII :
Signature · 1 line
2.17.1
Andrew Lunn
maintainerRe: [PATCH v4 2/3] Add phy interface for 5GBASER mode
Quoted 1 line · Pavana Sharma
Signed-off-by Pavana Sharma <[email protected]>
Please swap the order of the patches so the build does not break.
Andrew
Re: [PATCH v4 2/3] Add phy interface for 5GBASER mode
In reply to Pavana SharmaQuoted 1 line · Pavana Sharma
Signed-off-by Pavana Sharma <[email protected]>
Please subject this patch properly with "net: phy: Add 5GBASER interface mode" and please also consider updating other files that are relevant here:
Documentation/devicetree/bindings/net/ethernet-controller.yaml drivers/net/phy/phy-core.c
Signature · 1 line
Florian
PATCH v4 3/3 Change serdes lane parameter from u8 type to int.
In reply to Pavana SharmaReturning 0 is no more an error case with MV88E6393 family which has serdes lane numbers 0, 9 or 10.
So with this change .serdes_get_lane will return lane number or error (-ENODEV).
--- drivers/net/dsa/mv88e6xxx/chip.c | 28 +++++------ drivers/net/dsa/mv88e6xxx/chip.h | 16 +++--- drivers/net/dsa/mv88e6xxx/port.c | 6 +-- drivers/net/dsa/mv88e6xxx/serdes.c | 80 +++++++++++++++--------------- drivers/net/dsa/mv88e6xxx/serdes.h | 58 +++++++++++----------- 5 files changed, 93 insertions(+), 95 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +14 -14
@@ -484,12 +484,12 @@ static int mv88e6xxx_serdes_pcs_get_state(struct dsa_switch *ds, int port, struct phylink_link_state *state) {struct mv88e6xxx_chip *chip = ds->priv; -u8 lane; +int lane;int err;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane && chip->info->ops->serdes_pcs_get_state) +if ((lane != -ENODEV ) && chip->info->ops->serdes_pcs_get_state) err = chip->info->ops->serdes_pcs_get_state (chip, port, lane, state);else
@@ -505,11 +505,11 @@ static int mv88e6xxx_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, const unsigned long *advertise) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane;if (ops->serdes_pcs_config) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane != -ENODEV )return ops->serdes_pcs_config (chip, port, lane, mode, interface, advertise); }
@@ -522,14 +522,14 @@ static void mv88e6xxx_serdes_pcs_an_restart(struct dsa_switch *ds, int port)struct mv88e6xxx_chip *chip = ds->priv;const struct mv88e6xxx_ops *ops;int err =0 ; -u8 lane; +int lane; ops = chip->info->ops;if (ops->serdes_pcs_an_restart) {mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane != -ENODEV ) err = ops->serdes_pcs_an_restart (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -543,11 +543,11 @@ static int mv88e6xxx_serdes_pcs_link_up(struct mv88e6xxx_chip *chip, int port, int speed, int duplex) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane;if (!phylink_autoneg_inband (mode) && ops->serdes_pcs_link_up) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane != -ENODEV )return ops->serdes_pcs_link_up (chip, port, lane, speed, duplex); }
@@ -2442,11 +2442,11 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id)struct mv88e6xxx_chip *chip = mvp->chip;irqreturn_t ret =IRQ_NONE ;int port = mvp->port; -u8 lane; +int lane;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane != -ENODEV ) ret =mv88e6xxx_serdes_irq_status (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -2454,7 +2454,7 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id) }static int mv88e6xxx_serdes_irq_request (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq;
@@ -2483,7 +2483,7 @@ static int mv88e6xxx_serdes_irq_request(struct mv88e6xxx_chip *chip, int port, }static int mv88e6xxx_serdes_irq_free (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq = dev_id->serdes_irq;
@@ -2508,11 +2508,11 @@ static int mv88e6xxx_serdes_irq_free(struct mv88e6xxx_chip *chip, int port,static int mv88e6xxx_serdes_power (struct mv88e6xxx_chip *chip,int port,bool on) { -u8 lane; +int lane;int err; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) +if (lane == -ENODEV )return 0 ;if (on) {
drivers/net/dsa/mv88e6xxx/chip.h +8 -8
@@ -494,30 +494,30 @@ struct mv88e6xxx_ops {int (*mgmt_rsvd2cpu)(struct mv88e6xxx_chip *chip);/* Power on/off a SERDES interface */ -int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,int lane,bool up);/* SERDES lane mapping */ -u8 (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port); +int (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port);int (*serdes_pcs_get_state)(struct mv88e6xxx_chip *chip,int port, -u8 lane,struct phylink_link_state *state); +int lane,struct phylink_link_state *state);int (*serdes_pcs_config)(struct mv88e6xxx_chip *chip,int port, -u8 lane,unsigned int mode, +int lane,unsigned int mode,phy_interface_t interface,const unsigned long *advertise);int (*serdes_pcs_an_restart)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);int (*serdes_pcs_link_up)(struct mv88e6xxx_chip *chip,int port, -u8 lane,int speed,int duplex); +int lane,int speed,int duplex);/* SERDES interrupt handling */ unsigned int (*serdes_irq_mapping)(struct mv88e6xxx_chip *chip,int port); -int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,int lane,bool enable);irqreturn_t (*serdes_irq_status)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);/* Statistics from the SERDES interface */ int (*serdes_get_sset_count)(struct mv88e6xxx_chip *chip,int port);
drivers/net/dsa/mv88e6xxx/port.c +3 -3
@@ -482,7 +482,7 @@ int mv88e6393x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,static int mv88e6xxx_port_set_cmode (struct mv88e6xxx_chip *chip,int port,phy_interface_t mode,bool force) { -u8 lane; +int lane;u16 cmode;u16 reg;int err;
@@ -529,7 +529,7 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port,return 0 ; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) { +if (lane != -ENODEV ) {if (chip->ports[port].serdes_irq) { err =mv88e6xxx_serdes_irq_disable (chip, port, lane);if (err)
@@ -558,7 +558,7 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port, chip->ports[port].cmode = cmode; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) +if (lane == -ENODEV )return -ENODEV ; err =mv88e6xxx_serdes_power_up (chip, port, lane);
drivers/net/dsa/mv88e6xxx/serdes.c +39 -41
302 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +29 -29
128 lines not on this page · raw message
Signature · 1 line
2.17.1
Quoted 12 lines · Pavana Sharma
Hi,
Thanks for the review.
Following is the updated patchset.The 6393X family has MV88E6191X, MV88E6193X and MV88E6393X products listed in Gigabit Ethernet and Gigabit 10G+ Ethernet categories. There are no 6393 devices (without X) but there is 6191 device (without X)from a different family. The product id is listed with the 'X' in the name so I prefer to retain the product name 6393X in the driver whereas we can define the family name as '
MV88E6XXX_FAMILY_6393' without 'X'.
Quoted 4 lines
The patchset adds support for modes 5GBASE-R, 10GBASE-R and USXGMII on ports 0, 9 and 10.
Tested on MV88E6193X device.
Please subject your patches appropriately using "net: dsa: mv88e6xxx: " for DSA changes to the driver and "net: phy: " for PHY subsystem changes.
Signature · 1 line
Florian
v5 cover Add support for mv88e6393x family of Marvell
Updated patchset.
Pavana Sharma (3):
net: phy: Add 5GBASER interface mode
dt-bindings: net: Add 5GBASER phy interface mode
net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
.../bindings/net/ethernet-controller.yaml | 2 + drivers/net/dsa/mv88e6xxx/chip.c | 119 ++++++- drivers/net/dsa/mv88e6xxx/chip.h | 20 +- drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 240 +++++++++++++- drivers/net/dsa/mv88e6xxx/port.h | 40 ++- drivers/net/dsa/mv88e6xxx/serdes.c | 296 +++++++++++++++--- drivers/net/dsa/mv88e6xxx/serdes.h | 89 ++++-- include/linux/phy.h | 3 + 10 files changed, 732 insertions(+), 87 deletions(-)
Signature · 1 line
2.17.1
PATCH v5 1/3 net: phy: Add 5GBASER interface mode
Add new mode supported by MV88E6393 family.
--- include/linux/phy.h | 3 +++ 1 file changed, 3 insertions(+)
include/linux/phy.h +3 -0
@@ -107,6 +107,7 @@ typedef enum {PHY_INTERFACE_MODE_2500BASEX ,PHY_INTERFACE_MODE_RXAUI ,PHY_INTERFACE_MODE_XAUI , +PHY_INTERFACE_MODE_5GBASER ,/* 10GBASE-R, XFI, SFI - single lane 10G Serdes */ PHY_INTERFACE_MODE_10GBASER , PHY_INTERFACE_MODE_USXGMII,
@@ -187,6 +188,8 @@ static inline const char *phy_modes(phy_interface_t interface)return "rxaui" ;case PHY_INTERFACE_MODE_XAUI :return "xaui" ; +case PHY_INTERFACE_MODE_5GBASER : +return "5gbase-r" ;case PHY_INTERFACE_MODE_10GBASER :return "10gbase-r" ;case PHY_INTERFACE_MODE_USXGMII :
Signature · 1 line
2.17.1
Andrew Lunn
maintainerRe: [PATCH v5 1/3] net: phy: Add 5GBASER interface mode
Quoted 12 lines · Pavana Sharma
Add new mode supported by MV88E6393 family.
Signed-off-by Pavana Sharma <[email protected]>--- include/linux/phy.h | 3 +++ 1 file changed, 3 insertions(+)include/linux/phy.h +0
-0
include/linux/phy.h typedef enum { · line 113
Quoted 7 lines
include/linux/phy.h +1
-0@@ -107,6 +107,7 @@ typedef enum {PHY_INTERFACE_MODE_2500BASEX ,PHY_INTERFACE_MODE_RXAUI ,PHY_INTERFACE_MODE_XAUI , +PHY_INTERFACE_MODE_5GBASER ,/* 10GBASE-R, XFI, SFI - single lane 10G Serdes */ PHY_INTERFACE_MODE_10GBASER , PHY_INTERFACE_MODE_USXGMII,
Hi Pavana
You need to add this new mode to the kerneldoc above the typedef. Otherwise you will get a warning from W=1 and kernel documentation build process.
Andrew
PATCH v5 2/3 dt-bindings: net: Add 5GBASER phy interface mode
In reply to Pavana SharmaAdd 5GBASE-R phy interface mode supported by mv88e6393 family.
--- Documentation/devicetree/bindings/net/ethernet-controller.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/net/ethernet-controller.yaml +2 -0
@@ -92,6 +92,8 @@ properties: - rxaui - xaui + # 5GBASE-R + - 5gbase-r # 10GBASE-KR, XFI, SFI - 10gbase-kr - usxgmii
Signature · 1 line
2.17.1
Re: [PATCH v5 2/3] dt-bindings: net: Add 5GBASER phy interface mode
Quoted 4 lines · Pavana Sharma
Add 5GBASE-R phy interface mode supported by mv88e6393 family.
Signed-off-by Pavana Sharma <[email protected]>
Andrew
PATCH v5 3/3 net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
In reply to Pavana SharmaThe Marvell 88E6393X device is a single-chip integration of a 11-port Ethernet switch with eight integrated Gigabit Ethernet (GbE) transceivers and three 10-Gigabit interfaces.
This patch adds functionalities specific to mv88e6393x family (88E6393X, 88E6193X and 88E6191X)
---
Changes in v2:
- Fix a warning (Reported-by: kernel test robot <[email protected]>)
Changes in v3:
- Fix 'unused function' warning
Changes in v4, v5:
- Incorporated feedback from maintainers.
--- drivers/net/dsa/mv88e6xxx/chip.c | 119 +++++++++-- drivers/net/dsa/mv88e6xxx/chip.h | 20 +- drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 240 +++++++++++++++++++++- drivers/net/dsa/mv88e6xxx/port.h | 40 +++- drivers/net/dsa/mv88e6xxx/serdes.c | 296 ++++++++++++++++++++++++---- drivers/net/dsa/mv88e6xxx/serdes.h | 89 ++++++--- 8 files changed, 727 insertions(+), 87 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +105 -14
@@ -484,12 +484,12 @@ static int mv88e6xxx_serdes_pcs_get_state(struct dsa_switch *ds, int port, struct phylink_link_state *state) {struct mv88e6xxx_chip *chip = ds->priv; -u8 lane; +int lane;int err;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane && chip->info->ops->serdes_pcs_get_state) +if ((lane != -ENODEV ) && chip->info->ops->serdes_pcs_get_state) err = chip->info->ops->serdes_pcs_get_state (chip, port, lane, state);else
@@ -505,11 +505,11 @@ static int mv88e6xxx_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, const unsigned long *advertise) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane;if (ops->serdes_pcs_config) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane != -ENODEV )return ops->serdes_pcs_config (chip, port, lane, mode, interface, advertise); }
@@ -522,14 +522,14 @@ static void mv88e6xxx_serdes_pcs_an_restart(struct dsa_switch *ds, int port)struct mv88e6xxx_chip *chip = ds->priv;const struct mv88e6xxx_ops *ops;int err =0 ; -u8 lane; +int lane; ops = chip->info->ops;if (ops->serdes_pcs_an_restart) {mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane != -ENODEV ) err = ops->serdes_pcs_an_restart (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -543,11 +543,11 @@ static int mv88e6xxx_serdes_pcs_link_up(struct mv88e6xxx_chip *chip, int port, int speed, int duplex) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane;if (!phylink_autoneg_inband (mode) && ops->serdes_pcs_link_up) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane != -ENODEV )return ops->serdes_pcs_link_up (chip, port, lane, speed, duplex); }
@@ -634,6 +634,24 @@ static void mv88e6390x_phylink_validate(struct mv88e6xxx_chip *chip, int port,mv88e6390_phylink_validate (chip, port, mask, state); } +static void mv88e6393x_phylink_validate (struct mv88e6xxx_chip *chip,int port, +unsigned long *mask, +struct phylink_link_state *state) +{ +if (port ==0 || port ==9 || port ==10 ) { + phylink_set(mask, 10000baseT_Full); + phylink_set(mask, 10000baseKR_Full); + phylink_set(mask, 5000baseT_Full); + phylink_set(mask, 2500baseX_Full); + phylink_set(mask, 2500baseT_Full); + } + + phylink_set(mask, 1000baseT_Full); + phylink_set(mask, 1000baseX_Full); + +mv88e6065_phylink_validate (chip, port, mask, state); +} +static void mv88e6xxx_validate (struct dsa_switch *ds,int port,unsigned long *supported,struct phylink_link_state *state)
@@ -2424,11 +2442,11 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id)struct mv88e6xxx_chip *chip = mvp->chip;irqreturn_t ret =IRQ_NONE ;int port = mvp->port; -u8 lane; +int lane;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane != -ENODEV ) ret =mv88e6xxx_serdes_irq_status (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -2436,7 +2454,7 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id) }static int mv88e6xxx_serdes_irq_request (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq;
@@ -2465,7 +2483,7 @@ static int mv88e6xxx_serdes_irq_request(struct mv88e6xxx_chip *chip, int port, }static int mv88e6xxx_serdes_irq_free (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq = dev_id->serdes_irq;
@@ -2490,11 +2508,11 @@ static int mv88e6xxx_serdes_irq_free(struct mv88e6xxx_chip *chip, int port,static int mv88e6xxx_serdes_power (struct mv88e6xxx_chip *chip,int port,bool on) { -u8 lane; +int lane;int err; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) +if (lane == -ENODEV )return 0 ;if (on) {
@@ -4141,6 +4159,56 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { .phylink_validate = mv88e6390_phylink_validate, }; +static const struct mv88e6xxx_ops mv88e6193x_ops = { +/* MV88E6XXX_FAMILY_6393 */ + .setup_errata = mv88e6393x_setup_errata, + .irl_init_all = mv88e6390_g2_irl_init_all, + .get_eeprom = mv88e6xxx_g2_get_eeprom8, + .set_eeprom = mv88e6xxx_g2_set_eeprom8, + .set_switch_mac = mv88e6xxx_g2_set_switch_mac, + .phy_read = mv88e6xxx_g2_smi_phy_read, + .phy_write = mv88e6xxx_g2_smi_phy_write, + .port_set_link = mv88e6xxx_port_set_link, + .port_set_speed_duplex = mv88e6393x_port_set_speed_duplex, + .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, + .port_tag_remap = mv88e6390_port_tag_remap, + .port_set_frame_mode = mv88e6351_port_set_frame_mode, + .port_set_egress_floods = mv88e6352_port_set_egress_floods, + .port_set_ether_type = mv88e6393x_port_set_ether_type, + .port_set_jumbo_size = mv88e6165_port_set_jumbo_size, + .port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting, + .port_pause_limit = mv88e6390_port_pause_limit, + .port_set_cmode = mv88e6393x_port_set_cmode, + .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit, + .port_disable_pri_override = mv88e6xxx_port_disable_pri_override, + .port_get_cmode = mv88e6352_port_get_cmode, + .stats_snapshot = mv88e6390_g1_stats_snapshot, + .stats_set_histogram = mv88e6390_g1_stats_set_histogram, + .stats_get_sset_count = mv88e6320_stats_get_sset_count, + .stats_get_strings = mv88e6320_stats_get_strings, + .stats_get_stats = mv88e6390_stats_get_stats, + .set_cpu_port = mv88e6393x_port_set_cpu_dest, + .set_egress_port = mv88e6393x_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, + .mgmt_rsvd2cpu = mv88e6393x_port_mgmt_rsvd2cpu, + .pot_clear = mv88e6xxx_g2_pot_clear, + .reset = mv88e6352_g1_reset, + .rmu_disable = mv88e6390_g1_rmu_disable, + .vtu_getnext = mv88e6390_g1_vtu_getnext, + .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge, + .serdes_power = mv88e6393x_serdes_power, + .serdes_get_lane = mv88e6393x_serdes_get_lane, +/* Check status register pause & lpa register */ + .serdes_pcs_get_state = mv88e6390_serdes_pcs_get_state, + .serdes_irq_mapping = mv88e6390_serdes_irq_mapping, + .serdes_irq_enable = mv88e6393x_serdes_irq_enable, + .serdes_irq_status = mv88e6393x_serdes_irq_status, + .gpio_ops = &mv88e6352_gpio_ops, + .avb_ops = &mv88e6390_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, + .phylink_validate = mv88e6393x_phylink_validate, +}; +static const struct mv88e6xxx_ops mv88e6240_ops = {/* MV88E6XXX_FAMILY_6352 */ .ieee_pri_map = mv88e6085_g1_ieee_pri_map,
@@ -5073,6 +5141,29 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .ops = &mv88e6191_ops, }, + [MV88E6193X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6193X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6193X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6193x_ops, + }, + [MV88E6220] = { .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6220, .family = MV88E6XXX_FAMILY_6250,
drivers/net/dsa/mv88e6xxx/chip.h +12 -8
@@ -63,6 +63,8 @@ enum mv88e6xxx_model {MV88E6190 ,MV88E6190X ,MV88E6191 , +MV88E6191X , +MV88E6193X ,MV88E6220 ,MV88E6240 , MV88E6250,
@@ -75,6 +77,7 @@ enum mv88e6xxx_model {MV88E6352 ,MV88E6390 ,MV88E6390X , + MV88E6393X, }; enum mv88e6xxx_family {
@@ -90,6 +93,7 @@ enum mv88e6xxx_family {MV88E6XXX_FAMILY_6351 ,/* 6171 6175 6350 6351 */ MV88E6XXX_FAMILY_6352 ,/* 6172 6176 6240 6352 */ MV88E6XXX_FAMILY_6390 ,/* 6190 6190X 6191 6290 6390 6390X */ + MV88E6XXX_FAMILY_6393, /* 6191X 6193X 6393X */ };struct mv88e6xxx_ops ;
@@ -490,30 +494,30 @@ struct mv88e6xxx_ops {int (*mgmt_rsvd2cpu)(struct mv88e6xxx_chip *chip);/* Power on/off a SERDES interface */ -int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,int lane,bool up);/* SERDES lane mapping */ -u8 (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port); +int (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port);int (*serdes_pcs_get_state)(struct mv88e6xxx_chip *chip,int port, -u8 lane,struct phylink_link_state *state); +int lane,struct phylink_link_state *state);int (*serdes_pcs_config)(struct mv88e6xxx_chip *chip,int port, -u8 lane,unsigned int mode, +int lane,unsigned int mode,phy_interface_t interface,const unsigned long *advertise);int (*serdes_pcs_an_restart)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);int (*serdes_pcs_link_up)(struct mv88e6xxx_chip *chip,int port, -u8 lane,int speed,int duplex); +int lane,int speed,int duplex);/* SERDES interrupt handling */ unsigned int (*serdes_irq_mapping)(struct mv88e6xxx_chip *chip,int port); -int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,int lane,bool enable);irqreturn_t (*serdes_irq_status)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);/* Statistics from the SERDES interface */ int (*serdes_get_sset_count)(struct mv88e6xxx_chip *chip,int port);
drivers/net/dsa/mv88e6xxx/global1.h +2 -0
@@ -22,6 +22,7 @@#define MV88E6185_G1_STS_PPU_STATE_DISABLED 0x8000#define MV88E6185_G1_STS_PPU_STATE_POLLING 0xc000#define MV88E6XXX_G1_STS_INIT_READY 0x0800 +#define MV88E6193X_G1_STS_IRQ_DEVICE_2 9#define MV88E6XXX_G1_STS_IRQ_AVB 8#define MV88E6XXX_G1_STS_IRQ_DEVICE 7#define MV88E6XXX_G1_STS_IRQ_STATS 6
@@ -59,6 +60,7 @@#define MV88E6185_G1_CTL1_SCHED_PRIO 0x0800#define MV88E6185_G1_CTL1_MAX_FRAME_1632 0x0400#define MV88E6185_G1_CTL1_RELOAD_EEPROM 0x0200 +#define MV88E6193X_G1_CTL1_DEVICE2_EN 0x0200#define MV88E6XXX_G1_CTL1_DEVICE_EN 0x0080#define MV88E6XXX_G1_CTL1_STATS_DONE_EN 0x0040#define MV88E6XXX_G1_CTL1_VTU_PROBLEM_EN 0x0020
drivers/net/dsa/mv88e6xxx/global2.h +8 -0
@@ -38,9 +38,15 @@/* Offset 0x02: MGMT Enable Register 2x */ #define MV88E6XXX_G2_MGMT_EN_2X 0x02 +/* Offset 0x02: MAC LINK change IRQ Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_SRC 0x02 +/* Offset 0x03: MGMT Enable Register 0x */ #define MV88E6XXX_G2_MGMT_EN_0X 0x03 +/* Offset 0x03: MAC LINK change IRQ Mask Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_MASK 0x03 +/* Offset 0x04: Flow Control Delay Register */ #define MV88E6XXX_G2_FLOW_CTL 0x04
@@ -52,6 +58,8 @@#define MV88E6XXX_G2_SWITCH_MGMT_FORCE_FLOW_CTL_PRI 0x0080#define MV88E6XXX_G2_SWITCH_MGMT_RSVD2CPU 0x0008 +#define MV88E6393X_G2_EGRESS_MONITOR_DEST 0x05 +/* Offset 0x06: Device Mapping Table Register */ #define MV88E6XXX_G2_DEVICE_MAPPING 0x06#define MV88E6XXX_G2_DEVICE_MAPPING_UPDATE 0x8000
drivers/net/dsa/mv88e6xxx/port.c +237 -3
291 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/port.h +39 -1
@@ -49,6 +49,9 @@#define MV88E6XXX_PORT_STS_CMODE_2500BASEX 0x000b#define MV88E6XXX_PORT_STS_CMODE_XAUI 0x000c#define MV88E6XXX_PORT_STS_CMODE_RXAUI 0x000d +#define MV88E6XXX_PORT_STS_CMODE_5GBASER 0x000c +#define MV88E6XXX_PORT_STS_CMODE_10GBASER 0x000d +#define MV88E6XXX_PORT_STS_CMODE_USXGMII 0x000e#define MV88E6185_PORT_STS_CDUPLEX 0x0008#define MV88E6185_PORT_STS_CMODE_MASK 0x0007#define MV88E6185_PORT_STS_CMODE_GMII_FD 0x0000
@@ -117,6 +120,8 @@#define MV88E6XXX_PORT_SWITCH_ID_PROD_6176 0x1760#define MV88E6XXX_PORT_SWITCH_ID_PROD_6190 0x1900#define MV88E6XXX_PORT_SWITCH_ID_PROD_6191 0x1910 +#define MV88E6XXX_PORT_SWITCH_ID_PROD_6191X 0x1920 +#define MV88E6XXX_PORT_SWITCH_ID_PROD_6193X 0x1930#define MV88E6XXX_PORT_SWITCH_ID_PROD_6185 0x1a70#define MV88E6XXX_PORT_SWITCH_ID_PROD_6220 0x2200#define MV88E6XXX_PORT_SWITCH_ID_PROD_6240 0x2400
@@ -129,6 +134,7 @@#define MV88E6XXX_PORT_SWITCH_ID_PROD_6350 0x3710#define MV88E6XXX_PORT_SWITCH_ID_PROD_6351 0x3750#define MV88E6XXX_PORT_SWITCH_ID_PROD_6390 0x3900 +#define MV88E6XXX_PORT_SWITCH_ID_PROD_6393X 0x3930#define MV88E6XXX_PORT_SWITCH_ID_REV_MASK 0x000f/* Offset 0x04: Port Control Register */
@@ -236,6 +242,19 @@#define MV88E6XXX_PORT_POLICY_CTL_TRAP 0x0002#define MV88E6XXX_PORT_POLICY_CTL_DISCARD 0x0003 +/* Offset 0x0E: Policy & MGMT Control Register (FAMILY_6393X)*/ +#define MV88E6393X_PORT_POLICY_MGMT_CTL 0x0e +#define MV88E6393X_PORT_POLICY_MGMT_CTL_UPDATE 0x8000 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_MASK 0x3f00 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000000XLO 0x2000 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000000XHI 0x2100 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000002XLO 0x2400 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000002XHI 0x2500 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_INGRESS_DEST 0x3000 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_CPU_DEST 0x3800 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_DATA_MASK 0x00ff +#define MV88E6393X_PORT_POLICY_MGMT_CTL_CPU_DEST_MGMTPRI 0x00e0 +/* Offset 0x0F: Port Special Ether Type */ #define MV88E6XXX_PORT_ETH_TYPE 0x0f#define MV88E6XXX_PORT_ETH_TYPE_DEFAULT 0x9100
@@ -243,6 +262,15 @@/* Offset 0x10: InDiscards Low Counter */ #define MV88E6XXX_PORT_IN_DISCARD_LO 0x10 +/* Offset 0x10: Extended Port Control Command */ +#define MV88E6393X_PORT_EPC_CMD 0x10 +#define MV88E6393X_PORT_EPC_CMD_BUSY 0x8000 +#define MV88E6393X_PORT_EPC_CMD_WRITE 0x0300 +#define MV88E6393X_PORT_EPC_INDEX_PORT_ETYPE 0x02 + +/* Offset 0x11: Extended Port Control Data */ +#define MV88E6393X_PORT_EPC_DATA 0x11 +/* Offset 0x11: InDiscards High Counter */ #define MV88E6XXX_PORT_IN_DISCARD_HI 0x11
@@ -312,7 +340,8 @@ int mv88e6390_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, int speed, int duplex);int mv88e6390x_port_set_speed_duplex (struct mv88e6xxx_chip *chip,int port,int speed,int duplex); - +int mv88e6393x_port_set_speed_duplex (struct mv88e6xxx_chip *chip,int port, +int speed,int duplex);phy_interface_t mv88e6341_port_max_speed_mode (int port);phy_interface_t mv88e6390_port_max_speed_mode (int port);phy_interface_t mv88e6390x_port_max_speed_mode (int port);
@@ -346,6 +375,13 @@ int mv88e6352_port_set_policy(struct mv88e6xxx_chip *chip, int port, enum mv88e6xxx_policy_action action);int mv88e6351_port_set_ether_type (struct mv88e6xxx_chip *chip,int port,u16 etype); +int mv88e6393x_set_egress_port (struct mv88e6xxx_chip *chip, +enum mv88e6xxx_egress_direction direction, +int port); +int mv88e6393x_port_set_cpu_dest (struct mv88e6xxx_chip *chip,int port); +int mv88e6393x_port_mgmt_rsvd2cpu (struct mv88e6xxx_chip *chip); +int mv88e6393x_port_set_ether_type (struct mv88e6xxx_chip *chip,int port, +u16 etype);int mv88e6xxx_port_set_message_port (struct mv88e6xxx_chip *chip,int port,bool message_port); int mv88e6165_port_set_jumbo_size(struct mv88e6xxx_chip *chip, int port,
@@ -362,6 +398,8 @@ int mv88e6390_port_set_cmode(struct mv88e6xxx_chip *chip, int port, phy_interface_t mode);int mv88e6390x_port_set_cmode (struct mv88e6xxx_chip *chip,int port,phy_interface_t mode); +int mv88e6393x_port_set_cmode (struct mv88e6xxx_chip *chip,int port, +phy_interface_t mode);int mv88e6185_port_get_cmode (struct mv88e6xxx_chip *chip,int port,u8 *cmode);int mv88e6352_port_get_cmode (struct mv88e6xxx_chip *chip,int port,u8 *cmode);int mv88e6xxx_port_set_map_da (struct mv88e6xxx_chip *chip,int port);
drivers/net/dsa/mv88e6xxx/serdes.c +260 -36
503 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +64 -25
160 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH v5 3/3] net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
Pavana,
please add me to Cc for this.
Does USXGMII mode work? There are some erratas for for 10gb serdes mode.
Also you should split this patch. The code that refactores the serdes_get_lane methods should be in a separate patch.
I have a device with this switch and also a SFP module which can operate with USXGMII. I would like to get USXGMII mode to work before this support is added, if possible. For some reason though I was unable to get it to work, I will have to look at those erratas.
Marek
Andrew Lunn
maintainerRe: [PATCH v5 3/3] net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
In reply to Pavana SharmaQuoted 6 lines · Pavana Sharma
The Marvell 88E6393X device is a single-chip integration of a 11-port Ethernet switch with eight integrated Gigabit Ethernet (GbE) transceivers and three 10-Gigabit interfaces.
This patch adds functionalities specific to mv88e6393x family (88E6393X, 88E6193X and 88E6191X)
Please break this patch up a bit into preparation patches, and the last patch actually adding support for the new family.
e.g. serdes_get_lane() returning -ENODEV should be a patch of its own. That should hopefully answer the question which
ommit 5122d4ec9e8053a5944bf77db6bd6c89143531d7
Author: Vivien Didelot <[email protected]> Date: Sat Aug 31 16:18:30 2019 -0400
net: dsa: mv88e6xxx: simplify .serdes_get_lane
Because the mapping between a SERDES interface and its lane is static, we don't need to stick with negative error codes actually and we can simply return 0 if there is no lane, just like the IRQ mapping.
This way we can keep a simple and intuitive API using unsigned lane numbers while simplifying the implementations with single return statements
raises.
Quoted 55 lines
drivers/net/dsa/mv88e6xxx/chip.c +49
-0+static const struct mv88e6xxx_ops mv88e6193x_ops = { +/* MV88E6XXX_FAMILY_6393 */ + .setup_errata = mv88e6393x_setup_errata, + .irl_init_all = mv88e6390_g2_irl_init_all, + .get_eeprom = mv88e6xxx_g2_get_eeprom8, + .set_eeprom = mv88e6xxx_g2_set_eeprom8, + .set_switch_mac = mv88e6xxx_g2_set_switch_mac, + .phy_read = mv88e6xxx_g2_smi_phy_read, + .phy_write = mv88e6xxx_g2_smi_phy_write, + .port_set_link = mv88e6xxx_port_set_link, + .port_set_speed_duplex = mv88e6393x_port_set_speed_duplex, + .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, + .port_tag_remap = mv88e6390_port_tag_remap, + .port_set_frame_mode = mv88e6351_port_set_frame_mode, + .port_set_egress_floods = mv88e6352_port_set_egress_floods, + .port_set_ether_type = mv88e6393x_port_set_ether_type, + .port_set_jumbo_size = mv88e6165_port_set_jumbo_size, + .port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting, + .port_pause_limit = mv88e6390_port_pause_limit, + .port_set_cmode = mv88e6393x_port_set_cmode, + .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit, + .port_disable_pri_override = mv88e6xxx_port_disable_pri_override, + .port_get_cmode = mv88e6352_port_get_cmode, + .stats_snapshot = mv88e6390_g1_stats_snapshot, + .stats_set_histogram = mv88e6390_g1_stats_set_histogram, + .stats_get_sset_count = mv88e6320_stats_get_sset_count, + .stats_get_strings = mv88e6320_stats_get_strings, + .stats_get_stats = mv88e6390_stats_get_stats, + .set_cpu_port = mv88e6393x_port_set_cpu_dest, + .set_egress_port = mv88e6393x_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, + .mgmt_rsvd2cpu = mv88e6393x_port_mgmt_rsvd2cpu, + .pot_clear = mv88e6xxx_g2_pot_clear, + .reset = mv88e6352_g1_reset, + .rmu_disable = mv88e6390_g1_rmu_disable, + .vtu_getnext = mv88e6390_g1_vtu_getnext, + .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge, + .serdes_power = mv88e6393x_serdes_power, + .serdes_get_lane = mv88e6393x_serdes_get_lane, +/* Check status register pause & lpa register */ + .serdes_pcs_get_state = mv88e6390_serdes_pcs_get_state, + .serdes_irq_mapping = mv88e6390_serdes_irq_mapping, + .serdes_irq_enable = mv88e6393x_serdes_irq_enable, + .serdes_irq_status = mv88e6393x_serdes_irq_status, + .gpio_ops = &mv88e6352_gpio_ops, + .avb_ops = &mv88e6390_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, + .phylink_validate = mv88e6393x_phylink_validate, +};drivers/net/dsa/mv88e6xxx/chip.h +0
-0
drivers/net/dsa/mv88e6xxx/chip.h enum mv88e6xxx_model { · line 66
Quoted 4 lines
drivers/net/dsa/mv88e6xxx/chip.h +1
-0@@ -63,6 +63,8 @@ enum mv88e6xxx_model {MV88E6190 ,MV88E6190X ,MV88E6191 , + MV88E6191X,
Is the 6191X part of the 6193 family? Not the 6390, like the 6191 is? Or do we have the 6191 in the wrong family?
drivers/net/dsa/mv88e6xxx/chip.h enum mv88e6xxx_model { · line 67
Quoted 1 line
drivers/net/dsa/mv88e6xxx/chip.h +1
-0+ MV88E6193X,
You don't add any _ops structure for the 6193x. How is it different? Can you make your best guess at the ops structure. Also, what about the 6191X?
Quoted 12 lines
drivers/net/dsa/mv88e6xxx/chip.h +1
-0MV88E6220 ,MV88E6240 , MV88E6250,@@ -75,6 +77,7 @@ enum mv88e6xxx_model {MV88E6352 ,MV88E6390 ,MV88E6390X , + MV88E6393X, }; enum mv88e6xxx_family {
drivers/net/dsa/mv88e6xxx/chip.h enum mv88e6xxx_family { · line 97
Quoted 5 lines
drivers/net/dsa/mv88e6xxx/chip.h +1
-0@@ -90,6 +93,7 @@ enum mv88e6xxx_family {MV88E6XXX_FAMILY_6351 ,/* 6171 6175 6350 6351 */ MV88E6XXX_FAMILY_6352 ,/* 6172 6176 6240 6352 */ MV88E6XXX_FAMILY_6390 ,/* 6190 6190X 6191 6290 6390 6390X */ + MV88E6XXX_FAMILY_6393, /* 6191X 6193X 6393X */ };
Andrew
v6 cover Add support for mv88e6393x family of Marvell
Updated patchset.
Split the patch to separate mv88e6393 changes from refactoring serdes_get_lane.
Update Documentation before adding new mode.
Quoted 8 lines
Is the 6191X part of the 6193 family? Not the 6390, like the 6191 is? Or do we have the 6191 in the wrong family?
drivers/net/dsa/mv88e6xxx/chip.h enum mv88e6xxx_model { · line 67
Quoted 1 line
drivers/net/dsa/mv88e6xxx/chip.h +1
-0+ MV88E6193X,You don't add any
_opsstructure for the 6193x. How is it different? Can you make your best guess at the ops structure. Also, what about the 6191X?
6393 Family lists 6191X, 6193X and 6393X products. Unlike 6390, the 6393X have 10G interconnect.
I'm not sure on naming of 6191 and 6191X.
I am adding _ops for 6193X, mv88e6193x_ops which can be used for the other two products unless any specific functionality differs.
Pavana Sharma (4):
dt-bindings: net: Add 5GBASER phy interface mode
net: phy: Add 5GBASER interface mode
net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
net: dsa: mv88e6xxx: Change serdes lane parameter from u8 to int
.../bindings/net/ethernet-controller.yaml | 2 + drivers/net/dsa/mv88e6xxx/chip.c | 119 ++++++- drivers/net/dsa/mv88e6xxx/chip.h | 20 +- drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 240 +++++++++++++- drivers/net/dsa/mv88e6xxx/port.h | 43 ++- drivers/net/dsa/mv88e6xxx/serdes.c | 295 +++++++++++++++--- drivers/net/dsa/mv88e6xxx/serdes.h | 89 ++++-- include/linux/phy.h | 3 + 10 files changed, 733 insertions(+), 88 deletions(-)
Signature · 1 line
2.17.1
PATCH v6 1/4 dt-bindings: net: Add 5GBASER phy interface mode
Add 5GBASE-R phy interface mode supported by mv88e6393 family.
--- Documentation/devicetree/bindings/net/ethernet-controller.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/net/ethernet-controller.yaml +2 -0
@@ -92,6 +92,8 @@ properties: - rxaui - xaui + # 5GBASE-R + - 5gbase-r # 10GBASE-KR, XFI, SFI - 10gbase-kr - usxgmii
Signature · 1 line
2.17.1
PATCH v6 2/4 net: phy: Add 5GBASER interface mode
In reply to Pavana SharmaAdd new mode supported by MV88E6393 family.
--- include/linux/phy.h | 3 +++ 1 file changed, 3 insertions(+)
include/linux/phy.h +3 -0
@@ -107,6 +107,7 @@ typedef enum {PHY_INTERFACE_MODE_2500BASEX ,PHY_INTERFACE_MODE_RXAUI ,PHY_INTERFACE_MODE_XAUI , +PHY_INTERFACE_MODE_5GBASER ,/* 10GBASE-R, XFI, SFI - single lane 10G Serdes */ PHY_INTERFACE_MODE_10GBASER , PHY_INTERFACE_MODE_USXGMII,
@@ -187,6 +188,8 @@ static inline const char *phy_modes(phy_interface_t interface)return "rxaui" ;case PHY_INTERFACE_MODE_XAUI :return "xaui" ; +case PHY_INTERFACE_MODE_5GBASER : +return "5gbase-r" ;case PHY_INTERFACE_MODE_10GBASER :return "10gbase-r" ;case PHY_INTERFACE_MODE_USXGMII :
Signature · 1 line
2.17.1
Re: [PATCH v6 2/4] net: phy: Add 5GBASER interface mode
Quoted 2 lines · On Thu, 29 Oct 2020 15:42:00 +1000 Pavana Sharma <[email protected]> wrote:
Add new mode supported by MV88E6393 family.
This commit message isn't ideal. It infers that the Amethyst is first such device to implement this mode, which is not true. The 5gbase-r mode is supported by various other hardware, for example Marvell's 88X3310 PHY. Just say:
Add 5gbase-r PHY interface mode.
include/linux/phy.h typedef enum { · line 113
Quoted 7 lines
include/linux/phy.h +1
-0PHY_INTERFACE_MODE_2500BASEX ,PHY_INTERFACE_MODE_RXAUI ,PHY_INTERFACE_MODE_XAUI , +PHY_INTERFACE_MODE_5GBASER ,/* 10GBASE-R, XFI, SFI - single lane 10G Serdes */ PHY_INTERFACE_MODE_10GBASER , PHY_INTERFACE_MODE_USXGMII,
The position is IMO out of order. RXAUI and XAUI are both 10G modes, so 5gbase-r should be between 2500base-x and rxaui.
include/linux/phy.h static inline const char *phy_modes(phy_interface_t interface) · line 195
Quoted 9 lines
include/linux/phy.h +2
-0@@ -187,6 +188,8 @@ static inline const char *phy_modes(phy_interface_t interface)return "rxaui" ;case PHY_INTERFACE_MODE_XAUI :return "xaui" ; +case PHY_INTERFACE_MODE_5GBASER : +return "5gbase-r" ;case PHY_INTERFACE_MODE_10GBASER :return "10gbase-r" ;case PHY_INTERFACE_MODE_USXGMII :
Here as well.
Andrew Lunn
maintainerRe: [PATCH v6 2/4] net: phy: Add 5GBASER interface mode
In reply to Pavana SharmaQuoted 1 line · Pavana Sharma
Add new mode supported by MV88E6393 family.
Hi Pavana
I asked you to add kerneldoc for this new value, but you have not added it. Please compile your code with W=1, and you should see the warning.
Andrew
Re: [PATCH v6 0/4] Add support for mv88e6393x family of Marvell
In reply to Pavana SharmaQuoted 5 lines · On Thu, 29 Oct 2020 15:40:25 +1000 Pavana Sharma <[email protected]> wrote:
Updated patchset.
Split the patch to separate mv88e6393 changes from refactoring
serdes_get_lane.
Update Documentation before adding new mode.
Pavana, the patch adding support for Amethyst has to be the last in the series. The patch refactoring the serdes_get_lane code must go before the patch adding the support for the new family, because Amethyst already needs this functionality.
PATCH v6 3/4 net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
In reply to Pavana SharmaThe Marvell 88E6393X device is a single-chip integration of a 11-port Ethernet switch with eight integrated Gigabit Ethernet (GbE) transceivers and three 10-Gigabit interfaces.
This patch adds functionalities specific to mv88e6393x family (88E6393X, 88E6193X and 88E6191X)
---
Changes in v2:
- Fix a warning (Reported-by: kernel test robot <[email protected]>)
Changes in v3:
- Fix 'unused function' warning
Changes in v4, v5, v6:
- Incorporated feedback from maintainers.
--- drivers/net/dsa/mv88e6xxx/chip.c | 91 +++++++++++ drivers/net/dsa/mv88e6xxx/chip.h | 4 + drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 234 ++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/port.h | 43 ++++- drivers/net/dsa/mv88e6xxx/serdes.c | 225 ++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/serdes.h | 39 +++++ 8 files changed, 644 insertions(+), 2 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +91 -0
@@ -634,6 +634,24 @@ static void mv88e6390x_phylink_validate(struct mv88e6xxx_chip *chip, int port,mv88e6390_phylink_validate (chip, port, mask, state); } +static void mv88e6393x_phylink_validate (struct mv88e6xxx_chip *chip,int port, +unsigned long *mask, +struct phylink_link_state *state) +{ +if (port ==0 || port ==9 || port ==10 ) { + phylink_set(mask, 10000baseT_Full); + phylink_set(mask, 10000baseKR_Full); + phylink_set(mask, 5000baseT_Full); + phylink_set(mask, 2500baseX_Full); + phylink_set(mask, 2500baseT_Full); + } + + phylink_set(mask, 1000baseT_Full); + phylink_set(mask, 1000baseX_Full); + +mv88e6065_phylink_validate (chip, port, mask, state); +} +static void mv88e6xxx_validate (struct dsa_switch *ds,int port,unsigned long *supported,struct phylink_link_state *state)
@@ -4141,6 +4159,56 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { .phylink_validate = mv88e6390_phylink_validate, }; +static const struct mv88e6xxx_ops mv88e6193x_ops = { +/* MV88E6XXX_FAMILY_6393 */ + .setup_errata = mv88e6393x_setup_errata, + .irl_init_all = mv88e6390_g2_irl_init_all, + .get_eeprom = mv88e6xxx_g2_get_eeprom8, + .set_eeprom = mv88e6xxx_g2_set_eeprom8, + .set_switch_mac = mv88e6xxx_g2_set_switch_mac, + .phy_read = mv88e6xxx_g2_smi_phy_read, + .phy_write = mv88e6xxx_g2_smi_phy_write, + .port_set_link = mv88e6xxx_port_set_link, + .port_set_speed_duplex = mv88e6393x_port_set_speed_duplex, + .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, + .port_tag_remap = mv88e6390_port_tag_remap, + .port_set_frame_mode = mv88e6351_port_set_frame_mode, + .port_set_egress_floods = mv88e6352_port_set_egress_floods, + .port_set_ether_type = mv88e6393x_port_set_ether_type, + .port_set_jumbo_size = mv88e6165_port_set_jumbo_size, + .port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting, + .port_pause_limit = mv88e6390_port_pause_limit, + .port_set_cmode = mv88e6393x_port_set_cmode, + .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit, + .port_disable_pri_override = mv88e6xxx_port_disable_pri_override, + .port_get_cmode = mv88e6352_port_get_cmode, + .stats_snapshot = mv88e6390_g1_stats_snapshot, + .stats_set_histogram = mv88e6390_g1_stats_set_histogram, + .stats_get_sset_count = mv88e6320_stats_get_sset_count, + .stats_get_strings = mv88e6320_stats_get_strings, + .stats_get_stats = mv88e6390_stats_get_stats, + .set_cpu_port = mv88e6393x_port_set_cpu_dest, + .set_egress_port = mv88e6393x_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, + .mgmt_rsvd2cpu = mv88e6393x_port_mgmt_rsvd2cpu, + .pot_clear = mv88e6xxx_g2_pot_clear, + .reset = mv88e6352_g1_reset, + .rmu_disable = mv88e6390_g1_rmu_disable, + .vtu_getnext = mv88e6390_g1_vtu_getnext, + .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge, + .serdes_power = mv88e6393x_serdes_power, + .serdes_get_lane = mv88e6393x_serdes_get_lane, +/* Check status register pause & lpa register */ + .serdes_pcs_get_state = mv88e6390_serdes_pcs_get_state, + .serdes_irq_mapping = mv88e6390_serdes_irq_mapping, + .serdes_irq_enable = mv88e6393x_serdes_irq_enable, + .serdes_irq_status = mv88e6393x_serdes_irq_status, + .gpio_ops = &mv88e6352_gpio_ops, + .avb_ops = &mv88e6390_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, + .phylink_validate = mv88e6393x_phylink_validate, +}; +static const struct mv88e6xxx_ops mv88e6240_ops = {/* MV88E6XXX_FAMILY_6352 */ .ieee_pri_map = mv88e6085_g1_ieee_pri_map,
@@ -5073,6 +5141,29 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .ops = &mv88e6191_ops, }, + [MV88E6193X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6193X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6193X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6193x_ops, + }, + [MV88E6220] = { .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6220, .family = MV88E6XXX_FAMILY_6250,
drivers/net/dsa/mv88e6xxx/chip.h +4 -0
@@ -63,6 +63,8 @@ enum mv88e6xxx_model {MV88E6190 ,MV88E6190X ,MV88E6191 , +MV88E6191X , +MV88E6193X ,MV88E6220 ,MV88E6240 , MV88E6250,
@@ -75,6 +77,7 @@ enum mv88e6xxx_model {MV88E6352 ,MV88E6390 ,MV88E6390X , + MV88E6393X, }; enum mv88e6xxx_family {
@@ -90,6 +93,7 @@ enum mv88e6xxx_family {MV88E6XXX_FAMILY_6351 ,/* 6171 6175 6350 6351 */ MV88E6XXX_FAMILY_6352 ,/* 6172 6176 6240 6352 */ MV88E6XXX_FAMILY_6390 ,/* 6190 6190X 6191 6290 6390 6390X */ + MV88E6XXX_FAMILY_6393, /* 6191X 6193X 6393X */ };struct mv88e6xxx_ops ;
drivers/net/dsa/mv88e6xxx/global1.h +2 -0
@@ -22,6 +22,7 @@#define MV88E6185_G1_STS_PPU_STATE_DISABLED 0x8000#define MV88E6185_G1_STS_PPU_STATE_POLLING 0xc000#define MV88E6XXX_G1_STS_INIT_READY 0x0800 +#define MV88E6193X_G1_STS_IRQ_DEVICE_2 9#define MV88E6XXX_G1_STS_IRQ_AVB 8#define MV88E6XXX_G1_STS_IRQ_DEVICE 7#define MV88E6XXX_G1_STS_IRQ_STATS 6
@@ -59,6 +60,7 @@#define MV88E6185_G1_CTL1_SCHED_PRIO 0x0800#define MV88E6185_G1_CTL1_MAX_FRAME_1632 0x0400#define MV88E6185_G1_CTL1_RELOAD_EEPROM 0x0200 +#define MV88E6193X_G1_CTL1_DEVICE2_EN 0x0200#define MV88E6XXX_G1_CTL1_DEVICE_EN 0x0080#define MV88E6XXX_G1_CTL1_STATS_DONE_EN 0x0040#define MV88E6XXX_G1_CTL1_VTU_PROBLEM_EN 0x0020
drivers/net/dsa/mv88e6xxx/global2.h +8 -0
@@ -38,9 +38,15 @@/* Offset 0x02: MGMT Enable Register 2x */ #define MV88E6XXX_G2_MGMT_EN_2X 0x02 +/* Offset 0x02: MAC LINK change IRQ Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_SRC 0x02 +/* Offset 0x03: MGMT Enable Register 0x */ #define MV88E6XXX_G2_MGMT_EN_0X 0x03 +/* Offset 0x03: MAC LINK change IRQ Mask Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_MASK 0x03 +/* Offset 0x04: Flow Control Delay Register */ #define MV88E6XXX_G2_FLOW_CTL 0x04
@@ -52,6 +58,8 @@#define MV88E6XXX_G2_SWITCH_MGMT_FORCE_FLOW_CTL_PRI 0x0080#define MV88E6XXX_G2_SWITCH_MGMT_RSVD2CPU 0x0008 +#define MV88E6393X_G2_EGRESS_MONITOR_DEST 0x05 +/* Offset 0x06: Device Mapping Table Register */ #define MV88E6XXX_G2_DEVICE_MAPPING 0x06#define MV88E6XXX_G2_DEVICE_MAPPING_UPDATE 0x8000
drivers/net/dsa/mv88e6xxx/port.c +234 -0
270 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/port.h +41 -2
97 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.c +225 -0
240 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +39 -0
@@ -68,15 +68,47 @@#define MV88E6390_SGMII_PHY_STATUS_LINK BIT(10)#define MV88E6390_SGMII_PHY_STATUS_TX_PAUSE BIT(3)#define MV88E6390_SGMII_PHY_STATUS_RX_PAUSE BIT(2) +#define MV88E6390_SGMII_STATUS_AN_ABLE BIT(3) +#define MV88E6390_SGMII_ANAR 0x2004 +#define MV88E6390_SGMII_ANAR_1000BASEX_FD BIT(5) +#define MV88E6390_SGMII_CONTROL 0x2000 +#define MV88E6390_SGMII_CONTROL_RESET BIT(15) +#define MV88E6390_SGMII_CONTROL_LOOPBACK BIT(14) +#define MV88E6390_SGMII_CONTROL_PDOWN BIT(11) +#define MV88E6390_SGMII_STATUS 0x2001/* Packet generator pad packet checker */ #define MV88E6390_PG_CONTROL 0xf010#define MV88E6390_PG_CONTROL_ENABLE_PC BIT(0) +#define MV88E6393X_PORT0_LANE 0x00 +#define MV88E6393X_PORT9_LANE 0x09 +#define MV88E6393X_PORT10_LANE 0x0a + +/* Port Operational Configuration */ +#define MV88E6393X_PCS_SELECT_1000BASEX 0x0000 +#define MV88E6393X_PCS_SELECT_2500BASEX 0x0001 +#define MV88E6393X_PCS_SELECT_SGMII_PHY 0x0002 +#define MV88E6393X_PCS_SELECT_SGMII_MAC 0x0003 +#define MV88E6393X_PCS_SELECT_5GBASER 0x0004 +#define MV88E6393X_PCS_SELECT_10GBASER 0x0005 +#define MV88E6393X_PCS_SELECT_USXGMII_PHY 0x0006 +#define MV88E6393X_PCS_SELECT_USXGMII_MAC 0x0007 + +#define MV88E6393X_SERDES_POC 0xf002 +#define MV88E6393X_SERDES_POC_PCS_MODE_MASK 0x0007 +#define MV88E6393X_SERDES_POC_RESET BIT(15) +#define MV88E6393X_SERDES_POC_PDOWN BIT(5) +#define MV88E6393X_SERDES_POC_ANEG BIT(3) + +#define MV88E6393X_ERRATA_1000BASEX_SGMII 0xF074 +#define MV88E6393X_ERRATA_1000BASEX_SGMII_BIT BIT(14) +u8 mv88e6341_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);u8 mv88e6352_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);u8 mv88e6390_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);u8 mv88e6390x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port); +u8 mv88e6393x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port); int mv88e6352_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, u8 lane, unsigned int mode, phy_interface_t interface,
@@ -105,14 +137,21 @@ int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, u8 lane, bool on);int mv88e6390_serdes_power (struct mv88e6xxx_chip *chip,int port,u8 lane,bool on); +int mv88e6393x_serdes_power (struct mv88e6xxx_chip *chip,int port,u8 lane, +bool on); +int mv88e6393x_setup_errata (struct mv88e6xxx_chip *chip);int mv88e6352_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port,u8 lane,bool enable);int mv88e6390_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port,u8 lane,bool enable); +int mv88e6393x_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port, +u8 lane,bool enable);irqreturn_t mv88e6352_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,u8 lane);irqreturn_t mv88e6390_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,u8 lane); +irqreturn_t mv88e6393x_serdes_irq_status (struct mv88e6xxx_chip *chip,int port, +u8 lane);int mv88e6352_serdes_get_sset_count (struct mv88e6xxx_chip *chip,int port);int mv88e6352_serdes_get_strings (struct mv88e6xxx_chip *chip,int port,uint8_t *data);
Signature · 1 line
2.17.1
Re: [PATCH v6 3/4] net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
Quoted 91 lines · On Thu, 29 Oct 2020 15:42:29 +1000 Pavana Sharma <[email protected]> wrote:
The Marvell 88E6393X device is a single-chip integration of a 11-port Ethernet switch with eight integrated Gigabit Ethernet (GbE) transceivers and three 10-Gigabit interfaces.
This patch adds functionalities specific to mv88e6393x family (88E6393X, 88E6193X and 88E6191X)
Co-developed-by Ashkan Boldaji <[email protected]>Signed-off-by Ashkan Boldaji <[email protected]>Signed-off-by Pavana Sharma <[email protected]>---
Changes in v2:
- Fix a warning (Reported-by: kernel test robot <[email protected]>)
Changes in v3:
- Fix 'unused function' warning
Changes in v4, v5, v6:
- Incorporated feedback from maintainers.--- drivers/net/dsa/mv88e6xxx/chip.c | 91 +++++++++++ drivers/net/dsa/mv88e6xxx/chip.h | 4 + drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 234 ++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/port.h | 43 ++++- drivers/net/dsa/mv88e6xxx/serdes.c | 225 ++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/serdes.h | 39 +++++ 8 files changed, 644 insertions(+), 2 deletions(-)drivers/net/dsa/mv88e6xxx/chip.c +48
-0@@ -634,6 +634,24 @@ static void mv88e6390x_phylink_validate(struct mv88e6xxx_chip *chip, int port,mv88e6390_phylink_validate (chip, port, mask, state); } +static void mv88e6393x_phylink_validate (struct mv88e6xxx_chip *chip,int port, +unsigned long *mask, +struct phylink_link_state *state) +{ +if (port ==0 || port ==9 || port ==10 ) { + phylink_set(mask, 10000baseT_Full); + phylink_set(mask, 10000baseKR_Full); + phylink_set(mask, 5000baseT_Full); + phylink_set(mask, 2500baseX_Full); + phylink_set(mask, 2500baseT_Full); + } + + phylink_set(mask, 1000baseT_Full); + phylink_set(mask, 1000baseX_Full); + +mv88e6065_phylink_validate (chip, port, mask, state); +} +static void mv88e6xxx_validate (struct dsa_switch *ds,int port,unsigned long *supported,struct phylink_link_state *state)@@ -4141,6 +4159,56 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { .phylink_validate = mv88e6390_phylink_validate, }; +static const struct mv88e6xxx_ops mv88e6193x_ops = { +/* MV88E6XXX_FAMILY_6393 */ + .setup_errata = mv88e6393x_setup_errata, + .irl_init_all = mv88e6390_g2_irl_init_all, + .get_eeprom = mv88e6xxx_g2_get_eeprom8, + .set_eeprom = mv88e6xxx_g2_set_eeprom8, + .set_switch_mac = mv88e6xxx_g2_set_switch_mac, + .phy_read = mv88e6xxx_g2_smi_phy_read, + .phy_write = mv88e6xxx_g2_smi_phy_write, + .port_set_link = mv88e6xxx_port_set_link, + .port_set_speed_duplex = mv88e6393x_port_set_speed_duplex, + .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, + .port_tag_remap = mv88e6390_port_tag_remap, + .port_set_frame_mode = mv88e6351_port_set_frame_mode, + .port_set_egress_floods = mv88e6352_port_set_egress_floods, + .port_set_ether_type = mv88e6393x_port_set_ether_type, + .port_set_jumbo_size = mv88e6165_port_set_jumbo_size, + .port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting, + .port_pause_limit = mv88e6390_port_pause_limit, + .port_set_cmode = mv88e6393x_port_set_cmode, + .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit, + .port_disable_pri_override = mv88e6xxx_port_disable_pri_override, + .port_get_cmode = mv88e6352_port_get_cmode, + .stats_snapshot = mv88e6390_g1_stats_snapshot, + .stats_set_histogram = mv88e6390_g1_stats_set_histogram, + .stats_get_sset_count = mv88e6320_stats_get_sset_count, + .stats_get_strings = mv88e6320_stats_get_strings, + .stats_get_stats = mv88e6390_stats_get_stats, + .set_cpu_port = mv88e6393x_port_set_cpu_dest, + .set_egress_port = mv88e6393x_set_egress_port,
drivers/net/dsa/mv88e6xxx/chip.c static const struct mv88e6xxx_ops mv88e6191_ops = { · line 4201
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/chip.c +10
-0+ .watchdog_ops = &mv88e6390_watchdog_ops, + .mgmt_rsvd2cpu = mv88e6393x_port_mgmt_rsvd2cpu, + .pot_clear = mv88e6xxx_g2_pot_clear, + .reset = mv88e6352_g1_reset, + .rmu_disable = mv88e6390_g1_rmu_disable, + .vtu_getnext = mv88e6390_g1_vtu_getnext, + .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge, + .serdes_power = mv88e6393x_serdes_power, + .serdes_get_lane = mv88e6393x_serdes_get_lane, +/* Check status register pause & lpa register */
Is this a TODO comment? If so, it should be marked as such.
Quoted 30 lines
drivers/net/dsa/mv88e6xxx/chip.c +23
-0+ .serdes_pcs_get_state = mv88e6390_serdes_pcs_get_state, + .serdes_irq_mapping = mv88e6390_serdes_irq_mapping, + .serdes_irq_enable = mv88e6393x_serdes_irq_enable, + .serdes_irq_status = mv88e6393x_serdes_irq_status, + .gpio_ops = &mv88e6352_gpio_ops, + .avb_ops = &mv88e6390_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, + .phylink_validate = mv88e6393x_phylink_validate, +}; +static const struct mv88e6xxx_ops mv88e6240_ops = {/* MV88E6XXX_FAMILY_6352 */ .ieee_pri_map = mv88e6085_g1_ieee_pri_map,@@ -5073,6 +5141,29 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .ops = &mv88e6191_ops, }, + [MV88E6193X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6193X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6193X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750,
drivers/net/dsa/mv88e6xxx/chip.c static const struct mv88e6xxx_info mv88e6xxx_table[] = { · line 5166
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/chip.c +10
-0+ .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6193x_ops, + }, +
Why not add 6393X here as well?
Quoted 45 lines
drivers/net/dsa/mv88e6xxx/chip.c +0
-0[MV88E6220] = { .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6220, .family = MV88E6XXX_FAMILY_6250,drivers/net/dsa/mv88e6xxx/chip.h +4
-0@@ -63,6 +63,8 @@ enum mv88e6xxx_model {MV88E6190 ,MV88E6190X ,MV88E6191 , +MV88E6191X , +MV88E6193X ,MV88E6220 ,MV88E6240 , MV88E6250,@@ -75,6 +77,7 @@ enum mv88e6xxx_model {MV88E6352 ,MV88E6390 ,MV88E6390X , + MV88E6393X, }; enum mv88e6xxx_family {@@ -90,6 +93,7 @@ enum mv88e6xxx_family {MV88E6XXX_FAMILY_6351 ,/* 6171 6175 6350 6351 */ MV88E6XXX_FAMILY_6352 ,/* 6172 6176 6240 6352 */ MV88E6XXX_FAMILY_6390 ,/* 6190 6190X 6191 6290 6390 6390X */ + MV88E6XXX_FAMILY_6393, /* 6191X 6193X 6393X */ };struct mv88e6xxx_ops ;drivers/net/dsa/mv88e6xxx/global1.h +1
-0@@ -22,6 +22,7 @@#define MV88E6185_G1_STS_PPU_STATE_DISABLED 0x8000#define MV88E6185_G1_STS_PPU_STATE_POLLING 0xc000#define MV88E6XXX_G1_STS_INIT_READY 0x0800 +#define MV88E6193X_G1_STS_IRQ_DEVICE_2 9#define MV88E6XXX_G1_STS_IRQ_AVB 8#define MV88E6XXX_G1_STS_IRQ_DEVICE 7#define MV88E6XXX_G1_STS_IRQ_STATS 6
drivers/net/dsa/mv88e6xxx/global1.h line 63
Quoted 4 lines
drivers/net/dsa/mv88e6xxx/global1.h +1
-0@@ -59,6 +60,7 @@#define MV88E6185_G1_CTL1_SCHED_PRIO 0x0800#define MV88E6185_G1_CTL1_MAX_FRAME_1632 0x0400#define MV88E6185_G1_CTL1_RELOAD_EEPROM 0x0200 +#define MV88E6193X_G1_CTL1_DEVICE2_EN 0x0200
Since the family is called 6393X, please use MV88E6393X prefix for these macros.
Quoted 8 lines
drivers/net/dsa/mv88e6xxx/global1.h +0
-0#define MV88E6XXX_G1_CTL1_DEVICE_EN 0x0080#define MV88E6XXX_G1_CTL1_STATS_DONE_EN 0x0040#define MV88E6XXX_G1_CTL1_VTU_PROBLEM_EN 0x0020drivers/net/dsa/mv88e6xxx/global2.h +0
-0
drivers/net/dsa/mv88e6xxx/global2.h line 43
Quoted 6 lines
drivers/net/dsa/mv88e6xxx/global2.h +3
-0@@ -38,9 +38,15 @@/* Offset 0x02: MGMT Enable Register 2x */ #define MV88E6XXX_G2_MGMT_EN_2X 0x02 +/* Offset 0x02: MAC LINK change IRQ Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_SRC 0x02 +
Here you are using prefix with 6393X, but above you used 6193X, ...
Quoted 313 lines
drivers/net/dsa/mv88e6xxx/global2.h +5
-0/* Offset 0x03: MGMT Enable Register 0x */ #define MV88E6XXX_G2_MGMT_EN_0X 0x03 +/* Offset 0x03: MAC LINK change IRQ Mask Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_MASK 0x03 +/* Offset 0x04: Flow Control Delay Register */ #define MV88E6XXX_G2_FLOW_CTL 0x04@@ -52,6 +58,8 @@#define MV88E6XXX_G2_SWITCH_MGMT_FORCE_FLOW_CTL_PRI 0x0080#define MV88E6XXX_G2_SWITCH_MGMT_RSVD2CPU 0x0008 +#define MV88E6393X_G2_EGRESS_MONITOR_DEST 0x05 +/* Offset 0x06: Device Mapping Table Register */ #define MV88E6XXX_G2_DEVICE_MAPPING 0x06#define MV88E6XXX_G2_DEVICE_MAPPING_UPDATE 0x8000drivers/net/dsa/mv88e6xxx/port.c +234
-0@@ -14,6 +14,7 @@#include <linux/phylink.h> #include "chip.h" +#include "global2.h" #include "port.h" #include "serdes.h" @@ -25,6 +26,14 @@ int mv88e6xxx_port_read(struct mv88e6xxx_chip *chip, int port, int reg,return mv88e6xxx_read (chip, addr, reg, val); } +int mv88e6xxx_port_wait_bit (struct mv88e6xxx_chip *chip,int port,int reg, +int bit,int val) +{ +int addr = chip->info->port_base_addr + port; + +return mv88e6xxx_wait_bit (chip, addr, reg, bit, val); +} +int mv88e6xxx_port_write (struct mv88e6xxx_chip *chip,int port,int reg,u16 val) {@@ -390,6 +399,87 @@ phy_interface_t mv88e6390x_port_max_speed_mode(int port)return PHY_INTERFACE_MODE_NA ; } +/* Support 10, 100, 200, 1000, 2500, 5000, 10000 Mbps (e.g. 88E6393X) */ +int mv88e6393x_port_set_speed_duplex (struct mv88e6xxx_chip *chip,int port, +int speed,int duplex) +{ +u16 reg, ctrl; +int err; + +if (speed ==SPEED_MAX ) + speed = (port >0 && port <9 ) ?1000 :10000 ; + +if (speed ==200 && port !=0 ) +return -EOPNOTSUPP ; + +if (speed >=2500 && port >0 && port <9 ) +return -EOPNOTSUPP ; + +switch (speed) { +case 10 : + ctrl =MV88E6XXX_PORT_MAC_CTL_SPEED_10 ; +break ; +case 100 : + ctrl =MV88E6XXX_PORT_MAC_CTL_SPEED_100 ; +break ; +case 200 : + ctrl =MV88E6XXX_PORT_MAC_CTL_SPEED_100 | +MV88E6390_PORT_MAC_CTL_ALTSPEED ; +break ; +case 1000 : + ctrl =MV88E6XXX_PORT_MAC_CTL_SPEED_1000 ; +break ; +case 2500 : + ctrl =MV88E6XXX_PORT_MAC_CTL_SPEED_1000 | +MV88E6390_PORT_MAC_CTL_ALTSPEED ; +break ; +case 5000 : + ctrl =MV88E6390_PORT_MAC_CTL_SPEED_10000 | +MV88E6390_PORT_MAC_CTL_ALTSPEED ; +break ; +case 10000 : +case SPEED_UNFORCED : + ctrl =MV88E6XXX_PORT_MAC_CTL_SPEED_UNFORCED ; +break ; +default : +return -EOPNOTSUPP ; + } + +switch (duplex) { +case DUPLEX_HALF : + ctrl |=MV88E6XXX_PORT_MAC_CTL_FORCE_DUPLEX ; +break ; +case DUPLEX_FULL : + ctrl |=MV88E6XXX_PORT_MAC_CTL_FORCE_DUPLEX | +MV88E6XXX_PORT_MAC_CTL_DUPLEX_FULL ; +break ; +case DUPLEX_UNFORCED : +/* normal duplex detection */ +break ; +default : +return -EOPNOTSUPP ; + } + + err =mv88e6xxx_port_read (chip, port,MV88E6XXX_PORT_MAC_CTL , ®); +if (err) +return err; + + reg &= ~(MV88E6XXX_PORT_MAC_CTL_SPEED_MASK | +MV88E6390_PORT_MAC_CTL_ALTSPEED | +MV88E6390_PORT_MAC_CTL_FORCE_SPEED ); + +if (speed !=SPEED_UNFORCED ) + reg |=MV88E6390_PORT_MAC_CTL_FORCE_SPEED ; + + reg |= ctrl; + + err =mv88e6xxx_port_write (chip, port,MV88E6XXX_PORT_MAC_CTL , reg); +if (err) +return err; + +return 0 ; +} +static int mv88e6xxx_port_set_cmode (struct mv88e6xxx_chip *chip,int port,phy_interface_t mode,bool force) {@@ -421,6 +511,16 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port,case PHY_INTERFACE_MODE_RXAUI : cmode =MV88E6XXX_PORT_STS_CMODE_RXAUI ;break ; +case PHY_INTERFACE_MODE_5GBASER : + cmode =MV88E6XXX_PORT_STS_CMODE_5GBASER ; +break ; +case PHY_INTERFACE_MODE_10GBASER : +case PHY_INTERFACE_MODE_10GKR : + cmode =MV88E6XXX_PORT_STS_CMODE_10GBASER ; +break ; +case PHY_INTERFACE_MODE_USXGMII : + cmode =MV88E6XXX_PORT_STS_CMODE_USXGMII ; +break ;default : cmode =0 ; }@@ -505,6 +605,15 @@ int mv88e6390_port_set_cmode(struct mv88e6xxx_chip *chip, int port,return mv88e6xxx_port_set_cmode (chip, port, mode, false); } +int mv88e6393x_port_set_cmode (struct mv88e6xxx_chip *chip,int port, +phy_interface_t mode) +{ +if (port !=0 && port !=9 && port !=10 ) +return -EOPNOTSUPP ; + +return mv88e6xxx_port_set_cmode (chip, port, mode, false); +} +static int mv88e6341_port_set_cmode_writable (struct mv88e6xxx_chip *chip,int port) {@@ -1128,6 +1237,131 @@ int mv88e6xxx_port_disable_pri_override(struct mv88e6xxx_chip *chip, int port)return mv88e6xxx_port_write (chip, port,MV88E6XXX_PORT_PRI_OVERRIDE ,0 ); } +/* Offset 0x0E: Policy & MGMT Control Register for FAMILY 6191X 6193X 6393X*/ + +static int mv88e6393x_port_policy_write (struct mv88e6xxx_chip *chip,u16 pointer, +u8 data) +{ + +int err =0 ; +int port; +u16 reg; + +/* Setup per Port policy register */ +for (port =0 ; port <mv88e6xxx_num_ports (chip); port++) { +if (dsa_is_unused_port (chip->ds, port)) +continue ; + +/* Prevent the use of an invalid port. */ +if (mv88e6xxx_is_invalid_port (chip, port)) { +dev_err (chip->dev,"port %d is invalid\n" , port); + err = -EINVAL ; + } + reg =MV88E6393X_PORT_POLICY_MGMT_CTL_UPDATE | pointer | data; + err =mv88e6xxx_port_write (chip, port,MV88E6393X_PORT_POLICY_MGMT_CTL , reg); + } +return err; +} + +int mv88e6393x_set_egress_port (struct mv88e6xxx_chip *chip, +enum mv88e6xxx_egress_direction direction, +int port) +{ +u16 ptr; +int err; + +switch (direction) { +case MV88E6XXX_EGRESS_DIR_INGRESS : + ptr =MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_INGRESS_DEST ; + err =mv88e6393x_port_policy_write (chip, ptr, port); +if (err) +return err; +break ; +case MV88E6XXX_EGRESS_DIR_EGRESS : + ptr =MV88E6393X_G2_EGRESS_MONITOR_DEST ; + err =mv88e6xxx_g2_write (chip, ptr, port); +if (err) +return err; +break ; + } +return 0 ; +} + +int mv88e6393x_port_set_cpu_dest (struct mv88e6xxx_chip *chip,int port) +{ +u16 ptr =MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_CPU_DEST ; +u8 data =MV88E6393X_PORT_POLICY_MGMT_CTL_CPU_DEST_MGMTPRI | port; + +return mv88e6393x_port_policy_write (chip, ptr, data); +} + +int mv88e6393x_port_mgmt_rsvd2cpu (struct mv88e6xxx_chip *chip) +{ +u16 ptr; +int err; + +/* Consider the frames with reserved multicast destination +* addresses matching 01:80:c2:00:00:00 and +* 01:80:c2:00:00:02 as MGMT. +*/ + ptr =MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000000XLO ; + err =mv88e6393x_port_policy_write (chip, ptr,0xff ); +if (err) +return err; + + ptr =MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000000XHI ; + err =mv88e6393x_port_policy_write (chip, ptr,0xff ); +if (err) +return err; + + ptr =MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000002XLO ; + err =mv88e6393x_port_policy_write (chip, ptr,0xff ); +if (err) +return err; + + ptr =MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000002XHI ; + err =mv88e6393x_port_policy_write (chip, ptr,0xff ); +if (err) +return err; + +return 0 ; +} + +/* Offset 0x10 & 0x11: EPC */ + +static int mv88e6393x_epc_wait_ready (struct mv88e6xxx_chip *chip,int port) +{ +int bit =__bf_shf (MV88E6393X_PORT_EPC_CMD_BUSY ); + +return mv88e6xxx_port_wait_bit (chip, port,MV88E6393X_PORT_EPC_CMD , bit,0 ); +} + +/* Port Ether type for 6393X family */ + +int mv88e6393x_port_set_ether_type (struct mv88e6xxx_chip *chip,int port, +u16 etype) +{ +u16 val; +int err; + + err =mv88e6393x_epc_wait_ready (chip, port); +if (err) +return err; + + err =mv88e6xxx_port_write (chip, port,MV88E6393X_PORT_EPC_DATA , etype); +if (err) +return err; + + val =MV88E6393X_PORT_EPC_CMD_BUSY | +MV88E6393X_PORT_EPC_CMD_WRITE | +MV88E6393X_PORT_EPC_INDEX_PORT_ETYPE ; + err =mv88e6xxx_port_write (chip, port,MV88E6393X_PORT_EPC_CMD , val); +if (err) +return err; + +return 0 ; +} +/* Offset 0x0f: Port Ether type */ int mv88e6351_port_set_ether_type(struct mv88e6xxx_chip *chip, int port,drivers/net/dsa/mv88e6xxx/port.h +3
-0@@ -49,6 +49,9 @@#define MV88E6XXX_PORT_STS_CMODE_2500BASEX 0x000b#define MV88E6XXX_PORT_STS_CMODE_XAUI 0x000c#define MV88E6XXX_PORT_STS_CMODE_RXAUI 0x000d +#define MV88E6XXX_PORT_STS_CMODE_5GBASER 0x000c +#define MV88E6XXX_PORT_STS_CMODE_10GBASER 0x000d +#define MV88E6XXX_PORT_STS_CMODE_USXGMII 0x000e#define MV88E6185_PORT_STS_CDUPLEX 0x0008#define MV88E6185_PORT_STS_CMODE_MASK 0x0007#define MV88E6185_PORT_STS_CMODE_GMII_FD 0x0000
drivers/net/dsa/mv88e6xxx/port.h line 124
Quoted 5 lines
drivers/net/dsa/mv88e6xxx/port.h +2
-0@@ -117,6 +120,8 @@#define MV88E6XXX_PORT_SWITCH_ID_PROD_6176 0x1760#define MV88E6XXX_PORT_SWITCH_ID_PROD_6190 0x1900#define MV88E6XXX_PORT_SWITCH_ID_PROD_6191 0x1910 +#define MV88E6XXX_PORT_SWITCH_ID_PROD_6191X 0x1920 +#define MV88E6XXX_PORT_SWITCH_ID_PROD_6193X 0x1930
Different indentation (the first uses spaces, the second uses tabs)
Quoted 12 lines
drivers/net/dsa/mv88e6xxx/port.h +1
-0#define MV88E6XXX_PORT_SWITCH_ID_PROD_6185 0x1a70#define MV88E6XXX_PORT_SWITCH_ID_PROD_6220 0x2200#define MV88E6XXX_PORT_SWITCH_ID_PROD_6240 0x2400@@ -129,6 +134,7 @@#define MV88E6XXX_PORT_SWITCH_ID_PROD_6350 0x3710#define MV88E6XXX_PORT_SWITCH_ID_PROD_6351 0x3750#define MV88E6XXX_PORT_SWITCH_ID_PROD_6390 0x3900 +#define MV88E6XXX_PORT_SWITCH_ID_PROD_6393X 0x3930#define MV88E6XXX_PORT_SWITCH_ID_REV_MASK 0x000f/* Offset 0x04: Port Control Register */
drivers/net/dsa/mv88e6xxx/port.h line 245
Quoted 4 lines
drivers/net/dsa/mv88e6xxx/port.h +1
-0@@ -236,6 +242,19 @@#define MV88E6XXX_PORT_POLICY_CTL_TRAP 0x0002#define MV88E6XXX_PORT_POLICY_CTL_DISCARD 0x0003 +/* Offset 0x0E: Policy & MGMT Control Register (FAMILY_6393X)*/
Space missing before end of comment */
Quoted 395 lines
drivers/net/dsa/mv88e6xxx/port.h +34
-2+#define MV88E6393X_PORT_POLICY_MGMT_CTL 0x0e +#define MV88E6393X_PORT_POLICY_MGMT_CTL_UPDATE 0x8000 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_MASK 0x3f00 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000000XLO 0x2000 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000000XHI 0x2100 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000002XLO 0x2400 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000002XHI 0x2500 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_INGRESS_DEST 0x3000 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_CPU_DEST 0x3800 +#define MV88E6393X_PORT_POLICY_MGMT_CTL_DATA_MASK 0x00ff +#define MV88E6393X_PORT_POLICY_MGMT_CTL_CPU_DEST_MGMTPRI 0x00e0 +/* Offset 0x0F: Port Special Ether Type */ #define MV88E6XXX_PORT_ETH_TYPE 0x0f#define MV88E6XXX_PORT_ETH_TYPE_DEFAULT 0x9100@@ -243,6 +262,15 @@/* Offset 0x10: InDiscards Low Counter */ #define MV88E6XXX_PORT_IN_DISCARD_LO 0x10 +/* Offset 0x10: Extended Port Control Command */ +#define MV88E6393X_PORT_EPC_CMD 0x10 +#define MV88E6393X_PORT_EPC_CMD_BUSY 0x8000 +#define MV88E6393X_PORT_EPC_CMD_WRITE 0x0300 +#define MV88E6393X_PORT_EPC_INDEX_PORT_ETYPE 0x02 + +/* Offset 0x11: Extended Port Control Data */ +#define MV88E6393X_PORT_EPC_DATA 0x11 +/* Offset 0x11: InDiscards High Counter */ #define MV88E6XXX_PORT_IN_DISCARD_HI 0x11@@ -288,7 +316,8 @@ int mv88e6xxx_port_read(struct mv88e6xxx_chip *chip, int port, int reg, u16 *val);int mv88e6xxx_port_write (struct mv88e6xxx_chip *chip,int port,int reg,u16 val); - +int mv88e6xxx_port_wait_bit (struct mv88e6xxx_chip *chip,int port,int reg, +int bit,int val);int mv88e6185_port_set_pause (struct mv88e6xxx_chip *chip,int port,int pause); int mv88e6352_port_set_rgmii_delay(struct mv88e6xxx_chip *chip, int port,@@ -312,7 +341,8 @@ int mv88e6390_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, int speed, int duplex);int mv88e6390x_port_set_speed_duplex (struct mv88e6xxx_chip *chip,int port,int speed,int duplex); - +int mv88e6393x_port_set_speed_duplex (struct mv88e6xxx_chip *chip,int port, +int speed,int duplex);phy_interface_t mv88e6341_port_max_speed_mode (int port);phy_interface_t mv88e6390_port_max_speed_mode (int port);phy_interface_t mv88e6390x_port_max_speed_mode (int port);@@ -346,6 +376,13 @@ int mv88e6352_port_set_policy(struct mv88e6xxx_chip *chip, int port, enum mv88e6xxx_policy_action action);int mv88e6351_port_set_ether_type (struct mv88e6xxx_chip *chip,int port,u16 etype); +int mv88e6393x_set_egress_port (struct mv88e6xxx_chip *chip, +enum mv88e6xxx_egress_direction direction, +int port); +int mv88e6393x_port_set_cpu_dest (struct mv88e6xxx_chip *chip,int port); +int mv88e6393x_port_mgmt_rsvd2cpu (struct mv88e6xxx_chip *chip); +int mv88e6393x_port_set_ether_type (struct mv88e6xxx_chip *chip,int port, +u16 etype);int mv88e6xxx_port_set_message_port (struct mv88e6xxx_chip *chip,int port,bool message_port); int mv88e6165_port_set_jumbo_size(struct mv88e6xxx_chip *chip, int port,@@ -362,6 +399,8 @@ int mv88e6390_port_set_cmode(struct mv88e6xxx_chip *chip, int port, phy_interface_t mode);int mv88e6390x_port_set_cmode (struct mv88e6xxx_chip *chip,int port,phy_interface_t mode); +int mv88e6393x_port_set_cmode (struct mv88e6xxx_chip *chip,int port, +phy_interface_t mode);int mv88e6185_port_get_cmode (struct mv88e6xxx_chip *chip,int port,u8 *cmode);int mv88e6352_port_get_cmode (struct mv88e6xxx_chip *chip,int port,u8 *cmode);int mv88e6xxx_port_set_map_da (struct mv88e6xxx_chip *chip,int port);drivers/net/dsa/mv88e6xxx/serdes.c +225
-0@@ -526,6 +526,26 @@ u8 mv88e6390x_serdes_get_lane(struct mv88e6xxx_chip *chip, int port)return lane; } +/* Only Ports 0, 9 and 10 have SERDES lanes. Return the SERDES lane address +* a port is using else Returns -ENODEV. +*/ +u8 mv88e6393x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port) +{ +u8 cmode = chip->ports[port].cmode; +u8 lane =0 ; + +if (port ==0 || port ==9 || port ==10 ) { +if (cmode ==MV88E6XXX_PORT_STS_CMODE_1000BASEX || + cmode ==MV88E6XXX_PORT_STS_CMODE_SGMII || + cmode ==MV88E6XXX_PORT_STS_CMODE_2500BASEX || + cmode ==MV88E6XXX_PORT_STS_CMODE_5GBASER || + cmode ==MV88E6XXX_PORT_STS_CMODE_10GBASER || + cmode ==MV88E6XXX_PORT_STS_CMODE_USXGMII ) + lane = port; + } +return lane; +} +/* Set power up/down for 10GBASE-R and 10GBASE-X4/X2 */ static int mv88e6390_serdes_power_10g (struct mv88e6xxx_chip *chip,u8 lane,bool up)@@ -916,6 +936,51 @@ static int mv88e6390_serdes_irq_status_sgmii(struct mv88e6xxx_chip *chip,return err; } +int mv88e6393x_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port, +u8 lane,bool enable) +{ +u8 cmode = chip->ports[port].cmode; +int err =0 ; + +switch (cmode) { +case MV88E6XXX_PORT_STS_CMODE_SGMII : +case MV88E6XXX_PORT_STS_CMODE_1000BASEX : +case MV88E6XXX_PORT_STS_CMODE_2500BASEX : +case MV88E6XXX_PORT_STS_CMODE_5GBASER : +case MV88E6XXX_PORT_STS_CMODE_10GBASER : + err =mv88e6390_serdes_irq_enable_sgmii (chip, lane, enable); + } + +return err; +} + +irqreturn_t mv88e6393x_serdes_irq_status (struct mv88e6xxx_chip *chip,int port, +u8 lane) +{ +u8 cmode = chip->ports[port].cmode; +irqreturn_t ret =IRQ_NONE ; +u16 status; +int err; + +switch (cmode) { +case MV88E6XXX_PORT_STS_CMODE_SGMII : +case MV88E6XXX_PORT_STS_CMODE_1000BASEX : +case MV88E6XXX_PORT_STS_CMODE_2500BASEX : +case MV88E6XXX_PORT_STS_CMODE_5GBASER : +case MV88E6XXX_PORT_STS_CMODE_10GBASER : + err =mv88e6390_serdes_irq_status_sgmii (chip, lane, &status); +if (err) +return ret; +if (status & (MV88E6390_SGMII_INT_LINK_DOWN | +MV88E6390_SGMII_INT_LINK_UP )) { + ret =IRQ_HANDLED ; +mv88e6390_serdes_irq_link_sgmii (chip, port, lane); + } + } + +return ret; +} +irqreturn_t mv88e6390_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,u8 lane) {@@ -999,3 +1064,163 @@ void mv88e6390_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void *_p) p[i] = reg; } } + +int mv88e6393x_setup_errata (struct mv88e6xxx_chip *chip) +{ +u16 config0, config9, config10; +u16 pcs0, pcs9, pcs10; +int err =0 ; + +/* mv88e6393x family errata 3.8 : +* When a SERDES port is operating in 1000BASE-X or SGMII mode link may not +* come up after hardware reset or software reset of SERDES core. +* Workaround is to write SERDES register 4.F074.14 =1 for only those modes +* and 0 in all other modes. +*/ + err =mv88e6390_serdes_read (chip,MV88E6393X_PORT0_LANE ,MDIO_MMD_PHYXS , +MV88E6393X_ERRATA_1000BASEX_SGMII , &config0); + err =mv88e6390_serdes_read (chip,MV88E6393X_PORT9_LANE ,MDIO_MMD_PHYXS , +MV88E6393X_ERRATA_1000BASEX_SGMII , &config9); + err =mv88e6390_serdes_read (chip,MV88E6393X_PORT10_LANE ,MDIO_MMD_PHYXS , +MV88E6393X_ERRATA_1000BASEX_SGMII , &config10); + + err =mv88e6390_serdes_read (chip,MV88E6393X_PORT0_LANE ,MDIO_MMD_PHYXS , +MV88E6393X_SERDES_POC , &pcs0); + pcs0 &=MV88E6393X_SERDES_POC_PCS_MODE_MASK ; + err =mv88e6390_serdes_read (chip,MV88E6393X_PORT9_LANE ,MDIO_MMD_PHYXS , +MV88E6393X_SERDES_POC , &pcs9); + pcs9 &=MV88E6393X_SERDES_POC_PCS_MODE_MASK ; + err =mv88e6390_serdes_read (chip,MV88E6393X_PORT10_LANE ,MDIO_MMD_PHYXS , +MV88E6393X_SERDES_POC , &pcs10); + pcs10 &=MV88E6393X_SERDES_POC_PCS_MODE_MASK ; + +if (pcs0 ==MV88E6393X_PCS_SELECT_1000BASEX || + pcs0 ==MV88E6393X_PCS_SELECT_SGMII_PHY || + pcs0 ==MV88E6393X_PCS_SELECT_SGMII_MAC ) { + config0 |=MV88E6393X_ERRATA_1000BASEX_SGMII_BIT ; + err =mv88e6390_serdes_write (chip,MV88E6393X_PORT0_LANE , +MDIO_MMD_PHYXS , +MV88E6393X_ERRATA_1000BASEX_SGMII , + config0); + }else { + config0 &= ~MV88E6393X_ERRATA_1000BASEX_SGMII_BIT ; + err =mv88e6390_serdes_write (chip,MV88E6393X_PORT0_LANE , +MDIO_MMD_PHYXS , +MV88E6393X_ERRATA_1000BASEX_SGMII , + config0); + } + +if (pcs9 ==MV88E6393X_PCS_SELECT_1000BASEX || + pcs9 ==MV88E6393X_PCS_SELECT_SGMII_PHY || + pcs9 ==MV88E6393X_PCS_SELECT_SGMII_MAC ) { + config9 |=MV88E6393X_ERRATA_1000BASEX_SGMII_BIT ; + err =mv88e6390_serdes_write (chip,MV88E6393X_PORT9_LANE , +MDIO_MMD_PHYXS , +MV88E6393X_ERRATA_1000BASEX_SGMII , + config9); + }else { + config9 &= ~MV88E6393X_ERRATA_1000BASEX_SGMII_BIT ; + err =mv88e6390_serdes_write (chip,MV88E6393X_PORT9_LANE , +MDIO_MMD_PHYXS , +MV88E6393X_ERRATA_1000BASEX_SGMII , + config9); + } + +if (pcs10 ==MV88E6393X_PCS_SELECT_1000BASEX || + pcs10 ==MV88E6393X_PCS_SELECT_SGMII_PHY || + pcs10 ==MV88E6393X_PCS_SELECT_SGMII_MAC ) { + config10 |=MV88E6393X_ERRATA_1000BASEX_SGMII_BIT ; + err =mv88e6390_serdes_write (chip,MV88E6393X_PORT10_LANE , +MDIO_MMD_PHYXS , +MV88E6393X_ERRATA_1000BASEX_SGMII , + config10); + }else { + config10 &= ~MV88E6393X_ERRATA_1000BASEX_SGMII_BIT ; + err =mv88e6390_serdes_write (chip,MV88E6393X_PORT10_LANE , +MDIO_MMD_PHYXS , +MV88E6393X_ERRATA_1000BASEX_SGMII , + config10); + } +return err; +} + +static int mv88e6393x_serdes_port_config (struct mv88e6xxx_chip *chip,u8 lane, +bool on) +{ +u8 cmode = chip->ports[lane].cmode; +u16 config, pcs; + +switch (cmode) { +case MV88E6XXX_PORT_STS_CMODE_1000BASEX : + pcs =MV88E6393X_PCS_SELECT_1000BASEX ; +break ; +case MV88E6XXX_PORT_STS_CMODE_2500BASEX : + pcs =MV88E6393X_PCS_SELECT_2500BASEX ; +break ; +case MV88E6XXX_PORT_STS_CMODE_10GBASER : + pcs =MV88E6393X_PCS_SELECT_10GBASER ; +break ; +default : + pcs =MV88E6393X_PCS_SELECT_1000BASEX ; +break ; + } + +if (on) { +/* mv88e6393x family errata 3.6 : +* When changing c_mode on Port 0 from [x]MII mode to any +* SERDES mode SERDES will not be operational. +* Workaround: Set Port0 SERDES register 4.F002.5=0 +*/ +mv88e6390_serdes_read (chip, lane,MDIO_MMD_PHYXS , +MV88E6393X_SERDES_POC , &config); + config &= ~(MV88E6393X_SERDES_POC_PCS_MODE_MASK | +MV88E6393X_SERDES_POC_PDOWN ); + config |= pcs; +mv88e6390_serdes_write (chip, lane,MDIO_MMD_PHYXS , +MV88E6393X_SERDES_POC , config); + config |=MV88E6393X_SERDES_POC_RESET ; +mv88e6390_serdes_write (chip, lane,MDIO_MMD_PHYXS , +MV88E6393X_SERDES_POC , config); + +/* mv88e6393x family errata 3.7 : +* When changing cmode on SERDES port from any other mode to +* 1000BASE-X mode the link may not come up due to invalid +* 1000BASE-X advertisement. +* Workaround: Correct advertisement and reset PHY core. +*/ + config =MV88E6390_SGMII_ANAR_1000BASEX_FD ; +mv88e6390_serdes_write (chip, lane,MDIO_MMD_PHYXS , +MV88E6390_SGMII_ANAR , config); + +/* soft reset the PCS/PMA */ +mv88e6390_serdes_read (chip, lane,MDIO_MMD_PHYXS , +MV88E6390_SGMII_CONTROL , &config); + config |=MV88E6390_SGMII_CONTROL_RESET ; +mv88e6390_serdes_write (chip, lane,MDIO_MMD_PHYXS , +MV88E6390_SGMII_CONTROL , config); + } + +return 0 ; +} + +int mv88e6393x_serdes_power (struct mv88e6xxx_chip *chip,int port,u8 lane, +bool on) +{ + lane =mv88e6393x_serdes_get_lane (chip, port); + +if (port ==0 || port ==9 || port ==10 ) { +u8 cmode = chip->ports[port].cmode; + +mv88e6393x_serdes_port_config (chip, lane, on); + +switch (cmode) { +case MV88E6XXX_PORT_STS_CMODE_1000BASEX : +case MV88E6XXX_PORT_STS_CMODE_2500BASEX : +return mv88e6390_serdes_power_sgmii (chip, lane, on); +case MV88E6XXX_PORT_STS_CMODE_10GBASER : +return mv88e6390_serdes_power_10g (chip, lane, on); + } + } + +return 0 ; +}drivers/net/dsa/mv88e6xxx/serdes.h +39
-0@@ -68,15 +68,47 @@#define MV88E6390_SGMII_PHY_STATUS_LINK BIT(10)#define MV88E6390_SGMII_PHY_STATUS_TX_PAUSE BIT(3)#define MV88E6390_SGMII_PHY_STATUS_RX_PAUSE BIT(2) +#define MV88E6390_SGMII_STATUS_AN_ABLE BIT(3) +#define MV88E6390_SGMII_ANAR 0x2004 +#define MV88E6390_SGMII_ANAR_1000BASEX_FD BIT(5) +#define MV88E6390_SGMII_CONTROL 0x2000 +#define MV88E6390_SGMII_CONTROL_RESET BIT(15) +#define MV88E6390_SGMII_CONTROL_LOOPBACK BIT(14) +#define MV88E6390_SGMII_CONTROL_PDOWN BIT(11) +#define MV88E6390_SGMII_STATUS 0x2001/* Packet generator pad packet checker */ #define MV88E6390_PG_CONTROL 0xf010#define MV88E6390_PG_CONTROL_ENABLE_PC BIT(0) +#define MV88E6393X_PORT0_LANE 0x00 +#define MV88E6393X_PORT9_LANE 0x09 +#define MV88E6393X_PORT10_LANE 0x0a + +/* Port Operational Configuration */ +#define MV88E6393X_PCS_SELECT_1000BASEX 0x0000 +#define MV88E6393X_PCS_SELECT_2500BASEX 0x0001 +#define MV88E6393X_PCS_SELECT_SGMII_PHY 0x0002 +#define MV88E6393X_PCS_SELECT_SGMII_MAC 0x0003 +#define MV88E6393X_PCS_SELECT_5GBASER 0x0004 +#define MV88E6393X_PCS_SELECT_10GBASER 0x0005 +#define MV88E6393X_PCS_SELECT_USXGMII_PHY 0x0006 +#define MV88E6393X_PCS_SELECT_USXGMII_MAC 0x0007 + +#define MV88E6393X_SERDES_POC 0xf002 +#define MV88E6393X_SERDES_POC_PCS_MODE_MASK 0x0007 +#define MV88E6393X_SERDES_POC_RESET BIT(15) +#define MV88E6393X_SERDES_POC_PDOWN BIT(5) +#define MV88E6393X_SERDES_POC_ANEG BIT(3) + +#define MV88E6393X_ERRATA_1000BASEX_SGMII 0xF074 +#define MV88E6393X_ERRATA_1000BASEX_SGMII_BIT BIT(14) +u8 mv88e6341_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);u8 mv88e6352_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);u8 mv88e6390_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);u8 mv88e6390x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port); +u8 mv88e6393x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port); int mv88e6352_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, u8 lane, unsigned int mode, phy_interface_t interface,@@ -105,14 +137,21 @@ int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, u8 lane, bool on);int mv88e6390_serdes_power (struct mv88e6xxx_chip *chip,int port,u8 lane,bool on); +int mv88e6393x_serdes_power (struct mv88e6xxx_chip *chip,int port,u8 lane, +bool on); +int mv88e6393x_setup_errata (struct mv88e6xxx_chip *chip);int mv88e6352_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port,u8 lane,bool enable);int mv88e6390_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port,u8 lane,bool enable); +int mv88e6393x_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port, +u8 lane,bool enable);irqreturn_t mv88e6352_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,u8 lane);irqreturn_t mv88e6390_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,u8 lane); +irqreturn_t mv88e6393x_serdes_irq_status (struct mv88e6xxx_chip *chip,int port, +u8 lane);int mv88e6352_serdes_get_sset_count (struct mv88e6xxx_chip *chip,int port);int mv88e6352_serdes_get_strings (struct mv88e6xxx_chip *chip,int port,uint8_t *data);
v7 cover Add support for mv88e6393x family of Marvell
Thanks for the review.
Here's updated patchset.
Pavana Sharma (4):
dt-bindings: net: Add 5GBASER phy interface mode
net: phy: Add 5GBASER interface mode
net: dsa: mv88e6xxx: Change serdes lane parameter from u8 type to int
net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
.../bindings/net/ethernet-controller.yaml | 2 + drivers/net/dsa/mv88e6xxx/chip.c | 164 +++++++++- drivers/net/dsa/mv88e6xxx/chip.h | 20 +- drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 240 +++++++++++++- drivers/net/dsa/mv88e6xxx/port.h | 43 ++- drivers/net/dsa/mv88e6xxx/serdes.c | 299 +++++++++++++++--- drivers/net/dsa/mv88e6xxx/serdes.h | 91 ++++-- include/linux/phy.h | 4 + 10 files changed, 782 insertions(+), 91 deletions(-)
Signature · 1 line
2.17.1
PATCH v7 1/4 dt-bindings: net: Add 5GBASER phy interface mode
Add 5gbase-r PHY interface mode.
--- Documentation/devicetree/bindings/net/ethernet-controller.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/net/ethernet-controller.yaml +2 -0
@@ -89,6 +89,8 @@ properties: - trgmii - 1000base-x - 2500base-x + # 5GBASE-R + - 5gbase-r - rxaui - xaui
Signature · 1 line
2.17.1
PATCH v7 2/4 net: phy: Add 5GBASER interface mode
In reply to Pavana SharmaAdd 5GBASE-R phy interface mode
--- include/linux/phy.h | 4 ++++ 1 file changed, 4 insertions(+)
include/linux/phy.h +4 -0
@@ -105,6 +105,8 @@ typedef enum {PHY_INTERFACE_MODE_TRGMII ,PHY_INTERFACE_MODE_1000BASEX ,PHY_INTERFACE_MODE_2500BASEX , +/* 5GBASE-R mode */ +PHY_INTERFACE_MODE_5GBASER ,PHY_INTERFACE_MODE_RXAUI , PHY_INTERFACE_MODE_XAUI,/* 10GBASE-R, XFI, SFI - single lane 10G Serdes */
@@ -183,6 +185,8 @@ static inline const char *phy_modes(phy_interface_t interface)return "1000base-x" ;case PHY_INTERFACE_MODE_2500BASEX :return "2500base-x" ; +case PHY_INTERFACE_MODE_5GBASER : +return "5gbase-r" ;case PHY_INTERFACE_MODE_RXAUI :return "rxaui" ;case PHY_INTERFACE_MODE_XAUI :
Signature · 1 line
2.17.1
Re: [PATCH v7 2/4] net: phy: Add 5GBASER interface mode
Quoted 3 lines · Pavana Sharma
Add 5GBASE-R phy interface mode
Signed-off-by Pavana Sharma <[email protected]>
How many times have i asked for you to add kerneldoc for this new value? How many times have you not done so?
NACK.
If you don't understand a comment, please ask.
Andrew
PATCH v7 2/4 net: phy: Add 5GBASER interface mode
Quoted 2 lines
How many times have i asked for you to add kerneldoc for this new value? How many times have you not done so?
I have added kerneldoc comment for the new value added.
Quoted 3 lines
NACK.
If you don't understand a comment, please ask.
Ok, explain what do you expect by that comment.
Re: [PATCH v7 2/4] net: phy: Add 5GBASER interface mode
Quoted 10 lines · Pavana Sharma
Quoted 2 lines
How many times have i asked for you to add kerneldoc for this new value? How many times have you not done so?
I have added kerneldoc comment for the new value added.
Quoted 3 lines
NACK.
If you don't understand a comment, please ask.
Ok, explain what do you expect by that comment.
What Andrew wants you to do is add a comment like this:
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/tree/include/linux/phy.h#n88
Signature · 1 line
Florian
Andrew Lunn
maintainerRe: [PATCH v7 2/4] net: phy: Add 5GBASER interface mode
Quoted 10 lines · Florian Fainelli
Quoted 7 lines · Pavana Sharma
Quoted 2 lines
How many times have i asked for you to add kerneldoc for this new value? How many times have you not done so?
I have added kerneldoc comment for the new value added.
Quoted 1 line
NACK.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
If you don't understand a comment, please ask.
Ok, explain what do you expect by that comment.
What Andrew wants you to do is add a comment like this:
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/tree/include/linux/phy.h#n88
Hi Pavana
This should also help:
https://www.kernel.org/doc/html/latest/doc-guide/kernel-doc.html
And please compile the kernel with the W=1 flag. Make sure changes you make don't add new warnings. You will see a warning from this new enum valu you are adding because it is not correctly documented.
Andrew
v8 cover Add support for mv88e6393x family of Marvell
Updated patchset with following changes.
- Add kerneldoc for 5GBASER phy interface
- Remove lane param initialization wherever is it not needed.
Pavana Sharma (4):
dt-bindings: net: Add 5GBASER phy interface mode
net: phy: Add 5GBASER interface mode
net: dsa: mv88e6xxx: Change serdes lane parameter from u8 type to int
net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
.../bindings/net/ethernet-controller.yaml | 2 + drivers/net/dsa/mv88e6xxx/chip.c | 164 +++++++++- drivers/net/dsa/mv88e6xxx/chip.h | 20 +- drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 240 +++++++++++++- drivers/net/dsa/mv88e6xxx/port.h | 43 ++- drivers/net/dsa/mv88e6xxx/serdes.c | 295 +++++++++++++++--- drivers/net/dsa/mv88e6xxx/serdes.h | 91 ++++-- include/linux/phy.h | 5 + 10 files changed, 781 insertions(+), 89 deletions(-)
Signature · 1 line
2.17.1
PATCH v8 1/4 dt-bindings: net: Add 5GBASER phy interface mode
Add 5gbase-r PHY interface mode.
--- Documentation/devicetree/bindings/net/ethernet-controller.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/net/ethernet-controller.yaml +2 -0
@@ -89,6 +89,8 @@ properties: - trgmii - 1000base-x - 2500base-x + # 5GBASE-R + - 5gbase-r - rxaui - xaui
Signature · 1 line
2.17.1
Jakub Kicinski
maintainerRe: [PATCH v8 1/4] dt-bindings: net: Add 5GBASER phy interface mode
Quoted 3 lines · On Tue, 3 Nov 2020 18:49:02 +1000 Pavana Sharma wrote:
Add 5gbase-r PHY interface mode.
Signed-off-by Pavana Sharma <[email protected]>
Please always CC device tree maintainers and list on patches which touch bindings. Even if there is no need for review Rob has a bot which will catch any formatting errors.
PATCH v8 2/4 net: phy: Add 5GBASER interface mode
In reply to Pavana SharmaAdd 5GBASE-R phy interface mode
--- include/linux/phy.h | 5 +++++ 1 file changed, 5 insertions(+)
include/linux/phy.h +5 -0
@@ -106,6 +106,7 @@ extern const int phy_10gbit_features_array[1];* @PHY_INTERFACE_MODE_TRGMII: Turbo RGMII * @PHY_INTERFACE_MODE_1000BASEX: 1000 BaseX * @PHY_INTERFACE_MODE_2500BASEX: 2500 BaseX +* @PHY_INTERFACE_MODE_5GBASER: 5G BaseR * @PHY_INTERFACE_MODE_RXAUI: Reduced XAUI * @PHY_INTERFACE_MODE_XAUI: 10 Gigabit Attachment Unit Interface * @PHY_INTERFACE_MODE_10GBASER: 10G BaseR
@@ -137,6 +138,8 @@ typedef enum {PHY_INTERFACE_MODE_TRGMII ,PHY_INTERFACE_MODE_1000BASEX ,PHY_INTERFACE_MODE_2500BASEX , +/* 5GBASE-R mode */ +PHY_INTERFACE_MODE_5GBASER ,PHY_INTERFACE_MODE_RXAUI , PHY_INTERFACE_MODE_XAUI,/* 10GBASE-R, XFI, SFI - single lane 10G Serdes */
@@ -215,6 +218,8 @@ static inline const char *phy_modes(phy_interface_t interface)return "1000base-x" ;case PHY_INTERFACE_MODE_2500BASEX :return "2500base-x" ; +case PHY_INTERFACE_MODE_5GBASER : +return "5gbase-r" ;case PHY_INTERFACE_MODE_RXAUI :return "rxaui" ;case PHY_INTERFACE_MODE_XAUI :
Signature · 1 line
2.17.1
PATCH v8 3/4 net: dsa: mv88e6xxx: Change serdes lane parameter from u8 type to int
In reply to Pavana SharmaReturning 0 is no more an error case with MV88E6393 family which has serdes lane numbers 0, 9 or 10.
So with this change .serdes_get_lane will return lane number or error (-ENODEV).
--- drivers/net/dsa/mv88e6xxx/chip.c | 28 +++++------ drivers/net/dsa/mv88e6xxx/chip.h | 16 +++---- drivers/net/dsa/mv88e6xxx/port.c | 6 +-- drivers/net/dsa/mv88e6xxx/serdes.c | 74 +++++++++++++++--------------- drivers/net/dsa/mv88e6xxx/serdes.h | 50 ++++++++++---------- 5 files changed, 87 insertions(+), 87 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +14 -14
@@ -485,12 +485,12 @@ static int mv88e6xxx_serdes_pcs_get_state(struct dsa_switch *ds, int port, struct phylink_link_state *state) {struct mv88e6xxx_chip *chip = ds->priv; -u8 lane; +int lane;int err;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane && chip->info->ops->serdes_pcs_get_state) +if ((lane >=0 ) && chip->info->ops->serdes_pcs_get_state) err = chip->info->ops->serdes_pcs_get_state (chip, port, lane, state);else
@@ -506,11 +506,11 @@ static int mv88e6xxx_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, const unsigned long *advertise) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane;if (ops->serdes_pcs_config) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 )return ops->serdes_pcs_config (chip, port, lane, mode, interface, advertise); }
@@ -522,15 +522,15 @@ static void mv88e6xxx_serdes_pcs_an_restart(struct dsa_switch *ds, int port) {struct mv88e6xxx_chip *chip = ds->priv;const struct mv88e6xxx_ops *ops; +int lane;int err =0 ; -u8 lane; ops = chip->info->ops;if (ops->serdes_pcs_an_restart) {mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 ) err = ops->serdes_pcs_an_restart (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -544,11 +544,11 @@ static int mv88e6xxx_serdes_pcs_link_up(struct mv88e6xxx_chip *chip, int port, int speed, int duplex) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane;if (!phylink_autoneg_inband (mode) && ops->serdes_pcs_link_up) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 )return ops->serdes_pcs_link_up (chip, port, lane, speed, duplex); }
@@ -2422,11 +2422,11 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id)struct mv88e6xxx_chip *chip = mvp->chip;irqreturn_t ret =IRQ_NONE ;int port = mvp->port; -u8 lane; +int lane;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 ) ret =mv88e6xxx_serdes_irq_status (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -2434,7 +2434,7 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id) }static int mv88e6xxx_serdes_irq_request (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq;
@@ -2463,7 +2463,7 @@ static int mv88e6xxx_serdes_irq_request(struct mv88e6xxx_chip *chip, int port, }static int mv88e6xxx_serdes_irq_free (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq = dev_id->serdes_irq;
@@ -2488,11 +2488,11 @@ static int mv88e6xxx_serdes_irq_free(struct mv88e6xxx_chip *chip, int port,static int mv88e6xxx_serdes_power (struct mv88e6xxx_chip *chip,int port,bool on) { -u8 lane; +int lane;int err; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) +if (lane <0 )return 0 ;if (on) {
drivers/net/dsa/mv88e6xxx/chip.h +8 -8
@@ -506,30 +506,30 @@ struct mv88e6xxx_ops {int (*mgmt_rsvd2cpu)(struct mv88e6xxx_chip *chip);/* Power on/off a SERDES interface */ -int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,int lane,bool up);/* SERDES lane mapping */ -u8 (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port); +int (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port);int (*serdes_pcs_get_state)(struct mv88e6xxx_chip *chip,int port, -u8 lane,struct phylink_link_state *state); +int lane,struct phylink_link_state *state);int (*serdes_pcs_config)(struct mv88e6xxx_chip *chip,int port, -u8 lane,unsigned int mode, +int lane,unsigned int mode,phy_interface_t interface,const unsigned long *advertise);int (*serdes_pcs_an_restart)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);int (*serdes_pcs_link_up)(struct mv88e6xxx_chip *chip,int port, -u8 lane,int speed,int duplex); +int lane,int speed,int duplex);/* SERDES interrupt handling */ unsigned int (*serdes_irq_mapping)(struct mv88e6xxx_chip *chip,int port); -int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,int lane,bool enable);irqreturn_t (*serdes_irq_status)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);/* Statistics from the SERDES interface */ int (*serdes_get_sset_count)(struct mv88e6xxx_chip *chip,int port);
drivers/net/dsa/mv88e6xxx/port.c +3 -3
@@ -393,8 +393,8 @@ phy_interface_t mv88e6390x_port_max_speed_mode(int port)static int mv88e6xxx_port_set_cmode (struct mv88e6xxx_chip *chip,int port,phy_interface_t mode,bool force) { -u8 lane;u16 cmode; +int lane;u16 reg;int err;
@@ -430,7 +430,7 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port,return 0 ; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) { +if (lane >=0 ) {if (chip->ports[port].serdes_irq) { err =mv88e6xxx_serdes_irq_disable (chip, port, lane);if (err)
@@ -459,7 +459,7 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port, chip->ports[port].cmode = cmode; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) +if (lane <0 )return -ENODEV ; err =mv88e6xxx_serdes_power_up (chip, port, lane);
drivers/net/dsa/mv88e6xxx/serdes.c +37 -37
281 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +25 -25
117 lines not on this page · raw message
Signature · 1 line
2.17.1
Jakub Kicinski
maintainerRe: [PATCH v8 3/4] net: dsa: mv88e6xxx: Change serdes lane parameter from u8 type to int
drivers/net/dsa/mv88e6xxx/chip.c static int mv88e6xxx_serdes_pcs_get_state(struct dsa_switch *ds, int port, · line 493
Quoted 11 lines · On Tue, 3 Nov 2020 18:50:02 +1000 Pavana Sharma wrote:
Returning 0 is no more an error case with MV88E6393 family which has serdes lane numbers 0, 9 or 10.
So with this change .serdes_get_lane will return lane number or error (-ENODEV).Signed-off-by Pavana Sharma <[email protected]>drivers/net/dsa/mv88e6xxx/chip.c +1
-1mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane && chip->info->ops->serdes_pcs_get_state) +if ((lane >=0 ) && chip->info->ops->serdes_pcs_get_state)
unnecessary parenthesis, checkpatch even warns about this
drivers/net/dsa/mv88e6xxx/chip.c static void mv88e6xxx_serdes_pcs_an_restart(struct dsa_switch *ds, int port) · line 526
Quoted 11 lines
drivers/net/dsa/mv88e6xxx/chip.c +1
-0err = chip->info->ops->serdes_pcs_get_state (chip, port, lane, state); else@@ -522,15 +522,15 @@ static void mv88e6xxx_serdes_pcs_an_restart(struct dsa_switch *ds, int port) {struct mv88e6xxx_chip *chip = ds->priv;const struct mv88e6xxx_ops *ops; +int lane;int err =0 ;
Please keep the reverse xmas tree order of variables
int lane; should be after int err = 0;
We're ordering full lines, not just the type and name.
Quoted 14 lines
drivers/net/dsa/mv88e6xxx/chip.c +1
-2-u8 lane; ops = chip->info->ops;if (ops->serdes_pcs_an_restart) {mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 ) err = ops->serdes_pcs_an_restart (chip, port, lane);mv88e6xxx_reg_unlock (chip);void
mv88e6390_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void *_p){
drivers/net/dsa/mv88e6xxx/serdes.c int mv88e6390_serdes_get_regs_len(struct mv88e6xxx_chip *chip, int port) · line 990
Quoted 5 lines
drivers/net/dsa/mv88e6xxx/serdes.c +1
-1-u16 *p = _p;int lane; +u16 *p = _p;u16 reg;int i;
ditto
drivers/net/dsa/mv88e6xxx/serdes.h void mv88e6352_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void *_p); · line 132
Quoted 6 lines
drivers/net/dsa/mv88e6xxx/serdes.h +1
-1@@ -129,18 +129,18 @@ void mv88e6352_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void *_p);int mv88e6390_serdes_get_regs_len (struct mv88e6xxx_chip *chip,int port);void mv88e6390_serdes_get_regs (struct mv88e6xxx_chip *chip,int port,void *_p); -/* Return the (first) SERDES lane address a port is using, 0 otherwise. */ +/* Return the (first) SERDES lane address a port is using, ERROR otherwise. */
The usual notation is -errno, instead of ERROR.
PATCH v8 4/4 net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
In reply to Pavana SharmaThe Marvell 88E6393X device is a single-chip integration of a 11-port Ethernet switch with eight integrated Gigabit Ethernet (GbE) transceivers and three 10-Gigabit interfaces.
This patch adds functionalities specific to mv88e6393x family (88E6393X, 88E6193X and 88E6191X)
---
Changes in v2:
- Fix a warning (Reported-by: kernel test robot <[email protected]>)
Changes in v3:
- Fix 'unused function' warning
Changes in v4-v8:
- Incorporated feedback from maintainers.
--- drivers/net/dsa/mv88e6xxx/chip.c | 136 ++++++++++++++++ drivers/net/dsa/mv88e6xxx/chip.h | 4 + drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 234 ++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/port.h | 43 ++++- drivers/net/dsa/mv88e6xxx/serdes.c | 225 +++++++++++++++++++++++++- drivers/net/dsa/mv88e6xxx/serdes.h | 41 ++++- 8 files changed, 689 insertions(+), 4 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +136 -0
@@ -635,6 +635,24 @@ static void mv88e6390x_phylink_validate(struct mv88e6xxx_chip *chip, int port,mv88e6390_phylink_validate (chip, port, mask, state); } +static void mv88e6393x_phylink_validate (struct mv88e6xxx_chip *chip,int port, +unsigned long *mask, +struct phylink_link_state *state) +{ +if (port ==0 || port ==9 || port ==10 ) { + phylink_set(mask, 10000baseT_Full); + phylink_set(mask, 10000baseKR_Full); + phylink_set(mask, 5000baseT_Full); + phylink_set(mask, 2500baseX_Full); + phylink_set(mask, 2500baseT_Full); + } + + phylink_set(mask, 1000baseT_Full); + phylink_set(mask, 1000baseX_Full); + +mv88e6065_phylink_validate (chip, port, mask, state); +} +static void mv88e6xxx_validate (struct dsa_switch *ds,int port,unsigned long *supported,struct phylink_link_state *state)
@@ -3906,6 +3924,55 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { .phylink_validate = mv88e6390_phylink_validate, }; +static const struct mv88e6xxx_ops mv88e6393x_ops = { +/* MV88E6XXX_FAMILY_6393 */ + .setup_errata = mv88e6393x_setup_errata, + .irl_init_all = mv88e6390_g2_irl_init_all, + .get_eeprom = mv88e6xxx_g2_get_eeprom8, + .set_eeprom = mv88e6xxx_g2_set_eeprom8, + .set_switch_mac = mv88e6xxx_g2_set_switch_mac, + .phy_read = mv88e6xxx_g2_smi_phy_read, + .phy_write = mv88e6xxx_g2_smi_phy_write, + .port_set_link = mv88e6xxx_port_set_link, + .port_set_speed_duplex = mv88e6393x_port_set_speed_duplex, + .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, + .port_tag_remap = mv88e6390_port_tag_remap, + .port_set_frame_mode = mv88e6351_port_set_frame_mode, + .port_set_egress_floods = mv88e6352_port_set_egress_floods, + .port_set_ether_type = mv88e6393x_port_set_ether_type, + .port_set_jumbo_size = mv88e6165_port_set_jumbo_size, + .port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting, + .port_pause_limit = mv88e6390_port_pause_limit, + .port_set_cmode = mv88e6393x_port_set_cmode, + .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit, + .port_disable_pri_override = mv88e6xxx_port_disable_pri_override, + .port_get_cmode = mv88e6352_port_get_cmode, + .stats_snapshot = mv88e6390_g1_stats_snapshot, + .stats_set_histogram = mv88e6390_g1_stats_set_histogram, + .stats_get_sset_count = mv88e6320_stats_get_sset_count, + .stats_get_strings = mv88e6320_stats_get_strings, + .stats_get_stats = mv88e6390_stats_get_stats, + .set_cpu_port = mv88e6393x_port_set_cpu_dest, + .set_egress_port = mv88e6393x_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, + .mgmt_rsvd2cpu = mv88e6393x_port_mgmt_rsvd2cpu, + .pot_clear = mv88e6xxx_g2_pot_clear, + .reset = mv88e6352_g1_reset, + .rmu_disable = mv88e6390_g1_rmu_disable, + .vtu_getnext = mv88e6390_g1_vtu_getnext, + .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge, + .serdes_power = mv88e6393x_serdes_power, + .serdes_get_lane = mv88e6393x_serdes_get_lane, + .serdes_pcs_get_state = mv88e6390_serdes_pcs_get_state, + .serdes_irq_mapping = mv88e6390_serdes_irq_mapping, + .serdes_irq_enable = mv88e6393x_serdes_irq_enable, + .serdes_irq_status = mv88e6393x_serdes_irq_status, + .gpio_ops = &mv88e6352_gpio_ops, + .avb_ops = &mv88e6390_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, + .phylink_validate = mv88e6393x_phylink_validate, +}; +static const struct mv88e6xxx_ops mv88e6240_ops = {/* MV88E6XXX_FAMILY_6352 */ .ieee_pri_map = mv88e6085_g1_ieee_pri_map,
@@ -4838,6 +4905,52 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .ops = &mv88e6191_ops, }, + [MV88E6191X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6191X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6191X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, + + [MV88E6193X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6193X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6193X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, + [MV88E6220] = { .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6220, .family = MV88E6XXX_FAMILY_6250,
@@ -5128,6 +5241,29 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .ptp_support = true, .ops = &mv88e6390x_ops, }, + + [MV88E6393X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6393X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6393X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, };static const struct mv88e6xxx_info *mv88e6xxx_lookup_info (unsigned int prod_num)
drivers/net/dsa/mv88e6xxx/chip.h +4 -0
@@ -63,6 +63,8 @@ enum mv88e6xxx_model {MV88E6190 ,MV88E6190X ,MV88E6191 , +MV88E6191X , +MV88E6193X ,MV88E6220 ,MV88E6240 , MV88E6250,
@@ -75,6 +77,7 @@ enum mv88e6xxx_model {MV88E6352 ,MV88E6390 ,MV88E6390X , + MV88E6393X, }; enum mv88e6xxx_family {
@@ -90,6 +93,7 @@ enum mv88e6xxx_family {MV88E6XXX_FAMILY_6351 ,/* 6171 6175 6350 6351 */ MV88E6XXX_FAMILY_6352 ,/* 6172 6176 6240 6352 */ MV88E6XXX_FAMILY_6390 ,/* 6190 6190X 6191 6290 6390 6390X */ + MV88E6XXX_FAMILY_6393, /* 6191X 6193X 6393X */ };struct mv88e6xxx_ops ;
drivers/net/dsa/mv88e6xxx/global1.h +2 -0
@@ -22,6 +22,7 @@#define MV88E6185_G1_STS_PPU_STATE_DISABLED 0x8000#define MV88E6185_G1_STS_PPU_STATE_POLLING 0xc000#define MV88E6XXX_G1_STS_INIT_READY 0x0800 +#define MV88E6393X_G1_STS_IRQ_DEVICE_2 9#define MV88E6XXX_G1_STS_IRQ_AVB 8#define MV88E6XXX_G1_STS_IRQ_DEVICE 7#define MV88E6XXX_G1_STS_IRQ_STATS 6
@@ -59,6 +60,7 @@#define MV88E6185_G1_CTL1_SCHED_PRIO 0x0800#define MV88E6185_G1_CTL1_MAX_FRAME_1632 0x0400#define MV88E6185_G1_CTL1_RELOAD_EEPROM 0x0200 +#define MV88E6393X_G1_CTL1_DEVICE2_EN 0x0200#define MV88E6XXX_G1_CTL1_DEVICE_EN 0x0080#define MV88E6XXX_G1_CTL1_STATS_DONE_EN 0x0040#define MV88E6XXX_G1_CTL1_VTU_PROBLEM_EN 0x0020
drivers/net/dsa/mv88e6xxx/global2.h +8 -0
@@ -38,9 +38,15 @@/* Offset 0x02: MGMT Enable Register 2x */ #define MV88E6XXX_G2_MGMT_EN_2X 0x02 +/* Offset 0x02: MAC LINK change IRQ Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_SRC 0x02 +/* Offset 0x03: MGMT Enable Register 0x */ #define MV88E6XXX_G2_MGMT_EN_0X 0x03 +/* Offset 0x03: MAC LINK change IRQ Mask Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_MASK 0x03 +/* Offset 0x04: Flow Control Delay Register */ #define MV88E6XXX_G2_FLOW_CTL 0x04
@@ -52,6 +58,8 @@#define MV88E6XXX_G2_SWITCH_MGMT_FORCE_FLOW_CTL_PRI 0x0080#define MV88E6XXX_G2_SWITCH_MGMT_RSVD2CPU 0x0008 +#define MV88E6393X_G2_EGRESS_MONITOR_DEST 0x05 +/* Offset 0x06: Device Mapping Table Register */ #define MV88E6XXX_G2_DEVICE_MAPPING 0x06#define MV88E6XXX_G2_DEVICE_MAPPING_UPDATE 0x8000
drivers/net/dsa/mv88e6xxx/port.c +234 -0
276 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/port.h +41 -2
97 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.c +224 -1
247 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +40 -1
76 lines not on this page · raw message
Signature · 1 line
2.17.1
Jakub Kicinski
maintainerRe: [PATCH v8 4/4] net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
Quoted 6 lines · On Tue, 3 Nov 2020 18:50:38 +1000 Pavana Sharma wrote:
The Marvell 88E6393X device is a single-chip integration of a 11-port Ethernet switch with eight integrated Gigabit Ethernet (GbE) transceivers and three 10-Gigabit interfaces.
This patch adds functionalities specific to mv88e6393x family (88E6393X, 88E6193X and 88E6191X)
Please fix all checkpatch --strict --min-conf-desc-length=80 warnings and what I point out below
drivers/net/dsa/mv88e6xxx/port.c phy_interface_t mv88e6390x_port_max_speed_mode(int port) · line 469
Quoted 7 lines
Co-developed-by Ashkan Boldaji <[email protected]>Signed-off-by Ashkan Boldaji <[email protected]>Signed-off-by Pavana Sharma <[email protected]>drivers/net/dsa/mv88e6xxx/port.c +3
-0+ reg &= ~(MV88E6XXX_PORT_MAC_CTL_SPEED_MASK | +MV88E6390_PORT_MAC_CTL_ALTSPEED | +MV88E6390_PORT_MAC_CTL_FORCE_SPEED );
Align the continuation lines under the opening bracket, like the kernel coding style require, please.
drivers/net/dsa/mv88e6xxx/port.c phy_interface_t mv88e6390x_port_max_speed_mode(int port) · line 480
Quoted 11 lines
drivers/net/dsa/mv88e6xxx/port.c +11
-0+ +if (speed !=SPEED_UNFORCED ) + reg |=MV88E6390_PORT_MAC_CTL_FORCE_SPEED ; + + reg |= ctrl; + + err =mv88e6xxx_port_write (chip, port,MV88E6XXX_PORT_MAC_CTL , reg); +if (err) +return err; + +return 0 ;
no need to set err, just directly do:
return mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_MAC_CTL, reg);
drivers/net/dsa/mv88e6xxx/port.c phy_interface_t mv88e6390x_port_max_speed_mode(int port)
Quoted 7 lines
drivers/net/dsa/mv88e6xxx/port.c +3
-0+} +static int mv88e6xxx_port_set_cmode (struct mv88e6xxx_chip *chip,int port,phy_interface_t mode,bool force) { +/* Offset 0x0E: Policy & MGMT Control Register for FAMILY 6191X 6193X 6393X*/
Missing space at the end of that comment.
Quoted 7 lines
drivers/net/dsa/mv88e6xxx/port.c +7
-0+static int mv88e6393x_port_policy_write (struct mv88e6xxx_chip *chip,u16 pointer, +u8 data) +{ + +int err =0 ; +int port; +u16 reg;
drivers/net/dsa/mv88e6xxx/port.c int mv88e6xxx_port_disable_pri_override(struct mv88e6xxx_chip *chip, int port) · line 1258
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/port.c +10
-0+ +/* Setup per Port policy register */ +for (port =0 ; port <mv88e6xxx_num_ports (chip); port++) { +if (dsa_is_unused_port (chip->ds, port)) +continue ; + +/* Prevent the use of an invalid port. */ +if (mv88e6xxx_is_invalid_port (chip, port)) { +dev_err (chip->dev,"port %d is invalid\n" , port); + err = -EINVAL ;
did you mean to exit here? this assignment looks pointless
Quoted 27 lines
drivers/net/dsa/mv88e6xxx/port.c +26
-0+ } + reg =MV88E6393X_PORT_POLICY_MGMT_CTL_UPDATE | pointer | data; + err =mv88e6xxx_port_write (chip, port,MV88E6393X_PORT_POLICY_MGMT_CTL , reg); + } +return err; +} +int mv88e6393x_port_mgmt_rsvd2cpu (struct mv88e6xxx_chip *chip) +{ +u16 ptr; +int err; + +/* Consider the frames with reserved multicast destination +* addresses matching 01:80:c2:00:00:00 and +* 01:80:c2:00:00:02 as MGMT. +*/ + ptr =MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000000XLO ; + err =mv88e6393x_port_policy_write (chip, ptr,0xff ); +if (err) +return err; + + ptr =MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000000XHI ; + err =mv88e6393x_port_policy_write (chip, ptr,0xff ); +if (err) +return err; + + ptr =MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000002XLO ;
drivers/net/dsa/mv88e6xxx/port.c int mv88e6xxx_port_disable_pri_override(struct mv88e6xxx_chip *chip, int port) · line 1327
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/port.c +10
-0+ err =mv88e6393x_port_policy_write (chip, ptr,0xff ); +if (err) +return err; + + ptr =MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000002XHI ; + err =mv88e6393x_port_policy_write (chip, ptr,0xff ); +if (err) +return err; + +return 0 ;
return mv...
drivers/net/dsa/mv88e6xxx/port.c int mv88e6xxx_port_disable_pri_override(struct mv88e6xxx_chip *chip, int port) · line 1362
Quoted 9 lines
drivers/net/dsa/mv88e6xxx/port.c +7
-0+} + + err =mv88e6xxx_port_write (chip, port,MV88E6393X_PORT_EPC_CMD , val); +if (err) +return err; + +return 0 ;
ditto
drivers/net/dsa/mv88e6xxx/serdes.c void mv88e6390_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void *_p) · line 1209
Quoted 7 lines
drivers/net/dsa/mv88e6xxx/serdes.c +6
-0+} + +int mv88e6393x_serdes_power (struct mv88e6xxx_chip *chip,int port,int lane, +bool on) +{ +if (port ==0 || port ==9 || port ==10 ) {
Flip the condition, return early. Entire body of a function should not have to be indented.
Quoted 17 lines
drivers/net/dsa/mv88e6xxx/serdes.c +15
-0+u8 cmode = chip->ports[port].cmode; + +mv88e6393x_serdes_port_config (chip, lane, on); + +switch (cmode) { +case MV88E6XXX_PORT_STS_CMODE_1000BASEX : +case MV88E6XXX_PORT_STS_CMODE_2500BASEX : +return mv88e6390_serdes_power_sgmii (chip, lane, on); +case MV88E6XXX_PORT_STS_CMODE_10GBASER : +return mv88e6390_serdes_power_10g (chip, lane, on); + } + } + +return 0 ; +}
drivers/net/dsa/mv88e6xxx/serdes.c int mv88e6390_serdes_get_regs_len(struct mv88e6xxx_chip *chip, int port); · line 173
Quoted 6 lines
drivers/net/dsa/mv88e6xxx/serdes.c +1
-1@@ -130,7 +169,7 @@ int mv88e6390_serdes_get_regs_len(struct mv88e6xxx_chip *chip, int port);void mv88e6390_serdes_get_regs (struct mv88e6xxx_chip *chip,int port,void *_p);/* Return the (first) SERDES lane address a port is using, ERROR otherwise. */ -static inline u8 mv88e6xxx_serdes_get_lane (struct mv88e6xxx_chip *chip, +static inline int mv88e6xxx_serdes_get_lane (struct mv88e6xxx_chip *chip,int port)
Looks like this should be in patch 3?
Quoted 2 lines
drivers/net/dsa/mv88e6xxx/serdes.h +0
-0{if (!chip->info->ops->serdes_get_lane)
v9 cover Add support for mv88e6393x family of Marvell
Thanks for the review.
Here's updated patchset.
All possible checkpatch 'checks' are attended.
Pavana Sharma (4):
dt-bindings: net: Add 5GBASER phy interface mode
net: phy: Add 5GBASER interface mode
net: dsa: mv88e6xxx: Change serdes lane parameter from u8 type to int
net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
.../bindings/net/ethernet-controller.yaml | 2 + drivers/net/dsa/mv88e6xxx/chip.c | 164 +++++++++- drivers/net/dsa/mv88e6xxx/chip.h | 20 +- drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 240 +++++++++++++- drivers/net/dsa/mv88e6xxx/port.h | 43 ++- drivers/net/dsa/mv88e6xxx/serdes.c | 296 +++++++++++++++--- drivers/net/dsa/mv88e6xxx/serdes.h | 93 ++++-- include/linux/phy.h | 5 + 10 files changed, 781 insertions(+), 92 deletions(-)
Signature · 1 line
2.17.1
PATCH v9 1/4 dt-bindings: net: Add 5GBASER phy interface mode
Add 5gbase-r PHY interface mode.
--- Documentation/devicetree/bindings/net/ethernet-controller.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/net/ethernet-controller.yaml +2 -0
@@ -89,6 +89,8 @@ properties: - trgmii - 1000base-x - 2500base-x + # 5GBASE-R + - 5gbase-r - rxaui - xaui
Signature · 1 line
2.17.1
PATCH v9 2/4 net: phy: Add 5GBASER interface mode
In reply to Pavana SharmaAdd 5GBASE-R phy interface mode
--- include/linux/phy.h | 5 +++++ 1 file changed, 5 insertions(+)
include/linux/phy.h +5 -0
@@ -106,6 +106,7 @@ extern const int phy_10gbit_features_array[1];* @PHY_INTERFACE_MODE_TRGMII: Turbo RGMII * @PHY_INTERFACE_MODE_1000BASEX: 1000 BaseX * @PHY_INTERFACE_MODE_2500BASEX: 2500 BaseX +* @PHY_INTERFACE_MODE_5GBASER: 5G BaseR * @PHY_INTERFACE_MODE_RXAUI: Reduced XAUI * @PHY_INTERFACE_MODE_XAUI: 10 Gigabit Attachment Unit Interface * @PHY_INTERFACE_MODE_10GBASER: 10G BaseR
@@ -137,6 +138,8 @@ typedef enum {PHY_INTERFACE_MODE_TRGMII ,PHY_INTERFACE_MODE_1000BASEX ,PHY_INTERFACE_MODE_2500BASEX , +/* 5GBASE-R mode */ +PHY_INTERFACE_MODE_5GBASER ,PHY_INTERFACE_MODE_RXAUI , PHY_INTERFACE_MODE_XAUI,/* 10GBASE-R, XFI, SFI - single lane 10G Serdes */
@@ -215,6 +218,8 @@ static inline const char *phy_modes(phy_interface_t interface)return "1000base-x" ;case PHY_INTERFACE_MODE_2500BASEX :return "2500base-x" ; +case PHY_INTERFACE_MODE_5GBASER : +return "5gbase-r" ;case PHY_INTERFACE_MODE_RXAUI :return "rxaui" ;case PHY_INTERFACE_MODE_XAUI :
Signature · 1 line
2.17.1
PATCH v9 3/4 net: dsa: mv88e6xxx: Change serdes lane parameter from u8 type to int
In reply to Pavana SharmaReturning 0 is no more an error case with MV88E6393 family which has serdes lane numbers 0, 9 or 10.
So with this change .serdes_get_lane will return lane number or -errno (-ENODEV or -EOPNOTSUPP).
--- drivers/net/dsa/mv88e6xxx/chip.c | 28 ++++++------ drivers/net/dsa/mv88e6xxx/chip.h | 16 +++---- drivers/net/dsa/mv88e6xxx/port.c | 6 +-- drivers/net/dsa/mv88e6xxx/serdes.c | 72 +++++++++++++++--------------- drivers/net/dsa/mv88e6xxx/serdes.h | 54 +++++++++++----------- 5 files changed, 88 insertions(+), 88 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +14 -14
@@ -485,12 +485,12 @@ static int mv88e6xxx_serdes_pcs_get_state(struct dsa_switch *ds, int port, struct phylink_link_state *state) {struct mv88e6xxx_chip *chip = ds->priv; -u8 lane; +int lane;int err;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane && chip->info->ops->serdes_pcs_get_state) +if (lane >=0 && chip->info->ops->serdes_pcs_get_state) err = chip->info->ops->serdes_pcs_get_state (chip, port, lane, state);else
@@ -506,11 +506,11 @@ static int mv88e6xxx_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, const unsigned long *advertise) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane;if (ops->serdes_pcs_config) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 )return ops->serdes_pcs_config (chip, port, lane, mode, interface, advertise); }
@@ -523,14 +523,14 @@ static void mv88e6xxx_serdes_pcs_an_restart(struct dsa_switch *ds, int port)struct mv88e6xxx_chip *chip = ds->priv;const struct mv88e6xxx_ops *ops;int err =0 ; -u8 lane; +int lane; ops = chip->info->ops;if (ops->serdes_pcs_an_restart) {mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 ) err = ops->serdes_pcs_an_restart (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -544,11 +544,11 @@ static int mv88e6xxx_serdes_pcs_link_up(struct mv88e6xxx_chip *chip, int port, int speed, int duplex) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane;if (!phylink_autoneg_inband (mode) && ops->serdes_pcs_link_up) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 )return ops->serdes_pcs_link_up (chip, port, lane, speed, duplex); }
@@ -2422,11 +2422,11 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id)struct mv88e6xxx_chip *chip = mvp->chip;irqreturn_t ret =IRQ_NONE ;int port = mvp->port; -u8 lane; +int lane;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 ) ret =mv88e6xxx_serdes_irq_status (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -2434,7 +2434,7 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id) }static int mv88e6xxx_serdes_irq_request (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq;
@@ -2463,7 +2463,7 @@ static int mv88e6xxx_serdes_irq_request(struct mv88e6xxx_chip *chip, int port, }static int mv88e6xxx_serdes_irq_free (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq = dev_id->serdes_irq;
@@ -2488,11 +2488,11 @@ static int mv88e6xxx_serdes_irq_free(struct mv88e6xxx_chip *chip, int port,static int mv88e6xxx_serdes_power (struct mv88e6xxx_chip *chip,int port,bool on) { -u8 lane; +int lane;int err; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) +if (lane <0 )return 0 ;if (on) {
drivers/net/dsa/mv88e6xxx/chip.h +8 -8
@@ -506,30 +506,30 @@ struct mv88e6xxx_ops {int (*mgmt_rsvd2cpu)(struct mv88e6xxx_chip *chip);/* Power on/off a SERDES interface */ -int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,int lane,bool up);/* SERDES lane mapping */ -u8 (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port); +int (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port);int (*serdes_pcs_get_state)(struct mv88e6xxx_chip *chip,int port, -u8 lane,struct phylink_link_state *state); +int lane,struct phylink_link_state *state);int (*serdes_pcs_config)(struct mv88e6xxx_chip *chip,int port, -u8 lane,unsigned int mode, +int lane,unsigned int mode,phy_interface_t interface,const unsigned long *advertise);int (*serdes_pcs_an_restart)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);int (*serdes_pcs_link_up)(struct mv88e6xxx_chip *chip,int port, -u8 lane,int speed,int duplex); +int lane,int speed,int duplex);/* SERDES interrupt handling */ unsigned int (*serdes_irq_mapping)(struct mv88e6xxx_chip *chip,int port); -int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,int lane,bool enable);irqreturn_t (*serdes_irq_status)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);/* Statistics from the SERDES interface */ int (*serdes_get_sset_count)(struct mv88e6xxx_chip *chip,int port);
drivers/net/dsa/mv88e6xxx/port.c +3 -3
@@ -393,8 +393,8 @@ phy_interface_t mv88e6390x_port_max_speed_mode(int port)static int mv88e6xxx_port_set_cmode (struct mv88e6xxx_chip *chip,int port,phy_interface_t mode,bool force) { -u8 lane;u16 cmode; +int lane;u16 reg;int err;
@@ -430,7 +430,7 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port,return 0 ; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) { +if (lane >=0 ) {if (chip->ports[port].serdes_irq) { err =mv88e6xxx_serdes_irq_disable (chip, port, lane);if (err)
@@ -459,7 +459,7 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port, chip->ports[port].cmode = cmode; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) +if (lane <0 )return -ENODEV ; err =mv88e6xxx_serdes_power_up (chip, port, lane);
drivers/net/dsa/mv88e6xxx/serdes.c +36 -36
274 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +27 -27
119 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v9 4/4 net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
In reply to Pavana SharmaThe Marvell 88E6393X device is a single-chip integration of a 11-port Ethernet switch with eight integrated Gigabit Ethernet (GbE) transceivers and three 10-Gigabit interfaces.
This patch adds functionalities specific to mv88e6393x family (88E6393X, 88E6193X and 88E6191X)
---
Changes in v2:
- Fix a warning (Reported-by: kernel test robot <[email protected]>)
Changes in v3:
- Fix 'unused function' warning
Changes in v4-v9:
- Incorporated feedback from maintainers.
--- drivers/net/dsa/mv88e6xxx/chip.c | 136 ++++++++++++++++ drivers/net/dsa/mv88e6xxx/chip.h | 4 + drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 234 +++++++++++++++++++++++++++- drivers/net/dsa/mv88e6xxx/port.h | 43 ++++- drivers/net/dsa/mv88e6xxx/serdes.c | 224 ++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/serdes.h | 39 +++++ 8 files changed, 686 insertions(+), 4 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +136 -0
@@ -635,6 +635,24 @@ static void mv88e6390x_phylink_validate(struct mv88e6xxx_chip *chip, int port,mv88e6390_phylink_validate (chip, port, mask, state); } +static void mv88e6393x_phylink_validate (struct mv88e6xxx_chip *chip,int port, +unsigned long *mask, +struct phylink_link_state *state) +{ +if (port ==0 || port ==9 || port ==10 ) { + phylink_set(mask, 10000baseT_Full); + phylink_set(mask, 10000baseKR_Full); + phylink_set(mask, 5000baseT_Full); + phylink_set(mask, 2500baseX_Full); + phylink_set(mask, 2500baseT_Full); + } + + phylink_set(mask, 1000baseT_Full); + phylink_set(mask, 1000baseX_Full); + +mv88e6065_phylink_validate (chip, port, mask, state); +} +static void mv88e6xxx_validate (struct dsa_switch *ds,int port,unsigned long *supported,struct phylink_link_state *state)
@@ -3906,6 +3924,55 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { .phylink_validate = mv88e6390_phylink_validate, }; +static const struct mv88e6xxx_ops mv88e6393x_ops = { +/* MV88E6XXX_FAMILY_6393 */ + .setup_errata = mv88e6393x_setup_errata, + .irl_init_all = mv88e6390_g2_irl_init_all, + .get_eeprom = mv88e6xxx_g2_get_eeprom8, + .set_eeprom = mv88e6xxx_g2_set_eeprom8, + .set_switch_mac = mv88e6xxx_g2_set_switch_mac, + .phy_read = mv88e6xxx_g2_smi_phy_read, + .phy_write = mv88e6xxx_g2_smi_phy_write, + .port_set_link = mv88e6xxx_port_set_link, + .port_set_speed_duplex = mv88e6393x_port_set_speed_duplex, + .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, + .port_tag_remap = mv88e6390_port_tag_remap, + .port_set_frame_mode = mv88e6351_port_set_frame_mode, + .port_set_egress_floods = mv88e6352_port_set_egress_floods, + .port_set_ether_type = mv88e6393x_port_set_ether_type, + .port_set_jumbo_size = mv88e6165_port_set_jumbo_size, + .port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting, + .port_pause_limit = mv88e6390_port_pause_limit, + .port_set_cmode = mv88e6393x_port_set_cmode, + .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit, + .port_disable_pri_override = mv88e6xxx_port_disable_pri_override, + .port_get_cmode = mv88e6352_port_get_cmode, + .stats_snapshot = mv88e6390_g1_stats_snapshot, + .stats_set_histogram = mv88e6390_g1_stats_set_histogram, + .stats_get_sset_count = mv88e6320_stats_get_sset_count, + .stats_get_strings = mv88e6320_stats_get_strings, + .stats_get_stats = mv88e6390_stats_get_stats, + .set_cpu_port = mv88e6393x_port_set_cpu_dest, + .set_egress_port = mv88e6393x_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, + .mgmt_rsvd2cpu = mv88e6393x_port_mgmt_rsvd2cpu, + .pot_clear = mv88e6xxx_g2_pot_clear, + .reset = mv88e6352_g1_reset, + .rmu_disable = mv88e6390_g1_rmu_disable, + .vtu_getnext = mv88e6390_g1_vtu_getnext, + .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge, + .serdes_power = mv88e6393x_serdes_power, + .serdes_get_lane = mv88e6393x_serdes_get_lane, + .serdes_pcs_get_state = mv88e6390_serdes_pcs_get_state, + .serdes_irq_mapping = mv88e6390_serdes_irq_mapping, + .serdes_irq_enable = mv88e6393x_serdes_irq_enable, + .serdes_irq_status = mv88e6393x_serdes_irq_status, + .gpio_ops = &mv88e6352_gpio_ops, + .avb_ops = &mv88e6390_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, + .phylink_validate = mv88e6393x_phylink_validate, +}; +static const struct mv88e6xxx_ops mv88e6240_ops = {/* MV88E6XXX_FAMILY_6352 */ .ieee_pri_map = mv88e6085_g1_ieee_pri_map,
@@ -4838,6 +4905,52 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .ops = &mv88e6191_ops, }, + [MV88E6191X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6191X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6191X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, + + [MV88E6193X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6193X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6193X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, + [MV88E6220] = { .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6220, .family = MV88E6XXX_FAMILY_6250,
@@ -5128,6 +5241,29 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .ptp_support = true, .ops = &mv88e6390x_ops, }, + + [MV88E6393X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6393X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6393X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, };static const struct mv88e6xxx_info *mv88e6xxx_lookup_info (unsigned int prod_num)
drivers/net/dsa/mv88e6xxx/chip.h +4 -0
@@ -63,6 +63,8 @@ enum mv88e6xxx_model {MV88E6190 ,MV88E6190X ,MV88E6191 , +MV88E6191X , +MV88E6193X ,MV88E6220 ,MV88E6240 , MV88E6250,
@@ -75,6 +77,7 @@ enum mv88e6xxx_model {MV88E6352 ,MV88E6390 ,MV88E6390X , + MV88E6393X, }; enum mv88e6xxx_family {
@@ -90,6 +93,7 @@ enum mv88e6xxx_family {MV88E6XXX_FAMILY_6351 ,/* 6171 6175 6350 6351 */ MV88E6XXX_FAMILY_6352 ,/* 6172 6176 6240 6352 */ MV88E6XXX_FAMILY_6390 ,/* 6190 6190X 6191 6290 6390 6390X */ + MV88E6XXX_FAMILY_6393, /* 6191X 6193X 6393X */ };struct mv88e6xxx_ops ;
drivers/net/dsa/mv88e6xxx/global1.h +2 -0
@@ -22,6 +22,7 @@#define MV88E6185_G1_STS_PPU_STATE_DISABLED 0x8000#define MV88E6185_G1_STS_PPU_STATE_POLLING 0xc000#define MV88E6XXX_G1_STS_INIT_READY 0x0800 +#define MV88E6393X_G1_STS_IRQ_DEVICE_2 9#define MV88E6XXX_G1_STS_IRQ_AVB 8#define MV88E6XXX_G1_STS_IRQ_DEVICE 7#define MV88E6XXX_G1_STS_IRQ_STATS 6
@@ -59,6 +60,7 @@#define MV88E6185_G1_CTL1_SCHED_PRIO 0x0800#define MV88E6185_G1_CTL1_MAX_FRAME_1632 0x0400#define MV88E6185_G1_CTL1_RELOAD_EEPROM 0x0200 +#define MV88E6393X_G1_CTL1_DEVICE2_EN 0x0200#define MV88E6XXX_G1_CTL1_DEVICE_EN 0x0080#define MV88E6XXX_G1_CTL1_STATS_DONE_EN 0x0040#define MV88E6XXX_G1_CTL1_VTU_PROBLEM_EN 0x0020
drivers/net/dsa/mv88e6xxx/global2.h +8 -0
@@ -38,9 +38,15 @@/* Offset 0x02: MGMT Enable Register 2x */ #define MV88E6XXX_G2_MGMT_EN_2X 0x02 +/* Offset 0x02: MAC LINK change IRQ Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_SRC 0x02 +/* Offset 0x03: MGMT Enable Register 0x */ #define MV88E6XXX_G2_MGMT_EN_0X 0x03 +/* Offset 0x03: MAC LINK change IRQ Mask Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_MASK 0x03 +/* Offset 0x04: Flow Control Delay Register */ #define MV88E6XXX_G2_FLOW_CTL 0x04
@@ -52,6 +58,8 @@#define MV88E6XXX_G2_SWITCH_MGMT_FORCE_FLOW_CTL_PRI 0x0080#define MV88E6XXX_G2_SWITCH_MGMT_RSVD2CPU 0x0008 +#define MV88E6393X_G2_EGRESS_MONITOR_DEST 0x05 +/* Offset 0x06: Device Mapping Table Register */ #define MV88E6XXX_G2_DEVICE_MAPPING 0x06#define MV88E6XXX_G2_DEVICE_MAPPING_UPDATE 0x8000
drivers/net/dsa/mv88e6xxx/port.c +232 -2
282 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/port.h +41 -2
97 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.c +224 -0
239 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +39 -0
@@ -68,15 +68,47 @@#define MV88E6390_SGMII_PHY_STATUS_LINK BIT(10)#define MV88E6390_SGMII_PHY_STATUS_TX_PAUSE BIT(3)#define MV88E6390_SGMII_PHY_STATUS_RX_PAUSE BIT(2) +#define MV88E6390_SGMII_STATUS_AN_ABLE BIT(3) +#define MV88E6390_SGMII_ANAR 0x2004 +#define MV88E6390_SGMII_ANAR_1000BASEX_FD BIT(5) +#define MV88E6390_SGMII_CONTROL 0x2000 +#define MV88E6390_SGMII_CONTROL_RESET BIT(15) +#define MV88E6390_SGMII_CONTROL_LOOPBACK BIT(14) +#define MV88E6390_SGMII_CONTROL_PDOWN BIT(11) +#define MV88E6390_SGMII_STATUS 0x2001/* Packet generator pad packet checker */ #define MV88E6390_PG_CONTROL 0xf010#define MV88E6390_PG_CONTROL_ENABLE_PC BIT(0) +#define MV88E6393X_PORT0_LANE 0x00 +#define MV88E6393X_PORT9_LANE 0x09 +#define MV88E6393X_PORT10_LANE 0x0a + +/* Port Operational Configuration */ +#define MV88E6393X_PCS_SELECT_1000BASEX 0x0000 +#define MV88E6393X_PCS_SELECT_2500BASEX 0x0001 +#define MV88E6393X_PCS_SELECT_SGMII_PHY 0x0002 +#define MV88E6393X_PCS_SELECT_SGMII_MAC 0x0003 +#define MV88E6393X_PCS_SELECT_5GBASER 0x0004 +#define MV88E6393X_PCS_SELECT_10GBASER 0x0005 +#define MV88E6393X_PCS_SELECT_USXGMII_PHY 0x0006 +#define MV88E6393X_PCS_SELECT_USXGMII_MAC 0x0007 + +#define MV88E6393X_SERDES_POC 0xf002 +#define MV88E6393X_SERDES_POC_PCS_MODE_MASK 0x0007 +#define MV88E6393X_SERDES_POC_RESET BIT(15) +#define MV88E6393X_SERDES_POC_PDOWN BIT(5) +#define MV88E6393X_SERDES_POC_ANEG BIT(3) + +#define MV88E6393X_ERRATA_1000BASEX_SGMII 0xF074 +#define MV88E6393X_ERRATA_1000BASEX_SGMII_BIT BIT(14) +int mv88e6341_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);int mv88e6352_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);int mv88e6390_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);int mv88e6390x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port); +int mv88e6393x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port); int mv88e6352_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, int lane, unsigned int mode, phy_interface_t interface,
@@ -105,14 +137,21 @@ int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, int lane, bool on);int mv88e6390_serdes_power (struct mv88e6xxx_chip *chip,int port,int lane,bool on); +int mv88e6393x_serdes_power (struct mv88e6xxx_chip *chip,int port,int lane, +bool on); +int mv88e6393x_setup_errata (struct mv88e6xxx_chip *chip);int mv88e6352_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port,int lane,bool enable);int mv88e6390_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port,int lane,bool enable); +int mv88e6393x_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port, +int lane,bool enable);irqreturn_t mv88e6352_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,int lane);irqreturn_t mv88e6390_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,int lane); +irqreturn_t mv88e6393x_serdes_irq_status (struct mv88e6xxx_chip *chip,int port, +int lane);int mv88e6352_serdes_get_sset_count (struct mv88e6xxx_chip *chip,int port);int mv88e6352_serdes_get_strings (struct mv88e6xxx_chip *chip,int port,uint8_t *data);
Signature · 1 line
2.17.1
kernel test robot
build botRe: [PATCH v9 4/4] net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
Thank you for the patch! Perhaps something to improve:
Hi Pavana,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on robh/for-next]
[also build test WARNING on net-next/master net/master linus/master v5.10-rc4 next-20201119] [cannot apply to sparc-next/master]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Pavana-Sharma/Add-support-for-mv88e6393x-family-of-Marvell/20201119-160915 base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next config: sh-allmodconfig (attached as .config) compiler: sh4-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/2b347d8ede029475baf73ac8e08ea38dad2526e4
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Pavana-Sharma/Add-support-for-mv88e6393x-family-of-Marvell/20201119-160915 git checkout 2b347d8ede029475baf73ac8e08ea38dad2526e4
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=sh
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
drivers/net/dsa/mv88e6xxx/serdes.c: In function 'mv88e6393x_serdes_power':
>> drivers/net/dsa/mv88e6xxx/serdes.c:1212:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
1212 | u8 cmode = chip->ports[port].cmode;
| ^~vim +1212 drivers/net/dsa/mv88e6xxx/serdes.c
1205
1206 int mv88e6393x_serdes_power(struct mv88e6xxx_chip *chip, int port, int lane,
1207 bool on)
1208 {
1209 if (port != 0 && port != 9 && port != 10)
1210 return -EOPNOTSUPP;
1211
> 1212 u8 cmode = chip->ports[port].cmode;
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [PATCH v9 4/4] net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
In reply to Pavana SharmaThank you for the patch! Perhaps something to improve:
Hi Pavana,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on robh/for-next]
[also build test WARNING on net-next/master net/master linus/master v5.10-rc4 next-20201119] [cannot apply to sparc-next/master]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Pavana-Sharma/Add-support-for-mv88e6393x-family-of-Marvell/20201119-160915 base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next config: x86_64-randconfig-a004-20201119 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project b2613fb2f0f53691dd0211895afbb9413457fca7)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# https://github.com/0day-ci/linux/commit/2b347d8ede029475baf73ac8e08ea38dad2526e4
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Pavana-Sharma/Add-support-for-mv88e6393x-family-of-Marvell/20201119-160915 git checkout 2b347d8ede029475baf73ac8e08ea38dad2526e4
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/net/dsa/mv88e6xxx/serdes.c:1212:5: warning: ISO C90 forbids mixing declarations and code [-Wdeclaration-after-statement]
u8 cmode = chip->ports[port].cmode;
^1 warning generated.
vim +1212 drivers/net/dsa/mv88e6xxx/serdes.c
1205
1206 int mv88e6393x_serdes_power(struct mv88e6xxx_chip *chip, int port, int lane,
1207 bool on)
1208 {
1209 if (port != 0 && port != 9 && port != 10)
1210 return -EOPNOTSUPP;
1211
> 1212 u8 cmode = chip->ports[port].cmode;
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
v10 cover Add support for mv88e6393x family of Marvell
Updated patchset after fixing a warning.
Pavana Sharma (4):
dt-bindings: net: Add 5GBASER phy interface mode
net: phy: Add 5GBASER interface mode
net: dsa: mv88e6xxx: Change serdes lane parameter from u8 type to int
net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
.../bindings/net/ethernet-controller.yaml | 2 + drivers/net/dsa/mv88e6xxx/chip.c | 164 +++++++++- drivers/net/dsa/mv88e6xxx/chip.h | 20 +- drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 240 +++++++++++++- drivers/net/dsa/mv88e6xxx/port.h | 43 ++- drivers/net/dsa/mv88e6xxx/serdes.c | 298 +++++++++++++++--- drivers/net/dsa/mv88e6xxx/serdes.h | 93 ++++-- include/linux/phy.h | 5 + 10 files changed, 783 insertions(+), 92 deletions(-)
Signature · 1 line
2.17.1
PATCH v10 1/4 dt-bindings: net: Add 5GBASER phy interface mode
Add 5gbase-r PHY interface mode.
--- Documentation/devicetree/bindings/net/ethernet-controller.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/net/ethernet-controller.yaml +2 -0
@@ -89,6 +89,8 @@ properties: - trgmii - 1000base-x - 2500base-x + # 5GBASE-R + - 5gbase-r - rxaui - xaui
Signature · 1 line
2.17.1
Andrew Lunn
maintainerRe: [PATCH v10 1/4] dt-bindings: net: Add 5GBASER phy interface mode
Quoted 12 lines · Pavana Sharma
Add 5gbase-r PHY interface mode.
Signed-off-by Pavana Sharma <[email protected]>--- Documentation/devicetree/bindings/net/ethernet-controller.yaml | 2 ++ 1 file changed, 2 insertions(+)Documentation/devicetree/bindings/net/ethernet-controller.yaml +0
-0
Documentation/devicetree/bindings/net/ethernet-controller.yaml properties: · line 95
Quoted 7 lines
Documentation/devicetree/bindings/net/ethernet-controller.yaml +2
-0@@ -89,6 +89,8 @@ properties: - trgmii - 1000base-x - 2500base-x + # 5GBASE-R + - 5gbase-r - rxaui - xaui
Since you are respinning anyway. What value does the comment add?
Andrew
PATCH v10 2/4 net: phy: Add 5GBASER interface mode
In reply to Pavana SharmaAdd 5GBASE-R phy interface mode
--- include/linux/phy.h | 5 +++++ 1 file changed, 5 insertions(+)
include/linux/phy.h +5 -0
@@ -106,6 +106,7 @@ extern const int phy_10gbit_features_array[1];* @PHY_INTERFACE_MODE_TRGMII: Turbo RGMII * @PHY_INTERFACE_MODE_1000BASEX: 1000 BaseX * @PHY_INTERFACE_MODE_2500BASEX: 2500 BaseX +* @PHY_INTERFACE_MODE_5GBASER: 5G BaseR * @PHY_INTERFACE_MODE_RXAUI: Reduced XAUI * @PHY_INTERFACE_MODE_XAUI: 10 Gigabit Attachment Unit Interface * @PHY_INTERFACE_MODE_10GBASER: 10G BaseR
@@ -137,6 +138,8 @@ typedef enum {PHY_INTERFACE_MODE_TRGMII ,PHY_INTERFACE_MODE_1000BASEX ,PHY_INTERFACE_MODE_2500BASEX , +/* 5GBASE-R mode */ +PHY_INTERFACE_MODE_5GBASER ,PHY_INTERFACE_MODE_RXAUI , PHY_INTERFACE_MODE_XAUI,/* 10GBASE-R, XFI, SFI - single lane 10G Serdes */
@@ -215,6 +218,8 @@ static inline const char *phy_modes(phy_interface_t interface)return "1000base-x" ;case PHY_INTERFACE_MODE_2500BASEX :return "2500base-x" ; +case PHY_INTERFACE_MODE_5GBASER : +return "5gbase-r" ;case PHY_INTERFACE_MODE_RXAUI :return "rxaui" ;case PHY_INTERFACE_MODE_XAUI :
Signature · 1 line
2.17.1
Andrew Lunn
maintainerRe: [PATCH v10 2/4] net: phy: Add 5GBASER interface mode
Quoted 20 lines · Pavana Sharma
Add 5GBASE-R phy interface mode
Signed-off-by Pavana Sharma <[email protected]>--- include/linux/phy.h | 5 +++++ 1 file changed, 5 insertions(+)include/linux/phy.h +1
-0@@ -106,6 +106,7 @@ extern const int phy_10gbit_features_array[1];* @PHY_INTERFACE_MODE_TRGMII: Turbo RGMII * @PHY_INTERFACE_MODE_1000BASEX: 1000 BaseX * @PHY_INTERFACE_MODE_2500BASEX: 2500 BaseX +* @PHY_INTERFACE_MODE_5GBASER: 5G BaseR * @PHY_INTERFACE_MODE_RXAUI: Reduced XAUI * @PHY_INTERFACE_MODE_XAUI: 10 Gigabit Attachment Unit Interface * @PHY_INTERFACE_MODE_10GBASER: 10G BaseR
include/linux/phy.h typedef enum { · line 142
Quoted 5 lines
include/linux/phy.h +2
-0@@ -137,6 +138,8 @@ typedef enum {PHY_INTERFACE_MODE_TRGMII ,PHY_INTERFACE_MODE_1000BASEX ,PHY_INTERFACE_MODE_2500BASEX , +/* 5GBASE-R mode */ + PHY_INTERFACE_MODE_5GBASER,
Again, what is the value of the comment? 10GBASE-R has a comment because it is different from the rest, XFI and SFI caused a of discussion, and it was used wrong. But there does not seem to be anything special for 5GBASE-R.
Andrew
PATCH v10 3/4 net: dsa: mv88e6xxx: Change serdes lane parameter from u8 type to int
In reply to Pavana SharmaReturning 0 is no more an error case with MV88E6393 family which has serdes lane numbers 0, 9 or 10.
So with this change .serdes_get_lane will return lane number or -errno (-ENODEV or -EOPNOTSUPP).
--- drivers/net/dsa/mv88e6xxx/chip.c | 28 ++++++------ drivers/net/dsa/mv88e6xxx/chip.h | 16 +++---- drivers/net/dsa/mv88e6xxx/port.c | 6 +-- drivers/net/dsa/mv88e6xxx/serdes.c | 72 +++++++++++++++--------------- drivers/net/dsa/mv88e6xxx/serdes.h | 54 +++++++++++----------- 5 files changed, 88 insertions(+), 88 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +14 -14
@@ -485,12 +485,12 @@ static int mv88e6xxx_serdes_pcs_get_state(struct dsa_switch *ds, int port, struct phylink_link_state *state) {struct mv88e6xxx_chip *chip = ds->priv; -u8 lane; +int lane;int err;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane && chip->info->ops->serdes_pcs_get_state) +if (lane >=0 && chip->info->ops->serdes_pcs_get_state) err = chip->info->ops->serdes_pcs_get_state (chip, port, lane, state);else
@@ -506,11 +506,11 @@ static int mv88e6xxx_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, const unsigned long *advertise) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane;if (ops->serdes_pcs_config) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 )return ops->serdes_pcs_config (chip, port, lane, mode, interface, advertise); }
@@ -523,14 +523,14 @@ static void mv88e6xxx_serdes_pcs_an_restart(struct dsa_switch *ds, int port)struct mv88e6xxx_chip *chip = ds->priv;const struct mv88e6xxx_ops *ops;int err =0 ; -u8 lane; +int lane; ops = chip->info->ops;if (ops->serdes_pcs_an_restart) {mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 ) err = ops->serdes_pcs_an_restart (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -544,11 +544,11 @@ static int mv88e6xxx_serdes_pcs_link_up(struct mv88e6xxx_chip *chip, int port, int speed, int duplex) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane;if (!phylink_autoneg_inband (mode) && ops->serdes_pcs_link_up) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 )return ops->serdes_pcs_link_up (chip, port, lane, speed, duplex); }
@@ -2422,11 +2422,11 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id)struct mv88e6xxx_chip *chip = mvp->chip;irqreturn_t ret =IRQ_NONE ;int port = mvp->port; -u8 lane; +int lane;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 ) ret =mv88e6xxx_serdes_irq_status (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -2434,7 +2434,7 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id) }static int mv88e6xxx_serdes_irq_request (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq;
@@ -2463,7 +2463,7 @@ static int mv88e6xxx_serdes_irq_request(struct mv88e6xxx_chip *chip, int port, }static int mv88e6xxx_serdes_irq_free (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq = dev_id->serdes_irq;
@@ -2488,11 +2488,11 @@ static int mv88e6xxx_serdes_irq_free(struct mv88e6xxx_chip *chip, int port,static int mv88e6xxx_serdes_power (struct mv88e6xxx_chip *chip,int port,bool on) { -u8 lane; +int lane;int err; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) +if (lane <0 )return 0 ;if (on) {
drivers/net/dsa/mv88e6xxx/chip.h +8 -8
@@ -506,30 +506,30 @@ struct mv88e6xxx_ops {int (*mgmt_rsvd2cpu)(struct mv88e6xxx_chip *chip);/* Power on/off a SERDES interface */ -int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,int lane,bool up);/* SERDES lane mapping */ -u8 (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port); +int (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port);int (*serdes_pcs_get_state)(struct mv88e6xxx_chip *chip,int port, -u8 lane,struct phylink_link_state *state); +int lane,struct phylink_link_state *state);int (*serdes_pcs_config)(struct mv88e6xxx_chip *chip,int port, -u8 lane,unsigned int mode, +int lane,unsigned int mode,phy_interface_t interface,const unsigned long *advertise);int (*serdes_pcs_an_restart)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);int (*serdes_pcs_link_up)(struct mv88e6xxx_chip *chip,int port, -u8 lane,int speed,int duplex); +int lane,int speed,int duplex);/* SERDES interrupt handling */ unsigned int (*serdes_irq_mapping)(struct mv88e6xxx_chip *chip,int port); -int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,int lane,bool enable);irqreturn_t (*serdes_irq_status)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);/* Statistics from the SERDES interface */ int (*serdes_get_sset_count)(struct mv88e6xxx_chip *chip,int port);
drivers/net/dsa/mv88e6xxx/port.c +3 -3
@@ -393,8 +393,8 @@ phy_interface_t mv88e6390x_port_max_speed_mode(int port)static int mv88e6xxx_port_set_cmode (struct mv88e6xxx_chip *chip,int port,phy_interface_t mode,bool force) { -u8 lane;u16 cmode; +int lane;u16 reg;int err;
@@ -430,7 +430,7 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port,return 0 ; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) { +if (lane >=0 ) {if (chip->ports[port].serdes_irq) { err =mv88e6xxx_serdes_irq_disable (chip, port, lane);if (err)
@@ -459,7 +459,7 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port, chip->ports[port].cmode = cmode; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) +if (lane <0 )return -ENODEV ; err =mv88e6xxx_serdes_power_up (chip, port, lane);
drivers/net/dsa/mv88e6xxx/serdes.c +36 -36
274 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +27 -27
119 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH v10 3/4] net: dsa: mv88e6xxx: Change serdes lane parameter from u8 type to int
drivers/net/dsa/mv88e6xxx/port.c static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port, · line 463
Quoted 7 lines
drivers/net/dsa/mv88e6xxx/port.c +1
-1@@ -459,7 +459,7 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port, chip->ports[port].cmode = cmode; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) +if (lane <0 )return -ENODEV ;
return lane
since lane is an errno.
Other than that:
Andrew
PATCH v10 4/4 net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
In reply to Pavana SharmaThe Marvell 88E6393X device is a single-chip integration of a 11-port Ethernet switch with eight integrated Gigabit Ethernet (GbE) transceivers and three 10-Gigabit interfaces.
This patch adds functionalities specific to mv88e6393x family (88E6393X, 88E6193X and 88E6191X)
---
Changes in v2:
- Fix a warning (Reported-by: kernel test robot <[email protected]>)
Changes in v3:
- Fix 'unused function' warning
Changes in v4-v9:
- Incorporated feedback from maintainers.
Changes in v10:
- Fix ISO C90 forbids mixing declarations and code warning
--- drivers/net/dsa/mv88e6xxx/chip.c | 136 ++++++++++++++++ drivers/net/dsa/mv88e6xxx/chip.h | 4 + drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 234 +++++++++++++++++++++++++++- drivers/net/dsa/mv88e6xxx/port.h | 43 ++++- drivers/net/dsa/mv88e6xxx/serdes.c | 226 +++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/serdes.h | 39 +++++ 8 files changed, 688 insertions(+), 4 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +136 -0
@@ -635,6 +635,24 @@ static void mv88e6390x_phylink_validate(struct mv88e6xxx_chip *chip, int port,mv88e6390_phylink_validate (chip, port, mask, state); } +static void mv88e6393x_phylink_validate (struct mv88e6xxx_chip *chip,int port, +unsigned long *mask, +struct phylink_link_state *state) +{ +if (port ==0 || port ==9 || port ==10 ) { + phylink_set(mask, 10000baseT_Full); + phylink_set(mask, 10000baseKR_Full); + phylink_set(mask, 5000baseT_Full); + phylink_set(mask, 2500baseX_Full); + phylink_set(mask, 2500baseT_Full); + } + + phylink_set(mask, 1000baseT_Full); + phylink_set(mask, 1000baseX_Full); + +mv88e6065_phylink_validate (chip, port, mask, state); +} +static void mv88e6xxx_validate (struct dsa_switch *ds,int port,unsigned long *supported,struct phylink_link_state *state)
@@ -3906,6 +3924,55 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { .phylink_validate = mv88e6390_phylink_validate, }; +static const struct mv88e6xxx_ops mv88e6393x_ops = { +/* MV88E6XXX_FAMILY_6393 */ + .setup_errata = mv88e6393x_setup_errata, + .irl_init_all = mv88e6390_g2_irl_init_all, + .get_eeprom = mv88e6xxx_g2_get_eeprom8, + .set_eeprom = mv88e6xxx_g2_set_eeprom8, + .set_switch_mac = mv88e6xxx_g2_set_switch_mac, + .phy_read = mv88e6xxx_g2_smi_phy_read, + .phy_write = mv88e6xxx_g2_smi_phy_write, + .port_set_link = mv88e6xxx_port_set_link, + .port_set_speed_duplex = mv88e6393x_port_set_speed_duplex, + .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, + .port_tag_remap = mv88e6390_port_tag_remap, + .port_set_frame_mode = mv88e6351_port_set_frame_mode, + .port_set_egress_floods = mv88e6352_port_set_egress_floods, + .port_set_ether_type = mv88e6393x_port_set_ether_type, + .port_set_jumbo_size = mv88e6165_port_set_jumbo_size, + .port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting, + .port_pause_limit = mv88e6390_port_pause_limit, + .port_set_cmode = mv88e6393x_port_set_cmode, + .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit, + .port_disable_pri_override = mv88e6xxx_port_disable_pri_override, + .port_get_cmode = mv88e6352_port_get_cmode, + .stats_snapshot = mv88e6390_g1_stats_snapshot, + .stats_set_histogram = mv88e6390_g1_stats_set_histogram, + .stats_get_sset_count = mv88e6320_stats_get_sset_count, + .stats_get_strings = mv88e6320_stats_get_strings, + .stats_get_stats = mv88e6390_stats_get_stats, + .set_cpu_port = mv88e6393x_port_set_cpu_dest, + .set_egress_port = mv88e6393x_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, + .mgmt_rsvd2cpu = mv88e6393x_port_mgmt_rsvd2cpu, + .pot_clear = mv88e6xxx_g2_pot_clear, + .reset = mv88e6352_g1_reset, + .rmu_disable = mv88e6390_g1_rmu_disable, + .vtu_getnext = mv88e6390_g1_vtu_getnext, + .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge, + .serdes_power = mv88e6393x_serdes_power, + .serdes_get_lane = mv88e6393x_serdes_get_lane, + .serdes_pcs_get_state = mv88e6390_serdes_pcs_get_state, + .serdes_irq_mapping = mv88e6390_serdes_irq_mapping, + .serdes_irq_enable = mv88e6393x_serdes_irq_enable, + .serdes_irq_status = mv88e6393x_serdes_irq_status, + .gpio_ops = &mv88e6352_gpio_ops, + .avb_ops = &mv88e6390_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, + .phylink_validate = mv88e6393x_phylink_validate, +}; +static const struct mv88e6xxx_ops mv88e6240_ops = {/* MV88E6XXX_FAMILY_6352 */ .ieee_pri_map = mv88e6085_g1_ieee_pri_map,
@@ -4838,6 +4905,52 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .ops = &mv88e6191_ops, }, + [MV88E6191X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6191X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6191X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, + + [MV88E6193X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6193X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6193X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, + [MV88E6220] = { .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6220, .family = MV88E6XXX_FAMILY_6250,
@@ -5128,6 +5241,29 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .ptp_support = true, .ops = &mv88e6390x_ops, }, + + [MV88E6393X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6393X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6393X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, };static const struct mv88e6xxx_info *mv88e6xxx_lookup_info (unsigned int prod_num)
drivers/net/dsa/mv88e6xxx/chip.h +4 -0
@@ -63,6 +63,8 @@ enum mv88e6xxx_model {MV88E6190 ,MV88E6190X ,MV88E6191 , +MV88E6191X , +MV88E6193X ,MV88E6220 ,MV88E6240 , MV88E6250,
@@ -75,6 +77,7 @@ enum mv88e6xxx_model {MV88E6352 ,MV88E6390 ,MV88E6390X , + MV88E6393X, }; enum mv88e6xxx_family {
@@ -90,6 +93,7 @@ enum mv88e6xxx_family {MV88E6XXX_FAMILY_6351 ,/* 6171 6175 6350 6351 */ MV88E6XXX_FAMILY_6352 ,/* 6172 6176 6240 6352 */ MV88E6XXX_FAMILY_6390 ,/* 6190 6190X 6191 6290 6390 6390X */ + MV88E6XXX_FAMILY_6393, /* 6191X 6193X 6393X */ };struct mv88e6xxx_ops ;
drivers/net/dsa/mv88e6xxx/global1.h +2 -0
@@ -22,6 +22,7 @@#define MV88E6185_G1_STS_PPU_STATE_DISABLED 0x8000#define MV88E6185_G1_STS_PPU_STATE_POLLING 0xc000#define MV88E6XXX_G1_STS_INIT_READY 0x0800 +#define MV88E6393X_G1_STS_IRQ_DEVICE_2 9#define MV88E6XXX_G1_STS_IRQ_AVB 8#define MV88E6XXX_G1_STS_IRQ_DEVICE 7#define MV88E6XXX_G1_STS_IRQ_STATS 6
@@ -59,6 +60,7 @@#define MV88E6185_G1_CTL1_SCHED_PRIO 0x0800#define MV88E6185_G1_CTL1_MAX_FRAME_1632 0x0400#define MV88E6185_G1_CTL1_RELOAD_EEPROM 0x0200 +#define MV88E6393X_G1_CTL1_DEVICE2_EN 0x0200#define MV88E6XXX_G1_CTL1_DEVICE_EN 0x0080#define MV88E6XXX_G1_CTL1_STATS_DONE_EN 0x0040#define MV88E6XXX_G1_CTL1_VTU_PROBLEM_EN 0x0020
drivers/net/dsa/mv88e6xxx/global2.h +8 -0
@@ -38,9 +38,15 @@/* Offset 0x02: MGMT Enable Register 2x */ #define MV88E6XXX_G2_MGMT_EN_2X 0x02 +/* Offset 0x02: MAC LINK change IRQ Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_SRC 0x02 +/* Offset 0x03: MGMT Enable Register 0x */ #define MV88E6XXX_G2_MGMT_EN_0X 0x03 +/* Offset 0x03: MAC LINK change IRQ Mask Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_MASK 0x03 +/* Offset 0x04: Flow Control Delay Register */ #define MV88E6XXX_G2_FLOW_CTL 0x04
@@ -52,6 +58,8 @@#define MV88E6XXX_G2_SWITCH_MGMT_FORCE_FLOW_CTL_PRI 0x0080#define MV88E6XXX_G2_SWITCH_MGMT_RSVD2CPU 0x0008 +#define MV88E6393X_G2_EGRESS_MONITOR_DEST 0x05 +/* Offset 0x06: Device Mapping Table Register */ #define MV88E6XXX_G2_DEVICE_MAPPING 0x06#define MV88E6XXX_G2_DEVICE_MAPPING_UPDATE 0x8000
drivers/net/dsa/mv88e6xxx/port.c +232 -2
282 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/port.h +41 -2
97 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.c +226 -0
241 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +39 -0
@@ -68,15 +68,47 @@#define MV88E6390_SGMII_PHY_STATUS_LINK BIT(10)#define MV88E6390_SGMII_PHY_STATUS_TX_PAUSE BIT(3)#define MV88E6390_SGMII_PHY_STATUS_RX_PAUSE BIT(2) +#define MV88E6390_SGMII_STATUS_AN_ABLE BIT(3) +#define MV88E6390_SGMII_ANAR 0x2004 +#define MV88E6390_SGMII_ANAR_1000BASEX_FD BIT(5) +#define MV88E6390_SGMII_CONTROL 0x2000 +#define MV88E6390_SGMII_CONTROL_RESET BIT(15) +#define MV88E6390_SGMII_CONTROL_LOOPBACK BIT(14) +#define MV88E6390_SGMII_CONTROL_PDOWN BIT(11) +#define MV88E6390_SGMII_STATUS 0x2001/* Packet generator pad packet checker */ #define MV88E6390_PG_CONTROL 0xf010#define MV88E6390_PG_CONTROL_ENABLE_PC BIT(0) +#define MV88E6393X_PORT0_LANE 0x00 +#define MV88E6393X_PORT9_LANE 0x09 +#define MV88E6393X_PORT10_LANE 0x0a + +/* Port Operational Configuration */ +#define MV88E6393X_PCS_SELECT_1000BASEX 0x0000 +#define MV88E6393X_PCS_SELECT_2500BASEX 0x0001 +#define MV88E6393X_PCS_SELECT_SGMII_PHY 0x0002 +#define MV88E6393X_PCS_SELECT_SGMII_MAC 0x0003 +#define MV88E6393X_PCS_SELECT_5GBASER 0x0004 +#define MV88E6393X_PCS_SELECT_10GBASER 0x0005 +#define MV88E6393X_PCS_SELECT_USXGMII_PHY 0x0006 +#define MV88E6393X_PCS_SELECT_USXGMII_MAC 0x0007 + +#define MV88E6393X_SERDES_POC 0xf002 +#define MV88E6393X_SERDES_POC_PCS_MODE_MASK 0x0007 +#define MV88E6393X_SERDES_POC_RESET BIT(15) +#define MV88E6393X_SERDES_POC_PDOWN BIT(5) +#define MV88E6393X_SERDES_POC_ANEG BIT(3) + +#define MV88E6393X_ERRATA_1000BASEX_SGMII 0xF074 +#define MV88E6393X_ERRATA_1000BASEX_SGMII_BIT BIT(14) +int mv88e6341_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);int mv88e6352_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);int mv88e6390_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);int mv88e6390x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port); +int mv88e6393x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port); int mv88e6352_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, int lane, unsigned int mode, phy_interface_t interface,
@@ -105,14 +137,21 @@ int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, int lane, bool on);int mv88e6390_serdes_power (struct mv88e6xxx_chip *chip,int port,int lane,bool on); +int mv88e6393x_serdes_power (struct mv88e6xxx_chip *chip,int port,int lane, +bool on); +int mv88e6393x_setup_errata (struct mv88e6xxx_chip *chip);int mv88e6352_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port,int lane,bool enable);int mv88e6390_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port,int lane,bool enable); +int mv88e6393x_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port, +int lane,bool enable);irqreturn_t mv88e6352_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,int lane);irqreturn_t mv88e6390_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,int lane); +irqreturn_t mv88e6393x_serdes_irq_status (struct mv88e6xxx_chip *chip,int port, +int lane);int mv88e6352_serdes_get_sset_count (struct mv88e6xxx_chip *chip,int port);int mv88e6352_serdes_get_strings (struct mv88e6xxx_chip *chip,int port,uint8_t *data);
Signature · 1 line
2.17.1
Andrew Lunn
maintainerRe: [PATCH v10 4/4] net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
drivers/net/dsa/mv88e6xxx/port.c static int mv88e6xxx_port_set_speed_duplex(struct mv88e6xxx_chip *chip, · line 235
Quoted 8 lines
drivers/net/dsa/mv88e6xxx/port.c +2
-2@@ -222,8 +231,8 @@ static int mv88e6xxx_port_set_speed_duplex(struct mv88e6xxx_chip *chip,return err; reg &= ~(MV88E6XXX_PORT_MAC_CTL_SPEED_MASK | -MV88E6XXX_PORT_MAC_CTL_FORCE_DUPLEX | -MV88E6XXX_PORT_MAC_CTL_DUPLEX_FULL ); +MV88E6XXX_PORT_MAC_CTL_FORCE_DUPLEX | +MV88E6XXX_PORT_MAC_CTL_DUPLEX_FULL );
This looks like a white space change?
Quoted 11 lines
drivers/net/dsa/mv88e6xxx/port.c +5
-0if (alt_bit) reg &= ~MV88E6390_PORT_MAC_CTL_ALTSPEED ;@@ -390,6 +399,84 @@ phy_interface_t mv88e6390x_port_max_speed_mode(int port)return PHY_INTERFACE_MODE_NA ; } +/* Support 10, 100, 200, 1000, 2500, 5000, 10000 Mbps (e.g. 88E6393X) */ +int mv88e6393x_port_set_speed_duplex (struct mv88e6xxx_chip *chip,int port, +int speed,int duplex) +{ +u16 reg, ctrl;
drivers/net/dsa/mv88e6xxx/port.c phy_interface_t mv88e6390x_port_max_speed_mode(int port) · line 416
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/port.c +10
-0+int err; + +if (speed ==SPEED_MAX ) + speed = (port >0 && port <9 ) ?1000 :10000 ; + +if (speed ==200 && port !=0 ) +return -EOPNOTSUPP ; + +if (speed >=2500 && port >0 && port <9 ) +return -EOPNOTSUPP ;
Maybe i'm missing something, but it looks like at this point you can call
return mv88e6xxx_port_set_speed_duplex(chip, port, speed, true, true, duplex);
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/port.c +10
-0+/* Offset 0x0E: Policy & MGMT Control Register for FAMILY 6191X 6193X 6393X */ + +static int mv88e6393x_port_policy_write (struct mv88e6xxx_chip *chip,u16 pointer, +u8 data) +{ + +int err =0 ; +int port; +u16 reg; +
drivers/net/dsa/mv88e6xxx/port.c int mv88e6xxx_port_disable_pri_override(struct mv88e6xxx_chip *chip, int port) · line 1256
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/port.c +10
-0+/* Setup per Port policy register */ +for (port =0 ; port <mv88e6xxx_num_ports (chip); port++) { +if (dsa_is_unused_port (chip->ds, port)) +continue ; + +/* Prevent the use of an invalid port. */ +if (mv88e6xxx_is_invalid_port (chip, port)) { +dev_err (chip->dev,"port %d is invalid\n" , port); +return -EINVAL ; + }
/* Mark certain ports as invalid. This is required for example for the
* MV88E6220 (which is in general a MV88E6250 with 7 ports) but the
* ports 2-4 are not routed to pins.
*/
unsigned int invalid_port_mask;You have not set this in the info structure of the 6393x devices, so you can skip this check.
drivers/net/dsa/mv88e6xxx/serdes.c int mv88e6390x_serdes_get_lane(struct mv88e6xxx_chip *chip, int port) · line 537
Quoted 9 lines
drivers/net/dsa/mv88e6xxx/serdes.c +9
-0+/* Only Ports 0, 9 and 10 have SERDES lanes. Return the SERDES lane address +* a port is using else Returns -ENODEV. +*/ +int mv88e6393x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port) +{ +u8 cmode = chip->ports[port].cmode; +int lane = -ENODEV ; + +if (port ==0 || port ==9 || port ==10 ) {
Maybe
if (port != 0 && port != 9 && port == 10) return -ENODEV
drivers/net/dsa/mv88e6xxx/serdes.c int mv88e6390x_serdes_get_lane(struct mv88e6xxx_chip *chip, int port) · line 543
Quoted 6 lines
drivers/net/dsa/mv88e6xxx/serdes.c +6
-0+if (cmode ==MV88E6XXX_PORT_STS_CMODE_1000BASEX || + cmode ==MV88E6XXX_PORT_STS_CMODE_SGMII || + cmode ==MV88E6XXX_PORT_STS_CMODE_2500BASEX || + cmode ==MV88E6XXX_PORT_STS_CMODE_5GBASER || + cmode ==MV88E6XXX_PORT_STS_CMODE_10GBASER || + cmode ==MV88E6XXX_PORT_STS_CMODE_USXGMII )
Indentation is messed up.
drivers/net/dsa/mv88e6xxx/serdes.c int mv88e6390x_serdes_get_lane(struct mv88e6xxx_chip *chip, int port) · line 544
Quoted 1 line
drivers/net/dsa/mv88e6xxx/serdes.c +1
-0+ lane = port;
return port; Andrew
Re: [PATCH v10 4/4] net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
Hi Andrew,
Quoted 7 lines · On Fri, 20 Nov 2020 02:29:06 +0100 Andrew Lunn <[email protected]> wrote:
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (speed >= 2500 && port > 0 && port < 9) + return -EOPNOTSUPP;Maybe i'm missing something, but it looks like at this point you can call
return mv88e6xxx_port_set_speed_duplex(chip, port, speed, true, true, duplex);
He can't. That function does not support speed 5000. You can't simply add it, because it clashes with register value for speed 2500 on previous switches (Peridot, Topaz).
Amethyst reg val Peridot + Topaz reg val
2500 SPD_1000 | ALT_BIT SPD_10000 | ALT_BIT
5000 SPD_10000 | ALT_BIT not supported
10000 SPD_UNFORCED SPD_UNFORCED
When I sent my proposal for Amethyst I somehow did it, and you commented [1]:
Quoted 1 line
This is getting more and more complex. Maybe it is time to refactor it?
And I agree :)
Marek
Andrew Lunn
maintainerRe: [PATCH v10 4/4] net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
Quoted 13 lines · Marek Behun
Hi Andrew,
Quoted 7 lines · On Fri, 20 Nov 2020 02:29:06 +0100 Andrew Lunn <[email protected]> wrote:
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (speed >= 2500 && port > 0 && port < 9) + return -EOPNOTSUPP;Maybe i'm missing something, but it looks like at this point you can call
return mv88e6xxx_port_set_speed_duplex(chip, port, speed, true, true, duplex);
Quoted 8 lines
He can't. That function does not support speed 5000. You can't simply add it, because it clashes with register value for speed 2500 on previous switches (Peridot, Topaz).
Amethyst reg val Peridot + Topaz reg val
2500SPD_1000|ALT_BITSPD_10000|ALT_BIT
5000SPD_10000|ALT_BITnot supported
10000SPD_UNFORCEDSPD_UNFORCED
Hi Marek
O.K, as i said, i might be missing something :-)
I think a comment would be nice, pointing this out. Otherwise somebody might try refactoring it, and make the same mistake!
Andrew
v11 cover Add support for mv88e6393x family of Marvell
Updated patchset after incorporating feedback.
Pavana Sharma (4):
dt-bindings: net: Add 5GBASER phy interface mode
net: phy: Add 5GBASER interface mode
net: dsa: mv88e6xxx: Change serdes lane parameter type from u8 type
to int
net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
.../bindings/net/ethernet-controller.yaml | 2 + drivers/net/dsa/mv88e6xxx/chip.c | 164 +++++++++- drivers/net/dsa/mv88e6xxx/chip.h | 20 +- drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 238 +++++++++++++- drivers/net/dsa/mv88e6xxx/port.h | 43 ++- drivers/net/dsa/mv88e6xxx/serdes.c | 299 +++++++++++++++--- drivers/net/dsa/mv88e6xxx/serdes.h | 93 ++++-- include/linux/phy.h | 5 + 10 files changed, 783 insertions(+), 91 deletions(-)
Signature · 1 line
2.17.1
PATCH v11 1/4 dt-bindings: net: Add 5GBASER phy interface mode
Add 5gbase-r PHY interface mode.
--- Documentation/devicetree/bindings/net/ethernet-controller.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/net/ethernet-controller.yaml +2 -0
@@ -89,6 +89,8 @@ properties: - trgmii - 1000base-x - 2500base-x + # 5GBASE-R + - 5gbase-r - rxaui - xaui
Signature · 1 line
2.17.1
Andrew Lunn
maintainerRe: [PATCH v11 1/4] dt-bindings: net: Add 5GBASER phy interface mode
Quoted 12 lines · Pavana Sharma
Add 5gbase-r PHY interface mode.
Signed-off-by Pavana Sharma <[email protected]>--- Documentation/devicetree/bindings/net/ethernet-controller.yaml | 2 ++ 1 file changed, 2 insertions(+)Documentation/devicetree/bindings/net/ethernet-controller.yaml +0
-0
Documentation/devicetree/bindings/net/ethernet-controller.yaml properties: · line 95
Quoted 7 lines
Documentation/devicetree/bindings/net/ethernet-controller.yaml +2
-0@@ -89,6 +89,8 @@ properties: - trgmii - 1000base-x - 2500base-x + # 5GBASE-R + - 5gbase-r - rxaui - xaui
Hi Pavana
Quoted 1 line · For v10 i said:
What value does the comment add?
I don't remember you replying. Why is 5gbase-r special and it needs a comment, saying the same thing in CAPS LETTERS? What value is there in the CAPS LETTERS string?
Thanks
Andrew
PATCH v11 1/4 dt-bindings: net: Add 5GBASER phy interface mode
Hi Andrew,
Quoted 7 lines
Quoted 1 line · For v10 i said:
What value does the comment add?
I don't remember you replying. Why is 5gbase-r special and it needs a comment, saying the same thing in CAPS LETTERS? What value is there in the CAPS LETTERS string?
There isn't anything special regarding 5gbase-r apart from another supported speed.
So, I will remove the comment from [PATCH 1 & 2] and keep it similar to other (1000/2500) speed options.
Thanks,
Pavana
PATCH v11 2/4 net: phy: Add 5GBASER interface mode
In reply to Pavana SharmaAdd 5GBASE-R phy interface mode
--- include/linux/phy.h | 5 +++++ 1 file changed, 5 insertions(+)
include/linux/phy.h +5 -0
@@ -106,6 +106,7 @@ extern const int phy_10gbit_features_array[1];* @PHY_INTERFACE_MODE_TRGMII: Turbo RGMII * @PHY_INTERFACE_MODE_1000BASEX: 1000 BaseX * @PHY_INTERFACE_MODE_2500BASEX: 2500 BaseX +* @PHY_INTERFACE_MODE_5GBASER: 5G BaseR * @PHY_INTERFACE_MODE_RXAUI: Reduced XAUI * @PHY_INTERFACE_MODE_XAUI: 10 Gigabit Attachment Unit Interface * @PHY_INTERFACE_MODE_10GBASER: 10G BaseR
@@ -137,6 +138,8 @@ typedef enum {PHY_INTERFACE_MODE_TRGMII ,PHY_INTERFACE_MODE_1000BASEX ,PHY_INTERFACE_MODE_2500BASEX , +/* 5GBASE-R mode */ +PHY_INTERFACE_MODE_5GBASER ,PHY_INTERFACE_MODE_RXAUI , PHY_INTERFACE_MODE_XAUI,/* 10GBASE-R, XFI, SFI - single lane 10G Serdes */
@@ -207,6 +210,8 @@ static inline const char *phy_modes(phy_interface_t interface)return "1000base-x" ;case PHY_INTERFACE_MODE_2500BASEX :return "2500base-x" ; +case PHY_INTERFACE_MODE_5GBASER : +return "5gbase-r" ;case PHY_INTERFACE_MODE_RXAUI :return "rxaui" ;case PHY_INTERFACE_MODE_XAUI :
Signature · 1 line
2.17.1
Andrew Lunn
maintainerRe: [PATCH v11 2/4] net: phy: Add 5GBASER interface mode
Quoted 27 lines · Pavana Sharma
Add 5GBASE-R phy interface mode
Signed-off-by Pavana Sharma <[email protected]>--- include/linux/phy.h | 5 +++++ 1 file changed, 5 insertions(+)include/linux/phy.h +3
-0@@ -106,6 +106,7 @@ extern const int phy_10gbit_features_array[1];* @PHY_INTERFACE_MODE_TRGMII: Turbo RGMII * @PHY_INTERFACE_MODE_1000BASEX: 1000 BaseX * @PHY_INTERFACE_MODE_2500BASEX: 2500 BaseX +* @PHY_INTERFACE_MODE_5GBASER: 5G BaseR * @PHY_INTERFACE_MODE_RXAUI: Reduced XAUI * @PHY_INTERFACE_MODE_XAUI: 10 Gigabit Attachment Unit Interface * @PHY_INTERFACE_MODE_10GBASER: 10G BaseR @@ -137,6 +138,8 @@ typedef enum {PHY_INTERFACE_MODE_TRGMII ,PHY_INTERFACE_MODE_1000BASEX ,PHY_INTERFACE_MODE_2500BASEX , +/* 5GBASE-R mode */ +PHY_INTERFACE_MODE_5GBASER ,PHY_INTERFACE_MODE_RXAUI , PHY_INTERFACE_MODE_XAUI,
Quoted 4 lines · For v10 i said:
Again, what is the value of the comment? 10GBASE-R has a comment because it is different from the rest, XFI and SFI caused a of discussion, and it was used wrong. But there does not seem to be anything special for 5GBASE-R.
Please don't ignore comments. If you don't understand, please ask. If you think the comments are wrong, please explain why, so we can discuss it.
Andrew
PATCH v11 3/4 net: dsa: mv88e6xxx: Change serdes lane parameter type from u8 type to int
In reply to Pavana SharmaReturning 0 is no more an error case with MV88E6393 family which has serdes lane numbers 0, 9 or 10.
So with this change .serdes_get_lane will return lane number or -errno (-ENODEV or -EOPNOTSUPP).
--- drivers/net/dsa/mv88e6xxx/chip.c | 28 ++++++------ drivers/net/dsa/mv88e6xxx/chip.h | 16 +++---- drivers/net/dsa/mv88e6xxx/port.c | 8 ++-- drivers/net/dsa/mv88e6xxx/serdes.c | 72 +++++++++++++++--------------- drivers/net/dsa/mv88e6xxx/serdes.h | 54 +++++++++++----------- 5 files changed, 89 insertions(+), 89 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +14 -14
@@ -485,12 +485,12 @@ static int mv88e6xxx_serdes_pcs_get_state(struct dsa_switch *ds, int port, struct phylink_link_state *state) {struct mv88e6xxx_chip *chip = ds->priv; -u8 lane; +int lane;int err;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane && chip->info->ops->serdes_pcs_get_state) +if (lane >=0 && chip->info->ops->serdes_pcs_get_state) err = chip->info->ops->serdes_pcs_get_state (chip, port, lane, state);else
@@ -506,11 +506,11 @@ static int mv88e6xxx_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, const unsigned long *advertise) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane;if (ops->serdes_pcs_config) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 )return ops->serdes_pcs_config (chip, port, lane, mode, interface, advertise); }
@@ -523,14 +523,14 @@ static void mv88e6xxx_serdes_pcs_an_restart(struct dsa_switch *ds, int port)struct mv88e6xxx_chip *chip = ds->priv;const struct mv88e6xxx_ops *ops;int err =0 ; -u8 lane; +int lane; ops = chip->info->ops;if (ops->serdes_pcs_an_restart) {mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 ) err = ops->serdes_pcs_an_restart (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -544,11 +544,11 @@ static int mv88e6xxx_serdes_pcs_link_up(struct mv88e6xxx_chip *chip, int port, int speed, int duplex) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane;if (!phylink_autoneg_inband (mode) && ops->serdes_pcs_link_up) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 )return ops->serdes_pcs_link_up (chip, port, lane, speed, duplex); }
@@ -2424,11 +2424,11 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id)struct mv88e6xxx_chip *chip = mvp->chip;irqreturn_t ret =IRQ_NONE ;int port = mvp->port; -u8 lane; +int lane;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 ) ret =mv88e6xxx_serdes_irq_status (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -2436,7 +2436,7 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id) }static int mv88e6xxx_serdes_irq_request (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq;
@@ -2465,7 +2465,7 @@ static int mv88e6xxx_serdes_irq_request(struct mv88e6xxx_chip *chip, int port, }static int mv88e6xxx_serdes_irq_free (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq = dev_id->serdes_irq;
@@ -2490,11 +2490,11 @@ static int mv88e6xxx_serdes_irq_free(struct mv88e6xxx_chip *chip, int port,static int mv88e6xxx_serdes_power (struct mv88e6xxx_chip *chip,int port,bool on) { -u8 lane; +int lane;int err; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) +if (lane <0 )return 0 ;if (on) {
drivers/net/dsa/mv88e6xxx/chip.h +8 -8
@@ -506,30 +506,30 @@ struct mv88e6xxx_ops {int (*mgmt_rsvd2cpu)(struct mv88e6xxx_chip *chip);/* Power on/off a SERDES interface */ -int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,int lane,bool up);/* SERDES lane mapping */ -u8 (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port); +int (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port);int (*serdes_pcs_get_state)(struct mv88e6xxx_chip *chip,int port, -u8 lane,struct phylink_link_state *state); +int lane,struct phylink_link_state *state);int (*serdes_pcs_config)(struct mv88e6xxx_chip *chip,int port, -u8 lane,unsigned int mode, +int lane,unsigned int mode,phy_interface_t interface,const unsigned long *advertise);int (*serdes_pcs_an_restart)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);int (*serdes_pcs_link_up)(struct mv88e6xxx_chip *chip,int port, -u8 lane,int speed,int duplex); +int lane,int speed,int duplex);/* SERDES interrupt handling */ unsigned int (*serdes_irq_mapping)(struct mv88e6xxx_chip *chip,int port); -int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,int lane,bool enable);irqreturn_t (*serdes_irq_status)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);/* Statistics from the SERDES interface */ int (*serdes_get_sset_count)(struct mv88e6xxx_chip *chip,int port);
drivers/net/dsa/mv88e6xxx/port.c +4 -4
@@ -393,8 +393,8 @@ phy_interface_t mv88e6390x_port_max_speed_mode(int port)static int mv88e6xxx_port_set_cmode (struct mv88e6xxx_chip *chip,int port,phy_interface_t mode,bool force) { -u8 lane;u16 cmode; +int lane;u16 reg;int err;
@@ -430,7 +430,7 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port,return 0 ; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) { +if (lane >=0 ) {if (chip->ports[port].serdes_irq) { err =mv88e6xxx_serdes_irq_disable (chip, port, lane);if (err)
@@ -459,8 +459,8 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port, chip->ports[port].cmode = cmode; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) -return -ENODEV ; +if (lane <0 ) +return lane; err =mv88e6xxx_serdes_power_up (chip, port, lane);if (err)
drivers/net/dsa/mv88e6xxx/serdes.c +36 -36
274 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +27 -27
119 lines not on this page · raw message
Signature · 1 line
2.17.1
Andrew Lunn
maintainerRe: [PATCH v11 3/4] net: dsa: mv88e6xxx: Change serdes lane parameter type from u8 type to int
Quoted 7 lines · Pavana Sharma
Returning 0 is no more an error case with MV88E6393 family which has serdes lane numbers 0, 9 or 10.
So with this change .serdes_get_lane will return lane number or -errno (-ENODEVor-EOPNOTSUPP).Signed-off-by Pavana Sharma <[email protected]>
I see here you did actually act on my comment. Thanks.
Quoted 3 lines · But i also
Other than that:
Reviewed-by Andrew Lunn <[email protected]>
Please add such tags to new versions of the patches. It then makes it easier for everybody to know the review state of the patches, which have been reviewed and deemed O.K, and which need more review.
Thanks
Andrew
PATCH v11 4/4 net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
In reply to Pavana SharmaThe Marvell 88E6393X device is a single-chip integration of a 11-port Ethernet switch with eight integrated Gigabit Ethernet (GbE) transceivers and three 10-Gigabit interfaces.
This patch adds functionalities specific to mv88e6393x family (88E6393X, 88E6193X and 88E6191X)
---
Changes in v2:
- Fix a warning (Reported-by: kernel test robot <[email protected]>)
Changes in v3:
- Fix 'unused function' warning
Changes in v4-v9:
- Incorporated feedback from maintainers.
Changes in v10:
- Fix ISO C90 forbids mixing declarations and code warning
Changes in v11:
- Add comment for clarity, regarding configuring speed 5000 (supported
by mv88e6393x family) --- drivers/net/dsa/mv88e6xxx/chip.c | 136 ++++++++++++++++ drivers/net/dsa/mv88e6xxx/chip.h | 4 + drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 230 ++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/port.h | 43 +++++- drivers/net/dsa/mv88e6xxx/serdes.c | 227 +++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/serdes.h | 39 +++++ 8 files changed, 687 insertions(+), 2 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +136 -0
@@ -635,6 +635,24 @@ static void mv88e6390x_phylink_validate(struct mv88e6xxx_chip *chip, int port,mv88e6390_phylink_validate (chip, port, mask, state); } +static void mv88e6393x_phylink_validate (struct mv88e6xxx_chip *chip,int port, +unsigned long *mask, +struct phylink_link_state *state) +{ +if (port ==0 || port ==9 || port ==10 ) { + phylink_set(mask, 10000baseT_Full); + phylink_set(mask, 10000baseKR_Full); + phylink_set(mask, 5000baseT_Full); + phylink_set(mask, 2500baseX_Full); + phylink_set(mask, 2500baseT_Full); + } + + phylink_set(mask, 1000baseT_Full); + phylink_set(mask, 1000baseX_Full); + +mv88e6065_phylink_validate (chip, port, mask, state); +} +static void mv88e6xxx_validate (struct dsa_switch *ds,int port,unsigned long *supported,struct phylink_link_state *state)
@@ -3908,6 +3926,55 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { .phylink_validate = mv88e6390_phylink_validate, }; +static const struct mv88e6xxx_ops mv88e6393x_ops = { +/* MV88E6XXX_FAMILY_6393 */ + .setup_errata = mv88e6393x_setup_errata, + .irl_init_all = mv88e6390_g2_irl_init_all, + .get_eeprom = mv88e6xxx_g2_get_eeprom8, + .set_eeprom = mv88e6xxx_g2_set_eeprom8, + .set_switch_mac = mv88e6xxx_g2_set_switch_mac, + .phy_read = mv88e6xxx_g2_smi_phy_read, + .phy_write = mv88e6xxx_g2_smi_phy_write, + .port_set_link = mv88e6xxx_port_set_link, + .port_set_speed_duplex = mv88e6393x_port_set_speed_duplex, + .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, + .port_tag_remap = mv88e6390_port_tag_remap, + .port_set_frame_mode = mv88e6351_port_set_frame_mode, + .port_set_egress_floods = mv88e6352_port_set_egress_floods, + .port_set_ether_type = mv88e6393x_port_set_ether_type, + .port_set_jumbo_size = mv88e6165_port_set_jumbo_size, + .port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting, + .port_pause_limit = mv88e6390_port_pause_limit, + .port_set_cmode = mv88e6393x_port_set_cmode, + .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit, + .port_disable_pri_override = mv88e6xxx_port_disable_pri_override, + .port_get_cmode = mv88e6352_port_get_cmode, + .stats_snapshot = mv88e6390_g1_stats_snapshot, + .stats_set_histogram = mv88e6390_g1_stats_set_histogram, + .stats_get_sset_count = mv88e6320_stats_get_sset_count, + .stats_get_strings = mv88e6320_stats_get_strings, + .stats_get_stats = mv88e6390_stats_get_stats, + .set_cpu_port = mv88e6393x_port_set_cpu_dest, + .set_egress_port = mv88e6393x_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, + .mgmt_rsvd2cpu = mv88e6393x_port_mgmt_rsvd2cpu, + .pot_clear = mv88e6xxx_g2_pot_clear, + .reset = mv88e6352_g1_reset, + .rmu_disable = mv88e6390_g1_rmu_disable, + .vtu_getnext = mv88e6390_g1_vtu_getnext, + .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge, + .serdes_power = mv88e6393x_serdes_power, + .serdes_get_lane = mv88e6393x_serdes_get_lane, + .serdes_pcs_get_state = mv88e6390_serdes_pcs_get_state, + .serdes_irq_mapping = mv88e6390_serdes_irq_mapping, + .serdes_irq_enable = mv88e6393x_serdes_irq_enable, + .serdes_irq_status = mv88e6393x_serdes_irq_status, + .gpio_ops = &mv88e6352_gpio_ops, + .avb_ops = &mv88e6390_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, + .phylink_validate = mv88e6393x_phylink_validate, +}; +static const struct mv88e6xxx_ops mv88e6240_ops = {/* MV88E6XXX_FAMILY_6352 */ .ieee_pri_map = mv88e6085_g1_ieee_pri_map,
@@ -4840,6 +4907,52 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .ops = &mv88e6191_ops, }, + [MV88E6191X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6191X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6191X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, + + [MV88E6193X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6193X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6193X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, + [MV88E6220] = { .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6220, .family = MV88E6XXX_FAMILY_6250,
@@ -5130,6 +5243,29 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .ptp_support = true, .ops = &mv88e6390x_ops, }, + + [MV88E6393X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6393X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6393X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, };static const struct mv88e6xxx_info *mv88e6xxx_lookup_info (unsigned int prod_num)
drivers/net/dsa/mv88e6xxx/chip.h +4 -0
@@ -63,6 +63,8 @@ enum mv88e6xxx_model {MV88E6190 ,MV88E6190X ,MV88E6191 , +MV88E6191X , +MV88E6193X ,MV88E6220 ,MV88E6240 , MV88E6250,
@@ -75,6 +77,7 @@ enum mv88e6xxx_model {MV88E6352 ,MV88E6390 ,MV88E6390X , + MV88E6393X, }; enum mv88e6xxx_family {
@@ -90,6 +93,7 @@ enum mv88e6xxx_family {MV88E6XXX_FAMILY_6351 ,/* 6171 6175 6350 6351 */ MV88E6XXX_FAMILY_6352 ,/* 6172 6176 6240 6352 */ MV88E6XXX_FAMILY_6390 ,/* 6190 6190X 6191 6290 6390 6390X */ + MV88E6XXX_FAMILY_6393, /* 6191X 6193X 6393X */ };struct mv88e6xxx_ops ;
drivers/net/dsa/mv88e6xxx/global1.h +2 -0
@@ -22,6 +22,7 @@#define MV88E6185_G1_STS_PPU_STATE_DISABLED 0x8000#define MV88E6185_G1_STS_PPU_STATE_POLLING 0xc000#define MV88E6XXX_G1_STS_INIT_READY 0x0800 +#define MV88E6393X_G1_STS_IRQ_DEVICE_2 9#define MV88E6XXX_G1_STS_IRQ_AVB 8#define MV88E6XXX_G1_STS_IRQ_DEVICE 7#define MV88E6XXX_G1_STS_IRQ_STATS 6
@@ -59,6 +60,7 @@#define MV88E6185_G1_CTL1_SCHED_PRIO 0x0800#define MV88E6185_G1_CTL1_MAX_FRAME_1632 0x0400#define MV88E6185_G1_CTL1_RELOAD_EEPROM 0x0200 +#define MV88E6393X_G1_CTL1_DEVICE2_EN 0x0200#define MV88E6XXX_G1_CTL1_DEVICE_EN 0x0080#define MV88E6XXX_G1_CTL1_STATS_DONE_EN 0x0040#define MV88E6XXX_G1_CTL1_VTU_PROBLEM_EN 0x0020
drivers/net/dsa/mv88e6xxx/global2.h +8 -0
@@ -38,9 +38,15 @@/* Offset 0x02: MGMT Enable Register 2x */ #define MV88E6XXX_G2_MGMT_EN_2X 0x02 +/* Offset 0x02: MAC LINK change IRQ Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_SRC 0x02 +/* Offset 0x03: MGMT Enable Register 0x */ #define MV88E6XXX_G2_MGMT_EN_0X 0x03 +/* Offset 0x03: MAC LINK change IRQ Mask Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_MASK 0x03 +/* Offset 0x04: Flow Control Delay Register */ #define MV88E6XXX_G2_FLOW_CTL 0x04
@@ -52,6 +58,8 @@#define MV88E6XXX_G2_SWITCH_MGMT_FORCE_FLOW_CTL_PRI 0x0080#define MV88E6XXX_G2_SWITCH_MGMT_RSVD2CPU 0x0008 +#define MV88E6393X_G2_EGRESS_MONITOR_DEST 0x05 +/* Offset 0x06: Device Mapping Table Register */ #define MV88E6XXX_G2_DEVICE_MAPPING 0x06#define MV88E6XXX_G2_DEVICE_MAPPING_UPDATE 0x8000
drivers/net/dsa/mv88e6xxx/port.c +230 -0
272 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/port.h +41 -2
97 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.c +227 -0
242 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +39 -0
@@ -68,15 +68,47 @@#define MV88E6390_SGMII_PHY_STATUS_LINK BIT(10)#define MV88E6390_SGMII_PHY_STATUS_TX_PAUSE BIT(3)#define MV88E6390_SGMII_PHY_STATUS_RX_PAUSE BIT(2) +#define MV88E6390_SGMII_STATUS_AN_ABLE BIT(3) +#define MV88E6390_SGMII_ANAR 0x2004 +#define MV88E6390_SGMII_ANAR_1000BASEX_FD BIT(5) +#define MV88E6390_SGMII_CONTROL 0x2000 +#define MV88E6390_SGMII_CONTROL_RESET BIT(15) +#define MV88E6390_SGMII_CONTROL_LOOPBACK BIT(14) +#define MV88E6390_SGMII_CONTROL_PDOWN BIT(11) +#define MV88E6390_SGMII_STATUS 0x2001/* Packet generator pad packet checker */ #define MV88E6390_PG_CONTROL 0xf010#define MV88E6390_PG_CONTROL_ENABLE_PC BIT(0) +#define MV88E6393X_PORT0_LANE 0x00 +#define MV88E6393X_PORT9_LANE 0x09 +#define MV88E6393X_PORT10_LANE 0x0a + +/* Port Operational Configuration */ +#define MV88E6393X_PCS_SELECT_1000BASEX 0x0000 +#define MV88E6393X_PCS_SELECT_2500BASEX 0x0001 +#define MV88E6393X_PCS_SELECT_SGMII_PHY 0x0002 +#define MV88E6393X_PCS_SELECT_SGMII_MAC 0x0003 +#define MV88E6393X_PCS_SELECT_5GBASER 0x0004 +#define MV88E6393X_PCS_SELECT_10GBASER 0x0005 +#define MV88E6393X_PCS_SELECT_USXGMII_PHY 0x0006 +#define MV88E6393X_PCS_SELECT_USXGMII_MAC 0x0007 + +#define MV88E6393X_SERDES_POC 0xf002 +#define MV88E6393X_SERDES_POC_PCS_MODE_MASK 0x0007 +#define MV88E6393X_SERDES_POC_RESET BIT(15) +#define MV88E6393X_SERDES_POC_PDOWN BIT(5) +#define MV88E6393X_SERDES_POC_ANEG BIT(3) + +#define MV88E6393X_ERRATA_1000BASEX_SGMII 0xF074 +#define MV88E6393X_ERRATA_1000BASEX_SGMII_BIT BIT(14) +int mv88e6341_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);int mv88e6352_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);int mv88e6390_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);int mv88e6390x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port); +int mv88e6393x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port); int mv88e6352_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, int lane, unsigned int mode, phy_interface_t interface,
@@ -105,14 +137,21 @@ int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, int lane, bool on);int mv88e6390_serdes_power (struct mv88e6xxx_chip *chip,int port,int lane,bool on); +int mv88e6393x_serdes_power (struct mv88e6xxx_chip *chip,int port,int lane, +bool on); +int mv88e6393x_setup_errata (struct mv88e6xxx_chip *chip);int mv88e6352_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port,int lane,bool enable);int mv88e6390_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port,int lane,bool enable); +int mv88e6393x_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port, +int lane,bool enable);irqreturn_t mv88e6352_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,int lane);irqreturn_t mv88e6390_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,int lane); +irqreturn_t mv88e6393x_serdes_irq_status (struct mv88e6xxx_chip *chip,int port, +int lane);int mv88e6352_serdes_get_sset_count (struct mv88e6xxx_chip *chip,int port);int mv88e6352_serdes_get_strings (struct mv88e6xxx_chip *chip,int port,uint8_t *data);
Signature · 1 line
2.17.1
Andrew Lunn
maintainerRe: [PATCH v11 4/4] net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
Quoted 5 lines
+/* Support 10, 100, 200, 1000, 2500, 5000, 10000 Mbps (e.g. 88E6393X)
+ * This function adds new speed 5000 supported by Amethyst family.
+ * Functionmv88e6xxx_port_set_speed_duplex()can't be used as the register
+ * values for speeds 2500 & 5000 conflict.
+ */
Thanks, that should stop my or somebody else trying to wrong combine them.
drivers/net/dsa/mv88e6xxx/port.c int mv88e6xxx_port_disable_pri_override(struct mv88e6xxx_chip *chip, int port) · line 1336
Quoted 8 lines
drivers/net/dsa/mv88e6xxx/port.c +8
-0+/* Offset 0x10 & 0x11: EPC */ + +static int mv88e6393x_epc_wait_ready (struct mv88e6xxx_chip *chip,int port) +{ +int bit =__bf_shf (MV88E6393X_PORT_EPC_CMD_BUSY ); + +return mv88e6xxx_port_wait_bit (chip, port,MV88E6393X_PORT_EPC_CMD , bit,0 ); +}
To follow the naming convention, this should really be called mv88e6393x_port_epc_wait_ready
drivers/net/dsa/mv88e6xxx/serdes.c static int mv88e6390_serdes_irq_status_sgmii(struct mv88e6xxx_chip *chip, · line 941
Quoted 2 lines
drivers/net/dsa/mv88e6xxx/serdes.c +2
-0+int mv88e6393x_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port, +int lane,bool enable)
It can be hard to tell in a diff, but the indentation looks wrong here. 'int lane' should line up with 'struct'.
Quoted 8 lines
drivers/net/dsa/mv88e6xxx/serdes.c +8
-0+{ +u8 cmode = chip->ports[port].cmode; +int err =0 ; + +switch (cmode) { +case MV88E6XXX_PORT_STS_CMODE_SGMII : +case MV88E6XXX_PORT_STS_CMODE_1000BASEX : +case MV88E6XXX_PORT_STS_CMODE_2500BASEX :
drivers/net/dsa/mv88e6xxx/serdes.c static int mv88e6390_serdes_irq_status_sgmii(struct mv88e6xxx_chip *chip, · line 959
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/serdes.c +10
-0+case MV88E6XXX_PORT_STS_CMODE_5GBASER : +case MV88E6XXX_PORT_STS_CMODE_10GBASER : + err =mv88e6390_serdes_irq_enable_sgmii (chip, lane, enable); + } + +return err; +} + +irqreturn_t mv88e6393x_serdes_irq_status (struct mv88e6xxx_chip *chip,int port, +int lane)
Maybe here as well?
Quoted 1 line
+int
mv88e6393x_setup_errata(struct mv88e6xxx_chip *chip)
It should have _serdes_ in the name to follow the naming convention.
Andrew
Jakub Kicinski
maintainerRe: [PATCH v11 0/4] Add support for mv88e6393x family of Marvell
In reply to Pavana SharmaQuoted 1 line · On Wed, 9 Dec 2020 15:02:54 +1000 Pavana Sharma wrote:
Updated patchset after incorporating feedback.
This set does not apply to net-next. Please rebase.
v12 cover Add support for mv88e6393x family of Marvell
Updated patchset after rebasing and incorporating feedback.
Pavana Sharma (4):
dt-bindings: net: Add 5GBASER phy interface mode
net: phy: Add 5GBASER interface mode
net: dsa: mv88e6xxx: Change serdes lane parameter type from u8 type
to int
net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
.../bindings/net/ethernet-controller.yaml | 1 + drivers/net/dsa/mv88e6xxx/chip.c | 164 +++++++++- drivers/net/dsa/mv88e6xxx/chip.h | 20 +- drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 238 +++++++++++++- drivers/net/dsa/mv88e6xxx/port.h | 43 ++- drivers/net/dsa/mv88e6xxx/serdes.c | 309 +++++++++++++++--- drivers/net/dsa/mv88e6xxx/serdes.h | 103 ++++-- include/linux/phy.h | 4 + 10 files changed, 791 insertions(+), 101 deletions(-)
Signature · 1 line
2.17.1
PATCH v12 1/4 dt-bindings: net: Add 5GBASER phy interface mode
Add 5gbase-r PHY interface mode.
--- Documentation/devicetree/bindings/net/ethernet-controller.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/net/ethernet-controller.yaml +1 -0
@@ -89,6 +89,7 @@ properties: - trgmii - 1000base-x - 2500base-x + - 5gbase-r - rxaui - xaui
Signature · 1 line
2.17.1
Re: [net-next PATCH v12 1/4] dt-bindings: net: Add 5GBASER phy interface mode
Quoted 7 lines · Pavana Sharma
Add 5gbase-r PHY interface mode.
Signed-off-by Pavana Sharma <[email protected]>--- Documentation/devicetree/bindings/net/ethernet-controller.yaml | 1 + 1 file changed, 1 insertion(+)
PATCH v12 2/4 net: phy: Add 5GBASER interface mode
In reply to Pavana SharmaAdd 5GBASE-R phy interface mode
--- include/linux/phy.h | 4 ++++ 1 file changed, 4 insertions(+)
include/linux/phy.h +4 -0
@@ -106,6 +106,7 @@ extern const int phy_10gbit_features_array[1];* @PHY_INTERFACE_MODE_TRGMII: Turbo RGMII * @PHY_INTERFACE_MODE_1000BASEX: 1000 BaseX * @PHY_INTERFACE_MODE_2500BASEX: 2500 BaseX +* @PHY_INTERFACE_MODE_5GBASER: 5G BaseR * @PHY_INTERFACE_MODE_RXAUI: Reduced XAUI * @PHY_INTERFACE_MODE_XAUI: 10 Gigabit Attachment Unit Interface * @PHY_INTERFACE_MODE_10GBASER: 10G BaseR
@@ -137,6 +138,7 @@ typedef enum {PHY_INTERFACE_MODE_TRGMII ,PHY_INTERFACE_MODE_1000BASEX ,PHY_INTERFACE_MODE_2500BASEX , +PHY_INTERFACE_MODE_5GBASER ,PHY_INTERFACE_MODE_RXAUI , PHY_INTERFACE_MODE_XAUI,/* 10GBASE-R, XFI, SFI - single lane 10G Serdes */
@@ -207,6 +209,8 @@ static inline const char *phy_modes(phy_interface_t interface)return "1000base-x" ;case PHY_INTERFACE_MODE_2500BASEX :return "2500base-x" ; +case PHY_INTERFACE_MODE_5GBASER : +return "5gbase-r" ;case PHY_INTERFACE_MODE_RXAUI :return "rxaui" ;case PHY_INTERFACE_MODE_XAUI :
Signature · 1 line
2.17.1
PATCH v12 3/4 net: dsa: mv88e6xxx: Change serdes lane parameter type from u8 type to int
In reply to Pavana SharmaReturning 0 is no more an error case with MV88E6393 family which has serdes lane numbers 0, 9 or 10.
So with this change .serdes_get_lane will return lane number or -errno (-ENODEV or -EOPNOTSUPP).
--- drivers/net/dsa/mv88e6xxx/chip.c | 28 +++++----- drivers/net/dsa/mv88e6xxx/chip.h | 16 +++--- drivers/net/dsa/mv88e6xxx/port.c | 8 +-- drivers/net/dsa/mv88e6xxx/serdes.c | 82 +++++++++++++++--------------- drivers/net/dsa/mv88e6xxx/serdes.h | 64 +++++++++++------------ 5 files changed, 99 insertions(+), 99 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +14 -14
@@ -485,12 +485,12 @@ static int mv88e6xxx_serdes_pcs_get_state(struct dsa_switch *ds, int port, struct phylink_link_state *state) {struct mv88e6xxx_chip *chip = ds->priv; -u8 lane; +int lane;int err;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane && chip->info->ops->serdes_pcs_get_state) +if (lane >=0 && chip->info->ops->serdes_pcs_get_state) err = chip->info->ops->serdes_pcs_get_state (chip, port, lane, state);else
@@ -506,11 +506,11 @@ static int mv88e6xxx_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, const unsigned long *advertise) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane;if (ops->serdes_pcs_config) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 )return ops->serdes_pcs_config (chip, port, lane, mode, interface, advertise); }
@@ -523,14 +523,14 @@ static void mv88e6xxx_serdes_pcs_an_restart(struct dsa_switch *ds, int port)struct mv88e6xxx_chip *chip = ds->priv;const struct mv88e6xxx_ops *ops;int err =0 ; -u8 lane; +int lane; ops = chip->info->ops;if (ops->serdes_pcs_an_restart) {mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 ) err = ops->serdes_pcs_an_restart (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -544,11 +544,11 @@ static int mv88e6xxx_serdes_pcs_link_up(struct mv88e6xxx_chip *chip, int port, int speed, int duplex) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane;if (!phylink_autoneg_inband (mode) && ops->serdes_pcs_link_up) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 )return ops->serdes_pcs_link_up (chip, port, lane, speed, duplex); }
@@ -2424,11 +2424,11 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id)struct mv88e6xxx_chip *chip = mvp->chip;irqreturn_t ret =IRQ_NONE ;int port = mvp->port; -u8 lane; +int lane;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 ) ret =mv88e6xxx_serdes_irq_status (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -2436,7 +2436,7 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id) }static int mv88e6xxx_serdes_irq_request (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq;
@@ -2465,7 +2465,7 @@ static int mv88e6xxx_serdes_irq_request(struct mv88e6xxx_chip *chip, int port, }static int mv88e6xxx_serdes_irq_free (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq = dev_id->serdes_irq;
@@ -2490,11 +2490,11 @@ static int mv88e6xxx_serdes_irq_free(struct mv88e6xxx_chip *chip, int port,static int mv88e6xxx_serdes_power (struct mv88e6xxx_chip *chip,int port,bool on) { -u8 lane; +int lane;int err; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) +if (lane <0 )return 0 ;if (on) {
drivers/net/dsa/mv88e6xxx/chip.h +8 -8
@@ -511,30 +511,30 @@ struct mv88e6xxx_ops {int (*mgmt_rsvd2cpu)(struct mv88e6xxx_chip *chip);/* Power on/off a SERDES interface */ -int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,int lane,bool up);/* SERDES lane mapping */ -u8 (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port); +int (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port);int (*serdes_pcs_get_state)(struct mv88e6xxx_chip *chip,int port, -u8 lane,struct phylink_link_state *state); +int lane,struct phylink_link_state *state);int (*serdes_pcs_config)(struct mv88e6xxx_chip *chip,int port, -u8 lane,unsigned int mode, +int lane,unsigned int mode,phy_interface_t interface,const unsigned long *advertise);int (*serdes_pcs_an_restart)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);int (*serdes_pcs_link_up)(struct mv88e6xxx_chip *chip,int port, -u8 lane,int speed,int duplex); +int lane,int speed,int duplex);/* SERDES interrupt handling */ unsigned int (*serdes_irq_mapping)(struct mv88e6xxx_chip *chip,int port); -int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,int lane,bool enable);irqreturn_t (*serdes_irq_status)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);/* Statistics from the SERDES interface */ int (*serdes_get_sset_count)(struct mv88e6xxx_chip *chip,int port);
drivers/net/dsa/mv88e6xxx/port.c +4 -4
@@ -429,8 +429,8 @@ phy_interface_t mv88e6390x_port_max_speed_mode(int port)static int mv88e6xxx_port_set_cmode (struct mv88e6xxx_chip *chip,int port,phy_interface_t mode,bool force) { -u8 lane;u16 cmode; +int lane;u16 reg;int err;
@@ -466,7 +466,7 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port,return 0 ; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) { +if (lane >=0 ) {if (chip->ports[port].serdes_irq) { err =mv88e6xxx_serdes_irq_disable (chip, port, lane);if (err)
@@ -495,8 +495,8 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port, chip->ports[port].cmode = cmode; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) -return -ENODEV ; +if (lane <0 ) +return lane; err =mv88e6xxx_serdes_power_up (chip, port, lane);if (err)
drivers/net/dsa/mv88e6xxx/serdes.c +41 -41
314 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +32 -32
133 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v12 4/4 net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
In reply to Pavana SharmaThe Marvell 88E6393X device is a single-chip integration of a 11-port Ethernet switch with eight integrated Gigabit Ethernet (GbE) transceivers and three 10-Gigabit interfaces.
This patch adds functionalities specific to mv88e6393x family (88E6393X, 88E6193X and 88E6191X)
---
Changes in v2:
- Fix a warning (Reported-by: kernel test robot <[email protected]>)
Changes in v3:
- Fix 'unused function' warning
Changes in v4-v9:
- Incorporated feedback from maintainers.
Changes in v10:
- Fix ISO C90 forbids mixing declarations and code warning
Changes in v11:
- Add comment for clarity, regarding configuring speed 5000 (supported
by mv88e6393x family)
Changes in v12:
- Rebase to net-next
- Remove 5GBASE-R comments from patch 1 & 2 of this patchset
- Make function name to the convention
--- drivers/net/dsa/mv88e6xxx/chip.c | 136 ++++++++++++++++ drivers/net/dsa/mv88e6xxx/chip.h | 4 + drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 230 ++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/port.h | 43 +++++- drivers/net/dsa/mv88e6xxx/serdes.c | 227 +++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/serdes.h | 39 +++++ 8 files changed, 687 insertions(+), 2 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +136 -0
@@ -635,6 +635,24 @@ static void mv88e6390x_phylink_validate(struct mv88e6xxx_chip *chip, int port,mv88e6390_phylink_validate (chip, port, mask, state); } +static void mv88e6393x_phylink_validate (struct mv88e6xxx_chip *chip,int port, +unsigned long *mask, +struct phylink_link_state *state) +{ +if (port ==0 || port ==9 || port ==10 ) { + phylink_set(mask, 10000baseT_Full); + phylink_set(mask, 10000baseKR_Full); + phylink_set(mask, 5000baseT_Full); + phylink_set(mask, 2500baseX_Full); + phylink_set(mask, 2500baseT_Full); + } + + phylink_set(mask, 1000baseT_Full); + phylink_set(mask, 1000baseX_Full); + +mv88e6065_phylink_validate (chip, port, mask, state); +} +static void mv88e6xxx_validate (struct dsa_switch *ds,int port,unsigned long *supported,struct phylink_link_state *state)
@@ -3937,6 +3955,55 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { .phylink_validate = mv88e6390_phylink_validate, }; +static const struct mv88e6xxx_ops mv88e6393x_ops = { +/* MV88E6XXX_FAMILY_6393 */ + .setup_errata = mv88e6393x_serdes_setup_errata, + .irl_init_all = mv88e6390_g2_irl_init_all, + .get_eeprom = mv88e6xxx_g2_get_eeprom8, + .set_eeprom = mv88e6xxx_g2_set_eeprom8, + .set_switch_mac = mv88e6xxx_g2_set_switch_mac, + .phy_read = mv88e6xxx_g2_smi_phy_read, + .phy_write = mv88e6xxx_g2_smi_phy_write, + .port_set_link = mv88e6xxx_port_set_link, + .port_set_speed_duplex = mv88e6393x_port_set_speed_duplex, + .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, + .port_tag_remap = mv88e6390_port_tag_remap, + .port_set_frame_mode = mv88e6351_port_set_frame_mode, + .port_set_egress_floods = mv88e6352_port_set_egress_floods, + .port_set_ether_type = mv88e6393x_port_set_ether_type, + .port_set_jumbo_size = mv88e6165_port_set_jumbo_size, + .port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting, + .port_pause_limit = mv88e6390_port_pause_limit, + .port_set_cmode = mv88e6393x_port_set_cmode, + .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit, + .port_disable_pri_override = mv88e6xxx_port_disable_pri_override, + .port_get_cmode = mv88e6352_port_get_cmode, + .stats_snapshot = mv88e6390_g1_stats_snapshot, + .stats_set_histogram = mv88e6390_g1_stats_set_histogram, + .stats_get_sset_count = mv88e6320_stats_get_sset_count, + .stats_get_strings = mv88e6320_stats_get_strings, + .stats_get_stats = mv88e6390_stats_get_stats, + .set_cpu_port = mv88e6393x_port_set_cpu_dest, + .set_egress_port = mv88e6393x_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, + .mgmt_rsvd2cpu = mv88e6393x_port_mgmt_rsvd2cpu, + .pot_clear = mv88e6xxx_g2_pot_clear, + .reset = mv88e6352_g1_reset, + .rmu_disable = mv88e6390_g1_rmu_disable, + .vtu_getnext = mv88e6390_g1_vtu_getnext, + .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge, + .serdes_power = mv88e6393x_serdes_power, + .serdes_get_lane = mv88e6393x_serdes_get_lane, + .serdes_pcs_get_state = mv88e6390_serdes_pcs_get_state, + .serdes_irq_mapping = mv88e6390_serdes_irq_mapping, + .serdes_irq_enable = mv88e6393x_serdes_irq_enable, + .serdes_irq_status = mv88e6393x_serdes_irq_status, + .gpio_ops = &mv88e6352_gpio_ops, + .avb_ops = &mv88e6390_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, + .phylink_validate = mv88e6393x_phylink_validate, +}; +static const struct mv88e6xxx_ops mv88e6240_ops = {/* MV88E6XXX_FAMILY_6352 */ .ieee_pri_map = mv88e6085_g1_ieee_pri_map,
@@ -4880,6 +4947,52 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .ops = &mv88e6191_ops, }, + [MV88E6191X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6191X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6191X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, + + [MV88E6193X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6193X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6193X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, + [MV88E6220] = { .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6220, .family = MV88E6XXX_FAMILY_6250,
@@ -5170,6 +5283,29 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .ptp_support = true, .ops = &mv88e6390x_ops, }, + + [MV88E6393X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6393X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6393X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, };static const struct mv88e6xxx_info *mv88e6xxx_lookup_info (unsigned int prod_num)
drivers/net/dsa/mv88e6xxx/chip.h +4 -0
@@ -63,6 +63,8 @@ enum mv88e6xxx_model {MV88E6190 ,MV88E6190X ,MV88E6191 , +MV88E6191X , +MV88E6193X ,MV88E6220 ,MV88E6240 , MV88E6250,
@@ -75,6 +77,7 @@ enum mv88e6xxx_model {MV88E6352 ,MV88E6390 ,MV88E6390X , + MV88E6393X, }; enum mv88e6xxx_family {
@@ -90,6 +93,7 @@ enum mv88e6xxx_family {MV88E6XXX_FAMILY_6351 ,/* 6171 6175 6350 6351 */ MV88E6XXX_FAMILY_6352 ,/* 6172 6176 6240 6352 */ MV88E6XXX_FAMILY_6390 ,/* 6190 6190X 6191 6290 6390 6390X */ + MV88E6XXX_FAMILY_6393, /* 6191X 6193X 6393X */ };struct mv88e6xxx_ops ;
drivers/net/dsa/mv88e6xxx/global1.h +2 -0
@@ -22,6 +22,7 @@#define MV88E6185_G1_STS_PPU_STATE_DISABLED 0x8000#define MV88E6185_G1_STS_PPU_STATE_POLLING 0xc000#define MV88E6XXX_G1_STS_INIT_READY 0x0800 +#define MV88E6393X_G1_STS_IRQ_DEVICE_2 9#define MV88E6XXX_G1_STS_IRQ_AVB 8#define MV88E6XXX_G1_STS_IRQ_DEVICE 7#define MV88E6XXX_G1_STS_IRQ_STATS 6
@@ -59,6 +60,7 @@#define MV88E6185_G1_CTL1_SCHED_PRIO 0x0800#define MV88E6185_G1_CTL1_MAX_FRAME_1632 0x0400#define MV88E6185_G1_CTL1_RELOAD_EEPROM 0x0200 +#define MV88E6393X_G1_CTL1_DEVICE2_EN 0x0200#define MV88E6XXX_G1_CTL1_DEVICE_EN 0x0080#define MV88E6XXX_G1_CTL1_STATS_DONE_EN 0x0040#define MV88E6XXX_G1_CTL1_VTU_PROBLEM_EN 0x0020
drivers/net/dsa/mv88e6xxx/global2.h +8 -0
@@ -38,9 +38,15 @@/* Offset 0x02: MGMT Enable Register 2x */ #define MV88E6XXX_G2_MGMT_EN_2X 0x02 +/* Offset 0x02: MAC LINK change IRQ Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_SRC 0x02 +/* Offset 0x03: MGMT Enable Register 0x */ #define MV88E6XXX_G2_MGMT_EN_0X 0x03 +/* Offset 0x03: MAC LINK change IRQ Mask Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_MASK 0x03 +/* Offset 0x04: Flow Control Delay Register */ #define MV88E6XXX_G2_FLOW_CTL 0x04
@@ -52,6 +58,8 @@#define MV88E6XXX_G2_SWITCH_MGMT_FORCE_FLOW_CTL_PRI 0x0080#define MV88E6XXX_G2_SWITCH_MGMT_RSVD2CPU 0x0008 +#define MV88E6393X_G2_EGRESS_MONITOR_DEST 0x05 +/* Offset 0x06: Device Mapping Table Register */ #define MV88E6XXX_G2_DEVICE_MAPPING 0x06#define MV88E6XXX_G2_DEVICE_MAPPING_UPDATE 0x8000
drivers/net/dsa/mv88e6xxx/port.c +230 -0
272 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/port.h +41 -2
97 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.c +227 -0
242 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +39 -0
@@ -68,16 +68,48 @@#define MV88E6390_SGMII_PHY_STATUS_LINK BIT(10)#define MV88E6390_SGMII_PHY_STATUS_TX_PAUSE BIT(3)#define MV88E6390_SGMII_PHY_STATUS_RX_PAUSE BIT(2) +#define MV88E6390_SGMII_STATUS_AN_ABLE BIT(3) +#define MV88E6390_SGMII_ANAR 0x2004 +#define MV88E6390_SGMII_ANAR_1000BASEX_FD BIT(5) +#define MV88E6390_SGMII_CONTROL 0x2000 +#define MV88E6390_SGMII_CONTROL_RESET BIT(15) +#define MV88E6390_SGMII_CONTROL_LOOPBACK BIT(14) +#define MV88E6390_SGMII_CONTROL_PDOWN BIT(11) +#define MV88E6390_SGMII_STATUS 0x2001/* Packet generator pad packet checker */ #define MV88E6390_PG_CONTROL 0xf010#define MV88E6390_PG_CONTROL_ENABLE_PC BIT(0) +#define MV88E6393X_PORT0_LANE 0x00 +#define MV88E6393X_PORT9_LANE 0x09 +#define MV88E6393X_PORT10_LANE 0x0a + +/* Port Operational Configuration */ +#define MV88E6393X_PCS_SELECT_1000BASEX 0x0000 +#define MV88E6393X_PCS_SELECT_2500BASEX 0x0001 +#define MV88E6393X_PCS_SELECT_SGMII_PHY 0x0002 +#define MV88E6393X_PCS_SELECT_SGMII_MAC 0x0003 +#define MV88E6393X_PCS_SELECT_5GBASER 0x0004 +#define MV88E6393X_PCS_SELECT_10GBASER 0x0005 +#define MV88E6393X_PCS_SELECT_USXGMII_PHY 0x0006 +#define MV88E6393X_PCS_SELECT_USXGMII_MAC 0x0007 + +#define MV88E6393X_SERDES_POC 0xf002 +#define MV88E6393X_SERDES_POC_PCS_MODE_MASK 0x0007 +#define MV88E6393X_SERDES_POC_RESET BIT(15) +#define MV88E6393X_SERDES_POC_PDOWN BIT(5) +#define MV88E6393X_SERDES_POC_ANEG BIT(3) + +#define MV88E6393X_ERRATA_1000BASEX_SGMII 0xF074 +#define MV88E6393X_ERRATA_1000BASEX_SGMII_BIT BIT(14) +int mv88e6185_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);int mv88e6341_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);int mv88e6352_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);int mv88e6390_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);int mv88e6390x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port); +int mv88e6393x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port); int mv88e6352_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, int lane, unsigned int mode, phy_interface_t interface,
@@ -110,18 +142,25 @@ int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, int lane, bool on);int mv88e6390_serdes_power (struct mv88e6xxx_chip *chip,int port,int lane,bool on); +int mv88e6393x_serdes_power (struct mv88e6xxx_chip *chip,int port,int lane, +bool on); +int mv88e6393x_serdes_setup_errata (struct mv88e6xxx_chip *chip);int mv88e6097_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port,int lane,bool enable);int mv88e6352_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port,int lane,bool enable);int mv88e6390_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port,int lane,bool enable); +int mv88e6393x_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port, +int lane,bool enable);irqreturn_t mv88e6097_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,int lane);irqreturn_t mv88e6352_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,int lane);irqreturn_t mv88e6390_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,int lane); +irqreturn_t mv88e6393x_serdes_irq_status (struct mv88e6xxx_chip *chip,int port, +int lane);int mv88e6352_serdes_get_sset_count (struct mv88e6xxx_chip *chip,int port);int mv88e6352_serdes_get_strings (struct mv88e6xxx_chip *chip,int port,uint8_t *data);
Signature · 1 line
2.17.1
Re: [net-next PATCH v12 4/4] net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
Quoted 4 lines · On Fri, 11 Dec 2020 22:51:01 +1000 Pavana Sharma <[email protected]> wrote:
drivers/net/dsa/mv88e6xxx/serdes.c +4
-0+int mv88e6393x_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port, +int lane,bool enable) +{ +u8 cmode = chip->ports[port].cmode;
drivers/net/dsa/mv88e6xxx/serdes.c static int mv88e6390_serdes_irq_status_sgmii(struct mv88e6xxx_chip *chip, · line 1064
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/serdes.c +10
-0+int err =0 ; + +switch (cmode) { +case MV88E6XXX_PORT_STS_CMODE_SGMII : +case MV88E6XXX_PORT_STS_CMODE_1000BASEX : +case MV88E6XXX_PORT_STS_CMODE_2500BASEX : +case MV88E6XXX_PORT_STS_CMODE_5GBASER : +case MV88E6XXX_PORT_STS_CMODE_10GBASER : + err =mv88e6390_serdes_irq_enable_sgmii (chip, lane, enable); + }
This is wrong. IRQ for 5gbase-r and 10gbase-r is enabled differently. Please look at how I did it in my proposal
https://www.mail-archive.com/netdev(a)vger.kernel.org/msg347854.html
Please look at the following functions in that patch:
mv88e6393x_serdes_irq_enable_10g()
mv88e6393x_serdes_irq_enable()
mv88e6393x_serdes_irq_status_10g()
irqreturn_t mv88e6393x_serdes_irq_status()
and also at the constants added to serdes.h in that patch
#define MV88E6393X_10G_INT_ENABLE 0x9000
#define MV88E6393X_10G_INT_LINK_CHANGE BIT(2)
#define MV88E6393X_10G_INT_STATUS 0x9001
PATCH v12 4/4 net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
Thanks Marek for catching this.
I will have a closer look and update the patchset.
Re: [net-next PATCH v12 4/4] net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
Quoted 3 lines · On Wed, 6 Jan 2021 10:45:30 +1000 Pavana Sharma <[email protected]> wrote:
Thanks Marek for catching this.
I will have a closer look and update the patchset.
I also sent a reply patch with subject
"patch fixing mv88e6393x SERDES IRQ for Pavana's series"
it contains the changes necessary to your series. Please look at that. You can apply it to your commit via
patch -p1 <patch_from_marek.patch
git commit --amend drivers/net/dsa/mv88e6xxx/{chip.c,serdes.c,serdes.h}
Marek
patch fixing mv88e6393x SERDES IRQ for Pavana's series
In reply to Pavana SharmaPavana, please add this changes to your patch
net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
It fixes SERDES IRQ enablement and status reading for 10G on 6393x.
Also, there is a double space in your commit title (between words "mv88e6393x" and "family"), please fix this.
You can add my Co-developed-by tag, if you want.
--- drivers/net/dsa/mv88e6xxx/chip.c | 2 +- drivers/net/dsa/mv88e6xxx/serdes.c | 100 +++++++++++++++++++++++++++-- drivers/net/dsa/mv88e6xxx/serdes.h | 5 ++ 3 files changed, 102 insertions(+), 5 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +1 -1
@@ -4001,7 +4001,7 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = { .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge, .serdes_power = mv88e6393x_serdes_power, .serdes_get_lane = mv88e6393x_serdes_get_lane, - .serdes_pcs_get_state = mv88e6390_serdes_pcs_get_state, + .serdes_pcs_get_state = mv88e6393x_serdes_pcs_get_state, .serdes_irq_mapping = mv88e6390_serdes_irq_mapping, .serdes_irq_enable = mv88e6393x_serdes_irq_enable, .serdes_irq_status = mv88e6393x_serdes_irq_status,
drivers/net/dsa/mv88e6xxx/serdes.c +96 -4
149 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +5 -0
@@ -42,6 +42,9 @@/* 10GBASE-R and 10GBASE-X4/X2 */ #define MV88E6390_10G_CTRL1 (0x1000 + MDIO_CTRL1)#define MV88E6390_10G_STAT1 (0x1000 + MDIO_STAT1) +#define MV88E6393X_10G_INT_ENABLE 0x9000 +#define MV88E6393X_10G_INT_LINK_CHANGE BIT(2) +#define MV88E6393X_10G_INT_STATUS 0x9001/* 1000BASE-X and SGMII */ #define MV88E6390_SGMII_BMCR (0x2000 + MII_BMCR)
@@ -124,6 +127,8 @@ int mv88e6352_serdes_pcs_get_state(struct mv88e6xxx_chip *chip, int port, int lane, struct phylink_link_state *state);int mv88e6390_serdes_pcs_get_state (struct mv88e6xxx_chip *chip,int port,int lane,struct phylink_link_state *state); +int mv88e6393x_serdes_pcs_get_state (struct mv88e6xxx_chip *chip,int port, +int lane,struct phylink_link_state *state);int mv88e6352_serdes_pcs_an_restart (struct mv88e6xxx_chip *chip,int port,int lane); int mv88e6390_serdes_pcs_an_restart(struct mv88e6xxx_chip *chip, int port,
Signature · 1 line
2.26.2
v13 cover Add support for mv88e6393x family of Marvell
Updated patchset with fixes for enbling IRQ for 5GBASER and 10BASER.
Pavana Sharma (4):
dt-bindings: net: Add 5GBASER phy interface
net: phy: Add 5GBASER interface mode
net: dsa: mv88e6xxx: Change serdes lane parameter type from u8 type to
int
net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
.../bindings/net/ethernet-controller.yaml | 1 + drivers/net/dsa/mv88e6xxx/chip.c | 164 ++++++- drivers/net/dsa/mv88e6xxx/chip.h | 20 +- drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 238 ++++++++++- drivers/net/dsa/mv88e6xxx/port.h | 43 +- drivers/net/dsa/mv88e6xxx/serdes.c | 401 ++++++++++++++++-- drivers/net/dsa/mv88e6xxx/serdes.h | 108 +++-- include/linux/phy.h | 4 + 10 files changed, 888 insertions(+), 101 deletions(-)
Signature · 1 line
2.17.1
PATCH v13 1/4 dt-bindings: net: Add 5GBASER phy interface
Add 5gbase-r PHY interface mode.
--- Documentation/devicetree/bindings/net/ethernet-controller.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/net/ethernet-controller.yaml +1 -0
@@ -89,6 +89,7 @@ properties: - trgmii - 1000base-x - 2500base-x + - 5gbase-r - rxaui - xaui
Signature · 1 line
2.17.1
Re: [net-next PATCH v13 1/4] dt-bindings: net: Add 5GBASER phy interface
Quoted 4 lines · Pavana Sharma
Add 5gbase-r PHY interface mode.
Signed-off-by Pavana Sharma <[email protected]>Acked-by Rob Herring <[email protected]>
Andrew
PATCH v13 2/4 net: phy: Add 5GBASER interface mode
In reply to Pavana SharmaAdd 5GBASE-R phy interface mode
--- include/linux/phy.h | 4 ++++ 1 file changed, 4 insertions(+)
include/linux/phy.h +4 -0
@@ -106,6 +106,7 @@ extern const int phy_10gbit_features_array[1];* @PHY_INTERFACE_MODE_TRGMII: Turbo RGMII * @PHY_INTERFACE_MODE_1000BASEX: 1000 BaseX * @PHY_INTERFACE_MODE_2500BASEX: 2500 BaseX +* @PHY_INTERFACE_MODE_5GBASER: 5G BaseR * @PHY_INTERFACE_MODE_RXAUI: Reduced XAUI * @PHY_INTERFACE_MODE_XAUI: 10 Gigabit Attachment Unit Interface * @PHY_INTERFACE_MODE_10GBASER: 10G BaseR
@@ -137,6 +138,7 @@ typedef enum {PHY_INTERFACE_MODE_TRGMII ,PHY_INTERFACE_MODE_1000BASEX ,PHY_INTERFACE_MODE_2500BASEX , +PHY_INTERFACE_MODE_5GBASER ,PHY_INTERFACE_MODE_RXAUI , PHY_INTERFACE_MODE_XAUI,/* 10GBASE-R, XFI, SFI - single lane 10G Serdes */
@@ -207,6 +209,8 @@ static inline const char *phy_modes(phy_interface_t interface)return "1000base-x" ;case PHY_INTERFACE_MODE_2500BASEX :return "2500base-x" ; +case PHY_INTERFACE_MODE_5GBASER : +return "5gbase-r" ;case PHY_INTERFACE_MODE_RXAUI :return "rxaui" ;case PHY_INTERFACE_MODE_XAUI :
Signature · 1 line
2.17.1
Re: [net-next PATCH v13 2/4] net: phy: Add 5GBASER interface mode
Quoted 3 lines · Pavana Sharma
Add 5GBASE-R phy interface mode
Signed-off-by Pavana Sharma <[email protected]>
Andrew
PATCH v13 3/4 net: dsa: mv88e6xxx: Change serdes lane parameter type from u8 type to int
In reply to Pavana SharmaReturning 0 is no more an error case with MV88E6393 family which has serdes lane numbers 0, 9 or 10.
So with this change .serdes_get_lane will return lane number or -errno (-ENODEV or -EOPNOTSUPP).
--- drivers/net/dsa/mv88e6xxx/chip.c | 28 +++++----- drivers/net/dsa/mv88e6xxx/chip.h | 16 +++--- drivers/net/dsa/mv88e6xxx/port.c | 8 +-- drivers/net/dsa/mv88e6xxx/serdes.c | 82 +++++++++++++++--------------- drivers/net/dsa/mv88e6xxx/serdes.h | 64 +++++++++++------------ 5 files changed, 99 insertions(+), 99 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +14 -14
@@ -485,12 +485,12 @@ static int mv88e6xxx_serdes_pcs_get_state(struct dsa_switch *ds, int port, struct phylink_link_state *state) {struct mv88e6xxx_chip *chip = ds->priv; -u8 lane; +int lane;int err;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane && chip->info->ops->serdes_pcs_get_state) +if (lane >=0 && chip->info->ops->serdes_pcs_get_state) err = chip->info->ops->serdes_pcs_get_state (chip, port, lane, state);else
@@ -506,11 +506,11 @@ static int mv88e6xxx_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, const unsigned long *advertise) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane;if (ops->serdes_pcs_config) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 )return ops->serdes_pcs_config (chip, port, lane, mode, interface, advertise); }
@@ -523,14 +523,14 @@ static void mv88e6xxx_serdes_pcs_an_restart(struct dsa_switch *ds, int port)struct mv88e6xxx_chip *chip = ds->priv;const struct mv88e6xxx_ops *ops;int err =0 ; -u8 lane; +int lane; ops = chip->info->ops;if (ops->serdes_pcs_an_restart) {mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 ) err = ops->serdes_pcs_an_restart (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -544,11 +544,11 @@ static int mv88e6xxx_serdes_pcs_link_up(struct mv88e6xxx_chip *chip, int port, int speed, int duplex) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane;if (!phylink_autoneg_inband (mode) && ops->serdes_pcs_link_up) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 )return ops->serdes_pcs_link_up (chip, port, lane, speed, duplex); }
@@ -2431,11 +2431,11 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id)struct mv88e6xxx_chip *chip = mvp->chip;irqreturn_t ret =IRQ_NONE ;int port = mvp->port; -u8 lane; +int lane;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 ) ret =mv88e6xxx_serdes_irq_status (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -2443,7 +2443,7 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id) }static int mv88e6xxx_serdes_irq_request (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq;
@@ -2472,7 +2472,7 @@ static int mv88e6xxx_serdes_irq_request(struct mv88e6xxx_chip *chip, int port, }static int mv88e6xxx_serdes_irq_free (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq = dev_id->serdes_irq;
@@ -2497,11 +2497,11 @@ static int mv88e6xxx_serdes_irq_free(struct mv88e6xxx_chip *chip, int port,static int mv88e6xxx_serdes_power (struct mv88e6xxx_chip *chip,int port,bool on) { -u8 lane; +int lane;int err; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) +if (lane <0 )return 0 ;if (on) {
drivers/net/dsa/mv88e6xxx/chip.h +8 -8
@@ -511,30 +511,30 @@ struct mv88e6xxx_ops {int (*mgmt_rsvd2cpu)(struct mv88e6xxx_chip *chip);/* Power on/off a SERDES interface */ -int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,int lane,bool up);/* SERDES lane mapping */ -u8 (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port); +int (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port);int (*serdes_pcs_get_state)(struct mv88e6xxx_chip *chip,int port, -u8 lane,struct phylink_link_state *state); +int lane,struct phylink_link_state *state);int (*serdes_pcs_config)(struct mv88e6xxx_chip *chip,int port, -u8 lane,unsigned int mode, +int lane,unsigned int mode,phy_interface_t interface,const unsigned long *advertise);int (*serdes_pcs_an_restart)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);int (*serdes_pcs_link_up)(struct mv88e6xxx_chip *chip,int port, -u8 lane,int speed,int duplex); +int lane,int speed,int duplex);/* SERDES interrupt handling */ unsigned int (*serdes_irq_mapping)(struct mv88e6xxx_chip *chip,int port); -int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,int lane,bool enable);irqreturn_t (*serdes_irq_status)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);/* Statistics from the SERDES interface */ int (*serdes_get_sset_count)(struct mv88e6xxx_chip *chip,int port);
drivers/net/dsa/mv88e6xxx/port.c +4 -4
@@ -429,8 +429,8 @@ phy_interface_t mv88e6390x_port_max_speed_mode(int port)static int mv88e6xxx_port_set_cmode (struct mv88e6xxx_chip *chip,int port,phy_interface_t mode,bool force) { -u8 lane;u16 cmode; +int lane;u16 reg;int err;
@@ -466,7 +466,7 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port,return 0 ; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) { +if (lane >=0 ) {if (chip->ports[port].serdes_irq) { err =mv88e6xxx_serdes_irq_disable (chip, port, lane);if (err)
@@ -495,8 +495,8 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port, chip->ports[port].cmode = cmode; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) -return -ENODEV ; +if (lane <0 ) +return lane; err =mv88e6xxx_serdes_power_up (chip, port, lane);if (err)
drivers/net/dsa/mv88e6xxx/serdes.c +41 -41
314 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +32 -32
133 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v13 4/4 net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
In reply to Pavana SharmaThe Marvell 88E6393X device is a single-chip integration of a 11-port Ethernet switch with eight integrated Gigabit Ethernet (GbE) transceivers and three 10-Gigabit interfaces.
This patch adds functionalities specific to mv88e6393x family (88E6393X, 88E6193X and 88E6191X)
---
Changes in v2:
- Fix a warning (Reported-by: kernel test robot <[email protected]>)
Changes in v3:
- Fix 'unused function' warning
Changes in v4-v9:
- Incorporated feedback from maintainers.
Changes in v10:
- Fix ISO C90 forbids mixing declarations and code warning
Changes in v11:
- Add comment for clarity, regarding configuring speed 5000 (supported
by mv88e6393x family)
Changes in v12:
- Rebase to net-next
- Remove 5GBASE-R comments from patch 1 & 2 of this patchset
- Make function name to the convention
Changes in v13:
- Rebase to latest.
- Pick-up Marek's patch to fix SERDES IRQ enablement and status reading for 10G on 6393x.
--- drivers/net/dsa/mv88e6xxx/chip.c | 136 ++++++++++++ drivers/net/dsa/mv88e6xxx/chip.h | 4 + drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 230 ++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/port.h | 43 +++- drivers/net/dsa/mv88e6xxx/serdes.c | 319 ++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/serdes.h | 44 ++++ 8 files changed, 784 insertions(+), 2 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +136 -0
@@ -635,6 +635,24 @@ static void mv88e6390x_phylink_validate(struct mv88e6xxx_chip *chip, int port,mv88e6390_phylink_validate (chip, port, mask, state); } +static void mv88e6393x_phylink_validate (struct mv88e6xxx_chip *chip,int port, +unsigned long *mask, +struct phylink_link_state *state) +{ +if (port ==0 || port ==9 || port ==10 ) { + phylink_set(mask, 10000baseT_Full); + phylink_set(mask, 10000baseKR_Full); + phylink_set(mask, 5000baseT_Full); + phylink_set(mask, 2500baseX_Full); + phylink_set(mask, 2500baseT_Full); + } + + phylink_set(mask, 1000baseT_Full); + phylink_set(mask, 1000baseX_Full); + +mv88e6065_phylink_validate (chip, port, mask, state); +} +static void mv88e6xxx_validate (struct dsa_switch *ds,int port,unsigned long *supported,struct phylink_link_state *state)
@@ -3944,6 +3962,55 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { .phylink_validate = mv88e6390_phylink_validate, }; +static const struct mv88e6xxx_ops mv88e6393x_ops = { +/* MV88E6XXX_FAMILY_6393 */ + .setup_errata = mv88e6393x_serdes_setup_errata, + .irl_init_all = mv88e6390_g2_irl_init_all, + .get_eeprom = mv88e6xxx_g2_get_eeprom8, + .set_eeprom = mv88e6xxx_g2_set_eeprom8, + .set_switch_mac = mv88e6xxx_g2_set_switch_mac, + .phy_read = mv88e6xxx_g2_smi_phy_read, + .phy_write = mv88e6xxx_g2_smi_phy_write, + .port_set_link = mv88e6xxx_port_set_link, + .port_set_speed_duplex = mv88e6393x_port_set_speed_duplex, + .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, + .port_tag_remap = mv88e6390_port_tag_remap, + .port_set_frame_mode = mv88e6351_port_set_frame_mode, + .port_set_egress_floods = mv88e6352_port_set_egress_floods, + .port_set_ether_type = mv88e6393x_port_set_ether_type, + .port_set_jumbo_size = mv88e6165_port_set_jumbo_size, + .port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting, + .port_pause_limit = mv88e6390_port_pause_limit, + .port_set_cmode = mv88e6393x_port_set_cmode, + .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit, + .port_disable_pri_override = mv88e6xxx_port_disable_pri_override, + .port_get_cmode = mv88e6352_port_get_cmode, + .stats_snapshot = mv88e6390_g1_stats_snapshot, + .stats_set_histogram = mv88e6390_g1_stats_set_histogram, + .stats_get_sset_count = mv88e6320_stats_get_sset_count, + .stats_get_strings = mv88e6320_stats_get_strings, + .stats_get_stats = mv88e6390_stats_get_stats, + .set_cpu_port = mv88e6393x_port_set_cpu_dest, + .set_egress_port = mv88e6393x_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, + .mgmt_rsvd2cpu = mv88e6393x_port_mgmt_rsvd2cpu, + .pot_clear = mv88e6xxx_g2_pot_clear, + .reset = mv88e6352_g1_reset, + .rmu_disable = mv88e6390_g1_rmu_disable, + .vtu_getnext = mv88e6390_g1_vtu_getnext, + .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge, + .serdes_power = mv88e6393x_serdes_power, + .serdes_get_lane = mv88e6393x_serdes_get_lane, + .serdes_pcs_get_state = mv88e6393x_serdes_pcs_get_state, + .serdes_irq_mapping = mv88e6390_serdes_irq_mapping, + .serdes_irq_enable = mv88e6393x_serdes_irq_enable, + .serdes_irq_status = mv88e6393x_serdes_irq_status, + .gpio_ops = &mv88e6352_gpio_ops, + .avb_ops = &mv88e6390_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, + .phylink_validate = mv88e6393x_phylink_validate, +}; +static const struct mv88e6xxx_ops mv88e6240_ops = {/* MV88E6XXX_FAMILY_6352 */ .ieee_pri_map = mv88e6085_g1_ieee_pri_map,
@@ -4887,6 +4954,52 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .ops = &mv88e6191_ops, }, + [MV88E6191X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6191X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6191X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, + + [MV88E6193X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6193X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6193X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, + [MV88E6220] = { .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6220, .family = MV88E6XXX_FAMILY_6250,
@@ -5177,6 +5290,29 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .ptp_support = true, .ops = &mv88e6390x_ops, }, + + [MV88E6393X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6393X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6393X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, };static const struct mv88e6xxx_info *mv88e6xxx_lookup_info (unsigned int prod_num)
drivers/net/dsa/mv88e6xxx/chip.h +4 -0
@@ -63,6 +63,8 @@ enum mv88e6xxx_model {MV88E6190 ,MV88E6190X ,MV88E6191 , +MV88E6191X , +MV88E6193X ,MV88E6220 ,MV88E6240 , MV88E6250,
@@ -75,6 +77,7 @@ enum mv88e6xxx_model {MV88E6352 ,MV88E6390 ,MV88E6390X , + MV88E6393X, }; enum mv88e6xxx_family {
@@ -90,6 +93,7 @@ enum mv88e6xxx_family {MV88E6XXX_FAMILY_6351 ,/* 6171 6175 6350 6351 */ MV88E6XXX_FAMILY_6352 ,/* 6172 6176 6240 6352 */ MV88E6XXX_FAMILY_6390 ,/* 6190 6190X 6191 6290 6390 6390X */ + MV88E6XXX_FAMILY_6393, /* 6191X 6193X 6393X */ };struct mv88e6xxx_ops ;
drivers/net/dsa/mv88e6xxx/global1.h +2 -0
@@ -22,6 +22,7 @@#define MV88E6185_G1_STS_PPU_STATE_DISABLED 0x8000#define MV88E6185_G1_STS_PPU_STATE_POLLING 0xc000#define MV88E6XXX_G1_STS_INIT_READY 0x0800 +#define MV88E6393X_G1_STS_IRQ_DEVICE_2 9#define MV88E6XXX_G1_STS_IRQ_AVB 8#define MV88E6XXX_G1_STS_IRQ_DEVICE 7#define MV88E6XXX_G1_STS_IRQ_STATS 6
@@ -59,6 +60,7 @@#define MV88E6185_G1_CTL1_SCHED_PRIO 0x0800#define MV88E6185_G1_CTL1_MAX_FRAME_1632 0x0400#define MV88E6185_G1_CTL1_RELOAD_EEPROM 0x0200 +#define MV88E6393X_G1_CTL1_DEVICE2_EN 0x0200#define MV88E6XXX_G1_CTL1_DEVICE_EN 0x0080#define MV88E6XXX_G1_CTL1_STATS_DONE_EN 0x0040#define MV88E6XXX_G1_CTL1_VTU_PROBLEM_EN 0x0020
drivers/net/dsa/mv88e6xxx/global2.h +8 -0
@@ -38,9 +38,15 @@/* Offset 0x02: MGMT Enable Register 2x */ #define MV88E6XXX_G2_MGMT_EN_2X 0x02 +/* Offset 0x02: MAC LINK change IRQ Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_SRC 0x02 +/* Offset 0x03: MGMT Enable Register 0x */ #define MV88E6XXX_G2_MGMT_EN_0X 0x03 +/* Offset 0x03: MAC LINK change IRQ Mask Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_MASK 0x03 +/* Offset 0x04: Flow Control Delay Register */ #define MV88E6XXX_G2_FLOW_CTL 0x04
@@ -52,6 +58,8 @@#define MV88E6XXX_G2_SWITCH_MGMT_FORCE_FLOW_CTL_PRI 0x0080#define MV88E6XXX_G2_SWITCH_MGMT_RSVD2CPU 0x0008 +#define MV88E6393X_G2_EGRESS_MONITOR_DEST 0x05 +/* Offset 0x06: Device Mapping Table Register */ #define MV88E6XXX_G2_DEVICE_MAPPING 0x06#define MV88E6XXX_G2_DEVICE_MAPPING_UPDATE 0x8000
drivers/net/dsa/mv88e6xxx/port.c +230 -0
272 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/port.h +41 -2
97 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.c +319 -0
352 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +44 -0
90 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [net-next PATCH v13 4/4] net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
Pavana, some last nitpicks, sorry I didn't check this before.
I will send another patch to you which shall fix all this things.
drivers/net/dsa/mv88e6xxx/port.c phy_interface_t mv88e6390x_port_max_speed_mode(int port) · line 445
Quoted 8 lines · On Fri, 8 Jan 2021 19:50:56 +1000 Pavana Sharma <[email protected]> wrote:
drivers/net/dsa/mv88e6xxx/port.c +8
-0+/* Support 10, 100, 200, 1000, 2500, 5000, 10000 Mbps (e.g. 88E6393X) +* This function adds new speed 5000 supported by Amethyst family. +* Function mv88e6xxx_port_set_speed_duplex() can't be used as the register +* values for speeds 2500 & 5000 conflict. +*/ + +int mv88e6393x_port_set_speed_duplex (struct mv88e6xxx_chip *chip,int port, +int speed,int duplex)
There are basically 2 empty lines between the comment and the function signature, one containting only comment end token " */" and the other truly empty. I think you can remove the empty line, since the comment is already visibly separated from the function body.
I think you can also remove the second line of the comment:
"This function adds new speed 5000 supported by Amethyst family."
The alignment of the speed argument is wrong. It should start at the same column as the first argument.
So:
/* Support 10, 100, 200, 1000, 2500, 5000, 10000 Mbps (e.g. 88E6393X)
* Function mv88e6xxx_port_set_speed_duplex() can't be used as the register
* values for speeds 2500 & 5000 conflict.
*/
int mv88e6393x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,
int speed, int duplex)
drivers/net/dsa/mv88e6xxx/port.c phy_interface_t mv88e6390x_port_max_speed_mode(int port) · line 510
Quoted 3 lines
drivers/net/dsa/mv88e6xxx/port.c +3
-0+ reg &= ~(MV88E6XXX_PORT_MAC_CTL_SPEED_MASK | +MV88E6390_PORT_MAC_CTL_ALTSPEED | +MV88E6390_PORT_MAC_CTL_FORCE_SPEED );
alignment:
reg &= ~(MV88E6XXX_PORT_MAC_CTL_SPEED_MASK | MV88E6390_PORT_MAC_CTL_ALTSPEED | MV88E6390_PORT_MAC_CTL_FORCE_SPEED);
drivers/net/dsa/mv88e6xxx/port.c int mv88e6xxx_port_disable_pri_override(struct mv88e6xxx_chip *chip, int port) · line 1284
Quoted 5 lines
drivers/net/dsa/mv88e6xxx/port.c +5
-0+static int mv88e6393x_port_policy_write (struct mv88e6xxx_chip *chip,u16 pointer, +u8 data) +{ + +int err =0 ;
Unneeded empty line before int err = 0;
Also alignment of the data argument:
static int mv88e6393x_port_policy_write(struct mv88e6xxx_chip *chip, u16 pointer,
u8 data)
(It seems to me that you only align with tabs. If you need to align for
example to 20th column, use 2 tabs and 4 spaces (2*8 + 4 = 20).)
drivers/net/dsa/mv88e6xxx/port.c int mv88e6xxx_port_disable_pri_override(struct mv88e6xxx_chip *chip, int port) · line 1377
Quoted 2 lines
drivers/net/dsa/mv88e6xxx/port.c +2
-0+int mv88e6393x_port_set_ether_type (struct mv88e6xxx_chip *chip,int port, +u16 etype)
Alignment:
int mv88e6393x_port_set_ether_type(struct mv88e6xxx_chip *chip, int port,
u16 etype)
drivers/net/dsa/mv88e6xxx/port.h line 54
Quoted 3 lines
drivers/net/dsa/mv88e6xxx/port.h +3
-0+#define MV88E6XXX_PORT_STS_CMODE_5GBASER 0x000c +#define MV88E6XXX_PORT_STS_CMODE_10GBASER 0x000d +#define MV88E6XXX_PORT_STS_CMODE_USXGMII 0x000e
These macros should have prefix
MV88E6393X_
instead of
MV88E6XXX_
since these values apply for 6393X family and they conflict with the values for other switches.
drivers/net/dsa/mv88e6xxx/port.h int mv88e6xxx_port_read(struct mv88e6xxx_chip *chip, int port, int reg, · line 320
Quoted 2 lines
drivers/net/dsa/mv88e6xxx/port.h +2
-0+int mv88e6xxx_port_wait_bit (struct mv88e6xxx_chip *chip,int port,int reg, +int bit,int val);
Alignment.
drivers/net/dsa/mv88e6xxx/port.h int mv88e6390_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, · line 348
Quoted 2 lines
drivers/net/dsa/mv88e6xxx/port.h +2
-0+int mv88e6393x_port_set_speed_duplex (struct mv88e6xxx_chip *chip,int port, +int speed,int duplex);
Alignment.
drivers/net/dsa/mv88e6xxx/port.h int mv88e6352_port_set_policy(struct mv88e6xxx_chip *chip, int port, · line 388
Quoted 2 lines
drivers/net/dsa/mv88e6xxx/port.h +2
-0+int mv88e6393x_port_set_ether_type (struct mv88e6xxx_chip *chip,int port, +u16 etype);
Alignment.
Quoted 7 lines
drivers/net/dsa/mv88e6xxx/serdes.c +7
-0+/* Only Ports 0, 9 and 10 have SERDES lanes. Return the SERDES lane address +* a port is using else Returns -ENODEV. +*/ +int mv88e6393x_serdes_get_lane (struct mv88e6xxx_chip *chip,int port) +{ +u8 cmode = chip->ports[port].cmode; +int lane = -ENODEV ;
drivers/net/dsa/mv88e6xxx/serdes.c int mv88e6390x_serdes_get_lane(struct mv88e6xxx_chip *chip, int port) · line 656
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/serdes.c +10
-0+ +if (port !=0 && port !=9 && port !=10 ) +return -EOPNOTSUPP ; + +if (cmode ==MV88E6XXX_PORT_STS_CMODE_1000BASEX || + cmode ==MV88E6XXX_PORT_STS_CMODE_SGMII || + cmode ==MV88E6XXX_PORT_STS_CMODE_2500BASEX || + cmode ==MV88E6XXX_PORT_STS_CMODE_5GBASER || + cmode ==MV88E6XXX_PORT_STS_CMODE_10GBASER || + cmode ==MV88E6XXX_PORT_STS_CMODE_USXGMII )
Alignment.
drivers/net/dsa/mv88e6xxx/serdes.c int mv88e6390x_serdes_get_lane(struct mv88e6xxx_chip *chip, int port)
Quoted 6 lines
drivers/net/dsa/mv88e6xxx/serdes.c +5
-0+ lane = port; +return lane; +} +int mv88e6393x_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port, +int lane,bool enable)
Alignment.
drivers/net/dsa/mv88e6xxx/serdes.c static int mv88e6390_serdes_irq_status_sgmii(struct mv88e6xxx_chip *chip, · line 1153
Quoted 2 lines
drivers/net/dsa/mv88e6xxx/serdes.c +2
-0+irqreturn_t mv88e6393x_serdes_irq_status (struct mv88e6xxx_chip *chip,int port, +int lane)
Alignment.
Review
Quoted 2 lines
(quoted diff) +2
-0+static int mv88e6393x_serdes_port_config(struct mv88e6xxx_chip *chip, int lane, + bool on)
Alignment.
Quoted 17 lines
drivers/net/dsa/mv88e6xxx/serdes.c +17
-0+mv88e6390_serdes_read (chip, lane,MDIO_MMD_PHYXS , +MV88E6393X_SERDES_POC , &config); + config &= ~(MV88E6393X_SERDES_POC_PCS_MODE_MASK | +MV88E6393X_SERDES_POC_PDOWN ); + config |= pcs; +mv88e6390_serdes_write (chip, lane,MDIO_MMD_PHYXS , +MV88E6393X_SERDES_POC , config); + config |=MV88E6393X_SERDES_POC_RESET ; +mv88e6390_serdes_write (chip, lane,MDIO_MMD_PHYXS , +MV88E6393X_SERDES_POC , config); + +/* mv88e6393x family errata 3.7 : +* When changing cmode on SERDES port from any other mode to +* 1000BASE-X mode the link may not come up due to invalid +* 1000BASE-X advertisement. +* Workaround: Correct advertisement and reset PHY core. +*/
drivers/net/dsa/mv88e6xxx/serdes.c void mv88e6390_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void *_p) · line 1406
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/serdes.c +10
-0+ config =MV88E6390_SGMII_ANAR_1000BASEX_FD ; +mv88e6390_serdes_write (chip, lane,MDIO_MMD_PHYXS , +MV88E6390_SGMII_ANAR , config); + +/* soft reset the PCS/PMA */ +mv88e6390_serdes_read (chip, lane,MDIO_MMD_PHYXS , +MV88E6390_SGMII_CONTROL , &config); + config |=MV88E6390_SGMII_CONTROL_RESET ; +mv88e6390_serdes_write (chip, lane,MDIO_MMD_PHYXS , +MV88E6390_SGMII_CONTROL , config);
Alignment in all calls to mv88e6390_serdes_write.
drivers/net/dsa/mv88e6xxx/serdes.c void mv88e6390_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void *_p) · line 1413
Quoted 2 lines
drivers/net/dsa/mv88e6xxx/serdes.c +2
-0+int mv88e6393x_serdes_power (struct mv88e6xxx_chip *chip,int port,int lane, +bool on)
Alignment.
drivers/net/dsa/mv88e6xxx/serdes.h int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, int lane, · line 151
Quoted 2 lines
drivers/net/dsa/mv88e6xxx/serdes.h +2
-0+int mv88e6393x_serdes_power (struct mv88e6xxx_chip *chip,int port,int lane, +bool on);
Alignment.
drivers/net/dsa/mv88e6xxx/serdes.h int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, int lane, · line 160
Quoted 2 lines
drivers/net/dsa/mv88e6xxx/serdes.h +2
-0+int mv88e6393x_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port, +int lane,bool enable);
Alignment.
drivers/net/dsa/mv88e6xxx/serdes.h int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, int lane, · line 168
Quoted 2 lines
drivers/net/dsa/mv88e6xxx/serdes.h +2
-0+irqreturn_t mv88e6393x_serdes_irq_status (struct mv88e6xxx_chip *chip,int port, +int lane);
Alignment.
Re: [net-next PATCH v13 4/4] net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
In reply to Pavana SharmaQuoted 8 lines · On Fri, 8 Jan 2021 19:50:56 +1000 Pavana Sharma <[email protected]> wrote:
drivers/net/dsa/mv88e6xxx/serdes.c +8
-0+int mv88e6393x_serdes_power (struct mv88e6xxx_chip *chip,int port,int lane, +bool on) +{ +u8 cmode; + +if (port !=0 && port !=9 && port !=10 ) +return -EOPNOTSUPP ; +
drivers/net/dsa/mv88e6xxx/serdes.c void mv88e6390_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void *_p) · line 1429
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/serdes.c +10
-0+ cmode = chip->ports[port].cmode; + +mv88e6393x_serdes_port_config (chip, lane, on); + +switch (cmode) { +case MV88E6XXX_PORT_STS_CMODE_1000BASEX : +case MV88E6XXX_PORT_STS_CMODE_2500BASEX : +return mv88e6390_serdes_power_sgmii (chip, lane, on); +case MV88E6XXX_PORT_STS_CMODE_10GBASER : +return mv88e6390_serdes_power_10g (chip, lane, on);
Shoudln't mv88e6390_serdes_power_10g() be called even for 5GBASER ? Have you tested 5GBASER at all?
Marek
PATCH 1/1 changes for Pavana
In reply to Pavana Sharma- some nitpicks are fixed here, mostly alignemnts
- also mv88e6393x_serdes_power() now enables 10g PHY not only for 10gbase-r, but also for 5gbase-r mode
Pavana, you can apply this patch as previously:
cd linux
patch -p1 <path-to.patch
git commit --amend drivers/net/dsa/mv88e6xxx/{port,serdes}.{c,h}
--- drivers/net/dsa/mv88e6xxx/port.c | 24 +++++++--------- drivers/net/dsa/mv88e6xxx/port.h | 12 ++++---- drivers/net/dsa/mv88e6xxx/serdes.c | 46 ++++++++++++++++-------------- drivers/net/dsa/mv88e6xxx/serdes.h | 18 ++++++------ 4 files changed, 50 insertions(+), 50 deletions(-)
drivers/net/dsa/mv88e6xxx/port.c +11 -13
@@ -436,13 +436,11 @@ phy_interface_t mv88e6390x_port_max_speed_mode(int port) }/* Support 10, 100, 200, 1000, 2500, 5000, 10000 Mbps (e.g. 88E6393X) -* This function adds new speed 5000 supported by Amethyst family. * Function mv88e6xxx_port_set_speed_duplex() can't be used as the register * values for speeds 2500 & 5000 conflict. */ -int mv88e6393x_port_set_speed_duplex (struct mv88e6xxx_chip *chip,int port, -int speed,int duplex) +int speed,int duplex) {u16 reg, ctrl;int err;
@@ -506,8 +504,8 @@ int mv88e6393x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,return err; reg &= ~(MV88E6XXX_PORT_MAC_CTL_SPEED_MASK | -MV88E6390_PORT_MAC_CTL_ALTSPEED | -MV88E6390_PORT_MAC_CTL_FORCE_SPEED ); +MV88E6390_PORT_MAC_CTL_ALTSPEED | +MV88E6390_PORT_MAC_CTL_FORCE_SPEED );if (speed !=SPEED_UNFORCED ) reg |=MV88E6390_PORT_MAC_CTL_FORCE_SPEED ;
@@ -543,7 +541,7 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port, cmode =MV88E6XXX_PORT_STS_CMODE_2500BASEX ;break ;case PHY_INTERFACE_MODE_5GBASER : - cmode =MV88E6XXX_PORT_STS_CMODE_5GBASER ; + cmode =MV88E6393X_PORT_STS_CMODE_5GBASER ;break ;case PHY_INTERFACE_MODE_XGMII :case PHY_INTERFACE_MODE_XAUI :
@@ -554,10 +552,10 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port,break ;case PHY_INTERFACE_MODE_10GBASER :case PHY_INTERFACE_MODE_10GKR : - cmode =MV88E6XXX_PORT_STS_CMODE_10GBASER ; + cmode =MV88E6393X_PORT_STS_CMODE_10GBASER ;break ;case PHY_INTERFACE_MODE_USXGMII : - cmode =MV88E6XXX_PORT_STS_CMODE_USXGMII ; + cmode =MV88E6393X_PORT_STS_CMODE_USXGMII ;break ;default : cmode =0 ;
@@ -1278,9 +1276,8 @@ int mv88e6xxx_port_disable_pri_override(struct mv88e6xxx_chip *chip, int port)/* Offset 0x0E: Policy & MGMT Control Register for FAMILY 6191X 6193X 6393X */ static int mv88e6393x_port_policy_write (struct mv88e6xxx_chip *chip,u16 pointer, -u8 data) +u8 data) { -int err =0 ;int port;u16 reg;
@@ -1299,8 +1296,8 @@ static int mv88e6393x_port_policy_write(struct mv88e6xxx_chip *chip, u16 pointer }int mv88e6393x_set_egress_port (struct mv88e6xxx_chip *chip, -enum mv88e6xxx_egress_direction direction, -int port) +enum mv88e6xxx_egress_direction direction, +int port) {u16 ptr;int err;
@@ -1319,6 +1316,7 @@ int mv88e6393x_set_egress_port(struct mv88e6xxx_chip *chip,return err;break ; } +return 0 ; }
@@ -1374,7 +1372,7 @@ static int mv88e6393x_port_epc_wait_ready(struct mv88e6xxx_chip *chip, int port)/* Port Ether type for 6393X family */ int mv88e6393x_port_set_ether_type (struct mv88e6xxx_chip *chip,int port, -u16 etype) +u16 etype) {u16 val;int err;
drivers/net/dsa/mv88e6xxx/port.h +6 -6
@@ -49,9 +49,9 @@#define MV88E6XXX_PORT_STS_CMODE_2500BASEX 0x000b#define MV88E6XXX_PORT_STS_CMODE_XAUI 0x000c#define MV88E6XXX_PORT_STS_CMODE_RXAUI 0x000d -#define MV88E6XXX_PORT_STS_CMODE_5GBASER 0x000c -#define MV88E6XXX_PORT_STS_CMODE_10GBASER 0x000d -#define MV88E6XXX_PORT_STS_CMODE_USXGMII 0x000e +#define MV88E6393X_PORT_STS_CMODE_5GBASER 0x000c +#define MV88E6393X_PORT_STS_CMODE_10GBASER 0x000d +#define MV88E6393X_PORT_STS_CMODE_USXGMII 0x000e#define MV88E6185_PORT_STS_CDUPLEX 0x0008#define MV88E6185_PORT_STS_CMODE_MASK 0x0007#define MV88E6185_PORT_STS_CMODE_GMII_FD 0x0000
@@ -317,7 +317,7 @@ int mv88e6xxx_port_read(struct mv88e6xxx_chip *chip, int port, int reg,int mv88e6xxx_port_write (struct mv88e6xxx_chip *chip,int port,int reg,u16 val);int mv88e6xxx_port_wait_bit (struct mv88e6xxx_chip *chip,int port,int reg, -int bit,int val); +int bit,int val);int mv88e6185_port_set_pause (struct mv88e6xxx_chip *chip,int port,int pause); int mv88e6352_port_set_rgmii_delay(struct mv88e6xxx_chip *chip, int port,
@@ -345,7 +345,7 @@ int mv88e6390_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,int mv88e6390x_port_set_speed_duplex (struct mv88e6xxx_chip *chip,int port,int speed,int duplex);int mv88e6393x_port_set_speed_duplex (struct mv88e6xxx_chip *chip,int port, -int speed,int duplex); +int speed,int duplex);phy_interface_t mv88e6341_port_max_speed_mode (int port);phy_interface_t mv88e6390_port_max_speed_mode (int port);phy_interface_t mv88e6390x_port_max_speed_mode (int port);
@@ -385,7 +385,7 @@ int mv88e6393x_set_egress_port(struct mv88e6xxx_chip *chip,int mv88e6393x_port_set_cpu_dest (struct mv88e6xxx_chip *chip,int port);int mv88e6393x_port_mgmt_rsvd2cpu (struct mv88e6xxx_chip *chip);int mv88e6393x_port_set_ether_type (struct mv88e6xxx_chip *chip,int port, -u16 etype); +u16 etype);int mv88e6xxx_port_set_message_port (struct mv88e6xxx_chip *chip,int port,bool message_port); int mv88e6165_port_set_jumbo_size(struct mv88e6xxx_chip *chip, int port,
drivers/net/dsa/mv88e6xxx/serdes.c +24 -22
123 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +9 -9
@@ -84,9 +84,9 @@#define MV88E6390_PG_CONTROL 0xf010#define MV88E6390_PG_CONTROL_ENABLE_PC BIT(0) -#define MV88E6393X_PORT0_LANE 0x00 -#define MV88E6393X_PORT9_LANE 0x09 -#define MV88E6393X_PORT10_LANE 0x0a +#define MV88E6393X_PORT0_LANE 0x00 +#define MV88E6393X_PORT9_LANE 0x09 +#define MV88E6393X_PORT10_LANE 0x0a/* Port Operational Configuration */ #define MV88E6393X_PCS_SELECT_1000BASEX 0x0000
@@ -98,13 +98,13 @@#define MV88E6393X_PCS_SELECT_USXGMII_PHY 0x0006#define MV88E6393X_PCS_SELECT_USXGMII_MAC 0x0007 -#define MV88E6393X_SERDES_POC 0xf002 -#define MV88E6393X_SERDES_POC_PCS_MODE_MASK 0x0007 +#define MV88E6393X_SERDES_POC 0xf002 +#define MV88E6393X_SERDES_POC_PCS_MODE_MASK 0x0007#define MV88E6393X_SERDES_POC_RESET BIT(15)#define MV88E6393X_SERDES_POC_PDOWN BIT(5)#define MV88E6393X_SERDES_POC_ANEG BIT(3) -#define MV88E6393X_ERRATA_1000BASEX_SGMII 0xF074 +#define MV88E6393X_ERRATA_1000BASEX_SGMII 0xF074#define MV88E6393X_ERRATA_1000BASEX_SGMII_BIT BIT(14)int mv88e6185_serdes_get_lane (struct mv88e6xxx_chip *chip,int port);
@@ -148,7 +148,7 @@ int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, int lane,int mv88e6390_serdes_power (struct mv88e6xxx_chip *chip,int port,int lane,bool on);int mv88e6393x_serdes_power (struct mv88e6xxx_chip *chip,int port,int lane, -bool on); +bool on);int mv88e6393x_serdes_setup_errata (struct mv88e6xxx_chip *chip);int mv88e6097_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port,int lane,bool enable);
@@ -157,7 +157,7 @@ int mv88e6352_serdes_irq_enable(struct mv88e6xxx_chip *chip, int port, int lane,int mv88e6390_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port,int lane,bool enable);int mv88e6393x_serdes_irq_enable (struct mv88e6xxx_chip *chip,int port, -int lane,bool enable); +int lane,bool enable);irqreturn_t mv88e6097_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,int lane); irqreturn_t mv88e6352_serdes_irq_status(struct mv88e6xxx_chip *chip, int port,
@@ -165,7 +165,7 @@ irqreturn_t mv88e6352_serdes_irq_status(struct mv88e6xxx_chip *chip, int port,irqreturn_t mv88e6390_serdes_irq_status (struct mv88e6xxx_chip *chip,int port,int lane);irqreturn_t mv88e6393x_serdes_irq_status (struct mv88e6xxx_chip *chip,int port, -int lane); +int lane);int mv88e6352_serdes_get_sset_count (struct mv88e6xxx_chip *chip,int port);int mv88e6352_serdes_get_strings (struct mv88e6xxx_chip *chip,int port,uint8_t *data);
Signature · 1 line
2.26.2
Re: [PATCH] changes for Pavana
Still one more change needed for 5gabe-r to work.
I am going to sent fix 5gbase-r and send this patches myself. I will leave Pavana as the author.
Marek
PATCH v7 3/4 net: dsa: mv88e6xxx: Change serdes lane parameter from u8 type to int
In reply to Pavana SharmaReturning 0 is no more an error case with MV88E6393 family which has serdes lane numbers 0, 9 or 10.
So with this change .serdes_get_lane will return lane number or error (-ENODEV).
--- drivers/net/dsa/mv88e6xxx/chip.c | 28 +++++------ drivers/net/dsa/mv88e6xxx/chip.h | 16 +++---- drivers/net/dsa/mv88e6xxx/port.c | 6 +-- drivers/net/dsa/mv88e6xxx/serdes.c | 76 +++++++++++++++--------------- drivers/net/dsa/mv88e6xxx/serdes.h | 50 ++++++++++---------- 5 files changed, 88 insertions(+), 88 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +14 -14
@@ -484,12 +484,12 @@ static int mv88e6xxx_serdes_pcs_get_state(struct dsa_switch *ds, int port, struct phylink_link_state *state) {struct mv88e6xxx_chip *chip = ds->priv; -u8 lane; +int lane = -ENODEV ;int err;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane && chip->info->ops->serdes_pcs_get_state) +if ((lane >=0 ) && chip->info->ops->serdes_pcs_get_state) err = chip->info->ops->serdes_pcs_get_state (chip, port, lane, state);else
@@ -505,11 +505,11 @@ static int mv88e6xxx_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, const unsigned long *advertise) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane = -ENODEV ;if (ops->serdes_pcs_config) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 )return ops->serdes_pcs_config (chip, port, lane, mode, interface, advertise); }
@@ -521,15 +521,15 @@ static void mv88e6xxx_serdes_pcs_an_restart(struct dsa_switch *ds, int port) {struct mv88e6xxx_chip *chip = ds->priv;const struct mv88e6xxx_ops *ops; +int lane = -ENODEV ;int err =0 ; -u8 lane; ops = chip->info->ops;if (ops->serdes_pcs_an_restart) {mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 ) err = ops->serdes_pcs_an_restart (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -543,11 +543,11 @@ static int mv88e6xxx_serdes_pcs_link_up(struct mv88e6xxx_chip *chip, int port, int speed, int duplex) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane = -ENODEV ;if (!phylink_autoneg_inband (mode) && ops->serdes_pcs_link_up) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 )return ops->serdes_pcs_link_up (chip, port, lane, speed, duplex); }
@@ -2424,11 +2424,11 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id)struct mv88e6xxx_chip *chip = mvp->chip;irqreturn_t ret =IRQ_NONE ;int port = mvp->port; -u8 lane; +int lane = -ENODEV ;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 ) ret =mv88e6xxx_serdes_irq_status (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -2436,7 +2436,7 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id) }static int mv88e6xxx_serdes_irq_request (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq;
@@ -2465,7 +2465,7 @@ static int mv88e6xxx_serdes_irq_request(struct mv88e6xxx_chip *chip, int port, }static int mv88e6xxx_serdes_irq_free (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq = dev_id->serdes_irq;
@@ -2490,11 +2490,11 @@ static int mv88e6xxx_serdes_irq_free(struct mv88e6xxx_chip *chip, int port,static int mv88e6xxx_serdes_power (struct mv88e6xxx_chip *chip,int port,bool on) { -u8 lane; +int lane = -ENODEV ;int err; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) +if (lane <0 )return 0 ;if (on) {
drivers/net/dsa/mv88e6xxx/chip.h +8 -8
@@ -490,30 +490,30 @@ struct mv88e6xxx_ops {int (*mgmt_rsvd2cpu)(struct mv88e6xxx_chip *chip);/* Power on/off a SERDES interface */ -int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,int lane,bool up);/* SERDES lane mapping */ -u8 (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port); +int (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port);int (*serdes_pcs_get_state)(struct mv88e6xxx_chip *chip,int port, -u8 lane,struct phylink_link_state *state); +int lane,struct phylink_link_state *state);int (*serdes_pcs_config)(struct mv88e6xxx_chip *chip,int port, -u8 lane,unsigned int mode, +int lane,unsigned int mode,phy_interface_t interface,const unsigned long *advertise);int (*serdes_pcs_an_restart)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);int (*serdes_pcs_link_up)(struct mv88e6xxx_chip *chip,int port, -u8 lane,int speed,int duplex); +int lane,int speed,int duplex);/* SERDES interrupt handling */ unsigned int (*serdes_irq_mapping)(struct mv88e6xxx_chip *chip,int port); -int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,int lane,bool enable);irqreturn_t (*serdes_irq_status)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);/* Statistics from the SERDES interface */ int (*serdes_get_sset_count)(struct mv88e6xxx_chip *chip,int port);
drivers/net/dsa/mv88e6xxx/port.c +3 -3
@@ -393,7 +393,7 @@ phy_interface_t mv88e6390x_port_max_speed_mode(int port)static int mv88e6xxx_port_set_cmode (struct mv88e6xxx_chip *chip,int port,phy_interface_t mode,bool force) { -u8 lane; +int lane = -ENODEV ;u16 cmode;u16 reg;int err;
@@ -430,7 +430,7 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port,return 0 ; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) { +if (lane >=0 ) {if (chip->ports[port].serdes_irq) { err =mv88e6xxx_serdes_irq_disable (chip, port, lane);if (err)
@@ -459,7 +459,7 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port, chip->ports[port].cmode = cmode; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) +if (lane <0 )return -ENODEV ; err =mv88e6xxx_serdes_power_up (chip, port, lane);
drivers/net/dsa/mv88e6xxx/serdes.c +38 -38
285 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +25 -25
117 lines not on this page · raw message
Signature · 1 line
2.17.1
Andrew Lunn
maintainerRe: [PATCH v7 3/4] net: dsa: mv88e6xxx: Change serdes lane parameter from u8 type to int
drivers/net/dsa/mv88e6xxx/serdes.c int mv88e6390_serdes_get_regs_len(struct mv88e6xxx_chip *chip, int port) · line 990
Quoted 8 lines
drivers/net/dsa/mv88e6xxx/serdes.c +1
-1@@ -985,12 +985,12 @@ int mv88e6390_serdes_get_regs_len(struct mv88e6xxx_chip *chip, int port)void mv88e6390_serdes_get_regs (struct mv88e6xxx_chip *chip,int port,void *_p) {u16 *p = _p; -int lane; +int lane = -ENODEV ;u16 reg;int i;
The reverse christmas tree is wrong here.
Andrew
Andrew Lunn
maintainerRe: [PATCH v7 3/4] net: dsa: mv88e6xxx: Change serdes lane parameter from u8 type to int
In reply to Pavana SharmaQuoted 19 lines · Pavana Sharma
Returning 0 is no more an error case with MV88E6393 family which has serdes lane numbers 0, 9 or 10.
So with this change .serdes_get_lane will return lane number or error (-ENODEV).Signed-off-by Pavana Sharma <[email protected]>--- drivers/net/dsa/mv88e6xxx/chip.c | 28 +++++------ drivers/net/dsa/mv88e6xxx/chip.h | 16 +++---- drivers/net/dsa/mv88e6xxx/port.c | 6 +-- drivers/net/dsa/mv88e6xxx/serdes.c | 76 +++++++++++++++--------------- drivers/net/dsa/mv88e6xxx/serdes.h | 50 ++++++++++---------- 5 files changed, 88 insertions(+), 88 deletions(-)drivers/net/dsa/mv88e6xxx/chip.c +0
-0
drivers/net/dsa/mv88e6xxx/chip.c static int mv88e6xxx_serdes_pcs_get_state(struct dsa_switch *ds, int port, · line 488
Quoted 6 lines
drivers/net/dsa/mv88e6xxx/chip.c +1
-1@@ -484,12 +484,12 @@ static int mv88e6xxx_serdes_pcs_get_state(struct dsa_switch *ds, int port, struct phylink_link_state *state) {struct mv88e6xxx_chip *chip = ds->priv; -u8 lane; +int lane = -ENODEV ;int err;
You have added a lot of initialises which are not needed.
drivers/net/dsa/mv88e6xxx/chip.c static int mv88e6xxx_serdes_pcs_get_state(struct dsa_switch *ds, int port, · line 490
Quoted 3 lines
drivers/net/dsa/mv88e6xxx/chip.c +0
-0mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port);
lane is always set, so there is no point in setting it to -ENODEV first.
Quoted 23 lines
drivers/net/dsa/mv88e6xxx/chip.c +3
-3-if (lane && chip->info->ops->serdes_pcs_get_state) +if ((lane >=0 ) && chip->info->ops->serdes_pcs_get_state) err = chip->info->ops->serdes_pcs_get_state (chip, port, lane, state);else @@ -505,11 +505,11 @@ static int mv88e6xxx_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, const unsigned long *advertise) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane = -ENODEV ;if (ops->serdes_pcs_config) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 )return ops->serdes_pcs_config (chip, port, lane, mode, interface, advertise); }@@ -521,15 +521,15 @@ static void mv88e6xxx_serdes_pcs_an_restart(struct dsa_switch *ds, int port) {struct mv88e6xxx_chip *chip = ds->priv;const struct mv88e6xxx_ops *ops;
drivers/net/dsa/mv88e6xxx/chip.c static void mv88e6xxx_serdes_pcs_an_restart(struct dsa_switch *ds, int port) · line 532
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/chip.c +1
-2+int lane = -ENODEV ;int err =0 ; -u8 lane; ops = chip->info->ops;if (ops->serdes_pcs_an_restart) {mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane)
lane is always set inside this if statement, and is never used outside of it.
Quoted 6 lines
drivers/net/dsa/mv88e6xxx/chip.c +1
-0+if (lane >=0 ) err = ops->serdes_pcs_an_restart (chip, port, lane);mv88e6xxx_reg_unlock (chip);@@ -543,11 +543,11 @@ static int mv88e6xxx_serdes_pcs_link_up(struct mv88e6xxx_chip *chip, int port, int speed, int duplex)
drivers/net/dsa/mv88e6xxx/chip.c static int mv88e6xxx_serdes_pcs_link_up(struct mv88e6xxx_chip *chip, int port, · line 551
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/chip.c +2
-2{const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane = -ENODEV ;if (!phylink_autoneg_inband (mode) && ops->serdes_pcs_link_up) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane >=0 ) return ops->serdes_pcs_link_up(chip, port, lane,
lane is always set, and never used outside of the if ....
Andrew
PATCH v7 4/4 net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
In reply to Pavana SharmaThe Marvell 88E6393X device is a single-chip integration of a 11-port Ethernet switch with eight integrated Gigabit Ethernet (GbE) transceivers and three 10-Gigabit interfaces.
This patch adds functionalities specific to mv88e6393x family (88E6393X, 88E6193X and 88E6191X)
---
Changes in v2:
- Fix a warning (Reported-by: kernel test robot <[email protected]>)
Changes in v3:
- Fix 'unused function' warning
Changes in v4-v7:
- Incorporated feedback from maintainers.
--- drivers/net/dsa/mv88e6xxx/chip.c | 136 ++++++++++++++++ drivers/net/dsa/mv88e6xxx/chip.h | 4 + drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/dsa/mv88e6xxx/global2.h | 8 + drivers/net/dsa/mv88e6xxx/port.c | 234 ++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/port.h | 43 ++++- drivers/net/dsa/mv88e6xxx/serdes.c | 225 +++++++++++++++++++++++++- drivers/net/dsa/mv88e6xxx/serdes.h | 41 ++++- 8 files changed, 689 insertions(+), 4 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +136 -0
@@ -634,6 +634,24 @@ static void mv88e6390x_phylink_validate(struct mv88e6xxx_chip *chip, int port,mv88e6390_phylink_validate (chip, port, mask, state); } +static void mv88e6393x_phylink_validate (struct mv88e6xxx_chip *chip,int port, +unsigned long *mask, +struct phylink_link_state *state) +{ +if (port ==0 || port ==9 || port ==10 ) { + phylink_set(mask, 10000baseT_Full); + phylink_set(mask, 10000baseKR_Full); + phylink_set(mask, 5000baseT_Full); + phylink_set(mask, 2500baseX_Full); + phylink_set(mask, 2500baseT_Full); + } + + phylink_set(mask, 1000baseT_Full); + phylink_set(mask, 1000baseX_Full); + +mv88e6065_phylink_validate (chip, port, mask, state); +} +static void mv88e6xxx_validate (struct dsa_switch *ds,int port,unsigned long *supported,struct phylink_link_state *state)
@@ -4141,6 +4159,55 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { .phylink_validate = mv88e6390_phylink_validate, }; +static const struct mv88e6xxx_ops mv88e6393x_ops = { +/* MV88E6XXX_FAMILY_6393 */ + .setup_errata = mv88e6393x_setup_errata, + .irl_init_all = mv88e6390_g2_irl_init_all, + .get_eeprom = mv88e6xxx_g2_get_eeprom8, + .set_eeprom = mv88e6xxx_g2_set_eeprom8, + .set_switch_mac = mv88e6xxx_g2_set_switch_mac, + .phy_read = mv88e6xxx_g2_smi_phy_read, + .phy_write = mv88e6xxx_g2_smi_phy_write, + .port_set_link = mv88e6xxx_port_set_link, + .port_set_speed_duplex = mv88e6393x_port_set_speed_duplex, + .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, + .port_tag_remap = mv88e6390_port_tag_remap, + .port_set_frame_mode = mv88e6351_port_set_frame_mode, + .port_set_egress_floods = mv88e6352_port_set_egress_floods, + .port_set_ether_type = mv88e6393x_port_set_ether_type, + .port_set_jumbo_size = mv88e6165_port_set_jumbo_size, + .port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting, + .port_pause_limit = mv88e6390_port_pause_limit, + .port_set_cmode = mv88e6393x_port_set_cmode, + .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit, + .port_disable_pri_override = mv88e6xxx_port_disable_pri_override, + .port_get_cmode = mv88e6352_port_get_cmode, + .stats_snapshot = mv88e6390_g1_stats_snapshot, + .stats_set_histogram = mv88e6390_g1_stats_set_histogram, + .stats_get_sset_count = mv88e6320_stats_get_sset_count, + .stats_get_strings = mv88e6320_stats_get_strings, + .stats_get_stats = mv88e6390_stats_get_stats, + .set_cpu_port = mv88e6393x_port_set_cpu_dest, + .set_egress_port = mv88e6393x_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, + .mgmt_rsvd2cpu = mv88e6393x_port_mgmt_rsvd2cpu, + .pot_clear = mv88e6xxx_g2_pot_clear, + .reset = mv88e6352_g1_reset, + .rmu_disable = mv88e6390_g1_rmu_disable, + .vtu_getnext = mv88e6390_g1_vtu_getnext, + .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge, + .serdes_power = mv88e6393x_serdes_power, + .serdes_get_lane = mv88e6393x_serdes_get_lane, + .serdes_pcs_get_state = mv88e6390_serdes_pcs_get_state, + .serdes_irq_mapping = mv88e6390_serdes_irq_mapping, + .serdes_irq_enable = mv88e6393x_serdes_irq_enable, + .serdes_irq_status = mv88e6393x_serdes_irq_status, + .gpio_ops = &mv88e6352_gpio_ops, + .avb_ops = &mv88e6390_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, + .phylink_validate = mv88e6393x_phylink_validate, +}; +static const struct mv88e6xxx_ops mv88e6240_ops = {/* MV88E6XXX_FAMILY_6352 */ .ieee_pri_map = mv88e6085_g1_ieee_pri_map,
@@ -5073,6 +5140,52 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .ops = &mv88e6191_ops, }, + [MV88E6191X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6191X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6191X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, + + [MV88E6193X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6193X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6193X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, + [MV88E6220] = { .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6220, .family = MV88E6XXX_FAMILY_6250,
@@ -5363,6 +5476,29 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .ptp_support = true, .ops = &mv88e6390x_ops, }, + + [MV88E6393X] = { + .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6393X, + .family = MV88E6XXX_FAMILY_6393, + .name = "Marvell 88E6393X", + .num_databases = 4096, + .num_ports = 11, /* 10 + Z80 */ + .num_internal_phys = 9, + .max_vid = 8191, + .port_base_addr = 0x0, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, + .global2_addr = 0x1c, + .age_time_coeff = 3750, + .g1_irqs = 10, + .g2_irqs = 14, + .atu_move_port_mask = 0x1f, + .pvt = true, + .multi_chip = true, + .tag_protocol = DSA_TAG_PROTO_DSA, + .ptp_support = true, + .ops = &mv88e6393x_ops, + }, };static const struct mv88e6xxx_info *mv88e6xxx_lookup_info (unsigned int prod_num)
drivers/net/dsa/mv88e6xxx/chip.h +4 -0
@@ -63,6 +63,8 @@ enum mv88e6xxx_model {MV88E6190 ,MV88E6190X ,MV88E6191 , +MV88E6191X , +MV88E6193X ,MV88E6220 ,MV88E6240 , MV88E6250,
@@ -75,6 +77,7 @@ enum mv88e6xxx_model {MV88E6352 ,MV88E6390 ,MV88E6390X , + MV88E6393X, }; enum mv88e6xxx_family {
@@ -90,6 +93,7 @@ enum mv88e6xxx_family {MV88E6XXX_FAMILY_6351 ,/* 6171 6175 6350 6351 */ MV88E6XXX_FAMILY_6352 ,/* 6172 6176 6240 6352 */ MV88E6XXX_FAMILY_6390 ,/* 6190 6190X 6191 6290 6390 6390X */ + MV88E6XXX_FAMILY_6393, /* 6191X 6193X 6393X */ };struct mv88e6xxx_ops ;
drivers/net/dsa/mv88e6xxx/global1.h +2 -0
@@ -22,6 +22,7 @@#define MV88E6185_G1_STS_PPU_STATE_DISABLED 0x8000#define MV88E6185_G1_STS_PPU_STATE_POLLING 0xc000#define MV88E6XXX_G1_STS_INIT_READY 0x0800 +#define MV88E6393X_G1_STS_IRQ_DEVICE_2 9#define MV88E6XXX_G1_STS_IRQ_AVB 8#define MV88E6XXX_G1_STS_IRQ_DEVICE 7#define MV88E6XXX_G1_STS_IRQ_STATS 6
@@ -59,6 +60,7 @@#define MV88E6185_G1_CTL1_SCHED_PRIO 0x0800#define MV88E6185_G1_CTL1_MAX_FRAME_1632 0x0400#define MV88E6185_G1_CTL1_RELOAD_EEPROM 0x0200 +#define MV88E6393X_G1_CTL1_DEVICE2_EN 0x0200#define MV88E6XXX_G1_CTL1_DEVICE_EN 0x0080#define MV88E6XXX_G1_CTL1_STATS_DONE_EN 0x0040#define MV88E6XXX_G1_CTL1_VTU_PROBLEM_EN 0x0020
drivers/net/dsa/mv88e6xxx/global2.h +8 -0
@@ -38,9 +38,15 @@/* Offset 0x02: MGMT Enable Register 2x */ #define MV88E6XXX_G2_MGMT_EN_2X 0x02 +/* Offset 0x02: MAC LINK change IRQ Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_SRC 0x02 +/* Offset 0x03: MGMT Enable Register 0x */ #define MV88E6XXX_G2_MGMT_EN_0X 0x03 +/* Offset 0x03: MAC LINK change IRQ Mask Register for MV88E6393X */ +#define MV88E6393X_G2_MACLINK_INT_MASK 0x03 +/* Offset 0x04: Flow Control Delay Register */ #define MV88E6XXX_G2_FLOW_CTL 0x04
@@ -52,6 +58,8 @@#define MV88E6XXX_G2_SWITCH_MGMT_FORCE_FLOW_CTL_PRI 0x0080#define MV88E6XXX_G2_SWITCH_MGMT_RSVD2CPU 0x0008 +#define MV88E6393X_G2_EGRESS_MONITOR_DEST 0x05 +/* Offset 0x06: Device Mapping Table Register */ #define MV88E6XXX_G2_DEVICE_MAPPING 0x06#define MV88E6XXX_G2_DEVICE_MAPPING_UPDATE 0x8000
drivers/net/dsa/mv88e6xxx/port.c +234 -0
276 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/port.h +41 -2
97 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.c +224 -1
247 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +40 -1
76 lines not on this page · raw message
Signature · 1 line
2.17.1
Andrew Lunn
maintainerRe: [PATCH v7 0/4] Add support for mv88e6393x family of Marvell
In reply to Pavana SharmaQuoted 2 lines · Pavana Sharma
Thanks for the review.
Here's updated patchset.
Please include a short description of what you have changed since the last version. It helps us as maintainers see if you have attempted to make the changes we have requested, or not.
Andrew
PATCH v6 4/4 net: dsa: mv88e6xxx: Change serdes lane parameter from u8 to int
In reply to Pavana SharmaReturning 0 is no more an error case with MV88E6393 family which has serdes lane numbers 0, 9 or 10.
So with this change .serdes_get_lane will return lane number or error (-ENODEV).
--- drivers/net/dsa/mv88e6xxx/chip.c | 28 +++++----- drivers/net/dsa/mv88e6xxx/chip.h | 16 +++--- drivers/net/dsa/mv88e6xxx/port.c | 6 +-- drivers/net/dsa/mv88e6xxx/serdes.c | 86 +++++++++++++++--------------- drivers/net/dsa/mv88e6xxx/serdes.h | 58 ++++++++++---------- 5 files changed, 96 insertions(+), 98 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +14 -14
@@ -484,12 +484,12 @@ static int mv88e6xxx_serdes_pcs_get_state(struct dsa_switch *ds, int port, struct phylink_link_state *state) {struct mv88e6xxx_chip *chip = ds->priv; -u8 lane; +int lane;int err;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane && chip->info->ops->serdes_pcs_get_state) +if ((lane != -ENODEV ) && chip->info->ops->serdes_pcs_get_state) err = chip->info->ops->serdes_pcs_get_state (chip, port, lane, state);else
@@ -505,11 +505,11 @@ static int mv88e6xxx_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, const unsigned long *advertise) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane;if (ops->serdes_pcs_config) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane != -ENODEV )return ops->serdes_pcs_config (chip, port, lane, mode, interface, advertise); }
@@ -522,14 +522,14 @@ static void mv88e6xxx_serdes_pcs_an_restart(struct dsa_switch *ds, int port)struct mv88e6xxx_chip *chip = ds->priv;const struct mv88e6xxx_ops *ops;int err =0 ; -u8 lane; +int lane; ops = chip->info->ops;if (ops->serdes_pcs_an_restart) {mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane != -ENODEV ) err = ops->serdes_pcs_an_restart (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -543,11 +543,11 @@ static int mv88e6xxx_serdes_pcs_link_up(struct mv88e6xxx_chip *chip, int port, int speed, int duplex) {const struct mv88e6xxx_ops *ops = chip->info->ops; -u8 lane; +int lane;if (!phylink_autoneg_inband (mode) && ops->serdes_pcs_link_up) { lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane != -ENODEV )return ops->serdes_pcs_link_up (chip, port, lane, speed, duplex); }
@@ -2442,11 +2442,11 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id)struct mv88e6xxx_chip *chip = mvp->chip;irqreturn_t ret =IRQ_NONE ;int port = mvp->port; -u8 lane; +int lane;mv88e6xxx_reg_lock (chip); lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) +if (lane != -ENODEV ) ret =mv88e6xxx_serdes_irq_status (chip, port, lane);mv88e6xxx_reg_unlock (chip);
@@ -2454,7 +2454,7 @@ static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id) }static int mv88e6xxx_serdes_irq_request (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq;
@@ -2483,7 +2483,7 @@ static int mv88e6xxx_serdes_irq_request(struct mv88e6xxx_chip *chip, int port, }static int mv88e6xxx_serdes_irq_free (struct mv88e6xxx_chip *chip,int port, -u8 lane) +int lane) {struct mv88e6xxx_port *dev_id = &chip->ports[port];unsigned int irq = dev_id->serdes_irq;
@@ -2508,11 +2508,11 @@ static int mv88e6xxx_serdes_irq_free(struct mv88e6xxx_chip *chip, int port,static int mv88e6xxx_serdes_power (struct mv88e6xxx_chip *chip,int port,bool on) { -u8 lane; +int lane;int err; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) +if (lane == -ENODEV )return 0 ;if (on) {
drivers/net/dsa/mv88e6xxx/chip.h +8 -8
@@ -494,30 +494,30 @@ struct mv88e6xxx_ops {int (*mgmt_rsvd2cpu)(struct mv88e6xxx_chip *chip);/* Power on/off a SERDES interface */ -int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_power)(struct mv88e6xxx_chip *chip,int port,int lane,bool up);/* SERDES lane mapping */ -u8 (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port); +int (*serdes_get_lane)(struct mv88e6xxx_chip *chip,int port);int (*serdes_pcs_get_state)(struct mv88e6xxx_chip *chip,int port, -u8 lane,struct phylink_link_state *state); +int lane,struct phylink_link_state *state);int (*serdes_pcs_config)(struct mv88e6xxx_chip *chip,int port, -u8 lane,unsigned int mode, +int lane,unsigned int mode,phy_interface_t interface,const unsigned long *advertise);int (*serdes_pcs_an_restart)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);int (*serdes_pcs_link_up)(struct mv88e6xxx_chip *chip,int port, -u8 lane,int speed,int duplex); +int lane,int speed,int duplex);/* SERDES interrupt handling */ unsigned int (*serdes_irq_mapping)(struct mv88e6xxx_chip *chip,int port); -int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,u8 lane, +int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip,int port,int lane,bool enable);irqreturn_t (*serdes_irq_status)(struct mv88e6xxx_chip *chip,int port, -u8 lane); +int lane);/* Statistics from the SERDES interface */ int (*serdes_get_sset_count)(struct mv88e6xxx_chip *chip,int port);
drivers/net/dsa/mv88e6xxx/port.c +3 -3
@@ -483,7 +483,7 @@ int mv88e6393x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,static int mv88e6xxx_port_set_cmode (struct mv88e6xxx_chip *chip,int port,phy_interface_t mode,bool force) { -u8 lane; +int lane;u16 cmode;u16 reg;int err;
@@ -530,7 +530,7 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port,return 0 ; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (lane) { +if (lane != -ENODEV ) {if (chip->ports[port].serdes_irq) { err =mv88e6xxx_serdes_irq_disable (chip, port, lane);if (err)
@@ -559,7 +559,7 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port, chip->ports[port].cmode = cmode; lane =mv88e6xxx_serdes_get_lane (chip, port); -if (!lane) +if (lane == -ENODEV )return -ENODEV ; err =mv88e6xxx_serdes_power_up (chip, port, lane);
drivers/net/dsa/mv88e6xxx/serdes.c +42 -44
322 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/serdes.h +29 -29
128 lines not on this page · raw message
Signature · 1 line
2.17.1
Jakub Kicinski
maintainerRe: [PATCH v5 3/3] net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
In reply to Pavana SharmaQuoted 7 lines · On Wed, 28 Oct 2020 10:09:50 +1000 Pavana Sharma wrote:
The Marvell 88E6393X device is a single-chip integration of a 11-port Ethernet switch with eight integrated Gigabit Ethernet (GbE) transceivers and three 10-Gigabit interfaces.
This patch adds functionalities specific to mv88e6393x family (88E6393X, 88E6193X and 88E6191X)
Quoted 8 lines
Signed-off-by Pavana Sharma <[email protected]>---
Changes in v2:
- Fix a warning (Reported-by: kernel test robot <[email protected]>)
Changes in v3:
- Fix 'unused function' warning
Changes in v4, v5:
- Incorporated feedback from maintainers.
drivers/net/dsa/mv88e6xxx/port.c:29:5: warning: no previous prototype for ‘mv88e6xxx_port_wait_bit’ [-Wmissing-prototypes]
29 | int mv88e6xxx_port_wait_bit(struct mv88e6xxx_chip *chip, int port, int reg,
| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/net/dsa/mv88e6xxx/port.c:29:5: warning: symbol 'mv88e6xxx_port_wait_bit' was not declared. Should it be static?
drivers/net/dsa/mv88e6xxx/port.c:29:5: warning: no previous prototype for ‘mv88e6xxx_port_wait_bit’ [-Wmissing-prototypes]
29 | int mv88e6xxx_port_wait_bit(struct mv88e6xxx_chip *chip, int port, int reg,
| ^~~~~~~~~~~~~~~~~~~~~~~kernel test robot
build botRe: [PATCH v5 3/3] net: dsa: mv88e6xxx: Add support for mv88e6393x family of Marvell
In reply to Pavana SharmaThank you for the patch! Perhaps something to improve:
Hi Pavana,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on robh/for-next]
[also build test WARNING on net-next/master net/master linus/master sparc-next/master v5.10-rc1 next-20201028] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Pavana-Sharma/Add-support-for-mv88e6393x-family-of-Marvell/20201028-094528 base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next config: x86_64-randconfig-a002-20201028 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 772aaa602383cf82795572ebcd86b0e660f3579f)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# https://github.com/0day-ci/linux/commit/f94f949ebd95e4501f9af58a2e358e5c32761c67
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Pavana-Sharma/Add-support-for-mv88e6393x-family-of-Marvell/20201028-094528 git checkout f94f949ebd95e4501f9af58a2e358e5c32761c67
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/net/dsa/mv88e6xxx/port.c:29:5: warning: no previous prototype for function 'mv88e6xxx_port_wait_bit' [-Wmissing-prototypes]
int mv88e6xxx_port_wait_bit(struct mv88e6xxx_chip *chip, int port, int reg,
^ drivers/net/dsa/mv88e6xxx/port.c:29:1: note: declare 'static' if the function is not intended to be used outside of this translation unit int mv88e6xxx_port_wait_bit(struct mv88e6xxx_chip *chip, int port, int reg,
^
static
1 warning generated.
vim +/mv88e6xxx_port_wait_bit +29 drivers/net/dsa/mv88e6xxx/port.c
28
> 29 int mv88e6xxx_port_wait_bit(struct mv88e6xxx_chip *chip, int port, int reg,
30 int bit, int val)
31 {
32 int addr = chip->info->port_base_addr + port;
33
34 return mv88e6xxx_wait_bit(chip, addr, reg, bit, val);
35 }
36 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org