 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_gem_pci.c,v 1.49 2020/03/01 05:51:46 thorpej Exp $ */
+/*	$NetBSD: if_gem_pci.c,v 1.50 2020/03/02 06:38:06 msaitoh Exp $ */
 /*
+ *
  * Copyright (C) 2001 Eduardo Horvath.
  * 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
 @@ -24,27 +24,27 @@
  * 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.
+ *
  */
 /*
  * PCI bindings for Apple GMAC, Sun ERI and Sun GEM Ethernet controllers
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.49 2020/03/01 05:51:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.50 2020/03/02 06:38:06 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <machine/endian.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 @@ -95,27 +95,27 @@ int
 gem_pci_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct pci_attach_args *pa = aux;
 	if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_SUN &&
 	    (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_SUN_ERINETWORK ||
 	     PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_SUN_GEMNETWORK))
 		return (1);
 	if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_APPLE &&
 	    (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_GMAC ||
 	     PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_GMAC2 ||
 	     PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_GMAC3 ||
- 	     PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_SHASTA_GMAC ||
+	     PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_SHASTA_GMAC ||
 	     PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_K2_GMAC ||
 	     PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_SHASTA_GMAC ||
 	     PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_INTREPID2_GMAC))
 		return (1);
 	return (0);
+}
 static inline int
 gempromvalid(u_int8_t* buf)
+{
 	return buf[0] == 0x18 && buf[1] == 0x00 &&	/* structure length */
 @@ -209,55 +209,57 @@ gem_pci_attach(device_t parent, device_t
 	if (sc->sc_variant == GEM_UNKNOWN) {
 		aprint_error_dev(sc->sc_dev, "unknown adaptor\n");
 		return;
+	}
 #define PCI_GEM_BASEADDR	(PCI_MAPREG_START + 0x00)
 	/* XXX Need to check for a 64-bit mem BAR? */
 	if (pci_mapreg_map(pa, PCI_GEM_BASEADDR,
 	    PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0,
 	    &sc->sc_bustag, &sc->sc_h1, NULL, &sc->sc_size) != 0)
+	{
-		aprint_error_dev(sc->sc_dev, "unable to map device registers\n");
+		aprint_error_dev(sc->sc_dev,
 		    "unable to map device registers\n");
 		return;
+	}
 	if (bus_space_subregion(sc->sc_bustag, sc->sc_h1,
 	    GEM_PCI_BANK2_OFFSET, GEM_PCI_BANK2_SIZE, &sc->sc_h2)) {
-		aprint_error_dev(sc->sc_dev, "unable to create bank 2 subregion\n");
+		aprint_error_dev(sc->sc_dev,
 		    "unable to create bank 2 subregion\n");
 		return;
+	}
 	if ((data = prop_dictionary_get(device_properties(sc->sc_dev),
 	    "mac-address")) != NULL) {
 		memcpy(enaddr, prop_data_data_nocopy(data), ETHER_ADDR_LEN);
 		got_addr = 1;
 		if ((data = prop_dictionary_get(device_properties(sc->sc_dev),
-	    	    "shared-pins")) != NULL) {
+		    "shared-pins")) != NULL) {
 			memcpy(buf, prop_data_data_nocopy(data),
 			    prop_data_size(data));
 			if (isserdes(buf)) {
 				sc->sc_flags |= GEM_SERDES;
+			}
+		}
 	} else {
 		/*
-		 * Dig out VPD (vital product data) and acquire Ethernet address.
+		 * Dig out VPD (vital product data) and acquire Ethernet
-		 * The VPD of gem resides in the PCI PROM (PCI FCode).
+		 * address. The VPD of gem resides in the PCI PROM (PCI FCode).
 		 */
 		/*
-		 * ``Writing FCode 3.x Programs'' (newer ones, dated 1997 and later)
+		 * ``Writing FCode 3.x Programs'' (newer ones, dated 1997 and
-		 * chapter 2 describes the data structure.
+		 * later) chapter 2 describes the data structure.
 		 */
 		enp = NULL;
 		if (sc->sc_variant == GEM_SUN_GEM &&
 		    (bus_space_subregion(sc->sc_bustag, sc->sc_h1,
 		    GEM_PCI_ROM_OFFSET, GEM_PCI_ROM_SIZE, &romh)) == 0) {
 			/* read PCI Expansion PROM Header */
 			bus_space_read_region_1(sc->sc_bustag,
 			    romh, 0, buf, sizeof buf);
 			/* Check for "shared-pins = serdes" in FCode. */
 @@ -269,28 +271,28 @@ gem_pci_attach(device_t parent, device_t
 						serdes = 1;
 				} else {
 					if (isshared_pins(&buf[i]))
 						serdes = 2;
+				}
 				if (serdes == 2) {
 					sc->sc_flags |= GEM_SERDES;
 					break;
+				}
 				i++;
+			}
 #ifdef GEM_DEBUG
 			/* PROM dump */
-			printf("%s: PROM dump (0x0000 to %04zx)\n", device_xname(sc->sc_dev),
+			printf("%s: PROM dump (0x0000 to %04zx)\n",
-			    (sizeof buf) - 1);
+			    device_xname(sc->sc_dev), (sizeof buf) - 1);
 			i = 0;
 			j = 0;
 			printf("  %04x  ", i);
 			while (i < sizeof buf) {
 				printf("%02x ", buf[i]);
 				if (i && !(i % 8))
 					printf(" ");
 				if (i && !(i % 16)) {
 					printf(" ");
 					while (j < i) {
 						if (buf[j] > 31 && buf[j] < 128)
 							printf("%c", buf[j]);
 						else
 @@ -300,66 +302,68 @@ gem_pci_attach(device_t parent, device_t
 					j = i;
 					printf("\n  %04x  ", i);
+				}
 				i++;
+			}
 			printf("\n");
 #endif
 			if (memcmp(buf, promhdr, sizeof promhdr) == 0 &&
 			    (dataoff = (buf[PROMHDR_PTR_DATA] |
 				(buf[PROMHDR_PTR_DATA + 1] << 8))) >= 0x1c) {
 				/* read PCI Expansion PROM Data */
-				bus_space_read_region_1(sc->sc_bustag, romh, dataoff,
+				bus_space_read_region_1(sc->sc_bustag, romh,
-				    buf, 64);
+				    dataoff, buf, 64);
 				if (memcmp(buf, promdat, sizeof promdat) == 0 &&
 				    gempromvalid(buf + PROMDATA_DATA2) &&
 				    (vpdoff = (buf[PROMDATA_PTR_VPD] |
 					(buf[PROMDATA_PTR_VPD + 1] << 8))) >= 0x1c) {
 					/*
-					 * The VPD of gem is not in PCI 2.2 standard
+					 * The VPD of gem is not in PCI 2.2
-					 * format.  The length in the resource header
+					 * standard format.  The length in the
-					 * is in big endian, and resources are not
+					 * resource header is in big endian,
-					 * properly terminated (only one resource
+					 * and resources are not properly
-					 * and no end tag).
+					 * terminated (only one resource and no
 					 * end tag).
 					 */
 					/* read PCI VPD */
-					bus_space_read_region_1(sc->sc_bustag, romh,
+					bus_space_read_region_1(sc->sc_bustag,
-					    vpdoff, buf, 64);
+					    romh, vpdoff, buf, 64);
 					vpd = (void *)(buf + 3);
 					if (PCI_VPDRES_ISLARGE(buf[0]) &&
 					    PCI_VPDRES_LARGE_NAME(buf[0])
 						== PCI_VPDRES_TYPE_VPD &&
 					    vpd->vpd_key0 == 0x4e /* N */ &&
 					    vpd->vpd_key1 == 0x41 /* A */ &&
 					    vpd->vpd_len == ETHER_ADDR_LEN) {
 						/*
 						 * Ethernet address found
 						 */
 						enp = buf + 6;
+					}
+				}
+			}
+		}
 		if (enp) {
 			memcpy(enaddr, enp, ETHER_ADDR_LEN);
 			got_addr = 1;
+		}
+	}
 	if (!got_addr) {
-		printf("%s: no Ethernet address found\n", device_xname(sc->sc_dev));
+		printf("%s: no Ethernet address found\n",
 		    device_xname(sc->sc_dev));
 		/* should we bail here? */
+	}
 	if (pci_intr_map(pa, &gsc->gsc_handle) != 0) {
 		aprint_error_dev(sc->sc_dev, "unable to map interrupt\n");
 		return;
+	}
 	gsc->gsc_pc = pa->pa_pc;
 	gem_pci_estintr(gsc);
 	/* Finish off the attach. */
 	gem_attach(sc, enaddr);
 @@ -381,27 +385,28 @@ gem_pci_suspend(device_t self, const pmf
 		gsc->gsc_ih = NULL;
+	}
 	return true;
+}
 static bool
 gem_pci_estintr(struct gem_pci_softc *gsc)
+{
 	struct gem_softc *sc = &gsc->gsc_gem;
 	const char *intrstr;
 	char intrbuf[PCI_INTRSTR_LEN];
-	intrstr = pci_intr_string(gsc->gsc_pc, gsc->gsc_handle, intrbuf, sizeof(intrbuf));
+	intrstr = pci_intr_string(gsc->gsc_pc, gsc->gsc_handle, intrbuf,
 	    sizeof(intrbuf));
 	gsc->gsc_ih = pci_intr_establish_xname(gsc->gsc_pc, gsc->gsc_handle,
 	    IPL_NET, gem_intr, sc, device_xname(sc->sc_dev));
 	if (gsc->gsc_ih == NULL) {
 		aprint_error_dev(sc->sc_dev, "unable to establish interrupt");
 		if (intrstr != NULL)
 			aprint_error(" at %s", intrstr);
 		aprint_error("\n");
 		return false;
+	}
 	aprint_normal_dev(sc->sc_dev, "interrupting at %s\n", intrstr);
 	return true;
+}