net: dsa: mv88e6xxx: Introduce _mv88e6xxx_phy_page_{read, write}
Add versions of the phy_page_read and _write functions to be used in a context where the SMI mutex is held. Tested-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
4833a0096a
commit
75baacf00f
@ -2264,6 +2264,38 @@ static void mv88e6xxx_bridge_work(struct work_struct *work)
|
|||||||
mutex_unlock(&ps->smi_mutex);
|
mutex_unlock(&ps->smi_mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int _mv88e6xxx_phy_page_write(struct dsa_switch *ds, int port, int page,
|
||||||
|
int reg, int val)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
ret = _mv88e6xxx_phy_write_indirect(ds, port, 0x16, page);
|
||||||
|
if (ret < 0)
|
||||||
|
goto restore_page_0;
|
||||||
|
|
||||||
|
ret = _mv88e6xxx_phy_write_indirect(ds, port, reg, val);
|
||||||
|
restore_page_0:
|
||||||
|
_mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0);
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int _mv88e6xxx_phy_page_read(struct dsa_switch *ds, int port, int page,
|
||||||
|
int reg)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
ret = _mv88e6xxx_phy_write_indirect(ds, port, 0x16, page);
|
||||||
|
if (ret < 0)
|
||||||
|
goto restore_page_0;
|
||||||
|
|
||||||
|
ret = _mv88e6xxx_phy_read_indirect(ds, port, reg);
|
||||||
|
restore_page_0:
|
||||||
|
_mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0);
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port)
|
static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port)
|
||||||
{
|
{
|
||||||
struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
|
struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
|
||||||
@ -2714,13 +2746,9 @@ int mv88e6xxx_phy_page_read(struct dsa_switch *ds, int port, int page, int reg)
|
|||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
mutex_lock(&ps->smi_mutex);
|
mutex_lock(&ps->smi_mutex);
|
||||||
ret = _mv88e6xxx_phy_write_indirect(ds, port, 0x16, page);
|
ret = _mv88e6xxx_phy_page_read(ds, port, page, reg);
|
||||||
if (ret < 0)
|
|
||||||
goto error;
|
|
||||||
ret = _mv88e6xxx_phy_read_indirect(ds, port, reg);
|
|
||||||
error:
|
|
||||||
_mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0);
|
|
||||||
mutex_unlock(&ps->smi_mutex);
|
mutex_unlock(&ps->smi_mutex);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2731,14 +2759,9 @@ int mv88e6xxx_phy_page_write(struct dsa_switch *ds, int port, int page,
|
|||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
mutex_lock(&ps->smi_mutex);
|
mutex_lock(&ps->smi_mutex);
|
||||||
ret = _mv88e6xxx_phy_write_indirect(ds, port, 0x16, page);
|
ret = _mv88e6xxx_phy_page_write(ds, port, page, reg, val);
|
||||||
if (ret < 0)
|
|
||||||
goto error;
|
|
||||||
|
|
||||||
ret = _mv88e6xxx_phy_write_indirect(ds, port, reg, val);
|
|
||||||
error:
|
|
||||||
_mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0);
|
|
||||||
mutex_unlock(&ps->smi_mutex);
|
mutex_unlock(&ps->smi_mutex);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user