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

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



Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2021-03-11

This series contains updates to igc and e1000e drivers.

Sasha adds locking to reset task to prevent race condition for igc.

Muhammad fixes reporting of supported pause frame as well as advertised
pause frame for Tx/Rx off for igc.

Andre fixes timestamp retrieval from the wrong timer for igc.

Vitaly adds locking to reset task to prevent race condition for e1000e.

Dinghao Liu adds a missed check to return on error in
e1000_set_d0_lplu_state_82571.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b80350f3 b52912b8

drivers/net/ethernet/intel/e1000e/82571.c

+2 −0
Original line number Diff line number Diff line
@@ -899,6 +899,8 @@ static s32 e1000_set_d0_lplu_state_82571(struct e1000_hw *hw, bool active) 
	} else {

		data &= ~IGP02E1000_PM_D0_LPLU;

		ret_val = e1e_wphy(hw, IGP02E1000_PHY_POWER_MGMT, data);

		if (ret_val)

			return ret_val;

		/* LPLU and SmartSpeed are mutually exclusive.  LPLU is used

		 * during Dx states where the power conservation is most

		 * important.  During driver activity we should enable

drivers/net/ethernet/intel/e1000e/netdev.c

+5 −1
Original line number Diff line number Diff line
@@ -5974,15 +5974,19 @@ static void e1000_reset_task(struct work_struct *work) 
	struct e1000_adapter *adapter;

	adapter = container_of(work, struct e1000_adapter, reset_task);



	rtnl_lock();

	/* don't run the task if already down */

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

	if (test_bit(__E1000_DOWN, &adapter->state)) {

		rtnl_unlock();

		return;

	}



	if (!(adapter->flags & FLAG_RESTART_NOW)) {

		e1000e_dump(adapter);

		e_err("Reset adapter unexpectedly\n");

	}

	e1000e_reinit_locked(adapter);

	rtnl_unlock();

}



/**

drivers/net/ethernet/intel/igc/igc.h

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ void igc_ptp_init(struct igc_adapter *adapter); 
void igc_ptp_reset(struct igc_adapter *adapter);

void igc_ptp_suspend(struct igc_adapter *adapter);

void igc_ptp_stop(struct igc_adapter *adapter);

void igc_ptp_rx_pktstamp(struct igc_q_vector *q_vector, void *va,

void igc_ptp_rx_pktstamp(struct igc_q_vector *q_vector, __le32 *va,

			 struct sk_buff *skb);

int igc_ptp_set_ts_config(struct net_device *netdev, struct ifreq *ifr);

int igc_ptp_get_ts_config(struct net_device *netdev, struct ifreq *ifr);

drivers/net/ethernet/intel/igc/igc_ethtool.c

+4 −3
Original line number Diff line number Diff line
@@ -1711,6 +1711,9 @@ static int igc_ethtool_get_link_ksettings(struct net_device *netdev, 
						     Autoneg);

	}



	/* Set pause flow control settings */

	ethtool_link_ksettings_add_link_mode(cmd, supported, Pause);



	switch (hw->fc.requested_mode) {

	case igc_fc_full:

		ethtool_link_ksettings_add_link_mode(cmd, advertising, Pause);
@@ -1725,9 +1728,7 @@ static int igc_ethtool_get_link_ksettings(struct net_device *netdev, 
						     Asym_Pause);

		break;

	default:

		ethtool_link_ksettings_add_link_mode(cmd, advertising, Pause);

		ethtool_link_ksettings_add_link_mode(cmd, advertising,

						     Asym_Pause);

		break;

	}



	status = pm_runtime_suspended(&adapter->pdev->dev) ?

drivers/net/ethernet/intel/igc/igc_main.c

+9 −0
Original line number Diff line number Diff line
@@ -3831,10 +3831,19 @@ static void igc_reset_task(struct work_struct *work) 


	adapter = container_of(work, struct igc_adapter, reset_task);



	rtnl_lock();

	/* If we're already down or resetting, just bail */

	if (test_bit(__IGC_DOWN, &adapter->state) ||

	    test_bit(__IGC_RESETTING, &adapter->state)) {

		rtnl_unlock();

		return;

	}



	igc_rings_dump(adapter);

	igc_regs_dump(adapter);

	netdev_err(adapter->netdev, "Reset adapter\n");

	igc_reinit_locked(adapter);

	rtnl_unlock();

}



/**