1 files changed, 11 insertions, 0 deletions

diff --git a/arch/mips/include/asm/mips-cm.h b/arch/mips/include/asm/mips-cm.h
index 58e7874e9347..4fafeefe65c2 100644
--- a/arch/mips/include/asm/mips-cm.h
+++ b/arch/mips/include/asm/mips-cm.h
@@ -458,10 +458,21 @@ static inline int mips_cm_revision(void)
 static inline unsigned int mips_cm_max_vp_width(void)
 {
         extern int smp_num_siblings;
+        uint32_t cfg;
 
         if (mips_cm_revision() >= CM_REV_CM3)
                 return read_gcr_sys_config2() & CM_GCR_SYS_CONFIG2_MAXVPW_MSK;
 
+        if (mips_cm_present()) {
+                /*
+                 * We presume that all cores in the system will have the same
+                 * number of VP(E)s, and if that ever changes then this will
+                 * need revisiting.
+                 */
+                cfg = read_gcr_cl_config() & CM_GCR_Cx_CONFIG_PVPE_MSK;
+                return (cfg >> CM_GCR_Cx_CONFIG_PVPE_SHF) + 1;
+        }
+
         if (IS_ENABLED(CONFIG_SMP))
                 return smp_num_siblings;