Skip to contentSkip to conversation

TSEC: Add the support for RealTek RTL8211B PHY

PATCH New Dave Liu 4 participants 6 messages Jan 11, 2008 – Jan 14, 2008 Network drivers

lore
Share & tools
lore

Dave Liu

author
#0 lore raw

PATCH 2/4 TSEC: Add the support for RealTek RTL8211B PHY

Add the support of RealTek RTL8211B PHY, the RTL8211B PHY only supports RGMII and MII mode.

Signed-off-by Dave Liu <[email protected]>
---
 drivers/net/tsec.c |   85 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/net/tsec.h |    8 +++++
 2 files changed, 93 insertions(+), 0 deletions(-)
drivers/net/tsec.c +85 -0
index 25392f6..54f35c4 100644
@@ -571,6 +571,63 @@ uint mii_parse_88E1011_psr(uint mii_reg, struct tsec_private * priv)
 	return 0;
 }
 
+/* Parse the RTL8211B's status register for speed and duplex
+ * information
+ */
+uint mii_parse_RTL8211B_sr(uint mii_reg, struct tsec_private * priv)
+{
+	uint speed;
+
+	mii_reg = read_phy_reg(priv, MIIM_RTL8211B_PHY_STATUS);
+	if ((mii_reg & MIIM_RTL8211B_PHYSTAT_LINK) &&
+		!(mii_reg & MIIM_RTL8211B_PHYSTAT_SPDDONE)) {
+		int i = 0;
+
+		puts("Waiting for PHY realtime link");
+		while (!(mii_reg & MIIM_RTL8211B_PHYSTAT_SPDDONE)) {
+			/* Timeout reached ? */
+			if (i > PHY_AUTONEGOTIATE_TIMEOUT) {
+				puts(" TIMEOUT !\n");
+				priv->link = 0;
+				break;
+			}
+
+			if ((i++ % 1000) == 0) {
+				putc('.');
+			}
+			udelay(1000);	/* 1 ms */
+			mii_reg = read_phy_reg(priv, MIIM_RTL8211B_PHY_STATUS);
+		}
+		puts(" done\n");
+		udelay(500000);	/* another 500 ms (results in faster booting) */
+	} else {
+		if (mii_reg & MIIM_RTL8211B_PHYSTAT_LINK)
+			priv->link = 1;
+		else
+			priv->link = 0;
+	}
+
+	if (mii_reg & MIIM_RTL8211B_PHYSTAT_DUPLEX)
+		priv->duplexity = 1;
+	else
+		priv->duplexity = 0;
+
+	speed = (mii_reg & MIIM_RTL8211B_PHYSTAT_SPEED);
+
+	switch (speed) {
+	case MIIM_RTL8211B_PHYSTAT_GBIT:
+		priv->speed = 1000;
+		break;
+	case MIIM_RTL8211B_PHYSTAT_100:
+		priv->speed = 100;
+		break;
+	default:
+		priv->speed = 10;
+	}
+
+	return 0;
+}
+
 /* Parse the cis8201's status register for speed and duplex
  * information
  */

@@ -1361,6 +1418,33 @@ struct phy_info phy_info_dp83865 = {
 			   },
 };
 
