[ACS PATCH v5 2/2] adding xen dom0 checking

[ACS PATCH v5 2/2] adding xen dom0 checking

[Allen Kay]

This patch is predicated on Jeremy's patch in include/xen/xen.h.

Signed-off-by: Allen Kay <allen.m.kay@intel.com>
---
 drivers/pci/probe.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index aa98258..e9b347e 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 */
@@ -1017,7 +1018,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);
 }
 
-- 
1.6.0.6

Re: [ACS PATCH v5 2/2] adding xen dom0 checking

[Jeremy Fitzhardinge]

On 10/07/09 10:27, Allen Kay wrote:
> This patch is predicated on Jeremy's patch in include/xen/xen.h.
>   

Feel free to include that patch in your series if you depend on it. 
Otherwise it will get too awkward keeping track of everything.

    J

Re: [ACS PATCH v5 2/2] adding xen dom0 checking

[Jesse Barnes]

On Wed, 07 Oct 2009 11:07:22 -0700
Jeremy Fitzhardinge <jeremy@goop.org> wrote:

> On 10/07/09 10:27, Allen Kay wrote:
> > This patch is predicated on Jeremy's patch in include/xen/xen.h.
> >   
> 
> Feel free to include that patch in your series if you depend on it. 
> Otherwise it will get too awkward keeping track of everything.

Ok, I applied Allen's patchset along with your xen.h patch to my
linux-next tree.

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center