2 files changed, 13 insertions, 0 deletions

diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 6c67be679764..177cb467ba90 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -9691,8 +9691,15 @@ static void bnx2x_self_test(struct net_device *dev,
                 etest->flags &= ~ETH_TEST_FL_OFFLINE;
 
         if (etest->flags & ETH_TEST_FL_OFFLINE) {
+                int port = BP_PORT(bp);
+                u32 val;
                 u8 link_up;
 
+                /* save current value of input enable for TX port IF */
+                val = REG_RD(bp, NIG_REG_EGRESS_UMP0_IN_EN + port*4);
+                /* disable input for TX port IF */
+                REG_WR(bp, NIG_REG_EGRESS_UMP0_IN_EN + port*4, 0);
+
                 link_up = bp->link_vars.link_up;
                 bnx2x_nic_unload(bp, UNLOAD_NORMAL);
                 bnx2x_nic_load(bp, LOAD_DIAG);
@@ -9712,6 +9719,10 @@ static void bnx2x_self_test(struct net_device *dev,
                         etest->flags |= ETH_TEST_FL_FAILED;
 
                 bnx2x_nic_unload(bp, UNLOAD_NORMAL);
+
+                /* restore input for TX port IF */
+                REG_WR(bp, NIG_REG_EGRESS_UMP0_IN_EN + port*4, val);
+
                 bnx2x_nic_load(bp, LOAD_NORMAL);
                 /* wait until link state is restored */
                 bnx2x_wait_for_link(bp, link_up);
diff --git a/drivers/net/bnx2x_reg.h b/drivers/net/bnx2x_reg.h
index b8ce6fc927a0..6d77730b6b4d 100644
--- a/drivers/net/bnx2x_reg.h
+++ b/drivers/net/bnx2x_reg.h
@@ -1660,6 +1660,8 @@
 #define NIG_REG_EGRESS_PBF0_IN_EN                                0x100cc
 /* [RW 1] Input enable for TX PBF user packet port1 IF */
 #define NIG_REG_EGRESS_PBF1_IN_EN                                0x100d0
+/* [RW 1] Input enable for TX UMP management packet port0 IF */
+#define NIG_REG_EGRESS_UMP0_IN_EN                                0x100d4
 /* [RW 1] Input enable for RX_EMAC0 IF */
 #define NIG_REG_EMAC0_IN_EN                                      0x100a4
 /* [RW 1] output enable for TX EMAC pause port 0 IF */