svn commit: r189325 - head/sys/dev/bce

David Christensen davidch at FreeBSD.org
Tue Mar 3 16:05:41 PST 2009


Author: davidch
Date: Wed Mar  4 00:05:40 2009
New Revision: 189325
URL: http://svn.freebsd.org/changeset/base/189325

Log:
  - Updated firmware to latest 4.6.X release.
  - Added missing firmware for 5709 A1 controllers.
  - Changed some debug statistic variable names to be more consistent.
  
  Submitted by:	davidch
  MFC after:	Two weeks

Modified:
  head/sys/dev/bce/if_bce.c
  head/sys/dev/bce/if_bcefw.h
  head/sys/dev/bce/if_bcereg.h

Modified: head/sys/dev/bce/if_bce.c
==============================================================================
--- head/sys/dev/bce/if_bce.c	Tue Mar  3 21:45:47 2009	(r189324)
+++ head/sys/dev/bce/if_bce.c	Wed Mar  4 00:05:40 2009	(r189325)
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
  *   BCM5708C B1, B2
  *   BCM5708S B1, B2
  *   BCM5709C A1, C0
- *   BCM5716  C0
+ * 	 BCM5716C C0
  *
  * The following controllers are not supported by this driver:
  *   BCM5706C A0, A1 (pre-production)
@@ -71,19 +71,19 @@ __FBSDID("$FreeBSD$");
 	/* 1073741824 = 1 in             2 */
 
 	/* Controls how often the l2_fhdr frame error check will fail. */
-	int bce_debug_l2fhdr_status_check = 0;
+	int l2fhdr_error_sim_control = 0;
 
 	/* Controls how often the unexpected attention check will fail. */
-	int bce_debug_unexpected_attention = 0;
+	int unexpected_attention_sim_control = 0;
 
 	/* Controls how often to simulate an mbuf allocation failure. */
-	int bce_debug_mbuf_allocation_failure = 0;
+	int mbuf_alloc_failed_sim_control = 0;
 
 	/* Controls how often to simulate a DMA mapping failure. */
-	int bce_debug_dma_map_addr_failure = 0;
+	int dma_map_addr_failed_sim_control = 0;
 
 	/* Controls how often to simulate a bootcode failure. */
-	int bce_debug_bootcode_running_failure = 0;
+	int bootcode_running_failure_sim_control = 0;
 #endif
 
 /****************************************************************************/
@@ -495,7 +495,8 @@ SYSCTL_UINT(_hw_bce, OID_AUTO, msi_enabl
 /* ToDo: Add tunable to enable/disable strict MTU handling. */
 /* Currently allows "loose" RX MTU checking (i.e. sets the  */
 /* H/W RX MTU to the size of the largest receive buffer, or */
-/* 2048 bytes).                                             */
+/* 2048 bytes). This will cause a UNH failure but is more   */
+/* desireable from a functional perspective.                */
 
 
 /****************************************************************************/
@@ -595,7 +596,7 @@ bce_print_adapter_info(struct bce_softc 
 	}
 
 	/* Firmware version and device features. */
-	printf("F/W (0x%08X); Flags( ", sc->bce_fw_ver);
+	printf("B/C (0x%08X); Flags( ", sc->bce_bc_ver);
 #ifdef ZERO_COPY_SOCKETS
 	printf("SPLT ");
 #endif
@@ -846,7 +847,7 @@ bce_attach(device_t dev)
 		__FUNCTION__, sc->bce_shmem_base);
 
 	/* Fetch the bootcode revision. */
