MFC 259942,262274,263035,263054,263211,263744,264179,264324,264468,264631,

264648,264650,264651,266572,267558:
Flesh out the AT PIC and 8254 PIT emulations and move them into the kernel.

8 files changed, 64 insertions, 502 deletions

diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
index e8bf793..116fb60 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			\
@@ -29,7 +27,6 @@ SRCS=	\
 	pci_virtio_block.c	\
 	pci_virtio_net.c	\
 	pci_uart.c		\
-	pit_8254.c		\
 	pm.c			\
 	pmtmr.c			\
 	post.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/inout.c b/usr.sbin/bhyve/inout.c
index a200265..9fec70a 100644
--- a/usr.sbin/bhyve/inout.c
+++ b/usr.sbin/bhyve/inout.c
@@ -95,9 +95,10 @@ emulate_inout(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
 	      uint32_t *eax, int strict)
 {
 	int flags;
-	uint32_t mask;
+	uint32_t mask, val;
 	inout_func_t handler;
 	void *arg;
+	int error;
 
 	assert(port < MAX_IOPORTS);
 
@@ -118,16 +119,34 @@ emulate_inout(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
 			mask = 0xffffffff;
 			break;
 		}
-		*eax = *eax & mask;
+		val = *eax & mask;
 	}
 
 	flags = inout_handlers[port].flags;
 	arg = inout_handlers[port].arg;
 
 	if ((in && (flags & IOPORT_F_IN)) || (!in && (flags & IOPORT_F_OUT)))
-		return ((*handler)(ctx, vcpu, in, port, bytes, eax, arg));
+		error = (*handler)(ctx, vcpu, in, port, bytes, &val, arg);
 	else
-		return (-1);
+		error = -1;
+
+	if (!error && in) {
+		switch (bytes) {
+		case 1:
+			mask = 0xff;
+			break;
+		case 2:
+			mask = 0xffff;
+			break;
+		default:
+			mask = 0xffffffff;
+			break;
+		}
+		*eax &= ~mask;
+		*eax |= val & mask;
+	}
+
+	return (error);
 }
 
 void
diff --git a/usr.sbin/bhyve/pci_lpc.c b/usr.sbin/bhyve/pci_lpc.c
index 30b0401..5b1b4a8 100644
--- a/usr.sbin/bhyve/pci_lpc.c
+++ b/usr.sbin/bhyve/pci_lpc.c
@@ -46,9 +46,20 @@ __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);
+
+#define	IO_TIMER1_PORT	0x40
+
+#define	NMISC_PORT	0x61
+SYSRES_IO(NMISC_PORT, 1);
+
 static struct pci_devinst *lpc_bridge;
 
 #define	LPC_UART_NUM	2
