Module Name: src
Committed By: macallan
Date: Fri Mar 10 00:13:08 UTC 2017
Modified Files:
src/sys/arch/shark/shark: shark_machdep.c
Log Message:
if we have vlpci, map in 1MB worth of PCI memory space
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/shark/shark/shark_machdep.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/shark/shark/shark_machdep.c
diff -u src/sys/arch/shark/shark/shark_machdep.c:1.42 src/sys/arch/shark/shark/shark_machdep.c:1.43
--- src/sys/arch/shark/shark/shark_machdep.c:1.42 Thu Jul 7 06:55:38 2016
+++ src/sys/arch/shark/shark/shark_machdep.c Fri Mar 10 00:13:08 2017
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: shark_machde
#include <shark/shark/sequoia.h>
#include "isadma.h"
+#include "vlpci.h"
#include "wd.h"
#include "cd.h"
@@ -139,6 +140,10 @@ int ofw_handleticks = 0; /* set to TRUE
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 @@ initarm(void *arg)
/* 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);
