From: INAGAKI Hiroshi Date: Sun, 7 Aug 2022 06:12:46 +0000 (+0900) Subject: realtek: update SMP-related calls in prom_init() X-Git-Tag: v23.05.0-rc1~2191 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5b37e3245d02f414c4883e78ffe9e157225958e7;p=openwrt%2Fopenwrt.git 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 [squash SMP change commits, reword commit message] Signed-off-by: Sander Vanheule --- 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 1428c01a33..d04d77e438 100644 --- 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()); - /* Early detection of CMP support */ - if(soc_info.family == RTL9310_FAMILY_ID) { - mips_cm_probe(); - mips_cpc_probe(); - } - prom_init_cmdline(); + mips_cpc_probe(); + if (!register_cps_smp_ops()) return;