Page MenuHomeFreeBSD
Files F145985425

D40741.1779059003.diff
No OneTemporary
Actions

Size
5 KB
Referenced Files
None
Subscribers
None

D40741.1779059003.diff
View Options

diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
--- a/usr.sbin/bhyve/Makefile
+++ b/usr.sbin/bhyve/Makefile
@@ -30,7 +30,6 @@
ctl_util.c \
gdb.c \
hda_codec.c \
- inout.c \
iov.c \
mem.c \
mevent.c \
diff --git a/usr.sbin/bhyve/amd64/Makefile.inc b/usr.sbin/bhyve/amd64/Makefile.inc
--- a/usr.sbin/bhyve/amd64/Makefile.inc
+++ b/usr.sbin/bhyve/amd64/Makefile.inc
@@ -4,6 +4,7 @@
atkbdc.c \
e820.c \
fwctl.c \
+ inout.c \
ioapic.c \
kernemu_dev.c \
mptbl.c \
diff --git a/usr.sbin/bhyve/inout.h b/usr.sbin/bhyve/amd64/inout.h
rename from usr.sbin/bhyve/inout.h
rename to usr.sbin/bhyve/amd64/inout.h
diff --git a/usr.sbin/bhyve/inout.c b/usr.sbin/bhyve/amd64/inout.c
rename from usr.sbin/bhyve/inout.c
rename to usr.sbin/bhyve/amd64/inout.c
diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
--- a/usr.sbin/bhyve/bhyverun.c
+++ b/usr.sbin/bhyve/bhyverun.c
@@ -82,7 +82,9 @@
#endif
#include "bootrom.h"
#include "config.h"
-#include "inout.h"
+#ifdef __amd64__
+#include "amd64/inout.h"
+#endif
#include "debug.h"
#ifdef __amd64__
#include "amd64/e820.h"
@@ -1035,8 +1037,8 @@
#endif
init_mem(guest_ncpus);
- init_inout();
#ifdef __amd64__
+ init_inout();
kernemu_dev_init();
#endif
init_bootrom(ctx);
diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c
--- a/usr.sbin/bhyve/pci_emul.c
+++ b/usr.sbin/bhyve/pci_emul.c
@@ -55,8 +55,8 @@
#include "bhyverun.h"
#include "config.h"
#include "debug.h"
-#include "inout.h"
#ifdef __amd64__
+#include "amd64/inout.h"
#include "amd64/ioapic.h"
#endif
#include "mem.h"
@@ -506,6 +506,7 @@
return (-1);
}
+#ifdef __amd64__
static int
pci_emul_io_handler(struct vmctx *ctx __unused, int in, int port,
int bytes, uint32_t *eax, void *arg)
@@ -534,6 +535,31 @@
}
return (-1);
}
+#endif
+
+static int
+pci_emul_iomem_handler(struct vcpu *vcpu __unused, int dir,
+ uint64_t addr, int size, uint64_t *val, void *arg1, long arg2)
+{
+ struct pci_devinst *pdi = arg1;
+ struct pci_devemu *pe = pdi->pi_d;
+ uint64_t offset;
+ int bidx = (int)arg2;
+
+ assert(bidx <= PCI_BARMAX);
+ assert(pdi->pi_bar[bidx].type == PCIBAR_IO);
+ assert(addr >= pdi->pi_bar[bidx].addr &&
+ addr + size <= pdi->pi_bar[bidx].addr + pdi->pi_bar[bidx].size);
+ assert(size == 1 || size == 2 || size == 4);
+
+ offset = addr - pdi->pi_bar[bidx].addr;
+ if (dir == MEM_F_READ)
+ *val = (*pe->pe_barread)(pdi, bidx, offset, size);
+ else
+ (*pe->pe_barwrite)(pdi, bidx, offset, size, *val);
+
+ return (0);
+}
static int
pci_emul_mem_handler(struct vcpu *vcpu __unused, int dir,
@@ -542,7 +568,7 @@
struct pci_devinst *pdi = arg1;
struct pci_devemu *pe = pdi->pi_d;
uint64_t offset;
- int bidx = (int) arg2;
+ int bidx = (int)arg2;
assert(bidx <= PCI_BARMAX);
assert(pdi->pi_bar[bidx].type == PCIBAR_MEM32 ||
@@ -605,12 +631,16 @@
{
struct pci_devemu *pe;
int error;
- struct inout_port iop;
- struct mem_range mr;
+ enum pcibar_type type;
pe = pi->pi_d;
- switch (pi->pi_bar[idx].type) {
+ type = pi->pi_bar[idx].type;
+ switch (type) {
case PCIBAR_IO:
+#ifdef __amd64__
+ {
+ struct inout_port iop;
+
bzero(&iop, sizeof(struct inout_port));
iop.name = pi->pi_name;
iop.port = pi->pi_bar[idx].addr;
@@ -626,15 +656,22 @@
(*pe->pe_baraddr)(pi, idx, registration,
pi->pi_bar[idx].addr);
break;
+ }
+#endif
+ /* FALLTHROUGH */
case PCIBAR_MEM32:
case PCIBAR_MEM64:
+ {
+ struct mem_range mr;
+
bzero(&mr, sizeof(struct mem_range));
mr.name = pi->pi_name;
mr.base = pi->pi_bar[idx].addr;
mr.size = pi->pi_bar[idx].size;
if (registration) {
mr.flags = MEM_F_RW;
- mr.handler = pci_emul_mem_handler;
+ mr.handler = type == PCIBAR_IO ?
+ pci_emul_iomem_handler : pci_emul_mem_handler;
mr.arg1 = pi;
mr.arg2 = idx;
error = register_mem(&mr);
@@ -644,6 +681,7 @@
(*pe->pe_baraddr)(pi, idx, registration,
pi->pi_bar[idx].addr);
break;
+ }
case PCIBAR_ROM:
error = 0;
if (pe->pe_baraddr != NULL)
@@ -2357,6 +2395,7 @@
}
}
+#ifdef __amd64__
static int cfgenable, cfgbus, cfgslot, cfgfunc, cfgoff;
static int
@@ -2412,6 +2451,7 @@
INOUT_PORT(pci_cfgdata, CONF1_DATA_PORT+1, IOPORT_F_INOUT, pci_emul_cfgdata);
INOUT_PORT(pci_cfgdata, CONF1_DATA_PORT+2, IOPORT_F_INOUT, pci_emul_cfgdata);
INOUT_PORT(pci_cfgdata, CONF1_DATA_PORT+3, IOPORT_F_INOUT, pci_emul_cfgdata);
+#endif
#ifdef BHYVE_SNAPSHOT
/*
diff --git a/usr.sbin/bhyve/pctestdev.c b/usr.sbin/bhyve/pctestdev.c
--- a/usr.sbin/bhyve/pctestdev.c
+++ b/usr.sbin/bhyve/pctestdev.c
@@ -45,7 +45,9 @@
#include <vmmapi.h>
#include "debug.h"
-#include "inout.h"
+#ifdef __amd64__
+#include "amd64/inout.h"
+#endif
#include "mem.h"
#include "pctestdev.h"
diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c
--- a/usr.sbin/bhyve/qemu_fwcfg.c
+++ b/usr.sbin/bhyve/qemu_fwcfg.c
@@ -22,8 +22,8 @@
#include "acpi_device.h"
#include "bhyverun.h"
-#include "inout.h"
#ifdef __amd64__
+#include "amd64/inout.h"
#include "amd64/pci_lpc.h"
#endif
#include "qemu_fwcfg.h"
@@ -295,6 +295,7 @@
(uint8_t *)fwcfg_signature));
}
+#ifdef __amd64__
static int
qemu_fwcfg_register_port(const char *const name, const int port, const int size,
const int flags, const inout_func_t handler)
@@ -310,6 +311,7 @@
return (register_inout(&iop));
}
+#endif
int
qemu_fwcfg_add_file(const char *name, const uint32_t size, void *const data)
@@ -456,7 +458,7 @@
goto done;
}
- /* add handlers for fwcfg ports */
+#ifdef __amd64__
if ((error = qemu_fwcfg_register_port("qemu_fwcfg_selector",
QEMU_FWCFG_SELECTOR_PORT_NUMBER,
QEMU_FWCFG_SELECTOR_PORT_SIZE,
@@ -476,6 +478,7 @@
__func__, QEMU_FWCFG_DATA_PORT_NUMBER);
goto done;
}
+#endif
}
/* add common fwcfg items */

File Metadata

Mime Type
text/plain
Expires
Sun, May 17, 11:03 PM (21 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28711121
Default Alt Text
D40741.1779059003.diff (5 KB)

Event Timeline