MIPS: Netlogic: Add support for XLP5XX

Add support for the XLP5XX processor which is an 8 core variant of the
XLP9XX. Add XLP5XX cases to code which earlier handled XLP9XX.

Signed-off-by: Yonghong Song <ysong@broadcom.com>
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/6871/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

3 files changed, 7 insertions, 3 deletions

diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index 39826a77b9f3..129d08701e91 100644
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -201,6 +201,7 @@
 #define PRID_IMP_NETLOGIC_XLP3XX        0x1100
 #define PRID_IMP_NETLOGIC_XLP2XX        0x1200
 #define PRID_IMP_NETLOGIC_XLP9XX        0x1500
+#define PRID_IMP_NETLOGIC_XLP5XX        0x1300
 
 /*
  * Particular Revision values for bits 7:0 of the PRId register.
diff --git a/arch/mips/include/asm/netlogic/mips-extns.h b/arch/mips/include/asm/netlogic/mips-extns.h
index 38af905bf07e..06f1f75bfa9b 100644
--- a/arch/mips/include/asm/netlogic/mips-extns.h
+++ b/arch/mips/include/asm/netlogic/mips-extns.h
@@ -148,7 +148,8 @@ static inline int nlm_nodeid(void)
 {
         uint32_t prid = read_c0_prid() & PRID_IMP_MASK;
 
-        if (prid == PRID_IMP_NETLOGIC_XLP9XX)
+        if ((prid == PRID_IMP_NETLOGIC_XLP9XX) ||
+                        (prid == PRID_IMP_NETLOGIC_XLP5XX))
                 return (__read_32bit_c0_register($15, 1) >> 7) & 0x7;
         else
                 return (__read_32bit_c0_register($15, 1) >> 5) & 0x3;
diff --git a/arch/mips/include/asm/netlogic/xlp-hal/xlp.h b/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
index a11b289956e6..62d19871b983 100644
--- a/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
+++ b/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
@@ -102,14 +102,16 @@ static inline int cpu_is_xlpii(void)
         int chip = read_c0_prid() & PRID_IMP_MASK;
 
         return chip == PRID_IMP_NETLOGIC_XLP2XX ||
-                chip == PRID_IMP_NETLOGIC_XLP9XX;
+                chip == PRID_IMP_NETLOGIC_XLP9XX ||
+                chip == PRID_IMP_NETLOGIC_XLP5XX;
 }
 
 static inline int cpu_is_xlp9xx(void)
 {
         int chip = read_c0_prid() & PRID_IMP_MASK;
 
-        return chip == PRID_IMP_NETLOGIC_XLP9XX;
+        return chip == PRID_IMP_NETLOGIC_XLP9XX ||
+                chip == PRID_IMP_NETLOGIC_XLP5XX;
 }
 #endif /* !__ASSEMBLY__ */
 #endif /* _ASM_NLM_XLP_H */