qlcnic: refactor 83xx diagnostic IRQ test (58ead415) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c

+36 −12

Original line number	Original line	Diff line number	Diff line
	@@ -2744,25 +2744,37 @@ int qlcnic_83xx_get_registers(struct qlcnic_adapter adapter, u32 regs_buff)
	return i;		return i;
	}		}

	int qlcnic_83xx_interrupt_test(struct qlcnic_adapter *adapter,		int qlcnic_83xx_interrupt_test(struct net_device *netdev)
	struct qlcnic_cmd_args *cmd)
	{		{
	u8 val;		struct qlcnic_adapter *adapter = netdev_priv(netdev);
	int ret;		struct qlcnic_hardware_context *ahw = adapter->ahw;
			struct qlcnic_cmd_args cmd;
	u32 data;		u32 data;
	u16 intrpt_id, id;		u16 intrpt_id, id;
			u8 val;
			int ret, max_sds_rings = adapter->max_sds_rings;

			if (test_and_set_bit(__QLCNIC_RESETTING, &adapter->state))
			return -EIO;

			ret = qlcnic_83xx_diag_alloc_res(netdev, QLCNIC_INTERRUPT_TEST);
			if (ret)
			goto fail_diag_irq;

			ahw->diag_cnt = 0;
			qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_INTRPT_TEST);

	if (adapter->flags & QLCNIC_MSIX_ENABLED)		if (adapter->flags & QLCNIC_MSIX_ENABLED)
	intrpt_id = adapter->ahw->intr_tbl[0].id;		intrpt_id = ahw->intr_tbl[0].id;
	else		else
	intrpt_id = QLCRDX(adapter->ahw, QLCNIC_DEF_INT_ID);		intrpt_id = QLCRDX(ahw, QLCNIC_DEF_INT_ID);

	cmd->req.arg[1] = 1;		cmd.req.arg[1] = 1;
	cmd->req.arg[2] = intrpt_id;		cmd.req.arg[2] = intrpt_id;
	cmd->req.arg[3] = BIT_0;		cmd.req.arg[3] = BIT_0;

	ret = qlcnic_issue_cmd(adapter, cmd);		ret = qlcnic_issue_cmd(adapter, &cmd);
	data = cmd->rsp.arg[2];		data = cmd.rsp.arg[2];
	id = LSW(data);		id = LSW(data);
	val = LSB(MSW(data));		val = LSB(MSW(data));
	if (id != intrpt_id)		if (id != intrpt_id)
	@@ -2770,9 +2782,21 @@ int qlcnic_83xx_interrupt_test(struct qlcnic_adapter *adapter,
	"Interrupt generated: 0x%x, requested:0x%x\n",		"Interrupt generated: 0x%x, requested:0x%x\n",
	id, intrpt_id);		id, intrpt_id);
	if (val)		if (val)
	dev_info(&adapter->pdev->dev,		dev_err(&adapter->pdev->dev,
	"Interrupt test error: 0x%x\n", val);		"Interrupt test error: 0x%x\n", val);
			if (ret)
			goto done;

			msleep(20);
			ret = !ahw->diag_cnt;

			done:
			qlcnic_free_mbx_args(&cmd);
			qlcnic_83xx_diag_free_res(netdev, max_sds_rings);

			fail_diag_irq:
			adapter->max_sds_rings = max_sds_rings;
			clear_bit(__QLCNIC_RESETTING, &adapter->state);
	return ret;		return ret;
	}		}

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -429,7 +429,6 @@ int qlcnic_83xx_reg_test(struct qlcnic_adapter *);
	int qlcnic_83xx_get_regs_len(struct qlcnic_adapter *);		int qlcnic_83xx_get_regs_len(struct qlcnic_adapter *);
	int qlcnic_83xx_get_registers(struct qlcnic_adapter , u32 );		int qlcnic_83xx_get_registers(struct qlcnic_adapter , u32 );
	int qlcnic_83xx_loopback_test(struct net_device *, u8);		int qlcnic_83xx_loopback_test(struct net_device *, u8);
	int qlcnic_83xx_interrupt_test(struct qlcnic_adapter *,		int qlcnic_83xx_interrupt_test(struct net_device *);
	struct qlcnic_cmd_args *);
	int qlcnic_83xx_flash_test(struct qlcnic_adapter *);		int qlcnic_83xx_flash_test(struct qlcnic_adapter *);
	#endif		#endif

drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c

+11 −13

Original line number	Original line	Diff line number	Diff line
	@@ -823,38 +823,36 @@ static int qlcnic_get_sset_count(struct net_device *dev, int sset)
	static int qlcnic_irq_test(struct net_device *netdev)		static int qlcnic_irq_test(struct net_device *netdev)
	{		{
	struct qlcnic_adapter *adapter = netdev_priv(netdev);		struct qlcnic_adapter *adapter = netdev_priv(netdev);
	int max_sds_rings = adapter->max_sds_rings;		struct qlcnic_hardware_context *ahw = adapter->ahw;
	int ret;
	struct qlcnic_cmd_args cmd;		struct qlcnic_cmd_args cmd;
			int ret, max_sds_rings = adapter->max_sds_rings;

			if (qlcnic_83xx_check(adapter))
			return qlcnic_83xx_interrupt_test(netdev);

	if (test_and_set_bit(__QLCNIC_RESETTING, &adapter->state))		if (test_and_set_bit(__QLCNIC_RESETTING, &adapter->state))
	return -EIO;		return -EIO;

	ret = qlcnic_diag_alloc_res(netdev, QLCNIC_INTERRUPT_TEST);		ret = qlcnic_diag_alloc_res(netdev, QLCNIC_INTERRUPT_TEST);
	if (ret)		if (ret)
	goto clear_it;		goto clear_diag_irq;

	adapter->ahw->diag_cnt = 0;		ahw->diag_cnt = 0;
	qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_INTRPT_TEST);		qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_INTRPT_TEST);

	if (qlcnic_83xx_check(adapter)) {		cmd.req.arg[1] = ahw->pci_func;
	ret = qlcnic_83xx_interrupt_test(adapter, &cmd);
	} else {
	cmd.req.arg[1] = adapter->ahw->pci_func;
	ret = qlcnic_issue_cmd(adapter, &cmd);		ret = qlcnic_issue_cmd(adapter, &cmd);
	}

	if (ret)		if (ret)
	goto done;		goto done;

	usleep_range(1000, 12000);		usleep_range(1000, 12000);
	ret = !adapter->ahw->diag_cnt;		ret = !ahw->diag_cnt;

	done:		done:
	qlcnic_free_mbx_args(&cmd);		qlcnic_free_mbx_args(&cmd);
	qlcnic_diag_free_res(netdev, max_sds_rings);		qlcnic_diag_free_res(netdev, max_sds_rings);

	clear_it:		clear_diag_irq:
	adapter->max_sds_rings = max_sds_rings;		adapter->max_sds_rings = max_sds_rings;
	clear_bit(__QLCNIC_RESETTING, &adapter->state);		clear_bit(__QLCNIC_RESETTING, &adapter->state);
	return ret;		return ret;