realtek: update SMP-related calls in prom_init()

The availabibity of probing CPC depends on CONFIG_MIPS_CPC symbol and it
will be checked in arch/mips/include/asm/mips-cpc.h. RTL9310 selects
this symbol, so the family check is redudant.

Furthermore, mips_cm_probe() is already called from setup_arch() in
mips/kernel/setup.c before prom_init(), and as such is not required.

Also move mips_cpc_probe() to run just before registering SMP ops.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
[squash SMP change commits, reword commit message]
Signed-off-by: Sander Vanheule <sander@svanheule.net>
---
This patch only really has an impact on the rtl931x subtarget, which has
no devices. Noboby is currently set up to test these patches either, but
the end result is closer to MIPS_GENERIC, so I do not expect it to cause
issues.

diff --git a/target/linux/realtek/files-5.10/arch/mips/rtl838x/prom.c b/target/linux/realtek/files-5.10/arch/mips/rtl838x/prom.c
index 1428c01a3302c85586c5584311beceac88063584..d04d77e438fcbb151b467154000f12ebd0dcb736 100644 (file)
--- a/target/linux/realtek/files-5.10/arch/mips/rtl838x/prom.c
+++ b/target/linux/realtek/files-5.10/arch/mips/rtl838x/prom.c
@@ -214,14 +214,10 @@ void __init prom_init(void)
 
        pr_info("SoC Type: %s\n", get_system_type());
 
 
        pr_info("SoC Type: %s\n", get_system_type());
 

-       /* Early detection of CMP support */
-       if(soc_info.family == RTL9310_FAMILY_ID) {
-               mips_cm_probe();
-               mips_cpc_probe();
-       }
-

        prom_init_cmdline();
 
        prom_init_cmdline();
 

+       mips_cpc_probe();
+

        if (!register_cps_smp_ops())
                return;
 
        if (!register_cps_smp_ops())
                return;