Tue May 5 18:08:29 2009 UTC ()

Doesn't print error message only when the register is BGE_SRS_MODE.
It occurs on some environment (and once after boot?). Other *BSDs and
Linux don't print the error message for all registers.


(msaitoh)

diff -r1.164 -r1.165 src/sys/dev/pci/if_bge.c

--- src/sys/dev/pci/if_bge.c 2009/04/23 10:47:44	1.164
+++ src/sys/dev/pci/if_bge.c 2009/05/05 18:08:28	1.165

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_bge.c,v 1.164 2009/04/23 10:47:44 msaitoh Exp $	*/
+/*	$NetBSD: if_bge.c,v 1.165 2009/05/05 18:08:28 msaitoh Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2001
  *	Bill Paul <wpaul@windriver.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
 @@ -69,27 +69,27 @@
  * does not support external SSRAM.
+ *
  * Broadcom also produces a variation of the BCM5700 under the "Altima"
  * brand name, which is functionally similar but lacks PCI-X support.
+ *
  * Without external SSRAM, you can only have at most 4 TX rings,
  * and the use of the mini RX ring is disabled. This seems to imply
  * that these features are simply not available on the BCM5701. As a
  * result, this driver does not implement any support for the mini RX
  * ring.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.164 2009/04/23 10:47:44 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.165 2009/05/05 18:08:28 msaitoh Exp $");
 #include "bpfilter.h"
 #include "vlan.h"
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 @@ -4182,28 +4182,34 @@ bge_stop_block(struct bge_softc *sc, bus
+{
 	int i;
 	BGE_CLRBIT(sc, reg, bit);
 	for (i = 0; i < BGE_TIMEOUT; i++) {
 		if ((CSR_READ_4(sc, reg) & bit) == 0)
 			return;
 		delay(100);
 		if (sc->bge_flags & BGE_PCIE)
 		  DELAY(1000);
+	}
-	aprint_error_dev(sc->bge_dev,
+	/*
-	    "block failed to stop: reg 0x%lx, bit 0x%08x\n", (u_long)reg, bit);
+	 * Doesn't print only when the register is BGE_SRS_MODE. It occurs
 	 * on some environment (and once after boot?)
 	 */
 	if (reg != BGE_SRS_MODE)
 		aprint_error_dev(sc->bge_dev,
 		    "block failed to stop: reg 0x%lx, bit 0x%08x\n",
 		    (u_long)reg, bit);
+}
 /*
  * Stop the adapter and free any mbufs allocated to the
  * RX and TX lists.
  */
 static void
 bge_stop(struct ifnet *ifp, int disable)
+{
 	struct bge_softc *sc = ifp->if_softc;
 	callout_stop(&sc->bge_timeout);