Commit 5bcfb6a4 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: Propagate extack down to register_fib_notifier() 



During the devlink reaload the extack is present, so propagate it all
the way down to register_fib_notifier() call in spectrum_router.c.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b2a880f

drivers/net/ethernet/mellanox/mlxsw/core.c

+8 −5
Original line number Diff line number Diff line
@@ -1005,7 +1005,7 @@ mlxsw_devlink_core_bus_device_reload_up(struct devlink *devlink, 
	return mlxsw_core_bus_device_register(mlxsw_core->bus_info,

					      mlxsw_core->bus,

					      mlxsw_core->bus_priv, true,

					      devlink);

					      devlink, extack);

}



static int mlxsw_devlink_flash_update(struct devlink *devlink,
@@ -1098,7 +1098,8 @@ static int 
__mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,

				 const struct mlxsw_bus *mlxsw_bus,

				 void *bus_priv, bool reload,

				 struct devlink *devlink)

				 struct devlink *devlink,

				 struct netlink_ext_ack *extack)

{

	const char *device_kind = mlxsw_bus_info->device_kind;

	struct mlxsw_core *mlxsw_core;
@@ -1172,7 +1173,7 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, 
	}



	if (mlxsw_driver->init) {

		err = mlxsw_driver->init(mlxsw_core, mlxsw_bus_info);

		err = mlxsw_driver->init(mlxsw_core, mlxsw_bus_info, extack);

		if (err)

			goto err_driver_init;

	}
@@ -1223,14 +1224,16 @@ err_devlink_alloc: 
int mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,

				   const struct mlxsw_bus *mlxsw_bus,

				   void *bus_priv, bool reload,

				   struct devlink *devlink)

				   struct devlink *devlink,

				   struct netlink_ext_ack *extack)

{

	bool called_again = false;

	int err;



again:

	err = __mlxsw_core_bus_device_register(mlxsw_bus_info, mlxsw_bus,

					       bus_priv, reload, devlink);

					       bus_priv, reload,

					       devlink, extack);

	/* -EAGAIN is returned in case the FW was updated. FW needs

	 * a reset, so lets try to call __mlxsw_core_bus_device_register()

	 * again.

drivers/net/ethernet/mellanox/mlxsw/core.h

+4 −2
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ void mlxsw_core_driver_unregister(struct mlxsw_driver *mlxsw_driver); 
int mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,

				   const struct mlxsw_bus *mlxsw_bus,

				   void *bus_priv, bool reload,

				   struct devlink *devlink);

				   struct devlink *devlink,

				   struct netlink_ext_ack *extack);

void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core, bool reload);



struct mlxsw_tx_info {
@@ -253,7 +254,8 @@ struct mlxsw_driver { 
	const char *kind;

	size_t priv_size;

	int (*init)(struct mlxsw_core *mlxsw_core,

		    const struct mlxsw_bus_info *mlxsw_bus_info);

		    const struct mlxsw_bus_info *mlxsw_bus_info,

		    struct netlink_ext_ack *extack);

	void (*fini)(struct mlxsw_core *mlxsw_core);

	int (*basic_trap_groups_set)(struct mlxsw_core *mlxsw_core);

	int (*port_type_set)(struct mlxsw_core *mlxsw_core, u8 local_port,

drivers/net/ethernet/mellanox/mlxsw/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ static int mlxsw_i2c_probe(struct i2c_client *client, 


	err = mlxsw_core_bus_device_register(&mlxsw_i2c->bus_info,

					     &mlxsw_i2c_bus, mlxsw_i2c, false,

					     NULL);

					     NULL, NULL);

	if (err) {

		dev_err(&client->dev, "Fail to register core bus\n");

		return err;

drivers/net/ethernet/mellanox/mlxsw/minimal.c

+2 −1
Original line number Diff line number Diff line
@@ -327,7 +327,8 @@ static void mlxsw_m_ports_remove(struct mlxsw_m *mlxsw_m) 
}



static int mlxsw_m_init(struct mlxsw_core *mlxsw_core,

			const struct mlxsw_bus_info *mlxsw_bus_info)

			const struct mlxsw_bus_info *mlxsw_bus_info,

			struct netlink_ext_ack *extack)

{

	struct mlxsw_m *mlxsw_m = mlxsw_core_driver_priv(mlxsw_core);

	int err;

drivers/net/ethernet/mellanox/mlxsw/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1802,7 +1802,7 @@ static int mlxsw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	err = mlxsw_core_bus_device_register(&mlxsw_pci->bus_info,

					     &mlxsw_pci_bus, mlxsw_pci, false,

					     NULL);

					     NULL, NULL);

	if (err) {

		dev_err(&pdev->dev, "cannot register bus device\n");

		goto err_bus_device_register;

CRA Git | Maintained and supported by SUSTech CRA and CCSE