-	sc->bce_fw_ver = REG_RD_IND(sc, sc->bce_shmem_base +
+	sc->bce_bc_ver = REG_RD_IND(sc, sc->bce_shmem_base +
 		BCE_DEV_INFO_BC_REV);
 
 	/* Check if any management firmware is running. */
@@ -2863,20 +2864,16 @@ bce_dma_map_addr(void *arg, bus_dma_segm
 	bus_addr_t *busaddr = arg;
 
 	/* Simulate a mapping failure. */
-	DBRUNIF(DB_RANDOMTRUE(bce_debug_dma_map_addr_failure),
-		printf("bce: %s(%d): Simulating DMA mapping error.\n",
-			__FILE__, __LINE__);
+	DBRUNIF(DB_RANDOMTRUE(dma_map_addr_failed_sim_control),
 		error = ENOMEM);
 
 	/* Check for an error and signal the caller that an error occurred. */
 	if (error) {
-		printf("bce %s(%d): DMA mapping error! error = %d, "
-		    "nseg = %d\n", __FILE__, __LINE__, error, nseg);
 		*busaddr = 0;
-		return;
+	} else {
+		*busaddr = segs->ds_addr;
 	}
 
-	*busaddr = segs->ds_addr;
 	return;
 }
 
@@ -3272,6 +3269,11 @@ bce_dma_alloc(device_t dev)
 #else
 	max_size = max_seg_size = MJUM9BYTES;
 #endif
+	max_segments = 1;
+
+	DBPRINT(sc, BCE_INFO, "%s(): Creating rx_mbuf_tag (max size = 0x%jX "
+		"max segments = %d, max segment size = 0x%jX)\n", __FUNCTION__,
+		(uintmax_t) max_size, max_segments, (uintmax_t) max_seg_size);
 
 	if (bus_dma_tag_create(sc->parent_tag,
 			1,
@@ -3280,7 +3282,7 @@ bce_dma_alloc(device_t dev)
 			BUS_SPACE_MAXADDR,
 			NULL, NULL,
 			max_size,
-			1,
+			max_segments,
 			max_seg_size,
 			0,
 			NULL, NULL,
@@ -4156,15 +4158,24 @@ bce_init_cpus(struct bce_softc *sc)
 
 	if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
 		(BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
-		bce_load_rv2p_fw(sc, bce_xi_rv2p_proc1, sizeof(bce_xi_rv2p_proc1),
-			RV2P_PROC1);
-		bce_load_rv2p_fw(sc, bce_xi_rv2p_proc2, sizeof(bce_xi_rv2p_proc2),
-			RV2P_PROC2);
+
+		if ((BCE_CHIP_REV(sc) == BCE_CHIP_REV_Ax)) {
+			bce_load_rv2p_fw(sc, bce_xi90_rv2p_proc1, 
+				sizeof(bce_xi90_rv2p_proc1), RV2P_PROC1);
+			bce_load_rv2p_fw(sc, bce_xi90_rv2p_proc2, 
+				sizeof(bce_xi90_rv2p_proc2), RV2P_PROC2);
+		} else {
+			bce_load_rv2p_fw(sc, bce_xi_rv2p_proc1, 
+				sizeof(bce_xi_rv2p_proc1), RV2P_PROC1);
+			bce_load_rv2p_fw(sc, bce_xi_rv2p_proc2, 
+				sizeof(bce_xi_rv2p_proc2), RV2P_PROC2);
+		}
+
 	} else {
-		bce_load_rv2p_fw(sc, bce_rv2p_proc1, sizeof(bce_rv2p_proc1),
-			RV2P_PROC1);
-		bce_load_rv2p_fw(sc, bce_rv2p_proc2, sizeof(bce_rv2p_proc2),
-			RV2P_PROC2);
+		bce_load_rv2p_fw(sc, bce_rv2p_proc1, 
+			sizeof(bce_rv2p_proc1),	RV2P_PROC1);
+		bce_load_rv2p_fw(sc, bce_rv2p_proc2,
+			sizeof(bce_rv2p_proc2),	RV2P_PROC2);
 	}
 
 	bce_init_rxp_cpu(sc);
@@ -4727,7 +4738,7 @@ bce_blockinit(struct bce_softc *sc)
 	/* Verify that bootcode is running. */
 	reg = REG_RD_IND(sc, sc->bce_shmem_base + BCE_DEV_INFO_SIGNATURE);
 
-	DBRUNIF(DB_RANDOMTRUE(bce_debug_bootcode_running_failure),
+	DBRUNIF(DB_RANDOMTRUE(bootcode_running_failure_sim_control),
 		BCE_PRINTF("%s(%d): Simulating bootcode failure.\n",
 			__FILE__, __LINE__);
 		reg = 0);
@@ -4814,9 +4825,9 @@ bce_get_rx_buf(struct bce_softc *sc, str
 	if (m == NULL) {
 
 		/* Simulate an mbuf allocation failure. */
-		DBRUNIF(DB_RANDOMTRUE(bce_debug_mbuf_allocation_failure),
-			sc->mbuf_alloc_failed++;
-			sc->debug_mbuf_sim_alloc_failed++;
+		DBRUNIF(DB_RANDOMTRUE(mbuf_alloc_failed_sim_control),
+			sc->mbuf_alloc_failed_count++;
+			sc->mbuf_alloc_failed_sim_count++;
 			rc = ENOBUFS;
 			goto bce_get_rx_buf_exit);
 
@@ -4831,7 +4842,7 @@ bce_get_rx_buf(struct bce_softc *sc, str
 #endif
 
 		if (m_new == NULL) {
-			sc->mbuf_alloc_failed++;
+			sc->mbuf_alloc_failed_count++;
 			rc = ENOBUFS;
 			goto bce_get_rx_buf_exit;
 		}
@@ -4861,7 +4872,9 @@ bce_get_rx_buf(struct bce_softc *sc, str
 		BCE_PRINTF("%s(%d): Error mapping mbuf into RX chain (%d)!\n",
 			__FILE__, __LINE__, error);
 
+		sc->dma_map_addr_rx_failed_count++;
 		m_freem(m_new);
+
 		DBRUN(sc->debug_rx_mbuf_alloc--);
 
 		rc = ENOBUFS;
@@ -4939,16 +4952,16 @@ bce_get_pg_buf(struct bce_softc *sc, str
 	if (m == NULL) {
 
 		/* Simulate an mbuf allocation failure. */
-		DBRUNIF(DB_RANDOMTRUE(bce_debug_mbuf_allocation_failure),
-			sc->mbuf_alloc_failed++;
-			sc->debug_mbuf_sim_alloc_failed++;
+		DBRUNIF(DB_RANDOMTRUE(mbuf_alloc_failed_sim_control),
+			sc->mbuf_alloc_failed_count++;
+			sc->mbuf_alloc_failed_sim_count++;
 			rc = ENOBUFS;
 			goto bce_get_pg_buf_exit);
 
 		/* This is a new mbuf allocation. */
 		m_new = m_getcl(M_DONTWAIT, MT_DATA, 0);
 		if (m_new == NULL) {
-			sc->mbuf_alloc_failed++;
+			sc->mbuf_alloc_failed_count++;
 			rc = ENOBUFS;
 			goto bce_get_pg_buf_exit;
 		}
@@ -5766,20 +5779,20 @@ bce_rx_intr(struct bce_softc *sc)
 		sc->free_rx_bd++;
 
 		/*
-		 * Frames received on the NetXteme II are prepended
-		 * with an l2_fhdr structure which provides status
-		 * information about the received frame (including
-		 * VLAN tags and checksum info).  The frames are also
-		 * automatically adjusted to align the IP header
-		 * (i.e. two null bytes are inserted before the
-		 * Ethernet header).  As a result the data DMA'd by
-		 * the controller into the mbuf is as follows:
+		 * Frames received on the NetXteme II are prepended	with an
+		 * l2_fhdr structure which provides status information about
+		 * the received frame (including VLAN tags and checksum info).
+		 * The frames are also automatically adjusted to align the IP
+		 * header (i.e. two null bytes are inserted before the Ethernet
+		 * header).  As a result the data DMA'd by the controller into
+		 * the mbuf is as follows:
+		 * 
 		 * +---------+-----+---------------------+-----+
 		 * | l2_fhdr | pad | packet data         | FCS |
 		 * +---------+-----+---------------------+-----+
-		 * The l2_fhdr needs to be checked and skipped and
-		 * the FCS needs to be stripped before sending the
-		 * packet up the stack.
+		 * 
+		 * The l2_fhdr needs to be checked and skipped and the FCS needs
+		 * to be stripped before sending the packet up the stack.
 		 */
 		l2fhdr  = mtod(m0, struct l2_fhdr *);
 
@@ -5894,8 +5907,9 @@ bce_rx_intr(struct bce_softc *sc)
 			BCE_PRINTF("Invalid Ethernet frame size!\n");
 			m_print(m0, 128));
 
-		DBRUNIF(DB_RANDOMTRUE(bce_debug_l2fhdr_status_check),
+		DBRUNIF(DB_RANDOMTRUE(l2fhdr_error_sim_control),
 			BCE_PRINTF("Simulating l2_fhdr status error.\n");
+			sc->l2fhdr_error_sim_count++;
 			status = status | L2_FHDR_ERRORS_PHY_DECODE);
 
 		/* Check the received frame for errors. */
@@ -5905,7 +5919,7 @@ bce_rx_intr(struct bce_softc *sc)
 
 			/* Log the error and release the mbuf. */
 			ifp->if_ierrors++;
-			DBRUN(sc->l2fhdr_status_errors++);
+			sc->l2fhdr_error_count++;
 
 			m_freem(m0);
 			m0 = NULL;
@@ -5946,10 +5960,7 @@ bce_rx_intr(struct bce_softc *sc)
 			}
 		}
 
-		/*
-		 * If we received a packet with a vlan tag,
-		 * attach that information to the packet.
-		 */
+		/* Attach the VLAN tag.	*/
 		if (status & L2_FHDR_STATUS_L2_VLAN_TAG) {
 #if __FreeBSD_version < 700000
 			VLAN_INPUT_TAG(ifp, m0, l2fhdr->l2_fhdr_vlan_tag, continue);
@@ -5959,7 +5970,7 @@ bce_rx_intr(struct bce_softc *sc)
 #endif
 		}
 
-		/* Pass the mbuf off to the upper layers. */
+		/* Increment received packet statistics. */
 		ifp->if_ipackets++;
 
 bce_rx_int_next_rx:
@@ -6273,14 +6284,17 @@ bce_init_locked(struct bce_softc *sc)
 
 	DBPRINT(sc, BCE_INFO_LOAD,
 		"%s(): rx_bd_mbuf_alloc_size = %d, rx_bce_mbuf_data_len = %d, "
-		"rx_bd_mbuf_align_pad = %d, pg_bd_mbuf_alloc_size = %d\n",
-		__FUNCTION__, sc->rx_bd_mbuf_alloc_size, sc->rx_bd_mbuf_data_len,
-		sc->rx_bd_mbuf_align_pad, sc->pg_bd_mbuf_alloc_size);
+		"rx_bd_mbuf_align_pad = %d\n", __FUNCTION__, 
+		sc->rx_bd_mbuf_alloc_size, sc->rx_bd_mbuf_data_len,
+		sc->rx_bd_mbuf_align_pad);
 
 	/* Program appropriate promiscuous/multicast filtering. */
 	bce_set_rx_mode(sc);
 
 #ifdef ZERO_COPY_SOCKETS
+	DBPRINT(sc, BCE_INFO_LOAD, "%s(): pg_bd_mbuf_alloc_size = %d\n",
+		__FUNCTION__, sc->pg_bd_mbuf_alloc_size);
+
 	/* Init page buffer descriptor chain. */
 	bce_init_pg_chain(sc);
 #endif
@@ -6489,10 +6503,7 @@ bce_tx_encap_skip_tso:
 	/* Check if the DMA mapping was successful */
 	if (error == EFBIG) {
 
-		/* The mbuf is too fragmented for our DMA mapping. */
-   		DBPRINT(sc, BCE_WARN, "%s(): fragmented mbuf (%d pieces)\n",
-			__FUNCTION__, nsegs);
-		DBRUN(bce_dump_mbuf(sc, m0););
+		sc->fragmented_mbuf_count++;
 
 		/* Try to defrag the mbuf. */
 		m0 = m_defrag(*m_head, M_DONTWAIT);
@@ -6500,7 +6511,7 @@ bce_tx_encap_skip_tso:
 			/* Defrag was unsuccessful */
 			m_freem(*m_head);
 			*m_head = NULL;
-			sc->mbuf_alloc_failed++;
+			sc->mbuf_alloc_failed_count++;
 			rc = ENOBUFS;
 			goto bce_tx_encap_exit;
 		}
@@ -6513,7 +6524,7 @@ bce_tx_encap_skip_tso:
 		/* Still getting an error after a defrag. */
 		if (error == ENOMEM) {
 			/* Insufficient DMA buffers available. */
-			sc->tx_dma_map_failures++;
+			sc->dma_map_addr_tx_failed_count++;
 			rc = error;
 			goto bce_tx_encap_exit;
 		} else if (error != 0) {
@@ -6523,19 +6534,19 @@ bce_tx_encap_skip_tso:
 			    __FILE__, __LINE__);
 			m_freem(m0);
 			*m_head = NULL;
-			sc->tx_dma_map_failures++;
+			sc->dma_map_addr_tx_failed_count++;
 			rc = ENOBUFS;
 			goto bce_tx_encap_exit;
 		}
 	} else if (error == ENOMEM) {
 		/* Insufficient DMA buffers available. */
-		sc->tx_dma_map_failures++;
+		sc->dma_map_addr_tx_failed_count++;
 		rc = error;
 		goto bce_tx_encap_exit;
 	} else if (error != 0) {
 		m_freem(m0);
 		*m_head = NULL;
-		sc->tx_dma_map_failures++;
+		sc->dma_map_addr_tx_failed_count++;
 		rc = error;
 		goto bce_tx_encap_exit;
 	}
@@ -7040,9 +7051,10 @@ bce_intr(void *xsc)
 
 		status_attn_bits = sc->status_block->status_attn_bits;
 
-		DBRUNIF(DB_RANDOMTRUE(bce_debug_unexpected_attention),
-			BCE_PRINTF("Simulating unexpected status attention bit set.");
-			status_attn_bits = status_attn_bits | STATUS_ATTN_BITS_PARITY_ERROR);
+	DBRUNIF(DB_RANDOMTRUE(unexpected_attention_sim_control),
+		BCE_PRINTF("Simulating unexpected status attention bit set.");
+		sc->unexpected_attention_sim_count++;
+		status_attn_bits = status_attn_bits | STATUS_ATTN_BITS_PARITY_ERROR);
 
 		/* Was it a link change interrupt? */
 		if ((status_attn_bits & STATUS_ATTN_BITS_LINK_STATE) !=
@@ -7060,13 +7072,13 @@ bce_intr(void *xsc)
 			(sc->status_block->status_attn_bits_ack &
 			~STATUS_ATTN_BITS_LINK_STATE))) {
 
-			DBRUN(sc->unexpected_attentions++);
+		sc->unexpected_attention_count++;
 
 			BCE_PRINTF("%s(%d): Fatal attention detected: 0x%08X\n",
 				__FILE__, __LINE__, sc->status_block->status_attn_bits);
 
 			DBRUNMSG(BCE_FATAL,
-				if (bce_debug_unexpected_attention == 0)
+				if (unexpected_attention_sim_control == 0)
 					bce_breakpoint(sc));
 
 			bce_init_locked(sc);
@@ -7315,8 +7327,8 @@ bce_stats_update(struct bce_softc *sc)
 	sc->stat_EtherStatsUndersizePkts =
 		stats->stat_EtherStatsUndersizePkts;
 
-	sc->stat_EtherStatsOverrsizePkts =
-		stats->stat_EtherStatsOverrsizePkts;
+	sc->stat_EtherStatsOversizePkts =
+		stats->stat_EtherStatsOversizePkts;
 
 	sc->stat_EtherStatsPktsRx64Octets =
 		stats->stat_EtherStatsPktsRx64Octets;
@@ -7420,7 +7432,7 @@ bce_stats_update(struct bce_softc *sc)
 	/* ToDo: This method loses soft errors. */
 	ifp->if_ierrors =
 		(u_long) sc->stat_EtherStatsUndersizePkts +
-		(u_long) sc->stat_EtherStatsOverrsizePkts +
+		(u_long) sc->stat_EtherStatsOversizePkts +
 		(u_long) sc->stat_IfInMBUFDiscards +
 		(u_long) sc->stat_Dot3StatsAlignmentErrors +
 		(u_long) sc->stat_Dot3StatsFCSErrors +
@@ -7871,6 +7883,91 @@ bce_add_sysctls(struct bce_softc *sc)
 
 #ifdef BCE_DEBUG
 	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+		"l2fhdr_error_sim_control",
+		CTLFLAG_RW, &l2fhdr_error_sim_control,
+		0, "Debug control to force l2fhdr errors");
+
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+		"l2fhdr_error_sim_count",
+		CTLFLAG_RD, &sc->l2fhdr_error_sim_count,
+		0, "Number of simulated l2_fhdr errors");
+#endif
+
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+		"l2fhdr_error_count",
+		CTLFLAG_RD, &sc->l2fhdr_error_count,
+		0, "Number of l2_fhdr errors");
+
+#ifdef BCE_DEBUG
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+		"mbuf_alloc_failed_sim_control",
+		CTLFLAG_RW, &mbuf_alloc_failed_sim_control,
+		0, "Debug control to force mbuf allocation failures");
+
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+		"mbuf_alloc_failed_sim_count",
+		CTLFLAG_RD, &sc->mbuf_alloc_failed_sim_count,
+		0, "Number of simulated mbuf cluster allocation failures");
+#endif
+
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+		"mbuf_alloc_failed_count",
+		CTLFLAG_RD, &sc->mbuf_alloc_failed_count,
+		0, "Number of mbuf allocation failures");
+
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+		"fragmented_mbuf_count",
+		CTLFLAG_RD, &sc->fragmented_mbuf_count,
+		0, "Number of fragmented mbufs");
+
+#ifdef BCE_DEBUG
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+		"dma_map_addr_failed_sim_control",
+		CTLFLAG_RW, &dma_map_addr_failed_sim_control,
+		0, "Debug control to force DMA mapping failures");
+
+	/* ToDo: Figure out how to update this value in bce_dma_map_addr(). */
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+		"dma_map_addr_failed_sim_count",
+		CTLFLAG_RD, &sc->dma_map_addr_failed_sim_count,
+		0, "Number of simulated DMA mapping failures");
+	
+#endif
+
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+		"dma_map_addr_rx_failed_count",
+		CTLFLAG_RD, &sc->dma_map_addr_rx_failed_count,
+		0, "Number of RX DMA mapping failures");
+
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+		"dma_map_addr_tx_failed_count",
+		CTLFLAG_RD, &sc->dma_map_addr_tx_failed_count,
+		0, "Number of TX DMA mapping failures");
+
+#ifdef BCE_DEBUG
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+		"unexpected_attention_sim_control",
+		CTLFLAG_RW, &unexpected_attention_sim_control,
+		0, "Debug control to simulate unexpected attentions");
+
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+		"unexpected_attention_sim_count",
+		CTLFLAG_RW, &sc->unexpected_attention_sim_count,
+		0, "Number of simulated unexpected attentions");
+#endif
+
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+		"unexpected_attention_count",
+		CTLFLAG_RW, &sc->unexpected_attention_count,
+		0, "Number of unexpected attentions");
+
+#ifdef BCE_DEBUG
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+		"debug_bootcode_running_failure",
+		CTLFLAG_RW, &bootcode_running_failure_sim_control,
+		0, "Debug control to force bootcode running failures");
+
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 		"rx_low_watermark",
 		CTLFLAG_RD, &sc->rx_low_watermark,
 		0, "Lowest level of free rx_bd's");
