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

Commit 75baacf0 authored by Patrick Uiterwijk's avatar Patrick Uiterwijk Committed by David S. Miller
Browse files

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: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarPatrick Uiterwijk <patrick@puiterwijk.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4833a009

drivers/net/dsa/mv88e6xxx.c

+36 −13
Original line number Diff line number Diff line
@@ -2264,6 +2264,38 @@ static void mv88e6xxx_bridge_work(struct work_struct *work) 
	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)

{

	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;



	mutex_lock(&ps->smi_mutex);

	ret = _mv88e6xxx_phy_write_indirect(ds, port, 0x16, page);

	if (ret < 0)

		goto error;

	ret = _mv88e6xxx_phy_read_indirect(ds, port, reg);

error:

	_mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0);

	ret = _mv88e6xxx_phy_page_read(ds, port, page, reg);

	mutex_unlock(&ps->smi_mutex);



	return ret;

}
@@ -2731,14 +2759,9 @@ int mv88e6xxx_phy_page_write(struct dsa_switch *ds, int port, int page, 
	int ret;



	mutex_lock(&ps->smi_mutex);

	ret = _mv88e6xxx_phy_write_indirect(ds, port, 0x16, page);

	if (ret < 0)

		goto error;



	ret = _mv88e6xxx_phy_write_indirect(ds, port, reg, val);

error:

	_mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0);

	ret = _mv88e6xxx_phy_page_write(ds, port, page, reg, val);

	mutex_unlock(&ps->smi_mutex);



	return ret;

}