Add Clause 45 support for Aspeed MDIO
Subsystems (4)
v3 cover Add Clause 45 support for Aspeed MDIO
This patch series add Clause 45 support for Aspeed MDIO driver, and separate c22 and c45 implementation into different functions.
Changes v2 --> v3:
- sort local variable sequence in reverse Christmas tree format.
Changes v1 --> v2:
- add C45 to probe_capabilities
- break one patch into 3 small patches
Potin Lai (3):
net: mdio: aspeed: move reg accessing part into separate functions
net: mdio: aspeed: Introduce read write function for c22 and c45
net: mdio: aspeed: Add c45 support
drivers/net/mdio/mdio-aspeed.c | 123 ++++++++++++++++++++++++--------- 1 file changed, 89 insertions(+), 34 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/3 net: mdio: aspeed: move reg accessing part into separate functions
Add aspeed_mdio_op() and aseed_mdio_get_data() for register accessing.
aspeed_mdio_op() handles operations, write command to control register, then check and wait operations is finished (bit 31 is cleared).
aseed_mdio_get_data() fetchs the result value of operation from data register.
--- drivers/net/mdio/mdio-aspeed.c | 70 ++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 32 deletions(-)
drivers/net/mdio/mdio-aspeed.c +38 -32
@@ -39,34 +39,35 @@ struct aspeed_mdio {void __iomem *base; }; -static int aspeed_mdio_read (struct mii_bus *bus,int addr,int regnum) +static int aspeed_mdio_op (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_get_data (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 +79,36 @@ 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_read (struct mii_bus *bus,int addr,int regnum) { -struct aspeed_mdio *ctx = bus->priv; -u32 ctrl; +int rc; -dev_dbg (&bus->dev,"%s: addr: %d, regnum: %d, val: 0x%x\n" , - __func__, addr, regnum, val); +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 ; - 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); + rc =aspeed_mdio_op (bus,ASPEED_MDIO_CTRL_ST_C22 ,MDIO_C22_OP_READ , + addr, regnum,0 ); +if (rc <0 ) +return rc; -iowrite32 (ctrl, ctx->base +ASPEED_MDIO_CTRL ); +return aspeed_mdio_get_data (bus); +} -return readl_poll_timeout (ctx->base +ASPEED_MDIO_CTRL , ctrl, - !(ctrl &ASPEED_MDIO_CTRL_FIRE ), -ASPEED_MDIO_INTERVAL_US , -ASPEED_MDIO_TIMEOUT_US ); +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); + +/* Just clause 22 for the moment */ +if (regnum &MII_ADDR_C45 ) +return -EOPNOTSUPP ; + +return aspeed_mdio_op (bus,ASPEED_MDIO_CTRL_ST_C22 ,MDIO_C22_OP_WRITE , + addr, regnum, val); }static int aspeed_mdio_probe (struct platform_device *pdev)
Signature · 1 line
2.17.1
PATCH v3 2/3 net: mdio: aspeed: Introduce read write function for c22 and c45
In reply to Potin LaiAdd following additional functions to move out the implementation from aspeed_mdio_read() and aspeed_mdio_write().
c22:
- aspeed_mdio_read_c22()
- aspeed_mdio_write_c22()
c45:
- aspeed_mdio_read_c45()
- aspeed_mdio_write_c45()
--- drivers/net/mdio/mdio-aspeed.c | 46 +++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 12 deletions(-)
drivers/net/mdio/mdio-aspeed.c +34 -12
@@ -79,17 +79,10 @@ static int aspeed_mdio_get_data(struct mii_bus *bus)return FIELD_GET (ASPEED_MDIO_DATA_MIIRDATA , data); } -static int aspeed_mdio_read (struct mii_bus *bus,int addr,int regnum) +static int aspeed_mdio_read_c22 (struct mii_bus *bus,int addr,int regnum) {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 ; - rc =aspeed_mdio_op (bus,ASPEED_MDIO_CTRL_ST_C22 ,MDIO_C22_OP_READ , addr, regnum,0 );if (rc <0 )
@@ -98,17 +91,46 @@ static int aspeed_mdio_read(struct mii_bus *bus, int addr, int regnum)return aspeed_mdio_get_data (bus); } +static int aspeed_mdio_write_c22 (struct mii_bus *bus,int addr,int regnum, +u16 val) +{ +return aspeed_mdio_op (bus,ASPEED_MDIO_CTRL_ST_C22 ,MDIO_C22_OP_WRITE , + addr, regnum, val); +} + +static int aspeed_mdio_read_c45 (struct mii_bus *bus,int addr,int regnum) +{ +/* TODO: add c45 support */ +return -EOPNOTSUPP ; +} + +static int aspeed_mdio_write_c45 (struct mii_bus *bus,int addr,int regnum, +u16 val) +{ +/* TODO: add c45 support */ +return -EOPNOTSUPP ; +} + +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); + +if (regnum &MII_ADDR_C45 ) +return aspeed_mdio_read_c45 (bus, addr, regnum); + +return aspeed_mdio_read_c22 (bus, addr, regnum); +} +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); -/* Just clause 22 for the moment */ if (regnum &MII_ADDR_C45 ) -return -EOPNOTSUPP ; +return aspeed_mdio_write_c45 (bus, addr, regnum, val); -return aspeed_mdio_op (bus,ASPEED_MDIO_CTRL_ST_C22 ,MDIO_C22_OP_WRITE , - addr, regnum, val); +return aspeed_mdio_write_c22 (bus, addr, regnum, val); }static int aspeed_mdio_probe (struct platform_device *pdev)
Signature · 1 line
2.17.1
PATCH v3 3/3 net: mdio: aspeed: Add c45 support
In reply to Potin LaiAdd Clause 45 support for Aspeed mdio driver.
--- drivers/net/mdio/mdio-aspeed.c | 37 +++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-)
drivers/net/mdio/mdio-aspeed.c +32 -5
@@ -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)
@@ -66,8 +70,8 @@ static int aspeed_mdio_op(struct mii_bus *bus, u8 st, u8 op, u8 phyad, u8 regad,static int aspeed_mdio_get_data (struct mii_bus *bus) {struct aspeed_mdio *ctx = bus->priv; -int rc;u32 data; +int rc; rc = readl_poll_timeout(ctx->base + ASPEED_MDIO_DATA, data, data & ASPEED_MDIO_DATA_IDLE,
@@ -100,15 +104,37 @@ static int aspeed_mdio_write_c22(struct mii_bus *bus, int addr, int regnum,static int aspeed_mdio_read_c45 (struct mii_bus *bus,int addr,int regnum) { -/* TODO: add c45 support */ -return -EOPNOTSUPP ; +u8 c45_dev = (regnum >>16 ) &0x1F ; +u16 c45_addr = regnum &0xFFFF ; +int rc; + + rc =aspeed_mdio_op (bus,ASPEED_MDIO_CTRL_ST_C45 ,MDIO_C45_OP_ADDR , + addr, c45_dev, c45_addr); +if (rc <0 ) +return rc; + + rc =aspeed_mdio_op (bus,ASPEED_MDIO_CTRL_ST_C45 ,MDIO_C45_OP_READ , + addr, c45_dev,0 ); +if (rc <0 ) +return rc; + +return aspeed_mdio_get_data (bus); }static int aspeed_mdio_write_c45 (struct mii_bus *bus,int addr,int regnum,u16 val) { -/* TODO: add c45 support */ -return -EOPNOTSUPP ; +u8 c45_dev = (regnum >>16 ) &0x1F ; +u16 c45_addr = regnum &0xFFFF ; +int rc; + + rc =aspeed_mdio_op (bus,ASPEED_MDIO_CTRL_ST_C45 ,MDIO_C45_OP_ADDR , + addr, c45_dev, c45_addr); +if (rc <0 ) +return rc; + +return aspeed_mdio_op (bus,ASPEED_MDIO_CTRL_ST_C45 ,MDIO_C45_OP_WRITE , + addr, c45_dev, val); }static int aspeed_mdio_read (struct mii_bus *bus,int addr,int regnum)
@@ -153,6 +179,7 @@ static int aspeed_mdio_probe(struct platform_device *pdev) bus->parent = &pdev->dev; bus->read = aspeed_mdio_read; bus->write = aspeed_mdio_write; + bus->probe_capabilities =MDIOBUS_C22_C45 ; rc =of_mdiobus_register (bus, pdev->dev.of_node);if (rc) {
Signature · 1 line
2.17.1
Re: [PATCH net-next v3 3/3] net: mdio: aspeed: Add c45 support
Quoted 3 lines · Potin Lai
Add Clause 45 support for Aspeed mdio driver.
Signed-off-by Potin Lai <[email protected]>
Andrew
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 8 lines · On Thu, 7 Apr 2022 09:17:35 +0800 you wrote:
This patch series add Clause 45 support for Aspeed MDIO driver, and separate c22 and c45 implementation into different functions.
LINK [v1] https://lore.kernel.org/all/20220329161949.19762-1-potin.lai at quantatw.com/LINK [v2] https://lore.kernel.org/all/20220406170055.28516-1-potin.lai at quantatw.com/[...]
Here is the summary with links:
- [net-next,v3,1/3] net: mdio: aspeed: move reg accessing part into separate functions
https://git.kernel.org/netdev/net-next/c/737ca352569e - [net-next,v3,2/3] net: mdio: aspeed: Introduce read write function for c22 and c45 https://git.kernel.org/netdev/net-next/c/eb0571932314 - [net-next,v3,3/3] net: mdio: aspeed: Add c45 support https://git.kernel.org/netdev/net-next/c/e6df1b4a2759
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html