pci: apply workaround for Intel errata HSE43 and BDF2/BDX2

These errata affect the values read from the BAR registers, and could
render vPCI (and by extension PVH Dom0 unusable).

HSE43 is a Haswell erratum where a non-BAR register is implemented at
the position where the first BAR of the device should be found in a
Power Control Unit device. Note that there are no BARs on this device,
apart from the bogus CSR register positioned on top of the first BAR.

BDF2/BDX2 is a Broadwell erratum where BARs in the Home Agent device
will return bogus non-zero values.

In both cases the solution is to treat such devices as having no BARs
in the vPCI code.

Reported-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c
index 7584ce2fbbcb8a831d4a6a276cfdc5546447f303..1277ce2a0ffa88c9b5e78e85e3b0aad7ae075421 100644 (file)
--- a/xen/drivers/passthrough/pci.c
+++ b/xen/drivers/passthrough/pci.c
@@ -17,6 +17,7 @@
 #include <xen/sched.h>
 #include <xen/pci.h>
 #include <xen/pci_regs.h>
+#include <xen/pci_ids.h>
 #include <xen/list.h>
 #include <xen/prefetch.h>
 #include <xen/iommu.h>
@@ -298,6 +299,46 @@ static void check_pdev(const struct pci_dev *pdev)
 #undef PCI_STATUS_CHECK
 }
 
+static void apply_quirks(struct pci_dev *pdev)
+{
+    uint16_t vendor = pci_conf_read16(pdev->seg, pdev->bus,
+                                      PCI_SLOT(pdev->devfn),
+                                      PCI_FUNC(pdev->devfn), PCI_VENDOR_ID);
+    uint16_t device = pci_conf_read16(pdev->seg, pdev->bus,
+                                      PCI_SLOT(pdev->devfn),
+                                      PCI_FUNC(pdev->devfn), PCI_DEVICE_ID);
+    static const struct {
+        uint16_t vendor, device;
+    } ignore_bars[] = {
+        /*
+         * Device [8086:2fc0]
+         * Erratum HSE43
+         * CONFIG_TDP_NOMINAL CSR Implemented at Incorrect Offset
+         * http://www.intel.com/content/www/us/en/processors/xeon/xeon-e5-v3-spec-update.html 
+         */
+        { PCI_VENDOR_ID_INTEL, 0x2fc0 },
+        /*
+         * Devices [8086:6f60,6fa0,6fc0]
+         * Errata BDF2 / BDX2
+         * PCI BARs in the Home Agent Will Return Non-Zero Values During Enumeration
+         * http://www.intel.com/content/www/us/en/processors/xeon/xeon-e5-v4-spec-update.html 
+        */
+        { PCI_VENDOR_ID_INTEL, 0x6f60 },
+        { PCI_VENDOR_ID_INTEL, 0x6fa0 },
+        { PCI_VENDOR_ID_INTEL, 0x6fc0 },
+    };
+    unsigned int i;
+
+    for ( i = 0; i < ARRAY_SIZE(ignore_bars); i++)
+        if ( vendor == ignore_bars[i].vendor &&
+             device == ignore_bars[i].device )
+            /*
+             * For these errata force ignoring the BARs, which prevents vPCI
+             * from trying to size the BARs or add handlers to trap accesses.
+             */
+            pdev->ignore_bars = true;
+}
+
 static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn)
 {
     struct pci_dev *pdev;
@@ -397,6 +438,7 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn)
     }
 
     check_pdev(pdev);
+    apply_quirks(pdev);
 
     return pdev;
 }

diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c
index 43cac3f7d35b73bc56bf5eac2e10c8797b52dfe7..106e8af8b2811b428e963accb8e59086d42590d6 100644 (file)
--- a/xen/drivers/vpci/header.c
+++ b/xen/drivers/vpci/header.c
@@ -486,6 +486,9 @@ static int init_bars(struct pci_dev *pdev)
     if ( rc )
         return rc;
 
+    if ( pdev->ignore_bars )
+        return 0;
+
     /* Disable memory decoding before sizing. */
     cmd = pci_conf_read16(pdev->seg, pdev->bus, slot, func, PCI_COMMAND);
     if ( cmd & PCI_COMMAND_MEMORY )

diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h
index 3c361cf0c031796f6328dbb2e2421c8158903469..a934662713b558a56b672bea02d5e9c8f1beacd6 100644 (file)
--- a/xen/include/xen/pci.h
+++ b/xen/include/xen/pci.h
@@ -88,6 +88,9 @@ struct pci_dev {
 
     nodeid_t node; /* NUMA node */
 
+    /* Device with errata, ignore the BARs. */
+    bool ignore_bars;
+
     enum pdev_type {
         DEV_TYPE_PCI_UNKNOWN,
         DEV_TYPE_PCIe_ENDPOINT,