# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1217240963 -3600
# Node ID 13690b68fd462c6fe4751c2cc12d50cef71c339b
# Parent c6502ade05f9b23be51a4bf9f3f4111e85bee7b3
xend, pci passthru: Use Dstate transition to do FLR for integrated
devices without proper FLR capability.
Currently integrated devices without proper FLR capability are not
assignable. This is not nice since actually they may be assignable,
but due to old BIOS the proper FLR capability is not exposed. We can
use the previously-used Dstate transition method to do FLR for them.
This works well and looks few issues are reported AFAIK. Maybe we can
make a black list for the (rare) integrated devices that don't work
with this method.
Signed-off-by: Dexuan Cui <dexuan.cui@xxxxxxxxx>
---
tools/python/xen/util/pci.py | 69 ++++++++++++++++++++--------------
tools/python/xen/xend/server/pciif.py | 39 ++++++++++++-------
2 files changed, 66 insertions(+), 42 deletions(-)
diff -r c6502ade05f9 -r 13690b68fd46 tools/python/xen/util/pci.py
--- a/tools/python/xen/util/pci.py Mon Jul 28 11:28:45 2008 +0100
+++ b/tools/python/xen/util/pci.py Mon Jul 28 11:29:23 2008 +0100
@@ -56,6 +56,12 @@ PCI_EXP_DEVCAP_FLR = (0x1 << 28)
PCI_EXP_DEVCAP_FLR = (0x1 << 28)
PCI_EXP_DEVCTL = 0x8
PCI_EXP_DEVCTL_FLR = (0x1 << 15)
+
+PCI_CAP_ID_PM = 0x01
+PCI_PM_CTRL = 4
+PCI_PM_CTRL_NO_SOFT_RESET = 0x0004
+PCI_PM_CTRL_STATE_MASK = 0x0003
+PCI_D3hot = 3
PCI_CAP_ID_AF = 0x13
PCI_AF_CAPs = 0x3
@@ -246,18 +252,8 @@ def transform_list(target, src):
return result
def check_FLR_capability(dev_list):
- i = len(dev_list)
- if i == 0:
+ if len(dev_list) == 0:
return []
- i = i - 1;
- while i >= 0:
- dev = dev_list[i]
- if dev.bus == 0:
- if dev.dev_type == DEV_TYPE_PCIe_ENDPOINT and not dev.pcie_flr:
- del dev_list[i]
- elif dev.dev_type == DEV_TYPE_PCI and not dev.pci_af_flr:
- del dev_list[i]
- i = i - 1
pci_list = []
pci_dev_dict = {}
@@ -270,6 +266,8 @@ def check_FLR_capability(dev_list):
for pci in pci_list:
if isinstance(pci, types.StringTypes):
dev = pci_dev_dict[pci]
+ if dev.bus == 0:
+ continue
if dev.dev_type == DEV_TYPE_PCIe_ENDPOINT and not dev.pcie_flr:
coassigned_pci_list = dev.find_all_the_multi_functions()
need_transform = True
@@ -336,13 +334,6 @@ class PciDeviceAssignmentError(Exception
self.message = msg
def __str__(self):
return 'pci: impproper device assignment spcified: ' + \
- self.message
-
-class PciDeviceFlrError(PciDeviceAssignmentError):
- def __init__(self,msg):
- self.message = msg
- def __str__(self):
- return 'Can not find a suitable FLR method for the device(s): ' + \
self.message
class PciDevice:
@@ -480,6 +471,27 @@ class PciDevice:
# Restore the config spaces
restore_pci_conf_space((pci_list, cfg_list))
+ def do_Dstate_transition(self):
+ pos = self.find_cap_offset(PCI_CAP_ID_PM)
+ if pos == 0:
+ return
+
+ (pci_list, cfg_list) = save_pci_conf_space([self.name])
+
+ # Enter D3hot without soft reset
+ pm_ctl = self.pci_conf_read32(pos + PCI_PM_CTRL)
+ pm_ctl |= PCI_PM_CTRL_NO_SOFT_RESET
+ pm_ctl &= ~PCI_PM_CTRL_STATE_MASK
+ pm_ctl |= PCI_D3hot
+ self.pci_conf_write32(pos + PCI_PM_CTRL, pm_ctl)
+ time.sleep(0.010)
+
+ # From D3hot to D0
+ self.pci_conf_write32(pos + PCI_PM_CTRL, 0)
+ time.sleep(0.010)
+
+ restore_pci_conf_space((pci_list, cfg_list))
+
def find_all_the_multi_functions(self):
sysfs_mnt = find_sysfs_mnt()
pci_names = os.popen('ls ' + sysfs_mnt + SYSFS_PCI_DEVS_PATH).read()
@@ -650,13 +662,16 @@ class PciDevice:
time.sleep(0.200)
restore_pci_conf_space((pci_list, cfg_list))
else:
- funcs = self.find_all_the_multi_functions()
- self.devs_check_driver(funcs)
-
- parent = '%04x:%02x:%02x.%01x' % self.find_parent()
-
- # Do Secondary Bus Reset.
- self.do_secondary_bus_reset(parent, funcs)
+ if self.bus == 0:
+ self.do_Dstate_transition()
+ else:
+ funcs = self.find_all_the_multi_functions()
+ self.devs_check_driver(funcs)
+
+ parent = '%04x:%02x:%02x.%01x' % self.find_parent()
+
+ # Do Secondary Bus Reset.
+ self.do_secondary_bus_reset(parent, funcs)
# PCI devices
else:
# For PCI device on host bus, we test "PCI Advanced Capabilities".
@@ -669,9 +684,7 @@ class PciDevice:
restore_pci_conf_space((pci_list, cfg_list))
else:
if self.bus == 0:
- err_msg = 'pci: %s is not assignable: it is on bus 0, '+ \
- 'but it has no PCI Advanced Capabilities.'
- raise PciDeviceFlrError(err_msg % self.name)
+ self.do_Dstate_transition()
else:
devs = self.find_coassigned_devices(False)
# Remove the element 0 which is a bridge
diff -r c6502ade05f9 -r 13690b68fd46 tools/python/xen/xend/server/pciif.py
--- a/tools/python/xen/xend/server/pciif.py Mon Jul 28 11:28:45 2008 +0100
+++ b/tools/python/xen/xend/server/pciif.py Mon Jul 28 11:29:23 2008 +0100
@@ -375,23 +375,34 @@ class PciController(DevController):
raise VmError("pci: failed to locate device and "+
"parse it's resources - "+str(e))
if (dev.dev_type == DEV_TYPE_PCIe_ENDPOINT) and not dev.pcie_flr:
- funcs = dev.find_all_the_multi_functions()
- for f in funcs:
- if not f in pci_str_list:
- (f_dom, f_bus, f_slot, f_func) = parse_pci_name(f)
- f_pci_str = '0x%x,0x%x,0x%x,0x%x' % \
- (f_dom, f_bus, f_slot, f_func)
- # f has been assigned to other guest?
- if xc.test_assign_device(0, f_pci_str) != 0:
- err_msg = 'pci: %s must be co-assigned to the' + \
- ' same guest with %s'
- raise VmError(err_msg % (f, dev.name))
+ if dev.bus == 0:
+ # We cope with this case by using the Dstate transition
+ # method for now.
+ err_msg = 'pci: %s: it is on bus 0, but has no PCIe' +\
+ ' FLR Capability. Will try the Dstate transition'+\
+ ' method if available.'
+ log.warn(err_msg % dev.name)
+ else:
+ funcs = dev.find_all_the_multi_functions()
+ for f in funcs:
+ if not f in pci_str_list:
+ (f_dom, f_bus, f_slot, f_func) = parse_pci_name(f)
+ f_pci_str = '0x%x,0x%x,0x%x,0x%x' % \
+ (f_dom, f_bus, f_slot, f_func)
+ # f has been assigned to other guest?
+ if xc.test_assign_device(0, f_pci_str) != 0:
+ err_msg = 'pci: %s must be co-assigned to' + \
+ ' the same guest with %s'
+ raise VmError(err_msg % (f, dev.name))
elif dev.dev_type == DEV_TYPE_PCI:
if dev.bus == 0:
if not dev.pci_af_flr:
- err_msg = 'pci: %s is not assignable: it is on ' + \
- 'bus 0, but lacks of FLR capability'
- raise VmError(err_msg % dev.name)
+ # We cope with this case by using the Dstate transition
+ # method for now.
+ err_msg = 'pci: %s: it is on bus 0, but has no PCI' +\
+ ' Advanced Capabilities for FLR. Will try the'+\
+ ' Dstate transition method if available.'
+ log.warn(err_msg % dev.name)
else:
# All devices behind the uppermost PCI/PCI-X bridge must
be\
# co-assigned to the same guest.
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home