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

Commit aa9aef77 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: dsa: bcm_sf2: communicate integrated PHY revision to PHY driver 



The integrated BCM7xxx PHY contains no useful revision information
in its MII_PHYSID2 bits 3:0, that information is instead contained in
the SWITCH_REG_PHY_REVISION register.

Read this register, store its value, and return it by implementing the
dsa_switch::get_phy_flags() callback accordingly. The register layout is
already matching what the BCM7xxx PHY driver is expecting to find.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6819563e

drivers/net/dsa/bcm_sf2.c

+16 −0
Original line number Diff line number Diff line
@@ -376,6 +376,9 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds) 
					SWITCH_TOP_REV_MASK;

	priv->hw_params.core_rev = (rev & SF2_REV_MASK);



	rev = reg_readl(priv, REG_PHY_REVISION);

	priv->hw_params.gphy_rev = rev & PHY_REVISION_MASK;



	pr_info("Starfighter 2 top: %x.%02x, core: %x.%02x base: 0x%p, IRQs: %d, %d\n",

		priv->hw_params.top_rev >> 8, priv->hw_params.top_rev & 0xff,

		priv->hw_params.core_rev >> 8, priv->hw_params.core_rev & 0xff,
@@ -399,6 +402,18 @@ static int bcm_sf2_sw_set_addr(struct dsa_switch *ds, u8 *addr) 
	return 0;

}



static u32 bcm_sf2_sw_get_phy_flags(struct dsa_switch *ds, int port)

{

	struct bcm_sf2_priv *priv = ds_to_priv(ds);



	/* The BCM7xxx PHY driver expects to find the integrated PHY revision

	 * in bits 15:8 and the patch level in bits 7:0 which is exactly what

	 * the REG_PHY_REVISION register layout is.

	 */



	return priv->hw_params.gphy_rev;

}



static int bcm_sf2_sw_indir_rw(struct dsa_switch *ds, int op, int addr,

			       int regnum, u16 val)

{
@@ -597,6 +612,7 @@ static struct dsa_switch_driver bcm_sf2_switch_driver = { 
	.probe			= bcm_sf2_sw_probe,

	.setup			= bcm_sf2_sw_setup,

	.set_addr		= bcm_sf2_sw_set_addr,

	.get_phy_flags		= bcm_sf2_sw_get_phy_flags,

	.phy_read		= bcm_sf2_sw_phy_read,

	.phy_write		= bcm_sf2_sw_phy_write,

	.get_strings		= bcm_sf2_sw_get_strings,

drivers/net/dsa/bcm_sf2.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
struct bcm_sf2_hw_params {

	u16	top_rev;

	u16	core_rev;

	u16	gphy_rev;

	u32	num_gphy;

	u8	num_acb_queue;

	u8	num_rgmii;

drivers/net/dsa/bcm_sf2_regs.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#define  SWITCH_TOP_REV_MASK		0xffff



#define REG_PHY_REVISION		0x1C

#define  PHY_REVISION_MASK		0xffff



#define REG_SPHY_CNTRL			0x2C

#define  IDDQ_BIAS			(1 << 0)