Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

2 files changed, 43 insertions, 15 deletions

diff --git a/arch/ia64/hp/common/hwsw_iommu.c b/arch/ia64/hp/common/hwsw_iommu.c
index 1ba02baf2f94..a5a5637507be 100644
--- a/arch/ia64/hp/common/hwsw_iommu.c
+++ b/arch/ia64/hp/common/hwsw_iommu.c
@@ -17,7 +17,7 @@
 #include <asm/machvec.h>
 
 /* swiotlb declarations & definitions: */
-extern void swiotlb_init_with_default_size (size_t size);
+extern int swiotlb_late_init_with_default_size (size_t size);
 extern ia64_mv_dma_alloc_coherent       swiotlb_alloc_coherent;
 extern ia64_mv_dma_free_coherent        swiotlb_free_coherent;
 extern ia64_mv_dma_map_single           swiotlb_map_single;
@@ -67,7 +67,16 @@ void
 hwsw_init (void)
 {
         /* default to a smallish 2MB sw I/O TLB */
-        swiotlb_init_with_default_size (2 * (1<<20));
+        if (swiotlb_late_init_with_default_size (2 * (1<<20)) != 0) {
+#ifdef CONFIG_IA64_GENERIC
+                /* Better to have normal DMA than panic */
+                printk(KERN_WARNING "%s: Failed to initialize software I/O TLB,"
+                       " reverting to hpzx1 platform vector\n", __FUNCTION__);
+                machvec_init("hpzx1");
+#else
+                panic("Unable to initialize software I/O TLB services");
+#endif
+        }
 }
 
 void *
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index 21bffba78b6d..bdccd0b1eb60 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -2028,9 +2028,40 @@ static struct acpi_driver acpi_sba_ioc_driver = {
 static int __init
 sba_init(void)
 {
+        if (!ia64_platform_is("hpzx1") && !ia64_platform_is("hpzx1_swiotlb"))
+                return 0;
+
         acpi_bus_register_driver(&acpi_sba_ioc_driver);
-        if (!ioc_list)
+        if (!ioc_list) {
+#ifdef CONFIG_IA64_GENERIC
+                extern int swiotlb_late_init_with_default_size (size_t size);
+
+                /*
+                 * If we didn't find something sba_iommu can claim, we
+                 * need to setup the swiotlb and switch to the dig machvec.
+                 */
+                if (swiotlb_late_init_with_default_size(64 * (1<<20)) != 0)
+                        panic("Unable to find SBA IOMMU or initialize "
+                              "software I/O TLB: Try machvec=dig boot option");
+                machvec_init("dig");
+#else
+                panic("Unable to find SBA IOMMU: Try a generic or DIG kernel");
+#endif
                 return 0;
+        }
+
+#if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_HP_ZX1_SWIOTLB)
+        /*
+         * hpzx1_swiotlb needs to have a fairly small swiotlb bounce
+         * buffer setup to support devices with smaller DMA masks than
+         * sba_iommu can handle.
+         */
+        if (ia64_platform_is("hpzx1_swiotlb")) {
+                extern void hwsw_init(void);
+
+                hwsw_init();
+        }
+#endif
 
 #ifdef CONFIG_PCI
         {
@@ -2048,18 +2079,6 @@ sba_init(void)
 
 subsys_initcall(sba_init); /* must be initialized after ACPI etc., but before any drivers... */
 
-extern void dig_setup(char**);
-/*
- * MAX_DMA_ADDRESS needs to be setup prior to paging_init to do any good,
- * so we use the platform_setup hook to fix it up.
- */
-void __init
-sba_setup(char **cmdline_p)
-{
-        MAX_DMA_ADDRESS = ~0UL;
-        dig_setup(cmdline_p);
-}
-
 static int __init
 nosbagart(char *str)
 {