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

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

Merge branch 'qlcnic-next' 



Rajesh Borundia says:

====================
qlcnic: SR-IOV and FW-dump enhancements

This patch series contain following enhancements.

* SR-IOV enhancements:
 - Allow SR-IOV VF's to probe in hypervisor. SR-IOV VF can be
   uplinked to bridge/macvtap device with this change.
 - Commands from VF are processed in process context
   as it may sleep during PF-VF communication. Earlier
   we use to process qlcnic_sriov_vf_set_multi function in
   process context but now we process individual commands.
 - As SR-IOV VF's can be uplinked to bridge/macvtap device
   support mac-learning to allow communication through
   embedded switch.

* FW-dump enhancement:
 - Support to collect RDMEM section of firmware dump using
   PEX DMA method for 82xx series adapter.

* Changes in v2:
 - Removed unnecessary cast from void pointer to something
   else and verified this issue in entire patch series as
   per David Miller's suggestion.

Please apply this series to net-next.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a3ab3c13 27a4041e

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

+15 −3
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 


#define _QLCNIC_LINUX_MAJOR 5

#define _QLCNIC_LINUX_MINOR 3

#define _QLCNIC_LINUX_SUBVERSION 58

#define QLCNIC_LINUX_VERSIONID  "5.3.58"

#define _QLCNIC_LINUX_SUBVERSION 59

#define QLCNIC_LINUX_VERSIONID  "5.3.59"

#define QLCNIC_DRV_IDC_VER  0x01

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

		 (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))
@@ -1019,6 +1019,8 @@ struct qlcnic_ipaddr { 
#define QLCNIC_DEL_VXLAN_PORT		0x200000

#endif



#define QLCNIC_VLAN_FILTERING		0x800000



#define QLCNIC_IS_MSI_FAMILY(adapter) \

	((adapter)->flags & (QLCNIC_MSI_ENABLED | QLCNIC_MSIX_ENABLED))

#define QLCNIC_IS_TSO_CAPABLE(adapter)  \
@@ -1693,7 +1695,7 @@ int qlcnic_read_mac_addr(struct qlcnic_adapter *); 
int qlcnic_setup_netdev(struct qlcnic_adapter *, struct net_device *, int);

void qlcnic_set_netdev_features(struct qlcnic_adapter *,

				struct qlcnic_esw_func_cfg *);

void qlcnic_sriov_vf_schedule_multi(struct net_device *);

void qlcnic_sriov_vf_set_multi(struct net_device *);

int qlcnic_is_valid_nic_func(struct qlcnic_adapter *, u8);

int qlcnic_get_pci_func_type(struct qlcnic_adapter *, u16, u16 *, u16 *,

			     u16 *);
@@ -2355,6 +2357,16 @@ static inline bool qlcnic_83xx_vf_check(struct qlcnic_adapter *adapter) 
	return (device == PCI_DEVICE_ID_QLOGIC_VF_QLE834X) ? true : false;

}



static inline bool qlcnic_sriov_check(struct qlcnic_adapter *adapter)

{

	bool status;



	status = (qlcnic_sriov_pf_check(adapter) ||

		  qlcnic_sriov_vf_check(adapter)) ? true : false;



	return status;

}



static inline u32 qlcnic_get_vnic_func_count(struct qlcnic_adapter *adapter)

{

	if (qlcnic_84xx_check(adapter))

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

+10 −21
Original line number Diff line number Diff line
@@ -3037,19 +3037,18 @@ void qlcnic_83xx_unlock_driver(struct qlcnic_adapter *adapter) 
	QLCRDX(adapter->ahw, QLC_83XX_DRV_UNLOCK);

}



