Module Name: src
Committed By: martin
Date: Tue Oct 15 18:08:31 UTC 2019
Modified Files:
src/sys/arch/x86/pci [netbsd-9]: msipic.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.2.1 src/sys/arch/x86/pci/msipic.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/arch/x86/pci/msipic.c
diff -u src/sys/arch/x86/pci/msipic.c:1.17 src/sys/arch/x86/pci/msipic.c:1.17.2.1
--- src/sys/arch/x86/pci/msipic.c:1.17 Wed Jun 26 10:20:06 2019
+++ src/sys/arch/x86/pci/msipic.c Tue Oct 15 18:08:31 2019
@@ -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 @@ msipic_construct_msix_pic(const struct p
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 @@ msipic_destruct_msix_pic(struct pic *msi
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);
}
