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

Commit 025b4a54 authored by Anjali Singhai Jain's avatar Anjali Singhai Jain Committed by Jeff Kirsher
Browse files

i40e: Add FW check to disable DCB and wrap autoneg workaround with FW check 



For FW < 4.33 DCB should be disabled.
Also Autoneg workaround to avoid Rx stall is still needed for FW < 4.33.

Change-ID: Iff36ad86be2f597e7701096014d6d094332a9a21
Signed-off-by: default avatarAnjali Singhai Jain <anjali.singhai@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 9a3bd2f1

drivers/net/ethernet/intel/i40e/i40e_main.c

+19 −12
Original line number Diff line number Diff line
@@ -4551,6 +4551,11 @@ static int i40e_init_pf_dcb(struct i40e_pf *pf) 
	struct i40e_hw *hw = &pf->hw;

	int err = 0;



	/* Do not enable DCB for SW1 and SW2 images even if the FW is capable */

	if (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver < 33)) ||

	    (pf->hw.aq.fw_maj_ver < 4))

		goto out;



	/* Get the initial DCB configuration */

	err = i40e_init_dcb(hw);

	if (!err) {
@@ -6311,13 +6316,14 @@ static void i40e_reset_and_rebuild(struct i40e_pf *pf, bool reinit) 
		}

	}



	if (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver < 33)) ||

	    (pf->hw.aq.fw_maj_ver < 4)) {

		msleep(75);

		ret = i40e_aq_set_link_restart_an(&pf->hw, true, NULL);

	if (ret) {

		if (ret)

			dev_info(&pf->pdev->dev, "link restart failed, aq_err=%d\n",

				 pf->hw.aq.asq_last_status);

	}



	/* reinit the misc interrupt */

	if (pf->flags & I40E_FLAG_MSIX_ENABLED)

		ret = i40e_setup_misc_vector(pf);
@@ -9677,13 +9683,14 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (err)

		dev_info(&pf->pdev->dev, "set phy mask fail, aq_err %d\n", err);



	if (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver < 33)) ||

	    (pf->hw.aq.fw_maj_ver < 4)) {

		msleep(75);

		err = i40e_aq_set_link_restart_an(&pf->hw, true, NULL);

	if (err) {

		if (err)

			dev_info(&pf->pdev->dev, "link restart failed, aq_err=%d\n",

				 pf->hw.aq.asq_last_status);

	}



	/* The main driver is (mostly) up and happy. We need to set this state

	 * before setting up the misc vector or we get a race and the vector

	 * ends up disabled forever.