6.3 nfe: strange behavior after hand

[Pyun YongHyeon]

On Fri, Feb 01, 2008 at 03:56:17PM +0200, Andriy Gapon wrote:
 > on 01/02/2008 15:42 Andriy Gapon said the following:
 > > on 01/02/2008 14:36 Pyun YongHyeon said the following:
 > >> After applying attached patch and let me know the output of
 > >> "devid : xxx, revid : xxx, pwr = xxx". It would be even better
 > >> if you can show me the above message for working/non-working case.
 > >>
 > >>
 > > 
 > > Applied the patch with correction to actually print rev instead of dev
 > > for the second time :-)
 > > This is in working case:
 > > devid : 269, revid : a3, pwr = 00000003
 > 
 > A clarification: I just applied the patch, recompiled and re-loaded the
 > module. There was no reboot/poweroff/reset in between.
 > 
 > > Will wait for the non-working situation.
 > > 
 > 

Revert previous patch and try attached patch again and let me know
how it goes.

-- 
Regards,
Pyun YongHyeon
-------------- next part --------------
--- sys/dev/nfe/if_nfe.c.orig	2008-02-02 04:36:24.000000000 +0900
+++ sys/dev/nfe/if_nfe.c	2008-02-04 12:47:11.000000000 +0900
@@ -763,12 +763,6 @@
 
 	if ((sc->nfe_flags & NFE_PWR_MGMT) == 0)
 		return;
-	NFE_WRITE(sc, NFE_RXTX_CTL, NFE_RXTX_RESET | NFE_RXTX_BIT2);
-	NFE_WRITE(sc, NFE_MAC_RESET, NFE_MAC_RESET_MAGIC);
-	DELAY(100);
-	NFE_WRITE(sc, NFE_MAC_RESET, 0);
-	DELAY(100);
-	NFE_WRITE(sc, NFE_RXTX_CTL, NFE_RXTX_BIT2);
 	pwr = NFE_READ(sc, NFE_PWR2_CTL);
 	pwr &= ~NFE_PWR2_WAKEUP_MASK;
 	if (sc->nfe_revid >= 0xa3 &&
@@ -776,6 +770,12 @@
 	    sc->nfe_devid == PCI_PRODUCT_NVIDIA_NFORCE430_LAN2))
 		pwr |= NFE_PWR2_REVA3;
 	NFE_WRITE(sc, NFE_PWR2_CTL, pwr);
+	NFE_WRITE(sc, NFE_RXTX_CTL, NFE_RXTX_RESET | NFE_RXTX_BIT2);
+	NFE_WRITE(sc, NFE_MAC_RESET, NFE_MAC_RESET_MAGIC);
+	DELAY(100);
+	NFE_WRITE(sc, NFE_MAC_RESET, 0);
+	DELAY(100);
+	NFE_WRITE(sc, NFE_RXTX_CTL, NFE_RXTX_BIT2);
 }