MIPS: CM: Rename mips_cm_base to mips_gcr_base

We currently have a mips_cm_base variable which holds the base address
of the Coherence Manager (CM) Global Configuration Registers (GCRs), and
accessor functions which use the GCR in their names. This works fine,
but gets in the way of sharing the code to generate the accessor
functions with other blocks (ie. CPC & GIC) because that code would then
need to separately handle the name of the base address variable & the
name used in the accessor functions.

In order to prepare for sharing the accessor generation code between CM,
CPC & GIC code this patch renames mips_cm_base to mips_gcr_base such
that the "gcr" portion is common to both the base address variable & the
accessor function names.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/16999/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/include/asm/mips-cm.h b/arch/mips/include/asm/mips-cm.h
index cfdbab0157697f74cf0eedf048d2791f2b4dd643..a13d721669e61ee0ca27d68f9169299ba587da63 100644 (file)
--- a/arch/mips/include/asm/mips-cm.h
+++ b/arch/mips/include/asm/mips-cm.h
@@ -17,7 +17,7 @@
 #include <linux/types.h>
 
 /* The base address of the CM GCR block */
-extern void __iomem *mips_cm_base;
+extern void __iomem *mips_gcr_base;
 
 /* The base address of the CM L2-only sync region */
 extern void __iomem *mips_cm_l2sync_base;
@@ -80,7 +80,7 @@ static inline int mips_cm_probe(void)
 static inline bool mips_cm_present(void)
 {
 #ifdef CONFIG_MIPS_CM
-       return mips_cm_base != NULL;
+       return mips_gcr_base != NULL;
 #else
        return false;
 #endif
@@ -116,7 +116,7 @@ static inline bool mips_cm_has_l2sync(void)
 #define BUILD_CM_R_(name, off)                                 \
 static inline unsigned long __iomem *addr_gcr_##name(void)     \
 {                                                              \
-       return (unsigned long __iomem *)(mips_cm_base + (off)); \
+       return (unsigned long __iomem *)(mips_gcr_base + (off));\
 }                                                              \
                                                                \
 static inline u32 read32_gcr_##name(void)                      \

diff --git a/arch/mips/kernel/mips-cm.c b/arch/mips/kernel/mips-cm.c
index cb0c57f860d468fab42cc60aefc80c1c1efe161a..caac4a5239687eccf67536ca7e7c0edb6fed5ea0 100644 (file)
--- a/arch/mips/kernel/mips-cm.c
+++ b/arch/mips/kernel/mips-cm.c
@@ -15,7 +15,7 @@
 #include <asm/mips-cm.h>
 #include <asm/mipsregs.h>
 
-void __iomem *mips_cm_base;
+void __iomem *mips_gcr_base;
 void __iomem *mips_cm_l2sync_base;
 int mips_cm_is64;
 
@@ -211,7 +211,7 @@ int mips_cm_probe(void)
         * No need to probe again if we have already been
         * here before.
         */
-       if (mips_cm_base)
+       if (mips_gcr_base)
                return 0;
 
        addr = mips_cm_phys_base();
@@ -219,8 +219,8 @@ int mips_cm_probe(void)
        if (!addr)
                return -ENODEV;
 
-       mips_cm_base = ioremap_nocache(addr, MIPS_CM_GCR_SIZE);
-       if (!mips_cm_base)
+       mips_gcr_base = ioremap_nocache(addr, MIPS_CM_GCR_SIZE);
+       if (!mips_gcr_base)
                return -ENXIO;
 
        /* sanity check that we're looking at a CM */
@@ -228,7 +228,7 @@ int mips_cm_probe(void)
        if ((base_reg & CM_GCR_BASE_GCRBASE_MSK) != addr) {
                pr_err("GCRs appear to have been moved (expected them at 0x%08lx)!\n",
                       (unsigned long)addr);
-               mips_cm_base = NULL;
+               mips_gcr_base = NULL;
                return -ENODEV;
        }