Thu Sep 1 14:39:04 2011 UTC ()

Initialize MVGBE_MTU to 0, as suggested by the Orion databook.

If the platform firmware did not initialize this to 0 for us,
we were unable to transmit frames.


(jakllsch)

diff -r1.10 -r1.11 src/sys/dev/marvell/if_mvgbe.c

--- src/sys/dev/marvell/if_mvgbe.c 2011/07/30 19:06:57	1.10
+++ src/sys/dev/marvell/if_mvgbe.c 2011/09/01 14:39:03	1.11

 @@ -1,41 +1,41 @@
-/*	$NetBSD: if_mvgbe.c,v 1.10 2011/07/30 19:06:57 rjs Exp $	*/
+/*	$NetBSD: if_mvgbe.c,v 1.11 2011/09/01 14:39:03 jakllsch Exp $	*/
 /*
  * Copyright (c) 2007, 2008 KIYOHARA Takashi
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.10 2011/07/30 19:06:57 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.11 2011/09/01 14:39:03 jakllsch Exp $");
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/sockio.h>
 #include <dev/marvell/marvellreg.h>
 @@ -970,26 +970,27 @@ mvgbe_init(struct ifnet *ifp)
 	/* Init TX/RX descriptors */
 	if (mvgbe_init_tx_ring(sc) == ENOBUFS) {
 		aprint_error_ifnet(ifp,
 		    "initialization failed: no memory for tx buffers\n");
 		return ENOBUFS;
+	}
 	if (mvgbe_init_rx_ring(sc) == ENOBUFS) {
 		aprint_error_ifnet(ifp,
 		    "initialization failed: no memory for rx buffers\n");
 		return ENOBUFS;
+	}
 	MVGBE_WRITE(sc, MVGBE_MTU, 0);		/* hw reset value is wrong */
 	MVGBE_WRITE(sc, MVGBE_PSC,
 	    MVGBE_PSC_ANFC |			/* Enable Auto-Neg Flow Ctrl */
 	    MVGBE_PSC_RESERVED |		/* Must be set to 1 */
 	    MVGBE_PSC_FLFAIL |			/* Do NOT Force Link Fail */
 	    MVGBE_PSC_MRU(MVGBE_PSC_MRU_9022) | /* we want 9k */
 	    MVGBE_PSC_SETFULLDX);		/* Set_FullDx */
 	/* XXXX: mvgbe(4) always use RGMII. */
 	MVGBE_WRITE(sc, MVGBE_PSC1,
 	    MVGBE_READ(sc, MVGBE_PSC1) | MVGBE_PSC1_RGMIIEN);
 	/* XXXX: Also always Weighted Round-Robin Priority Mode */
 	MVGBE_WRITE(sc, MVGBE_TQFPC, MVGBE_TQFPC_EN(0));
 	MVGBE_WRITE(sc, MVGBE_CRDP(0), MVGBE_RX_RING_ADDR(sc, 0));