Commit 92352df1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'qlcnic' 



Rajesh Borundia says:

====================
* "qlcnic: Change 82xx adapter VLAN id endian type".
  - Adapter requires VLAN id in little endian. VLAN id was being
    converted to __le16 and then passed as a parameter. Pass VLAN id
    as u16 and then use cpu_to_le16 at appropriate places. It is
    appropriate for net-next as SR-IOV patches have a dependency on it.
* "qlcnic: Fix loopback test for SR-IOV PF".
  - It is appropriate for net-next as change is needed for SRIOV PF
    only.
* Remaining patches add enhancements to SR-IOV functionality like
  - FLR handling
  - Adapter reset recovery handling
  - iproute2 tool support for configuring MAC address, Tx rate and
    VLAN id.
  - Mailbox polling support for SR-IOV PF in case mailbox interrupts
    are disabled.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 42bbcb78 c6376278

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

+24 −14
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ 


#define _QLCNIC_LINUX_MAJOR 5

#define _QLCNIC_LINUX_MINOR 2

#define _QLCNIC_LINUX_SUBVERSION 40

#define QLCNIC_LINUX_VERSIONID  "5.2.40"

#define _QLCNIC_LINUX_SUBVERSION 41

#define QLCNIC_LINUX_VERSIONID  "5.2.41"

#define QLCNIC_DRV_IDC_VER  0x01

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

		 (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))
