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

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

Merge branch 'qlcnic' 



Shahed Shaikh says:

====================
qlcnic: Bug fixes

This patch series contains following bug fixes -

* Send INIT_NIC_FUNC mailbox command as first mailbox
* Fix a panic because of uninitialized delayed_work.
* Fix inconsistent calculation of max rings count.
* Fix PVID configuration issue. Driver needs to clear older
  PVID before adding new one.
* Fix QLogic application/driver interface by packing vNIC information
  array.
* Fix a crash when user tries to disable SR-IOV while VFs are
  still assigned to VMs.

Please apply to net.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 677df2f4 696f1943

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

+12 −9
Original line number Diff line number Diff line
@@ -2139,8 +2139,6 @@ static int qlcnic_83xx_get_nic_configuration(struct qlcnic_adapter *adapter) 
	ahw->max_mac_filters = nic_info.max_mac_filters;

	ahw->max_mtu = nic_info.max_mtu;



	adapter->max_tx_rings = ahw->max_tx_ques;

	adapter->max_sds_rings = ahw->max_rx_ques;

	/* eSwitch capability indicates vNIC mode.

	 * vNIC and SRIOV are mutually exclusive operational modes.

	 * If SR-IOV capability is detected, SR-IOV physical function
@@ -2161,6 +2159,7 @@ static int qlcnic_83xx_get_nic_configuration(struct qlcnic_adapter *adapter) 
int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)

{

	struct qlcnic_hardware_context *ahw = adapter->ahw;

	u16 max_sds_rings, max_tx_rings;

	int ret;



	ret = qlcnic_83xx_get_nic_configuration(adapter);
@@ -2173,18 +2172,21 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter) 
		if (qlcnic_83xx_config_vnic_opmode(adapter))

			return -EIO;



		adapter->max_sds_rings = QLCNIC_MAX_VNIC_SDS_RINGS;

		adapter->max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;

		max_sds_rings = QLCNIC_MAX_VNIC_SDS_RINGS;

		max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;

	} else if (ret == QLC_83XX_DEFAULT_OPMODE) {

		ahw->nic_mode = QLCNIC_DEFAULT_MODE;

		adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;

		ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;

		adapter->max_sds_rings = QLCNIC_MAX_SDS_RINGS;

		adapter->max_tx_rings = QLCNIC_MAX_TX_RINGS;

		max_sds_rings = QLCNIC_MAX_SDS_RINGS;

		max_tx_rings = QLCNIC_MAX_TX_RINGS;

	} else {

		return -EIO;

	}



	adapter->max_sds_rings = min(ahw->max_rx_ques, max_sds_rings);

	adapter->max_tx_rings = min(ahw->max_tx_ques, max_tx_rings);



	return 0;

}
@@ -2348,15 +2350,16 @@ int qlcnic_83xx_init(struct qlcnic_adapter *adapter, int pci_using_dac) 
		goto disable_intr;

	}



	INIT_DELAYED_WORK(&adapter->idc_aen_work, qlcnic_83xx_idc_aen_work);



	err = qlcnic_83xx_setup_mbx_intr(adapter);

	if (err)

		goto disable_mbx_intr;



	qlcnic_83xx_clear_function_resources(adapter);



	INIT_DELAYED_WORK(&adapter->idc_aen_work, qlcnic_83xx_idc_aen_work);



	qlcnic_dcb_enable(adapter->dcb);

	qlcnic_83xx_initialize_nic(adapter, 1);

	qlcnic_dcb_get_info(adapter->dcb);



	/* Configure default, SR-IOV or Virtual NIC mode of operation */

	err = qlcnic_83xx_configure_opmode(adapter);

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

+1 −2
Original line number Diff line number Diff line
@@ -883,8 +883,6 @@ int qlcnic_82xx_get_nic_info(struct qlcnic_adapter *adapter, 
		npar_info->max_rx_ques = le16_to_cpu(nic_info->max_rx_ques);

		npar_info->capabilities = le32_to_cpu(nic_info->capabilities);

		npar_info->max_mtu = le16_to_cpu(nic_info->max_mtu);

		adapter->max_tx_rings = npar_info->max_tx_ques;

		adapter->max_sds_rings = npar_info->max_rx_ques;

	}



	qlcnic_free_mbx_args(&cmd);
@@ -1356,6 +1354,7 @@ int qlcnic_config_switch_port(struct qlcnic_adapter *adapter, 
			arg2 &= ~BIT_3;

		break;

	case QLCNIC_ADD_VLAN:

			arg1 &= ~(0x0ffff << 16);

			arg1 |= (BIT_2 | BIT_5);

			arg1 |= (esw_cfg->vlan_id << 16);

			break;

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

+0 −2
Original line number Diff line number Diff line
@@ -330,8 +330,6 @@ static int __qlcnic_dcb_attach(struct qlcnic_dcb *dcb) 
		goto out_free_cfg;

	}



	qlcnic_dcb_get_info(dcb);



	return 0;

out_free_cfg:

	kfree(dcb->cfg);

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

+3 −2
Original line number Diff line number Diff line
@@ -2528,8 +2528,6 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_out_free_hw;

	}



	qlcnic_dcb_enable(adapter->dcb);



	if (qlcnic_read_mac_addr(adapter))

		dev_warn(&pdev->dev, "failed to read mac addr\n");
@@ -2549,7 +2547,10 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
			 "Device does not support MSI interrupts\n");



	if (qlcnic_82xx_check(adapter)) {

		qlcnic_dcb_enable(adapter->dcb);

		qlcnic_dcb_get_info(adapter->dcb);

		err = qlcnic_setup_intr(adapter);



		if (err) {

			dev_err(&pdev->dev, "Failed to setup interrupt\n");

			goto err_out_disable_msi;

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

+10 −0
Original line number Diff line number Diff line
@@ -461,6 +461,16 @@ static int qlcnic_pci_sriov_disable(struct qlcnic_adapter *adapter) 
{

	struct net_device *netdev = adapter->netdev;



	if (pci_vfs_assigned(adapter->pdev)) {

		netdev_err(adapter->netdev,

			   "SR-IOV VFs belonging to port %d are assigned to VMs. SR-IOV can not be disabled on this port\n",

			   adapter->portnum);

		netdev_info(adapter->netdev,

			    "Please detach SR-IOV VFs belonging to port %d from VMs, and then try to disable SR-IOV on this port\n",

			    adapter->portnum);

		return -EPERM;

	}



	rtnl_lock();

	if (netif_running(netdev))

		__qlcnic_down(adapter, netdev);