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

Commit def63be8 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-08-18

This series contains updates to igb, e100, e1000e and ixgbe.

Shota Suzuki provides a fix for a possible overflow in
igb_set_interrupt_capability() which leads to an oops.  When changing the
number of queues by "ethtool -L", set IGB_FLAG_QUEUE_PAIRS in the same
manner as when initializing the igb driver.

Vasily Averin provides a fix for a missing rtnl_unlock() for when we
error out due to not being able to allocate memory for our queues.

Stefan Assman provides a couple of fixes for igb/igbvf.  First changes
the igb driver in probe to simply call igb_enable_sriov() instead of
igb_sriov_reinit() since we are starting from scratch.  Then in igbvf,
fix the driver where it does not clear the buffer_info->dma in all
cases after calling dma_unmap_single(), which was found by changing the
MTU twice.

Richard Cochran implements the periodic output function using the
programmable clock outputs available in i210 when possible, falling
back to the target time for longer periods.

Todd adds support for the Marvell PHY 1512 which is required for i354
devices.  Then updates igb to make sure SR-IOV init uses the correct
number of queues, since recent changes could result in the PF holding
onto all of the queues.

Alex Williamson provides a fix in the case where a guest OS does not
support hot-unplug, so disable SR-IOV prior to unregister_netdev() to
avoid the problem.

Jia-Ju Bai provides several patches, first knocks some collecting dust
off an old e100 driver to add a check to avoid a null pointer
dereference.  Then cleans up a possible resource leak by releasing the
skb buffer allocated when the e100_xmit_prepare() runs into an issue
in the DMA mapping.  In igb, add a missing rtnl_unlock() for when we
error out due to igb_sriov_reinit() in the igb_init_interrupt_scheme().
Provides a e1000e fix, based on suggestions from Alex Duyck to move
head/tail register writing to e1000_configure_tx/rx() to avoid a
possible null pointer dereference (similar to igb driver).  Lastly,
fix a possible memory leak in igb_probe(), where the memory shadow_vfta
allocated by kcalloc in igb_sw_init() is not freed.

Mark simplifies port-specific macros for ixgbe by eliminating explicit
comparisons with 0 and enclose formal parameters in parens to eliminate
the risk of an operator precedence issue.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1c8aa215 56d1392f

drivers/net/ethernet/intel/e100.c