@@ -100,7 +111,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 +203,33 @@ 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_line("");
+	dsdt_line("Device (TIMR)");
+	dsdt_line("{");
+	dsdt_line("  Name (_HID, EisaId (\"PNP0100\"))");
+	dsdt_line("  Name (_CRS, ResourceTemplate ()");
+	dsdt_line("  {");
+	dsdt_indent(2);
+	dsdt_fixed_ioport(IO_TIMER1_PORT, 4);
+	dsdt_fixed_irq(0);
+	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
deleted file mode 100644
index 3eb1aa7..0000000
--- a/usr.sbin/bhyve/pit_8254.c
+++ /dev/null
@@ -1,291 +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 <sys/time.h>
-#include <machine/vmm.h>
-
-#include <machine/clock.h>
-
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <vmmapi.h>
-
-#include "acpi.h"
-#include "bhyverun.h"
-#include "inout.h"
-#include "mevent.h"
-#include "pci_lpc.h"
-#include "pit_8254.h"
-
-#define	TIMER_SEL_MASK		0xc0
-#define	TIMER_RW_MASK		0x30
-#define	TIMER_MODE_MASK		0x0f
-#define	TIMER_SEL_READBACK	0xc0
-
-#define	TIMER_DIV(freq, hz)	(((freq) + (hz) / 2) / (hz))
-
-#define	PIT_8254_FREQ		1193182
-static const int nsecs_per_tick = 1000000000 / PIT_8254_FREQ;
-
-struct counter {
-	struct vmctx	*ctx;
-	struct mevent	*tevp;	
-	struct timeval	tv;		/* uptime when counter was loaded */
-	int		mode;
-	uint16_t	initial;	/* initial counter value */
-	uint8_t		cr[2];
-	uint8_t		ol[2];
-	int		crbyte;
-	int		olbyte;
-	int		frbyte;
-};
-
-
-static void
-timevalfix(struct timeval *t1)
-{
-
-	if (t1->tv_usec < 0) {
-		t1->tv_sec--;
-		t1->tv_usec += 1000000;
-	}
-	if (t1->tv_usec >= 1000000) {
-		t1->tv_sec++;
-		t1->tv_usec -= 1000000;
-	}
-}
-
-static void
-timevalsub(struct timeval *t1, const struct timeval *t2)
-{
-
-	t1->tv_sec -= t2->tv_sec;
-	t1->tv_usec -= t2->tv_usec;
-	timevalfix(t1);
-}
-
-static uint64_t pit_mev_count;
-
-static void
-pit_mevent_cb(int fd, enum ev_type type, void *param)
-{
-	struct counter *c;
-
-	c = param;
-
-	pit_mev_count++;
-
-	vm_ioapic_pulse_irq(c->ctx, 2);
-
-	/*
-	 * Delete the timer for one-shots
-	 */
-	if (c->mode != TIMER_RATEGEN) {
-		mevent_delete(c->tevp);
-		c->tevp = NULL;
-	}
-}
-
-static void
-pit_timer_start(struct vmctx *ctx, struct counter *c)
-{
-	int msecs;
-
-	if (c->initial != 0) {
-		msecs = c->initial * nsecs_per_tick / 1000000;
-		if (msecs == 0)
-			msecs = 1;
-
-		if (c->tevp == NULL)
-			c->tevp = mevent_add(msecs, EVF_TIMER, pit_mevent_cb,
-			    c);
-	}
-}
-
-static uint16_t
-pit_update_counter(struct counter *c, int latch)
-{
-	struct timeval tv2;
-	uint16_t lval;
-	uint64_t delta_nsecs, delta_ticks;
-
-	/* cannot latch a new value until the old one has been consumed */
-	if (latch && c->olbyte != 0)
-		return (0);
-
-	if (c->initial == 0 || c->initial == 1) {
-		/*
-		 * XXX the program that runs the VM can be stopped and
-		 * restarted at any time. This means that state that was
-		 * created by the guest is destroyed between invocations
-		 * of the program.
-		 *
-		 * If the counter's initial value is not programmed we
-		 * assume a value that would be set to generate 100
-		 * interrupts per second.
-		 */
-		c->initial = TIMER_DIV(PIT_8254_FREQ, 100);
-		gettimeofday(&c->tv, NULL);
-	}
-	
-	(void)gettimeofday(&tv2, NULL);
-	timevalsub(&tv2, &c->tv);
-	delta_nsecs = tv2.tv_sec * 1000000000 + tv2.tv_usec * 1000;
-	delta_ticks = delta_nsecs / nsecs_per_tick;
-
-	lval = c->initial - delta_ticks % c->initial;
-
-	if (latch) {
-		c->olbyte = 2;
-		c->ol[1] = lval;		/* LSB */
-		c->ol[0] = lval >> 8;		/* MSB */
-	}
-
-	return (lval);
-}
-
-static int
-pit_8254_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
-		 uint32_t *eax, void *arg)
-{
-	int sel, rw, mode;
-	uint8_t val;
-	struct counter *c;
-
-	static struct counter counter[3];
-
-	if (bytes != 1)
-		return (-1);
-
-	val = *eax;
-
-	if (port == TIMER_MODE) {
-		assert(in == 0);
-		sel = val & TIMER_SEL_MASK;
-		rw = val & TIMER_RW_MASK;
-		mode = val & TIMER_MODE_MASK;
-
-		if (sel == TIMER_SEL_READBACK)
-			return (-1);
-		if (rw != TIMER_LATCH && rw != TIMER_16BIT)
-			return (-1);
-
-		if (rw != TIMER_LATCH) {
-			/*
-			 * Counter mode is not affected when issuing a
-			 * latch command.
-			 */
-			if (mode != TIMER_INTTC &&
-			    mode != TIMER_RATEGEN &&
-			    mode != TIMER_SQWAVE &&
-			    mode != TIMER_SWSTROBE)
-				return (-1);
-		}
-		
-		c = &counter[sel >> 6];
-		c->ctx = ctx;
-		c->mode = mode;
-		if (rw == TIMER_LATCH)
-			pit_update_counter(c, 1);
-		else
-			c->olbyte = 0;	/* reset latch after reprogramming */
-		
-		return (0);
-	}
-
-	/* counter ports */
-	assert(port >= TIMER_CNTR0 && port <= TIMER_CNTR2);
-	c = &counter[port - TIMER_CNTR0];
-
-	if (in) {
-		/*
-		 * The spec says that once the output latch is completely
-		 * read it should revert to "following" the counter. Use
-		 * the free running counter for this case (i.e. Linux
-		 * TSC calibration). Assuming the access mode is 16-bit,
-		 * toggle the MSB/LSB bit on each read.
-		 */
-		if (c->olbyte == 0) {
-			uint16_t tmp;
-
-			tmp = pit_update_counter(c, 0);
-			if (c->frbyte)
-				tmp >>= 8;
-			tmp &= 0xff;
-			*eax = tmp;
-			c->frbyte ^= 1;
-		}  else
-			*eax = c->ol[--c->olbyte];
-	} else {
-		c->cr[c->crbyte++] = *eax;
-		if (c->crbyte == 2) {
-			c->frbyte = 0;
-			c->crbyte = 0;
-			c->initial = c->cr[0] | (uint16_t)c->cr[1] << 8;
-			/* Start an interval timer for counter 0 */
-			if (port == 0x40)
-				pit_timer_start(ctx, c);
-			if (c->initial == 0)
-				c->initial = 0xffff;
-			gettimeofday(&c->tv, NULL);
-		}
-	}
-
-	return (0);
-}
-
-INOUT_PORT(8254, TIMER_MODE, IOPORT_F_OUT, pit_8254_handler);
-INOUT_PORT(8254, TIMER_CNTR0, IOPORT_F_INOUT, pit_8254_handler);
-INOUT_PORT(8254, TIMER_CNTR1, IOPORT_F_INOUT, pit_8254_handler);
-INOUT_PORT(8254, TIMER_CNTR2, IOPORT_F_INOUT, pit_8254_handler);
-
-static void
-pit_dsdt(void)
-{
-
-	dsdt_line("");
-	dsdt_line("Device (TIMR)");
-	dsdt_line("{");
-	dsdt_line("  Name (_HID, EisaId (\"PNP0100\"))");
-	dsdt_line("  Name (_CRS, ResourceTemplate ()");
-	dsdt_line("  {");
-	dsdt_indent(2);
-	dsdt_fixed_ioport(IO_TIMER1, 4);
-	dsdt_fixed_irq(0);
-	dsdt_unindent(2);
-	dsdt_line("  })");
-	dsdt_line("}");
-}
-LPC_DSDT(pit_dsdt);
diff --git a/usr.sbin/bhyve/pit_8254.h b/usr.sbin/bhyve/pit_8254.h
deleted file mode 100644
index 61bd15d..0000000
--- a/usr.sbin/bhyve/pit_8254.h
+++ /dev/null
@@ -1,45 +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$
- */
-
-#ifndef _PIT_8254_H_
-#define	_PIT_8254_H_
-
-/*
- * Borrowed from amd64/include/timerreg.h because in that file it is
- * conditionally compiled for #ifdef _KERNEL only.
- */
-
-#include <dev/ic/i8253reg.h>
-
-#define	IO_TIMER1	0x40		/* 8253 Timer #1 */
-#define	TIMER_CNTR0	(IO_TIMER1 + TIMER_REG_CNTR0)
-#define	TIMER_CNTR1	(IO_TIMER1 + TIMER_REG_CNTR1)
-#define	TIMER_CNTR2	(IO_TIMER1 + TIMER_REG_CNTR2)
-#define	TIMER_MODE	(IO_TIMER1 + TIMER_REG_MODE)
-
-#endif	/* _PIT_8254_H_ */
diff --git a/usr.sbin/bhyve/pm.c b/usr.sbin/bhyve/pm.c
index 627f527..99087e4 100644
--- a/usr.sbin/bhyve/pm.c
+++ b/usr.sbin/bhyve/pm.c
@@ -83,7 +83,7 @@ sci_assert(struct vmctx *ctx)
 
 	if (sci_active)
 		return;
-	vm_ioapic_assert_irq(ctx, SCI_INT);
+	vm_isa_assert_irq(ctx, SCI_INT, SCI_INT);
 	sci_active = 1;
 }
 
@@ -93,7 +93,7 @@ sci_deassert(struct vmctx *ctx)
 
 	if (!sci_active)
 		return;
-	vm_ioapic_deassert_irq(ctx, SCI_INT);
+	vm_isa_deassert_irq(ctx, SCI_INT, SCI_INT);
 	sci_active = 0;
 }