DP83869 Enhancements
Subsystems (4)
v2 cover DP83869 Enhancements
Hello
These are improvements to the DP83869 Ethernet PHY driver. OP-mode and port mirroring may be strapped on the device but the software only retrives these settings from the device tree. Reading the straps and initializing the associated stored variables so when setting the PHY up and down the PHY's configuration values will be retained.
The PHY also supports RGMII internal delays. Implement this feature as it was done in the DP83867 device.
Dan Murphy (4):
net: phy: dp83869: Update port-mirroring to read straps
net: phy: dp83869: Set opmode from straps
dt-bindings: net: Add RGMII internal delay for DP83869
net: dp83869: Add RGMII internal delay configuration
.../devicetree/bindings/net/ti,dp83869.yaml | 16 +++ drivers/net/phy/dp83869.c | 120 +++++++++++++++++- include/dt-bindings/net/ti-dp83869.h | 18 +++ 3 files changed, 150 insertions(+), 4 deletions(-)
Signature · 1 line
2.26.2
PATCH v2 1/4 net: phy: dp83869: Update port-mirroring to read straps
The device tree may not have the property set for port mirroring because the hardware may have it strapped. If the property is not in the DT then check the straps and set the port mirroring bit appropriately.
--- drivers/net/phy/dp83869.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/net/phy/dp83869.c +12 -3
@@ -66,6 +66,7 @@/* STRAP_STS1 bits */ #define DP83869_STRAP_STS1_RESERVED BIT(11) +#define DP83869_STRAP_MIRROR_ENABLED BIT(12)/* PHYCTRL bits */ #define DP83869_RX_FIFO_SHIFT 12
@@ -191,10 +192,18 @@ static int dp83869_of_init(struct phy_device *phydev)else if (of_property_read_bool (of_node,"ti,min-output-impedance" )) dp83869->io_impedance =DP83869_IO_MUX_CFG_IO_IMPEDANCE_MIN ; -if (of_property_read_bool (of_node,"enet-phy-lane-swap" )) +if (of_property_read_bool (of_node,"enet-phy-lane-swap" )) { dp83869->port_mirroring =DP83869_PORT_MIRRORING_EN ; -else - dp83869->port_mirroring =DP83869_PORT_MIRRORING_DIS ; + }else { +/* If the lane swap is not in the DT then check the straps */ + ret =phy_read_mmd (phydev,DP83869_DEVADDR ,DP83869_STRAP_STS1 ); +if (ret <0 ) +return ret; +if (ret &DP83869_STRAP_MIRROR_ENABLED ) + dp83869->port_mirroring =DP83869_PORT_MIRRORING_EN ; +else + dp83869->port_mirroring =DP83869_PORT_MIRRORING_DIS ; + }if (of_property_read_u32 (of_node,"rx-fifo-depth" , &dp83869->rx_fifo_depth))
Signature · 1 line
2.26.2
PATCH v2 2/4 net: phy: dp83869: Set opmode from straps
In reply to Dan MurphyIf the op-mode for the device is not set in the device tree then set the strapped op-mode and store it for later configuration.
---
v2 - Fixed val declaration from u16 to int
drivers/net/phy/dp83869.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
drivers/net/phy/dp83869.c +20 -1
@@ -65,6 +65,7 @@#define DP83869_RGMII_RX_CLK_DELAY_EN BIT(0)/* STRAP_STS1 bits */ +#define DP83869_STRAP_OP_MODE_MASK GENMASK(2, 0)#define DP83869_STRAP_STS1_RESERVED BIT(11)#define DP83869_STRAP_MIRROR_ENABLED BIT(12)
@@ -161,6 +162,20 @@ static int dp83869_config_port_mirroring(struct phy_device *phydev) DP83869_CFG3_PORT_MIRROR_EN); } +static int dp83869_set_strapped_mode (struct phy_device *phydev) +{ +struct dp83869_private *dp83869 = phydev->priv; +int val; + + val =phy_read_mmd (phydev,DP83869_DEVADDR ,DP83869_STRAP_STS1 ); +if (val <0 ) +return val; + + dp83869->mode = val &DP83869_STRAP_OP_MODE_MASK ; + +return 0 ; +} +#ifdef CONFIG_OF_MDIO static int dp83869_of_init (struct phy_device *phydev) {
@@ -185,6 +200,10 @@ static int dp83869_of_init(struct phy_device *phydev)if (dp83869->mode <DP83869_RGMII_COPPER_ETHERNET || dp83869->mode >DP83869_SGMII_COPPER_ETHERNET )return -EINVAL ; + }else { + ret =dp83869_set_strapped_mode (phydev); +if (ret) +return ret; }if (of_property_read_bool (of_node,"ti,max-output-impedance" ))
@@ -218,7 +237,7 @@ static int dp83869_of_init(struct phy_device *phydev)#else static int dp83869_of_init (struct phy_device *phydev) { -return 0 ; +return dp83869_set_strapped_mode (phydev); }#endif /* CONFIG_OF_MDIO */
Signature · 1 line
2.26.2
PATCH v2 3/4 dt-bindings: net: Add RGMII internal delay for DP83869
In reply to Dan MurphyAdd the internal delay values into the header and update the binding with the internal delay properties.
--- .../devicetree/bindings/net/ti,dp83869.yaml | 16 ++++++++++++++++ include/dt-bindings/net/ti-dp83869.h | 18 ++++++++++++++++++ 2 files changed, 34 insertions(+)
Documentation/devicetree/bindings/net/ti,dp83869.yaml +16 -0
@@ -64,6 +64,20 @@ properties: Operational mode for the PHY. If this is not set then the operational mode is set by the straps. see dt-bindings/net/ti-dp83869.h for values + ti,rx-internal-delay: + $ref: /schemas/types.yaml#definitions/uint32 + description: | + RGMII Receive Clock Delay - see dt-bindings/net/ti-dp83869.h + for applicable values. Required only if interface type is + PHY_INTERFACE_MODE_RGMII_ID or PHY_INTERFACE_MODE_RGMII_RXID. + + ti,tx-internal-delay: + $ref: /schemas/types.yaml#definitions/uint32 + description: | + RGMII Transmit Clock Delay - see dt-bindings/net/ti-dp83869.h + for applicable values. Required only if interface type is + PHY_INTERFACE_MODE_RGMII_ID or PHY_INTERFACE_MODE_RGMII_TXID. + required: - reg
@@ -80,5 +94,7 @@ examples: ti,op-mode = <DP83869_RGMII_COPPER_ETHERNET>; ti,max-output-impedance = "true"; ti,clk-output-sel = <DP83869_CLK_O_SEL_CHN_A_RCLK>; + ti,rx-internal-delay = <DP83869_RGMIIDCTL_2_25_NS>; + ti,tx-internal-delay = <DP83869_RGMIIDCTL_2_75_NS>; }; };
include/dt-bindings/net/ti-dp83869.h +18 -0
@@ -16,6 +16,24 @@#define DP83869_PHYCR_FIFO_DEPTH_6_B_NIB 0x02#define DP83869_PHYCR_FIFO_DEPTH_8_B_NIB 0x03 +/* RGMIIDCTL internal delay for rx and tx */ +#define DP83869_RGMIIDCTL_250_PS 0x0 +#define DP83869_RGMIIDCTL_500_PS 0x1 +#define DP83869_RGMIIDCTL_750_PS 0x2 +#define DP83869_RGMIIDCTL_1_NS 0x3 +#define DP83869_RGMIIDCTL_1_25_NS 0x4 +#define DP83869_RGMIIDCTL_1_50_NS 0x5 +#define DP83869_RGMIIDCTL_1_75_NS 0x6 +#define DP83869_RGMIIDCTL_2_00_NS 0x7 +#define DP83869_RGMIIDCTL_2_25_NS 0x8 +#define DP83869_RGMIIDCTL_2_50_NS 0x9 +#define DP83869_RGMIIDCTL_2_75_NS 0xa +#define DP83869_RGMIIDCTL_3_00_NS 0xb +#define DP83869_RGMIIDCTL_3_25_NS 0xc +#define DP83869_RGMIIDCTL_3_50_NS 0xd +#define DP83869_RGMIIDCTL_3_75_NS 0xe +#define DP83869_RGMIIDCTL_4_00_NS 0xf +/* IO_MUX_CFG - Clock output selection */ #define DP83869_CLK_O_SEL_CHN_A_RCLK 0x0#define DP83869_CLK_O_SEL_CHN_B_RCLK 0x1
Signature · 1 line
2.26.2
PATCH v2 4/4 net: dp83869: Add RGMII internal delay configuration
In reply to Dan MurphyAdd RGMII internal delay configuration for Rx and Tx.
--- drivers/net/phy/dp83869.c | 84 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+)
drivers/net/phy/dp83869.c +84 -0
@@ -99,6 +99,14 @@#define DP83869_OP_MODE_MII BIT(5)#define DP83869_SGMII_RGMII_BRIDGE BIT(6) +/* RGMIIDCTL bits */ +#define DP83869_RGMII_TX_CLK_DELAY_MAX 0xf +#define DP83869_RGMII_TX_CLK_DELAY_SHIFT 4 +#define DP83869_RGMII_TX_CLK_DELAY_INV (DP83869_RGMII_TX_CLK_DELAY_MAX + 1) +#define DP83869_RGMII_RX_CLK_DELAY_MAX 0xf +#define DP83869_RGMII_RX_CLK_DELAY_SHIFT 0 +#define DP83869_RGMII_RX_CLK_DELAY_INV (DP83869_RGMII_RX_CLK_DELAY_MAX + 1) +enum {DP83869_PORT_MIRRORING_KEEP ,DP83869_PORT_MIRRORING_EN ,
@@ -108,6 +116,8 @@ enum {struct dp83869_private {int tx_fifo_depth;int rx_fifo_depth; +u32 rx_id_delay; +u32 tx_id_delay;int io_impedance;int port_mirroring;bool rxctrl_strap_quirk;
@@ -232,6 +242,26 @@ static int dp83869_of_init(struct phy_device *phydev) &dp83869->tx_fifo_depth)) dp83869->tx_fifo_depth =DP83869_PHYCR_FIFO_DEPTH_4_B_NIB ; + dp83869->rx_id_delay =DP83869_RGMII_RX_CLK_DELAY_INV ; + ret =of_property_read_u32 (of_node,"ti,rx-internal-delay" , + &dp83869->rx_id_delay); +if (!ret && dp83869->rx_id_delay >DP83869_RGMII_RX_CLK_DELAY_MAX ) { +phydev_err (phydev, +"ti,rx-internal-delay value of %u out of range\n" , + dp83869->rx_id_delay); +return -EINVAL ; + } + + dp83869->tx_id_delay =DP83869_RGMII_TX_CLK_DELAY_INV ; + ret =of_property_read_u32 (of_node,"ti,tx-internal-delay" , + &dp83869->tx_id_delay); +if (!ret && dp83869->tx_id_delay >DP83869_RGMII_TX_CLK_DELAY_MAX ) { +phydev_err (phydev, +"ti,tx-internal-delay value of %u out of range\n" , + dp83869->tx_id_delay); +return -EINVAL ; + } + return ret; }#else
@@ -270,6 +300,29 @@ static int dp83869_configure_rgmii(struct phy_device *phydev,return ret; } +static int dp83869_verify_rgmii_cfg (struct phy_device *phydev) +{ +struct dp83869_private *dp83869 = phydev->priv; + +/* RX delay *must* be specified if internal delay of RX is used. */ +if ((phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID || + phydev->interface ==PHY_INTERFACE_MODE_RGMII_RXID ) && + dp83869->rx_id_delay ==DP83869_RGMII_RX_CLK_DELAY_INV ) { +phydev_err (phydev,"ti,rx-internal-delay must be specified\n" ); +return -EINVAL ; + } + +/* TX delay *must* be specified if internal delay of TX is used. */ +if ((phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID || + phydev->interface ==PHY_INTERFACE_MODE_RGMII_TXID ) && + dp83869->tx_id_delay ==DP83869_RGMII_TX_CLK_DELAY_INV ) { +phydev_err (phydev,"ti,tx-internal-delay must be specified\n" ); +return -EINVAL ; + } + +return 0 ; +} +static int dp83869_configure_mode (struct phy_device *phydev,struct dp83869_private *dp83869) {
@@ -371,6 +424,11 @@ static int dp83869_config_init(struct phy_device *phydev) {struct dp83869_private *dp83869 = phydev->priv;int ret, val; +u16 delay; + + ret =dp83869_verify_rgmii_cfg (phydev); +if (ret) +return ret; ret =dp83869_configure_mode (phydev, dp83869);if (ret)
@@ -394,6 +452,32 @@ static int dp83869_config_init(struct phy_device *phydev) dp83869->clk_output_sel << DP83869_IO_MUX_CFG_CLK_O_SEL_SHIFT); +if (phy_interface_is_rgmii (phydev)) { + val =phy_read_mmd (phydev,DP83869_DEVADDR ,DP83869_RGMIICTL ); + + val &= ~(DP83869_RGMII_TX_CLK_DELAY_EN |DP83869_RGMII_RX_CLK_DELAY_EN ); +if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID ) + val |= (DP83869_RGMII_TX_CLK_DELAY_EN |DP83869_RGMII_RX_CLK_DELAY_EN ); + +if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_TXID ) + val |=DP83869_RGMII_TX_CLK_DELAY_EN ; + +if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_RXID ) + val |=DP83869_RGMII_RX_CLK_DELAY_EN ; + +phy_write_mmd (phydev,DP83869_DEVADDR ,DP83869_RGMIICTL , val); + + delay =0 ; +if (dp83869->rx_id_delay !=DP83869_RGMII_RX_CLK_DELAY_INV ) + delay |= dp83869->rx_id_delay; +if (dp83869->tx_id_delay !=DP83869_RGMII_TX_CLK_DELAY_INV ) + delay |= dp83869->tx_id_delay << +DP83869_RGMII_TX_CLK_DELAY_SHIFT ; + +phy_write_mmd (phydev,DP83869_DEVADDR ,DP83869_RGMIIDCTL , + delay); + } +return ret; }
Signature · 1 line
2.26.2
Andrew Lunn
maintainerRe: [PATCH net-next v2 3/4] dt-bindings: net: Add RGMII internal delay for DP83869
In reply to Dan MurphyQuoted 14 lines · Dan Murphy
Add the internal delay values into the header and update the binding with the internal delay properties.
Signed-off-by Dan Murphy <[email protected]>--- .../devicetree/bindings/net/ti,dp83869.yaml | 16 ++++++++++++++++ include/dt-bindings/net/ti-dp83869.h | 18 ++++++++++++++++++ 2 files changed, 34 insertions(+)Documentation/devicetree/bindings/net/ti,dp83869.yaml +0
-0
Documentation/devicetree/bindings/net/ti,dp83869.yaml properties: · line 72
Quoted 9 lines
Documentation/devicetree/bindings/net/ti,dp83869.yaml +6
-0@@ -64,6 +64,20 @@ properties: Operational mode for the PHY. If this is not set then the operational mode is set by the straps. see dt-bindings/net/ti-dp83869.h for values + ti,rx-internal-delay: + $ref: /schemas/types.yaml#definitions/uint32 + description: | + RGMII Receive Clock Delay - see dt-bindings/net/ti-dp83869.h + for applicable values. Required only if interface type is + PHY_INTERFACE_MODE_RGMII_ID or PHY_INTERFACE_MODE_RGMII_RXID.
Hi Dan
Having it required with PHY_INTERFACE_MODE_RGMII_ID or PHY_INTERFACE_MODE_RGMII_RXID is pretty unusual. Normally these properties are used to fine tune the delay, if the default of 2ns does not work.
Andrew
Re: [PATCH net-next v2 3/4] dt-bindings: net: Add RGMII internal delay for DP83869
Andrew
Quoted 26 lines · Andrew Lunn
Quoted 14 lines · Dan Murphy
Add the internal delay values into the header and update the binding with the internal delay properties.
Signed-off-by Dan Murphy <[email protected]>--- .../devicetree/bindings/net/ti,dp83869.yaml | 16 ++++++++++++++++ include/dt-bindings/net/ti-dp83869.h | 18 ++++++++++++++++++ 2 files changed, 34 insertions(+)Documentation/devicetree/bindings/net/ti,dp83869.yaml +0
-0Documentation/devicetree/bindings/net/ti,dp83869.yaml properties: · line 72
Quoted 9 lines
Documentation/devicetree/bindings/net/ti,dp83869.yaml +6
-0@@ -64,6 +64,20 @@ properties: Operational mode for the PHY. If this is not set then the operational mode is set by the straps. see dt-bindings/net/ti-dp83869.h for values + ti,rx-internal-delay: + $ref: /schemas/types.yaml#definitions/uint32 + description: | + RGMII Receive Clock Delay - see dt-bindings/net/ti-dp83869.h + for applicable values. Required only if interface type is + PHY_INTERFACE_MODE_RGMII_ID or PHY_INTERFACE_MODE_RGMII_RXID.Hi Dan
Quoted 4 lines
Having it required with
PHY_INTERFACE_MODE_RGMII_IDorPHY_INTERFACE_MODE_RGMII_RXIDis pretty unusual. Normally these properties are used to fine tune the delay, if the default of 2ns does not work.
Also if the MAC phy-mode is configured with RGMII-ID and no internal delay values defined wouldn't that be counter intuitive?
The driver will error out if the RGMII-ID is used and there was no internal delay defined for either rx or tx making either one required.
The MAC node needs to indicate to use the internal delay for RGMII other wise the driver should ignore the internal delay programming as these internal delays are not applicable to SGMII or MII modes. The RGMII mode can be used if the default 2ns delay is acceptable.
Thus why we are documenting in the binding when the internal delay is required as putting these under "required" is not correct.
Dan
Quoted 2 lines
Andrew
Re: [PATCH net-next v2 3/4] dt-bindings: net: Add RGMII internal delay for DP83869
Andrew
Quoted 36 lines · Dan Murphy
Andrew
Quoted 26 lines · Andrew Lunn
Quoted 15 lines · Dan Murphy
Add the internal delay values into the header and update the binding with the internal delay properties.
Signed-off-by Dan Murphy <[email protected]>---
.../devicetree/bindings/net/ti,dp83869.yaml | 16 ++++++++++++++++ include/dt-bindings/net/ti-dp83869.h | 18
++++++++++++++++++2 files changed, 34 insertions(+)Documentation/devicetree/bindings/net/ti,dp83869.yaml +0
-0@@ -64,6 +64,20 @@ properties:Quoted 8 lines
Operational mode for the PHY. If this is not set then the operational mode is set by the straps. see
dt-bindings/net/ti-dp83869.hfor values + ti,rx-internal-delay:
+ $ref: /schemas/types.yaml#definitions/uint32
+ description: |
+ RGMII Receive Clock Delay - seedt-bindings/net/ti-dp83869.h+ for applicable values. Required only if interface type is
+PHY_INTERFACE_MODE_RGMII_IDorPHY_INTERFACE_MODE_RGMII_RXID.Hi Dan
Quoted 4 lines
Having it required with
PHY_INTERFACE_MODE_RGMII_IDorPHY_INTERFACE_MODE_RGMII_RXIDis pretty unusual. Normally these properties are used to fine tune the delay, if the default of 2ns does not work.Also if the MAC phy-mode is configured with RGMII-ID and no internal delay values defined wouldn't that be counter intuitive?
Quoted 8 lines
The driver will error out if the RGMII-ID is used and there was no internal delay defined for either rx or tx making either one required.
The MAC node needs to indicate to use the internal delay for RGMII other wise the driver should ignore the internal delay programming as these internal delays are not applicable to SGMII or MII modes. The RGMII mode can be used if the default 2ns delay is acceptable.
Thus why we are documenting in the binding when the internal delay is required as putting these under "required" is not correct.
Dan
This is also the same for the DP83867 PHY as that PHY and the 83869 have a few identical features like internal delay, WoL and downshifting.
Dan
Quoted 2 lines
Quoted 2 lines
Andrew
Andrew Lunn
maintainerRe: [PATCH net-next v2 3/4] dt-bindings: net: Add RGMII internal delay for DP83869
In reply to Dan MurphyQuoted 9 lines
Quoted 6 lines
Hi Dan
Having it required with
PHY_INTERFACE_MODE_RGMII_IDorPHY_INTERFACE_MODE_RGMII_RXIDis pretty unusual. Normally these properties are used to fine tune the delay, if the default of 2ns does not work.Also if the MAC phy-mode is configured with RGMII-ID and no internal delay values defined wouldn't that be counter intuitive?
Most PHYs don't allow the delay to be fine tuned. You just pass for example PHY_INTERFACE_MODE_RGMII_ID to the PHY driver and it enables a 2ns delay. That is what people expect, and is documented.
Being able to tune the delay is an optional extra, which some PHYs support, but that is always above and beyond PHY_INTERFACE_MODE_RGMII_ID.
Andrew
Re: [PATCH net-next v2 2/4] net: phy: dp83869: Set opmode from straps
In reply to Dan MurphyQuoted 4 lines · Dan Murphy
If the op-mode for the device is not set in the device tree then set the strapped op-mode and store it for later configuration.
Signed-off-by Dan Murphy <[email protected]>
Signature · 1 line
Florian
Re: [PATCH net-next v2 3/4] dt-bindings: net: Add RGMII internal delay for DP83869
In reply to Andrew LunnAndrew
Quoted 8 lines · Andrew Lunn
Quoted 8 lines
Quoted 6 lines
Hi Dan
Having it required with
PHY_INTERFACE_MODE_RGMII_IDorPHY_INTERFACE_MODE_RGMII_RXIDis pretty unusual. Normally these properties are used to fine tune the delay, if the default of 2ns does not work.Also if the MAC phy-mode is configured with RGMII-ID and no internal delay values defined wouldn't that be counter intuitive?
Quoted 7 lines
Most PHYs don't allow the delay to be fine tuned. You just pass for example
PHY_INTERFACE_MODE_RGMII_IDto the PHY driver and it enables a 2ns delay. That is what people expect, and is documented.Being able to tune the delay is an optional extra, which some PHYs support, but that is always above and beyond
PHY_INTERFACE_MODE_RGMII_ID.
I am interested in knowing where that is documented. I want to RTM I grepped for a few different words but came up empty
Since this is a tuneable phy we need to program the ID. 2ns is the default value
Maybe I can change it from Required to Configurable or Used.
Dan
Quoted 1 line
Andrew
Re: [PATCH net-next v2 3/4] dt-bindings: net: Add RGMII internal delay for DP83869
Quoted 20 lines · Dan Murphy
Andrew
Quoted 9 lines · Andrew Lunn
Quoted 9 lines
Quoted 6 lines
Hi Dan
Having it required with
PHY_INTERFACE_MODE_RGMII_IDorPHY_INTERFACE_MODE_RGMII_RXIDis pretty unusual. Normally these properties are used to fine tune the delay, if the default of 2ns does not work.Also if the MAC phy-mode is configured with RGMII-ID and no internal delay
values defined wouldn't that be counter intuitive?Quoted 7 lines
Most PHYs don't allow the delay to be fine tuned. You just pass for example
PHY_INTERFACE_MODE_RGMII_IDto the PHY driver and it enables a 2ns delay. That is what people expect, and is documented.Being able to tune the delay is an optional extra, which some PHYs support, but that is always above and beyond
PHY_INTERFACE_MODE_RGMII_ID.
Quoted 7 lines
I am interested in knowing where that is documented. I want to RTM I grepped for a few different words but came up empty
Since this is a tuneable phy we need to program the ID. 2ns is the default value
Maybe I can change it from Required to Configurable or Used.
I do not think this is properly documented, it is an established practice, but it should be clearly documented somewhere, I do not know whether that belongs in the PHY Device Tree binding or if this belongs to the PHY documentation.
Signature · 1 line
Florian
Andrew Lunn
maintainerRe: [PATCH net-next v2 3/4] dt-bindings: net: Add RGMII internal delay for DP83869
In reply to Dan MurphyQuoted 2 lines
I am interested in knowing where that is documented. I want to RTM I grepped for a few different words but came up empty
Hi Dan
It probably is not well documented, but one example would be
Documentation/devicetree/bindings/net/ethernet-controller.yaml
says:
# RX and TX delays are added by the MAC when required
- rgmii
# RGMII with internal RX and TX delays provided by the PHY, # the MAC should not add the RX or TX delays in this case
- rgmii-id
# RGMII with internal RX delay provided by the PHY, the MAC # should not add an RX delay in this case
- rgmii-rxid
# RGMII with internal TX delay provided by the PHY, the MAC # should not add an TX delay in this case
Andrew
Re: [PATCH net-next v2 3/4] dt-bindings: net: Add RGMII internal delay for DP83869
Andrew/Florian
Quoted 17 lines · Andrew Lunn
Quoted 2 lines
I am interested in knowing where that is documented. I want to RTM I grepped for a few different words but came up empty
Hi Dan
It probably is not well documented, but one example would be
Documentation/devicetree/bindings/net/ethernet-controller.yamlsays:
# RX and TX delays are added by the MAC when required
- rgmii# RGMII with internal RX and TX delays provided by the PHY, # the MAC should not add the RX or TX delays in this case
- rgmii-id
Quoted 8 lines
# RGMII with internal RX delay provided by the PHY, the MAC # should not add an RX delay in this case
- rgmii-rxid# RGMII with internal TX delay provided by the PHY, the MAC # should not add an TX delay in this case
Andrew
OKI I read that. I also looked at a couple other drivers too.
I am wondering if rx-internal-delay and tx-internal-delay should become a common property like tx/rx fifo-depth
And properly document how to use it or at least the expectation on use.
Dan
Re: [PATCH net-next v2 3/4] dt-bindings: net: Add RGMII internal delay for DP83869
Quoted 27 lines · Dan Murphy
Andrew/Florian
Quoted 24 lines · Andrew Lunn
Quoted 2 lines
I am interested in knowing where that is documented. I want to RTM I grepped for a few different words but came up empty
Hi Dan
It probably is not well documented, but one example would be
Documentation/devicetree/bindings/net/ethernet-controller.yamlsays:
# RX and TX delays are added by the MAC when required
- rgmii# RGMII with internal RX and TX delays provided by the PHY,
# the MAC should not add the RX or TX delays in this case - rgmii-id# RGMII with internal RX delay provided by the PHY, the MAC
# should not add an RX delay in this case - rgmii-rxid# RGMII with internal TX delay provided by the PHY, the MAC
# should not add an TX delay in this case
Quoted 7 lines
Quoted 1 line
Andrew
OKI I read that. I also looked at a couple other drivers too.
I am wondering if rx-internal-delay and tx-internal-delay should become a common property like tx/rx fifo-depth
Quoted 1 line
And properly document how to use it or at least the expectation on use.
Yes they should, and they should have an unit associated with the name.
Signature · 1 line
Florian
Re: [PATCH net-next v2 3/4] dt-bindings: net: Add RGMII internal delay for DP83869
Florian
Quoted 29 lines · Florian Fainelli
Quoted 27 lines · Dan Murphy
Andrew/Florian
Quoted 24 lines · Andrew Lunn
Quoted 2 lines
I am interested in knowing where that is documented. I want to RTM I grepped for a few different words but came up empty
Hi Dan
It probably is not well documented, but one example would be
Documentation/devicetree/bindings/net/ethernet-controller.yamlsays:
# RX and TX delays are added by the MAC when required
- rgmii# RGMII with internal RX and TX delays provided by the PHY,
# the MAC should not add the RX or TX delays in this case - rgmii-id# RGMII with internal RX delay provided by the PHY, the MAC
# should not add an RX delay in this case - rgmii-rxid# RGMII with internal TX delay provided by the PHY, the MAC
# should not add an TX delay in this case
Quoted 7 lines
Quoted 6 lines
Quoted 1 line
Andrew
OKI I read that. I also looked at a couple other drivers too.
I am wondering if rx-internal-delay and tx-internal-delay should become a common property like tx/rx fifo-depth
Quoted 1 line
And properly document how to use it or at least the expectation on use.
Yes they should, and they should have an unit associated with the name.
UGH I think I just got volunteered to do make them common.
Dan
Andrew Lunn
maintainerRe: [PATCH net-next v2 3/4] dt-bindings: net: Add RGMII internal delay for DP83869
Hi Dan
Quoted 1 line
UGH I think I just got volunteered to do make them common.
There is code you can copy from PHY drivers. :-)
What would be kind of nice is if the validate was in the core as well. Pass a list of possible delays in pS, and it will do a phydev_err() if what is in DT does not match one of the listed delays. Take a look around at what current drivers do and see if you can find a nice abstraction which will work for a few drivers. We cannot easily convert existing drivers without breaking DT, but a design which works in theory for what we currently have has a good chance of working for any new PHY driver.
Andrew
Re: [PATCH net-next v2 3/4] dt-bindings: net: Add RGMII internal delay for DP83869
Andrew
Quoted 5 lines · Andrew Lunn
Hi Dan
Quoted 1 line
UGH I think I just got volunteered to do make them common.
There is code you can copy from PHY drivers. :-)
Quoted 8 lines
What would be kind of nice is if the validate was in the core as well. Pass a list of possible delays in pS, and it will do a
phydev_err()if what is in DT does not match one of the listed delays. Take a look around at what current drivers do and see if you can find a nice abstraction which will work for a few drivers. We cannot easily convert existing drivers without breaking DT, but a design which works in theory for what we currently have has a good chance of working for any new PHY driver.
I think adding it in the core would be a bit of a challenge. I think each PHY driver needs to handle parsing and validating this property on its own (like fifo-depth). It is a PHY specific setting.
Take the DP83867/9 and the ADIN1200/ADIN1300.
The 8386X devices has a delta granularity of 250pS and the AD devices is 200pS per each setting
And the 867/9 has 3x more values (15) vs only 5 for the AD PHY.
And the Atheros AR803x PHY does use rgmii-id in the yaml, which I guess is what you were pointing out, that if set the PHY uses a default 2nS delay and it is not configurable.
Same with the Broadcomm.
Ack to not changing already existing drivers which is only 2 the AD PHY and the DP83867 PHY. But I can update the yaml for the 83867 and mark the TI specific properties as deprecated in favor of the new properties like I did with fifo-depth.
Dan
Quoted 1 line
Andrew
Andrew Lunn
maintainerRe: [PATCH net-next v2 3/4] dt-bindings: net: Add RGMII internal delay for DP83869
Quoted 3 lines
I think adding it in the core would be a bit of a challenge. I think each PHY driver needs to handle parsing and validating this property on its own (like fifo-depth). It is a PHY specific setting.
fifo-depth yes. But some delays follow a common pattern.
e.g. Documentation/devicetree/bindings/net/micrel-ksz90x1.txt
Device Tree Value Delay Pad Skew Register Value
-----------------------------------------------------
0 -840ps 0000
200 -720ps 0001
400 -600ps 0010
600 -480ps 0011
800 -360ps 0100
1000 -240ps 0101
1200 -120ps 0110
1400 0ps 0111
1600 120ps 1000
1800 240ps 1001
2000 360ps 1010
2200 480ps 1011
2400 600ps 1100
2600 720ps 1101
2800 840ps 1110
3000 960ps 1111Documentation/devicetree/bindings/net/adi,adin.yaml
adi,rx-internal-delay-ps:
description: |
RGMII RX Clock Delay used only when PHY operates in RGMII mode with internal delay (phy-mode is 'rgmii-id' or 'rgmii-rxid') in pico-seconds.
enum: [ 1600, 1800, 2000, 2200, 2400 ]
default: 2000
adi,tx-internal-delay-ps:
description: |
RGMII TX Clock Delay used only when PHY operates in RGMII mode with internal delay (phy-mode is 'rgmii-id' or 'rgmii-txid') in pico-seconds.
enum: [ 1600, 1800, 2000, 2200, 2400 ]
default: 2000
Documentation/devicetree/bindings/net/apm-xgene-enet.txt
- tx-delay: Delay value for RGMII bridge TX clock. Valid values are between 0 to 7, that maps to 417, 717, 1020, 1321, 1611, 1913, 2215, 2514 ps Default value is 4, which corresponds to 1611 ps
- rx-delay: Delay value for RGMII bridge RX clock. Valid values are between 0 to 7, that maps to 273, 589, 899, 1222, 1480, 1806, 2147, 2464 ps Default value is 2, which corresponds to 899 ps
You could implement checking against a table of valid values, which is something you need for your PHY. You could even consider making it a 2D table, and return the register value, not the delay?
Andrew
Re: [PATCH net-next v2 3/4] dt-bindings: net: Add RGMII internal delay for DP83869
Andrew
Quoted 54 lines · Andrew Lunn
Quoted 3 lines
I think adding it in the core would be a bit of a challenge. I think each PHY driver needs to handle parsing and validating this property on its own (like fifo-depth). It is a PHY specific setting.
fifo-depth yes. But some delays follow a common pattern.
e.g.
Documentation/devicetree/bindings/net/micrel-ksz90x1.txtDevice Tree Value Delay Pad Skew Register Value
-----------------------------------------------------0 -840ps 0000 200 -720ps 0001 400 -600ps 0010 600 -480ps 0011 800 -360ps 0100 1000 -240ps 0101 1200 -120ps 0110 1400 0ps 0111 1600 120ps 1000 1800 240ps 1001 2000 360ps 1010 2200 480ps 1011 2400 600ps 1100 2600 720ps 1101 2800 840ps 1110 3000 960ps 1111
Documentation/devicetree/bindings/net/adi,adin.yamladi,rx-internal-delay-ps:
description: |
RGMII RX Clock Delay used only when PHY operates in RGMII mode with internal delay (phy-mode is 'rgmii-id' or 'rgmii-rxid') in pico-seconds.
enum: [ 1600, 1800, 2000, 2200, 2400 ]
default: 2000adi,tx-internal-delay-ps:
description: |
RGMII TX Clock Delay used only when PHY operates in RGMII mode with internal delay (phy-mode is 'rgmii-id' or 'rgmii-txid') in pico-seconds.
enum: [ 1600, 1800, 2000, 2200, 2400 ]
default: 2000
Documentation/devicetree/bindings/net/apm-xgene-enet.txt- tx-delay: Delay value for RGMII bridge TX clock. Valid values are between 0 to 7, that maps to 417, 717, 1020, 1321, 1611, 1913, 2215, 2514 ps Default value is 4, which corresponds to 1611 ps
- rx-delay: Delay value for RGMII bridge RX clock. Valid values are between 0 to 7, that maps to 273, 589, 899, 1222, 1480, 1806, 2147, 2464 ps Default value is 2, which corresponds to 899 ps
Quoted 3 lines
You could implement checking against a table of valid values, which is something you need for your PHY. You could even consider making it a 2D table, and return the register value, not the delay?
So provide a helper function that will just basically parse an array and return the indexed value.
The outlier here is the AD device since the index to value is not 1-1 mapping. Not sure we need a 2D table like the AD driver.
I actually implemented this in the dp83869 a bit ago and have done this in a few other non-PHY drivers.
I guess I can look at making it a utility function in the networking space.
Dan
Quoted 2 lines
Andrew