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

Commit 8ce76845 authored by Yaniv Rosner's avatar Yaniv Rosner Committed by David S. Miller
Browse files

bnx2x: Fix port identification for the 84834 



Fix the "ethtool -p" for boards with BCM84834, by using LED4 of the PHY
to toggle the link LED while keeping interrupt disabled to avoid NIG attentions,
and at the end restore NIG to previous state.

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 faf1e785

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

+60 −0
Original line number Diff line number Diff line
@@ -10422,6 +10422,28 @@ static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy, 
					 MDIO_PMA_DEVAD,

					 MDIO_PMA_REG_8481_LED1_MASK,

					 0x0);

			if (phy->type ==

			    PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84834) {

				/* Disable MI_INT interrupt before setting LED4

				 * source to constant off.

				 */

				if (REG_RD(bp, NIG_REG_MASK_INTERRUPT_PORT0 +

					   params->port*4) &

				    NIG_MASK_MI_INT) {

					params->link_flags |=

					LINK_FLAGS_INT_DISABLED;



					bnx2x_bits_dis(

						bp,

						NIG_REG_MASK_INTERRUPT_PORT0 +

						params->port*4,

						NIG_MASK_MI_INT);

				}

				bnx2x_cl45_write(bp, phy,

						 MDIO_PMA_DEVAD,

						 MDIO_PMA_REG_8481_SIGNAL_MASK,

						 0x0);

			}

		}

		break;

	case LED_MODE_ON:
@@ -10468,6 +10490,28 @@ static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy, 
					 MDIO_PMA_DEVAD,

					 MDIO_PMA_REG_8481_LED1_MASK,

					 0x20);

			if (phy->type ==

			    PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84834) {

				/* Disable MI_INT interrupt before setting LED4

				 * source to constant on.

				 */

				if (REG_RD(bp, NIG_REG_MASK_INTERRUPT_PORT0 +

					   params->port*4) &

				    NIG_MASK_MI_INT) {

					params->link_flags |=

					LINK_FLAGS_INT_DISABLED;



					bnx2x_bits_dis(

						bp,

						NIG_REG_MASK_INTERRUPT_PORT0 +

						params->port*4,

						NIG_MASK_MI_INT);

				}

				bnx2x_cl45_write(bp, phy,

						 MDIO_PMA_DEVAD,

						 MDIO_PMA_REG_8481_SIGNAL_MASK,

						 0x20);

			}

		}

		break;
@@ -10532,6 +10576,22 @@ static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy, 
					 MDIO_PMA_DEVAD,

					 MDIO_PMA_REG_8481_LINK_SIGNAL,

					 val);

			if (phy->type ==

			    PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84834) {

				/* Restore LED4 source to external link,

				 * and re-enable interrupts.

				 */

				bnx2x_cl45_write(bp, phy,

						 MDIO_PMA_DEVAD,

						 MDIO_PMA_REG_8481_SIGNAL_MASK,

						 0x40);

				if (params->link_flags &

				    LINK_FLAGS_INT_DISABLED) {

					bnx2x_link_int_enable(params);

					params->link_flags &=

						~LINK_FLAGS_INT_DISABLED;

				}

			}

		}

		break;

	}

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

+2 −1
Original line number Diff line number Diff line
@@ -307,7 +307,8 @@ struct link_params { 
	struct bnx2x *bp;

	u16 req_fc_auto_adv; /* Should be set to TX / BOTH when

				req_flow_ctrl is set to AUTO */

	u16 rsrv1;

	u16 link_flags;

#define LINK_FLAGS_INT_DISABLED		(1<<0)

	u32 lfa_base;

};