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

Commit 69340406 authored by Steve Bennett's avatar Steve Bennett Committed by Greg Kroah-Hartman
Browse files

net: phy: micrel: Fix detection of ksz87xx switch 



[ Upstream commit a5e63c7d38d548b8dab6c6205e0b6af76899dbf5 ]

The logic for discerning between KSZ8051 and KSZ87XX PHYs is incorrect
such that the that KSZ87XX switch is not identified correctly.

ksz8051_ksz8795_match_phy_device() uses the parameter ksz_phy_id
to discriminate whether it was called from ksz8051_match_phy_device()
or from ksz8795_match_phy_device() but since PHY_ID_KSZ87XX is the
same value as PHY_ID_KSZ8051, this doesn't work.

Instead use a bool to discriminate the caller.

Without this patch, the KSZ8795 switch port identifies as:

ksz8795-switch spi3.1 ade1 (uninitialized): PHY [dsa-0.1:03] driver [Generic PHY]

With the patch, it identifies correctly:

ksz8795-switch spi3.1 ade1 (uninitialized): PHY [dsa-0.1:03] driver [Micrel KSZ87XX Switch]

Fixes: 8b95599c ("net: phy: micrel: Discern KSZ8051 and KSZ8795 PHYs")
Signed-off-by: default avatarSteve Bennett <steveb@workware.net.au>
Reviewed-by: default avatarMarek Vasut <marex@denx.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2b8ab7ae

drivers/net/phy/micrel.c

+5 −5
Original line number Diff line number Diff line
@@ -343,11 +343,11 @@ static int ksz8041_config_aneg(struct phy_device *phydev) 
}



static int ksz8051_ksz8795_match_phy_device(struct phy_device *phydev,

					    const u32 ksz_phy_id)

					    const bool ksz_8051)

{

	int ret;



	if ((phydev->phy_id & MICREL_PHY_ID_MASK) != ksz_phy_id)

	if ((phydev->phy_id & MICREL_PHY_ID_MASK) != PHY_ID_KSZ8051)

		return 0;



	ret = phy_read(phydev, MII_BMSR);
@@ -360,7 +360,7 @@ static int ksz8051_ksz8795_match_phy_device(struct phy_device *phydev, 
	 * the switch does not.

	 */

	ret &= BMSR_ERCAP;

	if (ksz_phy_id == PHY_ID_KSZ8051)

	if (ksz_8051)

		return ret;

	else

		return !ret;
@@ -368,7 +368,7 @@ static int ksz8051_ksz8795_match_phy_device(struct phy_device *phydev, 


static int ksz8051_match_phy_device(struct phy_device *phydev)

{

	return ksz8051_ksz8795_match_phy_device(phydev, PHY_ID_KSZ8051);

	return ksz8051_ksz8795_match_phy_device(phydev, true);

}



static int ksz8081_config_init(struct phy_device *phydev)
@@ -396,7 +396,7 @@ static int ksz8061_config_init(struct phy_device *phydev) 


static int ksz8795_match_phy_device(struct phy_device *phydev)

{

	return ksz8051_ksz8795_match_phy_device(phydev, PHY_ID_KSZ87XX);

	return ksz8051_ksz8795_match_phy_device(phydev, false);

}



static int ksz9021_load_values_from_of(struct phy_device *phydev,