* [PATCH 1/1] net: mdio: aspeed: Add Clause 45 support
@ 2022-03-29 16:19 Potin Lai
2022-03-29 17:39 ` Andrew Lunn
2022-03-30 2:44 ` Andrew Jeffery
0 siblings, 2 replies; 5+ messages in thread
From: Potin Lai @ 2022-03-29 16:19 UTC (permalink / raw)
To: Andrew Lunn, Heiner Kallweit, Russell King, David S. Miller,
Jakub Kicinski, Joel Stanley, Andrew Jeffery
Cc: Patrick Williams, Potin Lai, netdev, linux-arm-kernel,
linux-aspeed, linux-kernel
Add Clause 45 support for Aspeed mdio driver.
Signed-off-by: Potin Lai <potin.lai@quantatw.com>
---
drivers/net/mdio/mdio-aspeed.c | 122 ++++++++++++++++++++++++---------
1 file changed, 88 insertions(+), 34 deletions(-)
diff --git a/drivers/net/mdio/mdio-aspeed.c b/drivers/net/mdio/mdio-aspeed.c
index e2273588c75b..aa2b678b2381 100644
--- a/drivers/net/mdio/mdio-aspeed.c
+++ b/drivers/net/mdio/mdio-aspeed.c
@@ -21,6 +21,10 @@
#define ASPEED_MDIO_CTRL_OP GENMASK(27, 26)
#define MDIO_C22_OP_WRITE 0b01
#define MDIO_C22_OP_READ 0b10
+#define MDIO_C45_OP_ADDR 0b00
+#define MDIO_C45_OP_WRITE 0b01
+#define MDIO_C45_OP_PREAD 0b10
+#define MDIO_C45_OP_READ 0b11
#define ASPEED_MDIO_CTRL_PHYAD GENMASK(25, 21)
#define ASPEED_MDIO_CTRL_REGAD GENMASK(20, 16)
#define ASPEED_MDIO_CTRL_MIIWDATA GENMASK(15, 0)
@@ -39,34 +43,35 @@ struct aspeed_mdio {
void __iomem *base;
};
-static int aspeed_mdio_read(struct mii_bus *bus, int addr, int regnum)
+static int aspeed_mdio_ctrl_reg(struct mii_bus *bus, u8 st, u8 op, u8 phyad,
+ u8 regad, u16 data)
{
struct aspeed_mdio *ctx = bus->priv;
u32 ctrl;
- u32 data;
- int rc;
-
- dev_dbg(&bus->dev, "%s: addr: %d, regnum: %d\n", __func__, addr,
- regnum);
- /* Just clause 22 for the moment */
- if (regnum & MII_ADDR_C45)
- return -EOPNOTSUPP;
+ dev_dbg(&bus->dev, "%s: st: %u op: %u, phyad: %u, regad: %u, data: %u\n",
+ __func__, st, op, phyad, regad, data);
ctrl = ASPEED_MDIO_CTRL_FIRE
- | FIELD_PREP(ASPEED_MDIO_CTRL_ST, ASPEED_MDIO_CTRL_ST_C22)
- | FIELD_PREP(ASPEED_MDIO_CTRL_OP, MDIO_C22_OP_READ)
- | FIELD_PREP(ASPEED_MDIO_CTRL_PHYAD, addr)
- | FIELD_PREP(ASPEED_MDIO_CTRL_REGAD, regnum);
+ | FIELD_PREP(ASPEED_MDIO_CTRL_ST, st)
+ | FIELD_PREP(ASPEED_MDIO_CTRL_OP, op)
+ | FIELD_PREP(ASPEED_MDIO_CTRL_PHYAD, phyad)
+ | FIELD_PREP(ASPEED_MDIO_CTRL_REGAD, regad)
+ | FIELD_PREP(ASPEED_MDIO_DATA_MIIRDATA, data);
iowrite32(ctrl, ctx->base + ASPEED_MDIO_CTRL);
- rc = readl_poll_timeout(ctx->base + ASPEED_MDIO_CTRL, ctrl,
+ return readl_poll_timeout(ctx->base + ASPEED_MDIO_CTRL, ctrl,
!(ctrl & ASPEED_MDIO_CTRL_FIRE),
ASPEED_MDIO_INTERVAL_US,
ASPEED_MDIO_TIMEOUT_US);
- if (rc < 0)
- return rc;
+}
+
+static int aspeed_mdio_read_data_reg(struct mii_bus *bus)
+{
+ struct aspeed_mdio *ctx = bus->priv;
+ int rc;
+ u32 data;
rc = readl_poll_timeout(ctx->base + ASPEED_MDIO_DATA, data,
data & ASPEED_MDIO_DATA_IDLE,
@@ -78,31 +83,80 @@ static int aspeed_mdio_read(struct mii_bus *bus, int addr, int regnum)
return FIELD_GET(ASPEED_MDIO_DATA_MIIRDATA, data);
}
-static int aspeed_mdio_write(struct mii_bus *bus, int addr, int regnum, u16 val)
+static int aspeed_mdio_c45_read(struct mii_bus *bus, int addr, int regnum)
{
- struct aspeed_mdio *ctx = bus->priv;
- u32 ctrl;
+ int rc;
+ u8 c45_dev = (regnum >> 16) & 0x1F;
+ u16 c45_addr = regnum & 0xFFFF;
- dev_dbg(&bus->dev, "%s: addr: %d, regnum: %d, val: 0x%x\n",
- __func__, addr, regnum, val);
+ rc = aspeed_mdio_ctrl_reg(bus, ASPEED_MDIO_CTRL_ST_C45,
+ MDIO_C45_OP_ADDR, addr, c45_dev, c45_addr);
+ if (rc < 0)
+ return rc;
+
+ rc = aspeed_mdio_ctrl_reg(bus, ASPEED_MDIO_CTRL_ST_C45,
+ MDIO_C45_OP_READ, addr, c45_dev, 0);
+ if (rc < 0)
+ return rc;
+
+ return aspeed_mdio_read_data_reg(bus);
+}
+
+static int aspeed_mdio_c22_read(struct mii_bus *bus, int addr, int regnum)
+{
+ int rc;
+
+ rc = aspeed_mdio_ctrl_reg(bus, ASPEED_MDIO_CTRL_ST_C22,
+ MDIO_C22_OP_READ, addr, regnum, 0);
+ if (rc < 0)
+ return rc;
+
+ return aspeed_mdio_read_data_reg(bus);
+}
+
+static int aspeed_mdio_read(struct mii_bus *bus, int addr, int regnum)
+{
+ dev_dbg(&bus->dev, "%s: addr: %d, regnum: %d\n", __func__, addr,
+ regnum);
- /* Just clause 22 for the moment */
if (regnum & MII_ADDR_C45)
- return -EOPNOTSUPP;
+ return aspeed_mdio_c45_read(bus, addr, regnum);
- ctrl = ASPEED_MDIO_CTRL_FIRE
- | FIELD_PREP(ASPEED_MDIO_CTRL_ST, ASPEED_MDIO_CTRL_ST_C22)
- | FIELD_PREP(ASPEED_MDIO_CTRL_OP, MDIO_C22_OP_WRITE)
- | FIELD_PREP(ASPEED_MDIO_CTRL_PHYAD, addr)
- | FIELD_PREP(ASPEED_MDIO_CTRL_REGAD, regnum)
- | FIELD_PREP(ASPEED_MDIO_CTRL_MIIWDATA, val);
+ return aspeed_mdio_c22_read(bus, addr, regnum);
+}
- iowrite32(ctrl, ctx->base + ASPEED_MDIO_CTRL);
+static int aspeed_mdio_c45_write(struct mii_bus *bus, int addr, int regnum,
+ u16 val)
+{
+ int rc;
+ u8 c45_dev = (regnum >> 16) & 0x1F;
+ u16 c45_addr = regnum & 0xFFFF;
- return readl_poll_timeout(ctx->base + ASPEED_MDIO_CTRL, ctrl,
- !(ctrl & ASPEED_MDIO_CTRL_FIRE),
- ASPEED_MDIO_INTERVAL_US,
- ASPEED_MDIO_TIMEOUT_US);
+ rc = aspeed_mdio_ctrl_reg(bus, ASPEED_MDIO_CTRL_ST_C45,
+ MDIO_C45_OP_ADDR, addr, c45_dev, c45_addr);
+ if (rc < 0)
+ return rc;
+
+ return aspeed_mdio_ctrl_reg(bus, ASPEED_MDIO_CTRL_ST_C45,
+ MDIO_C45_OP_WRITE, addr, c45_dev, val);
+}
+
+static int aspeed_mdio_c22_write(struct mii_bus *bus, int addr, int regnum,
+ u16 val)
+{
+ return aspeed_mdio_ctrl_reg(bus, ASPEED_MDIO_CTRL_ST_C22,
+ MDIO_C22_OP_WRITE, addr, regnum, val);
+}
+
+static int aspeed_mdio_write(struct mii_bus *bus, int addr, int regnum, u16 val)
+{
+ dev_dbg(&bus->dev, "%s: addr: %d, regnum: %d, val: 0x%x\n",
+ __func__, addr, regnum, val);
+
+ if (regnum & MII_ADDR_C45)
+ return aspeed_mdio_c45_write(bus, addr, regnum, val);
+
+ return aspeed_mdio_c22_write(bus, addr, regnum, val);
}
static int aspeed_mdio_probe(struct platform_device *pdev)
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] net: mdio: aspeed: Add Clause 45 support
2022-03-29 16:19 [PATCH 1/1] net: mdio: aspeed: Add Clause 45 support Potin Lai
@ 2022-03-29 17:39 ` Andrew Lunn
2022-03-30 2:44 ` Andrew Jeffery
1 sibling, 0 replies; 5+ messages in thread
From: Andrew Lunn @ 2022-03-29 17:39 UTC (permalink / raw)
To: Potin Lai
Cc: Heiner Kallweit, Russell King, David S. Miller, Jakub Kicinski,
Joel Stanley, Andrew Jeffery, Patrick Williams, netdev,
linux-arm-kernel, linux-aspeed, linux-kernel
On Wed, Mar 30, 2022 at 12:19:49AM +0800, Potin Lai wrote:
> Add Clause 45 support for Aspeed mdio driver.
This looks O.K, but please set bus->probe_capabilities to indicate
both C22 and C45.
net-next is closed at the moment, so please wait until next week
before sending the next version.
Andrew
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] net: mdio: aspeed: Add Clause 45 support
@ 2022-03-29 17:39 ` Andrew Lunn
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Lunn @ 2022-03-29 17:39 UTC (permalink / raw)
To: Potin Lai
Cc: Heiner Kallweit, Russell King, David S. Miller, Jakub Kicinski,
Joel Stanley, Andrew Jeffery, Patrick Williams, netdev,
linux-arm-kernel, linux-aspeed, linux-kernel
On Wed, Mar 30, 2022 at 12:19:49AM +0800, Potin Lai wrote:
> Add Clause 45 support for Aspeed mdio driver.
This looks O.K, but please set bus->probe_capabilities to indicate
both C22 and C45.
net-next is closed at the moment, so please wait until next week
before sending the next version.
Andrew
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] net: mdio: aspeed: Add Clause 45 support
2022-03-29 16:19 [PATCH 1/1] net: mdio: aspeed: Add Clause 45 support Potin Lai
@ 2022-03-30 2:44 ` Andrew Jeffery
2022-03-30 2:44 ` Andrew Jeffery
1 sibling, 0 replies; 5+ messages in thread
From: Andrew Jeffery @ 2022-03-30 2:44 UTC (permalink / raw)
To: Potin Lai, Andrew Lunn, Heiner Kallweit, Russell King,
David Miller, Jakub Kicinski, Joel Stanley
Cc: Patrick Williams, netdev, linux-arm-kernel, linux-aspeed, linux-kernel
On Wed, 30 Mar 2022, at 02:49, Potin Lai wrote:
> Add Clause 45 support for Aspeed mdio driver.
>
> Signed-off-by: Potin Lai <potin.lai@quantatw.com>
> ---
> drivers/net/mdio/mdio-aspeed.c | 122 ++++++++++++++++++++++++---------
> 1 file changed, 88 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/net/mdio/mdio-aspeed.c b/drivers/net/mdio/mdio-aspeed.c
> index e2273588c75b..aa2b678b2381 100644
> --- a/drivers/net/mdio/mdio-aspeed.c
> +++ b/drivers/net/mdio/mdio-aspeed.c
> @@ -21,6 +21,10 @@
> #define ASPEED_MDIO_CTRL_OP GENMASK(27, 26)
> #define MDIO_C22_OP_WRITE 0b01
> #define MDIO_C22_OP_READ 0b10
> +#define MDIO_C45_OP_ADDR 0b00
> +#define MDIO_C45_OP_WRITE 0b01
> +#define MDIO_C45_OP_PREAD 0b10
> +#define MDIO_C45_OP_READ 0b11
> #define ASPEED_MDIO_CTRL_PHYAD GENMASK(25, 21)
> #define ASPEED_MDIO_CTRL_REGAD GENMASK(20, 16)
> #define ASPEED_MDIO_CTRL_MIIWDATA GENMASK(15, 0)
> @@ -39,34 +43,35 @@ struct aspeed_mdio {
> void __iomem *base;
> };
>
> -static int aspeed_mdio_read(struct mii_bus *bus, int addr, int regnum)
> +static int aspeed_mdio_ctrl_reg(struct mii_bus *bus, u8 st, u8 op, u8 phyad,
It's a bit of a nit-pick, but this function name talks about something
it impacts rather than something it does. What do you think of
`aspeed_mdio_op()`?
Less of a nitpick, this patch does three things:
1. Distills the aspeed_mdio_ctrl_reg() function from from the
aspeed_mdio_{read,write}() functions
2. Introduces the additional function indirection for C22 vs C45 reads
3. Adds the C45 support.
I think it'd be easier to review if it was broken into three separate
patches along the lines of the above. I'm finding the hunks hard to
concentrate on as they are.
Andrew
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] net: mdio: aspeed: Add Clause 45 support
@ 2022-03-30 2:44 ` Andrew Jeffery
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Jeffery @ 2022-03-30 2:44 UTC (permalink / raw)
To: Potin Lai, Andrew Lunn, Heiner Kallweit, Russell King,
David Miller, Jakub Kicinski, Joel Stanley
Cc: Patrick Williams, netdev, linux-arm-kernel, linux-aspeed, linux-kernel
On Wed, 30 Mar 2022, at 02:49, Potin Lai wrote:
> Add Clause 45 support for Aspeed mdio driver.
>
> Signed-off-by: Potin Lai <potin.lai@quantatw.com>
> ---
> drivers/net/mdio/mdio-aspeed.c | 122 ++++++++++++++++++++++++---------
> 1 file changed, 88 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/net/mdio/mdio-aspeed.c b/drivers/net/mdio/mdio-aspeed.c
> index e2273588c75b..aa2b678b2381 100644
> --- a/drivers/net/mdio/mdio-aspeed.c
> +++ b/drivers/net/mdio/mdio-aspeed.c
> @@ -21,6 +21,10 @@
> #define ASPEED_MDIO_CTRL_OP GENMASK(27, 26)
> #define MDIO_C22_OP_WRITE 0b01
> #define MDIO_C22_OP_READ 0b10
> +#define MDIO_C45_OP_ADDR 0b00
> +#define MDIO_C45_OP_WRITE 0b01
> +#define MDIO_C45_OP_PREAD 0b10
> +#define MDIO_C45_OP_READ 0b11
> #define ASPEED_MDIO_CTRL_PHYAD GENMASK(25, 21)
> #define ASPEED_MDIO_CTRL_REGAD GENMASK(20, 16)
> #define ASPEED_MDIO_CTRL_MIIWDATA GENMASK(15, 0)
> @@ -39,34 +43,35 @@ struct aspeed_mdio {
> void __iomem *base;
> };
>
> -static int aspeed_mdio_read(struct mii_bus *bus, int addr, int regnum)
> +static int aspeed_mdio_ctrl_reg(struct mii_bus *bus, u8 st, u8 op, u8 phyad,
It's a bit of a nit-pick, but this function name talks about something
it impacts rather than something it does. What do you think of
`aspeed_mdio_op()`?
Less of a nitpick, this patch does three things:
1. Distills the aspeed_mdio_ctrl_reg() function from from the
aspeed_mdio_{read,write}() functions
2. Introduces the additional function indirection for C22 vs C45 reads
3. Adds the C45 support.
I think it'd be easier to review if it was broken into three separate
patches along the lines of the above. I'm finding the hunks hard to
concentrate on as they are.
Andrew
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-03-30 2:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-29 16:19 [PATCH 1/1] net: mdio: aspeed: Add Clause 45 support Potin Lai
2022-03-29 17:39 ` Andrew Lunn
2022-03-29 17:39 ` Andrew Lunn
2022-03-30 2:44 ` Andrew Jeffery
2022-03-30 2:44 ` Andrew Jeffery
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.