Merge branch 'bnxt_en-Bug-fixes' (09cb9f26) · Commits · 戴 / test

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

+5 −11

Original line number	Diff line number	Diff line
		@@ -4176,14 +4176,12 @@ static int bnxt_hwrm_do_send_msg(struct bnxt bp, void msg, u32 msg_len,
		int i, intr_process, rc, tmo_count;
		struct input *req = msg;
		u32 *data = msg;
		__le32 *resp_len;
		u8 *valid;
		u16 cp_ring_id, len = 0;
		struct hwrm_err_output *resp = bp->hwrm_cmd_resp_addr;
		u16 max_req_len = BNXT_HWRM_MAX_REQ_LEN;
		struct hwrm_short_input short_input = {0};
		u32 doorbell_offset = BNXT_GRCPF_REG_CHIMP_COMM_TRIGGER;
		u8 resp_addr = (u8 )bp->hwrm_cmd_resp_addr;
		u32 bar_offset = BNXT_GRCPF_REG_CHIMP_COMM;
		u16 dst = BNXT_HWRM_CHNL_CHIMP;

		@@ -4201,7 +4199,6 @@ static int bnxt_hwrm_do_send_msg(struct bnxt bp, void msg, u32 msg_len,
		bar_offset = BNXT_GRCPF_REG_KONG_COMM;
		doorbell_offset = BNXT_GRCPF_REG_KONG_COMM_TRIGGER;
		resp = bp->hwrm_cmd_kong_resp_addr;
		resp_addr = (u8 *)bp->hwrm_cmd_kong_resp_addr;
		}

		memset(resp, 0, PAGE_SIZE);
		@@ -4270,7 +4267,6 @@ static int bnxt_hwrm_do_send_msg(struct bnxt bp, void msg, u32 msg_len,
		tmo_count = HWRM_SHORT_TIMEOUT_COUNTER;
		timeout = timeout - HWRM_SHORT_MIN_TIMEOUT * HWRM_SHORT_TIMEOUT_COUNTER;
		tmo_count += DIV_ROUND_UP(timeout, HWRM_MIN_TIMEOUT);
		resp_len = (__le32 *)(resp_addr + HWRM_RESP_LEN_OFFSET);

		if (intr_process) {
		u16 seq_id = bp->hwrm_intr_seq_id;
		@@ -4298,9 +4294,8 @@ static int bnxt_hwrm_do_send_msg(struct bnxt bp, void msg, u32 msg_len,
		le16_to_cpu(req->req_type));
		return -EBUSY;
		}
		len = (le32_to_cpu(*resp_len) & HWRM_RESP_LEN_MASK) >>
		HWRM_RESP_LEN_SFT;
		valid = resp_addr + len - 1;
		len = le16_to_cpu(resp->resp_len);
		valid = ((u8 *)resp) + len - 1;
		} else {
		int j;

		@@ -4311,8 +4306,7 @@ static int bnxt_hwrm_do_send_msg(struct bnxt bp, void msg, u32 msg_len,
		*/
		if (test_bit(BNXT_STATE_FW_FATAL_COND, &bp->state))
		return -EBUSY;
		len = (le32_to_cpu(*resp_len) & HWRM_RESP_LEN_MASK) >>
		HWRM_RESP_LEN_SFT;
		len = le16_to_cpu(resp->resp_len);
		if (len)
		break;
		/* on first few passes, just barely sleep */
		@@ -4334,7 +4328,7 @@ static int bnxt_hwrm_do_send_msg(struct bnxt bp, void msg, u32 msg_len,
		}

		/* Last byte of resp contains valid bit */
		valid = resp_addr + len - 1;
		valid = ((u8 *)resp) + len - 1;
		for (j = 0; j < HWRM_VALID_BIT_DELAY_USEC; j++) {
		/* make sure we read from updated DMA memory */
		dma_rmb();
		@@ -9310,7 +9304,7 @@ static void __bnxt_close_nic(struct bnxt *bp, bool irq_re_init,
		bnxt_free_skbs(bp);

		/* Save ring stats before shutdown */
		if (bp->bnapi)
		if (bp->bnapi && irq_re_init)
		bnxt_get_ring_stats(bp, &bp->net_stats_prev);
		if (irq_re_init) {
		bnxt_free_irq(bp);

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -656,11 +656,6 @@ struct nqe_cn {
		#define HWRM_CMD_TIMEOUT (bp->hwrm_cmd_timeout)
		#define HWRM_RESET_TIMEOUT ((HWRM_CMD_TIMEOUT) * 4)
		#define HWRM_COREDUMP_TIMEOUT ((HWRM_CMD_TIMEOUT) * 12)
		#define HWRM_RESP_ERR_CODE_MASK 0xffff
		#define HWRM_RESP_LEN_OFFSET 4
		#define HWRM_RESP_LEN_MASK 0xffff0000
		#define HWRM_RESP_LEN_SFT 16
		#define HWRM_RESP_VALID_MASK 0xff000000
		#define BNXT_HWRM_REQ_MAX_SIZE 128
		#define BNXT_HWRM_REQS_PER_PAGE (BNXT_PAGE_SIZE / \
		BNXT_HWRM_REQ_MAX_SIZE)

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -2012,11 +2012,12 @@ int bnxt_flash_package_from_file(struct net_device dev, const char filename,

		bnxt_hwrm_fw_set_time(bp);

		if (bnxt_find_nvram_item(dev, BNX_DIR_TYPE_UPDATE,
		rc = bnxt_find_nvram_item(dev, BNX_DIR_TYPE_UPDATE,
		BNX_DIR_ORDINAL_FIRST, BNX_DIR_EXT_NONE,
		&index, &item_len, NULL) != 0) {
		&index, &item_len, NULL);
		if (rc) {
		netdev_err(dev, "PKG update area not created in nvram\n");
		return -ENOBUFS;
		return rc;
		}

		rc = request_firmware(&fw, filename, &dev->dev);

Admin message