Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2015-03-06

This series contains updates to e1000, e1000e and igb.

Yanir provides updates to e1000e based on the patches provided by John
Linville.  First updates the code comment to better describe the changes
and the impact on the driver.  Second removed calls to ioremap/unmap for
i219 since this is only relevant to older hardware only.  Starting with
i219, the NVM will not be mapped to its one BAR but to a address region
in another bar.

Alex Duyck provides two fixes for igb, first fixes a compile warning
where a variable may be used uninitialized, so Alex initializes it.
Second fixes an issue where all of the pin register values were having
to be pushed onto the stack each time the function was called, so to
avoid this, Alex made them static const so that they should only need
to be allocated once and we can avoid all the instructions to get them
onto the stack.

Eliezer found an issue in e1000 where we needed to be calling
netif_carrier_off earlier in the down() to prevent the stack from
queuing more packets to the interface.

Sabrina Dubroca resolved a potential race condition by adding a
dummy allocator.  There was a race condition between e1000_change_mtu()
cleanups and netpoll, when changing the MTU across jumbo sizes.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 36 insertions, 22 deletions

diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 7f997d36948f..73c98d34fa1f 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -144,6 +144,11 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
 static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
                                      struct e1000_rx_ring *rx_ring,
                                      int *work_done, int work_to_do);
+static void e1000_alloc_dummy_rx_buffers(struct e1000_adapter *adapter,
+                                         struct e1000_rx_ring *rx_ring,
+                                         int cleaned_count)
+{
+}
 static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
                                    struct e1000_rx_ring *rx_ring,
                                    int cleaned_count);
@@ -516,6 +521,7 @@ void e1000_down(struct e1000_adapter *adapter)
         struct net_device *netdev = adapter->netdev;
         u32 rctl, tctl;
 
+        netif_carrier_off(netdev);
 
         /* disable receives in the hardware */
         rctl = er32(RCTL);
@@ -544,7 +550,6 @@ void e1000_down(struct e1000_adapter *adapter)
 
         adapter->link_speed = 0;
         adapter->link_duplex = 0;
-        netif_carrier_off(netdev);
 
         e1000_reset(adapter);
         e1000_clean_all_tx_rings(adapter);
@@ -3552,8 +3557,11 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
                 msleep(1);
         /* e1000_down has a dependency on max_frame_size */
         hw->max_frame_size = max_frame;
-        if (netif_running(netdev))
+        if (netif_running(netdev)) {
+                /* prevent buffers from being reallocated */
+                adapter->alloc_rx_buf = e1000_alloc_dummy_rx_buffers;
                 e1000_down(adapter);
+        }
 
         /* NOTE: netdev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN
          * means we reserve 2 more, this pushes us to allocate from the next
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 7523f510c7e4..9d81c0317433 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -603,12 +603,15 @@ static s32 e1000_init_nvm_params_ich8lan(struct e1000_hw *hw)
         u16 i;
         u32 nvm_size;
 
-        /* Can't read flash registers if the register set isn't mapped. */
         nvm->type = e1000_nvm_flash_sw;
