Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: add support for buggy MT7621S core detection

Most MT7621 SoCs have 2 cores, which is detected and supported properly
by CPS.

Unfortunately, MT7621 SoC has a less common S variant with only one core.
On MT7621S, GCR_CONFIG still reports 2 cores, which leads to hangs when
starting SMP. CPULAUNCH registers can be used in that case to detect the
absence of the second core and override the GCR_CONFIG PCORES field.

Rework a long-standing OpenWrt patch to override the value of
mips_cps_numcores on single-core MT7621 systems.

Tested on a dual-core MT7621 device (Ubiquiti ER-X) and a single-core
MT7621 device (Netgear R6220).

Original 4.14 OpenWrt patch:
Link: https://git.openwrt.org/?p=openwrt/openwrt.git;a=commitdiff;h=4cdbc90a376dd0555201c1434a2081e055e9ceb7
Current 5.10 OpenWrt patch:
Link: https://git.openwrt.org/?p=openwrt/openwrt.git;a=blob;f=target/linux/ramips/patches-5.10/320-mt7621-core-detect-hack.patch;h=c63f0f4c1ec742e24d8480e80553863744b58f6a;hb=10267e17299806f9885d086147878f6c492cb904

Suggested-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

authored by

Ilya Lipnitskiy and committed by
Thomas Bogendoerfer
6decd1aa e607ff63

+22 -1
+22 -1
arch/mips/include/asm/mips-cps.h
··· 10 10 #include <linux/io.h> 11 11 #include <linux/types.h> 12 12 13 + #include <asm/mips-boards/launch.h> 14 + 13 15 extern unsigned long __cps_access_bad_size(void) 14 16 __compiletime_error("Bad size for CPS accessor"); 15 17 ··· 167 165 */ 168 166 static inline unsigned int mips_cps_numcores(unsigned int cluster) 169 167 { 168 + unsigned int ncores; 169 + 170 170 if (!mips_cm_present()) 171 171 return 0; 172 172 173 173 /* Add one before masking to handle 0xff indicating no cores */ 174 - return (mips_cps_cluster_config(cluster) + 1) & CM_GCR_CONFIG_PCORES; 174 + ncores = (mips_cps_cluster_config(cluster) + 1) & CM_GCR_CONFIG_PCORES; 175 + 176 + if (IS_ENABLED(CONFIG_SOC_MT7621)) { 177 + struct cpulaunch *launch; 178 + 179 + /* 180 + * Ralink MT7621S SoC is single core, but the GCR_CONFIG method 181 + * always reports 2 cores. Check the second core's LAUNCH_FREADY 182 + * flag to detect if the second core is missing. This method 183 + * only works before the core has been started. 184 + */ 185 + launch = (struct cpulaunch *)CKSEG0ADDR(CPULAUNCH); 186 + launch += 2; /* MT7621 has 2 VPEs per core */ 187 + if (!(launch->flags & LAUNCH_FREADY)) 188 + ncores = 1; 189 + } 190 + 191 + return ncores; 175 192 } 176 193 177 194 /**