SRU Bug #240648 - [PATCH] UBUNTU: Setup PHYs correctly on rtl8101/2(e) hardware

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

SRU Bug #240648 - [PATCH] UBUNTU: Setup PHYs correctly on rtl8101/2(e) hardware

Tim Gardner-6

--
Tim Gardner [hidden email]

From ff32fd1f99091f2b6a65a524883cc8066c351b1f Mon Sep 17 00:00:00 2001
From: Mario Limonciello <[hidden email]>
Date: Tue, 1 Jul 2008 14:56:15 -0500
Subject: [PATCH] UBUNTU: Setup PHYs correctly on rtl8101/2(e) hardware

OriginalAuthor: Mario Limonciello
Bug: #240648
Ignore: No

This fix was created based upon the differences in the startup procedures
of the Realtek r8101 driver and the upstream r8169 driver.

Signed-off-by: Mario Limonciello <[hidden email]>
Signed-off-by: Tim Gardner <[hidden email]>
---
 drivers/net/r8169.c |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 4c5a875..a194a89 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1139,6 +1139,10 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
  { 0x7cf00000, 0x34000000, RTL_GIGA_MAC_VER_13 },
  { 0x7cf00000, 0x34200000, RTL_GIGA_MAC_VER_16 },
  { 0x7c800000, 0x34000000, RTL_GIGA_MAC_VER_16 },
+ /* 8102EL */
+ { 0x7c800000, 0x24800000, RTL_GIGA_MAC_VER_16 },
+ /* 8102E */
+ { 0x7c800000, 0x34800000, RTL_GIGA_MAC_VER_16 },
  /* FIXME: where did these entries come from ? -- FR */
  { 0xfc800000, 0x38800000, RTL_GIGA_MAC_VER_15 },
  { 0xfc800000, 0x30800000, RTL_GIGA_MAC_VER_14 },
@@ -1299,6 +1303,21 @@ static void rtl8168cx_hw_phy_config(void __iomem *ioaddr)
  rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
 }
 
+static void rtl8101_hw_phy_config(void __iomem *ioaddr)
+{
+ struct phy_reg phy_reg_init[] = {
+ { 0x1f, 0x0000 },
+ { 0x11, mdio_read(ioaddr,0x11) | 0x1000 },
+ { 0x19, mdio_read(ioaddr,0x19) | 0x2000 },
+ { 0x1f, 0x0003 },
+ { 0x08, 0x441D },
+ { 0x01, 0xc066 },
+ { 0x1f, 0x0000 }
+ };
+
+ rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
+}
+
 static void rtl_hw_phy_config(struct net_device *dev)
 {
  struct rtl8169_private *tp = netdev_priv(dev);
@@ -1316,6 +1335,9 @@ static void rtl_hw_phy_config(struct net_device *dev)
  case RTL_GIGA_MAC_VER_04:
  rtl8169sb_hw_phy_config(ioaddr);
  break;
+ case RTL_GIGA_MAC_VER_13:
+ case RTL_GIGA_MAC_VER_16:
+ rtl8101_hw_phy_config(ioaddr);
  case RTL_GIGA_MAC_VER_18:
  rtl8168cp_hw_phy_config(ioaddr);
  break;
@@ -1438,8 +1460,11 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp)
 
  rtl_hw_phy_config(dev);
 
- dprintk("Set MAC Reg C+CR Offset 0x82h = 0x01h\n");
- RTL_W8(0x82, 0x01);
+ if (tp->mac_version != RTL_GIGA_MAC_VER_13 && tp->mac_version != RTL_GIGA_MAC_VER_16)
+ {
+ dprintk("Set MAC Reg C+CR Offset 0x82h = 0x01h\n");
+ RTL_W8(0x82, 0x01);
+ }
 
  pci_write_config_byte(tp->pci_dev, PCI_LATENCY_TIMER, 0x40);
 
--
1.5.4.3


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: SRU Bug #240648 - [PATCH] UBUNTU: Setup PHYs correctly on rtl8101/2(e) hardware

Stefan Bader-2
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Tim Gardner wrote:

Ack (assuming this has been seen to fix issues)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIcnrZP+TjRTJVqvQRAsfmAJ4iLLkm1f1Bb9BoR1CEI0IvNs/CTQCgyhAb
kFKlKjofcyfrWVEeMG/EhEc=
=Qpv+
-----END PGP SIGNATURE-----

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: SRU Bug #240648 - [PATCH] UBUNTU: Setup PHYs correctly on rtl8101/2(e) hardware

Tim Gardner-6
Stefan Bader wrote:
> Tim Gardner wrote:
>
> Ack (assuming this has been seen to fix issues)

Indeed, I have positive acknowledgment from the Dell folks. I'm a bit
worried about regressions with existing RTL_GIGA_MAC_VER_13 and
RTL_GIGA_MAC_VER_16 chips, but as far as I can tell it looks correct.

rtg
--
Tim Gardner [hidden email]

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team