shithub: riscv

Download patch

ref: 83aa7ba70933335cd579b560a793b7741d5e3931
parent: 998d47855044d262db7608a72929f2b59e858226
author: cinap_lenrek <[email protected]>
date: Sun Jan 13 12:17:11 EST 2019 

ether82563: fix bugus FCA write and link detection for i217

the FCA registers 0x28, 0x2C have been reassigned to
to FEXTNVM on i217, i218 and i219 so add Fnofca flag
and avoid writing the registers.

make link detection more robust on i217 by delaying the
phy status read after link status change by 150ms. we'd
otherwise get a "phy wedged" (power saving state?) and
not update the link status until the next link change.


--- a/sys/src/9/pc/ether82563.c
+++ b/sys/src/9/pc/ether82563.c
@@ -463,6 +463,7 @@
 	F79phy	= 1<<5,
 	Fnofct	= 1<<6,
 	Fbadcsum= 1<<7,
+	Fnofca	= 1<<8,
 };
 
 typedef struct Ctlrtype Ctlrtype;
@@ -491,9 +492,9 @@
 [i82580]	"i82580",	9728,	F75|F79phy,
 [i82583]	"i82583",	1514,	0,
 [i210]		"i210",		9728,	F75|Fnofct|Fert,
-[i217]		"i217",		2048,	Fload|Fert|Fnofct|Fbadcsum,	/* 9018, but unstable above 2k */
-[i218]		"i218",		9018,	Fload|Fert|F79phy|Fnofct|Fbadcsum,
-[i219]		"i219",		9018,	Fload|Fert|F79phy|Fnofct|Fbadcsum,
+[i217]		"i217",		2048,	Fload|Fert|F79phy|Fnofct|Fnofca|Fbadcsum,/* 9018, but unstable above 2k */
+[i218]		"i218",		9018,	Fload|Fert|F79phy|Fnofct|Fnofca|Fbadcsum,
+[i219]		"i219",		9018,	Fload|Fert|F79phy|Fnofct|Fnofca|Fbadcsum,
 [i350]		"i350",		9728,	F75|F79phy|Fnofct,
 };
 
@@ -1192,7 +1193,7 @@
 static void
 phyl79proc(void *v)
 {
-	uint a, i, r, phy, phyno;
+	uint i, r, phy, phyno;
 	Ctlr *c;
 	Ether *e;
 
@@ -1205,19 +1206,21 @@
 		lsleep(c, Lsc);
 
 	for(;;){
-		phy = phyread(c, phyno, Phystat);
-		if(phy == ~0){
-			phy = 0;
-			i = 3;
-			goto next;
+		phy = 0;
+		for(i=0; i<4; i++){
+			tsleep(&up->sleep, return0, 0, 150);
+			phy = phyread(c, phyno, Phystat);
+			if(phy == ~0)
+				continue;
+			if(phy & Ans){
+				r = phyread(c, phyno, Phyctl);
+				if(r == ~0)
+					continue;
+				phywrite(c, phyno, Phyctl, r | Ran | Ean);
+			}
+			break;
 		}
 		i = (phy>>8) & 3;
-		a = phy & Ans;
-		if(a){
-			r = phyread(c, phyno, Phyctl);
-			phywrite(c, phyno, Phyctl, r | Ran | Ean);
-		}
-next:
 		e->link = i != 3 && (phy & Link) != 0;
 		if(e->link == 0)
 			i = 3;
@@ -1785,8 +1788,10 @@
 	memset(ctlr->mta, 0, sizeof(ctlr->mta));
 	for(i = 0; i < 128; i++)
 		csr32w(ctlr, Mta + i*4, 0);
-	csr32w(ctlr, Fcal, 0x00C28001);
-	csr32w(ctlr, Fcah, 0x0100);
+	if((flag & Fnofca) == 0){
+		csr32w(ctlr, Fcal, 0x00C28001);
+		csr32w(ctlr, Fcah, 0x0100);
+	}
 	if((flag & Fnofct) == 0)
 		csr32w(ctlr, Fct, 0x8808);
 	csr32w(ctlr, Fcttv, 0x0100);