@@ -919,6 +919,7 @@ struct qlcnic_ipaddr { 
#define __QLCNIC_ELB_INPROGRESS		8

#define __QLCNIC_SRIOV_ENABLE		10

#define __QLCNIC_SRIOV_CAPABLE		11

#define __QLCNIC_MBX_POLL_ENABLE	12



#define QLCNIC_INTERRUPT_TEST		1

#define QLCNIC_LOOPBACK_TEST		2
@@ -939,7 +940,7 @@ struct qlcnic_ipaddr { 
struct qlcnic_filter {

	struct hlist_node fnode;

	u8 faddr[ETH_ALEN];

	__le16 vlan_id;

	u16 vlan_id;

	unsigned long ftime;

};
@@ -976,9 +977,11 @@ struct qlcnic_adapter { 
	u8 fw_fail_cnt;

	u8 tx_timeo_cnt;

	u8 need_fw_reset;

	u8 reset_ctx_cnt;



	u16 is_up;

	u16 pvid;

	u16 rx_pvid;

	u16 tx_pvid;



	u32 irq;

	u32 heartbeat;
@@ -1010,6 +1013,7 @@ struct qlcnic_adapter { 
	struct workqueue_struct *qlcnic_wq;

	struct delayed_work fw_work;

	struct delayed_work idc_aen_work;

	struct delayed_work mbx_poll_work;



	struct qlcnic_filter_hash fhash;

	struct qlcnic_filter_hash rx_fhash;
@@ -1444,10 +1448,10 @@ void qlcnic_post_rx_buffers(struct qlcnic_adapter *adapter, 
		struct qlcnic_host_rds_ring *rds_ring, u8 ring_id);

int qlcnic_process_rcv_ring(struct qlcnic_host_sds_ring *sds_ring, int max);

void qlcnic_set_multi(struct net_device *netdev);

void __qlcnic_set_multi(struct net_device *netdev);

int qlcnic_nic_add_mac(struct qlcnic_adapter *, const u8 *);

void __qlcnic_set_multi(struct net_device *, u16);

int qlcnic_nic_add_mac(struct qlcnic_adapter *, const u8 *, u16);

int qlcnic_nic_del_mac(struct qlcnic_adapter *, const u8 *);

void qlcnic_free_mac_list(struct qlcnic_adapter *adapter);

void qlcnic_82xx_free_mac_list(struct qlcnic_adapter *adapter);



int qlcnic_fw_cmd_set_mtu(struct qlcnic_adapter *adapter, int mtu);

int qlcnic_fw_cmd_set_drv_version(struct qlcnic_adapter *);
@@ -1524,13 +1528,12 @@ int qlcnic_init_pci_info(struct qlcnic_adapter *); 
int qlcnic_set_default_offload_settings(struct qlcnic_adapter *);

int qlcnic_reset_npar_config(struct qlcnic_adapter *);

int qlcnic_set_eswitch_port_config(struct qlcnic_adapter *);

void qlcnic_add_lb_filter(struct qlcnic_adapter *, struct sk_buff *, int,

			  __le16);

void qlcnic_add_lb_filter(struct qlcnic_adapter *, struct sk_buff *, int, u16);

int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter);

int qlcnic_read_mac_addr(struct qlcnic_adapter *);

int qlcnic_setup_netdev(struct qlcnic_adapter *, struct net_device *, int);

void qlcnic_sriov_vf_schedule_multi(struct net_device *);

void qlcnic_vf_add_mc_list(struct net_device *);

void qlcnic_vf_add_mc_list(struct net_device *, u16);



/*

 * QLOGIC Board information
@@ -1595,7 +1598,7 @@ struct qlcnic_hardware_ops { 
	int (*get_nic_info) (struct qlcnic_adapter *, struct qlcnic_info *, u8);

	int (*get_pci_info) (struct qlcnic_adapter *, struct qlcnic_pci_info *);

	int (*set_nic_info) (struct qlcnic_adapter *, struct qlcnic_info *);

	int (*change_macvlan) (struct qlcnic_adapter *, u8*, __le16, u8);

	int (*change_macvlan) (struct qlcnic_adapter *, u8*, u16, u8);

	void (*napi_enable) (struct qlcnic_adapter *);

	void (*napi_disable) (struct qlcnic_adapter *);

	void (*config_intr_coal) (struct qlcnic_adapter *);
@@ -1604,8 +1607,9 @@ struct qlcnic_hardware_ops { 
	int (*config_loopback) (struct qlcnic_adapter *, u8);

	int (*clear_loopback) (struct qlcnic_adapter *, u8);

	int (*config_promisc_mode) (struct qlcnic_adapter *, u32);

	void (*change_l2_filter) (struct qlcnic_adapter *, u64 *, __le16);

	void (*change_l2_filter) (struct qlcnic_adapter *, u64 *, u16);

	int (*get_board_info) (struct qlcnic_adapter *);

	void (*free_mac_list) (struct qlcnic_adapter *);

};



extern struct qlcnic_nic_template qlcnic_vf_ops;
@@ -1746,7 +1750,7 @@ static inline int qlcnic_set_nic_info(struct qlcnic_adapter *adapter, 
}



static inline int qlcnic_sre_macaddr_change(struct qlcnic_adapter *adapter,

					    u8 *addr, __le16 id, u8 cmd)

					    u8 *addr, u16 id, u8 cmd)

{

	return adapter->ahw->hw_ops->change_macvlan(adapter, addr, id, cmd);

}
@@ -1805,7 +1809,7 @@ static inline int qlcnic_nic_set_promisc(struct qlcnic_adapter *adapter, 
}



static inline void qlcnic_change_filter(struct qlcnic_adapter *adapter,

					u64 *addr, __le16 id)

					u64 *addr, u16 id)

{

	adapter->ahw->hw_ops->change_l2_filter(adapter, addr, id);

}
@@ -1815,6 +1819,11 @@ static inline int qlcnic_get_board_info(struct qlcnic_adapter *adapter) 
	return adapter->ahw->hw_ops->get_board_info(adapter);

}



static inline void qlcnic_free_mac_list(struct qlcnic_adapter *adapter)

{

	return adapter->ahw->hw_ops->free_mac_list(adapter);

}



static inline void qlcnic_dev_request_reset(struct qlcnic_adapter *adapter,

					    u32 key)

{
@@ -1861,6 +1870,7 @@ static inline void qlcnic_enable_int(struct qlcnic_host_sds_ring *sds_ring) 
		writel(0xfbff, adapter->tgt_mask_reg);

}



extern const struct ethtool_ops qlcnic_sriov_vf_ethtool_ops;

extern const struct ethtool_ops qlcnic_ethtool_ops;

extern const struct ethtool_ops qlcnic_ethtool_failed_ops;

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

+84 −23
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ static struct qlcnic_hardware_ops qlcnic_83xx_hw_ops = { 
	.config_promisc_mode		= qlcnic_83xx_nic_set_promisc,

	.change_l2_filter		= qlcnic_83xx_change_l2_filter,

	.get_board_info			= qlcnic_83xx_get_port_info,

	.free_mac_list			= qlcnic_82xx_free_mac_list,

};



static struct qlcnic_nic_template qlcnic_83xx_ops = {
@@ -339,12 +340,13 @@ inline void qlcnic_83xx_enable_legacy_msix_mbx_intr(struct qlcnic_adapter 
	writel(0, adapter->ahw->pci_base0 + mask);

}



inline void qlcnic_83xx_disable_mbx_intr(struct qlcnic_adapter *adapter)

void qlcnic_83xx_disable_mbx_intr(struct qlcnic_adapter *adapter)

{

	u32 mask;



	mask = QLCRDX(adapter->ahw, QLCNIC_DEF_INT_MASK);

	writel(1, adapter->ahw->pci_base0 + mask);

	QLCWRX(adapter->ahw, QLCNIC_MBX_INTR_ENBL, 0);

}



static inline void qlcnic_83xx_get_mbx_data(struct qlcnic_adapter *adapter,
@@ -400,7 +402,8 @@ static void qlcnic_83xx_poll_process_aen(struct qlcnic_adapter *adapter) 


	event = readl(QLCNIC_MBX_FW(adapter->ahw, 0));

	if (event &  QLCNIC_MBX_ASYNC_EVENT)

		qlcnic_83xx_process_aen(adapter);

		__qlcnic_83xx_process_aen(adapter);



out:

	qlcnic_83xx_enable_legacy_msix_mbx_intr(adapter);

	spin_unlock_irqrestore(&adapter->ahw->mbx_lock, flags);
@@ -453,17 +456,15 @@ done: 


void qlcnic_83xx_free_mbx_intr(struct qlcnic_adapter *adapter)

{

	u32 val = 0, num_msix = adapter->ahw->num_msix - 1;

	u32 num_msix;



	qlcnic_83xx_disable_mbx_intr(adapter);



	if (adapter->flags & QLCNIC_MSIX_ENABLED)

		num_msix = adapter->ahw->num_msix - 1;

	else

		num_msix = 0;



	QLCWRX(adapter->ahw, QLCNIC_MBX_INTR_ENBL, val);



	qlcnic_83xx_disable_mbx_intr(adapter);



	msleep(20);

	synchronize_irq(adapter->msix_entries[num_msix].vector);

	free_irq(adapter->msix_entries[num_msix].vector, adapter);
@@ -758,7 +759,7 @@ poll: 
		/* Get the FW response data */

		fw_data = readl(QLCNIC_MBX_FW(ahw, 0));

		if (fw_data &  QLCNIC_MBX_ASYNC_EVENT) {

			qlcnic_83xx_process_aen(adapter);

			__qlcnic_83xx_process_aen(adapter);

			mbx_val = QLCRDX(ahw, QLCNIC_HOST_MBX_CTRL);

			if (mbx_val)

				goto poll;
@@ -862,7 +863,7 @@ static void qlcnic_83xx_handle_idc_comp_aen(struct qlcnic_adapter *adapter, 
	return;

}



void qlcnic_83xx_process_aen(struct qlcnic_adapter *adapter)

void __qlcnic_83xx_process_aen(struct qlcnic_adapter *adapter)

{

	u32 event[QLC_83XX_MBX_AEN_CNT];

	int i;
@@ -907,6 +908,53 @@ void qlcnic_83xx_process_aen(struct qlcnic_adapter *adapter) 
	QLCWRX(ahw, QLCNIC_FW_MBX_CTRL, QLCNIC_CLR_OWNER);

}



static void qlcnic_83xx_process_aen(struct qlcnic_adapter *adapter)

{

	struct qlcnic_hardware_context *ahw = adapter->ahw;

	u32 resp, event;

	unsigned long flags;



	spin_lock_irqsave(&ahw->mbx_lock, flags);



	resp = QLCRDX(ahw, QLCNIC_FW_MBX_CTRL);

	if (resp & QLCNIC_SET_OWNER) {

		event = readl(QLCNIC_MBX_FW(ahw, 0));

		if (event &  QLCNIC_MBX_ASYNC_EVENT)

			__qlcnic_83xx_process_aen(adapter);

	}



	spin_unlock_irqrestore(&ahw->mbx_lock, flags);

}



static void qlcnic_83xx_mbx_poll_work(struct work_struct *work)

{

	struct qlcnic_adapter *adapter;



	adapter = container_of(work, struct qlcnic_adapter, mbx_poll_work.work);



	if (!test_bit(__QLCNIC_MBX_POLL_ENABLE, &adapter->state))

		return;



	qlcnic_83xx_process_aen(adapter);

	queue_delayed_work(adapter->qlcnic_wq, &adapter->mbx_poll_work,

			   (HZ / 10));

}



void qlcnic_83xx_enable_mbx_poll(struct qlcnic_adapter *adapter)

{

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

		return;



	INIT_DELAYED_WORK(&adapter->mbx_poll_work, qlcnic_83xx_mbx_poll_work);

}



void qlcnic_83xx_disable_mbx_poll(struct qlcnic_adapter *adapter)

{

	if (!test_and_clear_bit(__QLCNIC_MBX_POLL_ENABLE, &adapter->state))

		return;

	cancel_delayed_work_sync(&adapter->mbx_poll_work);

}



static int qlcnic_83xx_add_rings(struct qlcnic_adapter *adapter)

{

	int index, i, err, sds_mbx_size;
@@ -1274,6 +1322,7 @@ static int qlcnic_83xx_diag_alloc_res(struct net_device *netdev, int test) 


	if (adapter->ahw->diag_test == QLCNIC_LOOPBACK_TEST) {

		/* disable and free mailbox interrupt */

		if (!(adapter->flags & QLCNIC_MSIX_ENABLED))

			qlcnic_83xx_free_mbx_intr(adapter);

		adapter->ahw->loopback_state = 0;

		adapter->ahw->hw_ops->setup_link_event(adapter, 1);
@@ -1302,6 +1351,7 @@ static void qlcnic_83xx_diag_free_res(struct net_device *netdev, 
	qlcnic_detach(adapter);



	if (adapter->ahw->diag_test == QLCNIC_LOOPBACK_TEST) {

		if (!(adapter->flags & QLCNIC_MSIX_ENABLED)) {

			err = qlcnic_83xx_setup_mbx_intr(adapter);

			if (err) {

				dev_err(&adapter->pdev->dev,
@@ -1310,6 +1360,7 @@ static void qlcnic_83xx_diag_free_res(struct net_device *netdev, 
				goto out;

			}

		}

	}

	adapter->ahw->diag_test = 0;

	adapter->max_sds_rings = max_sds_rings;
@@ -1556,7 +1607,9 @@ int qlcnic_83xx_loopback_test(struct net_device *netdev, u8 mode) 
	/* Poll for link up event before running traffic */

	do {

		msleep(500);

		if (!(adapter->flags & QLCNIC_MSIX_ENABLED))

			qlcnic_83xx_process_aen(adapter);



		if (loop++ > QLCNIC_ILB_MAX_RCV_LOOP) {

			dev_info(&adapter->pdev->dev,

				 "Firmware didn't sent link up event to loopback request\n");
@@ -1610,7 +1663,9 @@ int qlcnic_83xx_set_lb_mode(struct qlcnic_adapter *adapter, u8 mode) 
	/* Wait for Link and IDC Completion AEN */

	do {

		msleep(300);

		if (!(adapter->flags & QLCNIC_MSIX_ENABLED))

			qlcnic_83xx_process_aen(adapter);



		if (loop++ > QLCNIC_ILB_MAX_RCV_LOOP) {

			dev_err(&adapter->pdev->dev,

				"FW did not generate IDC completion AEN\n");
@@ -1650,7 +1705,9 @@ int qlcnic_83xx_clear_lb_mode(struct qlcnic_adapter *adapter, u8 mode) 
	/* Wait for Link and IDC Completion AEN */

	do {

		msleep(300);

		if (!(adapter->flags & QLCNIC_MSIX_ENABLED))

			qlcnic_83xx_process_aen(adapter);



		if (loop++ > QLCNIC_ILB_MAX_RCV_LOOP) {

			dev_err(&adapter->pdev->dev,

				"Firmware didn't sent IDC completion AEN\n");
@@ -1784,7 +1841,7 @@ static void qlcnic_83xx_set_interface_id_macaddr(struct qlcnic_adapter *adapter, 
}



int qlcnic_83xx_sre_macaddr_change(struct qlcnic_adapter *adapter, u8 *addr,

				   __le16 vlan_id, u8 op)

				   u16 vlan_id, u8 op)

{

	int err;

	u32 *buf, temp = 0;
@@ -1798,10 +1855,14 @@ int qlcnic_83xx_sre_macaddr_change(struct qlcnic_adapter *adapter, u8 *addr, 
	if (err)

		return err;



	if (vlan_id)

		op = (op == QLCNIC_MAC_ADD || op == QLCNIC_MAC_VLAN_ADD) ?

		     QLCNIC_MAC_VLAN_ADD : QLCNIC_MAC_VLAN_DEL;



	cmd.req.arg[1] = op | (1 << 8);

	qlcnic_83xx_set_interface_id_macaddr(adapter, &temp);

	cmd.req.arg[1] |= temp;

	mv.vlan = le16_to_cpu(vlan_id);

	mv.vlan = vlan_id;

	mv.mac_addr0 = addr[0];

	mv.mac_addr1 = addr[1];

	mv.mac_addr2 = addr[2];
@@ -1820,7 +1881,7 @@ int qlcnic_83xx_sre_macaddr_change(struct qlcnic_adapter *adapter, u8 *addr, 
}



void qlcnic_83xx_change_l2_filter(struct qlcnic_adapter *adapter, u64 *addr,

				  __le16 vlan_id)

				  u16 vlan_id)

{

	u8 mac[ETH_ALEN];

	memcpy(&mac, addr, ETH_ALEN);
@@ -1920,7 +1981,7 @@ irqreturn_t qlcnic_83xx_handle_aen(int irq, void *data) 


	event = readl(QLCNIC_MBX_FW(adapter->ahw, 0));

	if (event &  QLCNIC_MBX_ASYNC_EVENT)

		qlcnic_83xx_process_aen(adapter);

		__qlcnic_83xx_process_aen(adapter);

out:

	mask = QLCRDX(adapter->ahw, QLCNIC_DEF_INT_MASK);

	writel(0, adapter->ahw->pci_base0 + mask);

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

+18 −3
Original line number Diff line number Diff line
@@ -317,6 +317,18 @@ struct qlc_83xx_idc { 
	char		**name;

};



/* Device States */

enum qlcnic_83xx_states {

	QLC_83XX_IDC_DEV_UNKNOWN,

	QLC_83XX_IDC_DEV_COLD,

	QLC_83XX_IDC_DEV_INIT,

	QLC_83XX_IDC_DEV_READY,

	QLC_83XX_IDC_DEV_NEED_RESET,

	QLC_83XX_IDC_DEV_NEED_QUISCENT,

	QLC_83XX_IDC_DEV_FAILED,

	QLC_83XX_IDC_DEV_QUISCENT

};



#define QLCNIC_MBX_RSP(reg)		LSW(reg)

#define QLCNIC_MBX_NUM_REGS(reg)	(MSW(reg) & 0x1FF)

#define QLCNIC_MBX_STATUS(reg)		(((reg) >> 25) & 0x7F)
@@ -501,7 +513,7 @@ int qlcnic_83xx_clear_lb_mode(struct qlcnic_adapter *, u8); 
int qlcnic_83xx_config_hw_lro(struct qlcnic_adapter *, int);

int qlcnic_83xx_config_rss(struct qlcnic_adapter *, int);

int qlcnic_83xx_config_intr_coalesce(struct qlcnic_adapter *);

void qlcnic_83xx_change_l2_filter(struct qlcnic_adapter *, u64 *, __le16);

void qlcnic_83xx_change_l2_filter(struct qlcnic_adapter *, u64 *, u16);

int qlcnic_83xx_get_pci_info(struct qlcnic_adapter *, struct qlcnic_pci_info *);

int qlcnic_83xx_set_nic_info(struct qlcnic_adapter *, struct qlcnic_info *);

void qlcnic_83xx_register_nic_idc_func(struct qlcnic_adapter *, int);
@@ -523,7 +535,7 @@ int qlcnic_83xx_get_nic_info(struct qlcnic_adapter *, struct qlcnic_info *, u8); 
int qlcnic_83xx_setup_link_event(struct qlcnic_adapter *, int);

void qlcnic_83xx_process_rcv_ring_diag(struct qlcnic_host_sds_ring *);

int qlcnic_83xx_config_intrpt(struct qlcnic_adapter *, bool);

int qlcnic_83xx_sre_macaddr_change(struct qlcnic_adapter *, u8 *, __le16, u8);

int qlcnic_83xx_sre_macaddr_change(struct qlcnic_adapter *, u8 *, u16, u8);

int qlcnic_83xx_get_mac_address(struct qlcnic_adapter *, u8 *);

void qlcnic_83xx_configure_mac(struct qlcnic_adapter *, u8 *, u8,

			       struct qlcnic_cmd_args *);
@@ -536,6 +548,7 @@ void qlcnic_83xx_config_intr_coal(struct qlcnic_adapter *); 
irqreturn_t qlcnic_83xx_handle_aen(int, void *);

int qlcnic_83xx_get_port_info(struct qlcnic_adapter *);

void qlcnic_83xx_enable_mbx_intrpt(struct qlcnic_adapter *);

void qlcnic_83xx_disable_mbx_intr(struct qlcnic_adapter *);

irqreturn_t qlcnic_83xx_clear_legacy_intr(struct qlcnic_adapter *);

irqreturn_t qlcnic_83xx_intr(int, void *);

irqreturn_t qlcnic_83xx_tmp_intr(int, void *);
@@ -545,7 +558,7 @@ void qlcnic_83xx_disable_intr(struct qlcnic_adapter *, 
			     struct qlcnic_host_sds_ring *);

void qlcnic_83xx_check_vf(struct qlcnic_adapter *,

			  const struct pci_device_id *);

void qlcnic_83xx_process_aen(struct qlcnic_adapter *);

void __qlcnic_83xx_process_aen(struct qlcnic_adapter *);

int qlcnic_83xx_get_port_config(struct qlcnic_adapter *);

int qlcnic_83xx_set_port_config(struct qlcnic_adapter *);

int qlcnic_enable_eswitch(struct qlcnic_adapter *, u8, u8);
@@ -608,4 +621,6 @@ int qlcnic_83xx_enable_flash_write(struct qlcnic_adapter *); 
int qlcnic_83xx_disable_flash_write(struct qlcnic_adapter *);

u32 qlcnic_83xx_mac_rcode(struct qlcnic_adapter *);

u32 qlcnic_83xx_mbx_poll(struct qlcnic_adapter *);

void qlcnic_83xx_enable_mbx_poll(struct qlcnic_adapter *);

void qlcnic_83xx_disable_mbx_poll(struct qlcnic_adapter *);

#endif

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

+13 −14
Original line number Diff line number Diff line
@@ -115,18 +115,6 @@ static const char *const qlc_83xx_idc_states[] = { 
	"Quiesce"

};



/* Device States */

enum qlcnic_83xx_states {

	QLC_83XX_IDC_DEV_UNKNOWN,

	QLC_83XX_IDC_DEV_COLD,

	QLC_83XX_IDC_DEV_INIT,

	QLC_83XX_IDC_DEV_READY,

	QLC_83XX_IDC_DEV_NEED_RESET,

	QLC_83XX_IDC_DEV_NEED_QUISCENT,

	QLC_83XX_IDC_DEV_FAILED,

	QLC_83XX_IDC_DEV_QUISCENT

};



static int

qlcnic_83xx_idc_check_driver_presence_reg(struct qlcnic_adapter *adapter)

{
@@ -162,7 +150,8 @@ static int qlcnic_83xx_idc_update_audit_reg(struct qlcnic_adapter *adapter, 
			return -EBUSY;

	}



	val = adapter->portnum & 0xf;

	val = QLCRDX(adapter->ahw, QLC_83XX_IDC_DRV_AUDIT);

	val |= (adapter->portnum & 0xf);

	val |= mode << 7;

	if (mode)

		seconds = jiffies / HZ - adapter->ahw->idc.sec_counter;
@@ -401,14 +390,18 @@ static void qlcnic_83xx_idc_detach_driver(struct qlcnic_adapter *adapter) 
	struct net_device *netdev = adapter->netdev;



	netif_device_detach(netdev);



	/* Disable mailbox interrupt */

	QLCWRX(adapter->ahw, QLCNIC_MBX_INTR_ENBL, 0);

	qlcnic_83xx_disable_mbx_intr(adapter);

	qlcnic_down(adapter, netdev);

	for (i = 0; i < adapter->ahw->num_msix; i++) {

		adapter->ahw->intr_tbl[i].id = i;

		adapter->ahw->intr_tbl[i].enabled = 0;

		adapter->ahw->intr_tbl[i].src = 0;

	}



	if (qlcnic_sriov_pf_check(adapter))

		qlcnic_sriov_pf_reset(adapter);

}



/**
@@ -610,9 +603,15 @@ static int qlcnic_83xx_idc_check_fan_failure(struct qlcnic_adapter *adapter) 


static int qlcnic_83xx_idc_reattach_driver(struct qlcnic_adapter *adapter)

{

	int err;



	/* register for NIC IDC AEN Events */

	qlcnic_83xx_register_nic_idc_func(adapter, 1);



	err = qlcnic_sriov_pf_reinit(adapter);

	if (err)

		return err;



	qlcnic_83xx_enable_mbx_intrpt(adapter);



	if (qlcnic_83xx_configure_opmode(adapter)) {

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

+29 −5
Original line number Diff line number Diff line
@@ -862,6 +862,8 @@ clear_diag_irq: 
#define QLCNIC_ILB_PKT_SIZE		64

#define QLCNIC_NUM_ILB_PKT		16

#define QLCNIC_ILB_MAX_RCV_LOOP		10

#define QLCNIC_LB_PKT_POLL_DELAY_MSEC	1

#define QLCNIC_LB_PKT_POLL_COUNT	20



static void qlcnic_create_loopback_buff(unsigned char *data, u8 mac[])

{
@@ -898,9 +900,9 @@ int qlcnic_do_lb_test(struct qlcnic_adapter *adapter, u8 mode) 
		loop = 0;



		do {

			msleep(1);

			msleep(QLCNIC_LB_PKT_POLL_DELAY_MSEC);

			qlcnic_process_rcv_ring_diag(sds_ring);

			if (loop++ > QLCNIC_ILB_MAX_RCV_LOOP)

			if (loop++ > QLCNIC_LB_PKT_POLL_COUNT)

				break;

		} while (!adapter->ahw->diag_cnt);
@@ -1539,3 +1541,25 @@ const struct ethtool_ops qlcnic_ethtool_ops = { 
	.get_dump_data = qlcnic_get_dump_data,

	.set_dump = qlcnic_set_dump,

};



const struct ethtool_ops qlcnic_sriov_vf_ethtool_ops = {

	.get_settings		= qlcnic_get_settings,

	.get_drvinfo		= qlcnic_get_drvinfo,

	.get_regs_len		= qlcnic_get_regs_len,

	.get_regs		= qlcnic_get_regs,

	.get_link		= ethtool_op_get_link,

	.get_eeprom_len		= qlcnic_get_eeprom_len,

	.get_eeprom		= qlcnic_get_eeprom,

	.get_ringparam		= qlcnic_get_ringparam,

	.set_ringparam		= qlcnic_set_ringparam,

	.get_channels		= qlcnic_get_channels,

	.get_pauseparam		= qlcnic_get_pauseparam,

	.get_wol		= qlcnic_get_wol,

	.get_strings		= qlcnic_get_strings,

	.get_ethtool_stats	= qlcnic_get_ethtool_stats,

	.get_sset_count		= qlcnic_get_sset_count,

	.get_coalesce		= qlcnic_get_intr_coalesce,

	.set_coalesce		= qlcnic_set_intr_coalesce,

	.set_msglevel		= qlcnic_set_msglevel,

	.get_msglevel		= qlcnic_get_msglevel,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE