Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next (031554ea) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/net/ethernet/intel/ixgbe/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@

		obj-$(CONFIG_IXGBE) += ixgbe.o

		ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o ixgbe_debugfs.o\
		ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \
		ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \
		ixgbe_mbx.o ixgbe_x540.o ixgbe_lib.o ixgbe_ptp.o

		@@ -40,4 +40,5 @@ ixgbe-$(CONFIG_IXGBE_DCB) += ixgbe_dcb.o ixgbe_dcb_82598.o \
		ixgbe_dcb_82599.o ixgbe_dcb_nl.o

		ixgbe-$(CONFIG_IXGBE_HWMON) += ixgbe_sysfs.o
		ixgbe-$(CONFIG_DEBUG_FS) += ixgbe_debugfs.o
		ixgbe-$(CONFIG_FCOE:m=y) += ixgbe_fcoe.o

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+28 −6

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@
		#include <linux/cpumask.h>
		#include <linux/aer.h>
		#include <linux/if_vlan.h>
		#include <linux/jiffies.h>

		#include <linux/clocksource.h>
		#include <linux/net_tstamp.h>
		@@ -231,6 +232,7 @@ struct ixgbe_ring {
		struct ixgbe_tx_buffer *tx_buffer_info;
		struct ixgbe_rx_buffer *rx_buffer_info;
		};
		unsigned long last_rx_timestamp;
		unsigned long state;
		u8 __iomem *tail;
		dma_addr_t dma; /* phys. address of descriptor ring */
		@@ -580,11 +582,14 @@ struct ixgbe_adapter {

		struct ptp_clock *ptp_clock;
		struct ptp_clock_info ptp_caps;
		struct work_struct ptp_tx_work;
		struct sk_buff *ptp_tx_skb;
		unsigned long ptp_tx_start;
		unsigned long last_overflow_check;
		unsigned long last_rx_ptp_check;
		spinlock_t tmreg_lock;
		struct cyclecounter cc;
		struct timecounter tc;
		int rx_hwtstamp_filter;
		u32 base_incval;

		/* SR-IOV */
		@@ -749,15 +754,32 @@ static inline struct netdev_queue txring_txq(const struct ixgbe_ring ring)
		extern void ixgbe_ptp_init(struct ixgbe_adapter *adapter);
		extern void ixgbe_ptp_stop(struct ixgbe_adapter *adapter);
		extern void ixgbe_ptp_overflow_check(struct ixgbe_adapter *adapter);
		extern void ixgbe_ptp_tx_hwtstamp(struct ixgbe_q_vector *q_vector,
		extern void ixgbe_ptp_rx_hang(struct ixgbe_adapter *adapter);
		extern void __ixgbe_ptp_rx_hwtstamp(struct ixgbe_q_vector *q_vector,
		struct sk_buff *skb);
		extern void ixgbe_ptp_rx_hwtstamp(struct ixgbe_q_vector *q_vector,
		static inline void ixgbe_ptp_rx_hwtstamp(struct ixgbe_ring *rx_ring,
		union ixgbe_adv_rx_desc *rx_desc,
		struct sk_buff *skb);
		struct sk_buff *skb)
		{
		if (unlikely(!ixgbe_test_staterr(rx_desc, IXGBE_RXDADV_STAT_TS)))
		return;

		__ixgbe_ptp_rx_hwtstamp(rx_ring->q_vector, skb);

		/*
		* Update the last_rx_timestamp timer in order to enable watchdog check
		* for error case of latched timestamp on a dropped packet.
		*/
		rx_ring->last_rx_timestamp = jiffies;
		}

		extern int ixgbe_ptp_hwtstamp_ioctl(struct ixgbe_adapter *adapter,
		struct ifreq *ifr, int cmd);
		extern void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter);
		extern void ixgbe_ptp_reset(struct ixgbe_adapter *adapter);
		extern void ixgbe_ptp_check_pps_event(struct ixgbe_adapter *adapter, u32 eicr);
		#ifdef CONFIG_PCI_IOV
		void ixgbe_sriov_reinit(struct ixgbe_adapter *adapter);
		#endif

		#endif /* _IXGBE_H_ */

drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -24,9 +24,6 @@
		Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

		*******************************************************************************/

		#ifdef CONFIG_DEBUG_FS

		#include <linux/debugfs.h>
		#include <linux/module.h>

		@@ -277,5 +274,3 @@ void ixgbe_dbg_exit(void)
		{
		debugfs_remove_recursive(ixgbe_dbg_root);
		}

		#endif /* CONFIG_DEBUG_FS */

drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c

+34 −12

Original line number	Diff line number	Diff line
		@@ -1837,19 +1837,11 @@ static void ixgbe_diag_test(struct net_device *netdev,
		struct ethtool_test eth_test, u64 data)
		{
		struct ixgbe_adapter *adapter = netdev_priv(netdev);
		struct ixgbe_hw *hw = &adapter->hw;
		bool if_running = netif_running(netdev);

		set_bit(__IXGBE_TESTING, &adapter->state);
		if (eth_test->flags == ETH_TEST_FL_OFFLINE) {
		/* Offline tests */

		e_info(hw, "offline testing starting\n");

		/* Link test performed before hardware reset so autoneg doesn't
		* interfere with test result */
		if (ixgbe_link_test(adapter, &data[4]))
		eth_test->flags \|= ETH_TEST_FL_FAILED;

		if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {
		int i;
		for (i = 0; i < adapter->num_vfs; i++) {
		@@ -1870,12 +1862,24 @@ static void ixgbe_diag_test(struct net_device *netdev,
		}
		}

		/* Offline tests */
		e_info(hw, "offline testing starting\n");

		if (if_running)
		/* indicate we're in test mode */
		dev_close(netdev);
		else
		ixgbe_reset(adapter);

		/* bringing adapter down disables SFP+ optics */
		if (hw->mac.ops.enable_tx_laser)
		hw->mac.ops.enable_tx_laser(hw);

		/* Link test performed before hardware reset so autoneg doesn't
		* interfere with test result
		*/
		if (ixgbe_link_test(adapter, &data[4]))
		eth_test->flags \|= ETH_TEST_FL_FAILED;

		ixgbe_reset(adapter);
		e_info(hw, "register testing starting\n");
		if (ixgbe_reg_test(adapter, &data[0]))
		eth_test->flags \|= ETH_TEST_FL_FAILED;
		@@ -1908,16 +1912,22 @@ static void ixgbe_diag_test(struct net_device *netdev,
		skip_loopback:
		ixgbe_reset(adapter);

		/* clear testing bit and return adapter to previous state */
		clear_bit(__IXGBE_TESTING, &adapter->state);
		if (if_running)
		dev_open(netdev);
		} else {
		e_info(hw, "online testing starting\n");

		/* if adapter is down, SFP+ optics will be disabled */
		if (!if_running && hw->mac.ops.enable_tx_laser)
		hw->mac.ops.enable_tx_laser(hw);

		/* Online tests */
		if (ixgbe_link_test(adapter, &data[4]))
		eth_test->flags \|= ETH_TEST_FL_FAILED;

		/* Online tests aren't run; pass by default */
		/* Offline tests aren't run; pass by default */
		data[0] = 0;
		data[1] = 0;
		data[2] = 0;
		@@ -1925,6 +1935,10 @@ static void ixgbe_diag_test(struct net_device *netdev,

		clear_bit(__IXGBE_TESTING, &adapter->state);
		}

		/* if adapter was down, ensure SFP+ optics are disabled again */
		if (!if_running && hw->mac.ops.disable_tx_laser)
		hw->mac.ops.disable_tx_laser(hw);
		skip_ol_tests:
		msleep_interruptible(4 * 1000);
		}
		@@ -2695,6 +2709,14 @@ static int ixgbe_get_ts_info(struct net_device *dev,
		(1 << HWTSTAMP_FILTER_NONE) \|
		(1 << HWTSTAMP_FILTER_PTP_V1_L4_SYNC) \|
		(1 << HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ) \|
		(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_V2_EVENT);
		break;
		default:

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+53 −9

Original line number	Diff line number	Diff line
		@@ -803,6 +803,7 @@ static void ixgbe_tx_timeout_reset(struct ixgbe_adapter *adapter)
		/* Do the reset outside of interrupt context */
		if (!test_bit(__IXGBE_DOWN, &adapter->state)) {
		adapter->flags2 \|= IXGBE_FLAG2_RESET_REQUESTED;
		e_warn(drv, "initiating reset due to tx timeout\n");
		ixgbe_service_event_schedule(adapter);
		}
		}
		@@ -850,9 +851,6 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
		total_bytes += tx_buffer->bytecount;
		total_packets += tx_buffer->gso_segs;

		if (unlikely(tx_buffer->tx_flags & IXGBE_TX_FLAGS_TSTAMP))
		ixgbe_ptp_tx_hwtstamp(q_vector, tx_buffer->skb);

		/* free the skb */
		dev_kfree_skb_any(tx_buffer->skb);

		@@ -1441,7 +1439,7 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring,

		ixgbe_rx_checksum(rx_ring, rx_desc, skb);

		ixgbe_ptp_rx_hwtstamp(rx_ring->q_vector, rx_desc, skb);
		ixgbe_ptp_rx_hwtstamp(rx_ring, rx_desc, skb);

		if ((dev->features & NETIF_F_HW_VLAN_RX) &&
		ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_VP)) {
		@@ -5534,6 +5532,8 @@ static void ixgbe_watchdog_link_is_up(struct ixgbe_adapter *adapter)
		break;
		}

		adapter->last_rx_ptp_check = jiffies;

		if (adapter->flags2 & IXGBE_FLAG2_PTP_ENABLED)
		ixgbe_ptp_start_cyclecounter(adapter);

		@@ -5614,6 +5614,7 @@ static void ixgbe_watchdog_flush_tx(struct ixgbe_adapter *adapter)
		* to get done, so reset controller to flush Tx.
		* (Do the reset outside of interrupt context).
		*/
		e_warn(drv, "initiating reset to clear Tx work after link loss\n");
		adapter->flags2 \|= IXGBE_FLAG2_RESET_REQUESTED;
		}
		}
		@@ -5878,7 +5879,6 @@ static void ixgbe_service_task(struct work_struct *work)
		struct ixgbe_adapter *adapter = container_of(work,
		struct ixgbe_adapter,
		service_task);

		ixgbe_reset_subtask(adapter);
		ixgbe_sfp_detection_subtask(adapter);
		ixgbe_sfp_link_config_subtask(adapter);
		@@ -5886,7 +5886,11 @@ static void ixgbe_service_task(struct work_struct *work)
		ixgbe_watchdog_subtask(adapter);
		ixgbe_fdir_reinit_subtask(adapter);
		ixgbe_check_hang_subtask(adapter);

		if (adapter->flags2 & IXGBE_FLAG2_PTP_ENABLED) {
		ixgbe_ptp_overflow_check(adapter);
		ixgbe_ptp_rx_hang(adapter);
		}

		ixgbe_service_event_complete(adapter);
		}
		@@ -6432,6 +6436,11 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,
		if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
		skb_shinfo(skb)->tx_flags \|= SKBTX_IN_PROGRESS;
		tx_flags \|= IXGBE_TX_FLAGS_TSTAMP;

		/* schedule check for Tx timestamp */
		adapter->ptp_tx_skb = skb_get(skb);
		adapter->ptp_tx_start = jiffies;
		schedule_work(&adapter->ptp_tx_work);
		}

		#ifdef CONFIG_PCI_IOV
		@@ -6827,6 +6836,26 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc)
		}

		#endif /* CONFIG_IXGBE_DCB */
		#ifdef CONFIG_PCI_IOV
		void ixgbe_sriov_reinit(struct ixgbe_adapter *adapter)
		{
		struct net_device *netdev = adapter->netdev;

		rtnl_lock();
		#ifdef CONFIG_IXGBE_DCB
		ixgbe_setup_tc(netdev, netdev_get_num_tc(netdev));
		#else
		if (netif_running(netdev))
		ixgbe_close(netdev);
		ixgbe_clear_interrupt_scheme(adapter);
		ixgbe_init_interrupt_scheme(adapter);
		if (netif_running(netdev))
		ixgbe_open(netdev);
		#endif
		rtnl_unlock();
		}

		#endif
		void ixgbe_do_reset(struct net_device *netdev)
		{
		struct ixgbe_adapter *adapter = netdev_priv(netdev);
		@@ -7353,7 +7382,15 @@ static int ixgbe_probe(struct pci_dev pdev, const struct pci_device_id ent)
		}

		#ifdef CONFIG_PCI_IOV
		ixgbe_enable_sriov(adapter, ii);
		/* SR-IOV not supported on the 82598 */
		if (adapter->hw.mac.type == ixgbe_mac_82598EB)
		goto skip_sriov;
		/* Mailbox */
		ixgbe_init_mbx_params_pf(hw);
		memcpy(&hw->mbx.ops, ii->mbx_ops, sizeof(hw->mbx.ops));
		ixgbe_enable_sriov(adapter);
		pci_sriov_set_totalvfs(pdev, 63);
		skip_sriov:

		#endif
		netdev->features = NETIF_F_SG \|
		@@ -7609,8 +7646,14 @@ static void ixgbe_remove(struct pci_dev *pdev)
		if (netdev->reg_state == NETREG_REGISTERED)
		unregister_netdev(netdev);

		#ifdef CONFIG_PCI_IOV
		/*
		* Only disable SR-IOV on unload if the user specified the now
		* deprecated max_vfs module parameter.
		*/
		if (max_vfs)
		ixgbe_disable_sriov(adapter);

		#endif
		ixgbe_clear_interrupt_scheme(adapter);

		ixgbe_release_hw_control(adapter);
		@@ -7824,6 +7867,7 @@ static struct pci_driver ixgbe_driver = {
		.resume = ixgbe_resume,
		#endif
		.shutdown = ixgbe_shutdown,
		.sriov_configure = ixgbe_pci_sriov_configure,
		.err_handler = &ixgbe_err_handler
		};