powerpc/pseries: Use macros for referring to the DTL enable mask

[linux-2.6-block.git] / arch / powerpc / platforms / pseries / setup.c

diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index e4f0dfd4ae33458f6a4a9450b3df9c42c55a26c1..e2cb29e96fa425f1e13436bc3cc7b90c0b64439b 100644 (file)
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -42,6 +42,7 @@
 #include <linux/of.h>
 #include <linux/of_pci.h>
 #include <linux/memblock.h>
+#include <linux/swiotlb.h>
 
 #include <asm/mmu.h>
 #include <asm/processor.h>
@@ -71,6 +72,7 @@
 #include <asm/isa-bridge.h>
 #include <asm/security_features.h>
 #include <asm/asm-const.h>
+#include <asm/swiotlb.h>
 
 #include "pseries.h"
 #include "../../../../drivers/pci/pci.h"
@@ -316,7 +318,7 @@ static int alloc_dispatch_logs(void)
                pr_err("WARNING: DTL registration of cpu %d (hw %d) failed "
                       "with %d\n", smp_processor_id(),
                       hard_smp_processor_id(), ret);
-       get_paca()->lppaca_ptr->dtl_enable_mask = 2;
+       get_paca()->lppaca_ptr->dtl_enable_mask = DTL_LOG_PREEMPT;
 
        return 0;
 }
@@ -797,6 +799,9 @@ static void __init pSeries_setup_arch(void)
        }
 
        ppc_md.pcibios_root_bridge_prepare = pseries_root_bridge_prepare;
+
+       if (swiotlb_force == SWIOTLB_FORCE)
+               ppc_swiotlb_enable = 1;
 }
 
 static void pseries_panic(char *str)