hinic: add log in exception handling processes (90f86b8a) · Commits · 戴 / test

drivers/net/ethernet/huawei/hinic/hinic_hw_api_cmd.c

+25 −2

Original line number	Diff line number	Diff line
		@@ -112,6 +112,26 @@ static u32 get_hw_cons_idx(struct hinic_api_cmd_chain *chain)
		return HINIC_API_CMD_STATUS_GET(val, CONS_IDX);
		}

		static void dump_api_chain_reg(struct hinic_api_cmd_chain *chain)
		{
		u32 addr, val;

		addr = HINIC_CSR_API_CMD_STATUS_ADDR(chain->chain_type);
		val = hinic_hwif_read_reg(chain->hwif, addr);

		dev_err(&chain->hwif->pdev->dev, "Chain type: 0x%x, cpld error: 0x%x, check error: 0x%x, current fsm: 0x%x\n",
		chain->chain_type, HINIC_API_CMD_STATUS_GET(val, CPLD_ERR),
		HINIC_API_CMD_STATUS_GET(val, CHKSUM_ERR),
		HINIC_API_CMD_STATUS_GET(val, FSM));

		dev_err(&chain->hwif->pdev->dev, "Chain hw current ci: 0x%x\n",
		HINIC_API_CMD_STATUS_GET(val, CONS_IDX));

		addr = HINIC_CSR_API_CMD_CHAIN_PI_ADDR(chain->chain_type);
		val = hinic_hwif_read_reg(chain->hwif, addr);
		dev_err(&chain->hwif->pdev->dev, "Chain hw current pi: 0x%x\n", val);
		}

		/**
		* chain_busy - check if the chain is still processing last requests
		* @chain: chain to check
		@@ -131,8 +151,10 @@ static int chain_busy(struct hinic_api_cmd_chain *chain)

		/* check for a space for a new command */
		if (chain->cons_idx == MASKED_IDX(chain, prod_idx + 1)) {
		dev_err(&pdev->dev, "API CMD chain %d is busy\n",
		chain->chain_type);
		dev_err(&pdev->dev, "API CMD chain %d is busy, cons_idx: %d, prod_idx: %d\n",
		chain->chain_type, chain->cons_idx,
		chain->prod_idx);
		dump_api_chain_reg(chain);
		return -EBUSY;
		}
		break;
		@@ -332,6 +354,7 @@ static int wait_for_api_cmd_completion(struct hinic_api_cmd_chain *chain)
		err = wait_for_status_poll(chain);
		if (err) {
		dev_err(&pdev->dev, "API CMD Poll status timeout\n");
		dump_api_chain_reg(chain);
		break;
		}
		break;

drivers/net/ethernet/huawei/hinic/hinic_hw_api_cmd.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -103,10 +103,14 @@
		HINIC_API_CMD_STATUS_HEADER_##member##_MASK)

		#define HINIC_API_CMD_STATUS_CONS_IDX_SHIFT 0
		#define HINIC_API_CMD_STATUS_FSM_SHIFT 24
		#define HINIC_API_CMD_STATUS_CHKSUM_ERR_SHIFT 28
		#define HINIC_API_CMD_STATUS_CPLD_ERR_SHIFT 30

		#define HINIC_API_CMD_STATUS_CONS_IDX_MASK 0xFFFFFF
		#define HINIC_API_CMD_STATUS_FSM_MASK 0xFU
		#define HINIC_API_CMD_STATUS_CHKSUM_ERR_MASK 0x3
		#define HINIC_API_CMD_STATUS_CPLD_ERR_MASK 0x1U

		#define HINIC_API_CMD_STATUS_GET(val, member) \
		(((val) >> HINIC_API_CMD_STATUS_##member##_SHIFT) & \

drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -401,6 +401,7 @@ static int cmdq_sync_cmd_direct_resp(struct hinic_cmdq *cmdq,

		spin_unlock_bh(&cmdq->cmdq_lock);

		hinic_dump_ceq_info(cmdq->hwdev);
		return -ETIMEDOUT;
		}

		@@ -807,6 +808,7 @@ static int init_cmdqs_ctxt(struct hinic_hwdev *hwdev,

		cmdq_type = HINIC_CMDQ_SYNC;
		for (; cmdq_type < HINIC_MAX_CMDQ_TYPES; cmdq_type++) {
		cmdqs->cmdq[cmdq_type].hwdev = hwdev;
		err = init_cmdq(&cmdqs->cmdq[cmdq_type],
		&cmdqs->saved_wqs[cmdq_type], cmdq_type,
		db_area[cmdq_type]);

drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -130,6 +130,8 @@ struct hinic_cmdq_ctxt {
		};

		struct hinic_cmdq {
		struct hinic_hwdev *hwdev;

		struct hinic_wq *wq;

		enum hinic_cmdq_type cmdq_type;

drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -258,9 +258,9 @@ static int init_fw_ctxt(struct hinic_hwdev *hwdev)
		&fw_ctxt, sizeof(fw_ctxt),
		&fw_ctxt, &out_size);
		if (err \|\| (out_size != sizeof(fw_ctxt)) \|\| fw_ctxt.status) {
		dev_err(&pdev->dev, "Failed to init FW ctxt, ret = %d\n",
		fw_ctxt.status);
		return -EFAULT;
		dev_err(&pdev->dev, "Failed to init FW ctxt, err: %d, status: 0x%x, out size: 0x%x\n",
		err, fw_ctxt.status, out_size);
		return -EIO;
		}

		return 0;
		@@ -425,9 +425,9 @@ static int get_base_qpn(struct hinic_hwdev hwdev, u16 base_qpn)
		&cmd_base_qpn, sizeof(cmd_base_qpn),
		&cmd_base_qpn, &out_size);
		if (err \|\| (out_size != sizeof(cmd_base_qpn)) \|\| cmd_base_qpn.status) {
		dev_err(&pdev->dev, "Failed to get base qpn, status = %d\n",
		cmd_base_qpn.status);
		return -EFAULT;
		dev_err(&pdev->dev, "Failed to get base qpn, err: %d, status: 0x%x, out size: 0x%x\n",
		err, cmd_base_qpn.status, out_size);
		return -EIO;
		}

		*base_qpn = cmd_base_qpn.qpn;

Admin message