 @@ -1,14 +1,14 @@
-/*	$NetBSD: ppb.c,v 1.59 2017/04/26 03:54:37 msaitoh Exp $	*/
+/*	$NetBSD: ppb.c,v 1.60 2017/04/26 08:00:03 msaitoh Exp $	*/
 /*
  * Copyright (c) 1996, 1998 Christopher G. Demetriou.  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
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -21,27 +21,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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>
-__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.59 2017/04/26 03:54:37 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.60 2017/04/26 08:00:03 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/evcnt.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/ppbreg.h>
 #include <dev/pci/ppbvar.h>
 #include <dev/pci/pcidevs.h>
 @@ -50,27 +50,29 @@ __KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.59
 	 PCIE_SLCSR_PDE | PCIE_SLCSR_CCE | PCIE_SLCSR_HPE |	\
 	 PCIE_SLCSR_DLLSCE)
 static const char pcie_linkspeed_strings[4][5] = {
 	"1.25", "2.5", "5.0", "8.0",
 };
 int	ppb_printevent = 0; /* Print event type if the value is not 0 */
 static int	ppbmatch(device_t, cfdata_t, void *);
 static void	ppbattach(device_t, device_t, void *);
 static int	ppbdetach(device_t, int);
 static void	ppbchilddet(device_t, device_t);
 #ifdef PPB_USEINTR
 static int	ppb_intr(void *);
 #endif
 static bool	ppb_resume(device_t, const pmf_qual_t *);
 static bool	ppb_suspend(device_t, const pmf_qual_t *);
 CFATTACH_DECL3_NEW(ppb, sizeof(struct ppb_softc),
     ppbmatch, ppbattach, ppbdetach, NULL, NULL, ppbchilddet,
     DVF_DETACH_SHUTDOWN);
 static int
 ppbmatch(device_t parent, cfdata_t match, void *aux)
+{
 	struct pci_attach_args *pa = aux;
 	/*
 @@ -193,28 +195,30 @@ ppb_print_pcie(device_t self)
 	default:
 		aprint_normal(">\n");
 		break;
+	}
+}
 static void
 ppbattach(device_t parent, device_t self, void *aux)
+{
 	struct ppb_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	pci_chipset_tag_t pc = pa->pa_pc;
 	struct pcibus_attach_args pba;
 #ifdef PPB_USEINTR
 	char const *intrstr;
 	char intrbuf[PCI_INTRSTR_LEN];
 #endif
 	pcireg_t busdata, reg;
 	pci_aprint_devinfo(pa, NULL);
 	sc->sc_pc = pc;
 	sc->sc_tag = pa->pa_tag;
 	sc->sc_dev = self;
 	busdata = pci_conf_read(pc, pa->pa_tag, PPB_REG_BUSINFO);
 	if (PPB_BUSINFO_SECONDARY(busdata) == 0) {
 		aprint_normal_dev(self, "not configured by system firmware\n");
 		return;
 @@ -227,26 +231,27 @@ ppbattach(device_t parent, device_t self
 	 * XXX can't do this, because we're not given our bus number
 	 * (we shouldn't need it), and because we've no way to
 	 * decompose our tag.
 	 */
 	/* sanity check. */
 	if (pa->pa_bus != PPB_BUSINFO_PRIMARY(busdata))
 		panic("ppbattach: bus in tag (%d) != bus in reg (%d)",
 		    pa->pa_bus, PPB_BUSINFO_PRIMARY(busdata));
 #endif
 	/* Check for PCI Express capabilities and setup hotplug support. */
 	if (pci_get_capability(pc, pa->pa_tag, PCI_CAP_PCIEXPRESS,
 	    &sc->sc_pciecapoff, &reg) && (reg & PCIE_XCAP_SI)) {
 #ifdef PPB_USEINTR
 #if 0
 		/*
 		 * XXX Initialize workqueue or something else for
 		 * HotPlug support.
 		 */
 #endif
 		if (pci_intr_alloc(pa, &sc->sc_pihp, NULL, 0) == 0)
 			sc->sc_intrhand = pci_intr_establish_xname(pc,
 			    sc->sc_pihp[0], IPL_BIO, ppb_intr, sc,
 			    device_xname(sc->sc_dev));
 		if (sc->sc_intrhand) {
 @@ -294,99 +299,116 @@ ppbattach(device_t parent, device_t self
 					val |= __SHIFTIN(PCIE_SLCSR_IND_OFF,
 					    PCIE_SLCSR_PIC);
 				else
 					val |= __SHIFTIN(PCIE_SLCSR_IND_ON,
 					    PCIE_SLCSR_PIC);
+			}
 			val |= PCIE_SLCSR_DLLSCE | PCIE_SLCSR_HPE
 			    | PCIE_SLCSR_PDE;
 			slcsr = val;
 			pci_conf_write(pc, pa->pa_tag,
 			    sc->sc_pciecapoff + PCIE_SLCSR, slcsr);
+		}
 #else
 		reg = pci_conf_read(sc->sc_pc, sc->sc_tag,
 		    sc->sc_pciecapoff + PCIE_SLCSR);
 		if (reg & PCIE_SLCSR_NOTIFY_MASK) {
 			aprint_debug_dev(self,
 			    "disabling notification events\n");
 			reg &= ~PCIE_SLCSR_NOTIFY_MASK;
 			pci_conf_write(sc->sc_pc, sc->sc_tag,
 			    sc->sc_pciecapoff + PCIE_SLCSR, reg);
+		}
 #endif /* PPB_USEINTR */
+	}
 	if (!pmf_device_register(self, ppb_suspend, ppb_resume))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	/*
 	 * Attach the PCI bus than hangs off of it.
+	 *
 	 * XXX Don't pass-through Memory Read Multiple.  Should we?
 	 * XXX Consult the spec...
 	 */
 	pba.pba_iot = pa->pa_iot;
 	pba.pba_memt = pa->pa_memt;
 	pba.pba_dmat = pa->pa_dmat;
 	pba.pba_dmat64 = pa->pa_dmat64;
 	pba.pba_pc = pc;
 	pba.pba_flags = pa->pa_flags & ~PCI_FLAGS_MRM_OKAY;
 	pba.pba_bus = PPB_BUSINFO_SECONDARY(busdata);
 	pba.pba_sub = PPB_BUSINFO_SUBORDINATE(busdata);
 	pba.pba_bridgetag = &sc->sc_tag;
 	pba.pba_intrswiz = pa->pa_intrswiz;
 	pba.pba_intrtag = pa->pa_intrtag;
 #ifdef PPB_USEINTR
 	/* Attach event counters */
 	evcnt_attach_dynamic(&sc->sc_ev_intr, EVCNT_TYPE_INTR, NULL,
 	    device_xname(sc->sc_dev), "Interrupt");
 	evcnt_attach_dynamic(&sc->sc_ev_abp, EVCNT_TYPE_MISC, NULL,
 	    device_xname(sc->sc_dev), "Attention Button Pressed");
 	evcnt_attach_dynamic(&sc->sc_ev_pfd, EVCNT_TYPE_MISC, NULL,
 	    device_xname(sc->sc_dev), "Power Fault Detected");
 	evcnt_attach_dynamic(&sc->sc_ev_msc, EVCNT_TYPE_MISC, NULL,
 	    device_xname(sc->sc_dev), "MRL Sensor Changed");
 	evcnt_attach_dynamic(&sc->sc_ev_pdc, EVCNT_TYPE_MISC, NULL,
 	    device_xname(sc->sc_dev), "Presence Detect Changed");
 	evcnt_attach_dynamic(&sc->sc_ev_cc, EVCNT_TYPE_MISC, NULL,
 	    device_xname(sc->sc_dev), "Command Completed");
 	evcnt_attach_dynamic(&sc->sc_ev_lacs, EVCNT_TYPE_MISC, NULL,
 	    device_xname(sc->sc_dev), "Data Link Layer State Changed");
 #endif
 	config_found_ia(self, "pcibus", &pba, pcibusprint);
+}
 static int
 ppbdetach(device_t self, int flags)
