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

Commit 335b3209 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 2015-12-14

This series contains updates to e1000e and igb.

Alex Duyck changes e1000_up() to void since it always returned 0, also
by making it void, we can drop some code since we no longer have to worry
about non-zero return values.

Aaron Sierra removes GS40G specific defines and functions since the i210
internal PHY can be accessed with the access functions shared by 82580,
i350 and i354 devices.  Also removes the code to add the PHY address into
the PCDL register address, since there is no real reason to do so.

Joe updates the cable length function reports all four pairs true min, max
and average cable length for i210.  Also updated ethtool to use enum-based
labels instead of hard coded values.

Benjamin Poirier cleans up code that is never reachable since MSI-X
interrupts are not shared in e1000e.  Also removes the ICR read in the
other interrupt handler, since the information is not needed and IMS is
configured such that the only link status change can trigger the other
interrupt handler.  Fixed in MSI-X mode, there is no handler for the LSC
interrupt so there is no point in writing that to ICS now that we always
assume other interrupts are caused by LSC.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5833e052 0a8047ac

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

+2 −1
Original line number Diff line number Diff line
@@ -441,12 +441,13 @@ 
#define E1000_IMS_RXQ1      E1000_ICR_RXQ1      /* Rx Queue 1 Interrupt */

#define E1000_IMS_TXQ0      E1000_ICR_TXQ0      /* Tx Queue 0 Interrupt */

#define E1000_IMS_TXQ1      E1000_ICR_TXQ1      /* Tx Queue 1 Interrupt */

#define E1000_IMS_OTHER     E1000_ICR_OTHER     /* Other Interrupts */

#define E1000_IMS_OTHER     E1000_ICR_OTHER     /* Other Interrupt */



/* Interrupt Cause Set */

#define E1000_ICS_LSC       E1000_ICR_LSC       /* Link Status Change */

#define E1000_ICS_RXSEQ     E1000_ICR_RXSEQ     /* Rx sequence error */

#define E1000_ICS_RXDMT0    E1000_ICR_RXDMT0    /* Rx desc min. threshold */

#define E1000_ICS_OTHER     E1000_ICR_OTHER     /* Other Interrupt */



/* Transmit Descriptor Control */

#define E1000_TXDCTL_PTHRESH 0x0000003F /* TXDCTL Prefetch Threshold */

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

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ extern const char e1000e_driver_version[]; 
void e1000e_check_options(struct e1000_adapter *adapter);

void e1000e_set_ethtool_ops(struct net_device *netdev);



int e1000e_up(struct e1000_adapter *adapter);

void e1000e_up(struct e1000_adapter *adapter);

void e1000e_down(struct e1000_adapter *adapter, bool reset);

void e1000e_reinit_locked(struct e1000_adapter *adapter);

void e1000e_reset(struct e1000_adapter *adapter);

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

+32 −48
Original line number Diff line number Diff line
@@ -1905,30 +1905,15 @@ static irqreturn_t e1000_msix_other(int __always_unused irq, void *data) 
	struct net_device *netdev = data;

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_hw *hw = &adapter->hw;

	u32 icr = er32(ICR);



	if (!(icr & E1000_ICR_INT_ASSERTED)) {

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

			ew32(IMS, E1000_IMS_OTHER);

		return IRQ_NONE;

	}



	if (icr & adapter->eiac_mask)

		ew32(ICS, (icr & adapter->eiac_mask));



	if (icr & E1000_ICR_OTHER) {

		if (!(icr & E1000_ICR_LSC))

			goto no_link_interrupt;

	hw->mac.get_link_status = true;



	/* guard against interrupt when we're going down */

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

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

		mod_timer(&adapter->watchdog_timer, jiffies + 1);

		ew32(IMS, E1000_IMS_OTHER);

	}



