Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fef0c060 authored by Amit Kumar Salecha's avatar Amit Kumar Salecha Committed by David S. Miller
Browse files

qlcnic: define error code for loopback test 



o Defined error code such as fw not responding, test already running and
  cable not connected.
o Check Fw capability before performing loopback test.

Signed-off-by: default avatarAmit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f127f472

drivers/net/qlcnic/qlcnic.h

+8 −1
Original line number Diff line number Diff line
@@ -822,6 +822,7 @@ struct qlcnic_mac_list_s { 
#define QLCNIC_FW_CAPABILITY_BDG		BIT_8

#define QLCNIC_FW_CAPABILITY_FVLANTX		BIT_9

#define QLCNIC_FW_CAPABILITY_HW_LRO		BIT_10

#define QLCNIC_FW_CAPABILITY_MULTI_LOOPBACK	BIT_27



/* module types */

#define LINKEVENT_MODULE_NOT_PRESENT			1
@@ -936,6 +937,12 @@ struct qlcnic_ipaddr { 
#define QLCNIC_READD_AGE	20

#define QLCNIC_LB_MAX_FILTERS	64



/* QLCNIC Driver Error Code */

#define QLCNIC_FW_NOT_RESPOND		51

#define QLCNIC_TEST_IN_PROGRESS		52

#define QLCNIC_UNDEFINED_ERROR		53

#define QLCNIC_LB_CABLE_NOT_CONN	54



struct qlcnic_filter {

	struct hlist_node fnode;

	u8 faddr[ETH_ALEN];
@@ -1007,7 +1014,7 @@ struct qlcnic_adapter { 
	u8 max_mac_filters;

	u8 dev_state;

	u8 diag_test;

	u8 diag_cnt;

	char diag_cnt;

	u8 reset_ack_timeo;

	u8 dev_init_timeo;

	u16 msg_enable;

drivers/net/qlcnic/qlcnic_ethtool.c

+16 −11
Original line number Diff line number Diff line
@@ -756,6 +756,11 @@ static int qlcnic_loopback_test(struct net_device *netdev, u8 mode) 
	int loop = 0;

	int ret;



	if (!(adapter->capabilities & QLCNIC_FW_CAPABILITY_MULTI_LOOPBACK)) {

		netdev_info(netdev, "Firmware is not loopback test capable\n");

		return -EOPNOTSUPP;

	}



	netdev_info(netdev, "%s loopback test in progress\n",

		   mode == QLCNIC_ILB_MODE ? "internal" : "external");

	if (adapter->op_mode == QLCNIC_NON_PRIV_FUNC) {
@@ -765,8 +770,7 @@ static int qlcnic_loopback_test(struct net_device *netdev, u8 mode) 
	}



	if (test_and_set_bit(__QLCNIC_RESETTING, &adapter->state))

		return -EIO;



		return -EBUSY;



	ret = qlcnic_diag_alloc_res(netdev, QLCNIC_LOOPBACK_TEST);

	if (ret)
@@ -778,19 +782,20 @@ static int qlcnic_loopback_test(struct net_device *netdev, u8 mode) 
	if (ret)

		goto free_res;



	adapter->diag_cnt = 0;

	do {

		msleep(500);

		qlcnic_process_rcv_ring_diag(sds_ring);

		if (loop++ > QLCNIC_ILB_MAX_RCV_LOOP)

			break;

	} while (!QLCNIC_IS_LB_CONFIGURED(adapter->ahw->loopback_state));



	if (!QLCNIC_IS_LB_CONFIGURED(adapter->ahw->loopback_state)) {

		if (loop++ > QLCNIC_ILB_MAX_RCV_LOOP) {

			netdev_info(netdev, "firmware didnt respond to loopback"

				" configure request\n");

		ret = adapter->ahw->loopback_state;

			ret = -QLCNIC_FW_NOT_RESPOND;

			goto free_res;

		} else if (adapter->diag_cnt) {

			ret = adapter->diag_cnt;

			goto free_res;

		}

	} while (!QLCNIC_IS_LB_CONFIGURED(adapter->ahw->loopback_state));



	ret = qlcnic_do_lb_test(adapter);

drivers/net/qlcnic/qlcnic_init.c

+6 −0
Original line number Diff line number Diff line
@@ -1354,10 +1354,16 @@ qlcnic_handle_fw_message(int desc_cnt, int index, 
			break;

		case 1:

			dev_info(dev, "loopback already in progress\n");

			adapter->diag_cnt = -QLCNIC_TEST_IN_PROGRESS;

			break;

		case 2:

			dev_info(dev, "loopback cable is not connected\n");

			adapter->diag_cnt = -QLCNIC_LB_CABLE_NOT_CONN;

			break;

		default:

			dev_info(dev, "loopback configure request failed,"

					" ret %x\n", ret);

			adapter->diag_cnt = -QLCNIC_UNDEFINED_ERROR;

			break;

		}

		break;