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

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Fixes 2019-03-26

This series contains updates to igb, ixgbe, i40e and fm10k.

Jake fixes an issue with PTP in i40e where a previous commit resulted
in a regression where the driver would interpret small negative
adjustments as large positive additions, resulting in incorrect
behavior.

Arvind Sankar fixes an issue in igb where a previous commit would cause
a warning in the PCI pm core and resulted in pci_pm_runtime_suspend
would not call pci_save_state or pci_finish_runtime_suspend.

Ivan Vecera fixes MDIO bus registration with ixgbe, where the driver was
ignoring errors returned when registering and would leave the pointer in
a NULL state which triggered a BUG when un-registering.

Stefan Assmann fixes the check for Wake-On-LAN for i40e, which only
supports magic packet.

Yue Haibing fixes a potential NULL pointer de-reference in fm10k by
adding a simple check if the value is NULL.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d3332184 01ca6671

drivers/net/ethernet/intel/fm10k/fm10k_main.c

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ static int __init fm10k_init_module(void) 
	/* create driver workqueue */

	fm10k_workqueue = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0,

					  fm10k_driver_name);

	if (!fm10k_workqueue)

		return -ENOMEM;



	fm10k_dbg_init();

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

+1 −2
Original line number Diff line number Diff line
@@ -2573,8 +2573,7 @@ static int i40e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 
		return -EOPNOTSUPP;



	/* only magic packet is supported */

	if (wol->wolopts && (wol->wolopts != WAKE_MAGIC)

			  | (wol->wolopts != WAKE_FILTER))

	if (wol->wolopts & ~WAKE_MAGIC)

		return -EOPNOTSUPP;



	/* is this a new value? */

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

+3 −2
Original line number Diff line number Diff line
@@ -146,12 +146,13 @@ static int i40e_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb) 
static int i40e_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)

{

	struct i40e_pf *pf = container_of(ptp, struct i40e_pf, ptp_caps);

	struct timespec64 now;

	struct timespec64 now, then;



	then = ns_to_timespec64(delta);

	mutex_lock(&pf->tmreg_lock);



	i40e_ptp_read(pf, &now, NULL);

	timespec64_add_ns(&now, delta);

	now = timespec64_add(now, then);

	i40e_ptp_write(pf, (const struct timespec64 *)&now);



	mutex_unlock(&pf->tmreg_lock);

drivers/net/ethernet/intel/igb/e1000_defines.h

+2 −0
Original line number Diff line number Diff line
@@ -194,6 +194,8 @@ 
/* enable link status from external LINK_0 and LINK_1 pins */

#define E1000_CTRL_SWDPIN0  0x00040000  /* SWDPIN 0 value */

#define E1000_CTRL_SWDPIN1  0x00080000  /* SWDPIN 1 value */

#define E1000_CTRL_ADVD3WUC 0x00100000  /* D3 WUC */

#define E1000_CTRL_EN_PHY_PWR_MGMT 0x00200000 /* PHY PM enable */

#define E1000_CTRL_SDP0_DIR 0x00400000  /* SDP0 Data direction */

#define E1000_CTRL_SDP1_DIR 0x00800000  /* SDP1 Data direction */

#define E1000_CTRL_RST      0x04000000  /* Global reset */

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

+8 −49
Original line number Diff line number Diff line
@@ -8740,9 +8740,7 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake, 
	struct e1000_hw *hw = &adapter->hw;

	u32 ctrl, rctl, status;

	u32 wufc = runtime ? E1000_WUFC_LNKC : adapter->wol;

#ifdef CONFIG_PM

	int retval = 0;

#endif

	bool wake;



	rtnl_lock();

	netif_device_detach(netdev);
@@ -8755,14 +8753,6 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake, 
	igb_clear_interrupt_scheme(adapter);

	rtnl_unlock();



#ifdef CONFIG_PM

	if (!runtime) {

		retval = pci_save_state(pdev);

		if (retval)

			return retval;

	}

#endif



	status = rd32(E1000_STATUS);

	if (status & E1000_STATUS_LU)

		wufc &= ~E1000_WUFC_LNKC;
@@ -8779,10 +8769,6 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake, 
		}



		ctrl = rd32(E1000_CTRL);

		/* advertise wake from D3Cold */

		#define E1000_CTRL_ADVD3WUC 0x00100000

		/* phy power management enable */

		#define E1000_CTRL_EN_PHY_PWR_MGMT 0x00200000

		ctrl |= E1000_CTRL_ADVD3WUC;

		wr32(E1000_CTRL, ctrl);
@@ -8796,12 +8782,15 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake, 
		wr32(E1000_WUFC, 0);

	}



	*enable_wake = wufc || adapter->en_mng_pt;

	if (!*enable_wake)

	wake = wufc || adapter->en_mng_pt;

	if (!wake)

		igb_power_down_link(adapter);

	else

		igb_power_up_link(adapter);



	if (enable_wake)

		*enable_wake = wake;



	/* Release control of h/w to f/w.  If f/w is AMT enabled, this

	 * would have already happened in close and is redundant.

	 */
@@ -8844,22 +8833,7 @@ static void igb_deliver_wake_packet(struct net_device *netdev) 


static int __maybe_unused igb_suspend(struct device *dev)

{

	int retval;

	bool wake;

	struct pci_dev *pdev = to_pci_dev(dev);



	retval = __igb_shutdown(pdev, &wake, 0);

	if (retval)

		return retval;



	if (wake) {

		pci_prepare_to_sleep(pdev);

	} else {

		pci_wake_from_d3(pdev, false);

		pci_set_power_state(pdev, PCI_D3hot);

	}



	return 0;

	return __igb_shutdown(to_pci_dev(dev), NULL, 0);

}



static int __maybe_unused igb_resume(struct device *dev)
@@ -8930,22 +8904,7 @@ static int __maybe_unused igb_runtime_idle(struct device *dev) 


static int __maybe_unused igb_runtime_suspend(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	int retval;

	bool wake;



	retval = __igb_shutdown(pdev, &wake, 1);

	if (retval)

		return retval;



	if (wake) {

		pci_prepare_to_sleep(pdev);

	} else {

		pci_wake_from_d3(pdev, false);

		pci_set_power_state(pdev, PCI_D3hot);

	}



	return 0;

	return __igb_shutdown(to_pci_dev(dev), NULL, 1);

}



static int __maybe_unused igb_runtime_resume(struct device *dev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE