Commit bce9a0b7 authored by Edwin Peer's avatar Edwin Peer Committed by Jakub Kicinski
Browse files

bnxt_en: use firmware provided max timeout for messages 



Some older devices cannot accommodate the 40 seconds timeout
cap for long running commands (such as NVRAM commands) due to
hardware limitations. Allow these devices to request more time for
these long running commands, but print a warning, since the longer
timeout may cause the hung task watchdog to trigger. In the case of a
firmware update operation, this is preferable to failing outright.

v2: Use bp->hwrm_cmd_max_timeout directly without the constants.

Fixes: 881d8353 ("bnxt_en: Add an upper bound for all firmware command timeouts.")
Signed-off-by: default avatarEdwin Peer <edwin.peer@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 662c9b22

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+6 −0
Original line number Diff line number Diff line
@@ -8034,6 +8034,12 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp) 
	bp->hwrm_cmd_timeout = le16_to_cpu(resp->def_req_timeout);

	if (!bp->hwrm_cmd_timeout)

		bp->hwrm_cmd_timeout = DFLT_HWRM_CMD_TIMEOUT;

	bp->hwrm_cmd_max_timeout = le16_to_cpu(resp->max_req_timeout) * 1000;

	if (!bp->hwrm_cmd_max_timeout)

		bp->hwrm_cmd_max_timeout = HWRM_CMD_MAX_TIMEOUT;

	else if (bp->hwrm_cmd_max_timeout > HWRM_CMD_MAX_TIMEOUT)

		netdev_warn(bp->dev, "Device requests max timeout of %d seconds, may trigger hung task watchdog\n",

			    bp->hwrm_cmd_max_timeout / 1000);



	if (resp->hwrm_intf_maj_8b >= 1) {

		bp->hwrm_max_req_len = le16_to_cpu(resp->max_req_win_len);

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+2 −1
Original line number Diff line number Diff line
@@ -1987,7 +1987,8 @@ struct bnxt { 


	u16			hwrm_max_req_len;

	u16			hwrm_max_ext_req_len;

	int			hwrm_cmd_timeout;

	unsigned int		hwrm_cmd_timeout;

	unsigned int		hwrm_cmd_max_timeout;

	struct mutex		hwrm_cmd_lock;	/* serialize hwrm messages */

	struct hwrm_ver_get_output	ver_resp;

#define FW_VER_STR_LEN		32

drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static int bnxt_hwrm_dbg_dma_data(struct bnxt *bp, void *msg, 
		return -ENOMEM;

	}



	hwrm_req_timeout(bp, msg, HWRM_COREDUMP_TIMEOUT);

	hwrm_req_timeout(bp, msg, bp->hwrm_cmd_max_timeout);

	cmn_resp = hwrm_req_hold(bp, msg);

	resp = cmn_resp;
@@ -125,7 +125,7 @@ static int bnxt_hwrm_dbg_coredump_initiate(struct bnxt *bp, u16 component_id, 
	if (rc)

		return rc;



	hwrm_req_timeout(bp, req, HWRM_COREDUMP_TIMEOUT);

	hwrm_req_timeout(bp, req, bp->hwrm_cmd_max_timeout);

	req->component_id = cpu_to_le16(component_id);

	req->segment_id = cpu_to_le16(segment_id);

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

+3 −6
Original line number Diff line number Diff line
@@ -31,9 +31,6 @@ 
#include "bnxt_nvm_defs.h"	/* NVRAM content constant and structure defs */

#include "bnxt_fw_hdr.h"	/* Firmware hdr constant and structure defs */

#include "bnxt_coredump.h"

#define FLASH_NVRAM_TIMEOUT	((HWRM_CMD_TIMEOUT) * 100)

#define FLASH_PACKAGE_TIMEOUT	((HWRM_CMD_TIMEOUT) * 200)

#define INSTALL_PACKAGE_TIMEOUT	((HWRM_CMD_TIMEOUT) * 200)



static u32 bnxt_get_msglevel(struct net_device *dev)

{
@@ -2194,7 +2191,7 @@ static int bnxt_flash_nvram(struct net_device *dev, u16 dir_type, 
		req->host_src_addr = cpu_to_le64(dma_handle);

	}



	hwrm_req_timeout(bp, req, FLASH_NVRAM_TIMEOUT);

	hwrm_req_timeout(bp, req, bp->hwrm_cmd_max_timeout);

	req->dir_type = cpu_to_le16(dir_type);

	req->dir_ordinal = cpu_to_le16(dir_ordinal);

	req->dir_ext = cpu_to_le16(dir_ext);
@@ -2540,8 +2537,8 @@ int bnxt_flash_package_from_fw_obj(struct net_device *dev, const struct firmware 
		return rc;

	}



	hwrm_req_timeout(bp, modify, FLASH_PACKAGE_TIMEOUT);

	hwrm_req_timeout(bp, install, INSTALL_PACKAGE_TIMEOUT);

	hwrm_req_timeout(bp, modify, bp->hwrm_cmd_max_timeout);

	hwrm_req_timeout(bp, install, bp->hwrm_cmd_max_timeout);



	hwrm_req_hold(bp, modify);

	modify->host_src_addr = cpu_to_le64(dma_handle);

drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ static int __hwrm_send(struct bnxt *bp, struct bnxt_hwrm_ctx *ctx) 
	}



	/* Limit timeout to an upper limit */

	timeout = min_t(uint, ctx->timeout, HWRM_CMD_MAX_TIMEOUT);

	timeout = min(ctx->timeout, bp->hwrm_cmd_max_timeout ?: HWRM_CMD_MAX_TIMEOUT);

	/* convert timeout to usec */

	timeout *= 1000;