+11 −1
Original line number Diff line number Diff line
@@ -1770,8 +1770,11 @@ static int e100_xmit_prepare(struct nic *nic, struct cb *cb, 
	dma_addr = pci_map_single(nic->pdev,

				  skb->data, skb->len, PCI_DMA_TODEVICE);

	/* If we can't map the skb, have the upper layer try later */

	if (pci_dma_mapping_error(nic->pdev, dma_addr))

	if (pci_dma_mapping_error(nic->pdev, dma_addr)) {

		dev_kfree_skb_any(skb);

		skb = NULL;

		return -ENOMEM;

	}



	/*

	 * Use the last 4 bytes of the SKB payload packet as the CRC, used for
@@ -2967,6 +2970,11 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
			   nic->params.cbs.max * sizeof(struct cb),

			   sizeof(u32),

			   0);

	if (!nic->cbs_pool) {

		netif_err(nic, probe, nic->netdev, "Cannot create DMA pool, aborting\n");

		err = -ENOMEM;

		goto err_out_pool;

	}

	netif_info(nic, probe, nic->netdev,

		   "addr 0x%llx, irq %d, MAC addr %pM\n",

		   (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0),
@@ -2974,6 +2982,8 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	return 0;



err_out_pool:

	unregister_netdev(netdev);

err_out_free:

	e100_free(nic);

err_out_iounmap:

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

+12 −12
Original line number Diff line number Diff line
@@ -1737,12 +1737,6 @@ static void e1000_clean_rx_ring(struct e1000_ring *rx_ring) 
	rx_ring->next_to_clean = 0;

	rx_ring->next_to_use = 0;

	adapter->flags2 &= ~FLAG2_IS_DISCARDING;



	writel(0, rx_ring->head);

	if (adapter->flags2 & FLAG2_PCIM2PCI_ARBITER_WA)

		e1000e_update_rdt_wa(rx_ring, 0);

	else

		writel(0, rx_ring->tail);

}



static void e1000e_downshift_workaround(struct work_struct *work)
@@ -2447,12 +2441,6 @@ static void e1000_clean_tx_ring(struct e1000_ring *tx_ring) 


	tx_ring->next_to_use = 0;

	tx_ring->next_to_clean = 0;



	writel(0, tx_ring->head);

	if (adapter->flags2 & FLAG2_PCIM2PCI_ARBITER_WA)

		e1000e_update_tdt_wa(tx_ring, 0);

	else

		writel(0, tx_ring->tail);

}



/**
@@ -2954,6 +2942,12 @@ static void e1000_configure_tx(struct e1000_adapter *adapter) 
	tx_ring->head = adapter->hw.hw_addr + E1000_TDH(0);

	tx_ring->tail = adapter->hw.hw_addr + E1000_TDT(0);



	writel(0, tx_ring->head);

	if (adapter->flags2 & FLAG2_PCIM2PCI_ARBITER_WA)

		e1000e_update_tdt_wa(tx_ring, 0);

	else

		writel(0, tx_ring->tail);



	/* Set the Tx Interrupt Delay register */

	ew32(TIDV, adapter->tx_int_delay);

	/* Tx irq moderation */
@@ -3275,6 +3269,12 @@ static void e1000_configure_rx(struct e1000_adapter *adapter) 
	rx_ring->head = adapter->hw.hw_addr + E1000_RDH(0);

	rx_ring->tail = adapter->hw.hw_addr + E1000_RDT(0);



	writel(0, rx_ring->head);

	if (adapter->flags2 & FLAG2_PCIM2PCI_ARBITER_WA)

		e1000e_update_rdt_wa(rx_ring, 0);

	else

		writel(0, rx_ring->tail);



	/* Enable Receive Checksum Offload for TCP and UDP */

	rxcsum = er32(RXCSUM);

	if (adapter->netdev->features & NETIF_F_RXCSUM)

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

+17 −3
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ static s32 igb_init_phy_params_82575(struct e1000_hw *hw) 
	/* Verify phy id and set remaining function pointers */

	switch (phy->id) {

	case M88E1543_E_PHY_ID:

	case M88E1512_E_PHY_ID:

	case I347AT4_E_PHY_ID:

	case M88E1112_E_PHY_ID:

	case M88E1111_I_PHY_ID:
@@ -243,7 +244,7 @@ static s32 igb_init_phy_params_82575(struct e1000_hw *hw) 
		else

			phy->ops.get_cable_length = igb_get_cable_length_m88;

		phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_m88;

		/* Check if this PHY is confgured for media swap. */

		/* Check if this PHY is configured for media swap. */

		if (phy->id == M88E1112_E_PHY_ID) {

			u16 data;
@@ -266,6 +267,11 @@ static s32 igb_init_phy_params_82575(struct e1000_hw *hw) 
				hw->mac.ops.check_for_link =

						igb_check_for_link_media_swap;

		}

		if (phy->id == M88E1512_E_PHY_ID) {

			ret_val = igb_initialize_M88E1512_phy(hw);

			if (ret_val)

				goto out;

		}

		break;

	case IGP03E1000_E_PHY_ID:

		phy->type = e1000_phy_igp_3;
@@ -897,6 +903,7 @@ static s32 igb_get_phy_id_82575(struct e1000_hw *hw) 
 **/

static s32 igb_phy_hw_reset_sgmii_82575(struct e1000_hw *hw)

{

	struct e1000_phy_info *phy = &hw->phy;

	s32 ret_val;



	/* This isn't a true "hard" reset, but is the only reset
@@ -913,7 +920,11 @@ static s32 igb_phy_hw_reset_sgmii_82575(struct e1000_hw *hw) 
		goto out;



	ret_val = igb_phy_sw_reset(hw);

	if (ret_val)

		goto out;



	if (phy->id == M88E1512_E_PHY_ID)

		ret_val = igb_initialize_M88E1512_phy(hw);

out:

	return ret_val;

}
@@ -1587,6 +1598,7 @@ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw) 
		case I347AT4_E_PHY_ID:

		case M88E1112_E_PHY_ID:

		case M88E1543_E_PHY_ID:

		case M88E1512_E_PHY_ID:

		case I210_I_PHY_ID:

			ret_val = igb_copper_link_setup_m88_gen2(hw);

			break;
@@ -2629,7 +2641,8 @@ s32 igb_set_eee_i354(struct e1000_hw *hw, bool adv1G, bool adv100M) 
	u16 phy_data;



	if ((hw->phy.media_type != e1000_media_type_copper) ||

	    (phy->id != M88E1543_E_PHY_ID))

	    ((phy->id != M88E1543_E_PHY_ID) &&

	     (phy->id != M88E1512_E_PHY_ID)))

		goto out;



	if (!hw->dev_spec._82575.eee_disable) {
@@ -2709,7 +2722,8 @@ s32 igb_get_eee_status_i354(struct e1000_hw *hw, bool *status) 


	/* Check if EEE is supported on this device. */

	if ((hw->phy.media_type != e1000_media_type_copper) ||

	    (phy->id != M88E1543_E_PHY_ID))

	    ((phy->id != M88E1543_E_PHY_ID) &&

	     (phy->id != M88E1512_E_PHY_ID)))

		goto out;



	ret_val = igb_read_xmdio_reg(hw, E1000_PCS_STATUS_ADDR_I354,

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

+5 −0
Original line number Diff line number Diff line
@@ -604,6 +604,10 @@ 
#define E1000_M88E1112_MAC_CTRL_1_MODE_SHIFT	7

#define E1000_M88E1112_PAGE_ADDR		0x16

#define E1000_M88E1112_STATUS			0x01

#define E1000_M88E1512_CFG_REG_1		0x0010

#define E1000_M88E1512_CFG_REG_2		0x0011

#define E1000_M88E1512_CFG_REG_3		0x0007

#define E1000_M88E1512_MODE			0x0014



/* PCI Express Control */

#define E1000_GCR_CMPL_TMOUT_MASK       0x0000F000
@@ -861,6 +865,7 @@ 
#define M88_VENDOR           0x0141

#define I210_I_PHY_ID        0x01410C00

#define M88E1543_E_PHY_ID    0x01410EA0

#define M88E1512_E_PHY_ID    0x01410DD0



/* M88E1000 Specific Registers */

#define M88E1000_PHY_SPEC_CTRL     0x10  /* PHY Specific Control Register */

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

+91 −2
Original line number Diff line number Diff line
@@ -1262,6 +1262,8 @@ s32 igb_phy_force_speed_duplex_m88(struct e1000_hw *hw) 
			switch (hw->phy.id) {

			case I347AT4_E_PHY_ID:

			case M88E1112_E_PHY_ID:

			case M88E1543_E_PHY_ID:

			case M88E1512_E_PHY_ID:

			case I210_I_PHY_ID:

				reset_dsp = false;

				break;
@@ -1270,9 +1272,9 @@ s32 igb_phy_force_speed_duplex_m88(struct e1000_hw *hw) 
					reset_dsp = false;

				break;

			}

			if (!reset_dsp)

			if (!reset_dsp) {

				hw_dbg("Link taking longer than expected.\n");

			else {

			} else {

				/* We didn't get link.

				 * Reset the DSP and cross our fingers.

				 */
@@ -1297,6 +1299,8 @@ s32 igb_phy_force_speed_duplex_m88(struct e1000_hw *hw) 
	if (hw->phy.type != e1000_phy_m88 ||

	    hw->phy.id == I347AT4_E_PHY_ID ||

	    hw->phy.id == M88E1112_E_PHY_ID ||

	    hw->phy.id == M88E1543_E_PHY_ID ||

	    hw->phy.id == M88E1512_E_PHY_ID ||

	    hw->phy.id == I210_I_PHY_ID)

		goto out;
@@ -1737,6 +1741,7 @@ s32 igb_get_cable_length_m88_gen2(struct e1000_hw *hw) 
		phy->cable_length = phy_data / (is_cm ? 100 : 1);

		break;

	case M88E1543_E_PHY_ID:

	case M88E1512_E_PHY_ID:

	case I347AT4_E_PHY_ID:

		/* Remember the original page select and set it to 7 */

		ret_val = phy->ops.read_reg(hw, I347AT4_PAGE_SELECT,
@@ -2188,6 +2193,90 @@ s32 igb_phy_init_script_igp3(struct e1000_hw *hw) 
	return 0;

}



/**

 *  igb_initialize_M88E1512_phy - Initialize M88E1512 PHY

 *  @hw: pointer to the HW structure

 *

 *  Initialize Marvel 1512 to work correctly with Avoton.

 **/

s32 igb_initialize_M88E1512_phy(struct e1000_hw *hw)

{

	struct e1000_phy_info *phy = &hw->phy;

	s32 ret_val = 0;



	/* Switch to PHY page 0xFF. */

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

	if (ret_val)

		goto out;



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

	if (ret_val)

		goto out;



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

	if (ret_val)

		goto out;



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

	if (ret_val)

		goto out;



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

	if (ret_val)

		goto out;



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

	if (ret_val)

		goto out;



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

	if (ret_val)

		goto out;



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

	if (ret_val)

		goto out;



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

	if (ret_val)

		goto out;



	/* Switch to PHY page 0xFB. */

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

	if (ret_val)

		goto out;



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

	if (ret_val)

		goto out;



	/* Switch to PHY page 0x12. */

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

	if (ret_val)

		goto out;



	/* Change mode to SGMII-to-Copper */

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

	if (ret_val)

		goto out;



	/* Return the PHY to page 0. */

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

	if (ret_val)

		goto out;



	ret_val = igb_phy_sw_reset(hw);

	if (ret_val) {

		hw_dbg("Error committing the PHY changes\n");

		return ret_val;

	}



	/* msec_delay(1000); */

	usleep_range(1000, 2000);

out:

	return ret_val;

}



/**

 * igb_power_up_phy_copper - Restore copper link in case of PHY power down

 * @hw: pointer to the HW structure