Commit 32def412 authored by Amir Tzin's avatar Amir Tzin Committed by Saeed Mahameed
Browse files

net/mlx5: Read timeout values from DTOR 



Replace hard coded timeouts with values stored by firmware in default
timeouts register (DTOR). Timeouts are read during driver load. If DTOR
is not supported by firmware then fallback to hard coded defaults
instead.

Signed-off-by: default avatarAmir Tzin <amirtz@nvidia.com>
Reviewed-by: default avatarMoshe Shemesh <moshe@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 5945e1ad

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

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ void mlx5e_reporter_rq_cqe_err(struct mlx5e_rq *rq); 
void mlx5e_reporter_rx_timeout(struct mlx5e_rq *rq);



#define MLX5E_REPORTER_PER_Q_MAX_LEN 256

#define MLX5E_REPORTER_FLUSH_TIMEOUT_MSEC 2000



struct mlx5e_err_ctx {

	int (*recover)(void *ctx);

drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c

+5 −2
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include "txrx.h"

#include "devlink.h"

#include "ptp.h"

#include "lib/tout.h"



static int mlx5e_query_rq_state(struct mlx5_core_dev *dev, u32 rqn, u8 *state)

{
@@ -32,8 +33,10 @@ static int mlx5e_query_rq_state(struct mlx5_core_dev *dev, u32 rqn, u8 *state) 


static int mlx5e_wait_for_icosq_flush(struct mlx5e_icosq *icosq)

{

	unsigned long exp_time = jiffies +

				 msecs_to_jiffies(MLX5E_REPORTER_FLUSH_TIMEOUT_MSEC);

	struct mlx5_core_dev *dev = icosq->channel->mdev;

	unsigned long exp_time;



	exp_time = jiffies + msecs_to_jiffies(mlx5_tout_ms(dev, FLUSH_ON_ERROR));



	while (time_before(jiffies, exp_time)) {

		if (icosq->cc == icosq->pc)

drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c

+5 −2
Original line number Diff line number Diff line
@@ -4,11 +4,14 @@ 
#include "health.h"

#include "en/ptp.h"

#include "en/devlink.h"

#include "lib/tout.h"



static int mlx5e_wait_for_sq_flush(struct mlx5e_txqsq *sq)

{

	unsigned long exp_time = jiffies +

				 msecs_to_jiffies(MLX5E_REPORTER_FLUSH_TIMEOUT_MSEC);

	struct mlx5_core_dev *dev = sq->mdev;

	unsigned long exp_time;



	exp_time = jiffies + msecs_to_jiffies(mlx5_tout_ms(dev, FLUSH_ON_ERROR));



	while (time_before(jiffies, exp_time)) {

		if (sq->cc == sq->pc)

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

+5 −4
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/module.h>

#include "mlx5_core.h"

#include "../../mlxfw/mlxfw.h"

#include "lib/tout.h"

#include "accel/tls.h"



enum {
@@ -317,10 +318,9 @@ int mlx5_cmd_force_teardown_hca(struct mlx5_core_dev *dev) 
	return 0;

}



#define MLX5_FAST_TEARDOWN_WAIT_MS   3000

int mlx5_cmd_fast_teardown_hca(struct mlx5_core_dev *dev)

{

	unsigned long end, delay_ms = MLX5_FAST_TEARDOWN_WAIT_MS;

	unsigned long end, delay_ms = mlx5_tout_ms(dev, TEARDOWN);

	u32 out[MLX5_ST_SZ_DW(teardown_hca_out)] = {};

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

	int state;
@@ -618,17 +618,18 @@ static void mlx5_fsm_release(struct mlxfw_dev *mlxfw_dev, u32 fwhandle) 
			 fwhandle, 0);

}



#define MLX5_FSM_REACTIVATE_TOUT 5000 /* msecs */

static int mlx5_fsm_reactivate(struct mlxfw_dev *mlxfw_dev, u8 *status)

{

	unsigned long exp_time = jiffies + msecs_to_jiffies(MLX5_FSM_REACTIVATE_TOUT);

	struct mlx5_mlxfw_dev *mlx5_mlxfw_dev =

		container_of(mlxfw_dev, struct mlx5_mlxfw_dev, mlxfw_dev);

	struct mlx5_core_dev *dev = mlx5_mlxfw_dev->mlx5_core_dev;

	u32 out[MLX5_ST_SZ_DW(mirc_reg)];

	u32 in[MLX5_ST_SZ_DW(mirc_reg)];

	unsigned long exp_time;

	int err;



	exp_time = jiffies + msecs_to_jiffies(mlx5_tout_ms(dev, FSM_REACTIVATE));



	if (!MLX5_CAP_MCAM_REG2(dev, mirc))

		return -EOPNOTSUPP;

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

+7 −9
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include "fw_reset.h"

#include "diag/fw_tracer.h"

#include "lib/tout.h"



enum {

	MLX5_FW_RESET_FLAGS_RESET_REQUESTED,
@@ -228,8 +229,6 @@ static void mlx5_sync_reset_request_event(struct work_struct *work) 
		mlx5_core_warn(dev, "PCI Sync FW Update Reset Ack. Device reset is expected.\n");

}



#define MLX5_PCI_LINK_UP_TIMEOUT 2000



static int mlx5_pci_link_toggle(struct mlx5_core_dev *dev)

{

	struct pci_bus *bridge_bus = dev->pdev->bus;
@@ -286,7 +285,7 @@ static int mlx5_pci_link_toggle(struct mlx5_core_dev *dev) 
		goto restore;

	}



	timeout = jiffies + msecs_to_jiffies(MLX5_PCI_LINK_UP_TIMEOUT);

	timeout = jiffies + msecs_to_jiffies(mlx5_tout_ms(dev, PCI_TOGGLE));

	do {

		err = pci_read_config_word(bridge, cap + PCI_EXP_LNKSTA, &reg16);

		if (err)
@@ -299,8 +298,8 @@ static int mlx5_pci_link_toggle(struct mlx5_core_dev *dev) 
	if (reg16 & PCI_EXP_LNKSTA_DLLLA) {

		mlx5_core_info(dev, "PCI Link up\n");

	} else {

		mlx5_core_err(dev, "PCI link not ready (0x%04x) after %d ms\n",

			      reg16, MLX5_PCI_LINK_UP_TIMEOUT);

		mlx5_core_err(dev, "PCI link not ready (0x%04x) after %llu ms\n",

			      reg16, mlx5_tout_ms(dev, PCI_TOGGLE));

		err = -ETIMEDOUT;

	}
@@ -395,16 +394,15 @@ static int fw_reset_event_notifier(struct notifier_block *nb, unsigned long acti 
	return NOTIFY_OK;

}



#define MLX5_FW_RESET_TIMEOUT_MSEC 5000

int mlx5_fw_reset_wait_reset_done(struct mlx5_core_dev *dev)

{

	unsigned long timeout = msecs_to_jiffies(MLX5_FW_RESET_TIMEOUT_MSEC);

	unsigned long timeout = msecs_to_jiffies(mlx5_tout_ms(dev, PCI_SYNC_UPDATE));

	struct mlx5_fw_reset *fw_reset = dev->priv.fw_reset;

	int err;



	if (!wait_for_completion_timeout(&fw_reset->done, timeout)) {

		mlx5_core_warn(dev, "FW sync reset timeout after %d seconds\n",

			       MLX5_FW_RESET_TIMEOUT_MSEC / 1000);

		mlx5_core_warn(dev, "FW sync reset timeout after %llu seconds\n",

			       mlx5_tout_ms(dev, PCI_SYNC_UPDATE) / 1000);

		err = -ETIMEDOUT;

		goto out;

	}