Commit 3be0d950 authored by Robert Marko's avatar Robert Marko Committed by Paolo Abeni

net: phy: qca807x: move interface mode check to .config_init_once

Currently, we are checking whether the PHY package mode matches the
individual PHY interface modes at PHY package probe time, but at that time
we only know the PHY package mode and not the individual PHY interface
modes as of_get_phy_mode() that populates it will only get called once the
netdev to which PHY-s are attached to is being probed and thus this check
will always fail and return -EINVAL.

So, lets move this check to .config_init_once as at that point individual
PHY interface modes should be populated.

Fixes: d1cb613e ("net: phy: qcom: add support for QCA807x PHY Family")
Signed-off-by: default avatarRobert Marko <robimarko@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/20240212115043.1725918-1-robimarko@gmail.comSigned-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent d1d77120
...@@ -562,6 +562,11 @@ static int qca807x_phy_package_config_init_once(struct phy_device *phydev) ...@@ -562,6 +562,11 @@ static int qca807x_phy_package_config_init_once(struct phy_device *phydev)
struct qca807x_shared_priv *priv = shared->priv; struct qca807x_shared_priv *priv = shared->priv;
int val, ret; int val, ret;
/* Make sure PHY follow PHY package mode if enforced */
if (priv->package_mode != PHY_INTERFACE_MODE_NA &&
phydev->interface != priv->package_mode)
return -EINVAL;
phy_lock_mdio_bus(phydev); phy_lock_mdio_bus(phydev);
/* Set correct PHY package mode */ /* Set correct PHY package mode */
...@@ -718,11 +723,6 @@ static int qca807x_probe(struct phy_device *phydev) ...@@ -718,11 +723,6 @@ static int qca807x_probe(struct phy_device *phydev)
shared = phydev->shared; shared = phydev->shared;
shared_priv = shared->priv; shared_priv = shared->priv;
/* Make sure PHY follow PHY package mode if enforced */
if (shared_priv->package_mode != PHY_INTERFACE_MODE_NA &&
phydev->interface != shared_priv->package_mode)
return -EINVAL;
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment