mlxsw: spectrum: Add port type-speed operations

Add port type-speed operations in order to have different operations for
different ASICs. For now, both ASICs use the same pointer.

Signed-off-by: Shalom Toledo <shalomt@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 951e96b..895cc42 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -2473,7 +2473,8 @@ static const struct mlxsw_sp1_port_link_mode mlxsw_sp1_port_link_mode[] = {
 #define MLXSW_SP1_PORT_LINK_MODE_LEN ARRAY_SIZE(mlxsw_sp1_port_link_mode)
 
 static void
-mlxsw_sp1_from_ptys_supported_port(u32 ptys_eth_proto,
+mlxsw_sp1_from_ptys_supported_port(struct mlxsw_sp *mlxsw_sp,
+                                  u32 ptys_eth_proto,
                                   struct ethtool_link_ksettings *cmd)
 {
        if (ptys_eth_proto & (MLXSW_REG_PTYS_ETH_SPEED_10GBASE_CR |
@@ -2492,7 +2493,9 @@ mlxsw_sp1_from_ptys_supported_port(u32 ptys_eth_proto,
                ethtool_link_ksettings_add_link_mode(cmd, supported, Backplane);
 }
 
-static void mlxsw_sp1_from_ptys_link(u32 ptys_eth_proto, unsigned long *mode)
+static void
+mlxsw_sp1_from_ptys_link(struct mlxsw_sp *mlxsw_sp, u32 ptys_eth_proto,
+                        unsigned long *mode)
 {
        int i;
 
@@ -2504,7 +2507,8 @@ static void mlxsw_sp1_from_ptys_link(u32 ptys_eth_proto, unsigned long *mode)
 }
 
 static void
-mlxsw_sp1_from_ptys_speed_duplex(bool carrier_ok, u32 ptys_eth_proto,
+mlxsw_sp1_from_ptys_speed_duplex(struct mlxsw_sp *mlxsw_sp, bool carrier_ok,
+                                u32 ptys_eth_proto,
                                 struct ethtool_link_ksettings *cmd)
 {
        u32 speed = SPEED_UNKNOWN;
@@ -2527,7 +2531,8 @@ out:
 }
 
 static u32
-mlxsw_sp1_to_ptys_advert_link(const struct ethtool_link_ksettings *cmd)
+mlxsw_sp1_to_ptys_advert_link(struct mlxsw_sp *mlxsw_sp,
+                             const struct ethtool_link_ksettings *cmd)
 {
        u32 ptys_proto = 0;
        int i;
@@ -2540,7 +2545,7 @@ mlxsw_sp1_to_ptys_advert_link(const struct ethtool_link_ksettings *cmd)
        return ptys_proto;
 }
 
-static u32 mlxsw_sp1_to_ptys_speed(u32 speed)
+static u32 mlxsw_sp1_to_ptys_speed(struct mlxsw_sp *mlxsw_sp, u32 speed)
 {
        u32 ptys_proto = 0;
        int i;
@@ -2552,7 +2557,8 @@ static u32 mlxsw_sp1_to_ptys_speed(u32 speed)
        return ptys_proto;
 }
 
-static u32 mlxsw_sp1_to_ptys_upper_speed(u32 upper_speed)
+static u32
+mlxsw_sp1_to_ptys_upper_speed(struct mlxsw_sp *mlxsw_sp, u32 upper_speed)
 {
        u32 ptys_proto = 0;
        int i;
@@ -2564,25 +2570,74 @@ static u32 mlxsw_sp1_to_ptys_upper_speed(u32 upper_speed)
        return ptys_proto;
 }
 
-static void mlxsw_sp_port_get_link_supported(u32 eth_proto_cap,
-                                            struct ethtool_link_ksettings *cmd)
+static int
+mlxsw_sp1_port_speed_base(struct mlxsw_sp *mlxsw_sp, u8 local_port,
+                         u32 *base_speed)
+{
+       *base_speed = MLXSW_SP_PORT_BASE_SPEED_25G;
+       return 0;
+}
+
+static void
+mlxsw_sp1_reg_ptys_eth_pack(struct mlxsw_sp *mlxsw_sp, char *payload,
+                           u8 local_port, u32 proto_admin, bool autoneg)
+{
+       mlxsw_reg_ptys_eth_pack(payload, local_port, proto_admin, autoneg);
+}
+
+static void
+mlxsw_sp1_reg_ptys_eth_unpack(struct mlxsw_sp *mlxsw_sp, char *payload,
+                             u32 *p_eth_proto_cap, u32 *p_eth_proto_admin,
+                             u32 *p_eth_proto_oper)
+{
+       mlxsw_reg_ptys_eth_unpack(payload, p_eth_proto_cap, p_eth_proto_admin,
+                                 p_eth_proto_oper);
+}
+
+static const struct mlxsw_sp_port_type_speed_ops
+mlxsw_sp1_port_type_speed_ops = {
+       .from_ptys_supported_port       = mlxsw_sp1_from_ptys_supported_port,
+       .from_ptys_link                 = mlxsw_sp1_from_ptys_link,
+       .from_ptys_speed_duplex         = mlxsw_sp1_from_ptys_speed_duplex,
+       .to_ptys_advert_link            = mlxsw_sp1_to_ptys_advert_link,
+       .to_ptys_speed                  = mlxsw_sp1_to_ptys_speed,
+       .to_ptys_upper_speed            = mlxsw_sp1_to_ptys_upper_speed,
+       .port_speed_base                = mlxsw_sp1_port_speed_base,
+       .reg_ptys_eth_pack              = mlxsw_sp1_reg_ptys_eth_pack,
+       .reg_ptys_eth_unpack            = mlxsw_sp1_reg_ptys_eth_unpack,
+};
+
+static void
+mlxsw_sp_port_get_link_supported(struct mlxsw_sp *mlxsw_sp, u32 eth_proto_cap,
+                                struct ethtool_link_ksettings *cmd)
 {
+       const struct mlxsw_sp_port_type_speed_ops *ops;
+
+       ops = mlxsw_sp->port_type_speed_ops;
+
        ethtool_link_ksettings_add_link_mode(cmd, supported, Asym_Pause);
        ethtool_link_ksettings_add_link_mode(cmd, supported, Autoneg);
        ethtool_link_ksettings_add_link_mode(cmd, supported, Pause);
 
-       mlxsw_sp1_from_ptys_supported_port(eth_proto_cap, cmd);
-       mlxsw_sp1_from_ptys_link(eth_proto_cap, cmd->link_modes.supported);
+       ops->from_ptys_supported_port(mlxsw_sp, eth_proto_cap, cmd);
+       ops->from_ptys_link(mlxsw_sp, eth_proto_cap, cmd->link_modes.supported);
 }
 
-static void mlxsw_sp_port_get_link_advertise(u32 eth_proto_admin, bool autoneg,
-                                            struct ethtool_link_ksettings *cmd)
+static void
+mlxsw_sp_port_get_link_advertise(struct mlxsw_sp *mlxsw_sp,
+                                u32 eth_proto_admin, bool autoneg,
+                                struct ethtool_link_ksettings *cmd)
 {
+       const struct mlxsw_sp_port_type_speed_ops *ops;
+
+       ops = mlxsw_sp->port_type_speed_ops;
+
        if (!autoneg)
                return;
 
        ethtool_link_ksettings_add_link_mode(cmd, advertising, Autoneg);
-       mlxsw_sp1_from_ptys_link(eth_proto_admin, cmd->link_modes.advertising);
+       ops->from_ptys_link(mlxsw_sp, eth_proto_admin,
+                           cmd->link_modes.advertising);
 }
 
 static u8
@@ -2619,31 +2674,36 @@ static int mlxsw_sp_port_get_link_ksettings(struct net_device *dev,
        u32 eth_proto_cap, eth_proto_admin, eth_proto_oper;
        struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);
        struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
+       const struct mlxsw_sp_port_type_speed_ops *ops;
        char ptys_pl[MLXSW_REG_PTYS_LEN];
        u8 connector_type;
        u8 autoneg_status;
        bool autoneg;
        int err;
 
+       ops = mlxsw_sp->port_type_speed_ops;
+
        autoneg = mlxsw_sp_port->link.autoneg;
-       mlxsw_reg_ptys_eth_pack(ptys_pl, mlxsw_sp_port->local_port, 0, false);
+       ops->reg_ptys_eth_pack(mlxsw_sp, ptys_pl, mlxsw_sp_port->local_port,
+                              0, false);
        err = mlxsw_reg_query(mlxsw_sp->core, MLXSW_REG(ptys), ptys_pl);
        if (err)
                return err;
-       mlxsw_reg_ptys_eth_unpack(ptys_pl, &eth_proto_cap, &eth_proto_admin,
-                                 &eth_proto_oper);
+       ops->reg_ptys_eth_unpack(mlxsw_sp, ptys_pl, &eth_proto_cap,
+                                &eth_proto_admin, &eth_proto_oper);
 
-       mlxsw_sp_port_get_link_supported(eth_proto_cap, cmd);
+       mlxsw_sp_port_get_link_supported(mlxsw_sp, eth_proto_cap, cmd);
 
-       mlxsw_sp_port_get_link_advertise(eth_proto_admin, autoneg, cmd);
+       mlxsw_sp_port_get_link_advertise(mlxsw_sp, eth_proto_admin, autoneg,
+                                        cmd);
 
        autoneg_status = mlxsw_reg_ptys_an_status_get(ptys_pl);
 
        cmd->base.autoneg = autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE;
        connector_type = mlxsw_reg_ptys_connector_type_get(ptys_pl);
        cmd->base.port = mlxsw_sp_port_connector_port(connector_type);
-       mlxsw_sp1_from_ptys_speed_duplex(netif_carrier_ok(dev), eth_proto_oper,
-                                        cmd);
+       ops->from_ptys_speed_duplex(mlxsw_sp, netif_carrier_ok(dev),
+                                   eth_proto_oper, cmd);
 
        return 0;
 }
@@ -2654,21 +2714,25 @@ mlxsw_sp_port_set_link_ksettings(struct net_device *dev,
 {
        struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);
        struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
+       const struct mlxsw_sp_port_type_speed_ops *ops;
        char ptys_pl[MLXSW_REG_PTYS_LEN];
        u32 eth_proto_cap, eth_proto_new;
        bool autoneg;
        int err;
 
-       mlxsw_reg_ptys_eth_pack(ptys_pl, mlxsw_sp_port->local_port, 0, false);
+       ops = mlxsw_sp->port_type_speed_ops;
+
+       ops->reg_ptys_eth_pack(mlxsw_sp, ptys_pl, mlxsw_sp_port->local_port,
+                              0, false);
        err = mlxsw_reg_query(mlxsw_sp->core, MLXSW_REG(ptys), ptys_pl);
        if (err)
                return err;
-       mlxsw_reg_ptys_eth_unpack(ptys_pl, &eth_proto_cap, NULL, NULL);
+       ops->reg_ptys_eth_unpack(mlxsw_sp, ptys_pl, &eth_proto_cap, NULL, NULL);
 
        autoneg = cmd->base.autoneg == AUTONEG_ENABLE;
        eth_proto_new = autoneg ?
-               mlxsw_sp1_to_ptys_advert_link(cmd) :
-               mlxsw_sp1_to_ptys_speed(cmd->base.speed);
+               ops->to_ptys_advert_link(mlxsw_sp, cmd) :
+               ops->to_ptys_speed(mlxsw_sp, cmd->base.speed);
 
        eth_proto_new = eth_proto_new & eth_proto_cap;
        if (!eth_proto_new) {
@@ -2676,8 +2740,8 @@ mlxsw_sp_port_set_link_ksettings(struct net_device *dev,
                return -EINVAL;
        }
 
-       mlxsw_reg_ptys_eth_pack(ptys_pl, mlxsw_sp_port->local_port,
-                               eth_proto_new, autoneg);
+       ops->reg_ptys_eth_pack(mlxsw_sp, ptys_pl, mlxsw_sp_port->local_port,
+                              eth_proto_new, autoneg);
        err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ptys), ptys_pl);
        if (err)
                return err;
@@ -2864,13 +2928,24 @@ static int
 mlxsw_sp_port_speed_by_width_set(struct mlxsw_sp_port *mlxsw_sp_port, u8 width)
 {
        struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
-       u32 upper_speed = MLXSW_SP_PORT_BASE_SPEED * width;
+       const struct mlxsw_sp_port_type_speed_ops *ops;
        char ptys_pl[MLXSW_REG_PTYS_LEN];
        u32 eth_proto_admin;
+       u32 upper_speed;
+       u32 base_speed;
+       int err;
+
+       ops = mlxsw_sp->port_type_speed_ops;
+
+       err = ops->port_speed_base(mlxsw_sp, mlxsw_sp_port->local_port,
+                                  &base_speed);
+       if (err)
+               return err;
+       upper_speed = base_speed * width;
 
-       eth_proto_admin = mlxsw_sp1_to_ptys_upper_speed(upper_speed);
-       mlxsw_reg_ptys_eth_pack(ptys_pl, mlxsw_sp_port->local_port,
-                               eth_proto_admin, mlxsw_sp_port->link.autoneg);
+       eth_proto_admin = ops->to_ptys_upper_speed(mlxsw_sp, upper_speed);
+       ops->reg_ptys_eth_pack(mlxsw_sp, ptys_pl, mlxsw_sp_port->local_port,
+                              eth_proto_admin, mlxsw_sp_port->link.autoneg);
        return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ptys), ptys_pl);
 }
 
@@ -4095,6 +4170,7 @@ static int mlxsw_sp1_init(struct mlxsw_core *mlxsw_core,
        mlxsw_sp->mac_mask = mlxsw_sp1_mac_mask;
        mlxsw_sp->rif_ops_arr = mlxsw_sp1_rif_ops_arr;
        mlxsw_sp->sb_vals = &mlxsw_sp1_sb_vals;
+       mlxsw_sp->port_type_speed_ops = &mlxsw_sp1_port_type_speed_ops;
 
        return mlxsw_sp_init(mlxsw_core, mlxsw_bus_info);
 }
@@ -4113,6 +4189,7 @@ static int mlxsw_sp2_init(struct mlxsw_core *mlxsw_core,
        mlxsw_sp->mac_mask = mlxsw_sp2_mac_mask;
        mlxsw_sp->rif_ops_arr = mlxsw_sp2_rif_ops_arr;
        mlxsw_sp->sb_vals = &mlxsw_sp2_sb_vals;
+       mlxsw_sp->port_type_speed_ops = &mlxsw_sp1_port_type_speed_ops;
 
        return mlxsw_sp_init(mlxsw_core, mlxsw_bus_info);
 }

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index 8bb83d0..d4f5363 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -33,7 +33,7 @@
 
 #define MLXSW_SP_PORTS_PER_CLUSTER_MAX 4
 
-#define MLXSW_SP_PORT_BASE_SPEED 25000 /* Mb/s */
+#define MLXSW_SP_PORT_BASE_SPEED_25G 25000 /* Mb/s */
 
 #define MLXSW_SP_KVD_LINEAR_SIZE 98304 /* entries */
 #define MLXSW_SP_KVD_GRANULARITY 128
@@ -134,6 +134,7 @@ struct mlxsw_sp_mr_tcam_ops;
 struct mlxsw_sp_acl_tcam_ops;
 struct mlxsw_sp_nve_ops;
 struct mlxsw_sp_sb_vals;
+struct mlxsw_sp_port_type_speed_ops;
 
 struct mlxsw_sp {
        struct mlxsw_sp_port **ports;
@@ -169,6 +170,7 @@ struct mlxsw_sp {
        const struct mlxsw_sp_nve_ops **nve_ops_arr;
        const struct mlxsw_sp_rif_ops **rif_ops_arr;
        const struct mlxsw_sp_sb_vals *sb_vals;
+       const struct mlxsw_sp_port_type_speed_ops *port_type_speed_ops;
 };
 
 static inline struct mlxsw_sp_upper *
@@ -258,6 +260,29 @@ struct mlxsw_sp_port {
        struct mlxsw_sp_acl_block *eg_acl_block;
 };
 
+struct mlxsw_sp_port_type_speed_ops {
+       void (*from_ptys_supported_port)(struct mlxsw_sp *mlxsw_sp,
+                                        u32 ptys_eth_proto,
+                                        struct ethtool_link_ksettings *cmd);
+       void (*from_ptys_link)(struct mlxsw_sp *mlxsw_sp, u32 ptys_eth_proto,
+                              unsigned long *mode);
+       void (*from_ptys_speed_duplex)(struct mlxsw_sp *mlxsw_sp,
+                                      bool carrier_ok, u32 ptys_eth_proto,
+                                      struct ethtool_link_ksettings *cmd);
+       u32 (*to_ptys_advert_link)(struct mlxsw_sp *mlxsw_sp,
+                                  const struct ethtool_link_ksettings *cmd);
+       u32 (*to_ptys_speed)(struct mlxsw_sp *mlxsw_sp, u32 speed);
+       u32 (*to_ptys_upper_speed)(struct mlxsw_sp *mlxsw_sp, u32 upper_speed);
+       int (*port_speed_base)(struct mlxsw_sp *mlxsw_sp, u8 local_port,
+                              u32 *base_speed);
+       void (*reg_ptys_eth_pack)(struct mlxsw_sp *mlxsw_sp, char *payload,
+                                 u8 local_port, u32 proto_admin, bool autoneg);
+       void (*reg_ptys_eth_unpack)(struct mlxsw_sp *mlxsw_sp, char *payload,
+                                   u32 *p_eth_proto_cap,
+                                   u32 *p_eth_proto_admin,
+                                   u32 *p_eth_proto_oper);
+};
+
 static inline struct net_device *
 mlxsw_sp_bridge_vxlan_dev_find(struct net_device *br_dev)
 {