linux-mips
[Top] [All Lists]

[PATCH 4/5] MIPS: Netlogic: rename nlm_cop2_save/restore

To: linux-mips@linux-mips.org, ralf@linux-mips.org, ddaney.cavm@gmail.com
Subject: [PATCH 4/5] MIPS: Netlogic: rename nlm_cop2_save/restore
From: "Jayachandran C" <jchandra@broadcom.com>
Date: Mon, 10 Jun 2013 13:00:03 +0530
Cc: "Jayachandran C" <jchandra@broadcom.com>
In-reply-to: <1370849404-4918-1-git-send-email-jchandra@broadcom.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1370849404-4918-1-git-send-email-jchandra@broadcom.com>
Sender: linux-mips-bounce@linux-mips.org
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>
---
 arch/mips/include/asm/netlogic/xlr/fmn.h |    4 ++--
 arch/mips/netlogic/xlr/fmn.c             |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/mips/include/asm/netlogic/xlr/fmn.h 
b/arch/mips/include/asm/netlogic/xlr/fmn.h
index 56c7b85..5604db3 100644
--- 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 0fdce61..d428e84 100644
--- 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);
 }
-- 
1.7.9.5



<Prev in Thread] Current Thread [Next in Thread>