aboutsummaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorAllen Kay <allen.m.kay@intel.com>2009-10-07 10:27:51 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-11-04 08:47:26 -0800
commitdf0e97c6f1f2fdca686036998fe816cefd8e27d7 (patch)
tree8cef3a9d3dc141b804507fd8eed195ff8196a7c8 /drivers/pci
parentae21ee65e8bc228416bbcc8a1da01c56a847a60c (diff)
PCI: add xen dom0 checking before ACS initialization
This patch is predicated on Jeremy's patch in include/xen/xen.h. It'll prevent ACS init unless the platform has both an IOMMU and we're running as dom0. Signed-off-by: Allen Kay <allen.m.kay@intel.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/probe.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index aac5b156a5c..bb2cc39b64f 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -11,6 +11,7 @@
#include <linux/cpumask.h>
#include <linux/pci-aspm.h>
#include <linux/iommu.h>
+#include <xen/xen.h>
#include "pci.h"
#define CARDBUS_LATENCY_TIMER 176 /* secondary latency timer */
@@ -1007,7 +1008,7 @@ static void pci_init_capabilities(struct pci_dev *dev)
pci_iov_init(dev);
/* Enable ACS P2P upstream forwarding */
- if (iommu_found())
+ if (iommu_found() || xen_initial_domain())
pci_enable_acs(dev);
}