Module Name: src
Committed By: jmcneill
Date: Fri Nov 2 19:51:08 UTC 2018
Modified Files:
src/sys/dev/acpi: acpi_mcfg.c
Log Message:
Do not ignore non-zero segment numbers in MCFG if __HAVE_PCI_GET_SEGMENT
is defined.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/acpi/acpi_mcfg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_mcfg.c
diff -u src/sys/dev/acpi/acpi_mcfg.c:1.12 src/sys/dev/acpi/acpi_mcfg.c:1.13
--- src/sys/dev/acpi/acpi_mcfg.c:1.12 Fri Nov 2 15:01:18 2018
+++ src/sys/dev/acpi/acpi_mcfg.c Fri Nov 2 19:51:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_mcfg.c,v 1.12 2018/11/02 15:01:18 jmcneill Exp $ */
+/* $NetBSD: acpi_mcfg.c,v 1.13 2018/11/02 19:51:08 jmcneill Exp $ */
/*-
* Copyright (C) 2015 NONAKA Kimihiro <non...@netbsd.org>
@@ -28,7 +28,7 @@
#include "opt_pci.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_mcfg.c,v 1.12 2018/11/02 15:01:18 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_mcfg.c,v 1.13 2018/11/02 19:51:08 jmcneill Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -394,6 +394,7 @@ acpimcfg_init(bus_space_tag_t memt, cons
ama->Address, ama->StartBusNumber, bus_end);
}
+#ifndef __HAVE_PCI_GET_SEGMENT
if (ama->PciSegment != 0) {
aprint_debug_dev(acpi_sc->sc_dev,
"MCFG: segment %d, bus %d-%d, address 0x%016" PRIx64
@@ -401,6 +402,7 @@ acpimcfg_init(bus_space_tag_t memt, cons
ama->StartBusNumber, bus_end, ama->Address);
goto next;
}
+#endif
seg = &mcfg_segs[nsegs++];
seg->ms_address = ama->Address;
