Commit 58048e6d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'genet-gphy' 



Florian Fainelli says:

====================
net: bcmgenet: support for new GPHY revision scheme

These two patches update the GENET GPHY revision logic to account for some
of our newer designs starting with GPHY rev G0.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6db70e3e 60efff0c

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+23 −1
Original line number Diff line number Diff line
@@ -2504,6 +2504,7 @@ static void bcmgenet_set_hw_params(struct bcmgenet_priv *priv) 
	struct bcmgenet_hw_params *params;

	u32 reg;

	u8 major;

	u16 gphy_rev;



	if (GENET_IS_V4(priv)) {

		bcmgenet_dma_regs = bcmgenet_dma_regs_v3plus;
@@ -2552,8 +2553,29 @@ static void bcmgenet_set_hw_params(struct bcmgenet_priv *priv) 
	 * to pass this information to the PHY driver. The PHY driver expects

	 * to find the PHY major revision in bits 15:8 while the GENET register

	 * stores that information in bits 7:0, account for that.

	 *

	 * On newer chips, starting with PHY revision G0, a new scheme is

	 * deployed similar to the Starfighter 2 switch with GPHY major

	 * revision in bits 15:8 and patch level in bits 7:0. Major revision 0

	 * is reserved as well as special value 0x01ff, we have a small

	 * heuristic to check for the new GPHY revision and re-arrange things

	 * so the GPHY driver is happy.

	 */

	priv->gphy_rev = (reg & 0xffff) << 8;

	gphy_rev = reg & 0xffff;



	/* This is the good old scheme, just GPHY major, no minor nor patch */

	if ((gphy_rev & 0xf0) != 0)

		priv->gphy_rev = gphy_rev << 8;



	/* This is the new scheme, GPHY major rolls over with 0x10 = rev G0 */

	else if ((gphy_rev & 0xff00) != 0)

		priv->gphy_rev = gphy_rev;



	/* This is reserved so should require special treatment */

	else if (gphy_rev == 0 || gphy_rev == 0x01ff) {

		pr_warn("Invalid GPHY revision detected: 0x%04x\n", gphy_rev);

		return;

	}



#ifdef CONFIG_PHYS_ADDR_T_64BIT

	if (!(params->flags & GENET_HAS_40BITS))

drivers/net/phy/bcm7xxx.c

+2 −0
Original line number Diff line number Diff line
@@ -252,6 +252,8 @@ static int bcm7xxx_28nm_config_init(struct phy_device *phydev) 
		break;

	case 0xe0:

	case 0xf0:

	/* Rev G0 introduces a roll over */

	case 0x10:

		ret = bcm7xxx_28nm_e0_plus_afe_config_init(phydev);

		break;

	default:

CRA Git | Maintained and supported by SUSTech CRA and CCSE