Author: tychon
Date: Fri Apr 25 13:38:18 2014
New Revision: 264916
URL: http://svnweb.freebsd.org/changeset/base/264916
Log:
Provide a very basic stub for the 8042 PS/2 keyboard controller.
Reviewed by: jhb
Approved by: neel (co-mentor)
Added:
head/usr.sbin/bhyve/atkbdc.c (contents, props changed)
Modified:
head/usr.sbin/bhyve/Makefile
head/usr.sbin/bhyve/bhyverun.c
Modified: head/usr.sbin/bhyve/Makefile
==============================================================================
--- head/usr.sbin/bhyve/Makefile Fri Apr 25 11:36:11 2014
(r264915)
+++ head/usr.sbin/bhyve/Makefile Fri Apr 25 13:38:18 2014
(r264916)
@@ -9,6 +9,7 @@ DEBUG_FLAGS= -g -O0
MAN= bhyve.8
SRCS= \
+ atkbdc.c \
acpi.c \
bhyverun.c \
block_if.c \
Added: head/usr.sbin/bhyve/atkbdc.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/bhyve/atkbdc.c Fri Apr 25 13:38:18 2014
(r264916)
@@ -0,0 +1,85 @@
+/*-
+ * Copyright (c) 2014 Tycho Nightingale
<tycho.nighting...@pluribusnetworks.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+
+#include <machine/vmm.h>
+
+#include <stdio.h>
+
+#include "inout.h"
+#include "pci_lpc.h"
+
+#define KBD_DATA_PORT 0x60
+
+#define KBD_STS_CTL_PORT 0x64
+#define KDB_SYS_FLAG 0x4
+
+#define KBDC_RESET 0xfe
+
+static int
+atkbdc_data_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
+ uint32_t *eax, void *arg)
+{
+ if (bytes != 1)
+ return (INOUT_ERROR);
+
+ *eax = 0;
+
+ return (INOUT_OK);
+}
+
+static int
+atkbdc_sts_ctl_handler(struct vmctx *ctx, int vcpu, int in, int port,
+ int bytes, uint32_t *eax, void *arg)
+{
+ int retval;
+
+ if (bytes != 1)
+ return (INOUT_ERROR);
+
+ retval = INOUT_OK;
+ if (in) {
+ *eax = KDB_SYS_FLAG; /* system passed POST */
+ } else {
+ switch (*eax) {
+ case KBDC_RESET: /* Pulse "reset" line. */
+ retval = INOUT_RESET;
+ break;
+ }
+ }
+
+ return (retval);
+}
+
+INOUT_PORT(atkdbc, KBD_DATA_PORT, IOPORT_F_INOUT, atkbdc_data_handler);
+SYSRES_IO(KBD_DATA_PORT, 1);
+INOUT_PORT(atkbdc, KBD_STS_CTL_PORT, IOPORT_F_INOUT,
+ atkbdc_sts_ctl_handler);
+SYSRES_IO(KBD_STS_CTL_PORT, 1);
Modified: head/usr.sbin/bhyve/bhyverun.c
==============================================================================
--- head/usr.sbin/bhyve/bhyverun.c Fri Apr 25 11:36:11 2014
(r264915)
+++ head/usr.sbin/bhyve/bhyverun.c Fri Apr 25 13:38:18 2014
(r264916)
@@ -281,10 +281,6 @@ vmexit_inout(struct vmctx *ctx, struct v
if (vme->u.inout.string || vme->u.inout.rep)
return (VMEXIT_ABORT);
- /* Special case of guest reset */
- if (out && port == 0x64 && (uint8_t)eax == 0xFE)
- return (vmexit_catch_reset());
-
/* Extra-special case of host notifications */
if (out && port == GUEST_NIO_PORT)
return (vmexit_handle_notify(ctx, vme, pvcpu, eax));
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