+{
 #ifdef PPB_USEINTR
 	struct ppb_softc *sc = device_private(self);
 	pcireg_t slcsr;
 #endif
 	int rc;
 	if ((rc = config_detach_children(self, flags)) != 0)
 		return rc;
 #ifdef PPB_USEINTR
 	/* Detach event counters */
 	evcnt_detach(&sc->sc_ev_intr);
 	evcnt_detach(&sc->sc_ev_abp);
 	evcnt_detach(&sc->sc_ev_pfd);
 	evcnt_detach(&sc->sc_ev_msc);
 	evcnt_detach(&sc->sc_ev_pdc);
 	evcnt_detach(&sc->sc_ev_cc);
 	evcnt_detach(&sc->sc_ev_lacs);
 	/* Clear any pending events and disable interrupt */
 	slcsr = pci_conf_read(sc->sc_pc, sc->sc_tag,
 	      sc->sc_pciecapoff + PCIE_SLCSR);
 	slcsr &= ~PCIE_SLCSR_NOTIFY_MASK;
 	pci_conf_write(sc->sc_pc, sc->sc_tag,
 		sc->sc_pciecapoff + PCIE_SLCSR, slcsr);
 	/* Disestablish the interrupt handler */
 	if (sc->sc_intrhand != NULL) {
 		pci_intr_disestablish(sc->sc_pc, sc->sc_intrhand);
 		pci_intr_release(sc->sc_pc, sc->sc_pihp, 1);
+	}
 #endif
 	pmf_device_deregister(self);
 	return 0;
+}
 static bool
 ppb_resume(device_t dv, const pmf_qual_t *qual)
+{
 	struct ppb_softc *sc = device_private(dv);
 	int off;
 	pcireg_t val;
         for (off = 0x40; off <= 0xff; off += 4) {
 @@ -408,26 +430,27 @@ ppb_suspend(device_t dv, const pmf_qual_
 	for (off = 0x40; off <= 0xff; off += 4)
 		sc->sc_pciconfext[(off - 0x40) / 4] =
 		    pci_conf_read(sc->sc_pc, sc->sc_tag, off);
 	return true;
+}
 static void
 ppbchilddet(device_t self, device_t child)
+{
 	/* we keep no references to child devices, so do nothing */
+}
 #ifdef PPB_USEINTR
 static int
 ppb_intr(void *arg)
+{
 	struct ppb_softc *sc = arg;
 	device_t dev = sc->sc_dev;
 	pcireg_t reg;
 	sc->sc_ev_intr.ev_count++;
 	reg = pci_conf_read(sc->sc_pc, sc->sc_tag,
 	    sc->sc_pciecapoff + PCIE_SLCSR);
 	/* Clear interrupts. */
 	pci_conf_write(sc->sc_pc, sc->sc_tag,
 @@ -472,13 +495,14 @@ ppb_intr(void *arg)
 		if (ppb_printevent)
 			device_printf(dev, "Command Completed\n");
+	}
 	/* Data Link Layer State Changed */
 	if (reg & PCIE_SLCSR_LACS) {
 		sc->sc_ev_lacs.ev_count++;
 		if (ppb_printevent)
 			device_printf(dev, "Data Link Layer State Changed\n");
+	}
 	return 0;
+}
 #endif /* PPB_USEINTR */