 @@ -1,15 +1,16 @@
-/*	$NetBSD: amd64_mainbus.c,v 1.3 2018/12/22 07:45:58 cherry Exp $	*/
+/*	$NetBSD: amd64_mainbus.c,v 1.4 2018/12/22 08:35:04 maxv Exp $	*/
 /*	NetBSD: mainbus.c,v 1.39 2018/12/02 08:19:44 cherry Exp 	*/
 /*
  * Copyright (c) 1996 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
  *    must display the following acknowledgement:
 @@ -21,27 +22,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: amd64_mainbus.c,v 1.3 2018/12/22 07:45:58 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amd64_mainbus.c,v 1.4 2018/12/22 08:35:04 maxv Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <sys/bus.h>
 #include <dev/isa/isavar.h>
 #include <dev/pci/pcivar.h>
 #include <dev/isa/isareg.h>
 #include "pci.h"
 @@ -95,60 +96,59 @@ union amd64_mainbus_attach_args {
 #if NACPICA > 0
 	struct acpibus_attach_args mba_acpi;
 #endif
 	struct apic_attach_args aaa_caa;
 #if NIPMI > 0
 	struct ipmi_attach_args mba_ipmi;
 #endif
 };
 /*
  * This is set when the ISA bus is attached.  If it's not set by the
  * time it's checked below, then mainbus attempts to attach an ISA.
  */
-int	isa_has_been_seen;
+int isa_has_been_seen;
 struct x86_isa_chipset x86_isa_chipset;
 #if NISA > 0
 static const struct isabus_attach_args mba_iba = {
 	._iba_busname = "isa",
 	.iba_dmat = &isa_bus_dma_tag,
 	.iba_ic = &x86_isa_chipset
 };
 #endif
 #if defined(MPBIOS) || NACPICA > 0
 struct mp_bus *mp_busses;
 int mp_nbus;
 struct mp_intr_map *mp_intrs;
 int mp_nintr;
 int mp_isa_bus = -1;
 int mp_eisa_bus = -1;
 extern bool acpi_present;
 extern bool mpacpi_active;
 # ifdef MPVERBOSE
 #  if MPVERBOSE > 0
 int mp_verbose = MPVERBOSE;
 #  else
 int mp_verbose = 1;
 #  endif
 # else
 int mp_verbose = 0;
 # endif
 #endif
 /*
  * Probe for the mainbus; always succeeds.
  */
 int
 amd64_mainbus_match(device_t parent, cfdata_t match, void *aux)
+{
 	return 1;
+}
 /*
  * Attach the mainbus.
  */
 @@ -212,39 +212,38 @@ amd64_mainbus_attach(device_t parent, de
 #endif
 #if defined(MPBIOS) && defined(MPBIOS_SCANPCI)
 		if (npcibus == 0 && mpbios_scanned != 0)
 			npcibus = mp_pci_scan(self, &mba.mba_pba, pcibusprint);
 #endif
 		if (npcibus == 0)
 			config_found_ia(self, "pcibus", &mba.mba_pba,
 			    pcibusprint);
 #if NACPICA > 0
 		if (mp_verbose)
 			acpi_pci_link_state();
 #endif
+	}
 #endif
 #if NISA > 0
 	if (isa_has_been_seen == 0) {
 		mba.mba_iba = mba_iba;
 		mba.mba_iba.iba_iot = x86_bus_space_io;
 		mba.mba_iba.iba_memt = x86_bus_space_mem;
 		config_found_ia(self, "isabus", &mba.mba_iba, isabusprint);
+	}
 #endif
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
+}
 int
 amd64_mainbus_print(void *aux, const char *pnp)
