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

Commit 728a98b8 authored by Sucheta Chakraborty's avatar Sucheta Chakraborty Committed by David S. Miller
Browse files

qlcnic: add beacon test support. 



Beacon test flashes both port LEDs instead of just 1 LED of a port.
Updated driver version to 5.0.23.

Signed-off-by: default avatarSucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: default avatarSony Chacko <sony.chacko@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9254b751

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

+8 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 


#define _QLCNIC_LINUX_MAJOR 5

#define _QLCNIC_LINUX_MINOR 0

#define _QLCNIC_LINUX_SUBVERSION 22

#define QLCNIC_LINUX_VERSIONID  "5.0.22"

#define _QLCNIC_LINUX_SUBVERSION 23

#define QLCNIC_LINUX_VERSIONID  "5.0.23"

#define QLCNIC_DRV_IDC_VER  0x01

#define QLCNIC_DRIVER_VERSION  ((_QLCNIC_LINUX_MAJOR << 16) |\

		 (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))
@@ -457,6 +457,8 @@ struct qlcnic_hardware_context { 
	u16 port_type;

	u16 board_type;



	u8 beacon_state;



	struct qlcnic_nic_intr_coalesce coal;

	struct qlcnic_fw_dump fw_dump;

};
@@ -931,6 +933,7 @@ struct qlcnic_ipaddr { 
#define __QLCNIC_START_FW 		4

#define __QLCNIC_AER			5

#define __QLCNIC_DIAG_RES_ALLOC		6

#define __QLCNIC_LED_ENABLE		7



#define QLCNIC_INTERRUPT_TEST		1

#define QLCNIC_LOOPBACK_TEST		2
@@ -1397,6 +1400,9 @@ void qlcnic_pcie_sem_unlock(struct qlcnic_adapter *, int); 
#define crb_win_unlock(a)	\

	qlcnic_pcie_sem_unlock((a), 7)



#define __QLCNIC_MAX_LED_RATE	0xf

#define __QLCNIC_MAX_LED_STATE	0x2



int qlcnic_get_board_info(struct qlcnic_adapter *adapter);

int qlcnic_wol_supported(struct qlcnic_adapter *adapter);

int qlcnic_config_led(struct qlcnic_adapter *adapter, u32 state, u32 rate);

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

+5 −0
Original line number Diff line number Diff line
@@ -939,6 +939,9 @@ static int qlcnic_set_led(struct net_device *dev, 


	switch (state) {

	case ETHTOOL_ID_ACTIVE:

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

			return -EBUSY;



		if (!test_bit(__QLCNIC_DEV_UP, &adapter->state)) {

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

				return -EIO;
@@ -973,6 +976,8 @@ static int qlcnic_set_led(struct net_device *dev, 
		clear_bit(__QLCNIC_RESETTING, &adapter->state);

	}



	clear_bit(__QLCNIC_LED_ENABLE, &adapter->state);



	return -EIO;

}

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

+95 −0
Original line number Diff line number Diff line
@@ -3465,6 +3465,98 @@ int qlcnic_set_max_rss(struct qlcnic_adapter *adapter, u8 data) 
	return err;

}



static int

qlcnic_validate_beacon(struct qlcnic_adapter *adapter, u16 beacon, u8 *state,

			u8 *rate)

{

	*rate = LSB(beacon);

	*state = MSB(beacon);



	QLCDB(adapter, DRV, "rate %x state %x\n", *rate, *state);



	if (!*state) {

		*rate = __QLCNIC_MAX_LED_RATE;

		return 0;

	} else if (*state > __QLCNIC_MAX_LED_STATE)

		return -EINVAL;



	if ((!*rate) || (*rate > __QLCNIC_MAX_LED_RATE))

		return -EINVAL;



	return 0;

}



static ssize_t

qlcnic_store_beacon(struct device *dev,

		struct device_attribute *attr, const char *buf, size_t len)

{

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);

	int max_sds_rings = adapter->max_sds_rings;

	int dev_down = 0;

	u16 beacon;

	u8 b_state, b_rate;

	int err;



	if (len != sizeof(u16))

		return QL_STATUS_INVALID_PARAM;



	memcpy(&beacon, buf, sizeof(u16));

	err = qlcnic_validate_beacon(adapter, beacon, &b_state, &b_rate);

	if (err)

		return err;



	if (adapter->ahw->beacon_state == b_state)

		return len;



	if (!adapter->ahw->beacon_state)

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

			return -EBUSY;



	if (!test_bit(__QLCNIC_DEV_UP, &adapter->state)) {

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

			return -EIO;

		err = qlcnic_diag_alloc_res(adapter->netdev, QLCNIC_LED_TEST);

		if (err) {

			clear_bit(__QLCNIC_RESETTING, &adapter->state);

			clear_bit(__QLCNIC_LED_ENABLE, &adapter->state);

			return err;

		}

		dev_down = 1;

	}



	err = qlcnic_config_led(adapter, b_state, b_rate);



	if (!err) {

		adapter->ahw->beacon_state = b_state;

		err = len;

	}



	if (dev_down) {

		qlcnic_diag_free_res(adapter->netdev, max_sds_rings);

		clear_bit(__QLCNIC_RESETTING, &adapter->state);

	}



	if (!b_state)

		clear_bit(__QLCNIC_LED_ENABLE, &adapter->state);



	return err;

}



static ssize_t

qlcnic_show_beacon(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);



	return sprintf(buf, "%d\n", adapter->ahw->beacon_state);

}



static struct device_attribute dev_attr_beacon = {

	.attr = {.name = "beacon", .mode = (S_IRUGO | S_IWUSR)},

	.show = qlcnic_show_beacon,

	.store = qlcnic_store_beacon,

};



static int

qlcnic_sysfs_validate_crb(struct qlcnic_adapter *adapter,

		loff_t offset, size_t size)
@@ -4162,6 +4254,8 @@ qlcnic_create_diag_entries(struct qlcnic_adapter *adapter) 
		return;

	if (device_create_file(dev, &dev_attr_diag_mode))

		dev_info(dev, "failed to create diag_mode sysfs entry\n");

	if (device_create_file(dev, &dev_attr_beacon))

		dev_info(dev, "failed to create beacon sysfs entry");

	if (device_create_bin_file(dev, &bin_attr_crb))

		dev_info(dev, "failed to create crb sysfs entry\n");

	if (device_create_bin_file(dev, &bin_attr_mem))
@@ -4192,6 +4286,7 @@ qlcnic_remove_diag_entries(struct qlcnic_adapter *adapter) 
	if (adapter->op_mode == QLCNIC_NON_PRIV_FUNC)

		return;

	device_remove_file(dev, &dev_attr_diag_mode);

	device_remove_file(dev, &dev_attr_beacon);

	device_remove_bin_file(dev, &bin_attr_crb);

	device_remove_bin_file(dev, &bin_attr_mem);

	device_remove_bin_file(dev, &bin_attr_pci_config);