MIPS: Netlogic: rename nlm_cop2_save/restore

Rename macro nlm_cop2_enable() to nlm_cop2_enable_irqsave() and the macro
nlm_cop2_restore to nlm_cop2_disable_irqrestore(). The new names will
reflect the functionality better, and will make nlm_cop2_restore()
available to be used later in COP2 save/restore patch.

Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Cc: linux-mips@linux-mips.org
Cc: ddaney.cavm@gmail.com
Patchwork: https://patchwork.linux-mips.org/patch/5412/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/include/asm/netlogic/xlr/fmn.h b/arch/mips/include/asm/netlogic/xlr/fmn.h
index 56c7b85ea7ddad47e2d7ecde06cd38aad85923da..5604db3d18362bd4585f8d721c63466647210661 100644 (file)
--- a/arch/mips/include/asm/netlogic/xlr/fmn.h
+++ b/arch/mips/include/asm/netlogic/xlr/fmn.h
@@ -241,7 +241,7 @@ static inline void nlm_msgwait(unsigned int mask)
 /*
  * Disable interrupts and enable COP2 access
  */
-static inline uint32_t nlm_cop2_enable(void)
+static inline uint32_t nlm_cop2_enable_irqsave(void)
 {
        uint32_t sr = read_c0_status();
 
@@ -249,7 +249,7 @@ static inline uint32_t nlm_cop2_enable(void)
        return sr;
 }
 
-static inline void nlm_cop2_restore(uint32_t sr)
+static inline void nlm_cop2_disable_irqrestore(uint32_t sr)
 {
        write_c0_status(sr);
 }

diff --git a/arch/mips/netlogic/xlr/fmn.c b/arch/mips/netlogic/xlr/fmn.c
index 0fdce61857cd5b5970016641c8ad9a501445d556..d428e8471eec6627b3500c4b7fd987994515d4c0 100644 (file)
--- a/arch/mips/netlogic/xlr/fmn.c
+++ b/arch/mips/netlogic/xlr/fmn.c
@@ -74,7 +74,7 @@ static irqreturn_t fmn_message_handler(int irq, void *data)
        struct nlm_fmn_msg msg;
        uint32_t mflags, bkt_status;
 
-       mflags = nlm_cop2_enable();
+       mflags = nlm_cop2_enable_irqsave();
        /* Disable message ring interrupt */
        nlm_fmn_setup_intr(irq, 0);
        while (1) {
@@ -97,16 +97,16 @@ static irqreturn_t fmn_message_handler(int irq, void *data)
                                pr_warn("No msgring handler for stnid %d\n",
                                                src_stnid);
                        else {
-                               nlm_cop2_restore(mflags);
+                               nlm_cop2_disable_irqrestore(mflags);
                                hndlr->action(bucket, src_stnid, size, code,
                                        &msg, hndlr->arg);
-                               mflags = nlm_cop2_enable();
+                               mflags = nlm_cop2_enable_irqsave();
                        }
                }
        };
        /* Enable message ring intr, to any thread in core */
        nlm_fmn_setup_intr(irq, (1 << nlm_threads_per_core) - 1);
-       nlm_cop2_restore(mflags);
+       nlm_cop2_disable_irqrestore(mflags);
        return IRQ_HANDLED;
 }
 
@@ -128,7 +128,7 @@ void xlr_percpu_fmn_init(void)
 
        bucket_sizes = xlr_board_fmn_config.bucket_size;
        cpu_fmn_info = &xlr_board_fmn_config.cpu[id];
-       flags = nlm_cop2_enable();
+       flags = nlm_cop2_enable_irqsave();
 
        /* Setup bucket sizes for the core. */
        nlm_write_c2_bucksize(0, bucket_sizes[id * 8 + 0]);
@@ -166,7 +166,7 @@ void xlr_percpu_fmn_init(void)
 
        /* enable FMN interrupts on this CPU */
        nlm_fmn_setup_intr(IRQ_FMN, (1 << nlm_threads_per_core) - 1);
-       nlm_cop2_restore(flags);
+       nlm_cop2_disable_irqrestore(flags);
 }
 
 
@@ -198,7 +198,7 @@ void nlm_setup_fmn_irq(void)
        /* setup irq only once */
        setup_irq(IRQ_FMN, &fmn_irqaction);
 
-       flags = nlm_cop2_enable();
+       flags = nlm_cop2_enable_irqsave();
        nlm_fmn_setup_intr(IRQ_FMN, (1 << nlm_threads_per_core) - 1);
-       nlm_cop2_restore(flags);
+       nlm_cop2_disable_irqrestore(flags);
 }