+struct phy_info phy_info_rtl8211b = {
+	0x001cc91,
+	"RealTek RTL8211B",
+	4,
+	(struct phy_cmd[]){	/* config */
+		/* Reset and configure the PHY */
+		{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
+		{MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL},
+		{MIIM_ANAR, MIIM_ANAR_INIT, NULL},
+		{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
+		{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
+		{miim_end,}
+	},
+	(struct phy_cmd[]){	/* startup */
+		/* Status is read once to clear old link state */
+		{MIIM_STATUS, miim_read, NULL},
+		/* Auto-negotiate */
+		{MIIM_STATUS, miim_read, &mii_parse_sr},
+		/* Read the status */
+		{MIIM_RTL8211B_PHY_STATUS, miim_read, &mii_parse_RTL8211B_sr},
+		{miim_end,}
+	},
+	(struct phy_cmd[]){	/* shutdown */
+		{miim_end,}
+	},
+};
+
 struct phy_info *phy_info[] = {
 	&phy_info_cis8204,
 	&phy_info_cis8201,

@@ -1374,6 +1458,7 @@ struct phy_info *phy_info[] = {
 	&phy_info_lxt971,
 	&phy_info_VSC8244,
 	&phy_info_dp83865,
+	&phy_info_rtl8211b,
 	&phy_info_generic,
 	NULL
 };
drivers/net/tsec.h +8 -0
index 2f0092a..d4dc15a 100644
@@ -184,6 +184,14 @@
 #define MIIM_88E1145_PHY_PAGE   29
 #define MIIM_88E1145_PHY_CAL_OV 30
 
+/* RTL8211B PHY Status Register */
+#define MIIM_RTL8211B_PHY_STATUS	0x11
+#define MIIM_RTL8211B_PHYSTAT_SPEED	0xc000
+#define MIIM_RTL8211B_PHYSTAT_GBIT	0x8000
+#define MIIM_RTL8211B_PHYSTAT_100	0x4000
+#define MIIM_RTL8211B_PHYSTAT_DUPLEX	0x2000
+#define MIIM_RTL8211B_PHYSTAT_SPDDONE	0x0800
+#define MIIM_RTL8211B_PHYSTAT_LINK	0x0400
 
 /* DM9161 Control register values */
 #define MIIM_DM9161_CR_STOP	0x0400
Signature · 1 line
1.5.3.5.643.g40e25
#1 lore raw

PATCH 2/4 TSEC: Add the support for RealTek RTL8211B PHY

Quoted 8 lines · Dave Liu

Add the support of RealTek RTL8211B PHY, the RTL8211B PHY only supports RGMII and MII mode.

Signed-off-by Dave Liu <[email protected]>

---
+/* Parse the RTL8211B's status register for speed and duplex
+ * information
+ */

I'd prefer if we didn't unnecessarily proliferate phy-specific status code. Does the generic mii_parse_sr() function not work for the RTL8211B? If so, this is fine. Otherwise, let's not have 10 different versions of the same code, just because many PHYs have their own non-standard registers.

Other than that, I'm fine with this, and looking forward to seeing Ben's PHY rework. :)

Andy

#2 lore raw

PATCH 2/4 TSEC: Add the support for RealTek RTL8211B PHY

Quoted 5 lines

I'd prefer if we didn't unnecessarily proliferate phy-specific status code. Does the generic mii_parse_sr() function not work for the RTL8211B? If so, this is fine. Otherwise, let's not have 10 different versions of the same code, just because many PHYs have their own non-standard registers.

I will try to the generic mii_parse_sr in next week.

Quoted 2 lines

Other than that, I'm fine with this, and looking forward to seeing Ben's PHY rework. :)

and me, welcome Ben's rework.

Thanks,
Dave

author
#3 lore raw

PATCH 2/4 TSEC: Add the support for RealTekRTL8211B PHY

Quoted 9 lines · Liu Dave
Quoted 1 line

I'd prefer if we didn't unnecessarily proliferate phy-specific

status

Quoted 3 lines

code. Does the generic mii_parse_sr() function not work for the RTL8211B? If so, this is fine. Otherwise, let's not have 10 different versions of the same code, just because many PHYs have

their

Quoted 1 line

own non-standard registers.

I will try to the generic mii_parse_sr in next week.

not work for RTL8211B, please add the specific code to tsec.c

Thanks,
Dave

#5 lore raw

PATCH 2/4 TSEC: Add the support for RealTek RTL8211B PHY

Quoted 5 lines · Andy Fleming
Quoted 3 lines · Dave Liu

Add the support of RealTek RTL8211B PHY, the RTL8211B PHY only supports RGMII and MII mode.

Quoted 8 lines
Quoted 2 lines
Signed-off-by Dave Liu <[email protected]>

Ok, Dave confirmed that this code is needed for this PHY.

Acked-by Andy Fleming <[email protected]>

OK, I'll pull it in. Thanks guys.

regards,
Ben