no_link_interrupt:

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

		ew32(IMS, E1000_IMS_LSC | E1000_IMS_OTHER);



	return IRQ_HANDLED;

}
@@ -1946,6 +1931,9 @@ static irqreturn_t e1000_intr_msix_tx(int __always_unused irq, void *data) 
		/* Ring was not completely cleaned, so fire another interrupt */

		ew32(ICS, tx_ring->ims_val);



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

		ew32(IMS, adapter->tx_ring->ims_val);



	return IRQ_HANDLED;

}
@@ -2027,6 +2015,7 @@ static void e1000_configure_msix(struct e1000_adapter *adapter) 
		       hw->hw_addr + E1000_EITR_82574(vector));

	else

		writel(1, hw->hw_addr + E1000_EITR_82574(vector));

	adapter->eiac_mask |= E1000_IMS_OTHER;



	/* Cause Tx interrupts on every write back */

	ivar |= (1 << 31);
@@ -2034,12 +2023,8 @@ static void e1000_configure_msix(struct e1000_adapter *adapter) 
	ew32(IVAR, ivar);



	/* enable MSI-X PBA support */

	ctrl_ext = er32(CTRL_EXT);

	ctrl_ext |= E1000_CTRL_EXT_PBA_CLR;



	/* Auto-Mask Other interrupts upon ICR read */

	ew32(IAM, ~E1000_EIAC_MASK_82574 | E1000_IMS_OTHER);

	ctrl_ext |= E1000_CTRL_EXT_EIAME;

	ctrl_ext = er32(CTRL_EXT) & ~E1000_CTRL_EXT_IAME;

	ctrl_ext |= E1000_CTRL_EXT_PBA_CLR | E1000_CTRL_EXT_EIAME;

	ew32(CTRL_EXT, ctrl_ext);

	e1e_flush();

}
@@ -2255,7 +2240,7 @@ static void e1000_irq_enable(struct e1000_adapter *adapter) 


	if (adapter->msix_entries) {

		ew32(EIAC_82574, adapter->eiac_mask & E1000_EIAC_MASK_82574);

		ew32(IMS, adapter->eiac_mask | E1000_IMS_OTHER | E1000_IMS_LSC);

		ew32(IMS, adapter->eiac_mask | E1000_IMS_LSC);

	} else if ((hw->mac.type == e1000_pch_lpt) ||

		   (hw->mac.type == e1000_pch_spt)) {

		ew32(IMS, IMS_ENABLE_MASK | E1000_IMS_ECCER);
@@ -4146,10 +4131,24 @@ void e1000e_reset(struct e1000_adapter *adapter) 


}



int e1000e_up(struct e1000_adapter *adapter)

/**

 * e1000e_trigger_lsc - trigger an LSC interrupt

 * @adapter: 

 *

 * Fire a link status change interrupt to start the watchdog.

 **/

static void e1000e_trigger_lsc(struct e1000_adapter *adapter)

{

	struct e1000_hw *hw = &adapter->hw;



	if (adapter->msix_entries)

		ew32(ICS, E1000_ICS_OTHER);

	else

		ew32(ICS, E1000_ICS_LSC);

}



void e1000e_up(struct e1000_adapter *adapter)

{

	/* hardware has been reset, we need to reload some things */

	e1000_configure(adapter);
@@ -4161,13 +4160,7 @@ int e1000e_up(struct e1000_adapter *adapter) 


	netif_start_queue(adapter->netdev);



	/* fire a link change interrupt to start the watchdog */

	if (adapter->msix_entries)

		ew32(ICS, E1000_ICS_LSC | E1000_ICR_OTHER);

	else

		ew32(ICS, E1000_ICS_LSC);



	return 0;

	e1000e_trigger_lsc(adapter);

}



static void e1000e_flush_descriptors(struct e1000_adapter *adapter)
@@ -4592,11 +4585,7 @@ static int e1000_open(struct net_device *netdev) 
	hw->mac.get_link_status = true;

	pm_runtime_put(&pdev->dev);



	/* fire a link status change interrupt to start the watchdog */

	if (adapter->msix_entries)

		ew32(ICS, E1000_ICS_LSC | E1000_ICR_OTHER);

	else

		ew32(ICS, E1000_ICS_LSC);

	e1000e_trigger_lsc(adapter);



	return 0;
