1 files changed, 60 insertions, 71 deletions

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 0991648c53dc..757d02f443a5 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -169,21 +169,21 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu);
 static int e1000_set_mac(struct net_device *netdev, void *p);
 static irqreturn_t e1000_intr(int irq, void *data);
 static irqreturn_t e1000_intr_msi(int irq, void *data);
-static boolean_t e1000_clean_tx_irq(struct e1000_adapter *adapter,
-                                    struct e1000_tx_ring *tx_ring);
+static bool e1000_clean_tx_irq(struct e1000_adapter *adapter,
+                               struct e1000_tx_ring *tx_ring);
 #ifdef CONFIG_E1000_NAPI
 static int e1000_clean(struct napi_struct *napi, int budget);
-static boolean_t e1000_clean_rx_irq(struct e1000_adapter *adapter,
-                                    struct e1000_rx_ring *rx_ring,
-                                    int *work_done, int work_to_do);
-static boolean_t e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
-                                       struct e1000_rx_ring *rx_ring,
-                                       int *work_done, int work_to_do);
+static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
+                               struct e1000_rx_ring *rx_ring,
+                               int *work_done, int work_to_do);
+static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
+                                  struct e1000_rx_ring *rx_ring,
+                                  int *work_done, int work_to_do);
 #else
-static boolean_t e1000_clean_rx_irq(struct e1000_adapter *adapter,
-                                    struct e1000_rx_ring *rx_ring);
-static boolean_t e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
-                                       struct e1000_rx_ring *rx_ring);
+static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
+                               struct e1000_rx_ring *rx_ring);
+static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
+                                  struct e1000_rx_ring *rx_ring);
 #endif
 static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
                                    struct e1000_rx_ring *rx_ring,