@@ -7891,26 +7988,6 @@ bce_add_sysctls(struct bce_softc *sc)
 		0, "Number of times the TX chain was full");
 
 	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
-		"l2fhdr_status_errors",
-		CTLFLAG_RD, &sc->l2fhdr_status_errors,
-		0, "l2_fhdr status errors");
-
-	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
-		"unexpected_attentions",
-		CTLFLAG_RD, &sc->unexpected_attentions,
-		0, "Unexpected attentions");
-
-	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
-		"lost_status_block_updates",
-		CTLFLAG_RD, &sc->lost_status_block_updates,
-		0, "Lost status block updates");
-
-	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
-		"debug_mbuf_sim_alloc_failed",
-		CTLFLAG_RD, &sc->debug_mbuf_sim_alloc_failed,
-		0, "Simulated mbuf cluster allocation failures");
-
-	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 		"requested_tso_frames",
 		CTLFLAG_RD, &sc->requested_tso_frames,
 		0, "Number of TSO frames received");
@@ -7936,16 +8013,6 @@ bce_add_sysctls(struct bce_softc *sc)
 		"TX interrupt time");
 #endif
 
-	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
-		"mbuf_alloc_failed",
-		CTLFLAG_RD, &sc->mbuf_alloc_failed,
-		0, "mbuf cluster allocation failures");
-
-	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
-		"tx_dma_map_failures",
-		CTLFLAG_RD, &sc->tx_dma_map_failures,
-		0, "tx dma mapping failures");
-
 	SYSCTL_ADD_ULONG(ctx, children, OID_AUTO,
 		"stat_IfHcInOctets",
 		CTLFLAG_RD, &sc->stat_IfHCInOctets,
@@ -8062,9 +8129,9 @@ bce_add_sysctls(struct bce_softc *sc)
 		0, "Undersize packets");
 
 	SYSCTL_ADD_UINT(ctx, children, OID_AUTO,
-		"stat_EtherStatsOverrsizePkts",
-		CTLFLAG_RD, &sc->stat_EtherStatsOverrsizePkts,
-		0, "stat_EtherStatsOverrsizePkts");
+		"stat_EtherStatsOversizePkts",
+		CTLFLAG_RD, &sc->stat_EtherStatsOversizePkts,
+		0, "stat_EtherStatsOversizePkts");
 
 	SYSCTL_ADD_UINT(ctx, children, OID_AUTO,
 		"stat_EtherStatsPktsRx64Octets",
@@ -9455,9 +9522,9 @@ bce_dump_stats_block(struct bce_softc *s
 		BCE_PRINTF("         0x%08X : EtherStatsUndersizePkts\n",
 			sblk->stat_EtherStatsUndersizePkts);
 
-	if (sblk->stat_EtherStatsOverrsizePkts)
+	if (sblk->stat_EtherStatsOversizePkts)
 		BCE_PRINTF("         0x%08X : EtherStatsOverrsizePkts\n",
-			sblk->stat_EtherStatsOverrsizePkts);
+			sblk->stat_EtherStatsOversizePkts);
 
 	if (sblk->stat_EtherStatsPktsRx64Octets)
 		BCE_PRINTF("         0x%08X : EtherStatsPktsRx64Octets\n",
@@ -9724,13 +9791,9 @@ bce_dump_driver_state(struct bce_softc *
 		sc->pg_low_watermark, sc->max_pg_bd);
 #endif
 
-	BCE_PRINTF("         0x%08X - (sc->mbuf_alloc_failed) "
+	BCE_PRINTF("         0x%08X - (sc->mbuf_alloc_failed_count) "
 		"mbuf alloc failures\n",
-		sc->mbuf_alloc_failed);
-
-	BCE_PRINTF("         0x%08X - (sc->debug_mbuf_sim_alloc_failed) "
-		"simulated mbuf alloc failures\n",
-		sc->debug_mbuf_sim_alloc_failed);
+		sc->mbuf_alloc_failed_count);
 
 	BCE_PRINTF("         0x%08X - (sc->bce_flags) bce mac flags\n",
 		sc->bce_flags);
@@ -9762,7 +9825,7 @@ bce_dump_hw_state(struct bce_softc *sc)
 		" Hardware State "
 		"----------------------------\n");
 
-	BCE_PRINTF("0x%08X - bootcode version\n", sc->bce_fw_ver);
+	BCE_PRINTF("0x%08X - bootcode version\n", sc->bce_bc_ver);
 
 	val = REG_RD(sc, BCE_MISC_ENABLE_STATUS_BITS);
 	BCE_PRINTF("0x%08X - (0x%06X) misc_enable_status_bits\n",
@@ -9887,7 +9950,7 @@ bce_dump_bc_state(struct bce_softc *sc)
 		" Bootcode State "
 		"----------------------------\n");
 
-	BCE_PRINTF("0x%08X - bootcode version\n", sc->bce_fw_ver);
+	BCE_PRINTF("0x%08X - bootcode version\n", sc->bce_bc_ver);
 
 	val = REG_RD_IND(sc, sc->bce_shmem_base + BCE_BC_RESET_TYPE);
 	BCE_PRINTF("0x%08X - (0x%06X) reset_type\n",

Modified: head/sys/dev/bce/if_bcefw.h
==============================================================================
--- head/sys/dev/bce/if_bcefw.h	Tue Mar  3 21:45:47 2009	(r189324)
+++ head/sys/dev/bce/if_bcefw.h	Wed Mar  4 00:05:40 2009	(r189325)
@@ -38,124 +38,124 @@
  * accompanying it.
  */
 
-/* Firmware release 4.4.17 for BCM5706 and BCM5708 (b06). */
-/* Firmware release 4.4.21 for BCM5709 and BCM5716 (b09). */
+/* Firmware release 4.6.17 for BCM5706 and BCM5708 (b06). */
+/* Firmware release 4.6.16 for BCM5709 and BCM5716 (b09). */
 int bce_COM_b06FwReleaseMajor = 0x1;
 int bce_COM_b06FwReleaseMinor = 0x0;
 int bce_COM_b06FwReleaseFix = 0x0;
 u32 bce_COM_b06FwStartAddr = 0x080000f8;
 u32 bce_COM_b06FwTextAddr = 0x08000000;
-int bce_COM_b06FwTextLen = 0x4e94;
+int bce_COM_b06FwTextLen = 0x4df0;
 u32 bce_COM_b06FwDataAddr = 0x00000000;
 int bce_COM_b06FwDataLen = 0x0;
-u32 bce_COM_b06FwRodataAddr = 0x08004e94;
+u32 bce_COM_b06FwRodataAddr = 0x08004df0;
 int bce_COM_b06FwRodataLen = 0x14;
-u32 bce_COM_b06FwBssAddr = 0x08004ef8;
+u32 bce_COM_b06FwBssAddr = 0x08004e58;
 int bce_COM_b06FwBssLen = 0xbc;
-u32 bce_COM_b06FwSbssAddr = 0x08004ec0;
+u32 bce_COM_b06FwSbssAddr = 0x08004e20;
 int bce_COM_b06FwSbssLen = 0x38;
 u32 bce_COM_b06FwSDataAddr = 0x00000000;
 int bce_COM_b06FwSDataLen = 0x0;
-u32 bce_COM_b06FwText[(0x4e94/4) + 1] = {
-0xa00003e, 
-0x0, 0x0, 0xd, 0x636f6d34, 
-0x2e342e31, 0x37000000, 0x4041102, 0x0, 
-0x3, 0x14, 0x32, 0x3, 
+u32 bce_COM_b06FwText[(0x4df0/4) + 1] = {
+0xa00003e, 0x0, 0x0, 
+0xd, 0x636f6d34, 0x2e362e31, 0x37000000, 
+0x4061102, 0x0, 0x3, 0x14, 
+0x32, 0x3, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x10, 
+0x136, 0xea60, 0x1, 0x0, 
+0x0, 0x0, 0x8, 0x0, 
 0x0, 0x0, 0x0, 0x0, 
-0x0, 0x10, 0x136, 0xea60, 
-0x1, 0x0, 0x0, 0x0, 
-0x8, 0x0, 0x0, 0x0, 
 0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x2, 
 0x0, 0x0, 0x0, 0x0, 
-0x0, 0x2, 0x0, 0x0, 
 0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x10, 
+0x0, 0x10, 0x0, 0x0, 
 0x0, 0x0, 0x0, 0x0, 
 0x0, 0x0, 0x0, 0x0, 
 0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x10000003, 0x0, 
-0xd, 0xd, 0x3c020800, 0x24424ec0, 
-0x3c030800, 0x24634fb4, 0xac400000, 0x43202b, 
-0x1480fffd, 0x24420004, 0x3c1d0800, 0x37bd7ffc, 
-0x3a0f021, 0x3c100800, 0x261000f8, 0x3c1c0800, 
-0x279c4ec0, 0xe0002a8, 0x0, 0xd, 
-0x3c036010, 0x8c645000, 0x2402ff7f, 0x3c1a8000, 
-0x822024, 0x3484380c, 0x24020037, 0xac645000, 
-0xaf420008, 0x24020c80, 0xaf420024, 0x3c1b8008, 
-0x3c060800, 0x24c60794, 0x3c020800, 0x24424ef8, 
-0x2404001b, 0x2484ffff, 0xac460000, 0x481fffd, 
-0x24420004, 0x3c020800, 0x24420378, 0x3c010800, 
-0xac224f00, 0x3c020800, 0x24420678, 0x3c010800, 
-0xac224f04, 0x3c020800, 0x24420a08, 0x3c030800, 
-0x24630900, 0x3c040800, 0x2484093c, 0x3c050800, 
-0x24a53d98, 0x3c010800, 0xac224f48, 0x3c020800, 
-0x24420568, 0x3c010800, 0xac264f44, 0x3c010800, 
-0xac254f54, 0x3c010800, 0xac234f5c, 0x3c010800, 
-0xac224f60, 0x3c010800, 0xac244f64, 0x3c010800, 
-0xac234efc, 0x3c010800, 0xac204f08, 0x3c010800, 
-0xac204f0c, 0x3c010800, 0xac204f10, 0x3c010800, 
-0xac204f14, 0x3c010800, 0xac204f18, 0x3c010800, 
-0xac204f1c, 0x3c010800, 0xac204f20, 0x3c010800, 
-0xac244f24, 0x3c010800, 0xac204f28, 0x3c010800, 
-0xac204f2c, 0x3c010800, 0xac204f30, 0x3c010800, 
-0xac204f34, 0x3c010800, 0xac204f38, 0x3c010800, 
-0xac264f3c, 0x3c010800, 0xac264f40, 0x3c010800, 
-0xac204f4c, 0x3c010800, 0xac254f50, 0x3c010800, 
-0xac234f58, 0xa000751, 0x0, 0x3c030800, 
+0x10000003, 0x0, 0xd, 0xd, 
+0x3c020800, 0x24424e20, 0x3c030800, 0x24634f14, 
+0xac400000, 0x43202b, 0x1480fffd, 0x24420004, 
+0x3c1d0800, 0x37bd7ffc, 0x3a0f021, 0x3c100800, 
+0x261000f8, 0x3c1c0800, 0x279c4e20, 0xe0002bd, 
+0x0, 0xd, 0x3c036010, 0x8c645000, 
+0x2402ff7f, 0x3c1a8000, 0x822024, 0x3484380c, 
+0x24020037, 0xac645000, 0xaf420008, 0x24020c80, 
+0xaf420024, 0x3c1b8008, 0x3c060800, 0x24c607e8, 
+0x3c020800, 0x24424e58, 0x2404001b, 0x2484ffff, 
+0xac460000, 0x481fffd, 0x24420004, 0x3c020800, 
+0x24420380, 0x3c010800, 0xac224e60, 0x3c020800, 
+0x24420680, 0x3c010800, 0xac224e64, 0x3c020800, 
+0x24420dcc, 0x3c010800, 0xac224ea0, 0x3c020800, 
+0x24420a5c, 0x3c030800, 0x24630954, 0x3c040800, 
+0x24840990, 0x3c050800, 0x24a53c70, 0x3c010800, 
+0xac224ea8, 0x3c020800, 0x24420570, 0x3c010800, 
+0xac264ea4, 0x3c010800, 0xac254eb4, 0x3c010800, 
+0xac234ebc, 0x3c010800, 0xac224ec0, 0x3c010800, 
+0xac244ec4, 0x3c010800, 0xac234e5c, 0x3c010800, 
+0xac204e68, 0x3c010800, 0xac204e6c, 0x3c010800, 
+0xac204e70, 0x3c010800, 0xac204e74, 0x3c010800, 
+0xac204e78, 0x3c010800, 0xac204e7c, 0x3c010800, 
+0xac204e80, 0x3c010800, 0xac244e84, 0x3c010800, 
+0xac204e88, 0x3c010800, 0xac204e8c, 0x3c010800, 
+0xac204e90, 0x3c010800, 0xac204e94, 0x3c010800, 
+0xac204e98, 0x3c010800, 0xac264e9c, 0x3c010800, 
+0xac204eac, 0x3c010800, 0xac254eb0, 0x3c010800, 
+0xac234eb8, 0xa000707, 0x0, 0x3c030800, 
 0x8c630020, 0x8f820008, 0x10430003, 0x0, 
-0xa00055d, 0xaf830008, 0x3e00008, 0x0, 
+0xa00053f, 0xaf830008, 0x3e00008, 0x0, 
 0x27bdffe8, 0xafb00010, 0xafbf0014, 0x27500100, 
 0x92020009, 0x1040001a, 0x24030001, 0x3c020800, 
-0x8c420020, 0x10400016, 0x1821, 0xe00059b, 
-0x0, 0x96030008, 0x3c060800, 0x94c64f76, 
+0x8c420020, 0x10400016, 0x1821, 0xe000577, 
+0x0, 0x96030008, 0x3c060800, 0x94c64ed6, 
 0x8e040018, 0x8f820020, 0x9605000c, 0x31c00, 
 0x661825, 0xac440000, 0xac450004, 0x24040001, 
 0xac400008, 0xac40000c, 0xac400010, 0xac400014, 
-0xac400018, 0xe0005d3, 0xac43001c, 0x1821, 
+0xac400018, 0xe00059c, 0xac43001c, 0x1821, 
 0x8fbf0014, 0x8fb00010, 0x601021, 0x3e00008, 
 0x27bd0018, 0x27bdffe8, 0xafbf0010, 0x97420108, 
 0x30437000, 0x24022000, 0x1062000a, 0x28642001, 
 0x54800012, 0x8fbf0010, 0x24024000, 0x10620008, 
-0x24026000, 0x1062000a, 0x8fbf0010, 0xa0000f9, 
-0x1021, 0x8fbf0010, 0xa0000b9, 0x27bd0018, 
-0xe0004c3, 0x0, 0xa0000f8, 0x8fbf0010, 
-0xe000ff5, 0x0, 0x8fbf0010, 0x1021, 
+0x24026000, 0x1062000a, 0x8fbf0010, 0xa0000fb, 
+0x1021, 0x8fbf0010, 0xa0000bb, 0x27bd0018, 
+0xe000409, 0x0, 0xa0000fa, 0x8fbf0010, 
+0xe000fc9, 0x0, 0x8fbf0010, 0x1021, 
 0x3e00008, 0x27bd0018, 0x3c020800, 0x8c420020, 
-0x27bdffe8, 0x10400027, 0xafbf0010, 0xe00059b, 
+0x27bdffe8, 0x10400027, 0xafbf0010, 0xe000577, 
 0x0, 0x97420108, 0x9743010c, 0x8f850020, 
 0x3042003e, 0x3063ffff, 0x21400, 0x431025, 
-0xaca20000, 0x8f420100, 0x3c060800, 0x94c64f76, 
+0xaca20000, 0x8f420100, 0x3c060800, 0x94c64ed6, 
 0x8fbf0010, 0xaca20004, 0x97430116, 0x9744010e, 
 0x3c022000, 0x31c00, 0x3084ffff, 0x641825, 
 0xaca30008, 0xc23025, 0x97420110, 0x97430112, 
 0x24040001, 0x21400, 0x3063ffff, 0x431025, 
 0xaca2000c, 0x97420114, 0x27bd0018, 0x3042ffff, 
-0xaca20010, 0xaca00014, 0xaca00018, 0xa0005d3, 
+0xaca20010, 0xaca00014, 0xaca00018, 0xa00059c, 
 0xaca6001c, 0x8fbf0010, 0x3e00008, 0x27bd0018, 
 0x3c020800, 0x8c420020, 0x27bdffe8, 0x1040002a, 
-0xafbf0010, 0xe00059b, 0x0, 0x97420108, 
+0xafbf0010, 0xe000577, 0x0, 0x97420108, 
 0x9743010c, 0x8f850020, 0x3042003e, 0x3063ffff, 
 0x21400, 0x431025, 0xaca20000, 0x8f420100, 
-0x3c060800, 0x94c64f76, 0x8fbf0010, 0xaca20004, 
+0x3c060800, 0x94c64ed6, 0x8fbf0010, 0xaca20004, 
 0x97430116, 0x9744010e, 0x3c022000, 0x31c00, 
 0x3084ffff, 0x641825, 0xaca30008, 0xc23025, 
 0x97420110, 0x97430112, 0x24040001, 0x21400, 
 0x3063ffff, 0x431025, 0xaca2000c, 0x97420114, 
 0x27bd0018, 0x3042ffff, 0xaca20010, 0x8f420118, 
 0xaca20014, 0x9342010b, 0x304200ff, 0xaca20018, 
-0xa0005d3, 0xaca6001c, 0x8fbf0010, 0x3e00008, 
+0xa00059c, 0xaca6001c, 0x8fbf0010, 0x3e00008, 
 0x27bd0018, 0x27bdffe0, 0xafb00010, 0xafbf0018, 
 0xafb10014, 0x27500100, 0x9203000b, 0x2402001a, 
 0x96110008, 0x14620035, 0x2021, 0x32220001, 
 0x10400009, 0x0, 0x8e020000, 0x96030014, 
 0x211c2, 0x21040, 0x5a1021, 0xa4430080, 
-0xa000177, 0x32220002, 0xe000129, 0x0, 
+0xa000179, 0x32220002, 0xe00012b, 0x0, 
 0x3c020800, 0x8c420040, 0x24420001, 0x3c010800, 
 0xac220040, 0x32220002, 0x2202b, 0x3c020800, 
 0x8c420044, 0x32230004, 0x24420001, 0x3c010800, 
 0xac220044, 0x1060001a, 0x8fbf0018, 0x8f4202b8, 
 0x4410008, 0x24040001, 0x3c020800, 0x8c420060, 
-0x24420001, 0x3c010800, 0xac220060, 0xa00019a, 
+0x24420001, 0x3c010800, 0xac220060, 0xa00019c, 
 0x8fb10014, 0x8e020020, 0x96030016, 0x2021, 
 0xaf420280, 0x8e020004, 0xa7430284, 0xaf420288, 
 0x3c021000, 0xaf4202b8, 0x3c020800, 0x8c42005c, 
@@ -163,305 +163,286 @@ u32 bce_COM_b06FwText[(0x4e94/4) + 1] = 
 0x8fb10014, 0x8fb00010, 0x801021, 0x3e00008, 
 0x27bd0020, 0x27bdffe0, 0xafb00010, 0xafbf0018, 
 0xafb10014, 0x27500100, 0x9203000b, 0x24020003, 
-0x96110008, 0x14620035, 0x2021, 0x32220001, 
-0x10400009, 0x0, 0x8e020000, 0x96030014, 
-0x211c2, 0x21040, 0x5a1021, 0xa4430080, 
-0xa0001bb, 0x32220002, 0xe0000fb, 0x0, 
-0x3c020800, 0x8c420040, 0x24420001, 0x3c010800, 
-0xac220040, 0x32220002, 0x2202b, 0x3c020800, 
-0x8c420044, 0x32230004, 0x24420001, 0x3c010800, 
-0xac220044, 0x1060001a, 0x8fbf0018, 0x8f4202b8, 
-0x4410008, 0x24040001, 0x3c020800, 0x8c420060, 
-0x24420001, 0x3c010800, 0xac220060, 0xa0001de, 
-0x8fb10014, 0x8e020020, 0x96030016, 0x2021, 
+0x96110008, 0x14620048, 0x2021, 0x32220001, 
+0x10400008, 0x0, 0x8e020000, 0x96030014, 
+0x211c2, 0x21040, 0x5a1021, 0xa0001bb, 
+0xa4430080, 0xe0000fd, 0x0, 0x3c020800, 
+0x8c420040, 0x24420001, 0x3c010800, 0xac220040, 
+0x3c020800, 0x8c420044, 0x32230004, 0x24420001, 
+0x3c010800, 0xac220044, 0x1060001a, 0x32220002, 
+0x8f4202b8, 0x4430008, 0x8e020020, 0x3c020800, 
+0x8c420060, 0x24420001, 0x3c010800, 0xac220060, 
+0xa0001f1, 0x24040001, 0x96030016, 0x2021, 
 0xaf420280, 0x8e020004, 0xa7430284, 0xaf420288, 
 0x3c021000, 0xaf4202b8, 0x3c020800, 0x8c42005c, 
-0x24420001, 0x3c010800, 0xac22005c, 0x8fbf0018, 
-0x8fb10014, 0x8fb00010, 0x801021, 0x3e00008, 
-0x27bd0020, 0x93620000, 0x3e00008, 0xaf800004, 
-0x3e00008, 0x1021, 0x27bdffe8, 0xafbf0014, 
-0xafb00010, 0x8f420100, 0xaf420020, 0x8f420104, 
-0xaf4200a8, 0x9350010b, 0xe0001e2, 0x321000ff, 
-0x3c020800, 0x24424ef8, 0x101880, 0x2e10001c, 
-0x16000004, 0x621021, 0xe0001e5, 0xa0001fd, 
-0x0, 0x8c420000, 0x40f809, 0x0, 
+0x24420001, 0x3c010800, 0xac22005c, 0xa0001f2, 
+0x8fbf0018, 0x10400014, 0x2021, 0x8f430104, 
+0x3c026020, 0xac430014, 0x8c420004, 0x240301fe, 
+0x304203ff, 0x1443000c, 0x2021, 0x8f420100, 
+0x219c2, 0x2462fffc, 0x2c420008, 0x10400003, 
+0x24040002, 0x2462fffd, 0x442004, 0x3c026000, 
+0xac446914, 0x2021, 0x8fbf0018, 0x8fb10014, 
+0x8fb00010, 0x801021, 0x3e00008, 0x27bd0020, 
+0x93620000, 0x3e00008, 0xaf800004, 0x3e00008, 
+0x1021, 0x27bdffe8, 0xafbf0014, 0xafb00010, 
+0x8f420100, 0xaf420020, 0x8f420104, 0xaf4200a8, 
+0x9350010b, 0xe0001f7, 0x321000ff, 0x3c020800, 
+0x24424e58, 0x101880, 0x2e10001c, 0x16000004, 
+0x621021, 0xe0001fa, 0xa000212, 0x0, 
+0x8c420000, 0x40f809, 0x0, 0x10400005, 
+0x3c024000, 0x8f430104, 0x3c026020, 0xac430014, 
+0x3c024000, 0xaf420138, 0x3c020800, 0x8c420034, 
+0x8fbf0014, 0x8fb00010, 0x24420001, 0x3c010800, 
+0xac220034, 0x3e00008, 0x27bd0018, 0x27bdffe8, 
+0xafbf0010, 0x8f420140, 0xe0001f7, 0xaf420020, 
+0xe000393, 0x0, 0x3c024000, 0xaf420178, 
+0x3c030800, 0x24630038, 0x8c620000, 0x8fbf0010, 
+0x27bd0018, 0x24420001, 0x3e00008, 0xac620000, 
+0x27bdffe8, 0xafbf0010, 0x8f420180, 0xe0001f7, 
+0xaf420020, 0x8f430180, 0x24020f00, 0x14620005, 
+0x0, 0x8f420188, 0xa742009c, 0xa00024c, 
+0x3c024000, 0x93620000, 0x24030050, 0x304200ff, 
+0x14430008, 0x3c024000, 0xe000377, 0x0, 
+0x14400004, 0x3c024000, 0xe000e55, 0x0, 
+0x3c024000, 0xaf4201b8, 0x3c020800, 0x8c42003c, 
+0x8fbf0010, 0x24420001, 0x3c010800, 0xac22003c, 
+0x3e00008, 0x27bd0018, 0x3e00008, 0x1021, 
+0x8f430104, 0x8f820010, 0x10430008, 0x0, 
+0x3c020800, 0x8c420084, 0x24420001, 0x3c010800, 
+0xac220084, 0x8f420104, 0xaf820010, 0x3e00008, 
+0x0, 0x27bdffe8, 0xafbf0010, 0x27440100, 
+0x94820008, 0x30430002, 0x30420004, 0x1040001b, 
+0x0, 0x8f4202b8, 0x4410008, 0x24050001, 
+0x3c020800, 0x8c420060, 0x24420001, 0x3c010800, 
+0xac220060, 0xa000294, 0x8fbf0010, 0x8c820020, 
+0x94830016, 0x2821, 0xaf420280, 0x8c820004, 
+0xa7430284, 0xaf420288, 0x3c021000, 0xaf4202b8, 
+0x3c020800, 0x8c42005c, 0x24420001, 0x3c010800, 
+0xac22005c, 0xa000294, 0x8fbf0010, 0x10600008, 
+0x24050001, 0x3c020800, 0x8c420084, 0x24420001, 
+0x3c010800, 0xac220084, 0xa000294, 0x8fbf0010, 
+0x8f440100, 0xe000257, 0x0, 0x2821, 
+0x8fbf0010, 0xa01021, 0x3e00008, 0x27bd0018, 
+0x3c020800, 0x8c420088, 0x27430100, 0x9465000c, 
+0x24420001, 0x3c010800, 0xac220088, 0x8c640018, 
+0x3451021, 0x90454000, 0xaf440038, 0x8c62001c, 
+0x2403fff8, 0x52e00, 0x431024, 0x34420004, 
+0xaf42003c, 0x3c020005, 0xaf420030, 0x0, 
+0x0, 0x0, 0xaf450404, 0x0, 
+0x0, 0x0, 0x3c020006, 0x34420001, 
+0xaf420030, 0x0, 0x0, 0x0, 
+0x8f420000, 0x30420010, 0x1040fffd, 0x1021, 
+0x3e00008, 0x0, 0x27bdffe0, 0xafbf0018, 
+0xafb10014, 0xe000055, 0xafb00010, 0x3c028000, 
+0x34420070, 0x8c420000, 0xaf820014, 0xe0000b2, 
+0x0, 0x3c028000, 0x34460070, 0x3c030800, 
+0x8c6300a0, 0x3c020800, 0x8c4200a4, 0x10430004, 
+0x8f840014, 0x3c010800, 0xac2300a4, 0xa743009e, 
+0x8cca0000, 0x3c030800, 0x8c6300bc, 0x3c020800, 
+0x8c4200b8, 0x1442023, 0x641821, 0x4021, 
+0x64202b, 0x481021, 0x441021, 0x3c010800, 
+0xac2300bc, 0x3c010800, 0xac2200b8, 0x8f510000, 
+0x32220007, 0x1040ffe1, 0xaf8a0014, 0x8cc60000, 
+0x3c050800, 0x8ca500bc, 0x3c040800, 0x8c8400b8, 
+0xca3023, 0xa62821, 0x1021, 0xa6302b, 
+0x822021, 0x862021, 0x32270001, 0x3c010800, 
+0xac2500bc, 0x3c010800, 0xac2400b8, 0x10e00021, 
+0x32220002, 0x8f420100, 0xaf420020, 0x8f420104, 
+0xaf4200a8, 0x9342010b, 0xe0001f7, 0x305000ff, 
+0x2e02001c, 0x54400004, 0x101080, 0xe0001fa, 
+0xa00030b, 0x0, 0x3c030800, 0x24634e58, 
+0x431021, 0x8c420000, 0x40f809, 0x0, 
 0x10400005, 0x3c024000, 0x8f430104, 0x3c026020, 
 0xac430014, 0x3c024000, 0xaf420138, 0x3c020800, 
-0x8c420034, 0x8fbf0014, 0x8fb00010, 0x24420001, 
-0x3c010800, 0xac220034, 0x3e00008, 0x27bd0018, 
-0x27bdffe8, 0xafbf0010, 0x8f420140, 0xe0001e2, 
-0xaf420020, 0xe000380, 0x0, 0x3c024000, 
-0xaf420178, 0x3c030800, 0x24630038, 0x8c620000, 
-0x8fbf0010, 0x27bd0018, 0x24420001, 0x3e00008, 
-0xac620000, 0x27bdffe8, 0xafbf0010, 0x8f420180, 
-0xe0001e2, 0xaf420020, 0x8f430180, 0x24020f00, 
-0x14620005, 0x0, 0x8f420188, 0xa742009c, 
-0xa000237, 0x3c024000, 0x93620000, 0x24030050, 
-0x304200ff, 0x14430008, 0x3c024000, 0xe00035e, 
-0x0, 0x14400004, 0x3c024000, 0xe000e9f, 
-0x0, 0x3c024000, 0xaf4201b8, 0x3c020800, 
-0x8c42003c, 0x8fbf0010, 0x24420001, 0x3c010800, 
-0xac22003c, 0x3e00008, 0x27bd0018, 0x3e00008, 
-0x1021, 0x8f430104, 0x8f820010, 0x10430008, 
-0x0, 0x3c020800, 0x8c420084, 0x24420001, 
-0x3c010800, 0xac220084, 0x8f420104, 0xaf820010, 
-0x3e00008, 0x0, 0x27bdffe8, 0xafbf0010, 
-0x27440100, 0x94820008, 0x30430002, 0x30420004, 
-0x1040001b, 0x0, 0x8f4202b8, 0x4410008, 
-0x24050001, 0x3c020800, 0x8c420060, 0x24420001, 
-0x3c010800, 0xac220060, 0xa00027f, 0x8fbf0010, 
-0x8c820020, 0x94830016, 0x2821, 0xaf420280, 
-0x8c820004, 0xa7430284, 0xaf420288, 0x3c021000, 
-0xaf4202b8, 0x3c020800, 0x8c42005c, 0x24420001, 
-0x3c010800, 0xac22005c, 0xa00027f, 0x8fbf0010, 
-0x10600008, 0x24050001, 0x3c020800, 0x8c420084, 
-0x24420001, 0x3c010800, 0xac220084, 0xa00027f, 
-0x8fbf0010, 0x8f440100, 0xe000242, 0x0, 
-0x2821, 0x8fbf0010, 0xa01021, 0x3e00008, 
-0x27bd0018, 0x3c020800, 0x8c420088, 0x27430100, 
-0x9465000c, 0x24420001, 0x3c010800, 0xac220088, 
-0x8c640018, 0x3451021, 0x90454000, 0xaf440038, 
-0x8c62001c, 0x2403fff8, 0x52e00, 0x431024, 
-0x34420004, 0xaf42003c, 0x3c020005, 0xaf420030, 
-0x0, 0x0, 0x0, 0xaf450404, 
-0x0, 0x0, 0x0, 0x3c020006, 
-0x34420001, 0xaf420030, 0x0, 0x0, 
-0x0, 0x8f420000, 0x30420010, 0x1040fffd, 
-0x1021, 0x3e00008, 0x0, 0x27bdffe0, 
-0xafbf0018, 0xafb10014, 0xe000055, 0xafb00010, 
-0x3c028000, 0x34420070, 0x8c420000, 0xaf820014, 
-0xe0000b0, 0x0, 0x3c028000, 0x34460070, 
-0x3c030800, 0x8c6300a0, 0x3c020800, 0x8c4200a4, 
-0x10430004, 0x8f840014, 0x3c010800, 0xac2300a4, 
-0xa743009e, 0x8cca0000, 0x3c030800, 0x8c6300bc, 
-0x3c020800, 0x8c4200b8, 0x1442023, 0x641821, 
-0x4021, 0x64202b, 0x481021, 0x441021, 
-0x3c010800, 0xac2300bc, 0x3c010800, 0xac2200b8, 
-0x8f510000, 0x32220007, 0x1040ffe1, 0xaf8a0014, 
-0x8cc60000, 0x3c050800, 0x8ca500bc, 0x3c040800, 
-0x8c8400b8, 0xca3023, 0xa62821, 0x1021, 
-0xa6302b, 0x822021, 0x862021, 0x32270001, 
-0x3c010800, 0xac2500bc, 0x3c010800, 0xac2400b8, 
-0x10e00021, 0x32220002, 0x8f420100, 0xaf420020, 
-0x8f420104, 0xaf4200a8, 0x9342010b, 0xe0001e2, 
-0x305000ff, 0x2e02001c, 0x54400004, 0x101080, 
-0xe0001e5, 0xa0002f6, 0x0, 0x3c030800, 
-0x24634ef8, 0x431021, 0x8c420000, 0x40f809, 
-0x0, 0x10400005, 0x3c024000, 0x8f430104, 
-0x3c026020, 0xac430014, 0x3c024000, 0xaf420138, 
-0x3c020800, 0x8c420034, 0x24420001, 0x3c010800, 
-0xac220034, 0x32220002, 0x1040000e, 0x32220004, 
-0x8f420140, 0xe0001e2, 0xaf420020, 0xe000380, 
-0x0, 0x3c024000, 0xaf420178, 0x3c020800, 
-0x8c420038, 0x24420001, 0x3c010800, 0xac220038, 
-0x32220004, 0x1040ff9b, 0x3c028000, 0x8f420180, 
-0xe0001e2, 0xaf420020, 0x8f430180, 0x24020f00, 
-0x14620005, 0x0, 0x8f420188, 0xa742009c, 
-0xa00032b, 0x3c024000, 0x93620000, 0x24030050, 
-0x304200ff, 0x14430008, 0x3c024000, 0xe00035e, 
-0x0, 0x54400004, 0x3c024000, 0xe000e9f, 
-0x0, 0x3c024000, 0xaf4201b8, 0x3c020800, 
-0x8c42003c, 0x24420001, 0x3c010800, 0xac22003c, 
-0xa0002ae, 0x3c028000, 0x3c029000, 0x34420001, 
-0x822025, 0xaf440020, 0x8f420020, 0x440fffe, 
-0x0, 0x3e00008, 0x0, 0x3c028000, 
-0x34420001, 0x822025, 0x3e00008, 0xaf440020, 
-0x27bdffe0, 0xafb10014, 0xafb00010, 0x808821, 
-0xafbf0018, 0xe000333, 0x30b000ff, 0x9362007d, 
-0x2202021, 0x2028025, 0xa370007d, 0x8f700074, 
-0x3c028000, 0xe00033c, 0x2028024, 0x16000009, 
-0x8fbf0018, 0x8f4201f8, 0x440fffe, 0x24020002, 
-0xaf5101c0, 0xa34201c4, 0x3c021000, 0xaf4201f8, 
-0x8fbf0018, 0x8fb10014, 0x8fb00010, 0x3e00008, 
-0x27bd0020, 0x27bdffe8, 0xafbf0010, 0x8f440180, 
-0x97420184, 0x30420200, 0x10400005, 0x2821, 
-0xe0010b5, 0x0, 0xa000373, 0x24050001, 
-0x8f420188, 0x4400009, 0x8fbf0010, 0x8f420188, 
-0x3c03ff00, 0x431024, 0x3c030400, 0x14430003, 
-0x24050001, 0x9362003e, 0x8fbf0010, 0xa01021, 
-0x3e00008, 0x27bd0018, 0x8f420140, 0xaf420200, 
-0x3c021000, 0x3e00008, 0xaf420238, 0xa3600022, 
-0x8f440140, 0xa000341, 0x24050001, 0x27bdffe8, 
-0xafbf0014, 0xafb00010, 0x93620000, 0x24030020, 
-0x304200ff, 0x1043000b, 0x0, 0x93620000, 
-0x24030030, 0x304200ff, 0x10430006, 0x0, 
-0x93620000, 0x24030050, 0x304200ff, 0x1443005f, 
-0x8fbf0014, 0x93420148, 0x304200ff, 0x2443ffff, 
-0x2c620005, 0x10400059, 0x8fbf0014, 0x31080, 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-head mailing list