-        /* in SPT, gfpreg doesn't exist. NVM size is taken from the
-         * STRAP register
-         */
+
         if (hw->mac.type == e1000_pch_spt) {
+                /* in SPT, gfpreg doesn't exist. NVM size is taken from the
+                 * STRAP register. This is because in SPT the GbE Flash region
+                 * is no longer accessed through the flash registers. Instead,
+                 * the mechanism has changed, and the Flash region access
+                 * registers are now implemented in GbE memory space.
+                 */
                 nvm->flash_base_addr = 0;
                 nvm_size = (((er32(STRAP) >> 1) & 0x1F) + 1)
                     * NVM_SIZE_MULTIPLIER;
@@ -618,6 +621,7 @@ static s32 e1000_init_nvm_params_ich8lan(struct e1000_hw *hw)
                 /* Set the base address for flash register access */
                 hw->flash_address = hw->hw_addr + E1000_FLASH_BASE_ADDR;
         } else {
+                /* Can't read flash registers if register set isn't mapped. */
                 if (!hw->flash_address) {
                         e_dbg("ERROR: Flash registers not mapped\n");
                         return -E1000_ERR_CONFIG;
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 6fa4fc05709e..4be4576d71aa 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -6833,7 +6833,8 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto err_ioremap;
 
         if ((adapter->flags & FLAG_HAS_FLASH) &&
-            (pci_resource_flags(pdev, 1) & IORESOURCE_MEM)) {
+            (pci_resource_flags(pdev, 1) & IORESOURCE_MEM) &&
+            (hw->mac.type < e1000_pch_spt)) {
                 flash_start = pci_resource_start(pdev, 1);
                 flash_len = pci_resource_len(pdev, 1);
                 adapter->hw.flash_address = ioremap(flash_start, flash_len);
@@ -7069,7 +7070,7 @@ err_hw_init:
         kfree(adapter->tx_ring);
         kfree(adapter->rx_ring);
 err_sw_init:
-        if (adapter->hw.flash_address)
+        if ((adapter->hw.flash_address) && (hw->mac.type < e1000_pch_spt))
                 iounmap(adapter->hw.flash_address);
         e1000e_reset_interrupt_capability(adapter);
 err_flashmap:
@@ -7142,7 +7143,8 @@ static void e1000_remove(struct pci_dev *pdev)
         kfree(adapter->rx_ring);
 
         iounmap(adapter->hw.hw_addr);
-        if (adapter->hw.flash_address)
+        if ((adapter->hw.flash_address) &&
+            (adapter->hw.mac.type < e1000_pch_spt))
                 iounmap(adapter->hw.flash_address);
         pci_release_selected_regions(pdev,
                                      pci_select_bars(pdev, IORESOURCE_MEM));
diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c
index d20fc8ed11f1..d6be4c69172d 100644
--- a/drivers/net/ethernet/intel/igb/igb_ptp.c
+++ b/drivers/net/ethernet/intel/igb/igb_ptp.c
@@ -358,7 +358,7 @@ static int igb_ptp_settime_i210(struct ptp_clock_info *ptp,
 static void igb_pin_direction(int pin, int input, u32 *ctrl, u32 *ctrl_ext)
 {
         u32 *ptr = pin < 2 ? ctrl : ctrl_ext;
-        u32 mask[IGB_N_SDP] = {
+        static const u32 mask[IGB_N_SDP] = {
                 E1000_CTRL_SDP0_DIR,
                 E1000_CTRL_SDP1_DIR,
                 E1000_CTRL_EXT_SDP2_DIR,
@@ -373,16 +373,16 @@ static void igb_pin_direction(int pin, int input, u32 *ctrl, u32 *ctrl_ext)
 
 static void igb_pin_extts(struct igb_adapter *igb, int chan, int pin)
 {
-        struct e1000_hw *hw = &igb->hw;
-        u32 aux0_sel_sdp[IGB_N_SDP] = {
+        static const u32 aux0_sel_sdp[IGB_N_SDP] = {
                 AUX0_SEL_SDP0, AUX0_SEL_SDP1, AUX0_SEL_SDP2, AUX0_SEL_SDP3,
         };
-        u32 aux1_sel_sdp[IGB_N_SDP] = {
+        static const u32 aux1_sel_sdp[IGB_N_SDP] = {
                 AUX1_SEL_SDP0, AUX1_SEL_SDP1, AUX1_SEL_SDP2, AUX1_SEL_SDP3,
         };
-        u32 ts_sdp_en[IGB_N_SDP] = {
+        static const u32 ts_sdp_en[IGB_N_SDP] = {
                 TS_SDP0_EN, TS_SDP1_EN, TS_SDP2_EN, TS_SDP3_EN,
         };
+        struct e1000_hw *hw = &igb->hw;
         u32 ctrl, ctrl_ext, tssdp = 0;
 
         ctrl = rd32(E1000_CTRL);
@@ -409,28 +409,28 @@ static void igb_pin_extts(struct igb_adapter *igb, int chan, int pin)
 
 static void igb_pin_perout(struct igb_adapter *igb, int chan, int pin)
 {
-        struct e1000_hw *hw = &igb->hw;
-        u32 aux0_sel_sdp[IGB_N_SDP] = {
+        static const u32 aux0_sel_sdp[IGB_N_SDP] = {
                 AUX0_SEL_SDP0, AUX0_SEL_SDP1, AUX0_SEL_SDP2, AUX0_SEL_SDP3,
         };
-        u32 aux1_sel_sdp[IGB_N_SDP] = {
+        static const u32 aux1_sel_sdp[IGB_N_SDP] = {
                 AUX1_SEL_SDP0, AUX1_SEL_SDP1, AUX1_SEL_SDP2, AUX1_SEL_SDP3,
         };
-        u32 ts_sdp_en[IGB_N_SDP] = {
+        static const u32 ts_sdp_en[IGB_N_SDP] = {
                 TS_SDP0_EN, TS_SDP1_EN, TS_SDP2_EN, TS_SDP3_EN,
         };
-        u32 ts_sdp_sel_tt0[IGB_N_SDP] = {
+        static const u32 ts_sdp_sel_tt0[IGB_N_SDP] = {
                 TS_SDP0_SEL_TT0, TS_SDP1_SEL_TT0,
                 TS_SDP2_SEL_TT0, TS_SDP3_SEL_TT0,
         };
-        u32 ts_sdp_sel_tt1[IGB_N_SDP] = {
+        static const u32 ts_sdp_sel_tt1[IGB_N_SDP] = {
                 TS_SDP0_SEL_TT1, TS_SDP1_SEL_TT1,
                 TS_SDP2_SEL_TT1, TS_SDP3_SEL_TT1,
         };
-        u32 ts_sdp_sel_clr[IGB_N_SDP] = {
+        static const u32 ts_sdp_sel_clr[IGB_N_SDP] = {
                 TS_SDP0_SEL_FC1, TS_SDP1_SEL_FC1,
                 TS_SDP2_SEL_FC1, TS_SDP3_SEL_FC1,
         };
+        struct e1000_hw *hw = &igb->hw;
         u32 ctrl, ctrl_ext, tssdp = 0;
 
         ctrl = rd32(E1000_CTRL);
@@ -468,7 +468,7 @@ static int igb_ptp_feature_enable_i210(struct ptp_clock_info *ptp,
         u32 tsauxc, tsim, tsauxc_mask, tsim_mask, trgttiml, trgttimh;
         unsigned long flags;
         struct timespec ts;
-        int pin;
+        int pin = -1;
         s64 ns;
 
         switch (rq->type) {