 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_bge.c,v 1.228 2013/03/27 10:26:05 msaitoh Exp $	*/
+/*	$NetBSD: if_bge.c,v 1.229 2013/03/27 12:03:51 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.228 2013/03/27 10:26:05 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.229 2013/03/27 12:03:51 msaitoh Exp $");
 #include "vlan.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>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 @@ -1120,35 +1120,31 @@ bge_ape_unlock(struct bge_softc *sc, int
 /*
  * Send an event to the APE firmware.
  */
 void
 bge_ape_send_event(struct bge_softc *sc, uint32_t event)
+{
 	uint32_t apedata;
 	int i;
 	/* NCSI does not support APE events. */
 	if ((sc->bge_mfw_flags & BGE_MFW_ON_APE) == 0)
 		return;
 	printf("%s: APE event 0x%08x send\n", device_xname(sc->bge_dev), event);
 	/* Wait up to 1ms for APE to service previous event. */
 	for (i = 10; i > 0; i--) {
 		if (bge_ape_lock(sc, BGE_APE_LOCK_MEM) != 0)
 			break;
 		apedata = APE_READ_4(sc, BGE_APE_EVENT_STATUS);
 		printf("%s: APE data 0x%08x -> 0x%08x\n",
 		    device_xname(sc->bge_dev), apedata, event);
 		if ((apedata & BGE_APE_EVENT_STATUS_EVENT_PENDING) == 0) {
 			APE_WRITE_4(sc, BGE_APE_EVENT_STATUS, event |
 			    BGE_APE_EVENT_STATUS_EVENT_PENDING);
 			bge_ape_unlock(sc, BGE_APE_LOCK_MEM);
 			APE_WRITE_4(sc, BGE_APE_EVENT, BGE_APE_EVENT_1);
 			break;
+		}
 		bge_ape_unlock(sc, BGE_APE_LOCK_MEM);
 		DELAY(100);
+	}
 	if (i == 0) {
 		printf("%s: APE event 0x%08x send timed out\n",
 		    device_xname(sc->bge_dev), event);
 @@ -3472,35 +3468,26 @@ bge_attach(device_t parent, device_t sel
 	    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_BCM57791 ||
 	    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_BCM57795 ||
 	    BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5906) {
 		capmask &= ~BMSR_EXTSTAT;
 		sc->bge_flags |= BGE_PHY_NO_WIRESPEED;
+	}
 	if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5700 ||
 	    (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5705 &&
 	     (sc->bge_chipid != BGE_CHIPID_BCM5705_A0 &&
 		 sc->bge_chipid != BGE_CHIPID_BCM5705_A1)))
 		sc->bge_flags |= BGE_PHY_NO_WIRESPEED;
 	if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5719 ||
 	    BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5720 ||
 	    BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM57766 ||
 	    (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_BCM5718 &&
 		sc->bge_chipid != BGE_CHIPID_BCM5717_A0) ||
 	    (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM57765 &&
 		sc->bge_chipid != BGE_CHIPID_BCM57765_A0))
 		sc->bge_flags |= BGE_PHY_EEE;
 	/* Set various PHY bug flags. */
 	if (sc->bge_chipid == BGE_CHIPID_BCM5701_A0 ||
 	    sc->bge_chipid == BGE_CHIPID_BCM5701_B0)
 		sc->bge_flags |= BGE_PHY_CRC_BUG;
 	if (BGE_CHIPREV(sc->bge_chipid) == BGE_CHIPREV_5703_AX ||
 	    BGE_CHIPREV(sc->bge_chipid) == BGE_CHIPREV_5704_AX)
 		sc->bge_flags |= BGE_PHY_ADC_BUG;
 	if (sc->bge_chipid == BGE_CHIPID_BCM5704_A0)
 		sc->bge_flags |= BGE_PHY_5704_A0_BUG;
 	if ((BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5700 ||
 	    BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5701) &&
 	    PCI_VENDOR(subid) == PCI_VENDOR_DELL)
 		sc->bge_flags |= BGE_PHY_NO_3LED;
 @@ -4122,33 +4109,26 @@ bge_reset(struct bge_softc *sc)
 	    BGE_ASICREV(sc->bge_chipid) != BGE_ASICREV_BCM5785) {
 		uint32_t v;
 		/* Enable PCI Express bug fix */
 		v = CSR_READ_4(sc, BGE_TLP_CONTROL_REG);
 		CSR_WRITE_4(sc, BGE_TLP_CONTROL_REG,
 		    v | BGE_TLP_DATA_FIFO_PROTECT);
+	}
 	if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5720)
 		BGE_CLRBIT(sc, BGE_CPMU_CLCK_ORIDE,
 		    CPMU_CLCK_ORIDE_MAC_ORIDE_EN);
 	if ((sc->bge_flags & BGE_PHY_EEE) != 0) {
 		uint32_t eeemode;
 		eeemode = CSR_READ_4(sc, BGE_CPMU_EEE_MODE);
 		printf("EEEMODE = %x\n", eeemode);
 		CSR_WRITE_4(sc, BGE_CPMU_EEE_MODE, 0);
 	return 0;
+}
 /*
  * Frame reception handling. This is called if there's a frame
  * on the receive return list.
+ *
  * Note: we have to be able to handle two possibilities here:
  * 1) the frame is from the jumbo receive ring
  * 2) the frame is from the standard receive ring
  */
 static void
 @@ -5683,33 +5663,26 @@ bge_link_upd(struct bge_softc *sc)
 		if (BGE_STS_BIT(sc, BGE_STS_LINK) != link) {
 			mii_pollstat(mii);
 			if (!BGE_STS_BIT(sc, BGE_STS_LINK) &&
 			    mii->mii_media_status & IFM_ACTIVE &&
 			    IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE)
 				BGE_STS_SETBIT(sc, BGE_STS_LINK);
 			else if (BGE_STS_BIT(sc, BGE_STS_LINK) &&
 			    (!(mii->mii_media_status & IFM_ACTIVE) ||
 			    IFM_SUBTYPE(mii->mii_media_active) == IFM_NONE))
 				BGE_STS_CLRBIT(sc, BGE_STS_LINK);
+		}
 	} else {
 		/*
 		 * For controllers that call mii_tick, we have to poll
 		 * link status.
 		 */
 		mii_pollstat(mii);
 		bge_miibus_statchg(ifp);
+	}
 	/* Clear the attention */
 	CSR_WRITE_4(sc, BGE_MAC_STS, BGE_MACSTAT_SYNC_CHANGED|
 	    BGE_MACSTAT_CFG_CHANGED|BGE_MACSTAT_MI_COMPLETE|
 	    BGE_MACSTAT_LINK_CHANGED);
+}
 static int
 bge_sysctl_verify(SYSCTLFN_ARGS)
+{
 	int error, t;
 	struct sysctlnode node;