[src/trunk]: src/sys/dev BUS_SPACE_MAP_PREFETCHABLE yields a write combining ...

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

details:   https://anonhg.NetBSD.org/src/rev/646d298f1d54
branches:  trunk
changeset: 931242:646d298f1d54
user:      ad <ad%NetBSD.org@localhost>
date:      Fri Apr 24 22:31:35 2020 +0000

description:
BUS_SPACE_MAP_PREFETCHABLE yields a write combining region on x86 and that's
not what I intended.. BUS_SPACE_MAP_CACHEABLE is enough.

diffstat:

 sys/dev/ic/vga.c        |  7 +++----
 sys/dev/ic/vga_raster.c |  7 +++----
 sys/dev/isa/pcdisplay.c |  7 +++----
 3 files changed, 9 insertions(+), 12 deletions(-)

diffs (84 lines):

diff -r 6a38b433ada2 -r 646d298f1d54 sys/dev/ic/vga.c
--- a/sys/dev/ic/vga.c  Fri Apr 24 22:25:07 2020 +0000
+++ b/sys/dev/ic/vga.c  Fri Apr 24 22:31:35 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.117 2019/12/01 14:18:51 ad Exp $ */
+/* $NetBSD: vga.c,v 1.118 2020/04/24 22:31:35 ad Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.117 2019/12/01 14:18:51 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.118 2020/04/24 22:31:35 ad Exp $");
 
 #include "opt_vga.h"
 /* for WSCONS_SUPPORT_PCVTFONTS */
@@ -545,8 +545,7 @@
                panic("vga_init: couldn't map 6845 io");
 
        if (bus_space_map(vh->vh_memt, 0xa0000, 0x20000, 
-           BUS_SPACE_MAP_CACHEABLE | BUS_SPACE_MAP_PREFETCHABLE,
-           &vh->vh_allmemh))
+           BUS_SPACE_MAP_CACHEABLE, &vh->vh_allmemh))
                panic("vga_init: couldn't map memory");
 
        if (bus_space_subregion(vh->vh_memt, vh->vh_allmemh,
diff -r 6a38b433ada2 -r 646d298f1d54 sys/dev/ic/vga_raster.c
--- a/sys/dev/ic/vga_raster.c   Fri Apr 24 22:25:07 2020 +0000
+++ b/sys/dev/ic/vga_raster.c   Fri Apr 24 22:31:35 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vga_raster.c,v 1.47 2020/04/04 00:01:28 riastradh Exp $        */
+/*     $NetBSD: vga_raster.c,v 1.48 2020/04/24 22:31:36 ad Exp $       */
 
 /*
  * Copyright (c) 2001, 2002 Bang Jun-Young
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.47 2020/04/04 00:01:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.48 2020/04/24 22:31:36 ad Exp $");
 
 #include "opt_vga.h"
 #include "opt_wsmsgattrs.h" /* for WSDISPLAY_CUSTOM_OUTPUT */
@@ -396,8 +396,7 @@
                panic("vga_raster_init: couldn't map 6845 io");
 
        if (bus_space_map(vh->vh_memt, 0xa0000, 0x20000,
-           BUS_SPACE_MAP_CACHEABLE | BUS_SPACE_MAP_PREFETCHABLE,
-           &vh->vh_allmemh))
+           BUS_SPACE_MAP_CACHEABLE, &vh->vh_allmemh))
                panic("vga_init: couldn't map memory");
 
        if (bus_space_subregion(vh->vh_memt, vh->vh_allmemh, 0, 0x10000,
diff -r 6a38b433ada2 -r 646d298f1d54 sys/dev/isa/pcdisplay.c
--- a/sys/dev/isa/pcdisplay.c   Fri Apr 24 22:25:07 2020 +0000
+++ b/sys/dev/isa/pcdisplay.c   Fri Apr 24 22:31:35 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplay.c,v 1.44 2019/12/01 14:18:51 ad Exp $ */
+/* $NetBSD: pcdisplay.c,v 1.45 2020/04/24 22:31:35 ad Exp $ */
 
 /*
  * Copyright (c) 1998
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.44 2019/12/01 14:18:51 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.45 2020/04/24 22:31:35 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -190,8 +190,7 @@
        dc->mono = mono;
 
        if (bus_space_map(memt, mono ? 0xb0000 : 0xb8000, 0x8000,
-           BUS_SPACE_MAP_CACHEABLE | BUS_SPACE_MAP_PREFETCHABLE,
-           &ph->ph_memh))
+           BUS_SPACE_MAP_CACHEABLE, &ph->ph_memh))
                panic("pcdisplay_init: cannot map memory");
        if (bus_space_map(iot, mono ? 0x3b0 : 0x3d0, 0x10,
                          0, &ph->ph_ioh_6845))