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

Commit f3120acc 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/next-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2015-07-17

This series contains updates to igb, ixgbe, ixgbevf, i40e, bnx2x,
freescale, siena and dp83640.

Jacob provides several patches to clarify the intended way to implement
both SIOCSHWTSTAMP and ethtool's get_ts_info().  It is okay to support
the specific filters in SIOCSHWTSTAMP by upscaling them to the generic
filters.

Alex Duyck provides a igb patch to pull the time stamp from the fragment
before it gets added to the skb, to avoid a possible issue in which the
fragment can possibly be less than IGB_RX_HDR_LEN due to the time stamp
being pulled after the copybreak check.  Also provides a ixgbevf patch to
fold the ixgbevf_pull_tail() call into ixgbevf_add_rx_frag(), which gives
the advantage that the fragment does not have to be modified after it is
added to the skb.

Fan provides patches for ixgbe/ixgbevf to set the receive hash type
based on receive descriptor RSS type.

Todd provides a fix for igb where on check for link on any media other
than copper was not being detected since it was looking on the incorrect
PHY page (due to the page being used gets switched before the function
to check link gets executed).
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0e55a42a 2ba6c079

Documentation/networking/timestamping.txt

+7 −0
Original line number Diff line number Diff line
@@ -359,6 +359,13 @@ the requested fine-grained filtering for incoming packets is not 
supported, the driver may time stamp more than just the requested types

of packets.



Drivers are free to use a more permissive configuration than the requested

configuration. It is expected that drivers should only implement directly the

most generic mode that can be supported. For example if the hardware can

support HWTSTAMP_FILTER_V2_EVENT, then it should generally always upscale

HWTSTAMP_FILTER_V2_L2_SYNC_MESSAGE, and so forth, as HWTSTAMP_FILTER_V2_EVENT

is more generic (and more useful to applications).



A driver which supports hardware time stamping shall update the struct

with the actual, possibly more permissive configuration. If the

requested packets cannot be time stamped, then nothing should be

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

+1 −10
Original line number Diff line number Diff line
@@ -3562,17 +3562,8 @@ static int bnx2x_get_ts_info(struct net_device *dev, 


		info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) |

				   (1 << HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |

				   (1 << HWTSTAMP_FILTER_PTP_V1_L4_SYNC) |

				   (1 << HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ) |

				   (1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT) |

				   (1 << HWTSTAMP_FILTER_PTP_V2_L4_SYNC) |

				   (1 << HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ) |

				   (1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |

				   (1 << HWTSTAMP_FILTER_PTP_V2_L2_SYNC) |

				   (1 << HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ) |

				   (1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |

				   (1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |

				   (1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ);

				   (1 << HWTSTAMP_FILTER_PTP_V2_EVENT);



		info->tx_types = (1 << HWTSTAMP_TX_OFF)|(1 << HWTSTAMP_TX_ON);

drivers/net/ethernet/freescale/fec_ptp.c

+0 −6
Original line number Diff line number Diff line
@@ -506,12 +506,6 @@ int fec_ptp_set(struct net_device *ndev, struct ifreq *ifr) 
		break;



	default:

		/*

		 * register RXMTRL must be set in order to do V1 packets,

		 * therefore it is not possible to time stamp both V1 Sync and

		 * Delay_Req messages and hardware does not support

		 * timestamping all packets => return error

		 */

		fep->hwts_rx_en = 1;

		config.rx_filter = HWTSTAMP_FILTER_ALL;

		break;

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

+2 −11
Original line number Diff line number Diff line
@@ -1467,17 +1467,8 @@ static int i40e_get_ts_info(struct net_device *dev, 
	info->tx_types = (1 << HWTSTAMP_TX_OFF) | (1 << HWTSTAMP_TX_ON);



	info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) |

			   (1 << HWTSTAMP_FILTER_PTP_V1_L4_SYNC) |

			   (1 << HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ) |

			   (1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |

			   (1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |

			   (1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT) |

			   (1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |

			   (1 << HWTSTAMP_FILTER_PTP_V2_L2_SYNC) |

			   (1 << HWTSTAMP_FILTER_PTP_V2_L4_SYNC) |

			   (1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ) |

			   (1 << HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ) |

			   (1 << HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ);

			   (1 << HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |

			   (1 << HWTSTAMP_FILTER_PTP_V2_EVENT);



	return 0;

}

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

+13 −5
Original line number Diff line number Diff line
@@ -139,10 +139,6 @@ static s32 igb_check_for_link_media_swap(struct e1000_hw *hw) 
	if (ret_val)

		return ret_val;



	/* reset page to 0 */

	ret_val = phy->ops.write_reg(hw, E1000_M88E1112_PAGE_ADDR, 0);

	if (ret_val)

		return ret_val;



	if (data & E1000_M88E1112_STATUS_LINK)

		port = E1000_MEDIA_PORT_OTHER;
@@ -151,8 +147,20 @@ static s32 igb_check_for_link_media_swap(struct e1000_hw *hw) 
	if (port && (hw->dev_spec._82575.media_port != port)) {

		hw->dev_spec._82575.media_port = port;

		hw->dev_spec._82575.media_changed = true;

	}



	if (port == E1000_MEDIA_PORT_COPPER) {

		/* reset page to 0 */

		ret_val = phy->ops.write_reg(hw, E1000_M88E1112_PAGE_ADDR, 0);

		if (ret_val)

			return ret_val;

		igb_check_for_link_82575(hw);

	} else {

		ret_val = igb_check_for_link_82575(hw);

		igb_check_for_link_82575(hw);

		/* reset page to 0 */

		ret_val = phy->ops.write_reg(hw, E1000_M88E1112_PAGE_ADDR, 0);

		if (ret_val)

			return ret_val;

	}



	return 0;