Skip to content

L
linux
Commit c58e3994 authored by Andrew Lunn's avatar Andrew Lunn Committed by Jakub Kicinski
Browse files
Options

net: mdio: ipq4019: Separate C22 and C45 transactions 

The ipq4019 driver can perform both C22 and C45 transfers.  Create
separate functions for each and register the C45 versions using the
new driver API calls.
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent c3c497eb
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 64 deletions
drivers/net/mdio/mdio-ipq4019.c
View file @ c58e3994
...@@ -53,7 +53,8 @@ static int ipq4019_mdio_wait_busy(struct mii_bus *bus) ...@@ -53,7 +53,8 @@ static int ipq4019_mdio_wait_busy(struct mii_bus *bus)
IPQ4019_MDIO_SLEEP, IPQ4019_MDIO_TIMEOUT); IPQ4019_MDIO_SLEEP, IPQ4019_MDIO_TIMEOUT);
} }
static int ipq4019_mdio_read(struct mii_bus *bus, int mii_id, int regnum) static int ipq4019_mdio_read_c45(struct mii_bus *bus, int mii_id, int mmd,
int reg)
{ {
struct ipq4019_mdio_data *priv = bus->priv; struct ipq4019_mdio_data *priv = bus->priv;
unsigned int data; unsigned int data;
...@@ -62,61 +63,71 @@ static int ipq4019_mdio_read(struct mii_bus *bus, int mii_id, int regnum) ...@@ -62,61 +63,71 @@ static int ipq4019_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
if (ipq4019_mdio_wait_busy(bus)) if (ipq4019_mdio_wait_busy(bus))
return -ETIMEDOUT; return -ETIMEDOUT;
/* Clause 45 support */ data = readl(priv->membase + MDIO_MODE_REG);
if (regnum & MII_ADDR_C45) {
unsigned int mmd = (regnum >> 16) & 0x1F;
unsigned int reg = regnum & 0xFFFF;
/* Enter Clause 45 mode */ data |= MDIO_MODE_C45;
data = readl(priv->membase + MDIO_MODE_REG);
data |= MDIO_MODE_C45; writel(data, priv->membase + MDIO_MODE_REG);
writel(data, priv->membase + MDIO_MODE_REG); /* issue the phy address and mmd */
writel((mii_id << 8) | mmd, priv->membase + MDIO_ADDR_REG);
/* issue the phy address and mmd */ /* issue reg */
writel((mii_id << 8) | mmd, priv->membase + MDIO_ADDR_REG); writel(reg, priv->membase + MDIO_DATA_WRITE_REG);
/* issue reg */ cmd = MDIO_CMD_ACCESS_START | MDIO_CMD_ACCESS_CODE_C45_ADDR;
writel(reg, priv->membase + MDIO_DATA_WRITE_REG);
cmd = MDIO_CMD_ACCESS_START | MDIO_CMD_ACCESS_CODE_C45_ADDR; /* issue read command */
} else { writel(cmd, priv->membase + MDIO_CMD_REG);
/* Enter Clause 22 mode */
data = readl(priv->membase + MDIO_MODE_REG);
data &= ~MDIO_MODE_C45; /* Wait read complete */
if (ipq4019_mdio_wait_busy(bus))
return -ETIMEDOUT;
writel(data, priv->membase + MDIO_MODE_REG); cmd = MDIO_CMD_ACCESS_START | MDIO_CMD_ACCESS_CODE_C45_READ;
/* issue the phy address and reg */ writel(cmd, priv->membase + MDIO_CMD_REG);
writel((mii_id << 8) | regnum, priv->membase + MDIO_ADDR_REG);
cmd = MDIO_CMD_ACCESS_START | MDIO_CMD_ACCESS_CODE_READ; if (ipq4019_mdio_wait_busy(bus))
} return -ETIMEDOUT;
/* issue read command */ /* Read and return data */
writel(cmd, priv->membase + MDIO_CMD_REG); return readl(priv->membase + MDIO_DATA_READ_REG);
}
static int ipq4019_mdio_read_c22(struct mii_bus *bus, int mii_id, int regnum)
{
struct ipq4019_mdio_data *priv = bus->priv;
unsigned int data;
unsigned int cmd;
/* Wait read complete */
if (ipq4019_mdio_wait_busy(bus)) if (ipq4019_mdio_wait_busy(bus))
return -ETIMEDOUT; return -ETIMEDOUT;
if (regnum & MII_ADDR_C45) { data = readl(priv->membase + MDIO_MODE_REG);
cmd = MDIO_CMD_ACCESS_START | MDIO_CMD_ACCESS_CODE_C45_READ;
writel(cmd, priv->membase + MDIO_CMD_REG); data &= ~MDIO_MODE_C45;
if (ipq4019_mdio_wait_busy(bus)) writel(data, priv->membase + MDIO_MODE_REG);
return -ETIMEDOUT;
} /* issue the phy address and reg */
writel((mii_id << 8) | regnum, priv->membase + MDIO_ADDR_REG);
cmd = MDIO_CMD_ACCESS_START | MDIO_CMD_ACCESS_CODE_READ;
/* issue read command */
writel(cmd, priv->membase + MDIO_CMD_REG);
/* Wait read complete */
if (ipq4019_mdio_wait_busy(bus))
return -ETIMEDOUT;
/* Read and return data */ /* Read and return data */
return readl(priv->membase + MDIO_DATA_READ_REG); return readl(priv->membase + MDIO_DATA_READ_REG);
} }
static int ipq4019_mdio_write(struct mii_bus *bus, int mii_id, int regnum, static int ipq4019_mdio_write_c45(struct mii_bus *bus, int mii_id, int mmd,
u16 value) int reg, u16 value)
{ {
struct ipq4019_mdio_data *priv = bus->priv; struct ipq4019_mdio_data *priv = bus->priv;
unsigned int data; unsigned int data;
...@@ -125,50 +136,63 @@ static int ipq4019_mdio_write(struct mii_bus *bus, int mii_id, int regnum, ...@@ -125,50 +136,63 @@ static int ipq4019_mdio_write(struct mii_bus *bus, int mii_id, int regnum,
if (ipq4019_mdio_wait_busy(bus)) if (ipq4019_mdio_wait_busy(bus))
return -ETIMEDOUT; return -ETIMEDOUT;
/* Clause 45 support */ data = readl(priv->membase + MDIO_MODE_REG);
if (regnum & MII_ADDR_C45) {
unsigned int mmd = (regnum >> 16) & 0x1F;
unsigned int reg = regnum & 0xFFFF;
/* Enter Clause 45 mode */ data |= MDIO_MODE_C45;
data = readl(priv->membase + MDIO_MODE_REG);
data |= MDIO_MODE_C45; writel(data, priv->membase + MDIO_MODE_REG);
writel(data, priv->membase + MDIO_MODE_REG); /* issue the phy address and mmd */
writel((mii_id << 8) | mmd, priv->membase + MDIO_ADDR_REG);
/* issue the phy address and mmd */ /* issue reg */
writel((mii_id << 8) | mmd, priv->membase + MDIO_ADDR_REG); writel(reg, priv->membase + MDIO_DATA_WRITE_REG);
/* issue reg */ cmd = MDIO_CMD_ACCESS_START | MDIO_CMD_ACCESS_CODE_C45_ADDR;
writel(reg, priv->membase + MDIO_DATA_WRITE_REG);
cmd = MDIO_CMD_ACCESS_START | MDIO_CMD_ACCESS_CODE_C45_ADDR; writel(cmd, priv->membase + MDIO_CMD_REG);
writel(cmd, priv->membase + MDIO_CMD_REG); if (ipq4019_mdio_wait_busy(bus))
return -ETIMEDOUT;
if (ipq4019_mdio_wait_busy(bus)) /* issue write data */
return -ETIMEDOUT; writel(value, priv->membase + MDIO_DATA_WRITE_REG);
} else {
/* Enter Clause 22 mode */
data = readl(priv->membase + MDIO_MODE_REG);
data &= ~MDIO_MODE_C45; cmd = MDIO_CMD_ACCESS_START | MDIO_CMD_ACCESS_CODE_C45_WRITE;
writel(cmd, priv->membase + MDIO_CMD_REG);
writel(data, priv->membase + MDIO_MODE_REG); /* Wait write complete */
if (ipq4019_mdio_wait_busy(bus))
return -ETIMEDOUT;
/* issue the phy address and reg */ return 0;
writel((mii_id << 8) | regnum, priv->membase + MDIO_ADDR_REG); }
}
static int ipq4019_mdio_write_c22(struct mii_bus *bus, int mii_id, int regnum,
u16 value)
{
struct ipq4019_mdio_data *priv = bus->priv;
unsigned int data;
unsigned int cmd;
if (ipq4019_mdio_wait_busy(bus))
return -ETIMEDOUT;
/* Enter Clause 22 mode */
data = readl(priv->membase + MDIO_MODE_REG);
data &= ~MDIO_MODE_C45;
writel(data, priv->membase + MDIO_MODE_REG);
/* issue the phy address and reg */
writel((mii_id << 8) | regnum, priv->membase + MDIO_ADDR_REG);
/* issue write data */ /* issue write data */
writel(value, priv->membase + MDIO_DATA_WRITE_REG); writel(value, priv->membase + MDIO_DATA_WRITE_REG);
/* issue write command */ /* issue write command */
if (regnum & MII_ADDR_C45) cmd = MDIO_CMD_ACCESS_START | MDIO_CMD_ACCESS_CODE_WRITE;
cmd = MDIO_CMD_ACCESS_START | MDIO_CMD_ACCESS_CODE_C45_WRITE;
else
cmd = MDIO_CMD_ACCESS_START | MDIO_CMD_ACCESS_CODE_WRITE;
writel(cmd, priv->membase + MDIO_CMD_REG); writel(cmd, priv->membase + MDIO_CMD_REG);
...@@ -235,8 +259,10 @@ static int ipq4019_mdio_probe(struct platform_device *pdev) ...@@ -235,8 +259,10 @@ static int ipq4019_mdio_probe(struct platform_device *pdev)
priv->eth_ldo_rdy = devm_ioremap_resource(&pdev->dev, res); priv->eth_ldo_rdy = devm_ioremap_resource(&pdev->dev, res);
bus->name = "ipq4019_mdio"; bus->name = "ipq4019_mdio";
bus->read = ipq4019_mdio_read; bus->read = ipq4019_mdio_read_c22;
bus->write = ipq4019_mdio_write; bus->write = ipq4019_mdio_write_c22;
bus->read_c45 = ipq4019_mdio_read_c45;
bus->write_c45 = ipq4019_mdio_write_c45;
bus->reset = ipq_mdio_reset; bus->reset = ipq_mdio_reset;
bus->parent = &pdev->dev; bus->parent = &pdev->dev;
snprintf(bus->id, MII_BUS_ID_SIZE, "%s%d", pdev->name, pdev->id); snprintf(bus->id, MII_BUS_ID_SIZE, "%s%d", pdev->name, pdev->id);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7