Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/shark/shark if we have vlpci, map in 1MB worth of P...



details:   https://anonhg.NetBSD.org/src/rev/2cc21ddb2440
branches:  trunk
changeset: 352001:2cc21ddb2440
user:      macallan <macallan%NetBSD.org@localhost>
date:      Fri Mar 10 00:13:08 2017 +0000

description:
if we have vlpci, map in 1MB worth of PCI memory space

diffstat:

 sys/arch/shark/shark/shark_machdep.c |  13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (48 lines):

diff -r 44ef50159e4a -r 2cc21ddb2440 sys/arch/shark/shark/shark_machdep.c
--- a/sys/arch/shark/shark/shark_machdep.c      Fri Mar 10 00:09:13 2017 +0000
+++ b/sys/arch/shark/shark/shark_machdep.c      Fri Mar 10 00:13:08 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: shark_machdep.c,v 1.42 2016/07/07 06:55:38 msaitoh Exp $       */
+/*     $NetBSD: shark_machdep.c,v 1.43 2017/03/10 00:13:08 macallan Exp $      */
 
 /*
  * Copyright 1997
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: shark_machdep.c,v 1.42 2016/07/07 06:55:38 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shark_machdep.c,v 1.43 2017/03/10 00:13:08 macallan Exp $");
 
 #include "opt_ddb.h"
 #include "opt_modular.h"
@@ -79,6 +79,7 @@
 #include <shark/shark/sequoia.h>
 
 #include "isadma.h"
+#include "vlpci.h"
 
 #include "wd.h"
 #include "cd.h"
@@ -139,6 +140,10 @@
 extern unsigned int sa1_cache_clean_addr;
 extern unsigned int sa1_cache_clean_size;
 
+#if NVLPCI > 0
+extern vaddr_t vlpci_mem_vaddr;
+#endif
+
 CFATTACH_DECL_NEW(ofbus_root, 0,
     ofbus_match, ofbus_attach, NULL, NULL);
 
@@ -224,6 +229,10 @@
        /* XXX - this should be done in the isa-bus attach routine! -JJK */
        isa_mem_virtaddr = ofw_map(isa_mem_physaddr, L1_S_SIZE, 0);
        isa_io_virtaddr  = ofw_map(isa_io_physaddr,  L1_S_SIZE, 0);
+#if NVLPCI > 0
+       /* XXX should get address from OF */
+       vlpci_mem_vaddr  = ofw_map(0x02000000,  0x00100000, 0);
+#endif
 
        /* Set-up the ISA system: must be done before consinit */
        isa_init(isa_io_virtaddr, isa_mem_virtaddr);



Home | Main Index | Thread Index | Old Index