RDMA/nes: Make nesadapter->phy_lock usage consistent

nes_{read,write}_1G_phy_reg() are using phy_lock while
nes_{read,write}_10G_phy_reg() leave that to the caller.

Remove phy_lock from 1G routines and leave the locking to the caller.
Add additional phy_lock calls around 1G read/write.

Signed-off-by: Chien Tung <chien.tin.tung@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index c36a3f514929..8b67207c7076 100644
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -2458,7 +2458,6 @@ static void nes_process_mac_intr(struct nes_device *nesdev, u32 mac_number)
                 return;
         }
         nesadapter->mac_sw_state[mac_number] = NES_MAC_SW_INTERRUPT;
-        spin_unlock_irqrestore(&nesadapter->phy_lock, flags);
 
         /* ack the MAC interrupt */
         mac_status = nes_read_indexed(nesdev, NES_IDX_MAC_INT_STATUS + (mac_index * 0x200));
@@ -2469,11 +2468,9 @@ static void nes_process_mac_intr(struct nes_device *nesdev, u32 mac_number)
 
         if (mac_status & (NES_MAC_INT_LINK_STAT_CHG | NES_MAC_INT_XGMII_EXT)) {
                 nesdev->link_status_interrupts++;
-                if (0 == (++nesadapter->link_interrupt_count[mac_index] % ((u16)NES_MAX_LINK_INTERRUPTS))) {
-                        spin_lock_irqsave(&nesadapter->phy_lock, flags);
+                if (0 == (++nesadapter->link_interrupt_count[mac_index] % ((u16)NES_MAX_LINK_INTERRUPTS)))
                         nes_reset_link(nesdev, mac_index);
-                        spin_unlock_irqrestore(&nesadapter->phy_lock, flags);
-                }
+
                 /* read the PHY interrupt status register */
                 if ((nesadapter->OneG_Mode) &&
                 (nesadapter->phy_type[mac_index] != NES_PHY_TYPE_PUMA_1G)) {
@@ -2587,6 +2584,7 @@ static void nes_process_mac_intr(struct nes_device *nesdev, u32 mac_number)
                                 break;
                         }
                 }
+                spin_unlock_irqrestore(&nesadapter->phy_lock, flags);
 
                 if (phy_data & 0x0004) {
                         if (wide_ppm_offset &&