+{
 	union amd64_mainbus_attach_args *mba = aux;
 	if (pnp)
 		aprint_normal("%s at %s", mba->mba_busname, pnp);
-	return (UNCONF);
+	return UNCONF;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i386_mainbus.c,v 1.3 2018/12/22 07:45:58 cherry Exp $	*/
+/*	$NetBSD: i386_mainbus.c,v 1.4 2018/12/22 08:35:04 maxv Exp $	*/
 /*	NetBSD: mainbus.c,v 1.104 2018/12/02 08:19:44 cherry Exp 	*/
 /*
  * Copyright (c) 1996 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.
 @@ -22,27 +22,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: i386_mainbus.c,v 1.3 2018/12/22 07:45:58 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i386_mainbus.c,v 1.4 2018/12/22 08:35:04 maxv Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <sys/bus.h>
 #include <dev/isa/isavar.h>
 #include <dev/eisa/eisavar.h>
 #include <dev/pci/pcivar.h>
 #include <dev/isa/isareg.h>		/* for ISA_HOLE_VADDR */
 @@ -114,49 +114,49 @@ union i386_mainbus_attach_args {
 	struct apic_attach_args aaa_caa;
 #if NACPICA > 0
 	struct acpibus_attach_args mba_acpi;
 #endif
 #if NIPMI > 0
 	struct ipmi_attach_args mba_ipmi;
 #endif
 };
 /*
  * This is set when the ISA bus is attached.  If it's not set by the
  * time it's checked below, then mainbus attempts to attach an ISA.
  */
-int	isa_has_been_seen;
+int isa_has_been_seen;
 struct x86_isa_chipset x86_isa_chipset;
 #if NISA > 0
 static const struct isabus_attach_args mba_iba = {
 	._iba_busname = "isa",
 	.iba_dmat = &isa_bus_dma_tag,
 	.iba_ic = &x86_isa_chipset
 };
 #endif
 /*
  * Same as above, but for EISA.
  */
-int	eisa_has_been_seen;
+int eisa_has_been_seen;
 #if defined(MPBIOS) || NACPICA > 0
 struct mp_bus *mp_busses;
 int mp_nbus;
 struct mp_intr_map *mp_intrs;
 int mp_nintr;
-int mp_isa_bus = -1;            /* XXX */
+int mp_isa_bus = -1;	/* XXX */
-int mp_eisa_bus = -1;           /* XXX */
+int mp_eisa_bus = -1;	/* XXX */
 extern bool acpi_present;
 extern bool mpacpi_active;
 # ifdef MPVERBOSE
 #  if MPVERBOSE > 0
 int mp_verbose = MPVERBOSE;
 #  else
 int mp_verbose = 1;
 #  endif
 # else
 int mp_verbose = 0;
 # endif

 @@ -1,16 +1,16 @@
-/* $NetBSD: mainbus.c,v 1.1 2018/12/22 07:45:59 cherry Exp $ */
+/* $NetBSD: mainbus.c,v 1.2 2018/12/22 08:35:04 maxv Exp $ */
-/*-
+/*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 @@ -18,27 +18,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * 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: mainbus.c,v 1.1 2018/12/22 07:45:59 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.2 2018/12/22 08:35:04 maxv Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <dev/pci/pcivar.h>
 #include <machine/cpuvar.h>
 #include <machine/mpbiosvar.h>
 #include <machine/mpacpi.h>
 #include "pci.h"
 @@ -83,74 +83,73 @@ int	mainbus_match(device_t, cfdata_t, vo
 CFATTACH_DECL2_NEW(mainbus, sizeof(struct mainbus_softc),
     mainbus_match, mainbus_attach,
     NULL, NULL,
     mainbus_rescan, mainbus_childdetached);
 #if defined(__i386__) && !defined(XEN)
 void i386_mainbus_childdetached(device_t, device_t);
 int  i386_mainbus_rescan(device_t, const char *, const int *);
 void i386_mainbus_attach(device_t, device_t, void *);
 #endif
 #if defined(__x86_64__) && !defined(XEN)
-void
+void amd64_mainbus_attach(device_t, device_t, void *);
 amd64_mainbus_attach(device_t, device_t, void *);
 #endif
 #if defined(XEN)
 void xen_mainbus_attach(device_t, device_t, void *);
 #endif
 static int
 mainbus_cpu_print(void *aux, const char *busname)
+{
 	char *cpuname = aux;
 	if (busname)
 		aprint_normal("%s at %s", cpuname, busname);
-	return (UNCONF);
+	return UNCONF;
+}
 /*
- * On x86, cpus can be enumerated and attached to mainbus in mainly
+ * On x86, CPUs can be enumerated and attached to mainbus in mainly two ways
- * two ways depending on the platform (configuration):
+ * depending on the platform (configuration): via MP BIOS tables, and via
- * via MP BIOS tables, and via ACPI tables.
+ * ACPI tables.
+ *
- * Since cpus are not an optional part of computers, this attachment
+ * Since CPUs are not an optional part of computers, this attachment is made
- * is made common across all x86 architectures and modes, and thus
+ * common across all x86 architectures and modes, and thus hard-coded into
- * hard coded into the boot path, with the exception of XEN PV domU.
+ * the boot path, with the exception of XEN PV domU.
+ *
- * Along with cpus, apics come in various shapes and forms, and to
+ * Along with CPUs, APICs come in various shapes and forms, and to accommodate
- * accommodate for the configurable ioapic topology, the "ioapicbus"
+ * for the configurable ioapic topology, the "ioapicbus" is also enumerated
- * is also enumerated here as part of the mpbios/mpacpi probe path.
+ * here as part of the mpbios/mpacpi probe path.
+ *
- * All other busses are attached variously depending on the
+ * All other busses are attached variously depending on the platform
- * platform architecture and config(5)
+ * architecture and config(5).
+ *
  * These configurations and attach orderings for various platforms are
  * currently respectively driven in the functions:
+ *
- * i386_mainbus_attach();
+ *     i386_mainbus_attach();
- * amd64_mainbus_attach();
+ *     amd64_mainbus_attach();
- * xen_mainbus_attach();
+ *     xen_mainbus_attach();
+ *
- * This arrangement gives us the flexibility to do things such as
+ * This arrangement gives us the flexibility to do things such as dynamic
- * dynamic attach path traversal at boot time, depending on the
+ * attach path traversal at boot time, depending on the "mode" of operation,
- * "mode" of operation, ie; virtualition aware or native.
+ * ie: virtualition aware or native.
+ *
- * For (a contrived) eg: XEN PVHVM would allow us to attach pci(9)
+ * For (a contrived) eg: XEN PVHVM would allow us to attach pci(9) either via
- * either via hypervisorbus or mainbus depending on if the kernel is
+ * hypervisorbus or mainbus depending on if the kernel is running under the
- * running under the hypervisor or not.
+ * hypervisor or not.
  */
 static void
 x86_cpubus_attach(device_t self)
+{
 	int numcpus = 0;
 #if NPCI > 0
 #ifdef __HAVE_PCI_MSI_MSIX
 	msipic_init();
 #endif
 @@ -184,38 +183,37 @@ x86_cpubus_attach(device_t self)
 	 */
 	if (acpi_present)
 		mpacpi_active = mpacpi_scan_apics(self, &numcpus) != 0;
 	if (!mpacpi_active) {
 #endif
 #ifdef MPBIOS
 		if (mpbios_probe(self))
 			mpbios_scan(self, &numcpus);
 		else
 #endif
 		if (numcpus == 0) {
 			struct cpu_attach_args caa;
 			memset(&caa, 0, sizeof(caa));
 			caa.cpu_number = 0;
 			caa.cpu_role = CPU_ROLE_SP;
 			caa.cpu_func = 0;
 			config_found_ia(self, "cpubus", &caa, mainbus_cpu_print);
+		}
 #if NACPICA > 0
+	}
 #endif
+}
 int
 mainbus_match(device_t parent, cfdata_t match, void *aux)
+{
 	return 1;
+}
 void
 mainbus_attach(device_t parent, device_t self, void *aux)
+{
 @@ -228,28 +226,30 @@ mainbus_attach(device_t parent, device_t
 		x86_cpubus_attach(self);
 #if defined(__i386__) && !defined(XEN)
 		i386_mainbus_attach(parent, self, aux);
 #elif defined(__x86_64__) && !defined(XEN)
 		amd64_mainbus_attach(parent, self, aux);
 #endif
 #if defined(XEN)
+	}
 	xen_mainbus_attach(parent, self, aux);
 #endif
+}
-int	mainbus_rescan(device_t self, const char *ifattr, const int *locators)
+int
 mainbus_rescan(device_t self, const char *ifattr, const int *locators)
+{
 #if defined(__i386__) && !defined(XEN)
 	return i386_mainbus_rescan(self, ifattr, locators);
 #endif
 	return ENOTTY; /* Inappropriate ioctl for this device */
+}
-void	mainbus_childdetached(device_t self, device_t child)
+void
 mainbus_childdetached(device_t self, device_t child)
+{
 #if defined(__i386__) && !defined(XEN)
 	i386_mainbus_childdetached(self, child);
 #endif
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: xen_mainbus.c,v 1.3 2018/12/22 07:45:58 cherry Exp $	*/
+/*	$NetBSD: xen_mainbus.c,v 1.4 2018/12/22 08:35:04 maxv Exp $	*/
 /*	NetBSD: mainbus.c,v 1.19 2017/05/23 08:54:39 nonaka Exp 	*/
 /*	NetBSD: mainbus.c,v 1.53 2003/10/27 14:11:47 junyoung Exp 	*/
 /*
  * Copyright (c) 1996 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
 @@ -23,27 +23,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: xen_mainbus.c,v 1.3 2018/12/22 07:45:58 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_mainbus.c,v 1.4 2018/12/22 08:35:04 maxv Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include "hypervisor.h"
 #include "pci.h"
 #include "opt_xen.h"
 #include "opt_mpbios.h"
 #include "opt_pcifixup.h"
 @@ -57,46 +57,46 @@ __KERNEL_RCSID(0, "$NetBSD: xen_mainbus.
 #include <machine/i82093var.h>
 #include <xen/xen.h>
 #include <xen/hypervisor.h>
 #if NIPMI > 0
 #include <x86/ipmivar.h>
 #endif
 #if NPCI > 0
 #include <dev/pci/pcivar.h>
 #if NACPICA > 0
 #include <dev/acpi/acpivar.h>
 #include <xen/mpacpi.h>
 #endif /* NACPICA > 0 */
 #ifdef MPBIOS
 #include <machine/mpbiosvar.h>
 #endif /* MPBIOS */
 #ifdef PCI_BUS_FIXUP
 #include <arch/x86/pci/pci_bus_fixup.h>
 #ifdef PCI_ADDR_FIXUP
 #include <arch/x86/pci/pci_addr_fixup.h>
 #endif
 #endif
 #if defined(MPBIOS) || NACPICA > 0
 struct mp_bus *mp_busses;
 int mp_nbus;
 struct mp_intr_map *mp_intrs;
 int mp_nintr;
-int mp_isa_bus = -1;	    /* XXX */
+int mp_isa_bus = -1;	/* XXX */
-int mp_eisa_bus = -1;	   /* XXX */
+int mp_eisa_bus = -1;	/* XXX */
 #ifdef MPVERBOSE
 int mp_verbose = 1;
 #else /* MPVERBOSE */
 int mp_verbose = 0;
 #endif /* MPVERBOSE */
 #endif /* defined(MPBIOS) || NACPICA > 0 */
 #endif /* NPCI > 0 */
 extern bool acpi_present;
 extern bool mpacpi_active;
 int	xen_mainbus_match(device_t, cfdata_t, void *);
 @@ -138,25 +138,24 @@ xen_mainbus_attach(device_t parent, devi
 	mba.mba_ipmi.iaa_memt = x86_bus_space_mem;
 	if (ipmi_probe(&mba.mba_ipmi))
 		config_found_ia(self, "ipmibus", &mba.mba_ipmi, 0);
 #endif
 #if NHYPERVISOR > 0
 	mba.mba_haa.haa_busname = "hypervisor";
 	config_found_ia(self, "hypervisorbus", &mba.mba_haa, xen_mainbus_print);
 #endif
 	/* save/restore for Xen */
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
+}
 int
 xen_mainbus_print(void *aux, const char *pnp)
+{
 	union xen_mainbus_attach_args *mba = aux;
 	if (pnp)
 		aprint_normal("%s at %s", mba->mba_busname, pnp);
-	return (UNCONF);
+	return UNCONF;
+}