Merge tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw...

[linux-2.6-microblaze.git] / arch / mips / mti-malta / malta-setup.c

diff --git a/arch/mips/mti-malta/malta-setup.c b/arch/mips/mti-malta/malta-setup.c
index e1fb8b5..21cb3ac 100644 (file)
--- a/arch/mips/mti-malta/malta-setup.c
+++ b/arch/mips/mti-malta/malta-setup.c
@@ -13,8 +13,8 @@
 #include <linux/pci.h>
 #include <linux/screen_info.h>
 #include <linux/time.h>
+#include <linux/dma-map-ops.h> /* for dma_default_coherent */
 
-#include <asm/dma-coherence.h>
 #include <asm/fw/fw.h>
 #include <asm/mips-cps.h>
 #include <asm/mips-boards/generic.h>
@@ -90,16 +90,15 @@ static void __init fd_activate(void)
 }
 #endif
 
-static int __init plat_enable_iocoherency(void)
+static void __init plat_setup_iocoherency(void)
 {
-       int supported = 0;
        u32 cfg;
 
        if (mips_revision_sconid == MIPS_REVISION_SCON_BONITO) {
                if (BONITO_PCICACHECTRL & BONITO_PCICACHECTRL_CPUCOH_PRES) {
                        BONITO_PCICACHECTRL |= BONITO_PCICACHECTRL_CPUCOH_EN;
                        pr_info("Enabled Bonito CPU coherency\n");
-                       supported = 1;
+                       dma_default_coherent = true;
                }
                if (strstr(fw_getcmdline(), "iobcuncached")) {
                        BONITO_PCICACHECTRL &= ~BONITO_PCICACHECTRL_IOBCCOH_EN;
@@ -118,29 +117,16 @@ static int __init plat_enable_iocoherency(void)
                /* Nothing special needs to be done to enable coherency */
                pr_info("CMP IOCU detected\n");
                cfg = __raw_readl((u32 *)CKSEG1ADDR(ROCIT_CONFIG_GEN0));
-               if (!(cfg & ROCIT_CONFIG_GEN0_PCI_IOCU)) {
+               if (cfg & ROCIT_CONFIG_GEN0_PCI_IOCU)
+                       dma_default_coherent = true;
+               else
                        pr_crit("IOCU OPERATION DISABLED BY SWITCH - DEFAULTING TO SW IO COHERENCY\n");
-                       return 0;
-               }
-               supported = 1;
        }
-       hw_coherentio = supported;
-       return supported;
-}
 
-static void __init plat_setup_iocoherency(void)
-{
-       if (plat_enable_iocoherency()) {
-               if (coherentio == IO_COHERENCE_DISABLED)
-                       pr_info("Hardware DMA cache coherency disabled\n");
-               else
-                       pr_info("Hardware DMA cache coherency enabled\n");
-       } else {
-               if (coherentio == IO_COHERENCE_ENABLED)
-                       pr_info("Hardware DMA cache coherency unsupported, but enabled from command line!\n");
-               else
-                       pr_info("Software DMA cache coherency enabled\n");
-       }
+       if (dma_default_coherent)
+               pr_info("Hardware DMA cache coherency enabled\n");
+       else
+               pr_info("Software DMA cache coherency enabled\n");
 }
 
 static void __init pci_clock_check(void)