Skip to content

Commit

Permalink
net: dsa: mv88e6xxx: Rename _phy_ to _mdio_
Browse files Browse the repository at this point in the history 
The switch implements a generic MDIO bus, which could host more than
PHYs. It is conventional to use _mdio_ or _mii_ in the function name,
so rename them. Also postfix make the historically first read/write
function with _direct, to help distinguish it from _indirect and _ppu.

While touching these functions, remove some of the _ prefixes, which
we are deprecating.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Andrew Lunn authored and David S. Miller committed Jun 4, 2016
1 parent e755e49 commit 03a4a54
Showing 1 changed file with 63 additions and 63 deletions.
126 changes: 63 additions & 63 deletions drivers/net/dsa/mv88e6xxx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,16 +238,16 @@ int mv88e6xxx_set_addr(struct dsa_switch *ds, u8 *addr)
return mv88e6xxx_set_addr_direct(ds, addr);
}

static int _mv88e6xxx_phy_read(struct mv88e6xxx_priv_state *ps, int addr,
int regnum)
static int mv88e6xxx_mdio_read_direct(struct mv88e6xxx_priv_state *ps,
int addr, int regnum)
{
if (addr >= 0)
return _mv88e6xxx_reg_read(ps, addr, regnum);
return 0xffff;
}

static int _mv88e6xxx_phy_write(struct mv88e6xxx_priv_state *ps, int addr,
int regnum, u16 val)
static int mv88e6xxx_mdio_write_direct(struct mv88e6xxx_priv_state *ps,
int addr, int regnum, u16 val)
{
if (addr >= 0)
return _mv88e6xxx_reg_write(ps, addr, regnum, val);
Expand Down Expand Up @@ -378,8 +378,8 @@ void mv88e6xxx_ppu_state_init(struct mv88e6xxx_priv_state *ps)
ps->ppu_timer.function = mv88e6xxx_ppu_reenable_timer;
}

