xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] VT-d: support Intel IGD passthrough
@ 2010-02-04  8:12 Han, Weidong
  2010-02-04 17:08 ` Ian Jackson
  0 siblings, 1 reply; 10+ messages in thread
From: Han, Weidong @ 2010-02-04  8:12 UTC (permalink / raw)
  To: xen-devel@lists.xensource.com; +Cc: Kay, Allen M, Keir Fraser

[-- Attachment #1: Type: text/plain, Size: 398 bytes --]

Some registers of Intel IGD are mapped in host bridge, so it needs to passthrough these registers of physical host bridge to guest because emulated host bridge in guest doesn't have these mappings. 

Some VBIOSs and drivers ssume the IGD BDF (bus:device:function) is always 00:02.0, so this patch reserves 00:02.0 for assigned IGD in guest.

Signed-off-by: Weidong Han <weidong.han@intel.com>

[-- Attachment #2: qemu-igd.patch --]
[-- Type: application/octet-stream, Size: 5624 bytes --]

From 1adbc6160851e72f3c080717a85938976619b617 Mon Sep 17 00:00:00 2001
From: Weidong Han <weidong.han@intel.com>
Date: Thu, 4 Feb 2010 09:46:24 +0800
Subject: [PATCH] Intel IGD passthrough support

Some registers of Intel IGD are mapped in host bridge, so it needs
to passthrough these registers of physical host bridge to guest
because emulated host bridge in guest doesn't have these mappings.

Some VBIOSs and drivers ssume the IGD BDF (bus:device:function) is
always 00:02.0, so this patch reserves 00:02.0 for assigned IGD in
guest.

Signed-off-by: Weidong Han <weidong.han@intel.com>
---
 hw/pass-through.c |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 hw/pass-through.h |    4 +++
 hw/pci.c          |   32 +++++++++++++++++++++++++++++-
 3 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/hw/pass-through.c b/hw/pass-through.c
index 9371a39..ecb3d6f 100644
--- a/hw/pass-through.c
+++ b/hw/pass-through.c
@@ -94,6 +94,7 @@
 #include <sys/ioctl.h>
 
 extern int gfx_passthru;
+int igd_passthru = 0;
 
 struct php_dev {
     struct pt_dev *pt_dev;
@@ -915,6 +916,8 @@ static int find_free_vslot(void)
 
     for ( slot = 0; slot < NR_PCI_DEV; slot++ )
     {
+        if ( gfx_passthru && slot == 0x2 )
+            continue;
         for ( func = 0; func < NR_PCI_FUNC; func++ )
         {
             devfn = PCI_DEVFN(slot, func);
@@ -944,7 +947,16 @@ static int __insert_to_pci_devfn(int bus, int dev, int func, int devfn,
     PCIBus *e_bus = dpci_infos.e_bus;
     int vslot;
 
-    if ( devfn & AUTO_PHP_SLOT )
+    if ( gfx_passthru && bus == 0x0 && dev == 0x2 )
+    {
+        igd_passthru = 1;
+
+        /* make virtual BDF of Intel IGD in guest is same with host */
+        devfn = PCI_DEVFN(dev, func);
+        if ( test_pci_devfn(devfn) || pci_devfn_in_use(e_bus, devfn) )
+            return -2;
+    }
+    else if ( devfn & AUTO_PHP_SLOT )
     {
         vslot = find_free_vslot();
         if (vslot < 0)
@@ -2073,6 +2085,48 @@ static uint32_t find_ext_cap_offset(struct pci_dev *pci_dev, uint32_t cap)
     return 0;
 }
 
+u8 pt_pci_host_read_byte(int bus, int dev, int fn, u32 addr)
+{
+    struct pci_dev *pci_dev;
+    u8 val;
+
+    pci_dev = pci_get_dev(dpci_infos.pci_access, 0, bus, dev, fn);
+    if ( !pci_dev )
+        return 0;
+
+    val = pci_read_byte(pci_dev, addr);
+    pci_free_dev(pci_dev);
+    return val;
+}
+
+u16 pt_pci_host_read_word(int bus, int dev, int fn, u32 addr)
+{
+    struct pci_dev *pci_dev;
+    u16 val;
+
+    pci_dev = pci_get_dev(dpci_infos.pci_access, 0, bus, dev, fn);
+    if ( !pci_dev )
+        return 0;
+
+    val = pci_read_word(pci_dev, addr);
+    pci_free_dev(pci_dev);
+    return val;
+}
+
+u32 pt_pci_host_read_long(int bus, int dev, int fn, u32 addr)
+{
+    struct pci_dev *pci_dev;
+    u32 val;
+
+    pci_dev = pci_get_dev(dpci_infos.pci_access, 0, bus, dev, fn);
+    if ( !pci_dev )
+        return 0;
+
+    val = pci_read_long(pci_dev, addr);
+    pci_free_dev(pci_dev);
+    return val;
+}
+
 /* parse BAR */
 static int pt_bar_reg_parse(
         struct pt_dev *ptdev, struct pt_reg_info_tbl *reg)
diff --git a/hw/pass-through.h b/hw/pass-through.h
index 3156897..f8a0c73 100644
--- a/hw/pass-through.h
+++ b/hw/pass-through.h
@@ -407,5 +407,9 @@ static inline pciaddr_t pt_pci_base_addr(pciaddr_t base)
 
 uint8_t pci_intx(struct pt_dev *ptdev);
 
+u8 pt_pci_host_read_byte(int bus, int dev, int fn, u32 addr);
+u16 pt_pci_host_read_word(int bus, int dev, int fn, u32 addr);
+u32 pt_pci_host_read_long(int bus, int dev, int fn, u32 addr);
+
 #endif /* __PASSTHROUGH_H__ */
 
diff --git a/hw/pci.c b/hw/pci.c
index d7c516e..7f6bfa5 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -31,6 +31,8 @@
 #include "exec-all.h"
 #include "qemu-xen.h"
 
+extern int igd_passthru;
+
 //#define DEBUG_PCI
 
 struct PCIBus {
@@ -230,6 +232,12 @@ PCIDevice *pci_register_device(PCIBus *bus, const char *name,
 
     if (devfn < 0) {
         for(devfn = bus->devfn_min ; devfn < 256; devfn += 8) {
+#ifdef CONFIG_PASSTHROUGH
+            /* reserve 00:02.0, because some BIOSs and drivers assume
+             * 00:02.0 for Intel IGD */
+            if ( gfx_passthru && devfn == 0x10 )
+                continue;
+#endif
             if ( !pci_devfn_in_use(bus, devfn) )
                 goto found;
         }
@@ -611,7 +619,29 @@ uint32_t pci_data_read(void *opaque, uint32_t addr, int len)
         goto the_end;
     }
     config_addr = addr & 0xff;
-    val = pci_dev->config_read(pci_dev, config_addr, len);
+
+#ifdef CONFIG_PASSTHROUGH
+    /* host bridge reads for IGD passthrough */
+    if ( igd_passthru && pci_dev->devfn == 0x00 )
+    {
+        val = pci_dev->config_read(pci_dev, config_addr, len);
+
+        if ( config_addr == 0x00 && len == 4 )
+            val = pt_pci_host_read_long(0, 0, 0, 0x00);
+        else if ( config_addr == 0x02 ) // Device ID
+            val = pt_pci_host_read_word(0, 0, 0, 0x02);
+        else if ( config_addr == 0x52 ) // GMCH Graphics Control Register
+            val = pt_pci_host_read_word(0, 0, 0, 0x52);
+        else if ( config_addr == 0xa0 ) // GMCH Top of Memory Register
+            val = pt_pci_host_read_word(0, 0, 0, 0xa0);
+    }
+    else if ( igd_passthru && pci_dev->devfn == 0x10 &&
+              config_addr == 0xfc ) // read on IGD device
+        val = 0;  // use SMI to communicate with the system BIOS
+    else
+#endif
+        val = pci_dev->config_read(pci_dev, config_addr, len);
+
 #if defined(DEBUG_PCI)
     printf("pci_config_read: %s: addr=%02x val=%08x len=%d\n",
            pci_dev->name, config_addr, val, len);
-- 
1.6.0.4


[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2010-02-23 21:08 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-04  8:12 [PATCH 1/3] VT-d: support Intel IGD passthrough Han, Weidong
2010-02-04 17:08 ` Ian Jackson
2010-02-05  1:52   ` Weidong Han
2010-02-18  9:49     ` Isaku Yamahata
2010-02-20  7:47       ` Weidong Han
     [not found]         ` <E5E913F540B51B4C997F7A2993168735BC95981B01@vmdc1.w3host.co.uk>
2010-02-22  7:07           ` VT-d support proprietary NVidia/ATI GPU passthrough Weidong Han
2010-02-22 12:32             ` Timothy J. Moore
2010-02-22 16:48               ` Konrad Rzeszutek Wilk
2010-02-23  1:16                 ` Weidong Han
2010-02-23 21:08                   ` Timothy J. Moore

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).