socsvn commit: r289525 - in soc2015/mihai/bhyve-on-arm-head: sys/dev/bvm usr.sbin/bhyvearm

[mihai at FreeBSD.org]

Author: mihai
Date: Mon Aug 10 18:32:41 2015
New Revision: 289525
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289525

Log:
  usr.sbin: bhyvearm: modify consport/bvm_console address

Modified:
  soc2015/mihai/bhyve-on-arm-head/sys/dev/bvm/bvm_console.c
  soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyvearm/consport.c

Modified: soc2015/mihai/bhyve-on-arm-head/sys/dev/bvm/bvm_console.c
==============================================================================
--- soc2015/mihai/bhyve-on-arm-head/sys/dev/bvm/bvm_console.c	Mon Aug 10 17:18:21 2015	(r289524)
+++ soc2015/mihai/bhyve-on-arm-head/sys/dev/bvm/bvm_console.c	Mon Aug 10 18:32:41 2015	(r289525)
@@ -38,6 +38,11 @@
 #include <sys/reboot.h>
 #include <sys/bus.h>
 
+#if defined(__arm__)
+#include <vm/vm.h>
+#include <vm/pmap.h>
+#endif
+
 #include <sys/kdb.h>
 #include <ddb/ddb.h>
 
@@ -67,7 +72,7 @@
 #if defined(__i386__) || defined(__amd64__)
 #define	BVM_CONS_PORT	0x220
 #elif defined(__arm__)
-#define	BVM_CONS_PORT	0x220
+#define	BVM_CONS_PORT	0x1c090000
 #endif
 
 static int bvm_cons_port = BVM_CONS_PORT;
@@ -112,9 +117,9 @@
 }
 
 #if defined(__arm__)
-#ifdef EARLY_PRINTF
-early_putc_t * early_putc = (early_putc_t *) bvm_wcons;
-#endif
+//#ifdef EARLY_PRINTF
+//early_putc_t * early_putc = (early_putc_t *) bvm_wcons;
+//#endif
 #endif
 
 static void
@@ -184,7 +189,7 @@
 static void
 bvm_cnprobe(struct consdev *cp)
 {
-	int disabled, port;
+	int disabled;
 
 	disabled = 0;
 	cp->cn_pri = CN_DEAD;
@@ -192,11 +197,13 @@
 
 	resource_int_value("bvmconsole", 0, "disabled", &disabled);
 	if (!disabled) {
+
+#if defined(__i386__) || defined(__amd64__)
 		if (resource_int_value("bvmconsole", 0, "port", &port) == 0)
 			bvm_cons_port = port;
-#if defined(__i386__) || defined(__amd64__)
 		if (inw(bvm_cons_port) == BVM_CONS_SIG)
 #elif defined(__arm__)
+		bvm_cons_port = (int) pmap_mapdev(bvm_cons_port, 0x1000);
 		if ((*(short *)bvm_cons_port) == BVM_CONS_SIG)
 #endif
 			cp->cn_pri = CN_REMOTE;

Modified: soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyvearm/consport.c
==============================================================================
--- soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyvearm/consport.c	Mon Aug 10 17:18:21 2015	(r289524)
+++ soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyvearm/consport.c	Mon Aug 10 18:32:41 2015	(r289525)
@@ -9,7 +9,7 @@
 
 #include "mem.h"
 
-#define	BVM_CONSOLE_PORT	0x220
+#define	BVM_CONSOLE_PORT	0x1c090000
 #define	BVM_CONS_SIG		('b' << 8 | 'v')
 
 static struct termios tio_orig, tio_new;