net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access
Subsystems (5)
PATCH 1/1 net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access
Implement read and write access to IEEE 802.3 Clause 45 Ethernet phy registers.
Tested on the Ubiquiti UniFi 6 LR access point featuring MediaTek MT7622BV WiSoC with Aquantia AQR112C.
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 56 ++++++++++++++++++--- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 3 ++ 2 files changed, 51 insertions(+), 8 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +48 -8
@@ -102,10 +102,30 @@ static u32 _mtk_mdio_write(struct mtk_eth *eth, u32 phy_addr, write_data &=0xffff ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | - (phy_register <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ) | write_data, -MTK_PHY_IAC ); +if (phy_register &MII_ADDR_C45 ) { +u8 dev_num = (phy_register >>16 ) &0x1f ; +u16 reg = (u16)(phy_register &0xffff ); + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_SET_ADDR | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ) | + reg, +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return 0xffff ; + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_WRITE | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ) | + write_data, +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | + (phy_register <<PHY_IAC_REG_SHIFT ) | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | write_data, +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return -1 ;
@@ -120,10 +140,29 @@ static u32 _mtk_mdio_read(struct mtk_eth *eth, int phy_addr, int phy_reg)if (mtk_mdio_busy_wait (eth))return 0xffff ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_READ | - (phy_reg <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ), -MTK_PHY_IAC ); +if (phy_reg &MII_ADDR_C45 ) { +u8 dev_num = (phy_reg >>16 ) &0x1f ; +u16 reg = (u16)(phy_reg &0xffff ); + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_SET_ADDR | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ) | + reg, +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return 0xffff ; + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_READ_C45 | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ), +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_READ | + (phy_reg <<PHY_IAC_REG_SHIFT ) | + (phy_addr <<PHY_IAC_ADDR_SHIFT ), +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return 0xffff ;
@@ -497,6 +536,7 @@ static int mtk_mdio_init(struct mtk_eth *eth) eth->mii_bus->name ="mdio" ; eth->mii_bus->read = mtk_mdio_read; eth->mii_bus->write = mtk_mdio_write; + eth->mii_bus->probe_capabilities =MDIOBUS_C22_C45 ; eth->mii_bus->priv = eth; eth->mii_bus->parent = eth->dev;
drivers/net/ethernet/mediatek/mtk_eth_soc.h +3 -0
@@ -341,9 +341,12 @@/* PHY Indirect Access Control registers */ #define MTK_PHY_IAC 0x10004#define PHY_IAC_ACCESS BIT(31) +#define PHY_IAC_SET_ADDR 0#define PHY_IAC_READ BIT(19) +#define PHY_IAC_READ_C45 (BIT(18) | BIT(19))#define PHY_IAC_WRITE BIT(18)#define PHY_IAC_START BIT(16) +#define PHY_IAC_START_C45 0#define PHY_IAC_ADDR_SHIFT 20#define PHY_IAC_REG_SHIFT 25#define PHY_IAC_TIMEOUT HZ
Signature · 7 lines
2.34.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Andrew Lunn
maintainerdrivers/net/ethernet/mediatek/mtk_eth_soc.c static u32 _mtk_mdio_write(struct mtk_eth *eth, u32 phy_addr, · line 107
Quoted 3 lines
drivers/net/ethernet/mediatek/mtk_eth_soc.c +3
-0+if (phy_register &MII_ADDR_C45 ) { +u8 dev_num = (phy_register >>16 ) &0x1f ; +u16 reg = (u16)(phy_register &0xffff );
Hi Daniel
You can use the helpers
mdio_phy_id_is_c45()mdio_phy_id_prtad()mdio_phy_id_devad()
Andrew
Russell King (Oracle)
reviewerQuoted 11 lines · Andrew Lunn
drivers/net/ethernet/mediatek/mtk_eth_soc.c static u32 _mtk_mdio_write(struct mtk_eth *eth, u32 phy_addr, · line 107
Quoted 3 lines
drivers/net/ethernet/mediatek/mtk_eth_soc.c +3
-0+if (phy_register &MII_ADDR_C45 ) { +u8 dev_num = (phy_register >>16 ) &0x1f ; +u16 reg = (u16)(phy_register &0xffff );Hi Daniel
You can use the helpers
mdio_phy_id_is_c45()mdio_phy_id_prtad()mdio_phy_id_devad()
Before someone makes a mistake with this... no, don't use these. These are for the userspace MII ioctl API, not for drivers.
The MII ioctl API passes the prtad and devad via the PHY ID field, and is decoded by the above macros.
The internal API passes the prtad as the PHY ID and merges the devad into the register address.
The C45 register address can be extracted by masking with MII_REGADDR_C45_MASK. The C45 devad can be extracted by shifting right by MII_DEVADDR_C45_SHIFT and masking 5 bits. We don't have helpers for this.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
Andrew Lunn
maintainerQuoted 7 lines · Russell King (Oracle)
Quoted 6 lines · Andrew Lunn
drivers/net/ethernet/mediatek/mtk_eth_soc.c static u32 _mtk_mdio_write(struct mtk_eth *eth, u32 phy_addr, · line 107
Quoted 3 lines
drivers/net/ethernet/mediatek/mtk_eth_soc.c +3
-0+if (phy_register &MII_ADDR_C45 ) { +u8 dev_num = (phy_register >>16 ) &0x1f ; +u16 reg = (u16)(phy_register &0xffff );Hi Daniel
Quoted 8 lines
Quoted 5 lines
You can use the helpers
mdio_phy_id_is_c45()mdio_phy_id_prtad()mdio_phy_id_devad()Before someone makes a mistake with this... no, don't use these. These are for the userspace MII ioctl API, not for drivers.
Ah, Sorry.
Thanks Russell, i got this wrong. I though there was some helpers for this, and happened to land on bnxt_hwrm_port_phy_read(), without checking what it was actually used for.
Quoted 4 lines
The C45 register address can be extracted by masking with
MII_REGADDR_C45_MASK. The C45 devad can be extracted by shifting right byMII_DEVADDR_C45_SHIFTand masking 5 bits. We don't have helpers for this.
Maybe we should have helpers.
Andrew
PATCH v2 1/1 net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access
Implement read and write access to IEEE 802.3 Clause 45 Ethernet phy registers.
Tested on the Ubiquiti UniFi 6 LR access point featuring MediaTek MT7622BV WiSoC with Aquantia AQR112C.
---
v2: use MII_DEVADDR_C45_SHIFT and MII_REGADDR_C45_MASK to extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 62 +++++++++++++++++---- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 3 + 2 files changed, 54 insertions(+), 11 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +51 -11
@@ -94,18 +94,38 @@ static int mtk_mdio_busy_wait(struct mtk_eth *eth)return -1 ; } -static u32 _mtk_mdio_write (struct mtk_eth *eth,u32 phy_addr, -u32 phy_register,u32 write_data) +static u32 _mtk_mdio_write (struct mtk_eth *eth,u32 phy_addr,u32 phy_reg, +u32 write_data) {if (mtk_mdio_busy_wait (eth))return -1 ; write_data &=0xffff ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | - (phy_register <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ) | write_data, -MTK_PHY_IAC ); +if (phy_reg &MII_ADDR_C45 ) { +u8 dev_num = (phy_reg >>MII_DEVADDR_C45_SHIFT ) &GENMASK (4 ,0 ); +u16 reg = (u16)(phy_reg &MII_REGADDR_C45_MASK ); + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_SET_ADDR | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ) | + reg, +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return 0xffff ; + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_WRITE | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ) | + write_data, +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | + (phy_reg <<PHY_IAC_REG_SHIFT ) | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | write_data, +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return -1 ;
@@ -113,17 +133,36 @@ static u32 _mtk_mdio_write(struct mtk_eth *eth, u32 phy_addr,return 0 ; } -static u32 _mtk_mdio_read (struct mtk_eth *eth,int phy_addr,int phy_reg) +static u32 _mtk_mdio_read (struct mtk_eth *eth,u32 phy_addr,u32 phy_reg) {u32 d;if (mtk_mdio_busy_wait (eth))return 0xffff ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_READ | - (phy_reg <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ), -MTK_PHY_IAC ); +if (phy_reg &MII_ADDR_C45 ) { +u8 dev_num = (phy_reg >>MII_DEVADDR_C45_SHIFT ) &GENMASK (4 ,0 ); +u16 reg = (u16)(phy_reg &MII_REGADDR_C45_MASK ); + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_SET_ADDR | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ) | + reg, +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return 0xffff ; + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_READ_C45 | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ), +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_READ | + (phy_reg <<PHY_IAC_REG_SHIFT ) | + (phy_addr <<PHY_IAC_ADDR_SHIFT ), +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return 0xffff ;
@@ -497,6 +536,7 @@ static int mtk_mdio_init(struct mtk_eth *eth) eth->mii_bus->name ="mdio" ; eth->mii_bus->read = mtk_mdio_read; eth->mii_bus->write = mtk_mdio_write; + eth->mii_bus->probe_capabilities =MDIOBUS_C22_C45 ; eth->mii_bus->priv = eth; eth->mii_bus->parent = eth->dev;
drivers/net/ethernet/mediatek/mtk_eth_soc.h +3 -0
@@ -341,9 +341,12 @@/* PHY Indirect Access Control registers */ #define MTK_PHY_IAC 0x10004#define PHY_IAC_ACCESS BIT(31) +#define PHY_IAC_SET_ADDR 0#define PHY_IAC_READ BIT(19) +#define PHY_IAC_READ_C45 (BIT(18) | BIT(19))#define PHY_IAC_WRITE BIT(18)#define PHY_IAC_START BIT(16) +#define PHY_IAC_START_C45 0#define PHY_IAC_ADDR_SHIFT 20#define PHY_IAC_REG_SHIFT 25#define PHY_IAC_TIMEOUT HZ
Signature · 1 line
2.34.1
PATCH v3 1/1 net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access
In reply to Andrew LunnImplement read and write access to IEEE 802.3 Clause 45 Ethernet phy registers.
Tested on the Ubiquiti UniFi 6 LR access point featuring MediaTek MT7622BV WiSoC with Aquantia AQR112C.
---
v3: return -1 instead of 0xffff on error in _mtk_mdio_write
v2: use MII_DEVADDR_C45_SHIFT and MII_REGADDR_C45_MASK to extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 62 +++++++++++++++++---- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 3 + 2 files changed, 54 insertions(+), 11 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +51 -11
@@ -94,18 +94,38 @@ static int mtk_mdio_busy_wait(struct mtk_eth *eth)return -1 ; } -static u32 _mtk_mdio_write (struct mtk_eth *eth,u32 phy_addr, -u32 phy_register,u32 write_data) +static u32 _mtk_mdio_write (struct mtk_eth *eth,u32 phy_addr,u32 phy_reg, +u32 write_data) {if (mtk_mdio_busy_wait (eth))return -1 ; write_data &=0xffff ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | - (phy_register <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ) | write_data, -MTK_PHY_IAC ); +if (phy_reg &MII_ADDR_C45 ) { +u8 dev_num = (phy_reg >>MII_DEVADDR_C45_SHIFT ) &GENMASK (4 ,0 ); +u16 reg = (u16)(phy_reg &MII_REGADDR_C45_MASK ); + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_SET_ADDR | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ) | + reg, +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return -1 ; + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_WRITE | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ) | + write_data, +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | + (phy_reg <<PHY_IAC_REG_SHIFT ) | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | write_data, +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return -1 ;
@@ -113,17 +133,36 @@ static u32 _mtk_mdio_write(struct mtk_eth *eth, u32 phy_addr,return 0 ; } -static u32 _mtk_mdio_read (struct mtk_eth *eth,int phy_addr,int phy_reg) +static u32 _mtk_mdio_read (struct mtk_eth *eth,u32 phy_addr,u32 phy_reg) {u32 d;if (mtk_mdio_busy_wait (eth))return 0xffff ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_READ | - (phy_reg <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ), -MTK_PHY_IAC ); +if (phy_reg &MII_ADDR_C45 ) { +u8 dev_num = (phy_reg >>MII_DEVADDR_C45_SHIFT ) &GENMASK (4 ,0 ); +u16 reg = (u16)(phy_reg &MII_REGADDR_C45_MASK ); + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_SET_ADDR | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ) | + reg, +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return 0xffff ; + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_READ_C45 | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ), +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_READ | + (phy_reg <<PHY_IAC_REG_SHIFT ) | + (phy_addr <<PHY_IAC_ADDR_SHIFT ), +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return 0xffff ;
@@ -497,6 +536,7 @@ static int mtk_mdio_init(struct mtk_eth *eth) eth->mii_bus->name ="mdio" ; eth->mii_bus->read = mtk_mdio_read; eth->mii_bus->write = mtk_mdio_write; + eth->mii_bus->probe_capabilities =MDIOBUS_C22_C45 ; eth->mii_bus->priv = eth; eth->mii_bus->parent = eth->dev;
drivers/net/ethernet/mediatek/mtk_eth_soc.h +3 -0
@@ -341,9 +341,12 @@/* PHY Indirect Access Control registers */ #define MTK_PHY_IAC 0x10004#define PHY_IAC_ACCESS BIT(31) +#define PHY_IAC_SET_ADDR 0#define PHY_IAC_READ BIT(19) +#define PHY_IAC_READ_C45 (BIT(18) | BIT(19))#define PHY_IAC_WRITE BIT(18)#define PHY_IAC_START BIT(16) +#define PHY_IAC_START_C45 0#define PHY_IAC_ADDR_SHIFT 20#define PHY_IAC_REG_SHIFT 25#define PHY_IAC_TIMEOUT HZ
Signature · 1 line
2.34.1
Russell King (Oracle)
reviewerQuoted 8 lines · Daniel Golle
Implement read and write access to IEEE 802.3 Clause 45 Ethernet phy registers.
Tested on the Ubiquiti UniFi 6 LR access point featuring MediaTek MT7622BV WiSoC with Aquantia AQR112C.Signed-off-by Daniel Golle <[email protected]>---
v3: return -1 instead of0xffffon error in_mtk_mdio_write
Oh no, not this "-1 disease" again.
eth->mii_bus->write = mtk_mdio_write;
static int mtk_mdio_write(struct mii_bus *bus, int phy_addr,
int phy_reg, u16 val)
{
struct mtk_eth *eth = bus->priv;
return _mtk_mdio_write(eth, phy_addr, phy_reg, val);
}This means if you return -1 from _mtk_mdio_write() (which for some strange reason returns a u32, not an "int") then you actually end up returning -EPERM. This is not an appropriate errno code.
As a general rule of thumb, if you're returning an "int" and wish to return "this failed" then always return an appropriate negative errno code in the kernel so there isn't any possibility of accidentially returning -EPERM through using "return -1".
This driver needs fixing _both_ due to returning -1, and also the return type from both _mtk_mdio_write() and _mtk_mdio_read().
To see why it's important to return a proper error code, see drivers/net/phy/phy_device.c::get_phy_c22_id() where -ENODEV and -EIO are specifically checked. Any other negative value here will stop the bus being scanned and cause the bus to be torn down.
Thanks.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
v4 cover net: mtk_soc_eth: implement Clause 45 MDIO access
As it turned out some clean-up would be needed, first address return value and type of mdio read and write functions in mtk_eth_soc. Then add support to access Clause 45 phy registers.
Both commits are tested on the Bananapi BPi-R64 board having MediaTek MT7531BE DSA gigE switch using clause 22 MDIO and Ubiquiti UniFi 6 LR access point having Aquantia AQR112C PHY using clause 45 MDIO.
v4: clean-up return values and types, split into two commits
v3: return -1 instead of 0xffff on error in _mtk_mdio_write
v2: use MII_DEVADDR_C45_SHIFT and MII_REGADDR_C45_MASK to extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
Daniel Golle (2):
net: mtk_eth_soc: fix return value of MDIO operations
net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 72 ++++++++++++++++----- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 3 + 2 files changed, 59 insertions(+), 16 deletions(-)
Signature · 1 line
2.34.1
PATCH v4 1/2 net: mtk_eth_soc: fix return value of MDIO operations
In reply to Russell King (Oracle)Instead of returning -1 (-EPERM) when MDIO bus is stuck busy while writing or 0xffff if it happens while reading, return the appropriate -EBUSY. Also fix return type to int instead of u32.
---
v4: clean-up return values and types, split into two commits
v3: return -1 instead of 0xffff on error in _mtk_mdio_write
v2: use MII_DEVADDR_C45_SHIFT and MII_REGADDR_C45_MASK to extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +7 -7
@@ -94,11 +94,11 @@ static int mtk_mdio_busy_wait(struct mtk_eth *eth)return -1 ; } -static u32 _mtk_mdio_write (struct mtk_eth *eth,u32 phy_addr, -u32 phy_register,u32 write_data) +static int _mtk_mdio_write (struct mtk_eth *eth,u32 phy_addr,u32 phy_reg, +u32 write_data) {if (mtk_mdio_busy_wait (eth)) -return -1 ; +return -EBUSY ; write_data &=0xffff ;
@@ -108,17 +108,17 @@ static u32 _mtk_mdio_write(struct mtk_eth *eth, u32 phy_addr, MTK_PHY_IAC);if (mtk_mdio_busy_wait (eth)) -return -1 ; +return -EBUSY ;return 0 ; } -static u32 _mtk_mdio_read (struct mtk_eth *eth,int phy_addr,int phy_reg) +static int _mtk_mdio_read (struct mtk_eth *eth,int phy_addr,int phy_reg) {u32 d;if (mtk_mdio_busy_wait (eth)) -return 0xffff ; +return -EBUSY ; mtk_w32(eth, PHY_IAC_ACCESS | PHY_IAC_START | PHY_IAC_READ | (phy_reg << PHY_IAC_REG_SHIFT) |
@@ -126,7 +126,7 @@ static u32 _mtk_mdio_read(struct mtk_eth *eth, int phy_addr, int phy_reg) MTK_PHY_IAC);if (mtk_mdio_busy_wait (eth)) -return 0xffff ; +return -EBUSY ; d =mtk_r32 (eth,MTK_PHY_IAC ) &0xffff ;
Signature · 1 line
2.34.1
PATCH v4 2/2 net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access
In reply to Russell King (Oracle)Implement read and write access to IEEE 802.3 Clause 45 Ethernet phy registers.
Tested on the Ubiquiti UniFi 6 LR access point featuring MediaTek MT7622BV WiSoC with Aquantia AQR112C.
---
v4: clean-up return values and types, split into two commits
v3: return -1 instead of 0xffff on error in _mtk_mdio_write
v2: use MII_DEVADDR_C45_SHIFT and MII_REGADDR_C45_MASK to extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 60 +++++++++++++++++---- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 3 ++ 2 files changed, 53 insertions(+), 10 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +50 -10
@@ -102,10 +102,30 @@ static int _mtk_mdio_write(struct mtk_eth *eth, u32 phy_addr, u32 phy_reg, write_data &=0xffff ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | - (phy_register <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ) | write_data, -MTK_PHY_IAC ); +if (phy_reg &MII_ADDR_C45 ) { +u8 dev_num = (phy_reg >>MII_DEVADDR_C45_SHIFT ) &GENMASK (4 ,0 ); +u16 reg = (u16)(phy_reg &MII_REGADDR_C45_MASK ); + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_SET_ADDR | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ) | + reg, +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return -EBUSY ; + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_WRITE | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ) | + write_data, +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | + (phy_reg <<PHY_IAC_REG_SHIFT ) | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | write_data, +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return -EBUSY ;
@@ -113,17 +133,36 @@ static int _mtk_mdio_write(struct mtk_eth *eth, u32 phy_addr, u32 phy_reg,return 0 ; } -static int _mtk_mdio_read (struct mtk_eth *eth,int phy_addr,int phy_reg) +static int _mtk_mdio_read (struct mtk_eth *eth,u32 phy_addr,u32 phy_reg) { -u32 d; +int d;if (mtk_mdio_busy_wait (eth))return -EBUSY ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_READ | - (phy_reg <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ), -MTK_PHY_IAC ); +if (phy_reg &MII_ADDR_C45 ) { +u8 dev_num = (phy_reg >>MII_DEVADDR_C45_SHIFT ) &GENMASK (4 ,0 ); +u16 reg = (u16)(phy_reg &MII_REGADDR_C45_MASK ); + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_SET_ADDR | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ) | + reg, +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return -EBUSY ; + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_READ_C45 | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ), +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_READ | + (phy_reg <<PHY_IAC_REG_SHIFT ) | + (phy_addr <<PHY_IAC_ADDR_SHIFT ), +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return -EBUSY ;
@@ -497,6 +536,7 @@ static int mtk_mdio_init(struct mtk_eth *eth) eth->mii_bus->name ="mdio" ; eth->mii_bus->read = mtk_mdio_read; eth->mii_bus->write = mtk_mdio_write; + eth->mii_bus->probe_capabilities =MDIOBUS_C22_C45 ; eth->mii_bus->priv = eth; eth->mii_bus->parent = eth->dev;
drivers/net/ethernet/mediatek/mtk_eth_soc.h +3 -0
@@ -341,9 +341,12 @@/* PHY Indirect Access Control registers */ #define MTK_PHY_IAC 0x10004#define PHY_IAC_ACCESS BIT(31) +#define PHY_IAC_SET_ADDR 0#define PHY_IAC_READ BIT(19) +#define PHY_IAC_READ_C45 (BIT(18) | BIT(19))#define PHY_IAC_WRITE BIT(18)#define PHY_IAC_START BIT(16) +#define PHY_IAC_START_C45 0#define PHY_IAC_ADDR_SHIFT 20#define PHY_IAC_REG_SHIFT 25#define PHY_IAC_TIMEOUT HZ
Signature · 1 line
2.34.1
v5 cover net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access
In reply to Russell King (Oracle)As it turned out some clean-up would be needed, first address return value and type of mdio read and write functions in mtk_eth_soc. Then add support to access Clause 45 phy registers.
Both commits are tested on the Bananapi BPi-R64 board having MediaTek MT7531BE DSA gigE switch using clause 22 MDIO and Ubiquiti UniFi 6 LR access point having Aquantia AQR112C PHY using clause 45 MDIO.
v5: fix wrong variable name in first patch covered by follow-up patch
v4: clean-up return values and types, split into two commits
v3: return -1 instead of 0xffff on error in _mtk_mdio_write
v2: use MII_DEVADDR_C45_SHIFT and MII_REGADDR_C45_MASK to extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
Daniel Golle (2):
net: ethernet: mtk_eth_soc: fix return value of MDIO ops
net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 72 ++++++++++++++++----- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 3 + 2 files changed, 59 insertions(+), 16 deletions(-)
Signature · 1 line
2.34.1
PATCH v5 1/2 net: ethernet: mtk_eth_soc: fix return value of MDIO ops
In reply to Russell King (Oracle)Instead of returning -1 (-EPERM) when MDIO bus is stuck busy while writing or 0xffff if it happens while reading, return the appropriate -EBUSY. Also fix return type to int instead of u32.
---
v5: fix incomplete unification of variable names phy_reg vs. phy_register
v4: clean-up return values and types, split into two commits
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +8 -8
@@ -94,31 +94,31 @@ static int mtk_mdio_busy_wait(struct mtk_eth *eth)return -1 ; } -static u32 _mtk_mdio_write (struct mtk_eth *eth,u32 phy_addr, -u32 phy_register,u32 write_data) +static int _mtk_mdio_write (struct mtk_eth *eth,u32 phy_addr,u32 phy_reg, +u32 write_data) {if (mtk_mdio_busy_wait (eth)) -return -1 ; +return -EBUSY ; write_data &=0xffff ;mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | - (phy_register <<PHY_IAC_REG_SHIFT ) | + (phy_reg <<PHY_IAC_REG_SHIFT ) | (phy_addr <<PHY_IAC_ADDR_SHIFT ) | write_data,MTK_PHY_IAC );if (mtk_mdio_busy_wait (eth)) -return -1 ; +return -EBUSY ;return 0 ; } -static u32 _mtk_mdio_read (struct mtk_eth *eth,int phy_addr,int phy_reg) +static int _mtk_mdio_read (struct mtk_eth *eth,int phy_addr,int phy_reg) {u32 d;if (mtk_mdio_busy_wait (eth)) -return 0xffff ; +return -EBUSY ; mtk_w32(eth, PHY_IAC_ACCESS | PHY_IAC_START | PHY_IAC_READ | (phy_reg << PHY_IAC_REG_SHIFT) |
@@ -126,7 +126,7 @@ static u32 _mtk_mdio_read(struct mtk_eth *eth, int phy_addr, int phy_reg) MTK_PHY_IAC);if (mtk_mdio_busy_wait (eth)) -return 0xffff ; +return -EBUSY ; d =mtk_r32 (eth,MTK_PHY_IAC ) &0xffff ;
Signature · 1 line
2.34.1
PATCH v5 2/2 net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access
In reply to Russell King (Oracle)Implement read and write access to IEEE 802.3 Clause 45 Ethernet phy registers.
Tested on the Ubiquiti UniFi 6 LR access point featuring MediaTek MT7622BV WiSoC with Aquantia AQR112C.
---
v5: unchanged
v4: clean-up return values and types, split into two commits
v3: return -1 instead of 0xffff on error in _mtk_mdio_write
v2: use MII_DEVADDR_C45_SHIFT and MII_REGADDR_C45_MASK to extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 60 +++++++++++++++++---- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 3 ++ 2 files changed, 53 insertions(+), 10 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +50 -10
@@ -102,10 +102,30 @@ static int _mtk_mdio_write(struct mtk_eth *eth, u32 phy_addr, u32 phy_reg, write_data &=0xffff ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | - (phy_reg <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ) | write_data, -MTK_PHY_IAC ); +if (phy_reg &MII_ADDR_C45 ) { +u8 dev_num = (phy_reg >>MII_DEVADDR_C45_SHIFT ) &GENMASK (4 ,0 ); +u16 reg = (u16)(phy_reg &MII_REGADDR_C45_MASK ); + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_SET_ADDR | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ) | + reg, +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return -EBUSY ; + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_WRITE | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ) | + write_data, +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | + (phy_reg <<PHY_IAC_REG_SHIFT ) | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | write_data, +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return -EBUSY ;
@@ -113,17 +133,36 @@ static int _mtk_mdio_write(struct mtk_eth *eth, u32 phy_addr, u32 phy_reg,return 0 ; } -static int _mtk_mdio_read (struct mtk_eth *eth,int phy_addr,int phy_reg) +static int _mtk_mdio_read (struct mtk_eth *eth,u32 phy_addr,u32 phy_reg) { -u32 d; +int d;if (mtk_mdio_busy_wait (eth))return -EBUSY ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_READ | - (phy_reg <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ), -MTK_PHY_IAC ); +if (phy_reg &MII_ADDR_C45 ) { +u8 dev_num = (phy_reg >>MII_DEVADDR_C45_SHIFT ) &GENMASK (4 ,0 ); +u16 reg = (u16)(phy_reg &MII_REGADDR_C45_MASK ); + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_SET_ADDR | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ) | + reg, +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return -EBUSY ; + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_READ_C45 | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ), +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_READ | + (phy_reg <<PHY_IAC_REG_SHIFT ) | + (phy_addr <<PHY_IAC_ADDR_SHIFT ), +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return -EBUSY ;
@@ -497,6 +536,7 @@ static int mtk_mdio_init(struct mtk_eth *eth) eth->mii_bus->name ="mdio" ; eth->mii_bus->read = mtk_mdio_read; eth->mii_bus->write = mtk_mdio_write; + eth->mii_bus->probe_capabilities =MDIOBUS_C22_C45 ; eth->mii_bus->priv = eth; eth->mii_bus->parent = eth->dev;
drivers/net/ethernet/mediatek/mtk_eth_soc.h +3 -0
@@ -341,9 +341,12 @@/* PHY Indirect Access Control registers */ #define MTK_PHY_IAC 0x10004#define PHY_IAC_ACCESS BIT(31) +#define PHY_IAC_SET_ADDR 0#define PHY_IAC_READ BIT(19) +#define PHY_IAC_READ_C45 (BIT(18) | BIT(19))#define PHY_IAC_WRITE BIT(18)#define PHY_IAC_START BIT(16) +#define PHY_IAC_START_C45 0#define PHY_IAC_ADDR_SHIFT 20#define PHY_IAC_REG_SHIFT 25#define PHY_IAC_TIMEOUT HZ
Signature · 1 line
2.34.1
v6 cover ethernet: mtk_eth_soc: implement Clause 45 MDIO access
In reply to Russell King (Oracle)As it turned out some clean-up would be needed, first address return value and type of mdio read and write functions in mtk_eth_soc. Then add support to access Clause 45 phy registers.
Both commits are tested on the Bananapi BPi-R64 board having MediaTek MT7531BE DSA gigE switch using clause 22 MDIO and Ubiquiti UniFi 6 LR access point having Aquantia AQR112C PHY using clause 45 MDIO.
v6: further clean up functions and more cleanly separate patches
v5: fix wrong variable name in first patch covered by follow-up patch
v4: clean-up return values and types, split into two commits
v3: return -1 instead of 0xffff on error in _mtk_mdio_write
v2: use MII_DEVADDR_C45_SHIFT and MII_REGADDR_C45_MASK to extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
Daniel Golle (2):
net: ethernet: mtk_eth_soc: fix return value of MDIO ops
net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 76 +++++++++++++++------ drivers/net/ethernet/mediatek/mtk_eth_soc.h | 3 + 2 files changed, 59 insertions(+), 20 deletions(-)
Signature · 1 line
2.34.1
PATCH v6 1/2 net: ethernet: mtk_eth_soc: fix return value of MDIO ops
In reply to Russell King (Oracle)Instead of returning -1 (-EPERM) when MDIO bus is stuck busy while writing or 0xffff if it happens while reading, return the appropriate -EBUSY. Also fix return type to int instead of u32.
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 22 +++++++++------------ 1 file changed, 9 insertions(+), 13 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +9 -13
@@ -94,31 +94,29 @@ static int mtk_mdio_busy_wait(struct mtk_eth *eth)return -1 ; } -static u32 _mtk_mdio_write (struct mtk_eth *eth,u32 phy_addr, -u32 phy_register,u32 write_data) +static int _mtk_mdio_write (struct mtk_eth *eth,u32 phy_addr,u32 phy_reg, +u32 write_data) {if (mtk_mdio_busy_wait (eth)) -return -1 ; +return -EBUSY ; write_data &=0xffff ;mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | - (phy_register <<PHY_IAC_REG_SHIFT ) | + (phy_reg <<PHY_IAC_REG_SHIFT ) | (phy_addr <<PHY_IAC_ADDR_SHIFT ) | write_data,MTK_PHY_IAC );if (mtk_mdio_busy_wait (eth)) -return -1 ; +return -EBUSY ;return 0 ; } -static u32 _mtk_mdio_read (struct mtk_eth *eth,int phy_addr,int phy_reg) +static int _mtk_mdio_read (struct mtk_eth *eth,u32 phy_addr,u32 phy_reg) { -u32 d; -if (mtk_mdio_busy_wait (eth)) -return 0xffff ; +return -EBUSY ; mtk_w32(eth, PHY_IAC_ACCESS | PHY_IAC_START | PHY_IAC_READ | (phy_reg << PHY_IAC_REG_SHIFT) |
@@ -126,11 +124,9 @@ static u32 _mtk_mdio_read(struct mtk_eth *eth, int phy_addr, int phy_reg) MTK_PHY_IAC);if (mtk_mdio_busy_wait (eth)) -return 0xffff ; - - d =mtk_r32 (eth,MTK_PHY_IAC ) &0xffff ; +return -EBUSY ; -return d; +return mtk_r32 (eth,MTK_PHY_IAC ) &0xffff ; } static int mtk_mdio_write(struct mii_bus *bus, int phy_addr,
Signature · 1 line
2.34.1
PATCH v6 2/2 net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access
In reply to Russell King (Oracle)Implement read and write access to IEEE 802.3 Clause 45 Ethernet phy registers.
Tested on the Ubiquiti UniFi 6 LR access point featuring MediaTek MT7622BV WiSoC with Aquantia AQR112C.
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 56 ++++++++++++++++++--- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 3 ++ 2 files changed, 51 insertions(+), 8 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +48 -8
@@ -102,10 +102,30 @@ static int _mtk_mdio_write(struct mtk_eth *eth, u32 phy_addr, u32 phy_reg, write_data &=0xffff ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | - (phy_reg <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ) | write_data, -MTK_PHY_IAC ); +if (phy_reg &MII_ADDR_C45 ) { +u8 dev_num = (phy_reg >>MII_DEVADDR_C45_SHIFT ) &GENMASK (4 ,0 ); +u16 reg = (u16)(phy_reg &MII_REGADDR_C45_MASK ); + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_SET_ADDR | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ) | + reg, +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return -EBUSY ; + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_WRITE | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ) | + write_data, +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | + (phy_reg <<PHY_IAC_REG_SHIFT ) | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | write_data, +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return -EBUSY ;
@@ -118,10 +138,29 @@ static int _mtk_mdio_read(struct mtk_eth *eth, u32 phy_addr, u32 phy_reg)if (mtk_mdio_busy_wait (eth))return -EBUSY ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_READ | - (phy_reg <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ), -MTK_PHY_IAC ); +if (phy_reg &MII_ADDR_C45 ) { +u8 dev_num = (phy_reg >>MII_DEVADDR_C45_SHIFT ) &GENMASK (4 ,0 ); +u16 reg = (u16)(phy_reg &MII_REGADDR_C45_MASK ); + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_SET_ADDR | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ) | + reg, +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return -EBUSY ; + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_READ_C45 | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (dev_num <<PHY_IAC_REG_SHIFT ), +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_READ | + (phy_reg <<PHY_IAC_REG_SHIFT ) | + (phy_addr <<PHY_IAC_ADDR_SHIFT ), +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return -EBUSY ;
@@ -493,6 +532,7 @@ static int mtk_mdio_init(struct mtk_eth *eth) eth->mii_bus->name ="mdio" ; eth->mii_bus->read = mtk_mdio_read; eth->mii_bus->write = mtk_mdio_write; + eth->mii_bus->probe_capabilities =MDIOBUS_C22_C45 ; eth->mii_bus->priv = eth; eth->mii_bus->parent = eth->dev;
drivers/net/ethernet/mediatek/mtk_eth_soc.h +3 -0
@@ -341,9 +341,12 @@/* PHY Indirect Access Control registers */ #define MTK_PHY_IAC 0x10004#define PHY_IAC_ACCESS BIT(31) +#define PHY_IAC_SET_ADDR 0#define PHY_IAC_READ BIT(19) +#define PHY_IAC_READ_C45 (BIT(18) | BIT(19))#define PHY_IAC_WRITE BIT(18)#define PHY_IAC_START BIT(16) +#define PHY_IAC_START_C45 0#define PHY_IAC_ADDR_SHIFT 20#define PHY_IAC_REG_SHIFT 25#define PHY_IAC_TIMEOUT HZ
Signature · 1 line
2.34.1
v7 cover net: ethernet: mtk_soc_eth: implement Clause 45 MDIO access
In reply to Russell King (Oracle)As it turned out some clean-up would be needed, first address return value and type of mdio read and write functions in mtk_eth_soc and generally clean up and unify both functions.
Then add support to access Clause 45 phy registers.
Both commits are tested on the Bananapi BPi-R64 board having MediaTek MT7531BE DSA gigE switch using clause 22 MDIO and Ubiquiti UniFi 6 LR access point having Aquantia AQR112C PHY using clause 45 MDIO.
v7: remove unneeded variables and order OR-ed call parameters
v6: further clean up functions and more cleanly separate patches
v5: fix wrong variable name in first patch covered by follow-up patch
v4: clean-up return values and types, split into two commits
v3: return -1 instead of 0xffff on error in _mtk_mdio_write
v2: use MII_DEVADDR_C45_SHIFT and MII_REGADDR_C45_MASK to extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
Daniel Golle (2):
net: ethernet: mtk_eth_soc: fix return value of MDIO ops
net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 75 +++++++++++++++------ drivers/net/ethernet/mediatek/mtk_eth_soc.h | 3 + 2 files changed, 58 insertions(+), 20 deletions(-)
Signature · 1 line
2.34.1
PATCH v7 1/2 net: ethernet: mtk_eth_soc: fix return value of MDIO ops
In reply to Russell King (Oracle)Instead of returning -1 (-EPERM) when MDIO bus is stuck busy while writing or 0xffff if it happens while reading, return the appropriate -EBUSY. Also fix return type to int instead of u32 and remove an unneeded variable.
---
v7: remove unneeded variable
v6: further clean up functions and more cleanly separate patches
v5: fix wrong variable name in first patch covered by follow-up patch
v4: clean-up return values and types, split into two commits
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 22 +++++++++------------ 1 file changed, 9 insertions(+), 13 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +9 -13
@@ -94,31 +94,29 @@ static int mtk_mdio_busy_wait(struct mtk_eth *eth)return -1 ; } -static u32 _mtk_mdio_write (struct mtk_eth *eth,u32 phy_addr, -u32 phy_register,u32 write_data) +static int _mtk_mdio_write (struct mtk_eth *eth,u32 phy_addr,u32 phy_reg, +u32 write_data) {if (mtk_mdio_busy_wait (eth)) -return -1 ; +return -EBUSY ; write_data &=0xffff ;mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | - (phy_register <<PHY_IAC_REG_SHIFT ) | + (phy_reg <<PHY_IAC_REG_SHIFT ) | (phy_addr <<PHY_IAC_ADDR_SHIFT ) | write_data,MTK_PHY_IAC );if (mtk_mdio_busy_wait (eth)) -return -1 ; +return -EBUSY ;return 0 ; } -static u32 _mtk_mdio_read (struct mtk_eth *eth,int phy_addr,int phy_reg) +static int _mtk_mdio_read (struct mtk_eth *eth,u32 phy_addr,u32 phy_reg) { -u32 d; -if (mtk_mdio_busy_wait (eth)) -return 0xffff ; +return -EBUSY ; mtk_w32(eth, PHY_IAC_ACCESS | PHY_IAC_START | PHY_IAC_READ | (phy_reg << PHY_IAC_REG_SHIFT) |
@@ -126,11 +124,9 @@ static u32 _mtk_mdio_read(struct mtk_eth *eth, int phy_addr, int phy_reg) MTK_PHY_IAC);if (mtk_mdio_busy_wait (eth)) -return 0xffff ; - - d =mtk_r32 (eth,MTK_PHY_IAC ) &0xffff ; +return -EBUSY ; -return d; +return mtk_r32 (eth,MTK_PHY_IAC ) &0xffff ; } static int mtk_mdio_write(struct mii_bus *bus, int phy_addr,
Signature · 1 line
2.34.1
PATCH v7 2/2 net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access
In reply to Russell King (Oracle)Implement read and write access to IEEE 802.3 Clause 45 Ethernet phy registers.
Tested on the Ubiquiti UniFi 6 LR access point featuring MediaTek MT7622BV WiSoC with Aquantia AQR112C.
v7: remove unneeded variables and order OR-ed call parameters
v6: further clean up functions and more cleanly separate patches
v5: fix wrong variable name in first patch covered by follow-up patch
v4: clean-up return values and types, split into two commits
v3: return -1 instead of 0xffff on error in _mtk_mdio_write
v2: use MII_DEVADDR_C45_SHIFT and MII_REGADDR_C45_MASK to extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 55 ++++++++++++++++++--- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 3 ++ 2 files changed, 50 insertions(+), 8 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +47 -8
@@ -102,10 +102,30 @@ static int _mtk_mdio_write(struct mtk_eth *eth, u32 phy_addr, u32 phy_reg, write_data &=0xffff ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | - (phy_reg <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ) | write_data, -MTK_PHY_IAC ); +if (phy_reg &MII_ADDR_C45 ) { +u8 dev_num = (phy_reg >>MII_DEVADDR_C45_SHIFT ) &GENMASK (4 ,0 ); + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_SET_ADDR | + (dev_num <<PHY_IAC_REG_SHIFT ) | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (phy_reg &MII_REGADDR_C45_MASK ), +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return -EBUSY ; + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_WRITE | + (dev_num <<PHY_IAC_REG_SHIFT ) | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + write_data, +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | + (phy_reg <<PHY_IAC_REG_SHIFT ) | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + write_data, +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return -EBUSY ;
@@ -118,10 +138,28 @@ static int _mtk_mdio_read(struct mtk_eth *eth, u32 phy_addr, u32 phy_reg)if (mtk_mdio_busy_wait (eth))return -EBUSY ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_READ | - (phy_reg <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ), -MTK_PHY_IAC ); +if (phy_reg &MII_ADDR_C45 ) { +u8 dev_num = (phy_reg >>MII_DEVADDR_C45_SHIFT ) &GENMASK (4 ,0 ); + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_SET_ADDR | + (dev_num <<PHY_IAC_REG_SHIFT ) | + (phy_addr <<PHY_IAC_ADDR_SHIFT ) | + (phy_reg &MII_REGADDR_C45_MASK ), +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return -EBUSY ; + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_READ_C45 | + (dev_num <<PHY_IAC_REG_SHIFT ) | + (phy_addr <<PHY_IAC_ADDR_SHIFT ), +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_READ | + (phy_reg <<PHY_IAC_REG_SHIFT ) | + (phy_addr <<PHY_IAC_ADDR_SHIFT ), +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return -EBUSY ;
@@ -493,6 +531,7 @@ static int mtk_mdio_init(struct mtk_eth *eth) eth->mii_bus->name ="mdio" ; eth->mii_bus->read = mtk_mdio_read; eth->mii_bus->write = mtk_mdio_write; + eth->mii_bus->probe_capabilities =MDIOBUS_C22_C45 ; eth->mii_bus->priv = eth; eth->mii_bus->parent = eth->dev;
drivers/net/ethernet/mediatek/mtk_eth_soc.h +3 -0
@@ -341,9 +341,12 @@/* PHY Indirect Access Control registers */ #define MTK_PHY_IAC 0x10004#define PHY_IAC_ACCESS BIT(31) +#define PHY_IAC_SET_ADDR 0#define PHY_IAC_READ BIT(19) +#define PHY_IAC_READ_C45 (BIT(18) | BIT(19))#define PHY_IAC_WRITE BIT(18)#define PHY_IAC_START BIT(16) +#define PHY_IAC_START_C45 0#define PHY_IAC_ADDR_SHIFT 20#define PHY_IAC_REG_SHIFT 25#define PHY_IAC_TIMEOUT HZ
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerRe: [PATCH v7 0/2] net: ethernet: mtk_soc_eth: implement Clause 45 MDIO access
In reply to Daniel GolleQuoted 9 lines · On Tue, 28 Dec 2021 01:10:21 +0000 Daniel Golle wrote:
As it turned out some clean-up would be needed, first address return value and type of mdio read and write functions in
mtk_eth_socand generally clean up and unify both functions.
Then add support to access Clause 45 phy registers.Both commits are tested on the Bananapi BPi-R64 board having MediaTek MT7531BE DSA gigE switch using clause 22 MDIO and Ubiquiti UniFi 6 LR access point having Aquantia AQR112C PHY using clause 45 MDIO.
Quoted 9 lines
v7: remove unneeded variables and order OR-ed call parameters
v6: further clean up functions and more cleanly separate patches
v5: fix wrong variable name in first patch covered by follow-up patch
v4: clean-up return values and types, split into two commits
v3: return -1 instead of0xffffon error in_mtk_mdio_write
v2: useMII_DEVADDR_C45_SHIFTandMII_REGADDR_C45_MASKto extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
Please stop reposting this series (1) so often; (2) as a flat response to an old version. You are completely confusing patch series detection, at least in patchwork.
Try git send-email and please allow at least 12 hours between postings for reviewers to comment.
Russell King (Oracle)
reviewerdrivers/net/ethernet/mediatek/mtk_eth_soc.h line 347
Quoted 12 lines · Daniel Golle
drivers/net/ethernet/mediatek/mtk_eth_soc.h +2
-0@@ -341,9 +341,12 @@/* PHY Indirect Access Control registers */ #define MTK_PHY_IAC 0x10004#define PHY_IAC_ACCESS BIT(31) +#define PHY_IAC_SET_ADDR 0#define PHY_IAC_READ BIT(19) +#define PHY_IAC_READ_C45 (BIT(18) | BIT(19))#define PHY_IAC_WRITE BIT(18)
You probably want at some point to clean the "operation code" (OP) definition up here. IEEE 802.3 defines this as a two bit field:
OP Clause 22 Clause 45
00 Undefined Address
01 Write Write
10 Read Post-read-increment-address
11 Undefined Read
What I'm getting at is, this isn't a couple of independent bits, and my feeling is that such fields should not be defined using BIT() unless they truely are independent bits.
Maybe:
#define PHY_IAC_OP(x) ((x) << 18)
#define PHY_IAC_OP_C45_ADDR PHY_IAC_OP(0)
#define PHY_IAC_OP_WRITE PHY_IAC_OP(1)
#define PHY_IAC_OP_C22_READ PHY_IAC_OP(2)
#define PHY_IAC_OP_C45_READ PHY_IAC_OP(3)
Or if you prefer GENMASK / FIELD_FIT way of doing things:
#define PHY_IAC_OP_MASK GENMASK(17, 16)
#define PHY_IAC_OP_C45_ADDR FIELD_FIT(PHY_IAC_OP_MASK, 0)
#define PHY_IAC_OP_WRITE FIELD_FIT(PHY_IAC_OP_MASK, 1)
#define PHY_IAC_OP_C22_READ FIELD_FIT(PHY_IAC_OP_MASK, 2)
#define PHY_IAC_OP_C45_READ FIELD_FIT(PHY_IAC_OP_MASK, 3)
I'm also wondering about the PHY_IAC_START* definitions. IEEE 802.3 gives us:
ST
00 Clause 45
01 Clause 22
I'm wondering whether bit 17 is part of the start field in your device, making bit 16 and 17 a two-bit field that defines the ST bits sent on the bus.
Also, as I mentioned previously, I would like to see helpers to extract the devad and regad fields, so here's a patch that adds a couple of helpers (but is completely untested!) If you update your patches to use this (please wait a bit longer before doing so in case there's other comments) you will need to include my patch along with your other two. Thanks.
8<====
From: "Russell King (Oracle)" <[email protected]>
Subject: [PATCH] net: mdio: add helpers to extract clause 45 regad and devad
fields
Add a couple of helpers and definitions to extract the clause 45 regad and devad fields from the regnum passed into MDIO drivers.
--- include/linux/mdio.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
include/linux/mdio.h +12 -0
@@ -7,6 +7,7 @@#define __LINUX_MDIO_H__#include <uapi/linux/mdio.h> +#include <linux/bitfield.h> #include <linux/mod_devicetable.h> /* Or MII_ADDR_C45 into regnum for read/write on mii_bus to enable the 21 bit
@@ -14,6 +15,7 @@*/ #define MII_ADDR_C45 (1<<30)#define MII_DEVADDR_C45_SHIFT 16 +#define MII_DEVADDR_C45_MASK GENMASK(20, 16)#define MII_REGADDR_C45_MASK GENMASK(15, 0)struct gpio_desc ;
@@ -385,6 +387,16 @@ static inline u32 mdiobus_c45_addr(int devad, u16 regnum)return MII_ADDR_C45 | devad <<MII_DEVADDR_C45_SHIFT | regnum; } +static inline u16 mdiobus_c45_regad (u32 regnum) +{ +return FIELD_GET (MII_REGADDR_C45_MASK , regnum); +} + +static inline u16 mdiobus_c45_devad (u32 regnum) +{ +return FIELD_GET (MII_DEVADDR_C45_MASK , regnum); +} +static inline int __mdiobus_c45_read (struct mii_bus *bus,int prtad,int devad,u16 regnum) {
Signature · 5 lines
2.30.2 -- RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
v8 cover net: ethernet: mtk_eth_soc: refactoring and Clause 45
As it turned out some clean-up would be needed, first address return value and type of mdio read and write functions in mtk_eth_soc and generally clean up and unify both functions.
Also refactor IAC register definitions to use bitfield helper macros to get rid of constants previously used as mask or shift values. Then add support to access Clause 45 phy registers, using the newly introcuced helper macros suggested by Russell King to access the Clause 45 device and register address encoded in the 32-bit parameter.
This series is tested on MediaTek MT7622AV based Bananapi BPi-R64 board having MediaTek MT7531BE DSA gigE switch using Clause 22 MDIO and MediaTek MT7622BV based Ubiquiti UniFi 6 LR access point having Aquantia AQR112C PHY using Clause 45 MDIO.
v8: add patch from Russel King, switch to bitfield helper macros
v7: remove unneeded variables and order OR-ed call parameters
v6: further clean up functions and more cleanly separate patches
v5: fix wrong variable name in first patch covered by follow-up patch
v4: clean-up return values and types, split into two commits
v3: return -1 instead of 0xffff on error in _mtk_mdio_write
v2: use MII_DEVADDR_C45_SHIFT and MII_REGADDR_C45_MASK to extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
Daniel Golle (2):
net: ethernet: mtk_eth_soc: fix return value and refactor MDIO ops
net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access
Russell King (Oracle) (1):
net: mdio: add helpers to extract clause 45 regad and devad fields
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 73 ++++++++++++++------- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 19 ++++-- include/linux/mdio.h | 12 ++++ 3 files changed, 77 insertions(+), 27 deletions(-)
Signature · 1 line
2.34.1
PATCH v8 1/3 net: mdio: add helpers to extract clause 45 regad and devad fields
In reply to Russell King (Oracle)From: "Russell King (Oracle)" <[email protected]>
Add a couple of helpers and definitions to extract the clause 45 regad and devad fields from the regnum passed into MDIO drivers.
---
v8: First inclusing upon comment on mailing list
include/linux/mdio.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
include/linux/mdio.h +12 -0
@@ -7,6 +7,7 @@#define __LINUX_MDIO_H__#include <uapi/linux/mdio.h> +#include <linux/bitfield.h> #include <linux/mod_devicetable.h> /* Or MII_ADDR_C45 into regnum for read/write on mii_bus to enable the 21 bit
@@ -14,6 +15,7 @@*/ #define MII_ADDR_C45 (1<<30)#define MII_DEVADDR_C45_SHIFT 16 +#define MII_DEVADDR_C45_MASK GENMASK(20, 16)#define MII_REGADDR_C45_MASK GENMASK(15, 0)struct gpio_desc ;
@@ -381,6 +383,16 @@ static inline u32 mdiobus_c45_addr(int devad, u16 regnum)return MII_ADDR_C45 | devad <<MII_DEVADDR_C45_SHIFT | regnum; } +static inline u16 mdiobus_c45_regad (u32 regnum) +{ +return FIELD_GET (MII_REGADDR_C45_MASK , regnum); +} + +static inline u16 mdiobus_c45_devad (u32 regnum) +{ +return FIELD_GET (MII_DEVADDR_C45_MASK , regnum); +} +static inline int __mdiobus_c45_read (struct mii_bus *bus,int prtad,int devad,u16 regnum) {
Signature · 1 line
2.34.1
PATCH v8 2/3 net: ethernet: mtk_eth_soc: fix return value and refactor MDIO ops
In reply to Russell King (Oracle)Instead of returning -1 (-EPERM) when MDIO bus is stuck busy while writing or 0xffff if it happens while reading, return the appropriate -EBUSY. Also fix return type to int instead of u32. Refactor functions to use bitfield helpers instead of having various masking and shifting constants in the code.
---
v8: switch to bitfield helper macros
v7: remove unneeded variables
v6: further clean up functions and more cleanly separate patches
v5: fix wrong variable name in first patch covered by follow-up patch
v4: clean-up return values and types, split into two commits
v3: return -1 instead of 0xffff on error in _mtk_mdio_write
v2: use MII_DEVADDR_C45_SHIFT and MII_REGADDR_C45_MASK to extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 35 +++++++++------------ drivers/net/ethernet/mediatek/mtk_eth_soc.h | 16 +++++++--- 2 files changed, 26 insertions(+), 25 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +15 -20
@@ -94,43 +94,38 @@ static int mtk_mdio_busy_wait(struct mtk_eth *eth)return -1 ; } -static u32 _mtk_mdio_write (struct mtk_eth *eth,u32 phy_addr, -u32 phy_register,u32 write_data) +static int _mtk_mdio_write (struct mtk_eth *eth,u32 phy_addr,u32 phy_reg, +u32 write_data) {if (mtk_mdio_busy_wait (eth)) -return -1 ; - - write_data &=0xffff ; +return -EBUSY ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | - (phy_register <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ) | write_data, +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C22 |PHY_IAC_CMD_WRITE | +PHY_IAC_REG (phy_reg) | +PHY_IAC_ADDR (phy_addr) | +PHY_IAC_DATA (write_data),MTK_PHY_IAC );if (mtk_mdio_busy_wait (eth)) -return -1 ; +return -EBUSY ;return 0 ; } -static u32 _mtk_mdio_read (struct mtk_eth *eth,int phy_addr,int phy_reg) +static int _mtk_mdio_read (struct mtk_eth *eth,u32 phy_addr,u32 phy_reg) { -u32 d; -if (mtk_mdio_busy_wait (eth)) -return 0xffff ; +return -EBUSY ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_READ | - (phy_reg <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ), +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C22 |PHY_IAC_CMD_C22_READ | +PHY_IAC_REG (phy_reg) | +PHY_IAC_ADDR (phy_addr),MTK_PHY_IAC );if (mtk_mdio_busy_wait (eth)) -return 0xffff ; - - d =mtk_r32 (eth,MTK_PHY_IAC ) &0xffff ; +return -EBUSY ; -return d; +return mtk_r32 (eth,MTK_PHY_IAC ) &PHY_IAC_DATA_MASK ; } static int mtk_mdio_write(struct mii_bus *bus, int phy_addr,
drivers/net/ethernet/mediatek/mtk_eth_soc.h +11 -5
@@ -341,11 +341,17 @@/* PHY Indirect Access Control registers */ #define MTK_PHY_IAC 0x10004#define PHY_IAC_ACCESS BIT(31) -#define PHY_IAC_READ BIT(19) -#define PHY_IAC_WRITE BIT(18) -#define PHY_IAC_START BIT(16) -#define PHY_IAC_ADDR_SHIFT 20 -#define PHY_IAC_REG_SHIFT 25 +#define PHY_IAC_REG_MASK GENMASK(29, 25) +#define PHY_IAC_REG (x) FIELD_PREP(PHY_IAC_REG_MASK, (x)) +#define PHY_IAC_ADDR_MASK GENMASK(24, 20) +#define PHY_IAC_ADDR (x) FIELD_PREP(PHY_IAC_ADDR_MASK, (x)) +#define PHY_IAC_CMD_MASK GENMASK(19, 18) +#define PHY_IAC_CMD_WRITE FIELD_PREP(PHY_IAC_CMD_MASK, 1) +#define PHY_IAC_CMD_C22_READ FIELD_PREP(PHY_IAC_CMD_MASK, 2) +#define PHY_IAC_START_MASK GENMASK(17, 16) +#define PHY_IAC_START_C22 FIELD_PREP(PHY_IAC_START_MASK, 1) +#define PHY_IAC_DATA_MASK GENMASK(15, 0) +#define PHY_IAC_DATA (x) FIELD_PREP(PHY_IAC_DATA_MASK, (x))#define PHY_IAC_TIMEOUT HZ#define MTK_MAC_MISC 0x1000c
Signature · 1 line
2.34.1
PATCH v8 3/3 net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access
In reply to Russell King (Oracle)Implement read and write access to IEEE 802.3 Clause 45 Ethernet phy registers while making use of new mdiobus_c45_regad and mdiobus_c45_devad helpers.
Improve readability by using bitfield helper macros which makes the register definitions in the header file resemble the exact values stated in the Reference Manual.
Tested on the Ubiquiti UniFi 6 LR access point featuring MediaTek MT7622BV WiSoC with Aquantia AQR112C.
---
v8: switch to bitfield helper macros, incl. newly introduced ones
v7: remove unneeded variables and order OR-ed call parameters
v6: further clean up functions and more cleanly separate patches
v5: fix wrong variable name in first patch covered by follow-up patch
v4: clean-up return values and types, split into two commits
v3: return -1 instead of 0xffff on error in _mtk_mdio_write
v2: use MII_DEVADDR_C45_SHIFT and MII_REGADDR_C45_MASK to extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 52 +++++++++++++++++---- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 3 ++ 2 files changed, 46 insertions(+), 9 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +43 -9
@@ -100,11 +100,28 @@ static int _mtk_mdio_write(struct mtk_eth *eth, u32 phy_addr, u32 phy_reg,if (mtk_mdio_busy_wait (eth))return -EBUSY ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C22 |PHY_IAC_CMD_WRITE | -PHY_IAC_REG (phy_reg) | -PHY_IAC_ADDR (phy_addr) | -PHY_IAC_DATA (write_data), -MTK_PHY_IAC ); +if (phy_reg &MII_ADDR_C45 ) { +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_CMD_C45_ADDR | +PHY_IAC_REG (mdiobus_c45_devad (phy_reg)) | +PHY_IAC_ADDR (phy_addr) | +PHY_IAC_DATA (mdiobus_c45_regad (phy_reg)), +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return -EBUSY ; + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_CMD_WRITE | +PHY_IAC_REG (mdiobus_c45_devad (phy_reg)) | +PHY_IAC_ADDR (phy_addr) | +PHY_IAC_DATA (write_data), +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C22 |PHY_IAC_CMD_WRITE | +PHY_IAC_REG (phy_reg) | +PHY_IAC_ADDR (phy_addr) | +PHY_IAC_DATA (write_data), +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return -EBUSY ;
@@ -117,10 +134,26 @@ static int _mtk_mdio_read(struct mtk_eth *eth, u32 phy_addr, u32 phy_reg)if (mtk_mdio_busy_wait (eth))return -EBUSY ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C22 |PHY_IAC_CMD_C22_READ | -PHY_IAC_REG (phy_reg) | -PHY_IAC_ADDR (phy_addr), -MTK_PHY_IAC ); +if (phy_reg &MII_ADDR_C45 ) { +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_CMD_C45_ADDR | +PHY_IAC_REG (mdiobus_c45_devad (phy_reg)) | +PHY_IAC_ADDR (phy_addr) | +PHY_IAC_DATA (mdiobus_c45_regad (phy_reg)), +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return -EBUSY ; + +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C45 |PHY_IAC_CMD_C45_READ | +PHY_IAC_REG (mdiobus_c45_devad (phy_reg)) | +PHY_IAC_ADDR (phy_addr), +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START_C22 |PHY_IAC_CMD_C22_READ | +PHY_IAC_REG (phy_reg) | +PHY_IAC_ADDR (phy_addr), +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return -EBUSY ;
@@ -492,6 +525,7 @@ static int mtk_mdio_init(struct mtk_eth *eth) eth->mii_bus->name ="mdio" ; eth->mii_bus->read = mtk_mdio_read; eth->mii_bus->write = mtk_mdio_write; + eth->mii_bus->probe_capabilities =MDIOBUS_C22_C45 ; eth->mii_bus->priv = eth; eth->mii_bus->parent = eth->dev;
drivers/net/ethernet/mediatek/mtk_eth_soc.h +3 -0
@@ -346,9 +346,12 @@#define PHY_IAC_ADDR_MASK GENMASK(24, 20)#define PHY_IAC_ADDR (x) FIELD_PREP(PHY_IAC_ADDR_MASK, (x))#define PHY_IAC_CMD_MASK GENMASK(19, 18) +#define PHY_IAC_CMD_C45_ADDR FIELD_PREP(PHY_IAC_CMD_MASK, 0)#define PHY_IAC_CMD_WRITE FIELD_PREP(PHY_IAC_CMD_MASK, 1)#define PHY_IAC_CMD_C22_READ FIELD_PREP(PHY_IAC_CMD_MASK, 2) +#define PHY_IAC_CMD_C45_READ FIELD_PREP(PHY_IAC_CMD_MASK, 3)#define PHY_IAC_START_MASK GENMASK(17, 16) +#define PHY_IAC_START_C45 FIELD_PREP(PHY_IAC_START_MASK, 0)#define PHY_IAC_START_C22 FIELD_PREP(PHY_IAC_START_MASK, 1)#define PHY_IAC_DATA_MASK GENMASK(15, 0)#define PHY_IAC_DATA (x) FIELD_PREP(PHY_IAC_DATA_MASK, (x))
Signature · 1 line
2.34.1
v9 cover net: ethernet: mtk_eth_soc: refactoring and Clause 45
In reply to Russell King (Oracle)Rework value and type of mdio read and write functions in mtk_eth_soc and generally clean up and unify both functions.
Then add support to access Clause 45 phy registers.
All three commits are tested on the Bananapi BPi-R64 board having MediaTek MT7531BE DSA gigE switch using clause 22 MDIO and Ubiquiti UniFi 6 LR access point having Aquantia AQR112C PHY using clause 45 MDIO.
v9: improved formatting and Cc missing maintainer
v8: add patch from Russel King, switch to bitfield helper macros
v7: remove unneeded variables and order OR-ed call parameters
v6: further clean up functions and more cleanly separate patches
v5: fix wrong variable name in first patch covered by follow-up patch
v4: clean-up return values and types, split into two commits
v3: return -1 instead of 0xffff on error in _mtk_mdio_write
v2: use MII_DEVADDR_C45_SHIFT and MII_REGADDR_C45_MASK to extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
Daniel Golle (2):
net: ethernet: mtk_eth_soc: fix return value and refactor MDIO ops
net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access
Russell King (Oracle) (1):
net: mdio: add helpers to extract clause 45 regad and devad fields
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 85 +++++++++++++++------ drivers/net/ethernet/mediatek/mtk_eth_soc.h | 19 +++-- include/linux/mdio.h | 12 +++ 3 files changed, 89 insertions(+), 27 deletions(-)
Signature · 1 line
2.34.1
PATCH v9 2/3 net: ethernet: mtk_eth_soc: fix return value and refactor MDIO ops
In reply to Russell King (Oracle)Instead of returning -1 (-EPERM) when MDIO bus is stuck busy while writing or 0xffff if it happens while reading, return the appropriate -EBUSY. Also fix return type to int instead of u32. Refactor functions to use bitfield helpers instead of having various masking and shifting constants in the code.
This allows the register definitions in the header file to closely resemble the values stated in the Reference Manual.
---
v9: improved formatting and Cc missing maintainer
v8: switch to bitfield helper macros
v7: remove unneeded variables
v6: further clean up functions and more cleanly separate patches
v5: fix wrong variable name in first patch covered by follow-up patch
v4: clean-up return values and types, split into two commits
v3: return -1 instead of 0xffff on error in _mtk_mdio_write
v2: use MII_DEVADDR_C45_SHIFT and MII_REGADDR_C45_MASK to extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 39 ++++++++++----------- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 16 ++++++--- 2 files changed, 30 insertions(+), 25 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +19 -20
@@ -94,43 +94,42 @@ static int mtk_mdio_busy_wait(struct mtk_eth *eth)return -1 ; } -static u32 _mtk_mdio_write (struct mtk_eth *eth,u32 phy_addr, -u32 phy_register,u32 write_data) +static int _mtk_mdio_write (struct mtk_eth *eth,u32 phy_addr,u32 phy_reg, +u32 write_data) {if (mtk_mdio_busy_wait (eth)) -return -1 ; - - write_data &=0xffff ; +return -EBUSY ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | - (phy_register <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ) | write_data, +mtk_w32 (eth,PHY_IAC_ACCESS | +PHY_IAC_START_C22 | +PHY_IAC_CMD_WRITE | +PHY_IAC_REG (phy_reg) | +PHY_IAC_ADDR (phy_addr) | +PHY_IAC_DATA (write_data),MTK_PHY_IAC );if (mtk_mdio_busy_wait (eth)) -return -1 ; +return -EBUSY ;return 0 ; } -static u32 _mtk_mdio_read (struct mtk_eth *eth,int phy_addr,int phy_reg) +static int _mtk_mdio_read (struct mtk_eth *eth,u32 phy_addr,u32 phy_reg) { -u32 d; -if (mtk_mdio_busy_wait (eth)) -return 0xffff ; +return -EBUSY ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_READ | - (phy_reg <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ), +mtk_w32 (eth,PHY_IAC_ACCESS | +PHY_IAC_START_C22 | +PHY_IAC_CMD_C22_READ | +PHY_IAC_REG (phy_reg) | +PHY_IAC_ADDR (phy_addr),MTK_PHY_IAC );if (mtk_mdio_busy_wait (eth)) -return 0xffff ; - - d =mtk_r32 (eth,MTK_PHY_IAC ) &0xffff ; +return -EBUSY ; -return d; +return mtk_r32 (eth,MTK_PHY_IAC ) &PHY_IAC_DATA_MASK ; } static int mtk_mdio_write(struct mii_bus *bus, int phy_addr,
drivers/net/ethernet/mediatek/mtk_eth_soc.h +11 -5
@@ -341,11 +341,17 @@/* PHY Indirect Access Control registers */ #define MTK_PHY_IAC 0x10004#define PHY_IAC_ACCESS BIT(31) -#define PHY_IAC_READ BIT(19) -#define PHY_IAC_WRITE BIT(18) -#define PHY_IAC_START BIT(16) -#define PHY_IAC_ADDR_SHIFT 20 -#define PHY_IAC_REG_SHIFT 25 +#define PHY_IAC_REG_MASK GENMASK(29, 25) +#define PHY_IAC_REG (x) FIELD_PREP(PHY_IAC_REG_MASK, (x)) +#define PHY_IAC_ADDR_MASK GENMASK(24, 20) +#define PHY_IAC_ADDR (x) FIELD_PREP(PHY_IAC_ADDR_MASK, (x)) +#define PHY_IAC_CMD_MASK GENMASK(19, 18) +#define PHY_IAC_CMD_WRITE FIELD_PREP(PHY_IAC_CMD_MASK, 1) +#define PHY_IAC_CMD_C22_READ FIELD_PREP(PHY_IAC_CMD_MASK, 2) +#define PHY_IAC_START_MASK GENMASK(17, 16) +#define PHY_IAC_START_C22 FIELD_PREP(PHY_IAC_START_MASK, 1) +#define PHY_IAC_DATA_MASK GENMASK(15, 0) +#define PHY_IAC_DATA (x) FIELD_PREP(PHY_IAC_DATA_MASK, (x))#define PHY_IAC_TIMEOUT HZ#define MTK_MAC_MISC 0x1000c
Signature · 1 line
2.34.1
PATCH v9 3/3 net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access
In reply to Russell King (Oracle)Implement read and write access to IEEE 802.3 Clause 45 Ethernet phy registers while making use of new mdiobus_c45_regad and mdiobus_c45_devad helpers.
Tested on the Ubiquiti UniFi 6 LR access point featuring MediaTek MT7622BV WiSoC with Aquantia AQR112C.
---
v9: improved formatting and Cc missing maintainer
v8: switch to bitfield helper macros, incl. newly introduced ones
v7: remove unneeded variables and order OR-ed call parameters
v6: further clean up functions and more cleanly separate patches
v5: fix wrong variable name in first patch covered by follow-up patch
v4: clean-up return values and types, split into two commits
v3: return -1 instead of 0xffff on error in _mtk_mdio_write
v2: use MII_DEVADDR_C45_SHIFT and MII_REGADDR_C45_MASK to extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 68 +++++++++++++++++---- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 3 + 2 files changed, 58 insertions(+), 13 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +55 -13
@@ -100,13 +100,34 @@ static int _mtk_mdio_write(struct mtk_eth *eth, u32 phy_addr, u32 phy_reg,if (mtk_mdio_busy_wait (eth))return -EBUSY ; -mtk_w32 (eth,PHY_IAC_ACCESS | -PHY_IAC_START_C22 | -PHY_IAC_CMD_WRITE | -PHY_IAC_REG (phy_reg) | -PHY_IAC_ADDR (phy_addr) | -PHY_IAC_DATA (write_data), -MTK_PHY_IAC ); +if (phy_reg &MII_ADDR_C45 ) { +mtk_w32 (eth,PHY_IAC_ACCESS | +PHY_IAC_START_C45 | +PHY_IAC_CMD_C45_ADDR | +PHY_IAC_REG (mdiobus_c45_devad (phy_reg)) | +PHY_IAC_ADDR (phy_addr) | +PHY_IAC_DATA (mdiobus_c45_regad (phy_reg)), +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return -EBUSY ; + +mtk_w32 (eth,PHY_IAC_ACCESS | +PHY_IAC_START_C45 | +PHY_IAC_CMD_WRITE | +PHY_IAC_REG (mdiobus_c45_devad (phy_reg)) | +PHY_IAC_ADDR (phy_addr) | +PHY_IAC_DATA (write_data), +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS | +PHY_IAC_START_C22 | +PHY_IAC_CMD_WRITE | +PHY_IAC_REG (phy_reg) | +PHY_IAC_ADDR (phy_addr) | +PHY_IAC_DATA (write_data), +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return -EBUSY ;
@@ -119,12 +140,32 @@ static int _mtk_mdio_read(struct mtk_eth *eth, u32 phy_addr, u32 phy_reg)if (mtk_mdio_busy_wait (eth))return -EBUSY ; -mtk_w32 (eth,PHY_IAC_ACCESS | -PHY_IAC_START_C22 | -PHY_IAC_CMD_C22_READ | -PHY_IAC_REG (phy_reg) | -PHY_IAC_ADDR (phy_addr), -MTK_PHY_IAC ); +if (phy_reg &MII_ADDR_C45 ) { +mtk_w32 (eth,PHY_IAC_ACCESS | +PHY_IAC_START_C45 | +PHY_IAC_CMD_C45_ADDR | +PHY_IAC_REG (mdiobus_c45_devad (phy_reg)) | +PHY_IAC_ADDR (phy_addr) | +PHY_IAC_DATA (mdiobus_c45_regad (phy_reg)), +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return -EBUSY ; + +mtk_w32 (eth,PHY_IAC_ACCESS | +PHY_IAC_START_C45 | +PHY_IAC_CMD_C45_READ | +PHY_IAC_REG (mdiobus_c45_devad (phy_reg)) | +PHY_IAC_ADDR (phy_addr), +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS | +PHY_IAC_START_C22 | +PHY_IAC_CMD_C22_READ | +PHY_IAC_REG (phy_reg) | +PHY_IAC_ADDR (phy_addr), +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return -EBUSY ;
@@ -496,6 +537,7 @@ static int mtk_mdio_init(struct mtk_eth *eth) eth->mii_bus->name ="mdio" ; eth->mii_bus->read = mtk_mdio_read; eth->mii_bus->write = mtk_mdio_write; + eth->mii_bus->probe_capabilities =MDIOBUS_C22_C45 ; eth->mii_bus->priv = eth; eth->mii_bus->parent = eth->dev;
drivers/net/ethernet/mediatek/mtk_eth_soc.h +3 -0
@@ -346,9 +346,12 @@#define PHY_IAC_ADDR_MASK GENMASK(24, 20)#define PHY_IAC_ADDR (x) FIELD_PREP(PHY_IAC_ADDR_MASK, (x))#define PHY_IAC_CMD_MASK GENMASK(19, 18) +#define PHY_IAC_CMD_C45_ADDR FIELD_PREP(PHY_IAC_CMD_MASK, 0)#define PHY_IAC_CMD_WRITE FIELD_PREP(PHY_IAC_CMD_MASK, 1)#define PHY_IAC_CMD_C22_READ FIELD_PREP(PHY_IAC_CMD_MASK, 2) +#define PHY_IAC_CMD_C45_READ FIELD_PREP(PHY_IAC_CMD_MASK, 3)#define PHY_IAC_START_MASK GENMASK(17, 16) +#define PHY_IAC_START_C45 FIELD_PREP(PHY_IAC_START_MASK, 0)#define PHY_IAC_START_C22 FIELD_PREP(PHY_IAC_START_MASK, 1)#define PHY_IAC_DATA_MASK GENMASK(15, 0)#define PHY_IAC_DATA (x) FIELD_PREP(PHY_IAC_DATA_MASK, (x))
Signature · 1 line
2.34.1
PATCH v9 1/3 net: mdio: add helpers to extract clause 45 regad and devad fields
In reply to Russell King (Oracle)From: "Russell King (Oracle)" <[email protected]>
Add a couple of helpers and definitions to extract the clause 45 regad and devad fields from the regnum passed into MDIO drivers.
---
v9: unchanged
v8: First inclusing upon comment on mailing list
include/linux/mdio.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
include/linux/mdio.h +12 -0
@@ -7,6 +7,7 @@#define __LINUX_MDIO_H__#include <uapi/linux/mdio.h> +#include <linux/bitfield.h> #include <linux/mod_devicetable.h> /* Or MII_ADDR_C45 into regnum for read/write on mii_bus to enable the 21 bit
@@ -14,6 +15,7 @@*/ #define MII_ADDR_C45 (1<<30)#define MII_DEVADDR_C45_SHIFT 16 +#define MII_DEVADDR_C45_MASK GENMASK(20, 16)#define MII_REGADDR_C45_MASK GENMASK(15, 0)struct gpio_desc ;
@@ -381,6 +383,16 @@ static inline u32 mdiobus_c45_addr(int devad, u16 regnum)return MII_ADDR_C45 | devad <<MII_DEVADDR_C45_SHIFT | regnum; } +static inline u16 mdiobus_c45_regad (u32 regnum) +{ +return FIELD_GET (MII_REGADDR_C45_MASK , regnum); +} + +static inline u16 mdiobus_c45_devad (u32 regnum) +{ +return FIELD_GET (MII_DEVADDR_C45_MASK , regnum); +} +static inline int __mdiobus_c45_read (struct mii_bus *bus,int prtad,int devad,u16 regnum) {
Signature · 1 line
2.34.1
Andrew Lunn
maintainerRe: [PATCH v9 1/3] net: mdio: add helpers to extract clause 45 regad and devad fields
In reply to a message not in the archiveQuoted 4 lines · Russell King (Oracle)
Add a couple of helpers and definitions to extract the clause 45 regad and devad fields from the regnum passed into MDIO drivers.
Signed-off-by Russell King (Oracle) <[email protected]>
This email has me confused. It seems to be coming directly from Russell, but is part of a patchset? Then there is a second 1/3 later in the patchset?
Andrew
Andrew Lunn
maintainerRe: [PATCH v9 1/3] net: mdio: add helpers to extract clause 45 regad and devad fields
In reply to Daniel GolleQuoted 8 lines · Daniel Golle
From: "Russell King (Oracle)" <[email protected]>
Add a couple of helpers and definitions to extract the clause 45 regad and devad fields from the regnum passed into MDIO drivers.
Tested-by Daniel Golle <[email protected]>Signed-off-by Daniel Golle <[email protected]>Signed-off-by Russell King (Oracle) <[email protected]>
Hi Daniel
Since you are submitted this, your Signed-off-by: needs to be last.
Andrew
Re: [PATCH v9 1/3] net: mdio: add helpers to extract clause 45 regad and devad fields
In reply to Andrew LunnQuoted 9 lines · Andrew Lunn
Quoted 4 lines · Russell King (Oracle)
Add a couple of helpers and definitions to extract the clause 45 regad and devad fields from the regnum passed into MDIO drivers.
Signed-off-by Russell King (Oracle) <[email protected]>This email has me confused. It seems to be coming directly from Russell, but is part of a patchset? Then there is a second 1/3 later in the patchset?
That happened by accident when using git-send-email and hence the first time it was sent with Russell's From: in the RFC822 headers it was (rightly) rejected.
I noticed that shortly after and resend the patch with my sender address set as From: in the RFC822 headers and Russell's From: in the mail body for only git, and not mailservers, to care about.
Sorry for that additional noise.
v10 cover net: ethernet: mtk_eth_soc: refactoring and Clause 45
In reply to Andrew LunnRework value and type of mdio read and write functions in mtk_eth_soc and generally clean up and unify both functions.
Then add support to access Clause 45 phy registers, using newly introduced helper macros added by a patch Russell King has suggested in a reply to an earlier version of this series [1].
All three commits are tested on the Bananapi BPi-R64 board having MediaTek MT7531BE DSA gigE switch using clause 22 MDIO and Ubiquiti UniFi 6 LR access point having Aquantia AQR112C PHY using clause 45 MDIO.
[1]: https://lore.kernel.org/netdev/[email protected]/
v10: correct order of SoB lines in 2/3, change patch order in series
v9: improved formatting and Cc missing maintainer
v8: add patch from Russel King, switch to bitfield helper macros
v7: remove unneeded variables and order OR-ed call parameters
v6: further clean up functions and more cleanly separate patches
v5: fix wrong variable name in first patch covered by follow-up patch
v4: clean-up return values and types, split into two commits
v3: return -1 instead of 0xffff on error in _mtk_mdio_write
v2: use MII_DEVADDR_C45_SHIFT and MII_REGADDR_C45_MASK to extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
Daniel Golle (2):
net: ethernet: mtk_eth_soc: fix return value and refactor MDIO ops
net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access
Russell King (Oracle) (1):
net: mdio: add helpers to extract clause 45 regad and devad fields
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 85 +++++++++++++++------ drivers/net/ethernet/mediatek/mtk_eth_soc.h | 19 +++-- include/linux/mdio.h | 12 +++ 3 files changed, 89 insertions(+), 27 deletions(-)
Signature · 7 lines
2.34.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v10 1/3 net: ethernet: mtk_eth_soc: fix return value and refactor MDIO ops
In reply to Andrew LunnInstead of returning -1 (-EPERM) when MDIO bus is stuck busy while writing or 0xffff if it happens while reading, return the appropriate -EBUSY. Also fix return type to int instead of u32. Refactor functions to use bitfield helpers instead of having various masking and shifting constants in the code.
---
v10: unchanged
v9: improved formatting and Cc missing maintainer
v8: switch to bitfield helper macros
v7: remove unneeded variables
v6: further clean up functions and more cleanly separate patches
v5: fix wrong variable name in first patch covered by follow-up patch
v4: clean-up return values and types, split into two commits
v3: return -1 instead of 0xffff on error in _mtk_mdio_write
v2: use MII_DEVADDR_C45_SHIFT and MII_REGADDR_C45_MASK to extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 39 ++++++++++----------- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 16 ++++++--- 2 files changed, 30 insertions(+), 25 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +19 -20
@@ -94,43 +94,42 @@ static int mtk_mdio_busy_wait(struct mtk_eth *eth)return -1 ; } -static u32 _mtk_mdio_write (struct mtk_eth *eth,u32 phy_addr, -u32 phy_register,u32 write_data) +static int _mtk_mdio_write (struct mtk_eth *eth,u32 phy_addr,u32 phy_reg, +u32 write_data) {if (mtk_mdio_busy_wait (eth)) -return -1 ; - - write_data &=0xffff ; +return -EBUSY ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_WRITE | - (phy_register <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ) | write_data, +mtk_w32 (eth,PHY_IAC_ACCESS | +PHY_IAC_START_C22 | +PHY_IAC_CMD_WRITE | +PHY_IAC_REG (phy_reg) | +PHY_IAC_ADDR (phy_addr) | +PHY_IAC_DATA (write_data),MTK_PHY_IAC );if (mtk_mdio_busy_wait (eth)) -return -1 ; +return -EBUSY ;return 0 ; } -static u32 _mtk_mdio_read (struct mtk_eth *eth,int phy_addr,int phy_reg) +static int _mtk_mdio_read (struct mtk_eth *eth,u32 phy_addr,u32 phy_reg) { -u32 d; -if (mtk_mdio_busy_wait (eth)) -return 0xffff ; +return -EBUSY ; -mtk_w32 (eth,PHY_IAC_ACCESS |PHY_IAC_START |PHY_IAC_READ | - (phy_reg <<PHY_IAC_REG_SHIFT ) | - (phy_addr <<PHY_IAC_ADDR_SHIFT ), +mtk_w32 (eth,PHY_IAC_ACCESS | +PHY_IAC_START_C22 | +PHY_IAC_CMD_C22_READ | +PHY_IAC_REG (phy_reg) | +PHY_IAC_ADDR (phy_addr),MTK_PHY_IAC );if (mtk_mdio_busy_wait (eth)) -return 0xffff ; - - d =mtk_r32 (eth,MTK_PHY_IAC ) &0xffff ; +return -EBUSY ; -return d; +return mtk_r32 (eth,MTK_PHY_IAC ) &PHY_IAC_DATA_MASK ; } static int mtk_mdio_write(struct mii_bus *bus, int phy_addr,
drivers/net/ethernet/mediatek/mtk_eth_soc.h +11 -5
@@ -341,11 +341,17 @@/* PHY Indirect Access Control registers */ #define MTK_PHY_IAC 0x10004#define PHY_IAC_ACCESS BIT(31) -#define PHY_IAC_READ BIT(19) -#define PHY_IAC_WRITE BIT(18) -#define PHY_IAC_START BIT(16) -#define PHY_IAC_ADDR_SHIFT 20 -#define PHY_IAC_REG_SHIFT 25 +#define PHY_IAC_REG_MASK GENMASK(29, 25) +#define PHY_IAC_REG (x) FIELD_PREP(PHY_IAC_REG_MASK, (x)) +#define PHY_IAC_ADDR_MASK GENMASK(24, 20) +#define PHY_IAC_ADDR (x) FIELD_PREP(PHY_IAC_ADDR_MASK, (x)) +#define PHY_IAC_CMD_MASK GENMASK(19, 18) +#define PHY_IAC_CMD_WRITE FIELD_PREP(PHY_IAC_CMD_MASK, 1) +#define PHY_IAC_CMD_C22_READ FIELD_PREP(PHY_IAC_CMD_MASK, 2) +#define PHY_IAC_START_MASK GENMASK(17, 16) +#define PHY_IAC_START_C22 FIELD_PREP(PHY_IAC_START_MASK, 1) +#define PHY_IAC_DATA_MASK GENMASK(15, 0) +#define PHY_IAC_DATA (x) FIELD_PREP(PHY_IAC_DATA_MASK, (x))#define PHY_IAC_TIMEOUT HZ#define MTK_MAC_MISC 0x1000c
Signature · 1 line
2.34.1
PATCH v10 2/3 net: mdio: add helpers to extract clause 45 regad and devad fields
In reply to Andrew LunnFrom: "Russell King (Oracle)" <[email protected]>
Add a couple of helpers and definitions to extract the clause 45 regad and devad fields from the regnum passed into MDIO drivers.
---
v10: correct order of SoB lines
v9: unchanged
v8: First inclusing upon comment on mailing list
include/linux/mdio.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
include/linux/mdio.h +12 -0
@@ -7,6 +7,7 @@#define __LINUX_MDIO_H__#include <uapi/linux/mdio.h> +#include <linux/bitfield.h> #include <linux/mod_devicetable.h> /* Or MII_ADDR_C45 into regnum for read/write on mii_bus to enable the 21 bit
@@ -14,6 +15,7 @@*/ #define MII_ADDR_C45 (1<<30)#define MII_DEVADDR_C45_SHIFT 16 +#define MII_DEVADDR_C45_MASK GENMASK(20, 16)#define MII_REGADDR_C45_MASK GENMASK(15, 0)struct gpio_desc ;
@@ -381,6 +383,16 @@ static inline u32 mdiobus_c45_addr(int devad, u16 regnum)return MII_ADDR_C45 | devad <<MII_DEVADDR_C45_SHIFT | regnum; } +static inline u16 mdiobus_c45_regad (u32 regnum) +{ +return FIELD_GET (MII_REGADDR_C45_MASK , regnum); +} + +static inline u16 mdiobus_c45_devad (u32 regnum) +{ +return FIELD_GET (MII_DEVADDR_C45_MASK , regnum); +} +static inline int __mdiobus_c45_read (struct mii_bus *bus,int prtad,int devad,u16 regnum) {
Signature · 1 line
2.34.1
PATCH v10 3/3 net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access
In reply to Andrew LunnImplement read and write access to IEEE 802.3 Clause 45 Ethernet phy registers while making use of new mdiobus_c45_regad and mdiobus_c45_devad helpers.
Improve readability by using bitfield helper macros which makes the register definitions in the header file resemble the exact values stated in the Reference Manual.
Tested on the Ubiquiti UniFi 6 LR access point featuring MediaTek MT7622BV WiSoC with Aquantia AQR112C.
---
v10: unchanged
v9: improved formatting and Cc missing maintainer
v8: switch to bitfield helper macros, incl. newly introduced ones
v7: remove unneeded variables and order OR-ed call parameters
v6: further clean up functions and more cleanly separate patches
v5: fix wrong variable name in first patch covered by follow-up patch
v4: clean-up return values and types, split into two commits
v3: return -1 instead of 0xffff on error in _mtk_mdio_write
v2: use MII_DEVADDR_C45_SHIFT and MII_REGADDR_C45_MASK to extract
device id and register address. Unify read and write functions to have identical types and parameter names where possible as we are anyway already replacing both function bodies.
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 68 +++++++++++++++++---- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 3 + 2 files changed, 58 insertions(+), 13 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +55 -13
@@ -100,13 +100,34 @@ static int _mtk_mdio_write(struct mtk_eth *eth, u32 phy_addr, u32 phy_reg,if (mtk_mdio_busy_wait (eth))return -EBUSY ; -mtk_w32 (eth,PHY_IAC_ACCESS | -PHY_IAC_START_C22 | -PHY_IAC_CMD_WRITE | -PHY_IAC_REG (phy_reg) | -PHY_IAC_ADDR (phy_addr) | -PHY_IAC_DATA (write_data), -MTK_PHY_IAC ); +if (phy_reg &MII_ADDR_C45 ) { +mtk_w32 (eth,PHY_IAC_ACCESS | +PHY_IAC_START_C45 | +PHY_IAC_CMD_C45_ADDR | +PHY_IAC_REG (mdiobus_c45_devad (phy_reg)) | +PHY_IAC_ADDR (phy_addr) | +PHY_IAC_DATA (mdiobus_c45_regad (phy_reg)), +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return -EBUSY ; + +mtk_w32 (eth,PHY_IAC_ACCESS | +PHY_IAC_START_C45 | +PHY_IAC_CMD_WRITE | +PHY_IAC_REG (mdiobus_c45_devad (phy_reg)) | +PHY_IAC_ADDR (phy_addr) | +PHY_IAC_DATA (write_data), +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS | +PHY_IAC_START_C22 | +PHY_IAC_CMD_WRITE | +PHY_IAC_REG (phy_reg) | +PHY_IAC_ADDR (phy_addr) | +PHY_IAC_DATA (write_data), +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return -EBUSY ;
@@ -119,12 +140,32 @@ static int _mtk_mdio_read(struct mtk_eth *eth, u32 phy_addr, u32 phy_reg)if (mtk_mdio_busy_wait (eth))return -EBUSY ; -mtk_w32 (eth,PHY_IAC_ACCESS | -PHY_IAC_START_C22 | -PHY_IAC_CMD_C22_READ | -PHY_IAC_REG (phy_reg) | -PHY_IAC_ADDR (phy_addr), -MTK_PHY_IAC ); +if (phy_reg &MII_ADDR_C45 ) { +mtk_w32 (eth,PHY_IAC_ACCESS | +PHY_IAC_START_C45 | +PHY_IAC_CMD_C45_ADDR | +PHY_IAC_REG (mdiobus_c45_devad (phy_reg)) | +PHY_IAC_ADDR (phy_addr) | +PHY_IAC_DATA (mdiobus_c45_regad (phy_reg)), +MTK_PHY_IAC ); + +if (mtk_mdio_busy_wait (eth)) +return -EBUSY ; + +mtk_w32 (eth,PHY_IAC_ACCESS | +PHY_IAC_START_C45 | +PHY_IAC_CMD_C45_READ | +PHY_IAC_REG (mdiobus_c45_devad (phy_reg)) | +PHY_IAC_ADDR (phy_addr), +MTK_PHY_IAC ); + }else { +mtk_w32 (eth,PHY_IAC_ACCESS | +PHY_IAC_START_C22 | +PHY_IAC_CMD_C22_READ | +PHY_IAC_REG (phy_reg) | +PHY_IAC_ADDR (phy_addr), +MTK_PHY_IAC ); + }if (mtk_mdio_busy_wait (eth))return -EBUSY ;
@@ -496,6 +537,7 @@ static int mtk_mdio_init(struct mtk_eth *eth) eth->mii_bus->name ="mdio" ; eth->mii_bus->read = mtk_mdio_read; eth->mii_bus->write = mtk_mdio_write; + eth->mii_bus->probe_capabilities =MDIOBUS_C22_C45 ; eth->mii_bus->priv = eth; eth->mii_bus->parent = eth->dev;
drivers/net/ethernet/mediatek/mtk_eth_soc.h +3 -0
@@ -346,9 +346,12 @@#define PHY_IAC_ADDR_MASK GENMASK(24, 20)#define PHY_IAC_ADDR (x) FIELD_PREP(PHY_IAC_ADDR_MASK, (x))#define PHY_IAC_CMD_MASK GENMASK(19, 18) +#define PHY_IAC_CMD_C45_ADDR FIELD_PREP(PHY_IAC_CMD_MASK, 0)#define PHY_IAC_CMD_WRITE FIELD_PREP(PHY_IAC_CMD_MASK, 1)#define PHY_IAC_CMD_C22_READ FIELD_PREP(PHY_IAC_CMD_MASK, 2) +#define PHY_IAC_CMD_C45_READ FIELD_PREP(PHY_IAC_CMD_MASK, 3)#define PHY_IAC_START_MASK GENMASK(17, 16) +#define PHY_IAC_START_C45 FIELD_PREP(PHY_IAC_START_MASK, 0)#define PHY_IAC_START_C22 FIELD_PREP(PHY_IAC_START_MASK, 1)#define PHY_IAC_DATA_MASK GENMASK(15, 0)#define PHY_IAC_DATA (x) FIELD_PREP(PHY_IAC_DATA_MASK, (x))
Signature · 1 line
2.34.1
Russell King (Oracle)
reviewerRe: [PATCH v10 0/3] net: ethernet: mtk_eth_soc: refactoring and Clause 45
In reply to Daniel GolleQuoted 5 lines · Daniel Golle
Rework value and type of mdio read and write functions in
mtk_eth_socand generally clean up and unify both functions.
Then add support to access Clause 45 phy registers, using newly introduced helper macros added by a patch Russell King has suggested in a reply to an earlier version of this series [1].
Can you please stop threading each re-post to the previous posting of the series. It's getting rather annoying after ten iterations to have the subject lines disappearing off the right hand side of the field. This is not a request to re-post, it is a request for the next posting.
Thanks.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
Andrew Lunn
maintainerRe: [PATCH v10 1/3] net: ethernet: mtk_eth_soc: fix return value and refactor MDIO ops
In reply to Daniel Golle> +static int _mtk_mdio_write(struct mtk_eth *eth, u32 phy_addr, u32 phy_reg,
drivers/net/ethernet/mediatek/mtk_eth_soc.c static int mtk_mdio_busy_wait(struct mtk_eth *eth) · line 101
Quoted 7 lines
drivers/net/ethernet/mediatek/mtk_eth_soc.c +2
-3+ u32 write_data) {if (mtk_mdio_busy_wait (eth)) -return -1 ; - - write_data &=0xffff ; +return -EBUSY ;
-ETIMEDOUT would be more normal.
I would probably also change mtk_mdio_busy_wait() so that it either returned 0, or -ETIMEDOUT. That is the general pattern in Linux, return 0 on success, or a negative error code. Returning -1 is an invitation for trouble.
The code would then become
ret = mtk_mdio_busy_wait(eth);
if (ret < 0)
return ret;which is a very common pattern in Linux.
Andrew
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: [PATCH v10 2/3] net: mdio: add helpers to extract clause 45 regad and devad fields
In reply to Daniel GolleQuoted 8 lines · Daniel Golle
From: "Russell King (Oracle)" <[email protected]>
Add a couple of helpers and definitions to extract the clause 45 regad and devad fields from the regnum passed into MDIO drivers.
Tested-by Daniel Golle <[email protected]>Signed-off-by Russell King (Oracle) <[email protected]>Signed-off-by Daniel Golle <[email protected]>
Andrew