[src/netbsd-6]: src/sys/arch/powerpc Pull up following revision(s) (requested...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/63bd3c8a65ba
branches:  netbsd-6
changeset: 774097:63bd3c8a65ba
user:      riz <riz%NetBSD.org@localhost>
date:      Thu May 17 18:09:44 2012 +0000

description:
Pull up following revision(s) (requested by matt in ticket #245):
        sys/arch/powerpc/booke/dev/pq3etsec.c: revision 1.13
        sys/arch/powerpc/include/booke/etsecreg.h: revision 1.4
        sys/arch/powerpc/booke/dev/pq3etsec.c: revision 1.11
        sys/arch/powerpc/booke/dev/pq3etsec.c: revision 1.12
Read maccfg1/maccfg2/ecntrl so we can preserve bits we don't change (like
GMII mode).
Don't use the current value of maccfg2.
Preserve some MACCFG2 bits

diffstat:

 sys/arch/powerpc/booke/dev/pq3etsec.c     |  8 +++++---
 sys/arch/powerpc/include/booke/etsecreg.h |  4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (47 lines):

diff -r 3733c60e0124 -r 63bd3c8a65ba sys/arch/powerpc/booke/dev/pq3etsec.c
--- a/sys/arch/powerpc/booke/dev/pq3etsec.c     Thu May 17 18:02:49 2012 +0000
+++ b/sys/arch/powerpc/booke/dev/pq3etsec.c     Thu May 17 18:09:44 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pq3etsec.c,v 1.9 2011/10/13 19:53:30 matt Exp $        */
+/*     $NetBSD: pq3etsec.c,v 1.9.8.1 2012/05/17 18:09:44 riz Exp $     */
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.9 2011/10/13 19:53:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.9.8.1 2012/05/17 18:09:44 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -501,7 +501,9 @@
        sc->sc_macstnaddr2 = etsec_read(sc, MACSTNADDR2);
        sc->sc_macstnaddr1 = etsec_read(sc, MACSTNADDR1);
        sc->sc_rctrl = RCTRL_DEFAULT;
-       sc->sc_maccfg2 = MACCFG2_DEFAULT;
+       sc->sc_ecntrl = etsec_read(sc, ECNTRL);
+       sc->sc_maccfg1 = etsec_read(sc, MACCFG1);
+       sc->sc_maccfg2 = etsec_read(sc, MACCFG2) | MACCFG2_DEFAULT;
 
        if (sc->sc_macstnaddr1 == 0 && sc->sc_macstnaddr2 == 0) {
                size_t len;
diff -r 3733c60e0124 -r 63bd3c8a65ba sys/arch/powerpc/include/booke/etsecreg.h
--- a/sys/arch/powerpc/include/booke/etsecreg.h Thu May 17 18:02:49 2012 +0000
+++ b/sys/arch/powerpc/include/booke/etsecreg.h Thu May 17 18:09:44 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: etsecreg.h,v 1.3 2011/06/09 19:11:06 matt Exp $        */
+/*     $NetBSD: etsecreg.h,v 1.3.8.1 2012/05/17 18:09:44 riz Exp $     */
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -371,7 +371,7 @@
 #define        MACCFG2_PADCRC  __PPCBIT(29)
 #define        MACCFG2_CRCEN   __PPCBIT(30)
 #define        MACCFG2_FD      __PPCBIT(31)
-#define        MACCFG2_DEFAULT (MACCFG2_FD|MACCFG2_PADCRC|MACCFG2_IFMODE_GMII|MACCFG2_PRELEN_DEFAULT)
+#define        MACCFG2_DEFAULT (MACCFG2_FD|MACCFG2_PADCRC|MACCFG2_PRELEN_DEFAULT)
 #define IPGIFG         0x508 /* Inter-packet/inter-frame gap register */
 #define HAFDUP         0x50C /* Half-duplex control */
 #define MAXFRM         0x510 /* Maximum frame length */