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

Commit 25f41150 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/jkirsher/next-queue 



Jeff Kirsher says:

====================
1GbE Intel Wired LAN Driver Updates 2017-06-06

This series contains updates and fixes to e1000e and igb.

Matwey V Kornilov fixes an issue where igb_get_phy_id_82575() relies on
the fact that page 0 is already selected, but this is not the case after
igb_read_phy_reg_gs40g()/igb_write_phy_reg_gs40g() were removed in a
previous commit.  This leads to initialization failure and some devices
not working.  To fix the issue, explicitly select page 0 before first
access to PHY registers.

Arnd Bergmann modifies the driver to avoid a "defined but not used"
warning by removing #ifdefs and using __maybe_unused annotation instead
for new power management functions.

Jake provides most of the changes in the series, all around PTP and
timestamp fixes/updates.  Resolved several race conditions based on
the hardware can only handle one transmit timestamp at a time, so
fix the locking logic, as well as create a statistic for "skipped"
timestamps to help administrators identify issues.

Benjamin Poirier provides 2 changes, first to igb to remove the
second argument to igb_update_stats() since it always passes the
same two arguments.  So instead of having to pass the second argument,
just update the function to the necessary information from the adapter
structure.  Second modifies the e1000e_get_stats64() call to
dev_get_stats() to avoid ethtool garbage being reported.

Konstantin Khlebnikov modifies e1000e to use disable_hardirq(), instead
of disable_irq() for MSIx vectors in e1000_netpoll().
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9d15e5cc fd8e597b

drivers/net/ethernet/intel/e1000e/e1000.h

