 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_bnx.c,v 1.38 2010/12/11 14:19:29 pgoyette Exp $	*/
+/*	$NetBSD: if_bnx.c,v 1.39 2010/12/11 14:28:38 martin Exp $	*/
 /*	$OpenBSD: if_bnx.c,v 1.85 2009/11/09 14:32:41 dlg Exp $ */
 /*-
  * Copyright (c) 2006 Broadcom Corporation
  *	David Christensen <davidch@broadcom.com>.  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
 @@ -25,27 +25,27 @@
  * 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>
 #if 0
 __FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $");
 #endif
-__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.38 2010/12/11 14:19:29 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.39 2010/12/11 14:28:38 martin Exp $");
 /*
  * The following controllers are supported by this driver:
  *   BCM5706C A2, A3
  *   BCM5706S A2, A3
  *   BCM5708C B1, B2
  *   BCM5708S B1, B2
  *   BCM5709C A1, C0
  *   BCM5716  C0
+ *
  * The following controllers are not supported by this driver:
+ *
  *   BCM5706C A0, A1
 @@ -3095,32 +3095,32 @@ bnx_init_context(struct bnx_softc *sc)
+		}
 	} else {
 		u_int32_t vcid_addr, offset;
 		/*
 		 * For the 5706/5708, context memory is local to
 		 * the controller, so initialize the controller
 		 * context memory.
 		 */
 		vcid_addr = GET_CID_ADDR(96);
 		while (vcid_addr) {
-			vcid_addr -= PHY_BNX_CTX_SIZE;
+			vcid_addr -= BNX_PHY_CTX_SIZE;
 			REG_WR(sc, BNX_CTX_VIRT_ADDR, 0);
 			REG_WR(sc, BNX_CTX_PAGE_TBL, vcid_addr);
-			for(offset = 0; offset < PHY_BNX_CTX_SIZE; offset += 4) {
+			for(offset = 0; offset < BNX_PHY_CTX_SIZE; offset += 4) {
 				CTX_WR(sc, 0x00, offset, 0);
+			}
 			REG_WR(sc, BNX_CTX_VIRT_ADDR, vcid_addr);
 			REG_WR(sc, BNX_CTX_PAGE_TBL, vcid_addr);
+		}
+	}
+}
 /****************************************************************************/
 /* Fetch the permanent MAC address of the controller.                       */
 /*                                                                          */
 /* Returns:                                                                 */
 @@ -3401,27 +3401,27 @@ bnx_chipinit(struct bnx_softc *sc)
 	val = REG_RD(sc, BNX_MQ_CONFIG);
 	val &= ~BNX_MQ_CONFIG_KNL_BYP_BLK_SIZE;
 	val |= BNX_MQ_CONFIG_KNL_BYP_BLK_SIZE_256;
 	/* Enable bins used on the 5709. */
 	if (BNX_CHIP_NUM(sc) == BNX_CHIP_NUM_5709) {
 		val |= BNX_MQ_CONFIG_BIN_MQ_MODE;
 		if (BNX_CHIP_ID(sc) == BNX_CHIP_ID_5709_A1)
 			val |= BNX_MQ_CONFIG_HALT_DIS;
+	}
 	REG_WR(sc, BNX_MQ_CONFIG, val);
