diff options
author | tychon <tychon@FreeBSD.org> | 2014-03-11 16:56:00 +0000 |
---|---|---|
committer | tychon <tychon@FreeBSD.org> | 2014-03-11 16:56:00 +0000 |
commit | 25c8b61cfd6f390fd191d8f7016a3d6fb37fbdc5 (patch) | |
tree | 88da83839b43667193b4f76775f5154fa48167aa /usr.sbin | |
parent | 537be6292992897fefd4922dc1fe5859d47d0df8 (diff) | |
download | FreeBSD-src-25c8b61cfd6f390fd191d8f7016a3d6fb37fbdc5.zip FreeBSD-src-25c8b61cfd6f390fd191d8f7016a3d6fb37fbdc5.tar.gz |
Replace the userspace atpic stub with a more functional vmm.ko model.
New ioctls VM_ISA_ASSERT_IRQ, VM_ISA_DEASSERT_IRQ and VM_ISA_PULSE_IRQ
can be used to manipulate the pic, and optionally the ioapic, pin state.
Reviewed by: jhb, neel
Approved by: neel (co-mentor)
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/bhyve/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/bhyve/atpic.c | 89 | ||||
-rw-r--r-- | usr.sbin/bhyve/elcr.c | 67 | ||||
-rw-r--r-- | usr.sbin/bhyve/pci_lpc.c | 22 | ||||
-rw-r--r-- | usr.sbin/bhyve/pit_8254.c | 2 |
5 files changed, 22 insertions, 160 deletions
diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index e8bf793..98ead03 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -10,12 +10,10 @@ MAN= bhyve.8 SRCS= \ acpi.c \ - atpic.c \ bhyverun.c \ block_if.c \ consport.c \ dbgport.c \ - elcr.c \ inout.c \ ioapic.c \ mem.c \ diff --git a/usr.sbin/bhyve/atpic.c b/usr.sbin/bhyve/atpic.c deleted file mode 100644 index a23aee8..0000000 --- a/usr.sbin/bhyve/atpic.c +++ /dev/null @@ -1,89 +0,0 @@ -/*- - * Copyright (c) 2011 NetApp, Inc. - * 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 NETAPP, INC ``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 NETAPP, INC 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. - * - * $FreeBSD$ - */ - -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - -#include <sys/param.h> - -#include <stdio.h> -#include <string.h> -#include <assert.h> - -#include "acpi.h" -#include "inout.h" -#include "pci_lpc.h" - -#define IO_ICU1 0x20 -#define IO_ICU2 0xA0 -#define ICU_IMR_OFFSET 1 - -static int -atpic_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes, - uint32_t *eax, void *arg) -{ - if (bytes != 1) - return (-1); - - if (in) { - if (port & ICU_IMR_OFFSET) { - /* all interrupts masked */ - *eax = 0xff; - } else { - *eax = 0x00; - } - } - - /* Pretend all writes to the 8259 are alright */ - return (0); -} - -INOUT_PORT(atpic, IO_ICU1, IOPORT_F_INOUT, atpic_handler); -INOUT_PORT(atpic, IO_ICU1 + ICU_IMR_OFFSET, IOPORT_F_INOUT, atpic_handler); -INOUT_PORT(atpic, IO_ICU2, IOPORT_F_INOUT, atpic_handler); -INOUT_PORT(atpic, IO_ICU2 + ICU_IMR_OFFSET, IOPORT_F_INOUT, atpic_handler); - -static void -atpic_dsdt(void) -{ - - dsdt_line(""); - dsdt_line("Device (PIC)"); - dsdt_line("{"); - dsdt_line(" Name (_HID, EisaId (\"PNP0000\"))"); - dsdt_line(" Name (_CRS, ResourceTemplate ()"); - dsdt_line(" {"); - dsdt_indent(2); - dsdt_fixed_ioport(IO_ICU1, 2); - dsdt_fixed_ioport(IO_ICU2, 2); - dsdt_fixed_irq(2); - dsdt_unindent(2); - dsdt_line(" })"); - dsdt_line("}"); -} -LPC_DSDT(atpic_dsdt); diff --git a/usr.sbin/bhyve/elcr.c b/usr.sbin/bhyve/elcr.c deleted file mode 100644 index 190b5c6..0000000 --- a/usr.sbin/bhyve/elcr.c +++ /dev/null @@ -1,67 +0,0 @@ -/*- - * Copyright (c) 2011 NetApp, Inc. - * 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 NETAPP, INC ``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 NETAPP, INC 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. - * - * $FreeBSD$ - */ - -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - -#include <sys/types.h> - -#include "inout.h" -#include "pci_lpc.h" - -/* - * EISA interrupt Level Control Register. - * - * This is a 16-bit register with one bit for each of the IRQ0 through IRQ15. - * A level triggered irq is indicated by setting the corresponding bit to '1'. - */ -#define ELCR_PORT 0x4d0 - -static uint8_t elcr[2] = { 0x00, 0x00 }; - -static int -elcr_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes, - uint32_t *eax, void *arg) -{ - int idx; - - if (bytes != 1) - return (-1); - - idx = port - ELCR_PORT; - - if (in) - *eax = elcr[idx]; - else - elcr[idx] = *eax; - - return (0); -} -INOUT_PORT(elcr, ELCR_PORT + 0, IOPORT_F_INOUT, elcr_handler); -INOUT_PORT(elcr, ELCR_PORT + 1, IOPORT_F_INOUT, elcr_handler); -SYSRES_IO(ELCR_PORT, 2); diff --git a/usr.sbin/bhyve/pci_lpc.c b/usr.sbin/bhyve/pci_lpc.c index 30b0401..0ef9403 100644 --- a/usr.sbin/bhyve/pci_lpc.c +++ b/usr.sbin/bhyve/pci_lpc.c @@ -46,9 +46,15 @@ __FBSDID("$FreeBSD$"); #include "pci_lpc.h" #include "uart_emul.h" +#define IO_ICU1 0x20 +#define IO_ICU2 0xA0 + SET_DECLARE(lpc_dsdt_set, struct lpc_dsdt); SET_DECLARE(lpc_sysres_set, struct lpc_sysres); +#define ELCR_PORT 0x4d0 +SYSRES_IO(ELCR_PORT, 2); + static struct pci_devinst *lpc_bridge; #define LPC_UART_NUM 2 @@ -100,7 +106,7 @@ lpc_uart_intr_assert(void *arg) assert(sc->irq >= 0); - vm_ioapic_pulse_irq(lpc_bridge->pi_vmctx, sc->irq); + vm_isa_pulse_irq(lpc_bridge->pi_vmctx, sc->irq, sc->irq); } static void @@ -192,6 +198,20 @@ pci_lpc_write_dsdt(struct pci_devinst *pi) ldp = *ldpp; ldp->handler(); } + + dsdt_line(""); + dsdt_line("Device (PIC)"); + dsdt_line("{"); + dsdt_line(" Name (_HID, EisaId (\"PNP0000\"))"); + dsdt_line(" Name (_CRS, ResourceTemplate ()"); + dsdt_line(" {"); + dsdt_indent(2); + dsdt_fixed_ioport(IO_ICU1, 2); + dsdt_fixed_ioport(IO_ICU2, 2); + dsdt_fixed_irq(2); + dsdt_unindent(2); + dsdt_line(" })"); + dsdt_line("}"); dsdt_unindent(1); dsdt_line("}"); diff --git a/usr.sbin/bhyve/pit_8254.c b/usr.sbin/bhyve/pit_8254.c index 26fb03d..b45b100 100644 --- a/usr.sbin/bhyve/pit_8254.c +++ b/usr.sbin/bhyve/pit_8254.c @@ -107,7 +107,7 @@ pit_mevent_cb(int fd, enum ev_type type, void *param) pit_mev_count++; - vm_ioapic_pulse_irq(c->ctx, 2); + vm_isa_pulse_irq(c->ctx, 0, 2); /* * Delete the timer for one-shots |