int qlcnic_83xx_ms_mem_write128(struct qlcnic_adapter *adapter, u64 addr,

int qlcnic_ms_mem_write128(struct qlcnic_adapter *adapter, u64 addr,

				u32 *data, u32 count)

{

	int i, j, ret = 0;

	u32 temp;

	int err = 0;



	/* Check alignment */

	if (addr & 0xF)

		return -EIO;



	mutex_lock(&adapter->ahw->mem_lock);

	qlcnic_83xx_wrt_reg_indirect(adapter, QLCNIC_MS_ADDR_HI, 0);

	qlcnic_ind_wr(adapter, QLCNIC_MS_ADDR_HI, 0);



	for (i = 0; i < count; i++, addr += 16) {

		if (!((ADDR_IN_RANGE(addr, QLCNIC_ADDR_QDR_NET,
@@ -3060,26 +3059,16 @@ int qlcnic_83xx_ms_mem_write128(struct qlcnic_adapter *adapter, u64 addr, 
			return -EIO;

		}



		qlcnic_83xx_wrt_reg_indirect(adapter, QLCNIC_MS_ADDR_LO, addr);

		qlcnic_83xx_wrt_reg_indirect(adapter, QLCNIC_MS_WRTDATA_LO,

					     *data++);

		qlcnic_83xx_wrt_reg_indirect(adapter, QLCNIC_MS_WRTDATA_HI,

					     *data++);

		qlcnic_83xx_wrt_reg_indirect(adapter, QLCNIC_MS_WRTDATA_ULO,

					     *data++);

		qlcnic_83xx_wrt_reg_indirect(adapter, QLCNIC_MS_WRTDATA_UHI,

					     *data++);

		qlcnic_83xx_wrt_reg_indirect(adapter, QLCNIC_MS_CTRL,

					     QLCNIC_TA_WRITE_ENABLE);

		qlcnic_83xx_wrt_reg_indirect(adapter, QLCNIC_MS_CTRL,

					     QLCNIC_TA_WRITE_START);

		qlcnic_ind_wr(adapter, QLCNIC_MS_ADDR_LO, addr);

		qlcnic_ind_wr(adapter, QLCNIC_MS_WRTDATA_LO, *data++);

		qlcnic_ind_wr(adapter, QLCNIC_MS_WRTDATA_HI, *data++);

		qlcnic_ind_wr(adapter, QLCNIC_MS_WRTDATA_ULO, *data++);

		qlcnic_ind_wr(adapter, QLCNIC_MS_WRTDATA_UHI, *data++);

		qlcnic_ind_wr(adapter, QLCNIC_MS_CTRL, QLCNIC_TA_WRITE_ENABLE);

		qlcnic_ind_wr(adapter, QLCNIC_MS_CTRL, QLCNIC_TA_WRITE_START);



		for (j = 0; j < MAX_CTL_CHECK; j++) {

			temp = QLCRD32(adapter, QLCNIC_MS_CTRL, &err);

			if (err == -EIO) {

				mutex_unlock(&adapter->ahw->mem_lock);

				return err;

			}

			temp = qlcnic_ind_rd(adapter, QLCNIC_MS_CTRL);



			if ((temp & TA_CTL_BUSY) == 0)

				break;

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

+2 −2
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ void qlcnic_83xx_napi_del(struct qlcnic_adapter *); 
void qlcnic_83xx_napi_enable(struct qlcnic_adapter *);

void qlcnic_83xx_napi_disable(struct qlcnic_adapter *);

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

void qlcnic_ind_wr(struct qlcnic_adapter *, u32, u32);

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

int qlcnic_ind_rd(struct qlcnic_adapter *, u32);

int qlcnic_83xx_create_rx_ctx(struct qlcnic_adapter *);

int qlcnic_83xx_create_tx_ctx(struct qlcnic_adapter *,
@@ -617,7 +617,6 @@ void qlcnic_83xx_idc_request_reset(struct qlcnic_adapter *, u32); 
int qlcnic_83xx_lock_driver(struct qlcnic_adapter *);

void qlcnic_83xx_unlock_driver(struct qlcnic_adapter *);

int qlcnic_83xx_set_default_offload_settings(struct qlcnic_adapter *);

int qlcnic_83xx_ms_mem_write128(struct qlcnic_adapter *, u64, u32 *, u32);

int qlcnic_83xx_idc_vnic_pf_entry(struct qlcnic_adapter *);

int qlcnic_83xx_disable_vnic_mode(struct qlcnic_adapter *, int);

int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *);
@@ -659,4 +658,5 @@ void qlcnic_83xx_cache_tmpl_hdr_values(struct qlcnic_fw_dump *); 
u32 qlcnic_83xx_get_cap_size(void *, int);

void qlcnic_83xx_set_sys_info(void *, int, u32);

void qlcnic_83xx_store_cap_mask(void *, u32);

int qlcnic_ms_mem_write128(struct qlcnic_adapter *, u64, u32 *, u32);

#endif

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

+6 −6
Original line number Diff line number Diff line
@@ -1363,7 +1363,7 @@ static int qlcnic_83xx_copy_bootloader(struct qlcnic_adapter *adapter) 
		return ret;

	}

	/* 16 byte write to MS memory */

	ret = qlcnic_83xx_ms_mem_write128(adapter, dest, (u32 *)p_cache,

	ret = qlcnic_ms_mem_write128(adapter, dest, (u32 *)p_cache,

				     size / 16);

	if (ret) {

		vfree(p_cache);
@@ -1389,7 +1389,7 @@ static int qlcnic_83xx_copy_fw_file(struct qlcnic_adapter *adapter) 
	p_cache = (u32 *)fw->data;

	addr = (u64)dest;



	ret = qlcnic_83xx_ms_mem_write128(adapter, addr,

	ret = qlcnic_ms_mem_write128(adapter, addr,

				     p_cache, size / 16);

	if (ret) {

		dev_err(&adapter->pdev->dev, "MS memory write failed\n");
@@ -1405,7 +1405,7 @@ static int qlcnic_83xx_copy_fw_file(struct qlcnic_adapter *adapter) 
			data[i] = fw->data[size + i];

		for (; i < 16; i++)

			data[i] = 0;

		ret = qlcnic_83xx_ms_mem_write128(adapter, addr,

		ret = qlcnic_ms_mem_write128(adapter, addr,

					     (u32 *)data, 1);

		if (ret) {

			dev_err(&adapter->pdev->dev,

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

+11 −21
Original line number Diff line number Diff line
@@ -373,12 +373,16 @@ int qlcnic_ind_rd(struct qlcnic_adapter *adapter, u32 addr) 
	return data;

}



void qlcnic_ind_wr(struct qlcnic_adapter *adapter, u32 addr, u32 data)

int qlcnic_ind_wr(struct qlcnic_adapter *adapter, u32 addr, u32 data)

{

	int ret = 0;



	if (qlcnic_82xx_check(adapter))

		qlcnic_write_window_reg(addr, adapter->ahw->pci_base0, data);

	else

		qlcnic_83xx_wrt_reg_indirect(adapter, addr, data);

		ret = qlcnic_83xx_wrt_reg_indirect(adapter, addr, data);



	return ret;

}



static int
@@ -567,27 +571,13 @@ static void __qlcnic_set_multi(struct net_device *netdev, u16 vlan) 
void qlcnic_set_multi(struct net_device *netdev)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	struct qlcnic_mac_vlan_list *cur;

	struct netdev_hw_addr *ha;

	size_t temp;



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

		return;

	if (qlcnic_sriov_vf_check(adapter)) {

		if (!netdev_mc_empty(netdev)) {

			netdev_for_each_mc_addr(ha, netdev) {

				temp = sizeof(struct qlcnic_mac_vlan_list);

				cur = kzalloc(temp, GFP_ATOMIC);

				if (cur == NULL)

					break;

				memcpy(cur->mac_addr,

				       ha->addr, ETH_ALEN);

				list_add_tail(&cur->list, &adapter->vf_mc_list);

			}

		}

		qlcnic_sriov_vf_schedule_multi(adapter->netdev);

		return;

	}



	if (qlcnic_sriov_vf_check(adapter))

		qlcnic_sriov_vf_set_multi(netdev);

	else

		__qlcnic_set_multi(netdev, 0);

}