+1 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ struct e1000_adapter { 
	u32 tx_fifo_size;

	u32 tx_dma_failed;

	u32 tx_hwtstamp_timeouts;

	u32 tx_hwtstamp_skipped;



	/* Rx */

	bool (*clean_rx)(struct e1000_ring *ring, int *work_done,

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

+2 −1
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ static const struct e1000_stats e1000_gstrings_stats[] = { 
	E1000_STAT("uncorr_ecc_errors", uncorr_errors),

	E1000_STAT("corr_ecc_errors", corr_errors),

	E1000_STAT("tx_hwtstamp_timeouts", tx_hwtstamp_timeouts),

	E1000_STAT("tx_hwtstamp_skipped", tx_hwtstamp_skipped),

};



#define E1000_GLOBAL_STATS_LEN	ARRAY_SIZE(e1000_gstrings_stats)
@@ -2072,7 +2073,7 @@ static void e1000_get_ethtool_stats(struct net_device *netdev, 


	pm_runtime_get_sync(netdev->dev.parent);



	e1000e_get_stats64(netdev, &net_stats);

	dev_get_stats(netdev, &net_stats);



	pm_runtime_put_sync(netdev->dev.parent);

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

+24 −15
Original line number Diff line number Diff line
@@ -1183,6 +1183,7 @@ static void e1000e_tx_hwtstamp_work(struct work_struct *work) 
	struct e1000_hw *hw = &adapter->hw;



	if (er32(TSYNCTXCTL) & E1000_TSYNCTXCTL_VALID) {

		struct sk_buff *skb = adapter->tx_hwtstamp_skb;

		struct skb_shared_hwtstamps shhwtstamps;

		u64 txstmp;
@@ -1191,9 +1192,14 @@ static void e1000e_tx_hwtstamp_work(struct work_struct *work) 


		e1000e_systim_to_hwtstamp(adapter, &shhwtstamps, txstmp);



		skb_tstamp_tx(adapter->tx_hwtstamp_skb, &shhwtstamps);

		dev_kfree_skb_any(adapter->tx_hwtstamp_skb);

		/* Clear the global tx_hwtstamp_skb pointer and force writes

		 * prior to notifying the stack of a Tx timestamp.

		 */

		adapter->tx_hwtstamp_skb = NULL;

		wmb(); /* force write prior to skb_tstamp_tx */



		skb_tstamp_tx(skb, &shhwtstamps);

		dev_kfree_skb_any(skb);

	} else if (time_after(jiffies, adapter->tx_hwtstamp_start

			      + adapter->tx_timeout_factor * HZ)) {

		dev_kfree_skb_any(adapter->tx_hwtstamp_skb);
@@ -5861,13 +5867,16 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, 
			     nr_frags);

	if (count) {

		if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) &&

		    (adapter->flags & FLAG_HAS_HW_TIMESTAMP) &&

		    !adapter->tx_hwtstamp_skb) {

		    (adapter->flags & FLAG_HAS_HW_TIMESTAMP)) {

			if (!adapter->tx_hwtstamp_skb) {

				skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;

				tx_flags |= E1000_TX_FLAGS_HWTSTAMP;

				adapter->tx_hwtstamp_skb = skb_get(skb);

				adapter->tx_hwtstamp_start = jiffies;

				schedule_work(&adapter->tx_hwtstamp_work);

			} else {

				adapter->tx_hwtstamp_skipped++;

			}

		}



		skb_tx_timestamp(skb);
@@ -6734,19 +6743,19 @@ static irqreturn_t e1000_intr_msix(int __always_unused irq, void *data) 


		vector = 0;

		msix_irq = adapter->msix_entries[vector].vector;

		disable_irq(msix_irq);

		if (disable_hardirq(msix_irq))

			e1000_intr_msix_rx(msix_irq, netdev);

		enable_irq(msix_irq);



		vector++;

		msix_irq = adapter->msix_entries[vector].vector;

		disable_irq(msix_irq);

		if (disable_hardirq(msix_irq))

			e1000_intr_msix_tx(msix_irq, netdev);

		enable_irq(msix_irq);



		vector++;

		msix_irq = adapter->msix_entries[vector].vector;

		disable_irq(msix_irq);

		if (disable_hardirq(msix_irq))

			e1000_msix_other(msix_irq, netdev);

		enable_irq(msix_irq);

	}

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

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ static s32 igb_init_phy_params_82575(struct e1000_hw *hw) 
	}



	/* Set phy->phy_addr and phy->id. */

	igb_write_phy_reg_82580(hw, I347AT4_PAGE_SELECT, 0);

	ret_val = igb_get_phy_id_82575(hw);

	if (ret_val)

		return ret_val;

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

+3 −1
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ struct igb_adapter { 
	struct cyclecounter cc;

	struct timecounter tc;

	u32 tx_hwtstamp_timeouts;

	u32 tx_hwtstamp_skipped;

	u32 rx_hwtstamp_cleared;

	bool pps_sys_wrap_on;
@@ -666,7 +667,7 @@ void igb_setup_tctl(struct igb_adapter *); 
void igb_setup_rctl(struct igb_adapter *);

netdev_tx_t igb_xmit_frame_ring(struct sk_buff *, struct igb_ring *);

void igb_alloc_rx_buffers(struct igb_ring *, u16);

void igb_update_stats(struct igb_adapter *, struct rtnl_link_stats64 *);

void igb_update_stats(struct igb_adapter *);

bool igb_has_link(struct igb_adapter *adapter);

void igb_set_ethtool_ops(struct net_device *);

void igb_power_up_link(struct igb_adapter *);
@@ -676,6 +677,7 @@ void igb_ptp_stop(struct igb_adapter *adapter); 
void igb_ptp_reset(struct igb_adapter *adapter);

void igb_ptp_suspend(struct igb_adapter *adapter);

void igb_ptp_rx_hang(struct igb_adapter *adapter);

void igb_ptp_tx_hang(struct igb_adapter *adapter);

void igb_ptp_rx_rgtstamp(struct igb_q_vector *q_vector, struct sk_buff *skb);

void igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector, void *va,

			 struct sk_buff *skb);