1 files changed, 10 insertions, 11 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 5ff0bcb70b08..983a0c86ee33 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -6059,6 +6059,8 @@ static int bnx2x_int_mem_test(struct bnx2x *bp)
 
 static void bnx2x_enable_blocks_attention(struct bnx2x *bp)
 {
+        u32 val;
+
         REG_WR(bp, PXP_REG_PXP_INT_MASK_0, 0);
         if (!CHIP_IS_E1x(bp))
                 REG_WR(bp, PXP_REG_PXP_INT_MASK_1, 0x40);
@@ -6092,17 +6094,14 @@ static void bnx2x_enable_blocks_attention(struct bnx2x *bp)
 /*      REG_WR(bp, CSEM_REG_CSEM_INT_MASK_0, 0); */
 /*      REG_WR(bp, CSEM_REG_CSEM_INT_MASK_1, 0); */
 
-        if (CHIP_REV_IS_FPGA(bp))
-                REG_WR(bp, PXP2_REG_PXP2_INT_MASK_0, 0x580000);
-        else if (!CHIP_IS_E1x(bp))
-                REG_WR(bp, PXP2_REG_PXP2_INT_MASK_0,
-                           (PXP2_PXP2_INT_MASK_0_REG_PGL_CPL_OF
-                                | PXP2_PXP2_INT_MASK_0_REG_PGL_CPL_AFT
-                                | PXP2_PXP2_INT_MASK_0_REG_PGL_PCIE_ATTN
-                                | PXP2_PXP2_INT_MASK_0_REG_PGL_READ_BLOCKED
-                                | PXP2_PXP2_INT_MASK_0_REG_PGL_WRITE_BLOCKED));
-        else
-                REG_WR(bp, PXP2_REG_PXP2_INT_MASK_0, 0x480000);
+        val = PXP2_PXP2_INT_MASK_0_REG_PGL_CPL_AFT  |
+                PXP2_PXP2_INT_MASK_0_REG_PGL_CPL_OF |
+                PXP2_PXP2_INT_MASK_0_REG_PGL_PCIE_ATTN;
+        if (!CHIP_IS_E1x(bp))
+                val |= PXP2_PXP2_INT_MASK_0_REG_PGL_READ_BLOCKED |
+                        PXP2_PXP2_INT_MASK_0_REG_PGL_WRITE_BLOCKED;
+        REG_WR(bp, PXP2_REG_PXP2_INT_MASK_0, val);
+
         REG_WR(bp, TSDM_REG_TSDM_INT_MASK_0, 0);
         REG_WR(bp, TSDM_REG_TSDM_INT_MASK_1, 0);
         REG_WR(bp, TCM_REG_TCM_INT_MASK, 0);