Commit a7e7b40c authored by Saeed Mahameed's avatar Saeed Mahameed
Browse files

net/mlx5e: Use the correct lag ports number when creating TISes 



The cited commit moved the code of mlx5e_create_tises() and changed the
loop to create TISes over MLX5_MAX_PORTS constant value, instead of
getting the correct lag ports supported by the device, which can cause
FW errors on devices with less than MLX5_MAX_PORTS ports.

Change that back to mlx5e_get_num_lag_ports(mdev).

Also IPoIB interfaces create there own TISes, they don't use the eth
TISes, pass a flag to indicate that.

Fixes: b25bd37c ("net/mlx5: Move TISes from priv to mdev HW resources")
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent bee9705c

drivers/net/ethernet/mellanox/mlx5/core/en.h

+1 −1
Original line number Diff line number Diff line
@@ -1124,7 +1124,7 @@ static inline bool mlx5_tx_swp_supported(struct mlx5_core_dev *mdev) 
extern const struct ethtool_ops mlx5e_ethtool_ops;



int mlx5e_create_mkey(struct mlx5_core_dev *mdev, u32 pdn, u32 *mkey);

int mlx5e_create_mdev_resources(struct mlx5_core_dev *mdev);

int mlx5e_create_mdev_resources(struct mlx5_core_dev *mdev, bool create_tises);

void mlx5e_destroy_mdev_resources(struct mlx5_core_dev *mdev);

int mlx5e_refresh_tirs(struct mlx5e_priv *priv, bool enable_uc_lb,

		       bool enable_mc_lb);

drivers/net/ethernet/mellanox/mlx5/core/en_common.c

+13 −8
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static void mlx5e_destroy_tises(struct mlx5_core_dev *mdev, u32 tisn[MLX5_MAX_PO 
{

	int tc, i;



	for (i = 0; i < MLX5_MAX_PORTS; i++)

	for (i = 0; i < mlx5e_get_num_lag_ports(mdev); i++)

		for (tc = 0; tc < MLX5_MAX_NUM_TC; tc++)

			mlx5e_destroy_tis(mdev, tisn[i][tc]);

}
@@ -110,7 +110,7 @@ static int mlx5e_create_tises(struct mlx5_core_dev *mdev, u32 tisn[MLX5_MAX_PORT 
	int tc, i;

	int err;



	for (i = 0; i < MLX5_MAX_PORTS; i++) {

	for (i = 0; i < mlx5e_get_num_lag_ports(mdev); i++) {

		for (tc = 0; tc < MLX5_MAX_NUM_TC; tc++) {

			u32 in[MLX5_ST_SZ_DW(create_tis_in)] = {};

			void *tisc;
@@ -140,7 +140,7 @@ static int mlx5e_create_tises(struct mlx5_core_dev *mdev, u32 tisn[MLX5_MAX_PORT 
	return err;

}



int mlx5e_create_mdev_resources(struct mlx5_core_dev *mdev)

int mlx5e_create_mdev_resources(struct mlx5_core_dev *mdev, bool create_tises)

{

	struct mlx5e_hw_objs *res = &mdev->mlx5e_res.hw_objs;

	int err;
@@ -169,11 +169,15 @@ int mlx5e_create_mdev_resources(struct mlx5_core_dev *mdev) 
		goto err_destroy_mkey;

	}



	if (create_tises) {

		err = mlx5e_create_tises(mdev, res->tisn);

		if (err) {

			mlx5_core_err(mdev, "alloc tises failed, %d\n", err);

			goto err_destroy_bfreg;

		}

		res->tisn_valid = true;

	}



	INIT_LIST_HEAD(&res->td.tirs_list);

	mutex_init(&res->td.list_lock);
@@ -203,6 +207,7 @@ void mlx5e_destroy_mdev_resources(struct mlx5_core_dev *mdev) 


	mlx5_crypto_dek_cleanup(mdev->mlx5e_res.dek_priv);

	mdev->mlx5e_res.dek_priv = NULL;

	if (res->tisn_valid)

		mlx5e_destroy_tises(mdev, res->tisn);

	mlx5_free_bfreg(mdev, &res->bfreg);

	mlx5_core_destroy_mkey(mdev, res->mkey);

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+1 −1
Original line number Diff line number Diff line
@@ -5992,7 +5992,7 @@ static int mlx5e_resume(struct auxiliary_device *adev) 
	if (netif_device_present(netdev))

		return 0;



	err = mlx5e_create_mdev_resources(mdev);

	err = mlx5e_create_mdev_resources(mdev, true);

	if (err)

		return err;

drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c

+1 −1
Original line number Diff line number Diff line
@@ -783,7 +783,7 @@ static int mlx5_rdma_setup_rn(struct ib_device *ibdev, u32 port_num, 
		}



		/* This should only be called once per mdev */

		err = mlx5e_create_mdev_resources(mdev);

		err = mlx5e_create_mdev_resources(mdev, false);

		if (err)

			goto destroy_ht;

	}

include/linux/mlx5/driver.h

+1 −0
Original line number Diff line number Diff line
@@ -681,6 +681,7 @@ struct mlx5e_resources { 
		struct mlx5_sq_bfreg       bfreg;

#define MLX5_MAX_NUM_TC 8

		u32                        tisn[MLX5_MAX_PORTS][MLX5_MAX_NUM_TC];

		bool			   tisn_valid;

	} hw_objs;

	struct net_device *uplink_netdev;

	struct mutex uplink_netdev_lock;