[src/netbsd-9]: src/sys/dev/acpi Pull up following revision(s) (requested by ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8f60f6def921
branches:  netbsd-9
changeset: 963128:8f60f6def921
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Oct 15 19:30:50 2019 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #333):

        sys/dev/acpi/acpi_mcfg.c: revision 1.17

The MCFG base address field is the physical address of the base of mmio
space relative to bus 0, not the start bus number specified in the table
entry.

diffstat:

 sys/dev/acpi/acpi_mcfg.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 723a139f08c5 -r 8f60f6def921 sys/dev/acpi/acpi_mcfg.c
--- a/sys/dev/acpi/acpi_mcfg.c  Tue Oct 15 19:28:16 2019 +0000
+++ b/sys/dev/acpi/acpi_mcfg.c  Tue Oct 15 19:30:50 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_mcfg.c,v 1.16 2018/12/20 19:16:17 jmcneill Exp $  */
+/*     $NetBSD: acpi_mcfg.c,v 1.16.4.1 2019/10/15 19:30:50 martin Exp $        */
 
 /*-
  * Copyright (C) 2015 NONAKA Kimihiro <nonaka%NetBSD.org@localhost>
@@ -28,7 +28,7 @@
 #include "opt_pci.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_mcfg.c,v 1.16 2018/12/20 19:16:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_mcfg.c,v 1.16.4.1 2019/10/15 19:30:50 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -575,7 +575,7 @@
                return 0;
 
        mb = &seg->ms_bus[boff];
-       baddr = seg->ms_address + (boff * ACPIMCFG_SIZE_PER_BUS);
+       baddr = seg->ms_address + (bus * ACPIMCFG_SIZE_PER_BUS);
 
        /* Map extended configration space of all dev/func. */
        error = bus_space_map(seg->ms_bst, baddr, ACPIMCFG_SIZE_PER_BUS, 0,
@@ -832,7 +832,7 @@
        for (b = seg->ms_bus_start; b <= seg->ms_bus_end; b++) {
                boff = b - seg->ms_bus_start;
                mb = &seg->ms_bus[boff];
-               baddr = seg->ms_address + (boff * ACPIMCFG_SIZE_PER_BUS);
+               baddr = seg->ms_address + (b * ACPIMCFG_SIZE_PER_BUS);
 
                /* Map extended configration space of all dev/func. */
                error = bus_space_map(seg->ms_bst, baddr, ACPIMCFG_SIZE_PER_BUS, 0,