Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / drivers / net / ethernet / mellanox / mlxsw / core.c

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c
index e70bb673eeecf35327ecf321517ba87a51781dad..9e8e3e92f3693507bc9a0a5e72a3b425c52c2e00 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.c
@@ -568,7 +568,7 @@ static int mlxsw_emad_init(struct mlxsw_core *mlxsw_core)
        if (!(mlxsw_core->bus->features & MLXSW_BUS_F_TXRX))
                return 0;
 
-       emad_wq = alloc_workqueue("mlxsw_core_emad", WQ_MEM_RECLAIM, 0);
+       emad_wq = alloc_workqueue("mlxsw_core_emad", 0, 0);
        if (!emad_wq)
                return -ENOMEM;
        mlxsw_core->emad_wq = emad_wq;
@@ -934,6 +934,46 @@ mlxsw_devlink_sb_occ_tc_port_bind_get(struct devlink_port *devlink_port,
                                                     pool_type, p_cur, p_max);
 }
 
+static int
+mlxsw_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req,
+                      struct netlink_ext_ack *extack)
+{
+       struct mlxsw_core *mlxsw_core = devlink_priv(devlink);
+       char fw_info_psid[MLXSW_REG_MGIR_FW_INFO_PSID_SIZE];
+       u32 hw_rev, fw_major, fw_minor, fw_sub_minor;
+       char mgir_pl[MLXSW_REG_MGIR_LEN];
+       char buf[32];
+       int err;
+
+       err = devlink_info_driver_name_put(req,
+                                          mlxsw_core->bus_info->device_kind);
+       if (err)
+               return err;
+
+       mlxsw_reg_mgir_pack(mgir_pl);
+       err = mlxsw_reg_query(mlxsw_core, MLXSW_REG(mgir), mgir_pl);
+       if (err)
+               return err;
+       mlxsw_reg_mgir_unpack(mgir_pl, &hw_rev, fw_info_psid, &fw_major,
+                             &fw_minor, &fw_sub_minor);
+
+       sprintf(buf, "%X", hw_rev);
+       err = devlink_info_version_fixed_put(req, "hw.revision", buf);
+       if (err)
+               return err;
+
+       err = devlink_info_version_fixed_put(req, "fw.psid", fw_info_psid);
+       if (err)
+               return err;
+
+       sprintf(buf, "%d.%d.%d", fw_major, fw_minor, fw_sub_minor);
+       err = devlink_info_version_running_put(req, "fw.version", buf);
+       if (err)
+               return err;
+
+       return 0;
+}
+
 static int mlxsw_devlink_core_bus_device_reload(struct devlink *devlink,
                                                struct netlink_ext_ack *extack)
 {
@@ -968,6 +1008,7 @@ static const struct devlink_ops mlxsw_devlink_ops = {
        .sb_occ_max_clear               = mlxsw_devlink_sb_occ_max_clear,
        .sb_occ_port_pool_get           = mlxsw_devlink_sb_occ_port_pool_get,
        .sb_occ_tc_port_bind_get        = mlxsw_devlink_sb_occ_tc_port_bind_get,
+       .info_get                       = mlxsw_devlink_info_get,
 };
 
 static int
@@ -1720,7 +1761,9 @@ EXPORT_SYMBOL(mlxsw_core_res_get);
 
 int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port,
                         u32 port_number, bool split,
-                        u32 split_port_subnumber)
+                        u32 split_port_subnumber,
+                        const unsigned char *switch_id,
+                        unsigned char switch_id_len)
 {
        struct devlink *devlink = priv_to_devlink(mlxsw_core);
        struct mlxsw_core_port *mlxsw_core_port =
@@ -1730,7 +1773,8 @@ int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port,
 
        mlxsw_core_port->local_port = local_port;
        devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,
-                              port_number, split, split_port_subnumber);
+                              port_number, split, split_port_subnumber,
+                              switch_id, switch_id_len);
        err = devlink_port_register(devlink, devlink_port, local_port);
        if (err)
                memset(mlxsw_core_port, 0, sizeof(*mlxsw_core_port));
@@ -1796,16 +1840,18 @@ enum devlink_port_type mlxsw_core_port_type_get(struct mlxsw_core *mlxsw_core,
 }
 EXPORT_SYMBOL(mlxsw_core_port_type_get);
 
-int mlxsw_core_port_get_phys_port_name(struct mlxsw_core *mlxsw_core,
-                                      u8 local_port, char *name, size_t len)
+
+struct devlink_port *
+mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core,
+                                u8 local_port)
 {
        struct mlxsw_core_port *mlxsw_core_port =
                                        &mlxsw_core->ports[local_port];
        struct devlink_port *devlink_port = &mlxsw_core_port->devlink_port;
 
-       return devlink_port_get_phys_port_name(devlink_port, name, len);
+       return devlink_port;
 }
-EXPORT_SYMBOL(mlxsw_core_port_get_phys_port_name);
+EXPORT_SYMBOL(mlxsw_core_port_devlink_port_get);
 
 static void mlxsw_core_buf_dump_dbg(struct mlxsw_core *mlxsw_core,
                                    const char *buf, size_t size)
@@ -1958,10 +2004,10 @@ static int __init mlxsw_core_module_init(void)
 {
        int err;
 
-       mlxsw_wq = alloc_workqueue(mlxsw_core_driver_name, WQ_MEM_RECLAIM, 0);
+       mlxsw_wq = alloc_workqueue(mlxsw_core_driver_name, 0, 0);
        if (!mlxsw_wq)
                return -ENOMEM;
-       mlxsw_owq = alloc_ordered_workqueue("%s_ordered", WQ_MEM_RECLAIM,
+       mlxsw_owq = alloc_ordered_workqueue("%s_ordered", 0,
                                            mlxsw_core_driver_name);
        if (!mlxsw_owq) {
                err = -ENOMEM;