[src/netbsd-9]: src/sys/arch/x86/pci Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/ea2884125985
branches:  netbsd-9
changeset: 455363:ea2884125985
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Oct 15 18:08:31 2019 +0000

description:
Pull up following revision(s) (requested by tnn in ticket #305):

        sys/arch/x86/pci/msipic.c: revision 1.18

change bus_space_map to _x86_memio_map

Resolves bus space reservation conflict between MI and MD code.

Discussion:
http://mail-index.netbsd.org/port-amd64/2019/09/28/msg003014.html

diffstat:

 sys/arch/x86/pci/msipic.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r c11a03425894 -r ea2884125985 sys/arch/x86/pci/msipic.c
--- a/sys/arch/x86/pci/msipic.c Sat Oct 12 15:12:09 2019 +0000
+++ b/sys/arch/x86/pci/msipic.c Tue Oct 15 18:08:31 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msipic.c,v 1.17 2019/06/26 10:20:06 knakahara Exp $    */
+/*     $NetBSD: msipic.c,v 1.17.2.1 2019/10/15 18:08:31 martin Exp $   */
 
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msipic.c,v 1.17 2019/06/26 10:20:06 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msipic.c,v 1.17.2.1 2019/10/15 18:08:31 martin Exp $");
 
 #include "opt_intrdebug.h"
 
@@ -711,7 +711,7 @@
                flags &= ~BUS_SPACE_MAP_PREFETCHABLE;
        }
        bssize = roundup(table_size, PAGE_SIZE);
-       err = bus_space_map(pa->pa_memt, memaddr + table_offset, bssize, flags,
+       err = _x86_memio_map(pa->pa_memt, memaddr + table_offset, bssize, flags,
            &bshandle);
        bstag = pa->pa_memt;
 #endif
@@ -739,8 +739,8 @@
        KASSERT(msix_pic->pic_type == PIC_MSIX);
 
        msipic = msix_pic->pic_msipic;
-       bus_space_unmap(msipic->mp_bstag, msipic->mp_bshandle,
-           msipic->mp_bssize);
+       _x86_memio_unmap(msipic->mp_bstag, msipic->mp_bshandle,
+           msipic->mp_bssize, NULL);
 
        msipic_destruct_common_msi_pic(msix_pic);
 }