Skip to content

Commit

Permalink
PCI: add xen dom0 checking before ACS initialization
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Allen Kay authored and Jesse Barnes committed Nov 4, 2009
1 parent ae21ee6 commit df0e97c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/pci/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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);
}

Expand Down

0 comments on commit df0e97c

Please sign in to comment.