phy: atheros: dt bindings and cleanup
Subsystems (3)
v2 cover phy: atheros: dt bindings and cleanup
[RESEND because I've forgot to add the mailinglist. Sorry!]
This patch series superseeds the following two:
From Vladimir Oltean
https://patchwork.ozlabs.org/cover/1031360/
From me:
https://patchwork.ozlabs.org/cover/1184507/
Although the first is marked as accepted into u-boot-net I guess it was removed due to broken boards ("DT as ABI", RGMII delay was fixed and thus breaks the board).
After disussing with Vladimir, I've integrated his patches with this series. Also the first one
Address packet drops at low traffic rate due to SmartEEE feature
was dropped because it will likely be fixed by making u-boot support the eee-broken-X device tree properties. Apart from that, only the subject was changed and a note about possible board breakage was added the patch which changes the delay behaviour.
For all of those, who will test this patchset, the device tree binding needs the phydev->node property, which needs to be set in every network driver. If the device tree binding is not working for you have a look at the
ar803x_of_init: found PHY node: phy at 0
output. In the case above "phy at 0" is the phy node in the device tree. If instead the node of your network device is displayed, you have to set the phydev->node property in your network device driver.
For the fsl_enetc driver this patchset will add it:
https://patchwork.ozlabs.org/cover/1188043/
changes since v1:
- pull all Vladimirs Oltan's patches and rebase mine onto them
- fix the CLK_25M settings for the AR8035
- add two new patches "fix AR8021 PHY ID mask" and "use defines for PHY IDs"
- use the new kernel device tree binding for the AR803x PHYs:
https://patchwork.ozlabs.org/patch/1188293/
- add debugging output
Michael Walle (7):
phy: atheros: fix AR8021 PHY ID mask
phy: atheros: use defines for PHY IDs
phy: atheros: introduce debug read and write functions
phy: atheros: move delay config to common function
phy: atheros: add device tree bindings and config
phy: atheros: ar8035: remove static clock config
phy: atheros: consolidate {ar8031|ar8035}_config()
Vladimir Oltean (5):
phy: atheros: Make RGMII Tx delays actually configurable for AR8035
phy: atheros: Use common functions for RGMII internal delays
phy: atheros: Clarify the configuration of the CLK_25M output pin
phy: atheros: Explicitly disable RGMII delays
phy: atheros: Clarify the intention of ar8021_config
doc/device-tree-bindings/net/phy/atheros.txt | 35 ++ drivers/net/phy/atheros.c | 349 ++++++++++++++++--- include/dt-bindings/net/qca-ar803x.h | 13 + 3 files changed, 344 insertions(+), 53 deletions(-) create mode 100644 doc/device-tree-bindings/net/phy/atheros.txt create mode 100644 include/dt-bindings/net/qca-ar803x.h
Signature · 1 line
2.20.1
PATCH v2 1/12 phy: atheros: Make RGMII Tx delays actually configurable for AR8035
From: Vladimir Oltean <[email protected]>
Delete the extraneous write to debug reg 5 that enables Tx delay
When the driver was originally introduced in commit "6027384a phylib:
Add Atheros AR8035 GETH PHY support", the Tx delay was being unconditionally enabled.
Then during "2ec4d10b phy: atheros: add support for RGMII_ID, RGMII_TXID and RGMII_RXID", the author did not notice that code for enabling Tx delay code was already. Therefore, the if condition for Tx delay has always been useless for this PHY since this commit introduced it.
Prior to this patch, every AR8035 PHY in U-boot had Tx delay enabled. After this patch, only those who define the interface as RGMII_TXID or RGMII_ID will. This is to be expected, but will nonetheless break the setups of those who didn't know they rely on Tx delay implicitly.
--- drivers/net/phy/atheros.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/net/phy/atheros.c +0 -4
@@ -63,10 +63,6 @@ static int ar8035_config(struct phy_device *phydev) regval =phy_read (phydev,MDIO_DEVAD_NONE ,0xe );phy_write (phydev,MDIO_DEVAD_NONE ,0xe , (regval|0x0018 )); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1d ,0x05 ); - regval =phy_read (phydev,MDIO_DEVAD_NONE ,0x1e ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1e , (regval|0x0100 )); -if ((phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID ) || (phydev->interface ==PHY_INTERFACE_MODE_RGMII_TXID )) {/* select debug reg 5 */
Signature · 1 line
2.20.1
PATCH v2 2/12 phy: atheros: Use common functions for RGMII internal delays
In reply to Michael WalleFrom: Vladimir Oltean <[email protected]>
--- drivers/net/phy/atheros.c | 69 +++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 28 deletions(-)
drivers/net/phy/atheros.c +41 -28
@@ -12,16 +12,45 @@#define AR803x_PHY_DEBUG_DATA_REG 0x1e#define AR803x_DEBUG_REG_5 0x5 -#define AR803x_RGMII_TX_CLK_DLY 0x100 +#define AR803x_RGMII_TX_CLK_DLY BIT(8)#define AR803x_DEBUG_REG_0 0x0 -#define AR803x_RGMII_RX_CLK_DLY 0x8000 +#define AR803x_RGMII_RX_CLK_DLY BIT(15) + +static void ar803x_enable_rx_delay (struct phy_device *phydev,bool on) +{ +int regval; + +phy_write (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_ADDR_REG, + AR803x_DEBUG_REG_0); + regval =phy_read (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_DATA_REG); +if (on) + regval |= AR803x_RGMII_RX_CLK_DLY; +else + regval &= ~AR803x_RGMII_RX_CLK_DLY; +phy_write (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_DATA_REG, regval); +} + +static void ar803x_enable_tx_delay (struct phy_device *phydev,bool on) +{ +int regval; + +phy_write (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_ADDR_REG, + AR803x_DEBUG_REG_5); + regval =phy_read (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_DATA_REG); +if (on) + regval |= AR803x_RGMII_TX_CLK_DLY; +else + regval &= ~AR803x_RGMII_TX_CLK_DLY; +phy_write (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_DATA_REG, regval); +}static int ar8021_config (struct phy_device *phydev) {phy_write (phydev,MDIO_DEVAD_NONE ,0x00 ,0x1200 ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1d ,0x05 ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1e ,0x3D47 ); +phy_write (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_ADDR_REG, + AR803x_DEBUG_REG_5); +phy_write (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_DATA_REG,0x3D47 ); phydev->supported = phydev->drv->features;return 0 ;
@@ -30,20 +59,12 @@ static int ar8021_config(struct phy_device *phydev)static int ar8031_config (struct phy_device *phydev) {if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_TXID || - phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID ) { -phy_write (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_ADDR_REG, - AR803x_DEBUG_REG_5); -phy_write (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_DATA_REG, - AR803x_RGMII_TX_CLK_DLY); - } + phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID ) +ar803x_enable_tx_delay (phydev, true);if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_RXID || - phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID ) { -phy_write (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_ADDR_REG, - AR803x_DEBUG_REG_0); -phy_write (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_DATA_REG, - AR803x_RGMII_RX_CLK_DLY); - } + phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID ) +ar803x_enable_rx_delay (phydev, true); phydev->supported = phydev->drv->features;
@@ -64,20 +85,12 @@ static int ar8035_config(struct phy_device *phydev)phy_write (phydev,MDIO_DEVAD_NONE ,0xe , (regval|0x0018 ));if ((phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID ) || - (phydev->interface ==PHY_INTERFACE_MODE_RGMII_TXID )) { -/* select debug reg 5 */ -phy_write (phydev,MDIO_DEVAD_NONE ,0x1D ,0x5 ); -/* enable tx delay */ -phy_write (phydev,MDIO_DEVAD_NONE ,0x1E ,0x0100 ); - } + (phydev->interface ==PHY_INTERFACE_MODE_RGMII_TXID )) +ar803x_enable_tx_delay (phydev, true);if ((phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID ) || - (phydev->interface ==PHY_INTERFACE_MODE_RGMII_RXID )) { -/* select debug reg 0 */ -phy_write (phydev,MDIO_DEVAD_NONE ,0x1D ,0x0 ); -/* enable rx delay */ -phy_write (phydev,MDIO_DEVAD_NONE ,0x1E ,0x8000 ); - } + (phydev->interface ==PHY_INTERFACE_MODE_RGMII_RXID )) +ar803x_enable_rx_delay (phydev, true); phydev->supported = phydev->drv->features;
Signature · 1 line
2.20.1
PATCH v2 3/12 phy: atheros: Clarify the configuration of the CLK_25M output pin
In reply to Michael WalleFrom: Vladimir Oltean <[email protected]>
Also take the opportunity to use the phy_read_mmd and phy_write_mmd convenience functions.
--- drivers/net/phy/atheros.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
drivers/net/phy/atheros.c +14 -5
@@ -17,6 +17,15 @@#define AR803x_DEBUG_REG_0 0x0#define AR803x_RGMII_RX_CLK_DLY BIT(15) +/* CLK_25M register is at MMD 7, address 0x8016 */ +#define AR803x_CLK_25M_SEL_REG 0x8016 +/* AR8035: Select frequency on CLK_25M pin through bits 4:3 */ +#define AR8035_CLK_25M_FREQ_25M (0 | 0) +#define AR8035_CLK_25M_FREQ_50M (0 | BIT(3)) +#define AR8035_CLK_25M_FREQ_62M (BIT(4) | 0) +#define AR8035_CLK_25M_FREQ_125M (BIT(4) | BIT(3)) +#define AR8035_CLK_25M_MASK GENMASK(4, 3) +static void ar803x_enable_rx_delay (struct phy_device *phydev,bool on) {int regval;
@@ -78,11 +87,11 @@ static int ar8035_config(struct phy_device *phydev) {int regval; -phy_write (phydev,MDIO_DEVAD_NONE ,0xd ,0x0007 ); -phy_write (phydev,MDIO_DEVAD_NONE ,0xe ,0x8016 ); -phy_write (phydev,MDIO_DEVAD_NONE ,0xd ,0x4007 ); - regval =phy_read (phydev,MDIO_DEVAD_NONE ,0xe ); -phy_write (phydev,MDIO_DEVAD_NONE ,0xe , (regval|0x0018 )); +/* Configure CLK_25M output clock at 125 MHz */ + regval =phy_read_mmd (phydev,MDIO_MMD_AN , AR803x_CLK_25M_SEL_REG); + regval &= ~AR8035_CLK_25M_MASK ;/* No surprises */ + regval |=AR8035_CLK_25M_FREQ_125M ; +phy_write_mmd (phydev,MDIO_MMD_AN , AR803x_CLK_25M_SEL_REG, regval);if ((phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID ) || (phydev->interface ==PHY_INTERFACE_MODE_RGMII_TXID ))
Signature · 1 line
2.20.1
PATCH v2 4/12 phy: atheros: Explicitly disable RGMII delays
In reply to Michael WalleFrom: Vladimir Oltean <[email protected]>
To eliminate any doubts about the out-of-reset value of the PHY, that the driver previously relied on.
If bisecting shows that this commit breaks your board you probably have a wrong PHY interface mode. You probably want the PHY_INTERFACE_MODE_RGMII_RXID or PHY_INTERFACE_MODE_RGMII_ID mode.
--- drivers/net/phy/atheros.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/phy/atheros.c +8 -0
@@ -70,10 +70,14 @@ static int ar8031_config(struct phy_device *phydev)if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_TXID || phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID )ar803x_enable_tx_delay (phydev, true); +else +ar803x_enable_tx_delay (phydev, false);if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_RXID || phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID )ar803x_enable_rx_delay (phydev, true); +else +ar803x_enable_rx_delay (phydev, false); phydev->supported = phydev->drv->features;
@@ -96,10 +100,14 @@ static int ar8035_config(struct phy_device *phydev)if ((phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID ) || (phydev->interface ==PHY_INTERFACE_MODE_RGMII_TXID ))ar803x_enable_tx_delay (phydev, true); +else +ar803x_enable_tx_delay (phydev, false);if ((phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID ) || (phydev->interface ==PHY_INTERFACE_MODE_RGMII_RXID ))ar803x_enable_rx_delay (phydev, true); +else +ar803x_enable_rx_delay (phydev, false); phydev->supported = phydev->drv->features;
Signature · 1 line
2.20.1
PATCH v2 5/12 phy: atheros: Clarify the intention of ar8021_config
In reply to Michael WalleFrom: Vladimir Oltean <[email protected]>
Debug register 5 contains TX_CLK DELAY at bit 8 and reserved values at the other bit positions, just like the other PHYs in the family do. Therefore, it is not necessary to hardcode the reserved values, but instead simply follow the read-modify-write procedure from the common function.
--- drivers/net/phy/atheros.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/phy/atheros.c +4 -4
@@ -56,10 +56,10 @@ static void ar803x_enable_tx_delay(struct phy_device *phydev, bool on)static int ar8021_config (struct phy_device *phydev) { -phy_write (phydev,MDIO_DEVAD_NONE ,0x00 ,0x1200 ); -phy_write (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_ADDR_REG, - AR803x_DEBUG_REG_5); -phy_write (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_DATA_REG,0x3D47 ); +phy_write (phydev,MDIO_DEVAD_NONE ,MII_BMCR , +BMCR_ANENABLE |BMCR_ANRESTART ); + +ar803x_enable_tx_delay (phydev, true); phydev->supported = phydev->drv->features;return 0 ;
Signature · 1 line
2.20.1
PATCH v2 6/12 phy: atheros: fix AR8021 PHY ID mask
In reply to Michael WalleThe upper bits are all the OUI.
--- drivers/net/phy/atheros.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/phy/atheros.c +1 -1
@@ -120,7 +120,7 @@ static int ar8035_config(struct phy_device *phydev)static struct phy_driver AR8021_driver = { .name ="AR8021" , .uid =0x4dd040 , - .mask =0x4ffff0 , + .mask =0xfffffff0 , .features =PHY_GBIT_FEATURES , .config = ar8021_config, .startup = genphy_startup,
Signature · 1 line
2.20.1
PATCH v2 6/12 phy: atheros: fix AR8021 PHY ID mask
Quoted 4 lines · Michael Walle
The upper bits are all the OUI.
Signed-off-by Michael Walle <[email protected]>
PATCH v2 7/12 phy: atheros: use defines for PHY IDs
In reply to Michael Walle--- drivers/net/phy/atheros.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/net/phy/atheros.c +7 -3
@@ -26,6 +26,10 @@#define AR8035_CLK_25M_FREQ_125M (BIT(4) | BIT(3))#define AR8035_CLK_25M_MASK GENMASK(4, 3) +#define AR8021_PHY_ID 0x004dd040 +#define AR8031_PHY_ID 0x004dd074 +#define AR8035_PHY_ID 0x004dd072 +static void ar803x_enable_rx_delay (struct phy_device *phydev,bool on) {int regval;
@@ -119,7 +123,7 @@ static int ar8035_config(struct phy_device *phydev)static struct phy_driver AR8021_driver = { .name ="AR8021" , - .uid =0x4dd040 , + .uid =AR8021_PHY_ID , .mask =0xfffffff0 , .features =PHY_GBIT_FEATURES , .config = ar8021_config,
@@ -129,7 +133,7 @@ static struct phy_driver AR8021_driver = {static struct phy_driver AR8031_driver = { .name ="AR8031/AR8033" , - .uid =0x4dd074 , + .uid =AR8031_PHY_ID , .mask =0xffffffef , .features =PHY_GBIT_FEATURES , .config = ar8031_config,
@@ -139,7 +143,7 @@ static struct phy_driver AR8031_driver = {static struct phy_driver AR8035_driver = { .name ="AR8035" , - .uid =0x4dd072 , + .uid =AR8035_PHY_ID , .mask =0xffffffef , .features =PHY_GBIT_FEATURES , .config = ar8035_config,
Signature · 1 line
2.20.1
PATCH v2 8/12 phy: atheros: introduce debug read and write functions
In reply to Michael WalleProvide functions to read and write the Atheros debug registers.
--- drivers/net/phy/atheros.c | 57 ++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 16 deletions(-)
drivers/net/phy/atheros.c +41 -16
@@ -30,32 +30,57 @@#define AR8031_PHY_ID 0x004dd074#define AR8035_PHY_ID 0x004dd072 -static void ar803x_enable_rx_delay (struct phy_device *phydev,bool on) +static int ar803x_debug_reg_read (struct phy_device *phydev,u16 reg) { -int regval; +int ret; + + ret =phy_write (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_ADDR_REG, + reg); +if (ret <0 ) +return ret; + +return phy_read (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_DATA_REG); +} + +static int ar803x_debug_reg_mask (struct phy_device *phydev,u16 reg, +u16 clear,u16 set) +{ +int val; + + val =ar803x_debug_reg_read (phydev, reg); +if (val <0 ) +return val; + + val &=0xffff ; + val &= ~clear; + val |= set; + +return phy_write (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_DATA_REG, + val); +} + +static int ar803x_enable_rx_delay (struct phy_device *phydev,bool on) +{ +u16 clear =0 , set =0 ; -phy_write (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_ADDR_REG, - AR803x_DEBUG_REG_0); - regval =phy_read (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_DATA_REG);if (on) - regval |= AR803x_RGMII_RX_CLK_DLY; + set = AR803x_RGMII_RX_CLK_DLY;else - regval &= ~AR803x_RGMII_RX_CLK_DLY; -phy_write (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_DATA_REG, regval); + clear = AR803x_RGMII_RX_CLK_DLY; + +return ar803x_debug_reg_mask (phydev, AR803x_DEBUG_REG_0, clear, set); } -static void ar803x_enable_tx_delay (struct phy_device *phydev,bool on) +static int ar803x_enable_tx_delay (struct phy_device *phydev,bool on) { -int regval; +u16 clear =0 , set =0 ; -phy_write (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_ADDR_REG, - AR803x_DEBUG_REG_5); - regval =phy_read (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_DATA_REG);if (on) - regval |= AR803x_RGMII_TX_CLK_DLY; + set = AR803x_RGMII_TX_CLK_DLY;else - regval &= ~AR803x_RGMII_TX_CLK_DLY; -phy_write (phydev,MDIO_DEVAD_NONE , AR803x_PHY_DEBUG_DATA_REG, regval); + clear = AR803x_RGMII_TX_CLK_DLY; + +return ar803x_debug_reg_mask (phydev, AR803x_DEBUG_REG_5, clear, set); }static int ar8021_config (struct phy_device *phydev)
Signature · 1 line
2.20.1
PATCH v2 8/12 phy: atheros: introduce debug read and write functions
Quoted 4 lines · Michael Walle
Provide functions to read and write the Atheros debug registers.
Signed-off-by Michael Walle <[email protected]>
PATCH v2 9/12 phy: atheros: move delay config to common function
In reply to Michael Walle--- drivers/net/phy/atheros.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-)
drivers/net/phy/atheros.c +22 -16
@@ -94,19 +94,32 @@ static int ar8021_config(struct phy_device *phydev)return 0 ; } -static int ar8031_config (struct phy_device *phydev) +static int ar803x_delay_config (struct phy_device *phydev) { +int ret; +if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_TXID || phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID ) -ar803x_enable_tx_delay (phydev, true); + ret =ar803x_enable_tx_delay (phydev, true);else -ar803x_enable_tx_delay (phydev, false); + ret =ar803x_enable_tx_delay (phydev, false);if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_RXID || phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID ) -ar803x_enable_rx_delay (phydev, true); + ret =ar803x_enable_rx_delay (phydev, true);else -ar803x_enable_rx_delay (phydev, false); + ret =ar803x_enable_rx_delay (phydev, false); + +return ret; +} + +static int ar8031_config (struct phy_device *phydev) +{ +int ret; + + ret =ar803x_delay_config (phydev); +if (ret <0 ) +return ret; phydev->supported = phydev->drv->features;
@@ -118,6 +131,7 @@ static int ar8031_config(struct phy_device *phydev)static int ar8035_config (struct phy_device *phydev) { +int ret;int regval;/* Configure CLK_25M output clock at 125 MHz */
@@ -126,17 +140,9 @@ static int ar8035_config(struct phy_device *phydev) regval |=AR8035_CLK_25M_FREQ_125M ;phy_write_mmd (phydev,MDIO_MMD_AN , AR803x_CLK_25M_SEL_REG, regval); -if ((phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID ) || - (phydev->interface ==PHY_INTERFACE_MODE_RGMII_TXID )) -ar803x_enable_tx_delay (phydev, true); -else -ar803x_enable_tx_delay (phydev, false); - -if ((phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID ) || - (phydev->interface ==PHY_INTERFACE_MODE_RGMII_RXID )) -ar803x_enable_rx_delay (phydev, true); -else -ar803x_enable_rx_delay (phydev, false); + ret =ar803x_delay_config (phydev); +if (ret <0 ) +return ret; phydev->supported = phydev->drv->features;
Signature · 1 line
2.20.1
PATCH v2 9/12 phy: atheros: move delay config to common function
Quoted 2 lines · Michael Walle
Signed-off-by Michael Walle <[email protected]>
PATCH v2 10/12 phy: atheros: add device tree bindings and config
In reply to Michael WalleAdd support for configuring the CLK_25M pin as well as the RGMII I/O voltage by the device tree.
By default the AT803x PHYs outputs the 25MHz clock of the XTAL input. But this output can also be changed by software to other frequencies. This commit introduces a generic way to configure this output.
Also the PHY supports different RGMII I/O voltages: 1.5V, 1.8V and 2.5V. An internal LDO is able to provide 1.5V (default) and 1.8V. The 2.5V option needs an external supply voltage. This commit adds support to switch the internal LDO to 1.8V.
--- doc/device-tree-bindings/net/phy/atheros.txt | 35 +++ drivers/net/phy/atheros.c | 223 ++++++++++++++++++- include/dt-bindings/net/qca-ar803x.h | 13 ++ 3 files changed, 269 insertions(+), 2 deletions(-) create mode 100644 doc/device-tree-bindings/net/phy/atheros.txt create mode 100644 include/dt-bindings/net/qca-ar803x.h
doc/device-tree-bindings/net/phy/atheros.txt new file +35 -0
@@ -0,0 +1,35 @@ +* Qualcomm Atheros PHY Device Tree binding + +Required properties: +- reg: PHY address + +Optional properties: +- qca,clk-out-frequency: Clock frequency of the CLK_25M pin in Hz. + Either 25000000, 50000000, 62500000 or 125000000. +- qca,clk-out-strength: Clock output buffer driver strength. + Supported values are defined in dt-bindings/net/qca-ar803x.h +- qca,keep-pll-enabled: Keep the PLL running if no link is present. + Don't go into hibernation mode. + Only supported on the AR8031/AR8033. +- vddio-supply: RGMII I/O voltage regulator + Only supported on the AR8031/AR8033. + +Optional subnodes: +- vddio-regulator: Initial data for the VDDIO regulator, as covered + doc/device-tree-bindings/regulator/regulator.txt + +Example: + #include <dt-bindings/net/qca-ar803x.h> + + ethernet-phy at 0 { + reg = <0>; + qca-clk-out-frequency = <125000000>; + qca,keep-pll-enabled; + + vddio-supply = <&vddio>; + + vddio: vddio-regulator { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + };
drivers/net/phy/atheros.c +221 -2
278 lines not on this page · raw message
include/dt-bindings/net/qca-ar803x.h new file +13 -0
@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Device Tree constants for the Qualcomm Atheros AR803x PHYs +*/ + +#ifndef _DT_BINDINGS_QCA_AR803X_H +#define _DT_BINDINGS_QCA_AR803X_H + +#define AR803X_STRENGTH_FULL 0 +#define AR803X_STRENGTH_HALF 1 +#define AR803X_STRENGTH_QUARTER 2 + +#endif
Signature · 1 line
2.20.1
PATCH v2 10/12 phy: atheros: add device tree bindings and config
Quoted 8 lines · Michael Walle
Add support for configuring the
CLK_25Mpin as well as the RGMII I/O voltage by the device tree.By default the AT803x PHYs outputs the 25MHz clock of the XTAL input. But this output can also be changed by software to other frequencies. This commit introduces a generic way to configure this output.
Quoted 6 lines
Also the PHY supports different RGMII I/O voltages: 1.5V, 1.8V and 2.5V. An internal LDO is able to provide 1.5V (default) and 1.8V. The 2.5V option needs an external supply voltage. This commit adds support to switch the internal LDO to 1.8V.
Signed-off-by Michael Walle <[email protected]>
PATCH v2 11/12 phy: atheros: ar8035: remove static clock config
In reply to Michael WalleWe can configure the clock output in the device tree. Disable the hardcoded one in here. This is highly board-specific and should have never been enabled in the PHY driver.
If bisecting shows that this commit breaks your board it probably depends on the clock output of your Atheros AR8035 PHY. Please have a look at doc/device-tree-bindings/net/phy/atheros.txt. You need to set "clk-out-frequency = <125000000>" because that value was the hardcoded value until this commit.
--- drivers/net/phy/atheros.c | 13 ------------- 1 file changed, 13 deletions(-)
drivers/net/phy/atheros.c +0 -13
@@ -37,12 +37,6 @@#define AR803x_CLK_25M_62_5MHZ_DSP 5#define AR803x_CLK_25M_125MHZ_PLL 6#define AR803x_CLK_25M_125MHZ_DSP 7 - -/* AR8035: Select frequency on CLK_25M pin through bits 4:3 */ -#define AR8035_CLK_25M_FREQ_25M (0 | 0) -#define AR8035_CLK_25M_FREQ_50M (0 | BIT(3)) -#define AR8035_CLK_25M_FREQ_62M (BIT(4) | 0) -#define AR8035_CLK_25M_FREQ_125M (BIT(4) | BIT(3))#define AR8035_CLK_25M_MASK GENMASK(4, 3)#define AR803x_CLK_25M_DR_MASK GENMASK(8, 7)
@@ -343,18 +337,11 @@ static int ar8031_config(struct phy_device *phydev)static int ar8035_config (struct phy_device *phydev) {int ret; -int regval; ret =ar803x_of_init (phydev);if (ret <0 )return ret; -/* Configure CLK_25M output clock@125 MHz */ - regval =phy_read_mmd (phydev,MDIO_MMD_AN , AR803x_CLK_25M_SEL_REG); - regval &= ~AR8035_CLK_25M_MASK ;/* No surprises */ - regval |=AR8035_CLK_25M_FREQ_125M ; -phy_write_mmd (phydev,MDIO_MMD_AN , AR803x_CLK_25M_SEL_REG, regval); - ret =ar803x_delay_config (phydev);if (ret <0 )return ret;
Signature · 1 line
2.20.1
PATCH v2 11/12 phy: atheros: ar8035: remove static clock config
Quoted 5 lines · Michael Walle
We can configure the clock output in the device tree. Disable the hardcoded one in here. This is highly board-specific and should have never been enabled in the PHY driver.
Quoted 7 lines
If bisecting shows that this commit breaks your board it probably depends on the clock output of your Atheros AR8035 PHY. Please have a look at
doc/device-tree-bindings/net/phy/atheros.txt. You need to set "clk-out-frequency = <125000000>" because that value was the hardcoded value until this commit.Signed-off-by Michael Walle <[email protected]>
PATCH v2 12/12 phy: atheros: consolidate {ar8031|ar8035}_config()
In reply to Michael WalleThe two functions are now exactly the same, remove one of them.
--- drivers/net/phy/atheros.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-)
drivers/net/phy/atheros.c +3 -27
@@ -310,31 +310,7 @@ static int ar803x_of_init(struct phy_device *phydev)return 0 ; } -static int ar8031_config (struct phy_device *phydev) -{ -int ret; - - ret =ar803x_of_init (phydev); -if (ret <0 ) -return ret; - - ret =ar803x_delay_config (phydev); -if (ret <0 ) -return ret; - - ret =ar803x_regs_config (phydev); -if (ret <0 ) -return ret; - - phydev->supported = phydev->drv->features; - -genphy_config_aneg (phydev); -genphy_restart_aneg (phydev); - -return 0 ; -} - -static int ar8035_config (struct phy_device *phydev) +static int ar803x_config (struct phy_device *phydev) {int ret;
@@ -373,7 +349,7 @@ static struct phy_driver AR8031_driver = { .uid = AR8031_PHY_ID, .mask = 0xffffffef, .features = PHY_GBIT_FEATURES, - .config = ar8031_config, + .config = ar803x_config, .startup = genphy_startup, .shutdown = genphy_shutdown, };
@@ -383,7 +359,7 @@ static struct phy_driver AR8035_driver = { .uid = AR8035_PHY_ID, .mask = 0xffffffef, .features = PHY_GBIT_FEATURES, - .config = ar8035_config, + .config = ar803x_config, .startup = genphy_startup, .shutdown = genphy_shutdown, };
Signature · 1 line
2.20.1
PATCH v2 12/12 phy: atheros: consolidate {ar8031|ar8035}_config()
Quoted 4 lines · Michael Walle
The two functions are now exactly the same, remove one of them.
Signed-off-by Michael Walle <[email protected]>
v2 cover phy: atheros: dt bindings and cleanup
In reply to Michael WalleHi all,
Am 2019-12-05 23:57, schrieb Michael Walle:
Quoted 35 lines
[RESEND because I've forgot to add the mailinglist. Sorry!]
This patch series superseeds the following two:
From Vladimir Oltean
https://patchwork.ozlabs.org/cover/1031360/
From me:
https://patchwork.ozlabs.org/cover/1184507/Although the first is marked as accepted into u-boot-net I guess it was removed due to broken boards ("DT as ABI", RGMII delay was fixed and thus
breaks the board).After disussing with Vladimir, I've integrated his patches with this series. Also the first one
Address packet drops at low traffic rate due to SmartEEE feature
was dropped because it will likely be fixed by making u-boot support the
eee-broken-X device tree properties. Apart from that, only the subject was
changed and a note about possible board breakage was added the patch which
changes the delay behaviour.For all of those, who will test this patchset, the device tree binding needs the
phydev->nodeproperty, which needs to be set in every network driver. If the device tree binding is not working for you have a look at
the
ar803x_of_init: found PHY node: phy at 0
output. In the case above "phy at 0" is the phy node in the device tree. If
instead the node of your network device is displayed, you have to set thephydev->nodeproperty in your network device driver.
Quoted 2 lines
For the
fsl_enetcdriver this patchset will add it:
https://patchwork.ozlabs.org/cover/1188043/
ping :)
would be cool to have that merged in the current window.
-michael
Quoted 33 lines
changes since v1:
- pull all Vladimirs Oltan's patches and rebase mine onto them
- fix theCLK_25Msettings for the AR8035
- add two new patches "fix AR8021 PHY ID mask" and "use defines for
PHY
IDs"
- use the new kernel device tree binding for the AR803x PHYs:https://patchwork.ozlabs.org/patch/1188293/- add debugging output
Michael Walle (7):
phy: atheros: fix AR8021 PHY ID mask
phy: atheros: use defines for PHY IDs
phy: atheros: introduce debug read and write functions
phy: atheros: move delay config to common function
phy: atheros: add device tree bindings and config
phy: atheros: ar8035: remove static clock config
phy: atheros: consolidate {ar8031|ar8035}_config()Vladimir Oltean (5):
phy: atheros: Make RGMII Tx delays actually configurable for AR8035
phy: atheros: Use common functions for RGMII internal delays
phy: atheros: Clarify the configuration of theCLK_25Moutput pin
phy: atheros: Explicitly disable RGMII delays
phy: atheros: Clarify the intention ofar8021_configdoc/device-tree-bindings/net/phy/atheros.txt | 35 ++ drivers/net/phy/atheros.c | 349 ++++++++++++++++--- include/dt-bindings/net/qca-ar803x.h | 13 + 3 files changed, 344 insertions(+), 53 deletions(-) create mode 100644 doc/device-tree-bindings/net/phy/atheros.txt create mode 100644 include/dt-bindings/net/qca-ar803x.h
v2 cover phy: atheros: dt bindings and cleanup
Hi Michael,
Quoted 39 lines · Michael Walle
Hi all,
Am 2019-12-05 23:57, schrieb Michael Walle:
Quoted 35 lines
[RESEND because I've forgot to add the mailinglist. Sorry!]
This patch series superseeds the following two:
From Vladimir Oltean
https://patchwork.ozlabs.org/cover/1031360/
From me:
https://patchwork.ozlabs.org/cover/1184507/Although the first is marked as accepted into u-boot-net I guess it was removed due to broken boards ("DT as ABI", RGMII delay was fixed and thus
breaks the board).After disussing with Vladimir, I've integrated his patches with this series. Also the first one
Address packet drops at low traffic rate due to SmartEEE feature
was dropped because it will likely be fixed by making u-boot support the
eee-broken-X device tree properties. Apart from that, only the subject was
changed and a note about possible board breakage was added the patch which
changes the delay behaviour.For all of those, who will test this patchset, the device tree binding needs the
phydev->nodeproperty, which needs to be set in every network driver. If the device tree binding is not working for you have a look at
the
ar803x_of_init: found PHY node: phy at 0
output. In the case above "phy at 0" is the phy node in the device tree. If
instead the node of your network device is displayed, you have to set thephydev->nodeproperty in your network device driver.
Quoted 6 lines
Quoted 2 lines
For the
fsl_enetcdriver this patchset will add it:
https://patchwork.ozlabs.org/cover/1188043/ping :)
would be cool to have that merged in the current window.
I tried to merge in the current window, but it broke some boards.
https://travis-ci.org/jhershbe/u-boot/builds/660395885
Please have a look and send a new version that passes those builds.
Thanks,
-Joe
Quoted 37 lines
-michael
Quoted 33 lines
changes since v1:
- pull all Vladimirs Oltan's patches and rebase mine onto them
- fix theCLK_25Msettings for the AR8035
- add two new patches "fix AR8021 PHY ID mask" and "use defines for
PHY
IDs"
- use the new kernel device tree binding for the AR803x PHYs:https://patchwork.ozlabs.org/patch/1188293/- add debugging output
Michael Walle (7):
phy: atheros: fix AR8021 PHY ID mask
phy: atheros: use defines for PHY IDs
phy: atheros: introduce debug read and write functions
phy: atheros: move delay config to common function
phy: atheros: add device tree bindings and config
phy: atheros: ar8035: remove static clock config
phy: atheros: consolidate {ar8031|ar8035}_config()Vladimir Oltean (5):
phy: atheros: Make RGMII Tx delays actually configurable for AR8035
phy: atheros: Use common functions for RGMII internal delays
phy: atheros: Clarify the configuration of theCLK_25Moutput pin
phy: atheros: Explicitly disable RGMII delays
phy: atheros: Clarify the intention ofar8021_configdoc/device-tree-bindings/net/phy/atheros.txt | 35 ++ drivers/net/phy/atheros.c | 349 ++++++++++++++++--- include/dt-bindings/net/qca-ar803x.h | 13 + 3 files changed, 344 insertions(+), 53 deletions(-) create mode 100644 doc/device-tree-bindings/net/phy/atheros.txt create mode 100644 include/dt-bindings/net/qca-ar803x.h
v2 cover phy: atheros: dt bindings and cleanup
Quoted 47 lines · Joe Hershberger
Hi Michael,
Quoted 44 lines · Michael Walle
Hi all,
Am 2019-12-05 23:57, schrieb Michael Walle:
Quoted 35 lines
[RESEND because I've forgot to add the mailinglist. Sorry!]
This patch series superseeds the following two:
From Vladimir Oltean
https://patchwork.ozlabs.org/cover/1031360/
From me:
https://patchwork.ozlabs.org/cover/1184507/Although the first is marked as accepted into u-boot-net I guess it was removed due to broken boards ("DT as ABI", RGMII delay was fixed and thus
breaks the board).After disussing with Vladimir, I've integrated his patches with this series. Also the first one
Address packet drops at low traffic rate due to SmartEEE feature
was dropped because it will likely be fixed by making u-boot support the
eee-broken-X device tree properties. Apart from that, only the subject was
changed and a note about possible board breakage was added the patch which
changes the delay behaviour.For all of those, who will test this patchset, the device tree binding needs the
phydev->nodeproperty, which needs to be set in every network driver. If the device tree binding is not working for you have a look at
the
ar803x_of_init: found PHY node: phy at 0
output. In the case above "phy at 0" is the phy node in the device tree. If
instead the node of your network device is displayed, you have to set thephydev->nodeproperty in your network device driver.Quoted 2 lines
For the
fsl_enetcdriver this patchset will add it:
https://patchwork.ozlabs.org/cover/1188043/ping :)
Quoted 7 lines
Quoted 1 line
would be cool to have that merged in the current window.
I tried to merge in the current window, but it broke some boards.
https://travis-ci.org/jhershbe/u-boot/builds/660395885
Please have a look and send a new version that passes those builds.
This seems related to the changes that Simon Glass did that Simon Goldschmidt is reverting and re-working, so don't go off on rewriting this series just yet.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200310/3df26999/attachment.sig>
v2 cover phy: atheros: dt bindings and cleanup
Am 2020-03-10 18:55, schrieb Tom Rini:
Quoted 52 lines · Joe Hershberger
Quoted 51 lines
Hi Michael,
Quoted 39 lines · Michael Walle
Hi all,
Am 2019-12-05 23:57, schrieb Michael Walle:
Quoted 35 lines
[RESEND because I've forgot to add the mailinglist. Sorry!]
This patch series superseeds the following two:
From Vladimir Oltean
https://patchwork.ozlabs.org/cover/1031360/
From me:
https://patchwork.ozlabs.org/cover/1184507/Although the first is marked as accepted into u-boot-net I guess it was removed due to broken boards ("DT as ABI", RGMII delay was fixed and thus
breaks the board).After disussing with Vladimir, I've integrated his patches with this series. Also the first one
Address packet drops at low traffic rate due to SmartEEE feature
was dropped because it will likely be fixed by making u-boot support the
eee-broken-X device tree properties. Apart from that, only the subject was
changed and a note about possible board breakage was added the patch which
changes the delay behaviour.For all of those, who will test this patchset, the device tree binding needs the
phydev->nodeproperty, which needs to be set in every network driver. If the device tree binding is not working for you have a look at
the
ar803x_of_init: found PHY node: phy at 0
output. In the case above "phy at 0" is the phy node in the device tree. If
instead the node of your network device is displayed, you have to set thephydev->nodeproperty in your network device driver.Quoted 6 lines
Quoted 2 lines
For the
fsl_enetcdriver this patchset will add it:
https://patchwork.ozlabs.org/cover/1188043/ping :)
would be cool to have that merged in the current window.
I tried to merge in the current window, but it broke some boards.
Quoted 7 lines
Quoted 3 lines
https://travis-ci.org/jhershbe/u-boot/builds/660395885
Please have a look and send a new version that passes those builds.
This seems related to the changes that Simon Glass did that Simon Goldschmidt is reverting and re-working, so don't go off on rewriting this series just yet.
Any news?
-michael