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

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net 



Jeff Kirsher says:

====================
This series contains updates to ixgbevf and igb.

The ixgbevf calls to pci_disable_msix() and to free the msix_entries
memory should not occur if device open fails.  Instead they should be
called during device driver removal to balance with the call to
pci_enable_msix() and the call to allocate msix_entries memory
during the device probe and driver load.

The remaining 4 of 5 igb patches are simple 1-3 line patches to fix
several issues such as possible null pointer dereference, PHC stopping
on max frequency, make sensor info static and SR-IOV initialization
reordering.

The remaining igb patch to fix anti-spoofing config fixes a problem
in i350 where anti spoofing configuration was written into a wrong
register.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 76a0e681 75517d92

drivers/net/ethernet/intel/igb/e1000_82575.c

+19 −14
Original line number Diff line number Diff line
@@ -1818,27 +1818,32 @@ out: 
 **/

void igb_vmdq_set_anti_spoofing_pf(struct e1000_hw *hw, bool enable, int pf)

{

	u32 dtxswc;

	u32 reg_val, reg_offset;



	switch (hw->mac.type) {

	case e1000_82576:

		reg_offset = E1000_DTXSWC;

		break;

	case e1000_i350:

		dtxswc = rd32(E1000_DTXSWC);

		reg_offset = E1000_TXSWC;

		break;

	default:

		return;

	}



	reg_val = rd32(reg_offset);

	if (enable) {

			dtxswc |= (E1000_DTXSWC_MAC_SPOOF_MASK |

		reg_val |= (E1000_DTXSWC_MAC_SPOOF_MASK |

			     E1000_DTXSWC_VLAN_SPOOF_MASK);

		/* The PF can spoof - it has to in order to

			 * support emulation mode NICs */

			dtxswc ^= (1 << pf | 1 << (pf + MAX_NUM_VFS));

		 * support emulation mode NICs

		 */

		reg_val ^= (1 << pf | 1 << (pf + MAX_NUM_VFS));

	} else {

			dtxswc &= ~(E1000_DTXSWC_MAC_SPOOF_MASK |

		reg_val &= ~(E1000_DTXSWC_MAC_SPOOF_MASK |

			     E1000_DTXSWC_VLAN_SPOOF_MASK);

	}

		wr32(E1000_DTXSWC, dtxswc);

		break;

	default:

		break;

	}

	wr32(reg_offset, reg_val);

}



/**

drivers/net/ethernet/intel/igb/igb_hwmon.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <linux/pci.h>



#ifdef CONFIG_IGB_HWMON

struct i2c_board_info i350_sensor_info = {

static struct i2c_board_info i350_sensor_info = {

	I2C_BOARD_INFO("i350bb", (0Xf8 >> 1)),

};

drivers/net/ethernet/intel/igb/igb_main.c

+2 −2
Original line number Diff line number Diff line
@@ -2542,8 +2542,8 @@ static void igb_probe_vfs(struct igb_adapter *adapter) 
	if ((hw->mac.type == e1000_i210) || (hw->mac.type == e1000_i211))

		return;



	igb_enable_sriov(pdev, max_vfs);

	pci_sriov_set_totalvfs(pdev, 7);

	igb_enable_sriov(pdev, max_vfs);



#endif /* CONFIG_PCI_IOV */

}
@@ -2652,7 +2652,7 @@ static int igb_sw_init(struct igb_adapter *adapter) 
		if (max_vfs > 7) {

			dev_warn(&pdev->dev,

				 "Maximum of 7 VFs per PF, using max\n");

			adapter->vfs_allocated_count = 7;

			max_vfs = adapter->vfs_allocated_count = 7;

		} else

			adapter->vfs_allocated_count = max_vfs;

		if (adapter->vfs_allocated_count)

drivers/net/ethernet/intel/igb/igb_ptp.c

+1 −1
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ void igb_ptp_init(struct igb_adapter *adapter) 
	case e1000_82576:

		snprintf(adapter->ptp_caps.name, 16, "%pm", netdev->dev_addr);

		adapter->ptp_caps.owner = THIS_MODULE;

		adapter->ptp_caps.max_adj = 1000000000;

		adapter->ptp_caps.max_adj = 999999881;

		adapter->ptp_caps.n_ext_ts = 0;

		adapter->ptp_caps.pps = 0;

		adapter->ptp_caps.adjfreq = igb_ptp_adjfreq_82576;

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

+20 −4
Original line number Diff line number Diff line
@@ -944,9 +944,17 @@ free_queue_irqs: 
		free_irq(adapter->msix_entries[vector].vector,

			 adapter->q_vector[vector]);

	}

	pci_disable_msix(adapter->pdev);

	kfree(adapter->msix_entries);

	adapter->msix_entries = NULL;

	/* This failure is non-recoverable - it indicates the system is

	 * out of MSIX vector resources and the VF driver cannot run

	 * without them.  Set the number of msix vectors to zero

	 * indicating that not enough can be allocated.  The error

	 * will be returned to the user indicating device open failed.

	 * Any further attempts to force the driver to open will also

	 * fail.  The only way to recover is to unload the driver and

	 * reload it again.  If the system has recovered some MSIX

	 * vectors then it may succeed.

	 */

	adapter->num_msix_vectors = 0;

	return err;

}
@@ -2572,6 +2580,15 @@ static int ixgbevf_open(struct net_device *netdev) 
	struct ixgbe_hw *hw = &adapter->hw;

	int err;



	/* A previous failure to open the device because of a lack of

	 * available MSIX vector resources may have reset the number

	 * of msix vectors variable to zero.  The only way to recover

	 * is to unload/reload the driver and hope that the system has

	 * been able to recover some MSIX vector resources.

	 */

	if (!adapter->num_msix_vectors)

		return -ENOMEM;



	/* disallow open during test */

	if (test_bit(__IXGBEVF_TESTING, &adapter->state))

		return -EBUSY;
@@ -2628,7 +2645,6 @@ static int ixgbevf_open(struct net_device *netdev) 


err_req_irq:

	ixgbevf_down(adapter);

	ixgbevf_free_irq(adapter);

err_setup_rx:

	ixgbevf_free_all_rx_resources(adapter);

err_setup_tx: