[patch net-next RFC 4/8] mlxsw: Pass switch ID through devlink_port_attrs_set()

[Jiri Pirko]

From: Jiri Pirko <j...@mellanox.com>

Pass the switch ID down the to devlink through devlink_port_attrs_set()
so it can be used by devlink_compat_switch_id_get().

Signed-off-by: Jiri Pirko <j...@mellanox.com>
---
 drivers/net/ethernet/mellanox/mlxsw/core.c     | 6 ++++--
 drivers/net/ethernet/mellanox/mlxsw/core.h     | 4 +++-
 drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 +++-
 drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 3 ++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c 
b/drivers/net/ethernet/mellanox/mlxsw/core.c
index a2fecfdec2a1..b770fa711c40 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.c
@@ -1748,7 +1748,9 @@ EXPORT_SYMBOL(mlxsw_core_port_fini);
 void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u8 local_port,
                             void *port_driver_priv, struct net_device *dev,
                             u32 port_number, bool split,
-                            u32 split_port_subnumber)
+                            u32 split_port_subnumber,
+                            const unsigned char *switch_id,
+                            unsigned char switch_id_len)
 {
        struct mlxsw_core_port *mlxsw_core_port =
                                        &mlxsw_core->ports[local_port];
@@ -1757,7 +1759,7 @@ void mlxsw_core_port_eth_set(struct mlxsw_core 
*mlxsw_core, u8 local_port,
        mlxsw_core_port->port_driver_priv = port_driver_priv;
        devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,
                               port_number, split, split_port_subnumber,
-                              NULL, 0);
+                              switch_id, switch_id_len);
        devlink_port_type_eth_set(devlink_port, dev);
 }
 EXPORT_SYMBOL(mlxsw_core_port_eth_set);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.h 
b/drivers/net/ethernet/mellanox/mlxsw/core.h
index 60b017a07cea..af28b6e894f4 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.h
@@ -169,7 +169,9 @@ void mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u8 
local_port);
 void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u8 local_port,
                             void *port_driver_priv, struct net_device *dev,
                             u32 port_number, bool split,
-                            u32 split_port_subnumber);
+                            u32 split_port_subnumber,
+                            const unsigned char *switch_id,
+                            unsigned char switch_id_len);
 void mlxsw_core_port_ib_set(struct mlxsw_core *mlxsw_core, u8 local_port,
                            void *port_driver_priv);
 void mlxsw_core_port_clear(struct mlxsw_core *mlxsw_core, u8 local_port,
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c 
b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 5d0adec84858..75c5b8f65912 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -3670,7 +3670,9 @@ static int mlxsw_sp_port_create(struct mlxsw_sp 
*mlxsw_sp, u8 local_port,
 
        mlxsw_core_port_eth_set(mlxsw_sp->core, mlxsw_sp_port->local_port,
                                mlxsw_sp_port, dev, module + 1,
-                               mlxsw_sp_port->split, lane / width);
+                               mlxsw_sp_port->split, lane / width,
+                               mlxsw_sp->base_mac,
+                               sizeof(mlxsw_sp->base_mac));
        mlxsw_core_schedule_dw(&mlxsw_sp_port->periodic_hw_stats.update_dw, 0);
        return 0;
 
diff --git a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c 
b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
index 9999d866f394..e6c7bf78f245 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
@@ -1091,7 +1091,8 @@ static int __mlxsw_sx_port_eth_create(struct mlxsw_sx 
*mlxsw_sx, u8 local_port,
        }
 
        mlxsw_core_port_eth_set(mlxsw_sx->core, mlxsw_sx_port->local_port,
-                               mlxsw_sx_port, dev, module + 1, false, 0);
+                               mlxsw_sx_port, dev, module + 1, false, 0,
+                               mlxsw_sx->hw_id, sizeof(mlxsw_sx->hw_id));
        mlxsw_sx->ports[local_port] = mlxsw_sx_port;
        return 0;
 
-- 
2.14.5