[Xen-devel] [PATCH 21/23] xen/pci: Request ACS when Xen-SWIOTLB is activated.

[Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>]

It used to done in the Xen startup code but that is not really
appropiate.

[v2: Update Kconfig with PCI requirement]
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
---
 arch/x86/xen/pci-swiotlb-xen.c |    4 ++++
 drivers/xen/Kconfig            |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/arch/x86/xen/pci-swiotlb-xen.c b/arch/x86/xen/pci-swiotlb-xen.c
index a013ec9..be4d80a 100644
--- a/arch/x86/xen/pci-swiotlb-xen.c
+++ b/arch/x86/xen/pci-swiotlb-xen.c
@@ -1,6 +1,7 @@
 /* Glue code to lib/swiotlb-xen.c */
 
 #include <linux/dma-mapping.h>
+#include <linux/pci.h>
 #include <xen/swiotlb-xen.h>
 
 #include <asm/xen/hypervisor.h>
@@ -54,5 +55,8 @@ void __init pci_xen_swiotlb_init(void)
        if (xen_swiotlb) {
                xen_swiotlb_init(1);
                dma_ops = &xen_swiotlb_dma_ops;
+
+               /* Make sure ACS will be enabled */
+               pci_request_acs();
        }
 }
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 60d71e9..f70a627 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -74,6 +74,6 @@ config XEN_PLATFORM_PCI
 
 config SWIOTLB_XEN
        def_bool y
-       depends on SWIOTLB
+       depends on PCI && SWIOTLB
 
 endmenu
-- 
1.7.0.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel