* [PATCH v5] Add OF bindings to Micrel ksz9021 PHY @ 2013-08-05 7:04 Sean Cross 2013-08-05 7:04 ` [PATCH v5] net/phy: micrel: Add OF configuration support for ksz9021 Sean Cross 0 siblings, 1 reply; 10+ messages in thread From: Sean Cross @ 2013-08-05 7:04 UTC (permalink / raw) To: Sascha Hauer, Duan Fugang-B38611, netdev, devicetree Cc: David Miller, stephen, Steven Rostedt, Sean Cross Some boards require custom parameters be passed to the Micrel PHY. Allow these boards to specify custom timing parameters in the device tree node. Changes since v4: - Add an example of parameters on an mdio bus - Specify values in picoseconds rather than as register values v4 was accidentally unchanged from v3 Changes since v2: - limited the scope to just ksz9021 rather than all PHYs Changes since v1: - removed redefinition of registers and addresses Sean Cross (1): net/phy: micrel: Add OF configuration support for ksz9021 .../devicetree/bindings/net/micrel-ksz9021.txt | 49 ++++++++++ drivers/net/phy/micrel.c | 101 +++++++++++++++++++- 2 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/net/micrel-ksz9021.txt -- 1.7.9.5 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v5] net/phy: micrel: Add OF configuration support for ksz9021 2013-08-05 7:04 [PATCH v5] Add OF bindings to Micrel ksz9021 PHY Sean Cross @ 2013-08-05 7:04 ` Sean Cross 2013-08-05 7:41 ` Duan Fugang-B38611 ` (2 more replies) 0 siblings, 3 replies; 10+ messages in thread From: Sean Cross @ 2013-08-05 7:04 UTC (permalink / raw) To: Sascha Hauer, Duan Fugang-B38611, netdev, devicetree Cc: David Miller, stephen, Steven Rostedt, Sean Cross Some boards require custom PHY configuration, for example due to trace length differences. Add the ability to configure these registers in order to get the PHY to function on boards that need it. Because PHYs are auto-detected based on MDIO device IDs, allow PHY configuration to be specified in the parent Ethernet device node if no PHY device node is present. Signed-off-by: Sean Cross <xobs@kosagi.com> --- .../devicetree/bindings/net/micrel-ksz9021.txt | 49 ++++++++++ drivers/net/phy/micrel.c | 101 +++++++++++++++++++- 2 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/net/micrel-ksz9021.txt diff --git a/Documentation/devicetree/bindings/net/micrel-ksz9021.txt b/Documentation/devicetree/bindings/net/micrel-ksz9021.txt new file mode 100644 index 0000000..338a7e2 --- /dev/null +++ b/Documentation/devicetree/bindings/net/micrel-ksz9021.txt @@ -0,0 +1,49 @@ +Micrel KSZ9021 Gigabit Ethernet PHY + +Some boards require special tuning values, particularly when it comes to +clock delays. You can specify clock delay values by adding +micrel-specific properties to an Ethernet OF device node. + +All skew control options are specified in picoseconds. The minimum +value is 0, and the maximum value is 3000. + +Optional properties: + - rxc-skew : Skew control of RXC pad + - rxdv-skew : Skew control of RX CTL pad + - txc-skew : Skew control of TXC pad + - txen-skew : Skew control of TX_CTL pad + - rxd0-skew : Skew control of RX data 0 pad + - rxd1-skew : Skew control of RX data 1 pad + - rxd2-skew : Skew control of RX data 2 pad + - rxd3-skew : Skew control of RX data 3 pad + - txd0-skew : Skew control of TX data 0 pad + - txd1-skew : Skew control of TX data 1 pad + - txd2-skew : Skew control of TX data 2 pad + - txd3-skew : Skew control of TX data 3 pad + +Examples: + + /* Attach to an Ethernet device with autodetected PHY */ + &enet { + rxc-skew = <3000>; // picoseconds + rxdv-skew = <0>; // picoseconds + txc-skew = <3000>; // picoseconds + txen-skew = <0>; // picoseconds + status = "okay"; + }; + + /* Attach to an explicitly-specified PHY */ + mdio { + phy0: ethernet-phy@0 { + rxc-skew = <3000>; // picoseconds + rxdv-skew = <0>; // picoseconds + txc-skew = <3000>; // picoseconds + txen-skew = <0>; // picoseconds + reg = <0>; + }; + }; + ethernet@70000 { + status = "okay"; + phy = <&phy0>; + phy-mode = "rgmii-id"; + }; diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 2510435..3e60ed0 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -25,6 +25,7 @@ #include <linux/module.h> #include <linux/phy.h> #include <linux/micrel_phy.h> +#include <linux/of.h> /* Operation Mode Strap Override */ #define MII_KSZPHY_OMSO 0x16 @@ -53,6 +54,18 @@ #define KS8737_CTRL_INT_ACTIVE_HIGH (1 << 14) #define KSZ8051_RMII_50MHZ_CLK (1 << 7) +/* Write/read to/from extended registers */ +#define MII_KSZPHY_EXTREG 0x0b +#define KSZPHY_EXTREG_WRITE 0x8000 + +#define MII_KSZPHY_EXTREG_WRITE 0x0c +#define MII_KSZPHY_EXTREG_READ 0x0d + +/* Extended registers */ +#define MII_KSZPHY_CLK_CONTROL_PAD_SKEW 0x104 +#define MII_KSZPHY_RX_DATA_PAD_SKEW 0x105 +#define MII_KSZPHY_TX_DATA_PAD_SKEW 0x106 + static int ksz_config_flags(struct phy_device *phydev) { int regval; @@ -65,6 +78,20 @@ static int ksz_config_flags(struct phy_device *phydev) return 0; } +static int kszphy_extended_write(struct phy_device *phydev, + u32 regnum, u16 val) +{ + phy_write(phydev, MII_KSZPHY_EXTREG, KSZPHY_EXTREG_WRITE | regnum); + return phy_write(phydev, MII_KSZPHY_EXTREG_WRITE, val); +} + +static int kszphy_extended_read(struct phy_device *phydev, + u32 regnum) +{ + phy_write(phydev, MII_KSZPHY_EXTREG, regnum); + return phy_read(phydev, MII_KSZPHY_EXTREG_READ); +} + static int kszphy_ack_interrupt(struct phy_device *phydev) { /* bit[7..0] int status, which is a read and clear register. */ @@ -141,6 +168,78 @@ static int ks8051_config_init(struct phy_device *phydev) return rc < 0 ? rc : 0; } +static int ksz9021_load_values_from_of(struct phy_device *phydev, + struct device_node *of_node, u16 reg, + char *field1, char *field2, + char *field3, char *field4) +{ + int val1 = -1; + int val2 = -2; + int val3 = -3; + int val4 = -4; + int newval; + int matches = 0; + + if (!of_property_read_u32(of_node, field1, &val1)) + matches++; + + if (!of_property_read_u32(of_node, field2, &val2)) + matches++; + + if (!of_property_read_u32(of_node, field3, &val3)) + matches++; + + if (!of_property_read_u32(of_node, field4, &val4)) + matches++; + + if (!matches) + return 0; + + if (matches < 4) + newval = kszphy_extended_read(phydev, reg); + else + newval = 0; + + if (val1 != -1) + newval = ((newval & 0xfff0) | ((val1/200)&0xf) << 0); + + if (val2 != -1) + newval = ((newval & 0xff0f) | ((val2/200)&0xf) << 4); + + if (val3 != -1) + newval = ((newval & 0xf0ff) | ((val3/200)&0xf) << 8); + + if (val4 != -1) + newval = ((newval & 0x0fff) | ((val4/200)&0xf) << 12); + + return kszphy_extended_write(phydev, reg, newval); +} + +static int ksz9021_config_init(struct phy_device *phydev) +{ + struct device *dev = &phydev->dev; + struct device_node *of_node = dev->of_node; + + if (!of_node && dev->parent->of_node) + of_node = dev->parent->of_node; + + if (of_node) { + ksz9021_load_values_from_of(phydev, of_node, + MII_KSZPHY_CLK_CONTROL_PAD_SKEW, + "txen-skew", "txc-skew", + "rxdv-skew", "rxc-skew"); + ksz9021_load_values_from_of(phydev, of_node, + MII_KSZPHY_RX_DATA_PAD_SKEW, + "rxd0-skew", "rxd1-skew", + "rxd2-skew", "rxd3-skew"); + ksz9021_load_values_from_of(phydev, of_node, + MII_KSZPHY_TX_DATA_PAD_SKEW, + "txd0-skew", "txd1-skew", + "txd2-skew", "txd3-skew"); + } + return 0; +} + #define KSZ8873MLL_GLOBAL_CONTROL_4 0x06 #define KSZ8873MLL_GLOBAL_CONTROL_4_DUPLEX (1 << 6) #define KSZ8873MLL_GLOBAL_CONTROL_4_SPEED (1 << 4) @@ -281,7 +380,7 @@ static struct phy_driver ksphy_driver[] = { .name = "Micrel KSZ9021 Gigabit PHY", .features = (PHY_GBIT_FEATURES | SUPPORTED_Pause), .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, - .config_init = kszphy_config_init, + .config_init = ksz9021_config_init, .config_aneg = genphy_config_aneg, .read_status = genphy_read_status, .ack_interrupt = kszphy_ack_interrupt, -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* RE: [PATCH v5] net/phy: micrel: Add OF configuration support for ksz9021 2013-08-05 7:04 ` [PATCH v5] net/phy: micrel: Add OF configuration support for ksz9021 Sean Cross @ 2013-08-05 7:41 ` Duan Fugang-B38611 2013-08-05 7:54 ` Sean Cross 2013-08-05 7:58 ` Sascha Hauer 2013-08-20 9:17 ` Sascha Hauer 2 siblings, 1 reply; 10+ messages in thread From: Duan Fugang-B38611 @ 2013-08-05 7:41 UTC (permalink / raw) To: Sean Cross, Sascha Hauer, netdev, devicetree Cc: David Miller, stephen, Steven Rostedt From: Sean Cross [mailto:xobs@kosagi.com] Data: Monday, August 05, 2013 3:04 PM > To: Sascha Hauer; Duan Fugang-B38611; netdev@vger.kernel.org; > devicetree@vger.kernel.org > Cc: David Miller; stephen@networkplumber.org; Steven Rostedt; Sean Cross > Subject: [PATCH v5] net/phy: micrel: Add OF configuration support for > ksz9021 > > Some boards require custom PHY configuration, for example due to trace > length differences. Add the ability to configure these registers in order > to get the PHY to function on boards that need it. > > Because PHYs are auto-detected based on MDIO device IDs, allow PHY > configuration to be specified in the parent Ethernet device node if no PHY > device node is present. > > Signed-off-by: Sean Cross <xobs@kosagi.com> > --- > +static int ksz9021_load_values_from_of(struct phy_device *phydev, > + struct device_node *of_node, u16 reg, > + char *field1, char *field2, > + char *field3, char *field4) > +{ > + int val1 = -1; > + int val2 = -2; > + int val3 = -3; > + int val4 = -4; > + int newval; > + int matches = 0; > + > + if (!of_property_read_u32(of_node, field1, &val1)) > + matches++; > + > + if (!of_property_read_u32(of_node, field2, &val2)) > + matches++; > + > + if (!of_property_read_u32(of_node, field3, &val3)) > + matches++; > + > + if (!of_property_read_u32(of_node, field4, &val4)) > + matches++; > + > + if (!matches) > + return 0; > + > + if (matches < 4) > + newval = kszphy_extended_read(phydev, reg); > + else > + newval = 0; > + > + if (val1 != -1) > + newval = ((newval & 0xfff0) | ((val1/200)&0xf) << 0); > + > + if (val2 != -1) > + newval = ((newval & 0xff0f) | ((val2/200)&0xf) << 4); Must be : Newval |= ... > + > + if (val3 != -1) > + newval = ((newval & 0xf0ff) | ((val3/200)&0xf) << 8); Must be : Newval |= ... > + > + if (val4 != -1) > + newval = ((newval & 0x0fff) | ((val4/200)&0xf) << 12); Must be : Newval |= ... > + > + return kszphy_extended_write(phydev, reg, newval); } ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v5] net/phy: micrel: Add OF configuration support for ksz9021 2013-08-05 7:41 ` Duan Fugang-B38611 @ 2013-08-05 7:54 ` Sean Cross 0 siblings, 0 replies; 10+ messages in thread From: Sean Cross @ 2013-08-05 7:54 UTC (permalink / raw) To: Duan Fugang-B38611 Cc: Sascha Hauer, netdev, devicetree, David Miller, stephen, Steven Rostedt -- Sean Cross On Monday, August 5, 2013 at 3:41 PM, Duan Fugang-B38611 wrote: > From: Sean Cross [mailto:xobs@kosagi.com] > Data: Monday, August 05, 2013 3:04 PM > > To: Sascha Hauer; Duan Fugang-B38611; netdev@vger.kernel.org (mailto:netdev@vger.kernel.org); > > devicetree@vger.kernel.org (mailto:devicetree@vger.kernel.org) > > Cc: David Miller; stephen@networkplumber.org (mailto:stephen@networkplumber.org); Steven Rostedt; Sean Cross > > Subject: [PATCH v5] net/phy: micrel: Add OF configuration support for > > ksz9021 > > > > Some boards require custom PHY configuration, for example due to trace > > length differences. Add the ability to configure these registers in order > > to get the PHY to function on boards that need it. > > > > Because PHYs are auto-detected based on MDIO device IDs, allow PHY > > configuration to be specified in the parent Ethernet device node if no PHY > > device node is present. > > > > Signed-off-by: Sean Cross <xobs@kosagi.com (mailto:xobs@kosagi.com)> > > --- > > +static int ksz9021_load_values_from_of(struct phy_device *phydev, > > + struct device_node *of_node, u16 reg, > > + char *field1, char *field2, > > + char *field3, char *field4) > > +{ > > + int val1 = -1; > > + int val2 = -2; > > + int val3 = -3; > > + int val4 = -4; > > + int newval; > > + int matches = 0; > > + > > + if (!of_property_read_u32(of_node, field1, &val1)) > > + matches++; > > + > > + if (!of_property_read_u32(of_node, field2, &val2)) > > + matches++; > > + > > + if (!of_property_read_u32(of_node, field3, &val3)) > > + matches++; > > + > > + if (!of_property_read_u32(of_node, field4, &val4)) > > + matches++; > > + > > + if (!matches) > > + return 0; > > + > > + if (matches < 4) > > + newval = kszphy_extended_read(phydev, reg); > > + else > > + newval = 0; > > + > > + if (val1 != -1) > > + newval = ((newval & 0xfff0) | ((val1/200)&0xf) << 0); > > + > > + if (val2 != -1) > > + newval = ((newval & 0xff0f) | ((val2/200)&0xf) << 4); > > > Must be : Newval |= ... > > + > > + if (val3 != -1) > > + newval = ((newval & 0xf0ff) | ((val3/200)&0xf) << 8); > > > Must be : Newval |= ... > > + > > + if (val4 != -1) > > + newval = ((newval & 0x0fff) | ((val4/200)&0xf) << 12); > > > Must be : Newval |= ... > > + > > + return kszphy_extended_write(phydev, reg, newval); } > If all four fields are updated, then newval will start out as 0. If only a few fields are updated, then newval will start out with the previous value. If a given field is mentioned in the device tree file, then its value will change to something other than -1. If the value remains at -1, then that particular field could not be found, and it should not be modified. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v5] net/phy: micrel: Add OF configuration support for ksz9021 2013-08-05 7:04 ` [PATCH v5] net/phy: micrel: Add OF configuration support for ksz9021 Sean Cross 2013-08-05 7:41 ` Duan Fugang-B38611 @ 2013-08-05 7:58 ` Sascha Hauer 2013-08-05 8:12 ` Sean Cross 2013-08-20 9:17 ` Sascha Hauer 2 siblings, 1 reply; 10+ messages in thread From: Sascha Hauer @ 2013-08-05 7:58 UTC (permalink / raw) To: Sean Cross Cc: Duan Fugang-B38611, netdev, devicetree, David Miller, stephen, Steven Rostedt On Mon, Aug 05, 2013 at 07:04:08AM +0000, Sean Cross wrote: > Some boards require custom PHY configuration, for example due to trace > length differences. Add the ability to configure these registers in > order to get the PHY to function on boards that need it. > > Because PHYs are auto-detected based on MDIO device IDs, allow PHY > configuration to be specified in the parent Ethernet device node if no > PHY device node is present. > > Signed-off-by: Sean Cross <xobs@kosagi.com> > --- > .../devicetree/bindings/net/micrel-ksz9021.txt | 49 ++++++++++ > drivers/net/phy/micrel.c | 101 +++++++++++++++++++- > 2 files changed, 149 insertions(+), 1 deletion(-) > create mode 100644 Documentation/devicetree/bindings/net/micrel-ksz9021.txt > > diff --git a/Documentation/devicetree/bindings/net/micrel-ksz9021.txt b/Documentation/devicetree/bindings/net/micrel-ksz9021.txt > new file mode 100644 > index 0000000..338a7e2 > --- /dev/null > +++ b/Documentation/devicetree/bindings/net/micrel-ksz9021.txt > @@ -0,0 +1,49 @@ > +Micrel KSZ9021 Gigabit Ethernet PHY > + > +Some boards require special tuning values, particularly when it comes to > +clock delays. You can specify clock delay values by adding > +micrel-specific properties to an Ethernet OF device node. > + > +All skew control options are specified in picoseconds. The minimum > +value is 0, and the maximum value is 3000. > + > +Optional properties: > + - rxc-skew : Skew control of RXC pad > + - rxdv-skew : Skew control of RX CTL pad > + - txc-skew : Skew control of TXC pad > + - txen-skew : Skew control of TX_CTL pad > + - rxd0-skew : Skew control of RX data 0 pad > + - rxd1-skew : Skew control of RX data 1 pad > + - rxd2-skew : Skew control of RX data 2 pad > + - rxd3-skew : Skew control of RX data 3 pad > + - txd0-skew : Skew control of TX data 0 pad > + - txd1-skew : Skew control of TX data 1 pad > + - txd2-skew : Skew control of TX data 2 pad > + - txd3-skew : Skew control of TX data 3 pad > + > +Examples: > + > + /* Attach to an Ethernet device with autodetected PHY */ > + &enet { > + rxc-skew = <3000>; // picoseconds > + rxdv-skew = <0>; // picoseconds > + txc-skew = <3000>; // picoseconds > + txen-skew = <0>; // picoseconds > + status = "okay"; > + }; > + > + /* Attach to an explicitly-specified PHY */ > + mdio { > + phy0: ethernet-phy@0 { > + rxc-skew = <3000>; // picoseconds > + rxdv-skew = <0>; // picoseconds > + txc-skew = <3000>; // picoseconds > + txen-skew = <0>; // picoseconds > + reg = <0>; > + }; > + }; > + ethernet@70000 { > + status = "okay"; > + phy = <&phy0>; > + phy-mode = "rgmii-id"; > + }; > diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c > index 2510435..3e60ed0 100644 > --- a/drivers/net/phy/micrel.c > +++ b/drivers/net/phy/micrel.c > @@ -25,6 +25,7 @@ > #include <linux/module.h> > #include <linux/phy.h> > #include <linux/micrel_phy.h> > +#include <linux/of.h> > > /* Operation Mode Strap Override */ > #define MII_KSZPHY_OMSO 0x16 > @@ -53,6 +54,18 @@ > #define KS8737_CTRL_INT_ACTIVE_HIGH (1 << 14) > #define KSZ8051_RMII_50MHZ_CLK (1 << 7) > > +/* Write/read to/from extended registers */ > +#define MII_KSZPHY_EXTREG 0x0b > +#define KSZPHY_EXTREG_WRITE 0x8000 > + > +#define MII_KSZPHY_EXTREG_WRITE 0x0c > +#define MII_KSZPHY_EXTREG_READ 0x0d > + > +/* Extended registers */ > +#define MII_KSZPHY_CLK_CONTROL_PAD_SKEW 0x104 > +#define MII_KSZPHY_RX_DATA_PAD_SKEW 0x105 > +#define MII_KSZPHY_TX_DATA_PAD_SKEW 0x106 > + > static int ksz_config_flags(struct phy_device *phydev) > { > int regval; > @@ -65,6 +78,20 @@ static int ksz_config_flags(struct phy_device *phydev) > return 0; > } > > +static int kszphy_extended_write(struct phy_device *phydev, > + u32 regnum, u16 val) > +{ > + phy_write(phydev, MII_KSZPHY_EXTREG, KSZPHY_EXTREG_WRITE | regnum); > + return phy_write(phydev, MII_KSZPHY_EXTREG_WRITE, val); > +} > + > +static int kszphy_extended_read(struct phy_device *phydev, > + u32 regnum) > +{ > + phy_write(phydev, MII_KSZPHY_EXTREG, regnum); > + return phy_read(phydev, MII_KSZPHY_EXTREG_READ); > +} > + > static int kszphy_ack_interrupt(struct phy_device *phydev) > { > /* bit[7..0] int status, which is a read and clear register. */ > @@ -141,6 +168,78 @@ static int ks8051_config_init(struct phy_device *phydev) > return rc < 0 ? rc : 0; > } > > +static int ksz9021_load_values_from_of(struct phy_device *phydev, > + struct device_node *of_node, u16 reg, > + char *field1, char *field2, > + char *field3, char *field4) > +{ > + int val1 = -1; > + int val2 = -2; > + int val3 = -3; > + int val4 = -4; > + int newval; > + int matches = 0; > + > + if (!of_property_read_u32(of_node, field1, &val1)) > + matches++; > + > + if (!of_property_read_u32(of_node, field2, &val2)) > + matches++; > + > + if (!of_property_read_u32(of_node, field3, &val3)) > + matches++; > + > + if (!of_property_read_u32(of_node, field4, &val4)) > + matches++; > + > + if (!matches) > + return 0; > + > + if (matches < 4) > + newval = kszphy_extended_read(phydev, reg); > + else > + newval = 0; Just initialize newval with the reset default of this register. It will make this function easier. Also this two step read from dt and evaluate afterwards seems unnecessary. > + > + if (val1 != -1) > + newval = ((newval & 0xfff0) | ((val1/200)&0xf) << 0); > + > + if (val2 != -1) > + newval = ((newval & 0xff0f) | ((val2/200)&0xf) << 4); > + > + if (val3 != -1) > + newval = ((newval & 0xf0ff) | ((val3/200)&0xf) << 8); > + > + if (val4 != -1) > + newval = ((newval & 0x0fff) | ((val4/200)&0xf) << 12); > + > + return kszphy_extended_write(phydev, reg, newval); > +} > + > +static int ksz9021_config_init(struct phy_device *phydev) > +{ > + struct device *dev = &phydev->dev; > + struct device_node *of_node = dev->of_node; > + > + if (!of_node && dev->parent->of_node) > + of_node = dev->parent->of_node; > + > + if (of_node) { > + ksz9021_load_values_from_of(phydev, of_node, > + MII_KSZPHY_CLK_CONTROL_PAD_SKEW, > + "txen-skew", "txc-skew", > + "rxdv-skew", "rxc-skew"); > + ksz9021_load_values_from_of(phydev, of_node, > + MII_KSZPHY_RX_DATA_PAD_SKEW, > + "rxd0-skew", "rxd1-skew", > + "rxd2-skew", "rxd3-skew"); > + ksz9021_load_values_from_of(phydev, of_node, > + MII_KSZPHY_TX_DATA_PAD_SKEW, > + "txd0-skew", "txd1-skew", > + "txd2-skew", "txd3-skew"); Are you sure this register exists? It's not mentioned in my datasheet, only the first two are. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v5] net/phy: micrel: Add OF configuration support for ksz9021 2013-08-05 7:58 ` Sascha Hauer @ 2013-08-05 8:12 ` Sean Cross 2013-08-20 8:34 ` Sean Cross 0 siblings, 1 reply; 10+ messages in thread From: Sean Cross @ 2013-08-05 8:12 UTC (permalink / raw) To: Sascha Hauer Cc: Duan Fugang-B38611, netdev, devicetree, David Miller, stephen, Steven Rostedt -- Sean Cross On Monday, August 5, 2013 at 3:58 PM, Sascha Hauer wrote: > On Mon, Aug 05, 2013 at 07:04:08AM +0000, Sean Cross wrote: > > Some boards require custom PHY configuration, for example due to trace > > length differences. Add the ability to configure these registers in > > order to get the PHY to function on boards that need it. > > > > Because PHYs are auto-detected based on MDIO device IDs, allow PHY > > configuration to be specified in the parent Ethernet device node if no > > PHY device node is present. > > > > Signed-off-by: Sean Cross <xobs@kosagi.com (mailto:xobs@kosagi.com)> > > --- > > .../devicetree/bindings/net/micrel-ksz9021.txt | 49 ++++++++++ > > drivers/net/phy/micrel.c | 101 +++++++++++++++++++- > > 2 files changed, 149 insertions(+), 1 deletion(-) > > create mode 100644 Documentation/devicetree/bindings/net/micrel-ksz9021.txt > > > > diff --git a/Documentation/devicetree/bindings/net/micrel-ksz9021.txt b/Documentation/devicetree/bindings/net/micrel-ksz9021.txt > > new file mode 100644 > > index 0000000..338a7e2 > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/net/micrel-ksz9021.txt > > @@ -0,0 +1,49 @@ > > +Micrel KSZ9021 Gigabit Ethernet PHY > > + > > +Some boards require special tuning values, particularly when it comes to > > +clock delays. You can specify clock delay values by adding > > +micrel-specific properties to an Ethernet OF device node. > > + > > +All skew control options are specified in picoseconds. The minimum > > +value is 0, and the maximum value is 3000. > > + > > +Optional properties: > > + - rxc-skew : Skew control of RXC pad > > + - rxdv-skew : Skew control of RX CTL pad > > + - txc-skew : Skew control of TXC pad > > + - txen-skew : Skew control of TX_CTL pad > > + - rxd0-skew : Skew control of RX data 0 pad > > + - rxd1-skew : Skew control of RX data 1 pad > > + - rxd2-skew : Skew control of RX data 2 pad > > + - rxd3-skew : Skew control of RX data 3 pad > > + - txd0-skew : Skew control of TX data 0 pad > > + - txd1-skew : Skew control of TX data 1 pad > > + - txd2-skew : Skew control of TX data 2 pad > > + - txd3-skew : Skew control of TX data 3 pad > > + > > +Examples: > > + > > + /* Attach to an Ethernet device with autodetected PHY */ > > + &enet { > > + rxc-skew = <3000>; // picoseconds > > + rxdv-skew = <0>; // picoseconds > > + txc-skew = <3000>; // picoseconds > > + txen-skew = <0>; // picoseconds > > + status = "okay"; > > + }; > > + > > + /* Attach to an explicitly-specified PHY */ > > + mdio { > > + phy0: ethernet-phy@0 { > > + rxc-skew = <3000>; // picoseconds > > + rxdv-skew = <0>; // picoseconds > > + txc-skew = <3000>; // picoseconds > > + txen-skew = <0>; // picoseconds > > + reg = <0>; > > + }; > > + }; > > + ethernet@70000 { > > + status = "okay"; > > + phy = <&phy0>; > > + phy-mode = "rgmii-id"; > > + }; > > diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c > > index 2510435..3e60ed0 100644 > > --- a/drivers/net/phy/micrel.c > > +++ b/drivers/net/phy/micrel.c > > @@ -25,6 +25,7 @@ > > #include <linux/module.h> > > #include <linux/phy.h> > > #include <linux/micrel_phy.h> > > +#include <linux/of.h> > > > > /* Operation Mode Strap Override */ > > #define MII_KSZPHY_OMSO 0x16 > > @@ -53,6 +54,18 @@ > > #define KS8737_CTRL_INT_ACTIVE_HIGH (1 << 14) > > #define KSZ8051_RMII_50MHZ_CLK (1 << 7) > > > > +/* Write/read to/from extended registers */ > > +#define MII_KSZPHY_EXTREG 0x0b > > +#define KSZPHY_EXTREG_WRITE 0x8000 > > + > > +#define MII_KSZPHY_EXTREG_WRITE 0x0c > > +#define MII_KSZPHY_EXTREG_READ 0x0d > > + > > +/* Extended registers */ > > +#define MII_KSZPHY_CLK_CONTROL_PAD_SKEW 0x104 > > +#define MII_KSZPHY_RX_DATA_PAD_SKEW 0x105 > > +#define MII_KSZPHY_TX_DATA_PAD_SKEW 0x106 > > + > > static int ksz_config_flags(struct phy_device *phydev) > > { > > int regval; > > @@ -65,6 +78,20 @@ static int ksz_config_flags(struct phy_device *phydev) > > return 0; > > } > > > > +static int kszphy_extended_write(struct phy_device *phydev, > > + u32 regnum, u16 val) > > +{ > > + phy_write(phydev, MII_KSZPHY_EXTREG, KSZPHY_EXTREG_WRITE | regnum); > > + return phy_write(phydev, MII_KSZPHY_EXTREG_WRITE, val); > > +} > > + > > +static int kszphy_extended_read(struct phy_device *phydev, > > + u32 regnum) > > +{ > > + phy_write(phydev, MII_KSZPHY_EXTREG, regnum); > > + return phy_read(phydev, MII_KSZPHY_EXTREG_READ); > > +} > > + > > static int kszphy_ack_interrupt(struct phy_device *phydev) > > { > > /* bit[7..0] int status, which is a read and clear register. */ > > @@ -141,6 +168,78 @@ static int ks8051_config_init(struct phy_device *phydev) > > return rc < 0 ? rc : 0; > > } > > > > +static int ksz9021_load_values_from_of(struct phy_device *phydev, > > + struct device_node *of_node, u16 reg, > > + char *field1, char *field2, > > + char *field3, char *field4) > > +{ > > + int val1 = -1; > > + int val2 = -2; > > + int val3 = -3; > > + int val4 = -4; > > + int newval; > > + int matches = 0; > > + > > + if (!of_property_read_u32(of_node, field1, &val1)) > > + matches++; > > + > > + if (!of_property_read_u32(of_node, field2, &val2)) > > + matches++; > > + > > + if (!of_property_read_u32(of_node, field3, &val3)) > > + matches++; > > + > > + if (!of_property_read_u32(of_node, field4, &val4)) > > + matches++; > > + > > + if (!matches) > > + return 0; > > + > > + if (matches < 4) > > + newval = kszphy_extended_read(phydev, reg); > > + else > > + newval = 0; > > > > Just initialize newval with the reset default of this register. It will > make this function easier. Also this two step read from dt and evaluate > afterwards seems unnecessary. The documentation seems inaccurate here. My datasheet says it defaults to 0x0111, but when I check it for myself it comes out 0x7777. Which value do you think I should take? > > + > > + if (val1 != -1) > > + newval = ((newval & 0xfff0) | ((val1/200)&0xf) << 0); > > + > > + if (val2 != -1) > > + newval = ((newval & 0xff0f) | ((val2/200)&0xf) << 4); > > + > > + if (val3 != -1) > > + newval = ((newval & 0xf0ff) | ((val3/200)&0xf) << 8); > > + > > + if (val4 != -1) > > + newval = ((newval & 0x0fff) | ((val4/200)&0xf) << 12); > > + > > + return kszphy_extended_write(phydev, reg, newval); > > +} > > + > > +static int ksz9021_config_init(struct phy_device *phydev) > > +{ > > + struct device *dev = &phydev->dev; > > + struct device_node *of_node = dev->of_node; > > + > > + if (!of_node && dev->parent->of_node) > > + of_node = dev->parent->of_node; > > + > > + if (of_node) { > > + ksz9021_load_values_from_of(phydev, of_node, > > + MII_KSZPHY_CLK_CONTROL_PAD_SKEW, > > + "txen-skew", "txc-skew", > > + "rxdv-skew", "rxc-skew"); > > + ksz9021_load_values_from_of(phydev, of_node, > > + MII_KSZPHY_RX_DATA_PAD_SKEW, > > + "rxd0-skew", "rxd1-skew", > > + "rxd2-skew", "rxd3-skew"); > > + ksz9021_load_values_from_of(phydev, of_node, > > + MII_KSZPHY_TX_DATA_PAD_SKEW, > > + "txd0-skew", "txd1-skew", > > + "txd2-skew", "txd3-skew"); > > > > Are you sure this register exists? It's not mentioned in my datasheet, > only the first two are. > I'm very sure the register exists. There's a hole in the documentation where the TX control register should exist. Furthermore, we measured that changing values in this register adjusted the TX skew on the RG-MII wires, and on our board at least, adjusting these values yields increased performance. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v5] net/phy: micrel: Add OF configuration support for ksz9021 2013-08-05 8:12 ` Sean Cross @ 2013-08-20 8:34 ` Sean Cross 2013-08-20 8:50 ` Duan Fugang-B38611 2013-08-20 18:35 ` David Miller 0 siblings, 2 replies; 10+ messages in thread From: Sean Cross @ 2013-08-20 8:34 UTC (permalink / raw) To: Sascha Hauer Cc: Duan Fugang-B38611, netdev, devicetree, David Miller, stephen, Steven Rostedt On Monday, August 5, 2013 at 4:12 PM, Sean Cross wrote: > > On Monday, August 5, 2013 at 3:58 PM, Sascha Hauer wrote: > > > On Mon, Aug 05, 2013 at 07:04:08AM +0000, Sean Cross wrote: > > > Some boards require custom PHY configuration, for example due to trace > > > length differences. Add the ability to configure these registers in > > > order to get the PHY to function on boards that need it. > > > > > > Because PHYs are auto-detected based on MDIO device IDs, allow PHY > > > configuration to be specified in the parent Ethernet device node if no > > > PHY device node is present. > > > > > > Signed-off-by: Sean Cross <xobs@kosagi.com (mailto:xobs@kosagi.com)> > > > --- > > > .../devicetree/bindings/net/micrel-ksz9021.txt | 49 ++++++++++ > > > drivers/net/phy/micrel.c | 101 +++++++++++++++++++- > > > 2 files changed, 149 insertions(+), 1 deletion(-) > > > create mode 100644 Documentation/devicetree/bindings/net/micrel-ksz9021.txt > > > > > > diff --git a/Documentation/devicetree/bindings/net/micrel-ksz9021.txt b/Documentation/devicetree/bindings/net/micrel-ksz9021.txt > > > new file mode 100644 > > > index 0000000..338a7e2 > > > --- /dev/null > > > +++ b/Documentation/devicetree/bindings/net/micrel-ksz9021.txt > > > @@ -0,0 +1,49 @@ > > > +Micrel KSZ9021 Gigabit Ethernet PHY > > > + > > > +Some boards require special tuning values, particularly when it comes to > > > +clock delays. You can specify clock delay values by adding > > > +micrel-specific properties to an Ethernet OF device node. > > > + > > > +All skew control options are specified in picoseconds. The minimum > > > +value is 0, and the maximum value is 3000. > > > + > > > +Optional properties: > > > + - rxc-skew : Skew control of RXC pad > > > + - rxdv-skew : Skew control of RX CTL pad > > > + - txc-skew : Skew control of TXC pad > > > + - txen-skew : Skew control of TX_CTL pad > > > + - rxd0-skew : Skew control of RX data 0 pad > > > + - rxd1-skew : Skew control of RX data 1 pad > > > + - rxd2-skew : Skew control of RX data 2 pad > > > + - rxd3-skew : Skew control of RX data 3 pad > > > + - txd0-skew : Skew control of TX data 0 pad > > > + - txd1-skew : Skew control of TX data 1 pad > > > + - txd2-skew : Skew control of TX data 2 pad > > > + - txd3-skew : Skew control of TX data 3 pad > > > + > > > +Examples: > > > + > > > + /* Attach to an Ethernet device with autodetected PHY */ > > > + &enet { > > > + rxc-skew = <3000>; // picoseconds > > > + rxdv-skew = <0>; // picoseconds > > > + txc-skew = <3000>; // picoseconds > > > + txen-skew = <0>; // picoseconds > > > + status = "okay"; > > > + }; > > > + > > > + /* Attach to an explicitly-specified PHY */ > > > + mdio { > > > + phy0: ethernet-phy@0 { > > > + rxc-skew = <3000>; // picoseconds > > > + rxdv-skew = <0>; // picoseconds > > > + txc-skew = <3000>; // picoseconds > > > + txen-skew = <0>; // picoseconds > > > + reg = <0>; > > > + }; > > > + }; > > > + ethernet@70000 { > > > + status = "okay"; > > > + phy = <&phy0>; > > > + phy-mode = "rgmii-id"; > > > + }; > > > diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c > > > index 2510435..3e60ed0 100644 > > > --- a/drivers/net/phy/micrel.c > > > +++ b/drivers/net/phy/micrel.c > > > @@ -25,6 +25,7 @@ > > > #include <linux/module.h> > > > #include <linux/phy.h> > > > #include <linux/micrel_phy.h> > > > +#include <linux/of.h> > > > > > > /* Operation Mode Strap Override */ > > > #define MII_KSZPHY_OMSO 0x16 > > > @@ -53,6 +54,18 @@ > > > #define KS8737_CTRL_INT_ACTIVE_HIGH (1 << 14) > > > #define KSZ8051_RMII_50MHZ_CLK (1 << 7) > > > > > > +/* Write/read to/from extended registers */ > > > +#define MII_KSZPHY_EXTREG 0x0b > > > +#define KSZPHY_EXTREG_WRITE 0x8000 > > > + > > > +#define MII_KSZPHY_EXTREG_WRITE 0x0c > > > +#define MII_KSZPHY_EXTREG_READ 0x0d > > > + > > > +/* Extended registers */ > > > +#define MII_KSZPHY_CLK_CONTROL_PAD_SKEW 0x104 > > > +#define MII_KSZPHY_RX_DATA_PAD_SKEW 0x105 > > > +#define MII_KSZPHY_TX_DATA_PAD_SKEW 0x106 > > > + > > > static int ksz_config_flags(struct phy_device *phydev) > > > { > > > int regval; > > > @@ -65,6 +78,20 @@ static int ksz_config_flags(struct phy_device *phydev) > > > return 0; > > > } > > > > > > +static int kszphy_extended_write(struct phy_device *phydev, > > > + u32 regnum, u16 val) > > > +{ > > > + phy_write(phydev, MII_KSZPHY_EXTREG, KSZPHY_EXTREG_WRITE | regnum); > > > + return phy_write(phydev, MII_KSZPHY_EXTREG_WRITE, val); > > > +} > > > + > > > +static int kszphy_extended_read(struct phy_device *phydev, > > > + u32 regnum) > > > +{ > > > + phy_write(phydev, MII_KSZPHY_EXTREG, regnum); > > > + return phy_read(phydev, MII_KSZPHY_EXTREG_READ); > > > +} > > > + > > > static int kszphy_ack_interrupt(struct phy_device *phydev) > > > { > > > /* bit[7..0] int status, which is a read and clear register. */ > > > @@ -141,6 +168,78 @@ static int ks8051_config_init(struct phy_device *phydev) > > > return rc < 0 ? rc : 0; > > > } > > > > > > +static int ksz9021_load_values_from_of(struct phy_device *phydev, > > > + struct device_node *of_node, u16 reg, > > > + char *field1, char *field2, > > > + char *field3, char *field4) > > > +{ > > > + int val1 = -1; > > > + int val2 = -2; > > > + int val3 = -3; > > > + int val4 = -4; > > > + int newval; > > > + int matches = 0; > > > + > > > + if (!of_property_read_u32(of_node, field1, &val1)) > > > + matches++; > > > + > > > + if (!of_property_read_u32(of_node, field2, &val2)) > > > + matches++; > > > + > > > + if (!of_property_read_u32(of_node, field3, &val3)) > > > + matches++; > > > + > > > + if (!of_property_read_u32(of_node, field4, &val4)) > > > + matches++; > > > + > > > + if (!matches) > > > + return 0; > > > + > > > + if (matches < 4) > > > + newval = kszphy_extended_read(phydev, reg); > > > + else > > > + newval = 0; > > > > > > > > > > > > Just initialize newval with the reset default of this register. It will > > make this function easier. Also this two step read from dt and evaluate > > afterwards seems unnecessary. > > > > The documentation seems inaccurate here. My datasheet says it defaults to 0x0111, but when I check it for myself it comes out 0x7777. Which value do you think I should take? > > > + > > > + if (val1 != -1) > > > + newval = ((newval & 0xfff0) | ((val1/200)&0xf) << 0); > > > + > > > + if (val2 != -1) > > > + newval = ((newval & 0xff0f) | ((val2/200)&0xf) << 4); > > > + > > > + if (val3 != -1) > > > + newval = ((newval & 0xf0ff) | ((val3/200)&0xf) << 8); > > > + > > > + if (val4 != -1) > > > + newval = ((newval & 0x0fff) | ((val4/200)&0xf) << 12); > > > + > > > + return kszphy_extended_write(phydev, reg, newval); > > > +} > > > + > > > +static int ksz9021_config_init(struct phy_device *phydev) > > > +{ > > > + struct device *dev = &phydev->dev; > > > + struct device_node *of_node = dev->of_node; > > > + > > > + if (!of_node && dev->parent->of_node) > > > + of_node = dev->parent->of_node; > > > + > > > + if (of_node) { > > > + ksz9021_load_values_from_of(phydev, of_node, > > > + MII_KSZPHY_CLK_CONTROL_PAD_SKEW, > > > + "txen-skew", "txc-skew", > > > + "rxdv-skew", "rxc-skew"); > > > + ksz9021_load_values_from_of(phydev, of_node, > > > + MII_KSZPHY_RX_DATA_PAD_SKEW, > > > + "rxd0-skew", "rxd1-skew", > > > + "rxd2-skew", "rxd3-skew"); > > > + ksz9021_load_values_from_of(phydev, of_node, > > > + MII_KSZPHY_TX_DATA_PAD_SKEW, > > > + "txd0-skew", "txd1-skew", > > > + "txd2-skew", "txd3-skew"); > > > > > > > > > > > > Are you sure this register exists? It's not mentioned in my datasheet, > > only the first two are. > > > > I'm very sure the register exists. There's a hole in the documentation where the TX control register should exist. Furthermore, we measured that changing values in this register adjusted the TX skew on the RG-MII wires, and on our board at least, adjusting these values yields increased performance. There hasn't been any response to this patch in two weeks. Can someone please merge this patch or indicate what's wrong with it? ^ permalink raw reply [flat|nested] 10+ messages in thread
* RE: [PATCH v5] net/phy: micrel: Add OF configuration support for ksz9021 2013-08-20 8:34 ` Sean Cross @ 2013-08-20 8:50 ` Duan Fugang-B38611 2013-08-20 18:35 ` David Miller 1 sibling, 0 replies; 10+ messages in thread From: Duan Fugang-B38611 @ 2013-08-20 8:50 UTC (permalink / raw) To: Sean Cross, Sascha Hauer Cc: netdev, devicetree, David Miller, stephen, Steven Rostedt From: Sean Cross [mailto:xobs@kosagi.com] Data: Tuesday, August 20, 2013 4:35 PM > To: Sascha Hauer > Cc: Duan Fugang-B38611; netdev@vger.kernel.org; devicetree@vger.kernel.org; > David Miller; stephen@networkplumber.org; Steven Rostedt > Subject: Re: [PATCH v5] net/phy: micrel: Add OF configuration support for > ksz9021 > > > > > On Monday, August 5, 2013 at 4:12 PM, Sean Cross wrote: > > > > > On Monday, August 5, 2013 at 3:58 PM, Sascha Hauer wrote: > > > > > On Mon, Aug 05, 2013 at 07:04:08AM +0000, Sean Cross wrote: > > > > Some boards require custom PHY configuration, for example due to > > > > trace length differences. Add the ability to configure these > > > > registers in order to get the PHY to function on boards that need it. > > > > > > > > Because PHYs are auto-detected based on MDIO device IDs, allow PHY > > > > configuration to be specified in the parent Ethernet device node > > > > if no PHY device node is present. > > > > > > > > Signed-off-by: Sean Cross <xobs@kosagi.com > > > > (mailto:xobs@kosagi.com) Reviewed-by: Fugang Duan <B38611@freescale.com> Do somebody have other suggestion for the patch ? > > > > --- > > > > .../devicetree/bindings/net/micrel-ksz9021.txt | 49 ++++++++++ > > > > drivers/net/phy/micrel.c | 101 +++++++++++++++++++- > > > > 2 files changed, 149 insertions(+), 1 deletion(-) create mode > > > > 100644 Documentation/devicetree/bindings/net/micrel-ksz9021.txt > > > > > > > > diff --git > > > > a/Documentation/devicetree/bindings/net/micrel-ksz9021.txt > > > > b/Documentation/devicetree/bindings/net/micrel-ksz9021.txt > > > > new file mode 100644 > > > > index 0000000..338a7e2 > > > > --- /dev/null > > > > +++ b/Documentation/devicetree/bindings/net/micrel-ksz9021.txt > > > > @@ -0,0 +1,49 @@ > > > > +Micrel KSZ9021 Gigabit Ethernet PHY > > > > + > > > > +Some boards require special tuning values, particularly when it > > > > +comes to clock delays. You can specify clock delay values by > > > > +adding micrel-specific properties to an Ethernet OF device node. > > > > + > > > > +All skew control options are specified in picoseconds. The > > > > +minimum value is 0, and the maximum value is 3000. > > > > + > > > > +Optional properties: > > > > + - rxc-skew : Skew control of RXC pad > > > > + - rxdv-skew : Skew control of RX CTL pad > > > > + - txc-skew : Skew control of TXC pad > > > > + - txen-skew : Skew control of TX_CTL pad > > > > + - rxd0-skew : Skew control of RX data 0 pad > > > > + - rxd1-skew : Skew control of RX data 1 pad > > > > + - rxd2-skew : Skew control of RX data 2 pad > > > > + - rxd3-skew : Skew control of RX data 3 pad > > > > + - txd0-skew : Skew control of TX data 0 pad > > > > + - txd1-skew : Skew control of TX data 1 pad > > > > + - txd2-skew : Skew control of TX data 2 pad > > > > + - txd3-skew : Skew control of TX data 3 pad > > > > + > > > > +Examples: > > > > + > > > > + /* Attach to an Ethernet device with autodetected PHY */ &enet { > > > > + rxc-skew = <3000>; // picoseconds rxdv-skew = <0>; // > > > > + picoseconds txc-skew = <3000>; // picoseconds txen-skew = <0>; > > > > + // picoseconds status = "okay"; }; > > > > + > > > > + /* Attach to an explicitly-specified PHY */ mdio { > > > > + phy0: ethernet-phy@0 { > > > > + rxc-skew = <3000>; // picoseconds rxdv-skew = <0>; // > > > > + picoseconds txc-skew = <3000>; // picoseconds txen-skew = <0>; > > > > + // picoseconds reg = <0>; }; }; > > > > + ethernet@70000 { > > > > + status = "okay"; > > > > + phy = <&phy0>; > > > > + phy-mode = "rgmii-id"; > > > > + }; > > > > diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c > > > > index 2510435..3e60ed0 100644 > > > > --- a/drivers/net/phy/micrel.c > > > > +++ b/drivers/net/phy/micrel.c > > > > @@ -25,6 +25,7 @@ > > > > #include <linux/module.h> > > > > #include <linux/phy.h> > > > > #include <linux/micrel_phy.h> > > > > +#include <linux/of.h> > > > > > > > > /* Operation Mode Strap Override */ #define MII_KSZPHY_OMSO 0x16 > > > > @@ -53,6 +54,18 @@ #define KS8737_CTRL_INT_ACTIVE_HIGH (1 << 14) > > > > #define KSZ8051_RMII_50MHZ_CLK (1 << 7) > > > > > > > > +/* Write/read to/from extended registers */ #define > > > > +MII_KSZPHY_EXTREG 0x0b #define KSZPHY_EXTREG_WRITE 0x8000 > > > > + > > > > +#define MII_KSZPHY_EXTREG_WRITE 0x0c #define > > > > +MII_KSZPHY_EXTREG_READ 0x0d > > > > + > > > > +/* Extended registers */ > > > > +#define MII_KSZPHY_CLK_CONTROL_PAD_SKEW 0x104 #define > > > > +MII_KSZPHY_RX_DATA_PAD_SKEW 0x105 #define > > > > +MII_KSZPHY_TX_DATA_PAD_SKEW 0x106 > > > > + > > > > static int ksz_config_flags(struct phy_device *phydev) { int > > > > regval; @@ -65,6 +78,20 @@ static int ksz_config_flags(struct > > > > phy_device *phydev) return 0; } > > > > > > > > +static int kszphy_extended_write(struct phy_device *phydev, > > > > + u32 regnum, u16 val) > > > > +{ > > > > + phy_write(phydev, MII_KSZPHY_EXTREG, KSZPHY_EXTREG_WRITE | > > > > +regnum); return phy_write(phydev, MII_KSZPHY_EXTREG_WRITE, val); > > > > +} > > > > + > > > > +static int kszphy_extended_read(struct phy_device *phydev, > > > > + u32 regnum) > > > > +{ > > > > + phy_write(phydev, MII_KSZPHY_EXTREG, regnum); return > > > > +phy_read(phydev, MII_KSZPHY_EXTREG_READ); } > > > > + > > > > static int kszphy_ack_interrupt(struct phy_device *phydev) { > > > > /* bit[7..0] int status, which is a read and clear register. */ @@ > > > > -141,6 +168,78 @@ static int ks8051_config_init(struct phy_device > > > > *phydev) return rc < 0 ? rc : 0; } > > > > > > > > +static int ksz9021_load_values_from_of(struct phy_device *phydev, > > > > +struct device_node *of_node, u16 reg, char *field1, char > > > > +*field2, char *field3, char *field4) { int val1 = -1; int val2 > > > > += -2; int val3 = -3; int val4 = -4; int newval; int matches = > > > > +0; > > > > + > > > > + if (!of_property_read_u32(of_node, field1, &val1)) > > > > + matches++; > > > > + > > > > + if (!of_property_read_u32(of_node, field2, &val2)) > > > > + matches++; > > > > + > > > > + if (!of_property_read_u32(of_node, field3, &val3)) > > > > + matches++; > > > > + > > > > + if (!of_property_read_u32(of_node, field4, &val4)) > > > > + matches++; > > > > + > > > > + if (!matches) > > > > + return 0; > > > > + > > > > + if (matches < 4) > > > > + newval = kszphy_extended_read(phydev, reg); else newval = 0; > > > > > > > > > > > > > > > > > > Just initialize newval with the reset default of this register. It > > > will make this function easier. Also this two step read from dt and > > > evaluate afterwards seems unnecessary. > > > > > > > > The documentation seems inaccurate here. My datasheet says it defaults > to 0x0111, but when I check it for myself it comes out 0x7777. Which value > do you think I should take? > > > > + > > > > + if (val1 != -1) > > > > + newval = ((newval & 0xfff0) | ((val1/200)&0xf) << 0); > > > > + > > > > + if (val2 != -1) > > > > + newval = ((newval & 0xff0f) | ((val2/200)&0xf) << 4); > > > > + > > > > + if (val3 != -1) > > > > + newval = ((newval & 0xf0ff) | ((val3/200)&0xf) << 8); > > > > + > > > > + if (val4 != -1) > > > > + newval = ((newval & 0x0fff) | ((val4/200)&0xf) << 12); > > > > + > > > > + return kszphy_extended_write(phydev, reg, newval); } > > > > + > > > > +static int ksz9021_config_init(struct phy_device *phydev) { > > > > +struct device *dev = &phydev->dev; struct device_node *of_node = > > > > +dev->of_node; > > > > + > > > > + if (!of_node && dev->parent->of_node) of_node = > > > > + dev->parent->of_node; > > > > + > > > > + if (of_node) { > > > > + ksz9021_load_values_from_of(phydev, of_node, > > > > + MII_KSZPHY_CLK_CONTROL_PAD_SKEW, "txen-skew", "txc-skew", > > > > + "rxdv-skew", "rxc-skew"); ksz9021_load_values_from_of(phydev, > > > > + of_node, MII_KSZPHY_RX_DATA_PAD_SKEW, "rxd0-skew", "rxd1-skew", > > > > + "rxd2-skew", "rxd3-skew"); ksz9021_load_values_from_of(phydev, > > > > + of_node, MII_KSZPHY_TX_DATA_PAD_SKEW, "txd0-skew", "txd1-skew", > > > > + "txd2-skew", "txd3-skew"); > > > > > > > > > > > > > > > > > > Are you sure this register exists? It's not mentioned in my > > > datasheet, only the first two are. > > > > > > > > I'm very sure the register exists. There's a hole in the documentation > where the TX control register should exist. Furthermore, we measured that > changing values in this register adjusted the TX skew on the RG-MII wires, > and on our board at least, adjusting these values yields increased > performance. > There hasn't been any response to this patch in two weeks. Can someone > please merge this patch or indicate what's wrong with it? > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v5] net/phy: micrel: Add OF configuration support for ksz9021 2013-08-20 8:34 ` Sean Cross 2013-08-20 8:50 ` Duan Fugang-B38611 @ 2013-08-20 18:35 ` David Miller 1 sibling, 0 replies; 10+ messages in thread From: David Miller @ 2013-08-20 18:35 UTC (permalink / raw) To: xobs; +Cc: s.hauer, B38611, netdev, devicetree, stephen, rostedt From: Sean Cross <xobs@kosagi.com> Date: Tue, 20 Aug 2013 16:34:59 +0800 > There hasn't been any response to this patch in two weeks. Can > someone please merge this patch or indicate what's wrong with it? At this point you will need to simply resubmit it. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v5] net/phy: micrel: Add OF configuration support for ksz9021 2013-08-05 7:04 ` [PATCH v5] net/phy: micrel: Add OF configuration support for ksz9021 Sean Cross 2013-08-05 7:41 ` Duan Fugang-B38611 2013-08-05 7:58 ` Sascha Hauer @ 2013-08-20 9:17 ` Sascha Hauer 2 siblings, 0 replies; 10+ messages in thread From: Sascha Hauer @ 2013-08-20 9:17 UTC (permalink / raw) To: Sean Cross Cc: Duan Fugang-B38611, netdev, devicetree, David Miller, stephen, Steven Rostedt On Mon, Aug 05, 2013 at 07:04:08AM +0000, Sean Cross wrote: > Some boards require custom PHY configuration, for example due to trace > length differences. Add the ability to configure these registers in > order to get the PHY to function on boards that need it. > > Because PHYs are auto-detected based on MDIO device IDs, allow PHY > configuration to be specified in the parent Ethernet device node if no > PHY device node is present. > > Signed-off-by: Sean Cross <xobs@kosagi.com> > --- > .../devicetree/bindings/net/micrel-ksz9021.txt | 49 ++++++++++ > drivers/net/phy/micrel.c | 101 +++++++++++++++++++- > 2 files changed, 149 insertions(+), 1 deletion(-) > create mode 100644 Documentation/devicetree/bindings/net/micrel-ksz9021.txt > > diff --git a/Documentation/devicetree/bindings/net/micrel-ksz9021.txt b/Documentation/devicetree/bindings/net/micrel-ksz9021.txt > new file mode 100644 > index 0000000..338a7e2 > --- /dev/null > +++ b/Documentation/devicetree/bindings/net/micrel-ksz9021.txt > @@ -0,0 +1,49 @@ > +Micrel KSZ9021 Gigabit Ethernet PHY > + > +Some boards require special tuning values, particularly when it comes to > +clock delays. You can specify clock delay values by adding > +micrel-specific properties to an Ethernet OF device node. > + > +All skew control options are specified in picoseconds. The minimum > +value is 0, and the maximum value is 3000. > + > +Optional properties: > + - rxc-skew : Skew control of RXC pad > + - rxdv-skew : Skew control of RX CTL pad > + - txc-skew : Skew control of TXC pad > + - txen-skew : Skew control of TX_CTL pad > + - rxd0-skew : Skew control of RX data 0 pad > + - rxd1-skew : Skew control of RX data 1 pad > + - rxd2-skew : Skew control of RX data 2 pad > + - rxd3-skew : Skew control of RX data 3 pad > + - txd0-skew : Skew control of TX data 0 pad > + - txd1-skew : Skew control of TX data 1 pad > + - txd2-skew : Skew control of TX data 2 pad > + - txd3-skew : Skew control of TX data 3 pad > + > +Examples: > + > + /* Attach to an Ethernet device with autodetected PHY */ > + &enet { > + rxc-skew = <3000>; // picoseconds > + rxdv-skew = <0>; // picoseconds > + txc-skew = <3000>; // picoseconds > + txen-skew = <0>; // picoseconds I prefer to add a -ps suffix to the property names. This makes the comments unnecessary and provides the unit information automatically where it is needed. > + if (val1 != -1) > + newval = ((newval & 0xfff0) | ((val1/200)&0xf) << 0); Please add whitespaces at both sides os operators as required in Documentation/CodingStyle. Otherwise: Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de> Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-08-20 18:35 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2013-08-05 7:04 [PATCH v5] Add OF bindings to Micrel ksz9021 PHY Sean Cross 2013-08-05 7:04 ` [PATCH v5] net/phy: micrel: Add OF configuration support for ksz9021 Sean Cross 2013-08-05 7:41 ` Duan Fugang-B38611 2013-08-05 7:54 ` Sean Cross 2013-08-05 7:58 ` Sascha Hauer 2013-08-05 8:12 ` Sean Cross 2013-08-20 8:34 ` Sean Cross 2013-08-20 8:50 ` Duan Fugang-B38611 2013-08-20 18:35 ` David Miller 2013-08-20 9:17 ` Sascha Hauer
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).