]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
bnx2x: Fix 578xx link LED
authorYaniv Rosner <yanivr@broadcom.com>
Wed, 7 Sep 2011 00:48:06 +0000 (00:48 +0000)
committerJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 00:13:07 +0000 (08:13 +0800)
Fix 1G link LED for the BCM578xx-SFI/KR.

Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit ab505dec96340946079d1288f49041bea9f259ff)

Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/bnx2x/bnx2x_link.c

index 52101cb4d8dbdabf7b123f9a1bdd0ad693017c40..57fe056bc5e0008efe6c2c053751e9edbead1c6b 100644 (file)
@@ -6201,7 +6201,7 @@ int bnx2x_set_led(struct link_params *params,
                                        (tmp | EMAC_LED_OVERRIDE));
                                /*
                                 * return here without enabling traffic
-                                * LED blink andsetting rate in ON mode.
+                                * LED blink and setting rate in ON mode.
                                 * In oper mode, enabling LED blink
                                 * and setting rate is needed.
                                 */
@@ -6213,7 +6213,11 @@ int bnx2x_set_led(struct link_params *params,
                         * This is a work-around for HW issue found when link
                         * is up in CL73
                         */
-                       REG_WR(bp, NIG_REG_LED_10G_P0 + port*4, 1);
+                       if ((!CHIP_IS_E3(bp)) ||
+                           (CHIP_IS_E3(bp) &&
+                            mode == LED_MODE_ON))
+                               REG_WR(bp, NIG_REG_LED_10G_P0 + port*4, 1);
+
                        if (CHIP_IS_E1x(bp) ||
                            CHIP_IS_E2(bp) ||
                            (mode == LED_MODE_ON))