Sun Oct 21 11:56:26 2018 UTC ()

Do not add PCI link references until the bus has been mapped


(jmcneill)

diff -r1.3 -r1.4 src/sys/arch/arm/acpi/acpi_pci_machdep.c

--- src/sys/arch/arm/acpi/acpi_pci_machdep.c 2018/10/21 00:42:05	1.3
+++ src/sys/arch/arm/acpi/acpi_pci_machdep.c 2018/10/21 11:56:26	1.4

 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_pci_machdep.c,v 1.3 2018/10/21 00:42:05 jmcneill Exp $ */
+/* $NetBSD: acpi_pci_machdep.c,v 1.4 2018/10/21 11:56:26 jmcneill Exp $ */
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jared McNeill <jmcneill@invisible.ca>.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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 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: acpi_pci_machdep.c,v 1.3 2018/10/21 00:42:05 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci_machdep.c,v 1.4 2018/10/21 11:56:26 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/extent.h>
 #include <sys/queue.h>
 #include <sys/mutex.h>
 #include <sys/kmem.h>
 #include <machine/cpu.h>
 @@ -177,41 +177,41 @@ acpi_pci_md_attach_hook(device_t parent,
 					handle = prtp->prt_handle;
 					break;
+				}
+		}
 	} else {
 		/*
 		 * Lookup the ACPI device node for the root bus.
 		 */
 		ad = acpi_pciroot_find(seg, 0);
 		if (ad != NULL)
 			handle = ad->ad_handle;
+	}
 	if (ad != NULL) {
 		/*
 		 * This is a new ACPI managed bus. Add PCI link references.
 		 */
 		acpi_pci_md_pci_link(ad->ad_handle, pba->pba_bus);
 	if (handle != NULL) {
 		prt = kmem_alloc(sizeof(*prt), KM_SLEEP);
 		prt->prt_bus = pba->pba_bus;
 		prt->prt_handle = handle;
 		TAILQ_INSERT_TAIL(&acpi_pci_irq_routes, prt, prt_list);
+	}
 	acpimcfg_map_bus(self, pba->pba_pc, pba->pba_bus);
 	if (ad != NULL) {
 		/*
 		 * This is a new ACPI managed bus. Add PCI link references.
 		 */
 		acpi_pci_md_pci_link(ad->ad_handle, pba->pba_bus);
+	}
+}
 static int
 acpi_pci_md_bus_maxdevs(void *v, int busno)
+{
 	return 32;
+}
 static pcitag_t
 acpi_pci_md_make_tag(void *v, int b, int d, int f)
+{
 	return (b << 16) | (d << 11) | (f << 8);
+}