On Tue, 8 Dec 2015, Gerd Hoffmann wrote: > Pure code motion, except for dropping instance_size for > TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE (no need to set, > we can inherit it from TYPE_I440FX_PCI_DEVICE). > > Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
Acked-by: Stefano Stabellini <stefano.stabell...@eu.citrix.com> > hw/pci-host/Makefile.objs | 3 ++ > hw/pci-host/igd.c | 96 > +++++++++++++++++++++++++++++++++++++++++++++++ > hw/pci-host/piix.c | 88 ------------------------------------------- > 3 files changed, 99 insertions(+), 88 deletions(-) > create mode 100644 hw/pci-host/igd.c > > diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs > index 45f1f0e..e341a49 100644 > --- a/hw/pci-host/Makefile.objs > +++ b/hw/pci-host/Makefile.objs > @@ -11,6 +11,9 @@ common-obj-$(CONFIG_PPCE500_PCI) += ppce500.o > # ARM devices > common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o > > +# igd passthrough support > +common-obj-$(CONFIG_LINUX) += igd.o > + > common-obj-$(CONFIG_PCI_APB) += apb.o > common-obj-$(CONFIG_FULONG) += bonito.o > common-obj-$(CONFIG_PCI_PIIX) += piix.o > diff --git a/hw/pci-host/igd.c b/hw/pci-host/igd.c > new file mode 100644 > index 0000000..ef0273b > --- /dev/null > +++ b/hw/pci-host/igd.c > @@ -0,0 +1,96 @@ > +#include "qemu-common.h" > +#include "hw/pci/pci.h" > +#include "hw/i386/pc.h" > + > +/* IGD Passthrough Host Bridge. */ > +typedef struct { > + uint8_t offset; > + uint8_t len; > +} IGDHostInfo; > + > +/* Here we just expose minimal host bridge offset subset. */ > +static const IGDHostInfo igd_host_bridge_infos[] = { > + {0x08, 2}, /* revision id */ > + {0x2c, 2}, /* sybsystem vendor id */ > + {0x2e, 2}, /* sybsystem id */ > + {0x50, 2}, /* SNB: processor graphics control register */ > + {0x52, 2}, /* processor graphics control register */ > + {0xa4, 4}, /* SNB: graphics base of stolen memory */ > + {0xa8, 4}, /* SNB: base of GTT stolen memory */ > +}; > + > +static int host_pci_config_read(int pos, int len, uint32_t val) > +{ > + char path[PATH_MAX]; > + int config_fd; > + ssize_t size = sizeof(path); > + /* Access real host bridge. */ > + int rc = snprintf(path, size, > "/sys/bus/pci/devices/%04x:%02x:%02x.%d/%s", > + 0, 0, 0, 0, "config"); > + int ret = 0; > + > + if (rc >= size || rc < 0) { > + return -ENODEV; > + } > + > + config_fd = open(path, O_RDWR); > + if (config_fd < 0) { > + return -ENODEV; > + } > + > + if (lseek(config_fd, pos, SEEK_SET) != pos) { > + ret = -errno; > + goto out; > + } > + do { > + rc = read(config_fd, (uint8_t *)&val, len); > + } while (rc < 0 && (errno == EINTR || errno == EAGAIN)); > + if (rc != len) { > + ret = -errno; > + } > +out: > + close(config_fd); > + return ret; > +} > + > +static int igd_pt_i440fx_initfn(struct PCIDevice *pci_dev) > +{ > + uint32_t val = 0; > + int rc, i, num; > + int pos, len; > + > + num = ARRAY_SIZE(igd_host_bridge_infos); > + for (i = 0; i < num; i++) { > + pos = igd_host_bridge_infos[i].offset; > + len = igd_host_bridge_infos[i].len; > + rc = host_pci_config_read(pos, len, val); > + if (rc) { > + return -ENODEV; > + } > + pci_default_write_config(pci_dev, pos, val, len); > + } > + > + return 0; > +} > + > +static void igd_passthrough_i440fx_class_init(ObjectClass *klass, void *data) > +{ > + DeviceClass *dc = DEVICE_CLASS(klass); > + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); > + > + k->init = igd_pt_i440fx_initfn; > + dc->desc = "IGD Passthrough Host bridge"; > +} > + > +static const TypeInfo igd_passthrough_i440fx_info = { > + .name = TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE, > + .parent = TYPE_I440FX_PCI_DEVICE, > + .class_init = igd_passthrough_i440fx_class_init, > +}; > + > +static void igd_register_types(void) > +{ > + type_register_static(&igd_passthrough_i440fx_info); > +} > + > +type_init(igd_register_types) > diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c > index 715208b..ccacb57 100644 > --- a/hw/pci-host/piix.c > +++ b/hw/pci-host/piix.c > @@ -744,93 +744,6 @@ static const TypeInfo i440fx_info = { > .class_init = i440fx_class_init, > }; > > -/* IGD Passthrough Host Bridge. */ > -typedef struct { > - uint8_t offset; > - uint8_t len; > -} IGDHostInfo; > - > -/* Here we just expose minimal host bridge offset subset. */ > -static const IGDHostInfo igd_host_bridge_infos[] = { > - {0x08, 2}, /* revision id */ > - {0x2c, 2}, /* sybsystem vendor id */ > - {0x2e, 2}, /* sybsystem id */ > - {0x50, 2}, /* SNB: processor graphics control register */ > - {0x52, 2}, /* processor graphics control register */ > - {0xa4, 4}, /* SNB: graphics base of stolen memory */ > - {0xa8, 4}, /* SNB: base of GTT stolen memory */ > -}; > - > -static int host_pci_config_read(int pos, int len, uint32_t val) > -{ > - char path[PATH_MAX]; > - int config_fd; > - ssize_t size = sizeof(path); > - /* Access real host bridge. */ > - int rc = snprintf(path, size, > "/sys/bus/pci/devices/%04x:%02x:%02x.%d/%s", > - 0, 0, 0, 0, "config"); > - int ret = 0; > - > - if (rc >= size || rc < 0) { > - return -ENODEV; > - } > - > - config_fd = open(path, O_RDWR); > - if (config_fd < 0) { > - return -ENODEV; > - } > - > - if (lseek(config_fd, pos, SEEK_SET) != pos) { > - ret = -errno; > - goto out; > - } > - do { > - rc = read(config_fd, (uint8_t *)&val, len); > - } while (rc < 0 && (errno == EINTR || errno == EAGAIN)); > - if (rc != len) { > - ret = -errno; > - } > -out: > - close(config_fd); > - return ret; > -} > - > -static int igd_pt_i440fx_initfn(struct PCIDevice *pci_dev) > -{ > - uint32_t val = 0; > - int rc, i, num; > - int pos, len; > - > - num = ARRAY_SIZE(igd_host_bridge_infos); > - for (i = 0; i < num; i++) { > - pos = igd_host_bridge_infos[i].offset; > - len = igd_host_bridge_infos[i].len; > - rc = host_pci_config_read(pos, len, val); > - if (rc) { > - return -ENODEV; > - } > - pci_default_write_config(pci_dev, pos, val, len); > - } > - > - return 0; > -} > - > -static void igd_passthrough_i440fx_class_init(ObjectClass *klass, void *data) > -{ > - DeviceClass *dc = DEVICE_CLASS(klass); > - PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); > - > - k->init = igd_pt_i440fx_initfn; > - dc->desc = "IGD Passthrough Host bridge"; > -} > - > -static const TypeInfo igd_passthrough_i440fx_info = { > - .name = TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE, > - .parent = TYPE_I440FX_PCI_DEVICE, > - .instance_size = sizeof(PCII440FXState), > - .class_init = igd_passthrough_i440fx_class_init, > -}; > - > static const char *i440fx_pcihost_root_bus_path(PCIHostState *host_bridge, > PCIBus *rootbus) > { > @@ -872,7 +785,6 @@ static const TypeInfo i440fx_pcihost_info = { > static void i440fx_register_types(void) > { > type_register_static(&i440fx_info); > - type_register_static(&igd_passthrough_i440fx_info); > type_register_static(&piix3_pci_type_info); > type_register_static(&piix3_info); > type_register_static(&piix3_xen_info); > -- > 1.8.3.1 > >