@@ -347,7 +347,6 @@ static void e1000_free_irq(struct e1000_adapter *adapter)
 static void
 e1000_irq_disable(struct e1000_adapter *adapter)
 {
-        atomic_inc(&adapter->irq_sem);
         E1000_WRITE_REG(&adapter->hw, IMC, ~0);
         E1000_WRITE_FLUSH(&adapter->hw);
         synchronize_irq(adapter->pdev->irq);
@@ -361,10 +360,8 @@ e1000_irq_disable(struct e1000_adapter *adapter)
 static void
 e1000_irq_enable(struct e1000_adapter *adapter)
 {
-        if (likely(atomic_dec_and_test(&adapter->irq_sem))) {
-                E1000_WRITE_REG(&adapter->hw, IMS, IMS_ENABLE_MASK);
-                E1000_WRITE_FLUSH(&adapter->hw);
-        }
+        E1000_WRITE_REG(&adapter->hw, IMS, IMS_ENABLE_MASK);
+        E1000_WRITE_FLUSH(&adapter->hw);
 }
 
 static void
@@ -584,7 +581,7 @@ void e1000_power_up_phy(struct e1000_adapter *adapter)
 static void e1000_power_down_phy(struct e1000_adapter *adapter)
 {
         /* Power down the PHY so no link is implied when interface is down *
-         * The PHY cannot be powered down if any of the following is TRUE *
+         * The PHY cannot be powered down if any of the following is true *
          * (a) WoL is enabled
          * (b) AMT is active
          * (c) SoL/IDER session is active */
@@ -638,7 +635,6 @@ e1000_down(struct e1000_adapter *adapter)
 
 #ifdef CONFIG_E1000_NAPI
         napi_disable(&adapter->napi);
-        atomic_set(&adapter->irq_sem, 0);
 #endif
         e1000_irq_disable(adapter);
 
@@ -673,7 +669,7 @@ e1000_reset(struct e1000_adapter *adapter)
 {
         uint32_t pba = 0, tx_space, min_tx_space, min_rx_space;
         uint16_t fc_high_water_mark = E1000_FC_HIGH_DIFF;
-        boolean_t legacy_pba_adjust = FALSE;
+        bool legacy_pba_adjust = false;
 
         /* Repartition Pba for greater than 9k mtu
          * To take effect CTRL.RST is required.
@@ -687,7 +683,7 @@ e1000_reset(struct e1000_adapter *adapter)
         case e1000_82540:
         case e1000_82541:
         case e1000_82541_rev_2:
-                legacy_pba_adjust = TRUE;
+                legacy_pba_adjust = true;
                 pba = E1000_PBA_48K;
                 break;
         case e1000_82545:
@@ -698,7 +694,7 @@ e1000_reset(struct e1000_adapter *adapter)
                 break;
         case e1000_82547:
         case e1000_82547_rev_2:
-                legacy_pba_adjust = TRUE;
+                legacy_pba_adjust = true;
                 pba = E1000_PBA_30K;
                 break;
         case e1000_82571:
@@ -716,7 +712,7 @@ e1000_reset(struct e1000_adapter *adapter)
                 break;
         }
 
-        if (legacy_pba_adjust == TRUE) {
+        if (legacy_pba_adjust) {
                 if (adapter->netdev->mtu > E1000_RXBUFFER_8192)
                         pba -= 8; /* allocate more FIFO for Tx */
 
@@ -1366,15 +1362,15 @@ e1000_sw_init(struct e1000_adapter *adapter)
 
         e1000_set_media_type(hw);
 
-        hw->wait_autoneg_complete = FALSE;
-        hw->tbi_compatibility_en = TRUE;
-        hw->adaptive_ifs = TRUE;
+        hw->wait_autoneg_complete = false;
+        hw->tbi_compatibility_en = true;
+        hw->adaptive_ifs = true;
 
         /* Copper options */
 
         if (hw->media_type == e1000_media_type_copper) {
                 hw->mdix = AUTO_ALL_MODES;
-                hw->disable_polarity_correction = FALSE;
+                hw->disable_polarity_correction = false;
                 hw->master_slave = E1000_MASTER_SLAVE;
         }
 
@@ -1396,7 +1392,6 @@ e1000_sw_init(struct e1000_adapter *adapter)
 #endif
 
         /* Explicitly disable IRQ since the NIC can be in any state. */
-        atomic_set(&adapter->irq_sem, 0);
         e1000_irq_disable(adapter);
 
         spin_lock_init(&adapter->stats_lock);
@@ -1576,7 +1571,7 @@ e1000_close(struct net_device *netdev)
  * @start: address of beginning of memory
  * @len: length of memory
  **/
-static boolean_t
+static bool
 e1000_check_64k_bound(struct e1000_adapter *adapter,
                       void *start, unsigned long len)
 {
@@ -1587,10 +1582,10 @@ e1000_check_64k_bound(struct e1000_adapter *adapter,
          * write location to cross 64k boundary due to errata 23 */
         if (adapter->hw.mac_type == e1000_82545 ||
             adapter->hw.mac_type == e1000_82546) {
-                return ((begin ^ (end - 1)) >> 16) != 0 ? FALSE : TRUE;
+                return ((begin ^ (end - 1)) >> 16) != 0 ? false : true;
         }
 
-        return TRUE;
+        return true;
 }
 
 /**
@@ -2133,7 +2128,7 @@ e1000_configure_rx(struct e1000_adapter *adapter)
         /* Enable 82543 Receive Checksum Offload for TCP and UDP */
         if (hw->mac_type >= e1000_82543) {
                 rxcsum = E1000_READ_REG(hw, RXCSUM);
-                if (adapter->rx_csum == TRUE) {
+                if (adapter->rx_csum) {
                         rxcsum |= E1000_RXCSUM_TUOFL;
 
                         /* Enable 82571 IPv4 payload checksum for UDP fragments
@@ -2669,7 +2664,7 @@ e1000_watchdog(unsigned long data)
         if (link) {
                 if (!netif_carrier_ok(netdev)) {
                         uint32_t ctrl;
-                        boolean_t txb2b = 1;
+                        bool txb2b = true;
                         e1000_get_speed_and_duplex(&adapter->hw,
                                                    &adapter->link_speed,
                                                    &adapter->link_duplex);
@@ -2691,12 +2686,12 @@ e1000_watchdog(unsigned long data)
                         adapter->tx_timeout_factor = 1;
                         switch (adapter->link_speed) {
                         case SPEED_10:
-                                txb2b = 0;
+                                txb2b = false;
                                 netdev->tx_queue_len = 10;
                                 adapter->tx_timeout_factor = 8;
                                 break;
                         case SPEED_100:
-                                txb2b = 0;
+                                txb2b = false;
                                 netdev->tx_queue_len = 100;
                                 /* maybe add some timeout factor ? */
                                 break;
@@ -2704,7 +2699,7 @@ e1000_watchdog(unsigned long data)
 
                         if ((adapter->hw.mac_type == e1000_82571 ||
                              adapter->hw.mac_type == e1000_82572) &&
-                            txb2b == 0) {
+                            !txb2b) {
                                 uint32_t tarc0;
                                 tarc0 = E1000_READ_REG(&adapter->hw, TARC0);
                                 tarc0 &= ~(1 << 21);
@@ -2802,7 +2797,7 @@ e1000_watchdog(unsigned long data)
         E1000_WRITE_REG(&adapter->hw, ICS, E1000_ICS_RXDMT0);
 
         /* Force detection of hung controller every watchdog period */
-        adapter->detect_tx_hung = TRUE;
+        adapter->detect_tx_hung = true;
 
         /* With 82571 controllers, LAA may be overwritten due to controller
          * reset from the other port. Set the appropriate LAA in RAR[0] */
@@ -3025,12 +3020,12 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
                 if (++i == tx_ring->count) i = 0;
                 tx_ring->next_to_use = i;
 
-                return TRUE;
+                return true;
         }
-        return FALSE;
+        return false;
 }
 
-static boolean_t
+static bool
 e1000_tx_csum(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
               struct sk_buff *skb)
 {
@@ -3060,10 +3055,10 @@ e1000_tx_csum(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
                 if (unlikely(++i == tx_ring->count)) i = 0;
                 tx_ring->next_to_use = i;
 
-                return TRUE;
+                return true;
         }
 
-        return FALSE;
+        return false;
 }
 
 #define E1000_MAX_TXD_PWR       12
@@ -3836,11 +3831,8 @@ e1000_intr_msi(int irq, void *data)
 #endif
         uint32_t icr = E1000_READ_REG(hw, ICR);
 
-#ifdef CONFIG_E1000_NAPI
-        /* read ICR disables interrupts using IAM, so keep up with our
-         * enable/disable accounting */
-        atomic_inc(&adapter->irq_sem);
-#endif
+        /* in NAPI mode read ICR disables interrupts using IAM */
+
         if (icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {
                 hw->get_link_status = 1;
                 /* 80003ES2LAN workaround-- For packet buffer work-around on
@@ -3910,12 +3902,8 @@ e1000_intr(int irq, void *data)
                      !(icr & E1000_ICR_INT_ASSERTED)))
                 return IRQ_NONE;
 
-        /* Interrupt Auto-Mask...upon reading ICR,
-         * interrupts are masked.  No need for the
-         * IMC write, but it does mean we should
-         * account for it ASAP. */
-        if (likely(hw->mac_type >= e1000_82571))
-                atomic_inc(&adapter->irq_sem);
+        /* Interrupt Auto-Mask...upon reading ICR, interrupts are masked.  No
+         * need for the IMC write */
 #endif
 
         if (unlikely(icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC))) {
@@ -3939,7 +3927,6 @@ e1000_intr(int irq, void *data)
 #ifdef CONFIG_E1000_NAPI
         if (unlikely(hw->mac_type < e1000_82571)) {
                 /* disable interrupts, without the synchronize_irq bit */
-                atomic_inc(&adapter->irq_sem);
                 E1000_WRITE_REG(hw, IMC, ~0);
                 E1000_WRITE_FLUSH(hw);
         }
@@ -3964,10 +3951,8 @@ e1000_intr(int irq, void *data)
          * in dead lock. Writing IMC forces 82547 into
          * de-assertion state.
          */
-        if (hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2) {
-                atomic_inc(&adapter->irq_sem);
+        if (hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2)
                 E1000_WRITE_REG(hw, IMC, ~0);
-        }
 
         adapter->total_tx_bytes = 0;
         adapter->total_rx_bytes = 0;
@@ -4038,7 +4023,7 @@ e1000_clean(struct napi_struct *napi, int budget)
  * @adapter: board private structure
  **/
 
-static boolean_t
+static bool
 e1000_clean_tx_irq(struct e1000_adapter *adapter,
                    struct e1000_tx_ring *tx_ring)
 {
@@ -4049,7 +4034,7 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
 #ifdef CONFIG_E1000_NAPI
         unsigned int count = 0;
 #endif
-        boolean_t cleaned = FALSE;
+        bool cleaned = false;
         unsigned int total_tx_bytes=0, total_tx_packets=0;
 
         i = tx_ring->next_to_clean;
@@ -4057,7 +4042,7 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
         eop_desc = E1000_TX_DESC(*tx_ring, eop);
 
         while (eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) {
-                for (cleaned = FALSE; !cleaned; ) {
+                for (cleaned = false; !cleaned; ) {
                         tx_desc = E1000_TX_DESC(*tx_ring, i);
                         buffer_info = &tx_ring->buffer_info[i];
                         cleaned = (i == eop);
@@ -4105,7 +4090,7 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
         if (adapter->detect_tx_hung) {
                 /* Detect a transmit hang in hardware, this serializes the
                  * check with the clearing of time_stamp and movement of i */
-                adapter->detect_tx_hung = FALSE;
+                adapter->detect_tx_hung = false;
                 if (tx_ring->buffer_info[eop].dma &&
                     time_after(jiffies, tx_ring->buffer_info[eop].time_stamp +
                                (adapter->tx_timeout_factor * HZ))
@@ -4200,7 +4185,7 @@ e1000_rx_checksum(struct e1000_adapter *adapter,
  * @adapter: board private structure
  **/
 
-static boolean_t
+static bool
 #ifdef CONFIG_E1000_NAPI
 e1000_clean_rx_irq(struct e1000_adapter *adapter,
                    struct e1000_rx_ring *rx_ring,
@@ -4219,7 +4204,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
         uint8_t last_byte;
         unsigned int i;
         int cleaned_count = 0;
-        boolean_t cleaned = FALSE;
+        bool cleaned = false;
         unsigned int total_rx_bytes=0, total_rx_packets=0;
 
         i = rx_ring->next_to_clean;
@@ -4247,7 +4232,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
 
                 next_buffer = &rx_ring->buffer_info[i];
 
-                cleaned = TRUE;
+                cleaned = true;
                 cleaned_count++;
                 pci_unmap_single(pdev,
                                  buffer_info->dma,
@@ -4373,7 +4358,7 @@ next_desc:
  * @adapter: board private structure
  **/
 
-static boolean_t
+static bool
 #ifdef CONFIG_E1000_NAPI
 e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
                       struct e1000_rx_ring *rx_ring,
@@ -4393,7 +4378,7 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
         unsigned int i, j;
         uint32_t length, staterr;
         int cleaned_count = 0;
-        boolean_t cleaned = FALSE;
+        bool cleaned = false;
         unsigned int total_rx_bytes=0, total_rx_packets=0;
 
         i = rx_ring->next_to_clean;
@@ -4420,7 +4405,7 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
 
                 next_buffer = &rx_ring->buffer_info[i];
 
-                cleaned = TRUE;
+                cleaned = true;
                 cleaned_count++;
                 pci_unmap_single(pdev, buffer_info->dma,
                                  buffer_info->length,
@@ -5001,7 +4986,8 @@ e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
         struct e1000_adapter *adapter = netdev_priv(netdev);
         uint32_t ctrl, rctl;
 
-        e1000_irq_disable(adapter);
+        if (!test_bit(__E1000_DOWN, &adapter->flags))
+                e1000_irq_disable(adapter);
         adapter->vlgrp = grp;
 
         if (grp) {
@@ -5038,7 +5024,8 @@ e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                 }
         }
 
-        e1000_irq_enable(adapter);
+        if (!test_bit(__E1000_DOWN, &adapter->flags))
+                e1000_irq_enable(adapter);
 }
 
 static void
@@ -5064,9 +5051,11 @@ e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid)
         struct e1000_adapter *adapter = netdev_priv(netdev);
         uint32_t vfta, index;
 
-        e1000_irq_disable(adapter);
+        if (!test_bit(__E1000_DOWN, &adapter->flags))
+                e1000_irq_disable(adapter);
         vlan_group_set_device(adapter->vlgrp, vid, NULL);
-        e1000_irq_enable(adapter);
+        if (!test_bit(__E1000_DOWN, &adapter->flags))
+                e1000_irq_enable(adapter);
 
         if ((adapter->hw.mng_cookie.status &
              E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&