Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9379c9be authored by Yaniv Rosner's avatar Yaniv Rosner Committed by David S. Miller
Browse files

bnx2x: Restore 1G LED on BCM57712+BCM8727 designs. 



Fix no-LED problem when link speed is 1G on BCM57712 + BCM8727 designs, by
removing a logic error checking for a different PHY.

Signed-off-by: default avatarYaniv Rosner <yanivr@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 25182fc2

drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c

+18 −15
Original line number Diff line number Diff line
@@ -6217,11 +6217,13 @@ int bnx2x_set_led(struct link_params *params, 
		tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);

		if (params->phy[EXT_PHY1].type ==

			PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM54618SE)

			EMAC_WR(bp, EMAC_REG_EMAC_LED, tmp & 0xfff1);

		else {

			EMAC_WR(bp, EMAC_REG_EMAC_LED,

				(tmp | EMAC_LED_OVERRIDE));

		}

			tmp &= ~(EMAC_LED_1000MB_OVERRIDE |

				EMAC_LED_100MB_OVERRIDE |

				EMAC_LED_10MB_OVERRIDE);

		else

			tmp |= EMAC_LED_OVERRIDE;



		EMAC_WR(bp, EMAC_REG_EMAC_LED, tmp);

		break;



	case LED_MODE_OPER:
@@ -6276,10 +6278,15 @@ int bnx2x_set_led(struct link_params *params, 
				       hw_led_mode);

		} else if ((params->phy[EXT_PHY1].type ==

			    PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM54618SE) &&

			   (mode != LED_MODE_OPER)) {

			   (mode == LED_MODE_ON)) {

			REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4, 0);

			tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);

			EMAC_WR(bp, EMAC_REG_EMAC_LED, tmp | 0x3);

			EMAC_WR(bp, EMAC_REG_EMAC_LED, tmp |

				EMAC_LED_OVERRIDE | EMAC_LED_1000MB_OVERRIDE);

			/* Break here; otherwise, it'll disable the

			 * intended override.

			 */

			break;

		} else

			REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4,

			       hw_led_mode);
@@ -6294,13 +6301,9 @@ int bnx2x_set_led(struct link_params *params, 
			       LED_BLINK_RATE_VAL_E1X_E2);

		REG_WR(bp, NIG_REG_LED_CONTROL_BLINK_RATE_ENA_P0 +

		       port*4, 1);

		if ((params->phy[EXT_PHY1].type !=

		     PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM54618SE) &&

		    (mode != LED_MODE_OPER)) {

		tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);

		EMAC_WR(bp, EMAC_REG_EMAC_LED,

			(tmp & (~EMAC_LED_OVERRIDE)));

		}



		if (CHIP_IS_E1(bp) &&

		    ((speed == SPEED_2500) ||