static int mv88e6xxx_phy_read_ppu(struct mv88e6xxx_priv_state *ps, int addr,
int regnum)
static int mv88e6xxx_mdio_read_ppu(struct mv88e6xxx_priv_state *ps, int addr,
int regnum)
{
int ret;

Expand All @@ -392,8 +392,8 @@ static int mv88e6xxx_phy_read_ppu(struct mv88e6xxx_priv_state *ps, int addr,
return ret;
}

static int mv88e6xxx_phy_write_ppu(struct mv88e6xxx_priv_state *ps, int addr,
int regnum, u16 val)
static int mv88e6xxx_mdio_write_ppu(struct mv88e6xxx_priv_state *ps, int addr,
int regnum, u16 val)
{
int ret;

Expand Down Expand Up @@ -829,7 +829,7 @@ static int mv88e6xxx_wait(struct mv88e6xxx_priv_state *ps, int reg,
return ret;
}

static int _mv88e6xxx_phy_wait(struct mv88e6xxx_priv_state *ps)
static int mv88e6xxx_mdio_wait(struct mv88e6xxx_priv_state *ps)
{
return _mv88e6xxx_wait(ps, REG_GLOBAL2, GLOBAL2_SMI_OP,
GLOBAL2_SMI_OP_BUSY);
Expand Down Expand Up @@ -1076,7 +1076,7 @@ static int _mv88e6xxx_atu_wait(struct mv88e6xxx_priv_state *ps)
GLOBAL_ATU_OP_BUSY);
}

static int _mv88e6xxx_phy_read_indirect(struct mv88e6xxx_priv_state *ps,
static int mv88e6xxx_mdio_read_indirect(struct mv88e6xxx_priv_state *ps,
int addr, int regnum)
{
int ret;
Expand All @@ -1087,7 +1087,7 @@ static int _mv88e6xxx_phy_read_indirect(struct mv88e6xxx_priv_state *ps,
if (ret < 0)
return ret;

ret = _mv88e6xxx_phy_wait(ps);
ret = mv88e6xxx_mdio_wait(ps);
if (ret < 0)
return ret;

Expand All @@ -1096,7 +1096,7 @@ static int _mv88e6xxx_phy_read_indirect(struct mv88e6xxx_priv_state *ps,
return ret;
}

static int _mv88e6xxx_phy_write_indirect(struct mv88e6xxx_priv_state *ps,
static int mv88e6xxx_mdio_write_indirect(struct mv88e6xxx_priv_state *ps,
int addr, int regnum, u16 val)
{
int ret;
Expand All @@ -1109,7 +1109,7 @@ static int _mv88e6xxx_phy_write_indirect(struct mv88e6xxx_priv_state *ps,
GLOBAL2_SMI_OP_22_WRITE | (addr << 5) |
regnum);

return _mv88e6xxx_phy_wait(ps);
return mv88e6xxx_mdio_wait(ps);
}

static int mv88e6xxx_get_eee(struct dsa_switch *ds, int port,
Expand All @@ -1123,7 +1123,7 @@ static int mv88e6xxx_get_eee(struct dsa_switch *ds, int port,

mutex_lock(&ps->smi_mutex);

reg = _mv88e6xxx_phy_read_indirect(ps, port, 16);
reg = mv88e6xxx_mdio_read_indirect(ps, port, 16);
if (reg < 0)
goto out;

Expand Down Expand Up @@ -1154,7 +1154,7 @@ static int mv88e6xxx_set_eee(struct dsa_switch *ds, int port,

mutex_lock(&ps->smi_mutex);

ret = _mv88e6xxx_phy_read_indirect(ps, port, 16);
ret = mv88e6xxx_mdio_read_indirect(ps, port, 16);
if (ret < 0)
goto out;

Expand All @@ -1164,7 +1164,7 @@ static int mv88e6xxx_set_eee(struct dsa_switch *ds, int port,
if (e->tx_lpi_enabled)
reg |= 0x0100;

ret = _mv88e6xxx_phy_write_indirect(ps, port, 16, reg);
ret = mv88e6xxx_mdio_write_indirect(ps, port, 16, reg);
out:
mutex_unlock(&ps->smi_mutex);

Expand Down Expand Up @@ -2547,34 +2547,34 @@ static void mv88e6xxx_port_bridge_leave(struct dsa_switch *ds, int port)
mutex_unlock(&ps->smi_mutex);
}

static int _mv88e6xxx_phy_page_write(struct mv88e6xxx_priv_state *ps,
int port, int page, int reg, int val)
static int _mv88e6xxx_mdio_page_write(struct mv88e6xxx_priv_state *ps,
int port, int page, int reg, int val)
{
int ret;

ret = _mv88e6xxx_phy_write_indirect(ps, port, 0x16, page);
ret = mv88e6xxx_mdio_write_indirect(ps, port, 0x16, page);
if (ret < 0)
goto restore_page_0;

ret = _mv88e6xxx_phy_write_indirect(ps, port, reg, val);
ret = mv88e6xxx_mdio_write_indirect(ps, port, reg, val);
restore_page_0:
_mv88e6xxx_phy_write_indirect(ps, port, 0x16, 0x0);
mv88e6xxx_mdio_write_indirect(ps, port, 0x16, 0x0);

return ret;
}

static int _mv88e6xxx_phy_page_read(struct mv88e6xxx_priv_state *ps,
int port, int page, int reg)
static int _mv88e6xxx_mdio_page_read(struct mv88e6xxx_priv_state *ps,
int port, int page, int reg)
{
int ret;

ret = _mv88e6xxx_phy_write_indirect(ps, port, 0x16, page);
ret = mv88e6xxx_mdio_write_indirect(ps, port, 0x16, page);
if (ret < 0)
goto restore_page_0;

ret = _mv88e6xxx_phy_read_indirect(ps, port, reg);
ret = mv88e6xxx_mdio_read_indirect(ps, port, reg);
restore_page_0:
_mv88e6xxx_phy_write_indirect(ps, port, 0x16, 0x0);
mv88e6xxx_mdio_write_indirect(ps, port, 0x16, 0x0);

return ret;
}
Expand Down Expand Up @@ -2645,16 +2645,16 @@ static int mv88e6xxx_power_on_serdes(struct mv88e6xxx_priv_state *ps)
{
int ret;

ret = _mv88e6xxx_phy_page_read(ps, REG_FIBER_SERDES, PAGE_FIBER_SERDES,
MII_BMCR);
ret = _mv88e6xxx_mdio_page_read(ps, REG_FIBER_SERDES,
PAGE_FIBER_SERDES, MII_BMCR);
if (ret < 0)
return ret;

if (ret & BMCR_PDOWN) {
ret &= ~BMCR_PDOWN;
ret = _mv88e6xxx_phy_page_write(ps, REG_FIBER_SERDES,
PAGE_FIBER_SERDES, MII_BMCR,
ret);
ret = _mv88e6xxx_mdio_page_write(ps, REG_FIBER_SERDES,
PAGE_FIBER_SERDES, MII_BMCR,
ret);
}

return ret;
Expand Down Expand Up @@ -3159,43 +3159,43 @@ static int mv88e6xxx_setup(struct dsa_switch *ds)
return err;
}

int mv88e6xxx_phy_page_read(struct dsa_switch *ds, int port, int page, int reg)
int mv88e6xxx_mdio_page_read(struct dsa_switch *ds, int port, int page, int reg)
{
struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
int ret;

mutex_lock(&ps->smi_mutex);
ret = _mv88e6xxx_phy_page_read(ps, port, page, reg);
ret = _mv88e6xxx_mdio_page_read(ps, port, page, reg);
mutex_unlock(&ps->smi_mutex);

return ret;
}

int mv88e6xxx_phy_page_write(struct dsa_switch *ds, int port, int page,
int reg, int val)
int mv88e6xxx_mdio_page_write(struct dsa_switch *ds, int port, int page,
int reg, int val)
{
struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
int ret;

mutex_lock(&ps->smi_mutex);
ret = _mv88e6xxx_phy_page_write(ps, port, page, reg, val);
ret = _mv88e6xxx_mdio_page_write(ps, port, page, reg, val);
mutex_unlock(&ps->smi_mutex);

return ret;
}

static int mv88e6xxx_port_to_phy_addr(struct mv88e6xxx_priv_state *ps,
int port)
static int mv88e6xxx_port_to_mdio_addr(struct mv88e6xxx_priv_state *ps,
int port)
{
if (port >= 0 && port < ps->info->num_ports)
return port;
return -EINVAL;
}

static int mv88e6xxx_phy_read(struct dsa_switch *ds, int port, int regnum)
static int mv88e6xxx_mdio_read(struct dsa_switch *ds, int port, int regnum)
{
struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
int addr = mv88e6xxx_port_to_phy_addr(ps, port);
int addr = mv88e6xxx_port_to_mdio_addr(ps, port);
int ret;

if (addr < 0)
Expand All @@ -3204,21 +3204,21 @@ static int mv88e6xxx_phy_read(struct dsa_switch *ds, int port, int regnum)
mutex_lock(&ps->smi_mutex);

if (mv88e6xxx_has(ps, MV88E6XXX_FLAG_PPU))
ret = mv88e6xxx_phy_read_ppu(ps, addr, regnum);
ret = mv88e6xxx_mdio_read_ppu(ps, addr, regnum);
else if (mv88e6xxx_has(ps, MV88E6XXX_FLAG_SMI_PHY))
ret = _mv88e6xxx_phy_read_indirect(ps, addr, regnum);
ret = mv88e6xxx_mdio_read_indirect(ps, addr, regnum);
else
ret = _mv88e6xxx_phy_read(ps, addr, regnum);
ret = mv88e6xxx_mdio_read_direct(ps, addr, regnum);

mutex_unlock(&ps->smi_mutex);
return ret;
}

static int mv88e6xxx_phy_write(struct dsa_switch *ds, int port, int regnum,
u16 val)
static int mv88e6xxx_mdio_write(struct dsa_switch *ds, int port, int regnum,
u16 val)
{
struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
int addr = mv88e6xxx_port_to_phy_addr(ps, port);
int addr = mv88e6xxx_port_to_mdio_addr(ps, port);
int ret;

if (addr < 0)
Expand All @@ -3227,11 +3227,11 @@ static int mv88e6xxx_phy_write(struct dsa_switch *ds, int port, int regnum,
mutex_lock(&ps->smi_mutex);

if (mv88e6xxx_has(ps, MV88E6XXX_FLAG_PPU))
ret = mv88e6xxx_phy_write_ppu(ps, addr, regnum, val);
ret = mv88e6xxx_mdio_write_ppu(ps, addr, regnum, val);
else if (mv88e6xxx_has(ps, MV88E6XXX_FLAG_SMI_PHY))
ret = _mv88e6xxx_phy_write_indirect(ps, addr, regnum, val);
ret = mv88e6xxx_mdio_write_indirect(ps, addr, regnum, val);
else
ret = _mv88e6xxx_phy_write(ps, addr, regnum, val);
ret = mv88e6xxx_mdio_write_direct(ps, addr, regnum, val);

mutex_unlock(&ps->smi_mutex);
return ret;
Expand All @@ -3249,37 +3249,37 @@ static int mv88e61xx_get_temp(struct dsa_switch *ds, int *temp)

mutex_lock(&ps->smi_mutex);

ret = _mv88e6xxx_phy_write(ps, 0x0, 0x16, 0x6);
ret = mv88e6xxx_mdio_write_direct(ps, 0x0, 0x16, 0x6);
if (ret < 0)
goto error;

/* Enable temperature sensor */
ret = _mv88e6xxx_phy_read(ps, 0x0, 0x1a);
ret = mv88e6xxx_mdio_read_direct(ps, 0x0, 0x1a);
if (ret < 0)
goto error;

ret = _mv88e6xxx_phy_write(ps, 0x0, 0x1a, ret | (1 << 5));
ret = mv88e6xxx_mdio_write_direct(ps, 0x0, 0x1a, ret | (1 << 5));
if (ret < 0)
goto error;

/* Wait for temperature to stabilize */
usleep_range(10000, 12000);

val = _mv88e6xxx_phy_read(ps, 0x0, 0x1a);
val = mv88e6xxx_mdio_read_direct(ps, 0x0, 0x1a);
if (val < 0) {
ret = val;
goto error;
}

/* Disable temperature sensor */
ret = _mv88e6xxx_phy_write(ps, 0x0, 0x1a, ret & ~(1 << 5));
ret = mv88e6xxx_mdio_write_direct(ps, 0x0, 0x1a, ret & ~(1 << 5));
if (ret < 0)
goto error;

*temp = ((val & 0x1f) - 5) * 5;

error:
_mv88e6xxx_phy_write(ps, 0x0, 0x16, 0x0);
mv88e6xxx_mdio_write_direct(ps, 0x0, 0x16, 0x0);
mutex_unlock(&ps->smi_mutex);
return ret;
}
Expand All @@ -3292,7 +3292,7 @@ static int mv88e63xx_get_temp(struct dsa_switch *ds, int *temp)

*temp = 0;

ret = mv88e6xxx_phy_page_read(ds, phy, 6, 27);
ret = mv88e6xxx_mdio_page_read(ds, phy, 6, 27);
if (ret < 0)
return ret;

Expand Down Expand Up @@ -3325,7 +3325,7 @@ static int mv88e6xxx_get_temp_limit(struct dsa_switch *ds, int *temp)

*temp = 0;

ret = mv88e6xxx_phy_page_read(ds, phy, 6, 26);
ret = mv88e6xxx_mdio_page_read(ds, phy, 6, 26);
if (ret < 0)
return ret;

Expand All @@ -3343,12 +3343,12 @@ static int mv88e6xxx_set_temp_limit(struct dsa_switch *ds, int temp)
if (!mv88e6xxx_has(ps, MV88E6XXX_FLAG_TEMP_LIMIT))
return -EOPNOTSUPP;

ret = mv88e6xxx_phy_page_read(ds, phy, 6, 26);
ret = mv88e6xxx_mdio_page_read(ds, phy, 6, 26);
if (ret < 0)
return ret;
temp = clamp_val(DIV_ROUND_CLOSEST(temp, 5) + 5, 0, 0x1f);
return mv88e6xxx_phy_page_write(ds, phy, 6, 26,
(ret & 0xe0ff) | (temp << 8));
return mv88e6xxx_mdio_page_write(ds, phy, 6, 26,
(ret & 0xe0ff) | (temp << 8));
}

static int mv88e6xxx_get_temp_alarm(struct dsa_switch *ds, bool *alarm)
Expand All @@ -3362,7 +3362,7 @@ static int mv88e6xxx_get_temp_alarm(struct dsa_switch *ds, bool *alarm)

*alarm = false;

ret = mv88e6xxx_phy_page_read(ds, phy, 6, 26);
ret = mv88e6xxx_mdio_page_read(ds, phy, 6, 26);
if (ret < 0)
return ret;

Expand Down Expand Up @@ -3590,8 +3590,8 @@ struct dsa_switch_driver mv88e6xxx_switch_driver = {
.probe = mv88e6xxx_drv_probe,
.setup = mv88e6xxx_setup,
.set_addr = mv88e6xxx_set_addr,
.phy_read = mv88e6xxx_phy_read,
.phy_write = mv88e6xxx_phy_write,
.phy_read = mv88e6xxx_mdio_read,
.phy_write = mv88e6xxx_mdio_write,
.adjust_link = mv88e6xxx_adjust_link,
.get_strings = mv88e6xxx_get_strings,
.get_ethtool_stats = mv88e6xxx_get_ethtool_stats,
Expand Down

0 comments on commit 03a4a54

Please sign in to comment.