-	val = 0x10000 + (MAX_CID_CNT * MB_KERNEL_BNX_CTX_SIZE);
+	val = 0x10000 + (MAX_CID_CNT * BNX_MB_KERNEL_CTX_SIZE);
 	REG_WR(sc, BNX_MQ_KNL_BYP_WIND_START, val);
 	REG_WR(sc, BNX_MQ_KNL_WIND_END, val);
 	val = (BCM_PAGE_BITS - 8) << 24;
 	REG_WR(sc, BNX_RV2P_CONFIG, val);
 	/* Configure page size. */
 	val = REG_RD(sc, BNX_TBDR_CONFIG);
 	val &= ~BNX_TBDR_CONFIG_PAGE_SIZE;
 	val |= (BCM_PAGE_BITS - 8) << 24 | 0x40;
 	REG_WR(sc, BNX_TBDR_CONFIG, val);
 #if 0

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_bnxreg.h,v 1.12 2010/12/11 12:14:06 martin Exp $	*/
+/*	$NetBSD: if_bnxreg.h,v 1.13 2010/12/11 14:28:38 martin Exp $	*/
 /*	$OpenBSD: if_bnxreg.h,v 1.33 2009/09/05 16:02:28 claudio Exp $  */
 /*-
  * Copyright (c) 2006 Broadcom Corporation
  *	David Christensen <davidch@broadcom.com>.  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
 @@ -4580,46 +4580,46 @@ struct l2_fhdr {
 #define RX_CHAIN_IDX(x) ((x) & MAX_RX_BD)
 #define RX_PAGE(x) (((x) & ~USABLE_RX_BD_PER_PAGE) >> (BCM_PAGE_BITS - 4))
 #define RX_IDX(x) ((x) & USABLE_RX_BD_PER_PAGE)
 /* Context size. */
 #define BNX_CTX_SHIFT			7
 #define BNX_CTX_SIZE			(1 << BNX_CTX_SHIFT)
 #define BNX_CTX_MASK			(BNX_CTX_SIZE - 1)
 #define GET_CID_ADDR(_cid)		((_cid) << BNX_CTX_SHIFT)
 #define GET_CID(_cid_addr)		((_cid_addr) >> BNX_CTX_SHIFT)
-#define PHY_BNX_CTX_SHIFT		6
+#define BNX_PHY_CTX_SHIFT		6
-#define PHY_BNX_CTX_SIZE		(1 << PHY_BNX_CTX_SHIFT)
+#define BNX_PHY_CTX_SIZE		(1 << BNX_PHY_CTX_SHIFT)
-#define PHY_BNX_CTX_MASK		(PHY_BNX_CTX_SIZE - 1)
+#define BNX_PHY_CTX_MASK		(BNX_PHY_CTX_SIZE - 1)
 #define GET_PCID_ADDR(_pcid)		((_pcid) << PHY_BNX_CTX_SHIFT)
 #define GET_PCID(_pcid_addr)		((_pcid_addr) >> PHY_BNX_CTX_SHIFT)
-#define MB_KERNEL_BNX_CTX_SHIFT 	8
+#define BNX_MB_KERNEL_CTX_SHIFT 	8
-#define MB_KERNEL_BNX_CTX_SIZE		(1 << MB_KERNEL_BNX_CTX_SHIFT)
+#define BNX_MB_KERNEL_CTX_SIZE		(1 << BNX_MB_KERNEL_CTX_SHIFT)
-#define MB_KERNEL_BNX_CTX_MASK		(MB_KERNEL_BNX_CTX_SIZE - 1)
+#define BNX_MB_KERNEL_CTX_MASK		(BNX_MB_KERNEL_CTX_SIZE - 1)
-#define MB_GET_CID_ADDR(_cid)		(0x10000 + ((_cid) << MB_KERNEL_BNX_CTX_SHIFT))
+#define BNX_MB_GET_CID_ADDR(_cid)	(0x10000 + ((_cid) << BNX_MB_KERNEL_CTX_SHIFT))
 #define MAX_CID_CNT			0x4000
 #define MAX_CID_ADDR			(GET_CID_ADDR(MAX_CID_CNT))
 #define INVALID_CID_ADDR		0xffffffff
 #define TX_CID		16
 #define RX_CID		0
-#define MB_TX_CID_ADDR	MB_GET_CID_ADDR(TX_CID)
+#define MB_TX_CID_ADDR	BNX_MB_GET_CID_ADDR(TX_CID)
-#define MB_RX_CID_ADDR	MB_GET_CID_ADDR(RX_CID)
+#define MB_RX_CID_ADDR	BNX_MB_GET_CID_ADDR(RX_CID)
 /****************************************************************************/
 /* BNX Processor Firmwware Load Definitions                                 */
 /****************************************************************************/
 struct cpu_reg {
 	u_int32_t mode;
 	u_int32_t mode_value_halt;
 	u_int32_t mode_value_sstep;
 	u_int32_t state;
 	u_int32_t state_value_clear;