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>
This commit is contained in:
parent
ae21ee65e8
commit
df0e97c6f1
@ -11,6 +11,7 @@
|
|||||||
#include <linux/cpumask.h>
|
#include <linux/cpumask.h>
|
||||||
#include <linux/pci-aspm.h>
|
#include <linux/pci-aspm.h>
|
||||||
#include <linux/iommu.h>
|
#include <linux/iommu.h>
|
||||||
|
#include <xen/xen.h>
|
||||||
#include "pci.h"
|
#include "pci.h"
|
||||||
|
|
||||||
#define CARDBUS_LATENCY_TIMER 176 /* secondary latency timer */
|
#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);
|
pci_iov_init(dev);
|
||||||
|
|
||||||
/* Enable ACS P2P upstream forwarding */
|
/* Enable ACS P2P upstream forwarding */
|
||||||
if (iommu_found())
|
if (iommu_found() || xen_initial_domain())
|
||||||
pci_enable_acs(dev);
|
pci_enable_acs(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user