diff options
| author | Jan Beulich <jbeulich@suse.com> | 2012-11-27 13:23:04 +0100 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2012-11-27 13:23:04 +0100 |
| commit | 3ab152559314eaa84c6ddb3cb6d5f58918310432 (patch) | |
| tree | 6c2be12786f869e5daa456a52d164ebcadd0e2d8 | |
| parent | f5f20508d2b538cecb5e9da8f001610d560bddd0 (diff) | |
| download | xen-3ab152559314eaa84c6ddb3cb6d5f58918310432.tar.gz xen-3ab152559314eaa84c6ddb3cb6d5f58918310432.tar.bz2 xen-3ab152559314eaa84c6ddb3cb6d5f58918310432.zip | |
passthrough/PCI: replace improper uses of pci_find_next_cap()
Using pci_find_next_cap() without prior pci_find_cap_offset() is bogus
(and possibly wrong, given that the latter doesn't check the
PCI_STATUS_CAP_LIST flag, which so far was checked in an open-coded way
only for the non-bridge case).
Once at it, fold the two calls into one, as we need its result in any
case.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Xiantao Zhang <xiantao.zhang@intel.com>
xen-unstable changeset: 26179:ae6fb202b233
xen-unstable date: Tue Nov 20 07:58:31 UTC 2012
| -rw-r--r-- | xen/drivers/passthrough/pci.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index d094a16ada..30515a93b0 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -565,16 +565,13 @@ void pci_release_devices(struct domain *d) int pdev_type(u16 seg, u8 bus, u8 devfn) { - u16 class_device; - u16 status, creg; - int pos; + u16 class_device, creg; u8 d = PCI_SLOT(devfn), f = PCI_FUNC(devfn); + int pos = pci_find_cap_offset(seg, bus, d, f, PCI_CAP_ID_EXP); class_device = pci_conf_read16(seg, bus, d, f, PCI_CLASS_DEVICE); if ( class_device == PCI_CLASS_BRIDGE_PCI ) { - pos = pci_find_next_cap(seg, bus, devfn, - PCI_CAPABILITY_LIST, PCI_CAP_ID_EXP); if ( !pos ) return DEV_TYPE_LEGACY_PCI_BRIDGE; creg = pci_conf_read16(seg, bus, d, f, pos + PCI_EXP_FLAGS); @@ -582,15 +579,7 @@ int pdev_type(u16 seg, u8 bus, u8 devfn) DEV_TYPE_PCIe2PCI_BRIDGE : DEV_TYPE_PCIe_BRIDGE; } - status = pci_conf_read16(seg, bus, d, f, PCI_STATUS); - if ( !(status & PCI_STATUS_CAP_LIST) ) - return DEV_TYPE_PCI; - - if ( pci_find_next_cap(seg, bus, devfn, PCI_CAPABILITY_LIST, - PCI_CAP_ID_EXP) ) - return DEV_TYPE_PCIe_ENDPOINT; - - return DEV_TYPE_PCI; + return pos ? DEV_TYPE_PCIe_ENDPOINT : DEV_TYPE_PCI; } /* |