From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: peter.maydell@linaro.org
Cc: Tiejun Chen <tiejun.chen@intel.com>,
xen-devel@lists.xensource.com, qemu-devel@nongnu.org,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: [PULL 04/29] piix: create host bridge to passthrough
Date: Thu, 10 Sep 2015 18:15:36 +0100 [thread overview]
Message-ID: <1441905361-31967-4-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <alpine.DEB.2.02.1509101751470.2672@kaball.uk.xensource.com>
From: Tiejun Chen <tiejun.chen@intel.com>
Implement a pci host bridge specific to passthrough. Actually
this just inherits the standard one. And we also just expose
a minimal real host bridge pci configuration subset.
[Replace pread with lseek and read to fix Windows build]
Signed-off-by: Tiejun Chen <tiejun.chen@intel.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/pci-host/piix.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++
include/hw/i386/pc.h | 2 ++
2 files changed, 87 insertions(+)
diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index e19badb..1fb71c8 100644
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@@ -739,6 +739,90 @@ 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");
+
+ 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) {
+ return -errno;
+ }
+ do {
+ rc = read(config_fd, (uint8_t *)&val, len);
+ } while (rc < 0 && (errno == EINTR || errno == EAGAIN));
+ if (rc != len) {
+ return -errno;
+ }
+
+ return 0;
+}
+
+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)
{
@@ -780,6 +864,7 @@ 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);
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 6edacbd..5cda2a3 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -222,6 +222,8 @@ typedef struct PCII440FXState PCII440FXState;
#define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost"
#define TYPE_I440FX_PCI_DEVICE "i440FX"
+#define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX"
+
PCIBus *i440fx_init(const char *host_type, const char *pci_type,
PCII440FXState **pi440fx_state, int *piix_devfn,
ISABus **isa_bus, qemu_irq *pic,
--
1.7.10.4
next prev parent reply other threads:[~2015-09-10 17:15 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-10 17:15 [PULL 00/29] xen-2015-09-10-tag Stefano Stabellini
2015-09-10 17:15 ` [PULL 01/29] xen-hvm: Add trace to ioreq Stefano Stabellini
2015-09-10 17:15 ` [PULL 02/29] i440fx: make types configurable at run-time Stefano Stabellini
2015-09-10 17:15 ` [PULL 03/29] pc_init1: pass parameters just with types Stefano Stabellini
2015-09-10 17:15 ` Stefano Stabellini [this message]
2015-09-10 17:15 ` [PULL 05/29] hw/pci-assign: split pci-assign.c Stefano Stabellini
2015-09-10 17:15 ` [PULL 06/29] xen, gfx passthrough: basic graphics passthrough support Stefano Stabellini
2015-09-10 17:15 ` [PULL 07/29] xen, gfx passthrough: retrieve VGA BIOS to work Stefano Stabellini
2015-09-10 17:15 ` [PULL 08/29] igd gfx passthrough: create a isa bridge Stefano Stabellini
2015-09-10 17:15 ` [PULL 09/29] xen, gfx passthrough: register " Stefano Stabellini
2015-09-10 17:15 ` [PULL 10/29] xen, gfx passthrough: register host bridge specific to passthrough Stefano Stabellini
2015-09-10 17:15 ` [PULL 11/29] xen, gfx passthrough: add opregion mapping Stefano Stabellini
2015-09-10 17:15 ` [PULL 12/29] xen-hvm: When using xc_domain_add_to_physmap also include errno when reporting Stefano Stabellini
2015-09-10 17:15 ` [PULL 13/29] xen/HVM: atomically access pointers in bufioreq handling Stefano Stabellini
2015-09-10 17:15 ` [PULL 14/29] xen/pt: Update comments with proper function name Stefano Stabellini
2015-09-10 17:15 ` [PULL 15/29] xen/pt: Make xen_pt_msi_set_enable static Stefano Stabellini
2015-09-10 17:15 ` [PULL 16/29] xen/pt: xen_host_pci_config_read returns -errno, not -1 on failure Stefano Stabellini
2015-09-10 17:15 ` [PULL 17/29] xen: use errno instead of rc for xc_domain_add_to_physmap Stefano Stabellini
2015-09-10 17:15 ` [PULL 18/29] xen/pt/msi: Add the register value when printing logging and error messages Stefano Stabellini
2015-09-10 17:15 ` [PULL 19/29] xen/pt: Use XEN_PT_LOG properly to guard against compiler warnings Stefano Stabellini
2015-09-10 17:15 ` [PULL 20/29] xen/pt: Use xen_host_pci_get_[byte|word] instead of dev.config Stefano Stabellini
2015-09-10 17:15 ` [PULL 21/29] xen/pt: Sync up the dev.config and data values Stefano Stabellini
2015-09-14 10:01 ` Paolo Bonzini
2015-09-15 10:07 ` Stefano Stabellini
2015-09-15 13:25 ` Konrad Rzeszutek Wilk
2015-09-15 13:28 ` Stefano Stabellini
2015-09-15 13:32 ` Paolo Bonzini
2015-09-15 13:55 ` Konrad Rzeszutek Wilk
2015-09-10 17:15 ` [PULL 22/29] xen/pt: Check if reg->init function sets the 'data' past the reg->size Stefano Stabellini
2015-09-10 17:15 ` [PULL 23/29] xen/pt: Remove XenPTReg->data field Stefano Stabellini
2015-09-10 17:15 ` [PULL 24/29] xen/pt: Log xen_host_pci_get in two init functions Stefano Stabellini
2015-09-10 17:15 ` [PULL 25/29] xen/pt: Log xen_host_pci_get/set errors in MSI code Stefano Stabellini
2015-09-10 17:15 ` [PULL 26/29] xen/pt: Make xen_pt_unregister_device idempotent Stefano Stabellini
2015-09-10 17:15 ` [PULL 27/29] xen/pt: Move bulk of xen_pt_unregister_device in its own routine Stefano Stabellini
2015-09-10 17:16 ` [PULL 28/29] xen/pt: Check for return values for xen_host_pci_[get|set] in init Stefano Stabellini
2015-09-10 17:16 ` [PULL 29/29] xen/pt: Don't slurp wholesale the PCI configuration registers Stefano Stabellini
2015-09-10 19:02 ` [PULL 00/29] xen-2015-09-10-tag Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1441905361-31967-4-git-send-email-stefano.stabellini@eu.citrix.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=tiejun.chen@intel.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).