RGMII Internal delay common property
Subsystems (4)
v5 cover RGMII Internal delay common property
Hello
The RGMII internal delay is a common setting found in most RGMII capable PHY devices. It was found that many vendor specific device tree properties exist to do the same function. This creates a common property to be used for PHY's that have tunable internal delays for the Rx and Tx paths.
Dan Murphy (4):
dt-bindings: net: Add tx and rx internal delays
net: phy: Add a helper to return the index for of the internal delay
dt-bindings: net: Add RGMII internal delay for DP83869
net: dp83869: Add RGMII internal delay configuration
.../devicetree/bindings/net/ethernet-phy.yaml | 13 +++ .../devicetree/bindings/net/ti,dp83869.yaml | 16 +++- drivers/net/phy/dp83869.c | 82 ++++++++++++++++++- drivers/net/phy/phy_device.c | 51 ++++++++++++ include/linux/phy.h | 2 + 5 files changed, 160 insertions(+), 4 deletions(-)
Signature · 1 line
2.26.2
PATCH v5 1/4 dt-bindings: net: Add tx and rx internal delays
tx-internal-delays and rx-internal-delays are a common setting for RGMII capable devices.
These properties are used when the phy-mode or phy-controller is set to rgmii-id, rgmii-rxid or rgmii-txid. These modes indicate to the controller that the PHY will add the internal delay for the connection.
--- .../devicetree/bindings/net/ethernet-phy.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+)
Documentation/devicetree/bindings/net/ethernet-phy.yaml +13 -0
@@ -162,6 +162,19 @@ properties: description: Specifies a reference to a node representing a SFP cage. + + rx-internal-delay-ps: + $ref: /schemas/types.yaml#definitions/uint32 + description: | + RGMII Receive PHY Clock Delay defined in pico seconds. This is used for + PHY's that have configurable RX internal delays. + + tx-internal-delay-ps: + $ref: /schemas/types.yaml#definitions/uint32 + description: | + RGMII Transmit PHY Clock Delay defined in pico seconds. This is used for + PHY's that have configurable TX internal delays. + required: - reg
Signature · 1 line
2.26.2
PATCH v5 2/4 net: phy: Add a helper to return the index for of the internal delay
In reply to Dan MurphyAdd a helper function that will return the index in the array for the passed in internal delay value. The helper requires the array, size and delay value.
The helper will then return the index for the exact match or return the index for the index to the closest smaller value.
--- drivers/net/phy/phy_device.c | 51 ++++++++++++++++++++++++++++++++++++ include/linux/phy.h | 2 ++ 2 files changed, 53 insertions(+)
drivers/net/phy/phy_device.c +51 -0
@@ -2657,6 +2657,57 @@ void phy_get_pause(struct phy_device *phydev, bool *tx_pause, bool *rx_pause) }EXPORT_SYMBOL (phy_get_pause); +/** +* phy_get_delay_index - returns the index of the internal delay +* @phydev: phy_device struct +* @delay_values: array of delays the PHY supports +* @size: the size of the delay array +* @int_delay: the internal delay to be looked up +* +* Returns the index within the array of internal delay passed in. +* The array must be in ascending order. +* Return errno if the delay is invalid or cannot be found. +*/ +s32 phy_get_delay_index (struct phy_device *phydev,const int *delay_values, +int size,int int_delay) +{ +int i; + +if (int_delay <0 ) +return -EINVAL ; + +if (size <=0 ) +return -EINVAL ; + +if (int_delay < delay_values[0 ] || int_delay > delay_values[size -1 ]) { +phydev_err (phydev,"Delay %d is out of range\n" , int_delay); +return -EINVAL ; + } + +if (int_delay == delay_values[0 ]) +return 0 ; + +for (i =1 ; i < size; i++) { +if (int_delay == delay_values[i]) +return i; + +/* Find an approximate index by looking up the table */ +if (int_delay > delay_values[i -1 ] && + int_delay < delay_values[i]) { +if (int_delay - delay_values[i -1 ] < + delay_values[i] - int_delay) +return i -1 ; +else +return i; + } + } + +phydev_err (phydev,"error finding internal delay index for %d\n" , + int_delay); +return -EINVAL ; +} +EXPORT_SYMBOL (phy_get_delay_index); +static bool phy_drv_supports_irq (struct phy_driver *phydrv) {return phydrv->config_intr && phydrv->ack_interrupt;
include/linux/phy.h +2 -0
@@ -1430,6 +1430,8 @@ void phy_set_asym_pause(struct phy_device *phydev, bool rx, bool tx);bool phy_validate_pause (struct phy_device *phydev,struct ethtool_pauseparam *pp);void phy_get_pause (struct phy_device *phydev,bool *tx_pause,bool *rx_pause); +int phy_get_delay_index (struct phy_device *phydev,const int *delay_values, +int size,int delay);void phy_resolve_pause (unsigned long *local_adv,unsigned long *partner_adv,bool *tx_pause,bool *rx_pause);
Signature · 1 line
2.26.2
PATCH v5 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 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/net/ti,dp83869.yaml +15 -1
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#" title: TI DP83869 ethernet PHY allOf: - - $ref: "ethernet-controller.yaml#" + - $ref: "ethernet-phy.yaml#" maintainers: - Dan Murphy <[email protected]>
@@ -64,6 +64,18 @@ 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 + rx-internal-delay-ps: + description: Delay is in pico seconds + enum: [ 250, 500, 750, 1000, 1250, 1500, 1750, 2000, 2250, 2500, 2750, 3000, + 3250, 3500, 3750, 4000 ] + default: 2000 + + tx-internal-delay-ps: + description: Delay is in pico seconds + enum: [ 250, 500, 750, 1000, 1250, 1500, 1750, 2000, 2250, 2500, 2750, 3000, + 3250, 3500, 3750, 4000 ] + default: 2000 + required: - reg
@@ -80,5 +92,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>; + rx-internal-delay-ps = <2000>; + tx-internal-delay-ps = <2000>; }; };
Signature · 1 line
2.26.2
PATCH v5 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 | 82 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 3 deletions(-)
drivers/net/phy/dp83869.c +79 -3
@@ -64,6 +64,10 @@#define DP83869_RGMII_TX_CLK_DELAY_EN BIT(1)#define DP83869_RGMII_RX_CLK_DELAY_EN BIT(0) +/* RGMIIDCTL */ +#define DP83869_RGMII_CLK_DELAY_SHIFT 4 +#define DP83869_CLK_DELAY_DEF 7 +/* STRAP_STS1 bits */ #define DP83869_STRAP_OP_MODE_MASK GENMASK(2, 0)#define DP83869_STRAP_STS1_RESERVED BIT(11)
@@ -78,9 +82,6 @@#define DP83869_PHYCR_FIFO_DEPTH_MASK GENMASK(15, 12)#define DP83869_PHYCR_RESERVED_MASK BIT(11) -/* RGMIIDCTL bits */ -#define DP83869_RGMII_TX_CLK_DELAY_SHIFT 4 -/* IO_MUX_CFG bits */ #define DP83869_IO_MUX_CFG_IO_IMPEDANCE_CTRL 0x1f
@@ -99,6 +100,10 @@#define DP83869_OP_MODE_MII BIT(5)#define DP83869_SGMII_RGMII_BRIDGE BIT(6) +static const int dp83869_internal_delay[] = {250 ,500 ,750 ,1000 ,1250 ,1500 , +1750 ,2000 ,2250 ,2500 ,2750 ,3000 , +3250 ,3500 ,3750 ,4000 }; +enum {DP83869_PORT_MIRRORING_KEEP ,DP83869_PORT_MIRRORING_EN ,
@@ -108,6 +113,8 @@ enum {struct dp83869_private {int tx_fifo_depth;int rx_fifo_depth; +s32 rx_id_delay; +s32 tx_id_delay;int io_impedance;int port_mirroring;bool rxctrl_strap_quirk;
@@ -232,6 +239,22 @@ static int dp83869_of_init(struct phy_device *phydev) &dp83869->tx_fifo_depth)) dp83869->tx_fifo_depth =DP83869_PHYCR_FIFO_DEPTH_4_B_NIB ; + ret =of_property_read_u32 (of_node,"rx-internal-delay-ps" , + &dp83869->rx_id_delay); +if (ret) { + dp83869->rx_id_delay = + dp83869_internal_delay[DP83869_CLK_DELAY_DEF ]; + ret =0 ; + } + + ret =of_property_read_u32 (of_node,"tx-internal-delay-ps" , + &dp83869->tx_id_delay); +if (ret) { + dp83869->tx_id_delay = + dp83869_internal_delay[DP83869_CLK_DELAY_DEF ]; + ret =0 ; + } + return ret; }#else
@@ -367,10 +390,35 @@ static int dp83869_configure_mode(struct phy_device *phydev,return ret; } +static int dp83869_get_delay (struct phy_device *phydev) +{ +struct dp83869_private *dp83869 = phydev->priv; +int delay_size =ARRAY_SIZE (dp83869_internal_delay); +int tx_delay; +int rx_delay; + + tx_delay =phy_get_delay_index (phydev, &dp83869_internal_delay[0 ], + delay_size, dp83869->tx_id_delay); +if (tx_delay <0 ) { +phydev_err (phydev,"Tx internal delay is invalid\n" ); +return tx_delay; + } + + rx_delay =phy_get_delay_index (phydev, &dp83869_internal_delay[0 ], + delay_size, dp83869->rx_id_delay); +if (rx_delay <0 ) { +phydev_err (phydev,"Rx internal delay is invalid\n" ); +return rx_delay; + } + +return rx_delay | tx_delay <<DP83869_RGMII_CLK_DELAY_SHIFT ; +} +static int dp83869_config_init (struct phy_device *phydev) {struct dp83869_private *dp83869 = phydev->priv;int ret, val; +int delay; ret =dp83869_configure_mode (phydev, dp83869);if (ret)
@@ -394,6 +442,34 @@ 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)) { + delay =dp83869_get_delay (phydev); +if (delay <0 ) +return delay; + + ret =phy_write_mmd (phydev,DP83869_DEVADDR ,DP83869_RGMIIDCTL , + delay); +if (ret) +return ret; + + 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 ; + + ret =phy_write_mmd (phydev,DP83869_DEVADDR ,DP83869_RGMIICTL , + val); + } +return ret; }
Signature · 1 line
2.26.2
Re: [PATCH net-next v5 4/4] net: dp83869: Add RGMII internal delay configuration
Quoted 4 lines · Dan Murphy
Add RGMII internal delay configuration for Rx and Tx.
Signed-off-by Dan Murphy <[email protected]>---
[snip]
Quoted 22 lines
drivers/net/phy/dp83869.c +8
-0+enum {DP83869_PORT_MIRRORING_KEEP ,DP83869_PORT_MIRRORING_EN ,@@ -108,6 +113,8 @@ enum {struct dp83869_private {int tx_fifo_depth;int rx_fifo_depth; +s32 rx_id_delay; +s32 tx_id_delay;int io_impedance;int port_mirroring;bool rxctrl_strap_quirk;@@ -232,6 +239,22 @@ static int dp83869_of_init(struct phy_device *phydev) &dp83869->tx_fifo_depth)) dp83869->tx_fifo_depth =DP83869_PHYCR_FIFO_DEPTH_4_B_NIB ; + ret =of_property_read_u32 (of_node,"rx-internal-delay-ps" , + &dp83869->rx_id_delay); +if (ret) { + dp83869->rx_id_delay = + dp83869_internal_delay[DP83869_CLK_DELAY_DEF ];
drivers/net/phy/dp83869.c static int dp83869_of_init(struct phy_device *phydev) · line 256
Quoted 10 lines
drivers/net/phy/dp83869.c +10
-0+ ret =0 ; + } + + ret =of_property_read_u32 (of_node,"tx-internal-delay-ps" , + &dp83869->tx_id_delay); +if (ret) { + dp83869->tx_id_delay = + dp83869_internal_delay[DP83869_CLK_DELAY_DEF ]; + ret =0 ; + }
It is still not clear to me why is not the parsing being done by the PHY library helper directly?
Signature · 1 line
Florian
Re: [PATCH net-next v5 4/4] net: dp83869: Add RGMII internal delay configuration
Florian
Quoted 34 lines · Florian Fainelli
Quoted 4 lines · Dan Murphy
Add RGMII internal delay configuration for Rx and Tx.
Signed-off-by Dan Murphy <[email protected]>---
[snip]
Quoted 26 lines
drivers/net/phy/dp83869.c +12
-0+enum {DP83869_PORT_MIRRORING_KEEP ,DP83869_PORT_MIRRORING_EN ,@@ -108,6 +113,8 @@ enum {struct dp83869_private {int tx_fifo_depth;int rx_fifo_depth; +s32 rx_id_delay; +s32 tx_id_delay;int io_impedance;int port_mirroring;bool rxctrl_strap_quirk;@@ -232,6 +239,22 @@ static int dp83869_of_init(struct phy_device *phydev) &dp83869->tx_fifo_depth)) dp83869->tx_fifo_depth =DP83869_PHYCR_FIFO_DEPTH_4_B_NIB ; + ret =of_property_read_u32 (of_node,"rx-internal-delay-ps" , + &dp83869->rx_id_delay); +if (ret) { + dp83869->rx_id_delay = + dp83869_internal_delay[DP83869_CLK_DELAY_DEF ]; + ret =0 ; + } + + ret = of_property_read_u32(of_node, "tx-internal-delay-ps",
Quoted 8 lines
drivers/net/phy/dp83869.c static int dp83869_of_init(struct phy_device *phydev) · line 256
Quoted 6 lines
drivers/net/phy/dp83869.c +6
-0+ &dp83869->tx_id_delay); +if (ret) { + dp83869->tx_id_delay = + dp83869_internal_delay[DP83869_CLK_DELAY_DEF ]; + ret =0 ; + }It is still not clear to me why is not the parsing being done by the PHY library helper directly?
Why would we do that for these properties and not any other?
Unless there is a new precedence being set here by having the PHY framework do all the dt node parsing for common properties.
Dan
Re: [PATCH net-next v5 4/4] net: dp83869: Add RGMII internal delay configuration
Quoted 46 lines · Dan Murphy
Florian
Quoted 34 lines · Florian Fainelli
Quoted 4 lines · Dan Murphy
Add RGMII internal delay configuration for Rx and Tx.
Signed-off-by Dan Murphy <[email protected]>---
[snip]
Quoted 26 lines
+
enum {
DP83869_PORT_MIRRORING_KEEP,
DP83869_PORT_MIRRORING_EN,drivers/net/phy/dp83869.c +10
-0@@ -108,6 +113,8 @@ enum { struct dp83869_private { int tx_fifo_depth; int rx_fifo_depth; + s32 rx_id_delay; + s32 tx_id_delay; int io_impedance; int port_mirroring; bool rxctrl_strap_quirk;@@ -232,6 +239,22 @@ static int dp83869_of_init(struct phy_device *phydev) &dp83869->tx_fifo_depth)) dp83869->tx_fifo_depth = DP83869_PHYCR_FIFO_DEPTH_4_B_NIB; + ret = of_property_read_u32(of_node, "rx-internal-delay-ps", + &dp83869->rx_id_delay); + if (ret) { + dp83869->rx_id_delay = + dp83869_internal_delay[DP83869_CLK_DELAY_DEF]; + ret = 0; + } + + ret = of_property_read_u32(of_node, "tx-internal-delay-ps",Quoted 8 lines
drivers/net/phy/dp83869.c static int dp83869_of_init(struct phy_device *phydev) · line 256
Quoted 6 lines
drivers/net/phy/dp83869.c +6
-0+ &dp83869->tx_id_delay); + if (ret) { + dp83869->tx_id_delay = + dp83869_internal_delay[DP83869_CLK_DELAY_DEF]; + ret = 0; + }It is still not clear to me why is not the parsing being done by the PHY library helper directly?
Quoted 1 line
Why would we do that for these properties and not any other?
Those properties have a standard name, which makes them suitable for parsing by the core PHY library.
Quoted 3 lines
Unless there is a new precedence being set here by having the PHY framework do all the dt node parsing for common properties.
You could parse the vendor properties through the driver, let the PHY library parse the standard properties, and resolve any ordering precedence within the driver. In general, I would favor standard properties over vendor properties.
Does this help?
Signature · 1 line
Florian
Re: [PATCH net-next v5 4/4] net: dp83869: Add RGMII internal delay configuration
Florian
Quoted 49 lines · Florian Fainelli
Quoted 44 lines · Dan Murphy
Florian
Quoted 33 lines · Florian Fainelli
Quoted 4 lines · Dan Murphy
Add RGMII internal delay configuration for Rx and Tx.
Signed-off-by Dan Murphy <[email protected]>---
[snip]
Quoted 26 lines
drivers/net/phy/dp83869.c +11
-0+ enum { DP83869_PORT_MIRRORING_KEEP, DP83869_PORT_MIRRORING_EN,@@ -108,6 +113,8 @@ enum { struct dp83869_private { int tx_fifo_depth; int rx_fifo_depth; + s32 rx_id_delay; + s32 tx_id_delay; int io_impedance; int port_mirroring; bool rxctrl_strap_quirk;@@ -232,6 +239,22 @@ static int dp83869_of_init(struct phy_device *phydev) &dp83869->tx_fifo_depth)) dp83869->tx_fifo_depth = DP83869_PHYCR_FIFO_DEPTH_4_B_NIB; + ret = of_property_read_u32(of_node, "rx-internal-delay-ps", + &dp83869->rx_id_delay); + if (ret) { + dp83869->rx_id_delay = + dp83869_internal_delay[DP83869_CLK_DELAY_DEF]; + ret = 0; + } + + ret = of_property_read_u32(of_node, "tx-internal-delay-ps",Quoted 8 lines
drivers/net/phy/dp83869.c static int dp83869_of_init(struct phy_device *phydev) · line 256
Quoted 6 lines
drivers/net/phy/dp83869.c +6
-0+ &dp83869->tx_id_delay); + if (ret) { + dp83869->tx_id_delay = + dp83869_internal_delay[DP83869_CLK_DELAY_DEF]; + ret = 0; + }It is still not clear to me why is not the parsing being done by the PHY library helper directly?
Quoted 1 line
Why would we do that for these properties and not any other?
Those properties have a standard name, which makes them suitable for parsing by the core PHY library.
Quoted 8 lines
Quoted 2 lines
Unless there is a new precedence being set here by having the PHY framework do all the dt node parsing for common properties.
You could parse the vendor properties through the driver, let the PHY library parse the standard properties, and resolve any ordering precedence within the driver. In general, I would favor standard properties over vendor properties.
Does this help?
Ok so new precedence then.
Because there are common properties like tx-fifo-depth, rx-fifo-depth, enet-phy-lane-swap and max_speed that the PHY framework should parse as well.
Dan
Re: [PATCH net-next v5 4/4] net: dp83869: Add RGMII internal delay configuration
Florian
Quoted 59 lines · Dan Murphy
Florian
Quoted 56 lines · Florian Fainelli
Quoted 44 lines · Dan Murphy
Florian
Quoted 33 lines · Florian Fainelli
Quoted 4 lines · Dan Murphy
Add RGMII internal delay configuration for Rx and Tx.
Signed-off-by Dan Murphy <[email protected]>---
[snip]
Quoted 26 lines
+
enum {
DP83869_PORT_MIRRORING_KEEP,
DP83869_PORT_MIRRORING_EN,drivers/net/phy/dp83869.c +10
-0@@ -108,6 +113,8 @@ enum { struct dp83869_private { int tx_fifo_depth; int rx_fifo_depth; + s32 rx_id_delay; + s32 tx_id_delay; int io_impedance; int port_mirroring; bool rxctrl_strap_quirk;@@ -232,6 +239,22 @@ static int dp83869_of_init(struct phy_device *phydev) &dp83869->tx_fifo_depth)) dp83869->tx_fifo_depth = DP83869_PHYCR_FIFO_DEPTH_4_B_NIB; + ret = of_property_read_u32(of_node, "rx-internal-delay-ps", + &dp83869->rx_id_delay); + if (ret) { + dp83869->rx_id_delay = + dp83869_internal_delay[DP83869_CLK_DELAY_DEF ]; + ret = 0; + } + + ret = of_property_read_u32(of_node, "tx-internal-delay-ps",Quoted 8 lines
drivers/net/phy/dp83869.c static int dp83869_of_init(struct phy_device *phydev) · line 256
Quoted 6 lines
drivers/net/phy/dp83869.c +6
-0+ &dp83869->tx_id_delay); + if (ret) { + dp83869->tx_id_delay = + dp83869_internal_delay[DP83869_CLK_DELAY_DEF ]; + ret = 0; + }It is still not clear to me why is not the parsing being done by the PHY library helper directly?
Quoted 1 line
Why would we do that for these properties and not any other?
Those properties have a standard name, which makes them suitable for parsing by the core PHY library.
Quoted 2 lines
Unless there is a new precedence being set here by having the PHY framework do all the dt node parsing for common properties.
You could parse the vendor properties through the driver, let the PHY library parse the standard properties, and resolve any ordering precedence within the driver. In general, I would favor standard properties over vendor properties.
Quoted 6 lines
Quoted 1 line
Does this help?
Ok so new precedence then.
Because there are common properties like tx-fifo-depth, rx-fifo-depth, enet-phy-lane-swap and
max_speedthat the PHY framework should parse as well.
I am assuming that the retrieval of the property and getting the index should be 2 separate APIs?
One API to get the property value and one API to find the index value.
Dan
Quoted 2 lines
Dan