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

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

Merge branch 'intel-next' 



Aaron Brown says:

====================
Mark updates ixgbe for LER / adapter removal.  He restores the HW
address in the recovery path so the device is not perpetually removed,
fixes up some removed state ethtool results and adds checks related to
config space access.

Jacob adds support for the new SIOCGHWTSTAMP ioctl.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 28572760 93501d48

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

+3 −2
Original line number Diff line number Diff line
@@ -765,6 +765,7 @@ struct ixgbe_adapter { 
	struct ptp_clock_info ptp_caps;

	struct work_struct ptp_tx_work;

	struct sk_buff *ptp_tx_skb;

	struct hwtstamp_config tstamp_config;

	unsigned long ptp_tx_start;

	unsigned long last_overflow_check;

	unsigned long last_rx_ptp_check;
@@ -957,8 +958,8 @@ static inline void ixgbe_ptp_rx_hwtstamp(struct ixgbe_ring *rx_ring, 
	rx_ring->last_rx_timestamp = jiffies;

}



int ixgbe_ptp_hwtstamp_ioctl(struct ixgbe_adapter *adapter, struct ifreq *ifr,

			     int cmd);

int ixgbe_ptp_set_ts_config(struct ixgbe_adapter *adapter, struct ifreq *ifr);

int ixgbe_ptp_get_ts_config(struct ixgbe_adapter *adapter, struct ifreq *ifr);

void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter);

void ixgbe_ptp_reset(struct ixgbe_adapter *adapter);

void ixgbe_ptp_check_pps_event(struct ixgbe_adapter *adapter, u32 eicr);

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

+7 −3
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2013 Intel Corporation.

  Copyright(c) 1999 - 2014 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -61,6 +61,9 @@ static void ixgbe_set_pcie_completion_timeout(struct ixgbe_hw *hw) 
	u32 gcr = IXGBE_READ_REG(hw, IXGBE_GCR);

	u16 pcie_devctl2;



	if (ixgbe_removed(hw->hw_addr))

		return;



	/* only take action if timeout value is defaulted to 0 */

	if (gcr & IXGBE_GCR_CMPL_TMOUT_MASK)

		goto out;
@@ -79,8 +82,9 @@ static void ixgbe_set_pcie_completion_timeout(struct ixgbe_hw *hw) 
	 * directly in order to set the completion timeout value for

	 * 16ms to 55ms

	 */

	pci_read_config_word(adapter->pdev,

	                     IXGBE_PCI_DEVICE_CONTROL2, &pcie_devctl2);

	pcie_devctl2 = ixgbe_read_pci_cfg_word(hw, IXGBE_PCI_DEVICE_CONTROL2);

	if (ixgbe_removed(hw->hw_addr))

		return;

	pcie_devctl2 |= IXGBE_PCI_DEVICE_CONTROL2_16ms;

	pci_write_config_word(adapter->pdev,

	                      IXGBE_PCI_DEVICE_CONTROL2, pcie_devctl2);

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

+9 −7
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2013 Intel Corporation.

  Copyright(c) 1999 - 2014 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -2487,7 +2487,6 @@ static u32 ixgbe_pcie_timeout_poll(struct ixgbe_hw *hw) 
 **/

static s32 ixgbe_disable_pcie_master(struct ixgbe_hw *hw)

{

	struct ixgbe_adapter *adapter = hw->back;

	s32 status = 0;

	u32 i, poll;

	u16 value;
@@ -2496,7 +2495,8 @@ static s32 ixgbe_disable_pcie_master(struct ixgbe_hw *hw) 
	IXGBE_WRITE_REG(hw, IXGBE_CTRL, IXGBE_CTRL_GIO_DIS);



	/* Exit if master requests are blocked */

	if (!(IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_GIO))

	if (!(IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_GIO) ||

	    ixgbe_removed(hw->hw_addr))

		goto out;



	/* Poll for master request bit to clear */
@@ -2524,8 +2524,9 @@ static s32 ixgbe_disable_pcie_master(struct ixgbe_hw *hw) 
	poll = ixgbe_pcie_timeout_poll(hw);

	for (i = 0; i < poll; i++) {

		udelay(100);

		pci_read_config_word(adapter->pdev, IXGBE_PCI_DEVICE_STATUS,

							 &value);

		value = ixgbe_read_pci_cfg_word(hw, IXGBE_PCI_DEVICE_STATUS);

		if (ixgbe_removed(hw->hw_addr))

			goto out;

		if (!(value & IXGBE_PCI_DEVICE_STATUS_TRANSACTION_PENDING))

			goto out;

	}
@@ -2867,7 +2868,6 @@ san_mac_addr_clr: 
 **/

u16 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw)

{

	struct ixgbe_adapter *adapter = hw->back;

	u16 msix_count = 1;

	u16 max_msix_count;

	u16 pcie_offset;
@@ -2886,7 +2886,9 @@ u16 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw) 
		return msix_count;

	}



	pci_read_config_word(adapter->pdev, pcie_offset, &msix_count);

	msix_count = ixgbe_read_pci_cfg_word(hw, pcie_offset);

	if (ixgbe_removed(hw->hw_addr))

		msix_count = 0;

	msix_count &= IXGBE_PCIE_MSIX_TBL_SZ_MASK;



	/* MSI-X count is zero-based in HW */

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

+5 −1
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2013 Intel Corporation.

  Copyright(c) 1999 - 2014 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -128,6 +128,10 @@ s32 ixgbe_get_thermal_sensor_data_generic(struct ixgbe_hw *hw); 
s32 ixgbe_init_thermal_sensor_thresh_generic(struct ixgbe_hw *hw);



#define IXGBE_FAILED_READ_REG 0xffffffffU

#define IXGBE_FAILED_READ_CFG_DWORD 0xffffffffU

#define IXGBE_FAILED_READ_CFG_WORD 0xffffU



u16 ixgbe_read_pci_cfg_word(struct ixgbe_hw *hw, u32 reg);



static inline bool ixgbe_removed(void __iomem *addr)

{

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

+8 −1
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2013 Intel Corporation.

  Copyright(c) 1999 - 2014 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -1247,6 +1247,11 @@ static int ixgbe_link_test(struct ixgbe_adapter *adapter, u64 *data) 
	struct ixgbe_hw *hw = &adapter->hw;

	bool link_up;

	u32 link_speed = 0;



	if (ixgbe_removed(hw->hw_addr)) {

		*data = 1;

		return 1;

	}

	*data = 0;



	hw->mac.ops.check_link(hw, &link_speed, &link_up, true);
@@ -1969,6 +1974,7 @@ static void ixgbe_diag_test(struct net_device *netdev, 
		data[1] = 1;

		data[2] = 1;

		data[3] = 1;

		data[4] = 1;

		eth_test->flags |= ETH_TEST_FL_FAILED;

		return;

	}
@@ -1988,6 +1994,7 @@ static void ixgbe_diag_test(struct net_device *netdev, 
					data[1] = 1;

					data[2] = 1;

					data[3] = 1;

					data[4] = 1;

					eth_test->flags |= ETH_TEST_FL_FAILED;

					clear_bit(__IXGBE_TESTING,

						  &adapter->state);