@@ -6633,7 +6622,7 @@ static int e1000e_pm_runtime_resume(struct device *dev) 
		return rc;



	if (netdev->flags & IFF_UP)

		rc = e1000e_up(adapter);

		e1000e_up(adapter);



	return rc;

}
@@ -6824,13 +6813,8 @@ static void e1000_io_resume(struct pci_dev *pdev) 


	e1000_init_manageability_pt(adapter);



	if (netif_running(netdev)) {

		if (e1000e_up(adapter)) {

			dev_err(&pdev->dev,

				"can't bring device back up after reset\n");

			return;

		}

	}

	if (netif_running(netdev))

		e1000e_up(adapter);



	netif_device_attach(netdev);

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

+4 −9
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ static s32 igb_get_cfg_done_82575(struct e1000_hw *); 
static s32  igb_init_hw_82575(struct e1000_hw *);

static s32  igb_phy_hw_reset_sgmii_82575(struct e1000_hw *);

static s32  igb_read_phy_reg_sgmii_82575(struct e1000_hw *, u32, u16 *);

static s32  igb_read_phy_reg_82580(struct e1000_hw *, u32, u16 *);

static s32  igb_write_phy_reg_82580(struct e1000_hw *, u32, u16);

static s32  igb_reset_hw_82575(struct e1000_hw *);

static s32  igb_reset_hw_82580(struct e1000_hw *);

static s32  igb_set_d0_lplu_state_82575(struct e1000_hw *, bool);
@@ -205,13 +203,10 @@ static s32 igb_init_phy_params_82575(struct e1000_hw *hw) 
		case e1000_82580:

		case e1000_i350:

		case e1000_i354:

			phy->ops.read_reg = igb_read_phy_reg_82580;

			phy->ops.write_reg = igb_write_phy_reg_82580;

			break;

		case e1000_i210:

		case e1000_i211:

			phy->ops.read_reg = igb_read_phy_reg_gs40g;

			phy->ops.write_reg = igb_write_phy_reg_gs40g;

			phy->ops.read_reg = igb_read_phy_reg_82580;

			phy->ops.write_reg = igb_write_phy_reg_82580;

			break;

		default:

			phy->ops.read_reg = igb_read_phy_reg_igp;
@@ -2153,7 +2148,7 @@ void igb_vmdq_set_replication_pf(struct e1000_hw *hw, bool enable) 
 *  Reads the MDI control register in the PHY at offset and stores the

 *  information read to data.

 **/

static s32 igb_read_phy_reg_82580(struct e1000_hw *hw, u32 offset, u16 *data)

s32 igb_read_phy_reg_82580(struct e1000_hw *hw, u32 offset, u16 *data)

{

	s32 ret_val;
@@ -2177,7 +2172,7 @@ static s32 igb_read_phy_reg_82580(struct e1000_hw *hw, u32 offset, u16 *data) 
 *

 *  Writes data to MDI control register in the PHY at offset.

 **/

static s32 igb_write_phy_reg_82580(struct e1000_hw *hw, u32 offset, u16 data)

s32 igb_write_phy_reg_82580(struct e1000_hw *hw, u32 offset, u16 data)

{

	s32 ret_val;

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

+4 −1
Original line number Diff line number Diff line
@@ -927,7 +927,10 @@ 


/* Intel i347-AT4 Registers */



#define I347AT4_PCDL                   0x10 /* PHY Cable Diagnostics Length */

#define I347AT4_PCDL0                  0x10 /* Pair 0 PHY Cable Diagnostics Length */

#define I347AT4_PCDL1                  0x11 /* Pair 1 PHY Cable Diagnostics Length */

#define I347AT4_PCDL2                  0x12 /* Pair 2 PHY Cable Diagnostics Length */

#define I347AT4_PCDL3                  0x13 /* Pair 3 PHY Cable Diagnostics Length */

#define I347AT4_PCDC                   0x15 /* PHY Cable Diagnostics Control */

#define I347AT4_PAGE_SELECT            0x16