Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df0e97c6 authored by Allen Kay's avatar Allen Kay Committed by Jesse Barnes
Browse files

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: default avatarAllen Kay <allen.m.kay@intel.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent ae21ee65

drivers/pci/probe.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

}