diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2018-04-27 10:26:16 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2018-04-27 10:26:16 +0000 |
| commit | 96611ca41defb17e83e80f37147ffcf72d197aec (patch) | |
| tree | a267c5ffe799a44a7d81945872286229a0072a7a /sys | |
| parent | ef5f442c04aa45748e8c4f5c43a2a4d79886328e (diff) | |
vmm(4): pass through ELCRx ports to vmd(8)
These ports are used for Edge/Level control on the legacy PIC and will be
needed for a subsequent commit.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/amd64/vmm.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/include/vmmvar.h | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/arch/amd64/amd64/vmm.c b/sys/arch/amd64/amd64/vmm.c index b026ab48df6..063852bd372 100644 --- a/sys/arch/amd64/amd64/vmm.c +++ b/sys/arch/amd64/amd64/vmm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmm.c,v 1.195 2018/04/26 17:15:39 mlarkin Exp $ */ +/* $OpenBSD: vmm.c,v 1.196 2018/04/27 10:26:15 mlarkin Exp $ */ /* * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org> * @@ -4987,6 +4987,7 @@ svm_handle_inout(struct vcpu *vcpu) case IO_RTC ... IO_RTC + 1: case IO_ICU2 ... IO_ICU2 + 1: case 0x3f8 ... 0x3ff: + case ELCR0 ... ELCR1: case 0x500 ... 0x50f: case 0xcf8: case 0xcfc ... 0xcff: @@ -5069,6 +5070,7 @@ vmx_handle_inout(struct vcpu *vcpu) case IO_RTC ... IO_RTC + 1: case IO_ICU2 ... IO_ICU2 + 1: case 0x3f8 ... 0x3ff: + case ELCR0 ... ELCR1: case 0xcf8: case 0xcfc ... 0xcff: case 0x500 ... 0x50f: diff --git a/sys/arch/amd64/include/vmmvar.h b/sys/arch/amd64/include/vmmvar.h index 5513863b321..ffc95da55ba 100644 --- a/sys/arch/amd64/include/vmmvar.h +++ b/sys/arch/amd64/include/vmmvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmmvar.h,v 1.52 2018/04/26 17:15:39 mlarkin Exp $ */ +/* $OpenBSD: vmmvar.h,v 1.53 2018/04/27 10:26:15 mlarkin Exp $ */ /* * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org> * @@ -324,7 +324,9 @@ enum { /* * Port definitions not found elsewhere */ -#define PCKBC_AUX 0x61 +#define PCKBC_AUX 0x61 +#define ELCR0 0x4D0 +#define ELCR1 0x4D1 /* * vm exit data |