MIPS: Netlogic: Fix nlm_read_c2_status() definition

The sel argument os nlm_read_c2_status() was not used and the macro
returned the sel 0 in all cases. Fix this by defining two macros:
nlm_read_c2_status0() and nlm_read_c2_status1() to return the two
status registers.

Add functions to write to the status registers as well.

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/5414/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 6 insertions, 2 deletions

diff --git a/arch/mips/include/asm/netlogic/xlr/fmn.h b/arch/mips/include/asm/netlogic/xlr/fmn.h
index 2a78929cef73..56c7b85ea7dd 100644
--- a/arch/mips/include/asm/netlogic/xlr/fmn.h
+++ b/arch/mips/include/asm/netlogic/xlr/fmn.h
@@ -175,6 +175,10 @@
 #define nlm_write_c2_cc14(s, v)         __write_32bit_c2_register($30, s, v)
 #define nlm_write_c2_cc15(s, v)         __write_32bit_c2_register($31, s, v)
 
+#define nlm_read_c2_status0()           __read_32bit_c2_register($2, 0)
+#define nlm_write_c2_status0(v)         __write_32bit_c2_register($2, 0, v)
+#define nlm_read_c2_status1()           __read_32bit_c2_register($2, 1)
+#define nlm_write_c2_status1(v)         __write_32bit_c2_register($2, 1, v)
 #define nlm_read_c2_status(sel)         __read_32bit_c2_register($2, 0)
 #define nlm_read_c2_config()            __read_32bit_c2_register($3, 0)
 #define nlm_write_c2_config(v)          __write_32bit_c2_register($3, 0, v)
@@ -296,7 +300,7 @@ static inline int nlm_fmn_send(unsigned int size, unsigned int code,
          */
         for (i = 0; i < 8; i++) {
                 nlm_msgsnd(dest);
-                status = nlm_read_c2_status(0);
+                status = nlm_read_c2_status0();
                 if ((status & 0x2) == 1)
                         pr_info("Send pending fail!\n");
                 if ((status & 0x4) == 0)
@@ -316,7 +320,7 @@ static inline int nlm_fmn_receive(int bucket, int *size, int *code, int *stid,
 
         /* wait for load pending to clear */
         do {
-                status = nlm_read_c2_status(1);
+                status = nlm_read_c2_status0();
         } while ((status & 0x08) != 0);
 
         /* receive error bits */