* [U-Boot] [PATCH v5 1/3] net: phy: Optionally force master mode for RTL PHY
2016-03-25 17:22 [U-Boot] [PATCH v5 0/3] net: phy: Force master mode for RTL8211C on some boards Michael Haas
@ 2016-03-25 17:22 ` Michael Haas
2016-03-25 21:11 ` Joe Hershberger
2016-03-25 17:22 ` [U-Boot] [PATCH v5 2/3] sunxi: A20-Olimex-SOM-EVB: Force 8211CL to master Michael Haas
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Michael Haas @ 2016-03-25 17:22 UTC (permalink / raw)
To: u-boot
This patch introduces CONFIG_RTL8211X_PHY_FORCE_MASTER. If this
define is set, RTL8211x PHYs (except for the RTL8211F) will have their
1000BASE-T master/slave autonegotiation disabled and forced to master
mode.
This is helpful for PHYs like the RTL8211C which produce unstable links
in slave mode. Such problems have been found on the A20-Olimex-SOM-EVB
and A20-OLinuXino-Lime2.
There is no proper way to identify affected PHYs in software as the
RTL8211C shares its UID with the RTL8211B. Thus, this fix requires
the introduction of an #ifdef.
CC: fradav at gmail.com
CC: merker at debian.org
CC: hdegoede at redhat.com
CC: ijc at hellion.org.uk
CC: joe.hershberger at ni.com
Signed-off-by: Michael Haas <haas@computerlinguist.org>
Tested-by: Karsten Merker <merker@debian.org>
---
Changes in v5:
- Improve formatting of Kconfig help text. No content change. Change
suggested by Karsten Merker.
Changes in v4:
- Squashed previously separate commit introducing KCONFIG variable
into commit containing main code change (Hans de Goede's suggestion)
- Changed KCONFIG description according to Karsten Merker's suggestions
plus some clarification of my own
- Changed commit message according to Karsten Merker's suggestions
Changes in v3:
- Remove incorrect detection of RTL8211CL and use #ifdef instead
(thanks to Karsten Merker)
- Introduced constants for register bits
Changes in v2:
- Removed accidental inclusion of Karsten's patch in my first submission of this series.
- Fix a typo in the code: 6 -> &
drivers/net/Kconfig | 21 +++++++++++++++++++++
drivers/net/phy/realtek.c | 13 ++++++++++++-
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 2a229b8..e0008fd 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -13,6 +13,27 @@ config PHYLIB
help
Enable Ethernet PHY (physical media interface) support.
+config RTL8211X_PHY_FORCE_MASTER
+ bool "Ethernet PHY RTL8211x: force 1000BASE-T master mode"
+ depends on PHYLIB
+ help
+ Force master mode for 1000BASE-T on RTl8211x PHYs (except for RTL8211F).
+ This can work around link stability and data corruption issues on gigabit
+ links which can occur in slave mode on certain PHYs, e.g. on the
+ RTL8211C(L).
+
+ Please note that two directly connected devices (i.e. via crossover cable)
+ will not be able to establish a link between each other if they both force
+ master mode. Multiple devices forcing master mode when connected by a
+ network switch do not pose a problem as the switch configures its affected
+ ports into slave mode.
+
+ This option only affects gigabit links. If you must establish a direct
+ connection between two devices which both force master mode, try forcing
+ the link speed to 100MBit/s.
+
+ If unsure, say N.
+
menuconfig NETDEVICES
bool "Network device support"
depends on NET
diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index 259a87f..359ec50 100644
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -12,6 +12,10 @@
#define PHY_AUTONEGOTIATE_TIMEOUT 5000
+/* RTL8211x 1000BASE-T Control Register */
+#define MIIM_RTL8211x_CTRL1000T_MSCE (1 << 12);
+#define MIIM_RTL8211X_CTRL1000T_MASTER (1 << 11);
+
/* RTL8211x PHY Status Register */
#define MIIM_RTL8211x_PHY_STATUS 0x11
#define MIIM_RTL8211x_PHYSTAT_SPEED 0xc000
@@ -53,7 +57,14 @@ static int rtl8211x_config(struct phy_device *phydev)
*/
phy_write(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211x_PHY_INER,
MIIM_RTL8211x_PHY_INTR_DIS);
-
+#ifdef CONFIG_RTL8211X_PHY_FORCE_MASTER
+ unsigned int reg = phy_read(phydev, MDIO_DEVAD_NONE, MII_CTRL1000);
+ /* force manual master/slave configuration */
+ reg |= MIIM_RTL8211x_CTRL1000T_MSCE;
+ /* force master mode */
+ reg |= MIIM_RTL8211X_CTRL1000T_MASTER;
+ phy_write(phydev, MDIO_DEVAD_NONE, MII_CTRL1000, reg);
+#endif
/* read interrupt status just to clear it */
phy_read(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211x_PHY_INER);
--
2.7.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [U-Boot] [PATCH v5 1/3] net: phy: Optionally force master mode for RTL PHY
2016-03-25 17:22 ` [U-Boot] [PATCH v5 1/3] net: phy: Optionally force master mode for RTL PHY Michael Haas
@ 2016-03-25 21:11 ` Joe Hershberger
2016-03-28 12:54 ` Hans de Goede
0 siblings, 1 reply; 8+ messages in thread
From: Joe Hershberger @ 2016-03-25 21:11 UTC (permalink / raw)
To: u-boot
On Fri, Mar 25, 2016 at 12:22 PM, Michael Haas
<haas@computerlinguist.org> wrote:
> This patch introduces CONFIG_RTL8211X_PHY_FORCE_MASTER. If this
> define is set, RTL8211x PHYs (except for the RTL8211F) will have their
> 1000BASE-T master/slave autonegotiation disabled and forced to master
> mode.
>
> This is helpful for PHYs like the RTL8211C which produce unstable links
> in slave mode. Such problems have been found on the A20-Olimex-SOM-EVB
> and A20-OLinuXino-Lime2.
>
> There is no proper way to identify affected PHYs in software as the
> RTL8211C shares its UID with the RTL8211B. Thus, this fix requires
> the introduction of an #ifdef.
>
> CC: fradav at gmail.com
> CC: merker at debian.org
> CC: hdegoede at redhat.com
> CC: ijc at hellion.org.uk
> CC: joe.hershberger at ni.com
>
> Signed-off-by: Michael Haas <haas@computerlinguist.org>
> Tested-by: Karsten Merker <merker@debian.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v5 1/3] net: phy: Optionally force master mode for RTL PHY
2016-03-25 21:11 ` Joe Hershberger
@ 2016-03-28 12:54 ` Hans de Goede
2016-03-28 16:12 ` Joe Hershberger
0 siblings, 1 reply; 8+ messages in thread
From: Hans de Goede @ 2016-03-28 12:54 UTC (permalink / raw)
To: u-boot
Hi,
On 25-03-16 22:11, Joe Hershberger wrote:
> On Fri, Mar 25, 2016 at 12:22 PM, Michael Haas
> <haas@computerlinguist.org> wrote:
>> This patch introduces CONFIG_RTL8211X_PHY_FORCE_MASTER. If this
>> define is set, RTL8211x PHYs (except for the RTL8211F) will have their
>> 1000BASE-T master/slave autonegotiation disabled and forced to master
>> mode.
>>
>> This is helpful for PHYs like the RTL8211C which produce unstable links
>> in slave mode. Such problems have been found on the A20-Olimex-SOM-EVB
>> and A20-OLinuXino-Lime2.
>>
>> There is no proper way to identify affected PHYs in software as the
>> RTL8211C shares its UID with the RTL8211B. Thus, this fix requires
>> the introduction of an #ifdef.
>>
>> CC: fradav at gmail.com
>> CC: merker at debian.org
>> CC: hdegoede at redhat.com
>> CC: ijc at hellion.org.uk
>> CC: joe.hershberger at ni.com
>>
>> Signed-off-by: Michael Haas <haas@computerlinguist.org>
>> Tested-by: Karsten Merker <merker@debian.org>
>
> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Series looks good to me:
Acked-by: Hans de Goede <hdegoede@redhat.com>
Joe, how do you want to proceed with upstreaming this, shall I take
all 3 patches upstream through u-boot-sunxi ?
Regards,
Hans
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v5 1/3] net: phy: Optionally force master mode for RTL PHY
2016-03-28 12:54 ` Hans de Goede
@ 2016-03-28 16:12 ` Joe Hershberger
0 siblings, 0 replies; 8+ messages in thread
From: Joe Hershberger @ 2016-03-28 16:12 UTC (permalink / raw)
To: u-boot
Hi Hans,
On Mon, Mar 28, 2016 at 7:54 AM, Hans de Goede <hdegoede@redhat.com> wrote:
> Hi,
>
>
> On 25-03-16 22:11, Joe Hershberger wrote:
>>
>> On Fri, Mar 25, 2016 at 12:22 PM, Michael Haas
>> <haas@computerlinguist.org> wrote:
>>>
>>> This patch introduces CONFIG_RTL8211X_PHY_FORCE_MASTER. If this
>>> define is set, RTL8211x PHYs (except for the RTL8211F) will have their
>>> 1000BASE-T master/slave autonegotiation disabled and forced to master
>>> mode.
>>>
>>> This is helpful for PHYs like the RTL8211C which produce unstable links
>>> in slave mode. Such problems have been found on the A20-Olimex-SOM-EVB
>>> and A20-OLinuXino-Lime2.
>>>
>>> There is no proper way to identify affected PHYs in software as the
>>> RTL8211C shares its UID with the RTL8211B. Thus, this fix requires
>>> the introduction of an #ifdef.
>>>
>>> CC: fradav at gmail.com
>>> CC: merker at debian.org
>>> CC: hdegoede at redhat.com
>>> CC: ijc at hellion.org.uk
>>> CC: joe.hershberger at ni.com
>>>
>>> Signed-off-by: Michael Haas <haas@computerlinguist.org>
>>> Tested-by: Karsten Merker <merker@debian.org>
>>
>>
>> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
>
>
> Series looks good to me:
>
> Acked-by: Hans de Goede <hdegoede@redhat.com>
>
> Joe, how do you want to proceed with upstreaming this, shall I take
> all 3 patches upstream through u-boot-sunxi ?
Sounds good to me.
-Joe
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v5 2/3] sunxi: A20-Olimex-SOM-EVB: Force 8211CL to master
2016-03-25 17:22 [U-Boot] [PATCH v5 0/3] net: phy: Force master mode for RTL8211C on some boards Michael Haas
2016-03-25 17:22 ` [U-Boot] [PATCH v5 1/3] net: phy: Optionally force master mode for RTL PHY Michael Haas
@ 2016-03-25 17:22 ` Michael Haas
2016-03-25 17:22 ` [U-Boot] [PATCH v5 3/3] sunxi: A20-OLinuXino-Lime2: " Michael Haas
2016-03-31 12:31 ` [U-Boot] [PATCH v5 0/3] net: phy: Force master mode for RTL8211C on some boards Hans de Goede
3 siblings, 0 replies; 8+ messages in thread
From: Michael Haas @ 2016-03-25 17:22 UTC (permalink / raw)
To: u-boot
Force master mode for 1000BASE-T operation on the
A20-Olimex-SOM-EVB.
Karsten Merker reports that this change is necessary to get a reliable
link at gigabit speeds.
Signed-off-by: Michael Haas <haas@computerlinguist.org>
---
Changes in v5:
- Fix order of defconfig entry (suggested by Karsten Marker)
Series-changes: 4
- Changed commit summary according to Chen-Yu Tsai's suggestion,
modified to fit the 70 character limit
Changes in v4: None
Changes in v3: None
Changes in v2: None
configs/A20-Olimex-SOM-EVB_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/configs/A20-Olimex-SOM-EVB_defconfig b/configs/A20-Olimex-SOM-EVB_defconfig
index 66d8f98..bcfbf9c 100644
--- a/configs/A20-Olimex-SOM-EVB_defconfig
+++ b/configs/A20-Olimex-SOM-EVB_defconfig
@@ -17,5 +17,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3)"
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
CONFIG_CMD_GPIO=y
+CONFIG_RTL8211X_PHY_FORCE_MASTER=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_USB_EHCI_HCD=y
--
2.7.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v5 3/3] sunxi: A20-OLinuXino-Lime2: Force 8211CL to master
2016-03-25 17:22 [U-Boot] [PATCH v5 0/3] net: phy: Force master mode for RTL8211C on some boards Michael Haas
2016-03-25 17:22 ` [U-Boot] [PATCH v5 1/3] net: phy: Optionally force master mode for RTL PHY Michael Haas
2016-03-25 17:22 ` [U-Boot] [PATCH v5 2/3] sunxi: A20-Olimex-SOM-EVB: Force 8211CL to master Michael Haas
@ 2016-03-25 17:22 ` Michael Haas
2016-03-31 12:31 ` [U-Boot] [PATCH v5 0/3] net: phy: Force master mode for RTL8211C on some boards Hans de Goede
3 siblings, 0 replies; 8+ messages in thread
From: Michael Haas @ 2016-03-25 17:22 UTC (permalink / raw)
To: u-boot
Force master mode on the A20-OLinuXino-Lime2. This change is required
to get a reliable link at gigabit speeds.
Signed-off-by: Michael Haas <haas@computerlinguist.org>
---
Changes in v5:
- Fix order of defconfig entry (suggested by Karsten Marker)
Changes in v4:
- Changed commit summary according to Chen-Yu Tsai's suggestion,
modified to fit the 70 character limit
Changes in v3: None
Changes in v2: None
configs/A20-OLinuXino-Lime2_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
index 95c67d6..1de503a 100644
--- a/configs/A20-OLinuXino-Lime2_defconfig
+++ b/configs/A20-OLinuXino-Lime2_defconfig
@@ -14,5 +14,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3)"
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
CONFIG_CMD_GPIO=y
+CONFIG_RTL8211X_PHY_FORCE_MASTER=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_USB_EHCI_HCD=y
--
2.7.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v5 0/3] net: phy: Force master mode for RTL8211C on some boards
2016-03-25 17:22 [U-Boot] [PATCH v5 0/3] net: phy: Force master mode for RTL8211C on some boards Michael Haas
` (2 preceding siblings ...)
2016-03-25 17:22 ` [U-Boot] [PATCH v5 3/3] sunxi: A20-OLinuXino-Lime2: " Michael Haas
@ 2016-03-31 12:31 ` Hans de Goede
3 siblings, 0 replies; 8+ messages in thread
From: Hans de Goede @ 2016-03-31 12:31 UTC (permalink / raw)
To: u-boot
Hi,
On 25-03-16 18:22, Michael Haas wrote:
> This patch is required to get reliable 1000BASE-T operation on some
> boards using the RTL8211C(L) PHY.
>
> Following discussions on v2 of this patch, I have removed the incorrect
> check for the RTL8211C(L). Affected boards now have to define
> CONFIG_RTL8211X_PHY_FORCE_MASTER to benefit from the fix.
>
> Note that this patch requires Karsten Merkers '[PATCH] net: phy: Realtek
> RTL8211B/C PHY ID fix' as well as Hans de Goede's recent u-boot-sunxi
> pull request, specifically 1eae8f66ff749409eb96e2f3f3387c56232d0b8a and
> fc8991c61c393ce6a9d3dfc97cb56dbbd9e8cbba.
>
> Michael
Thanks, I've applied this series to my tree, and it will be part of
the next u-boot-sunxi pull-req.
Regards,
Hans
>
>
> Changes in v5:
> - Improve formatting of Kconfig help text. No content change. Change
> suggested by Karsten Merker.
> - Fix order of defconfig entry (suggested by Karsten Marker)
> Series-changes: 4
> - Changed commit summary according to Chen-Yu Tsai's suggestion,
> modified to fit the 70 character limit
> - Fix order of defconfig entry (suggested by Karsten Marker)
>
> Changes in v4:
> - Squashed previously separate commit introducing KCONFIG variable
> into commit containing main code change (Hans de Goede's suggestion)
> - Changed KCONFIG description according to Karsten Merker's suggestions
> plus some clarification of my own
> - Changed commit message according to Karsten Merker's suggestions
> - Changed commit summary according to Chen-Yu Tsai's suggestion,
> modified to fit the 70 character limit
>
> Changes in v3:
> - Remove incorrect detection of RTL8211CL and use #ifdef instead
> (thanks to Karsten Merker)
> - Introduced constants for register bits
>
> Changes in v2:
> - Removed accidental inclusion of Karsten's patch in my first submission of this series.
> - Fix a typo in the code: 6 -> &
>
> Michael Haas (3):
> net: phy: Optionally force master mode for RTL PHY
> sunxi: A20-Olimex-SOM-EVB: Force 8211CL to master
> sunxi: A20-OLinuXino-Lime2: Force 8211CL to master
>
> configs/A20-OLinuXino-Lime2_defconfig | 1 +
> configs/A20-Olimex-SOM-EVB_defconfig | 1 +
> drivers/net/Kconfig | 21 +++++++++++++++++++++
> drivers/net/phy/realtek.c | 13 ++++++++++++-
> 4 files changed, 35 insertions(+), 1 deletion(-)
>
^ permalink raw reply [flat|nested] 8+ messages in thread