realtek: rtl838x: fix non-functional reboot

RTL838x devices cannot reboot if the flash controller is driven in
4 byte mode. Unitl fdc3776 ("realtek: pcs: fix PLL_CML_CTRL for
serdes 0/1") this bit was luckily cleared by a coding error. Since
then the device cannot be rebooted anymore.

Looking at the SDK one can see that this bit is reset short before
the reboot happens. But we might need that in critical situations
where there is no chance to do it right in time. As the RTL838x
always ran with the bit disabled restore the old behaviour. This
time implement it as a documented quirk so it does not get lost.

Fixes: fdc3776 ("realtek: pcs: fix PLL_CML_CTRL for serdes 0/1")
Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
(cherry-pick from commit b995f318b24f23ec1b594eb89221b78c0e50942e)
Link: https://github.com/openwrt/openwrt/pull/22384
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/realtek/files-6.12/arch/mips/rtl838x/prom.c b/target/linux/realtek/files-6.12/arch/mips/rtl838x/prom.c
index a409d9b0dc1680a6b38fc8c74b4f93dddbb43890..c35231abbc9d38385be859fd7d0768dea32e933f 100644 (file)
--- a/target/linux/realtek/files-6.12/arch/mips/rtl838x/prom.c
+++ b/target/linux/realtek/files-6.12/arch/mips/rtl838x/prom.c
@@ -78,9 +78,21 @@ static int rtlsmp_register(void)
 
 static void __init apply_early_quirks(void)
 {
-       /* Open up write protected registers. Never mess with this elsewhere */
-       if (soc_info.family == RTL8380_FAMILY_ID)
+       if (soc_info.family == RTL8380_FAMILY_ID) {
+               /*
+                * Open up write protected registers. SDK opens/closes this whenever needed. For
+                * simplicity always work with an "open" register set.
+                */
                sw_w32(0x3, RTL838X_INT_RW_CTRL);
+               /*
+                * Disable 4 byte address mode of flash controller. If this bit is not cleared
+                * the watchdog cannot reset the SoC. The SDK changes this short before restart.
+                * Until this quirk was implemented all RTL838x devices ran with this disabled
+                * because of a coding error. As no issues were detected keep the behaviour
+                * until more details are known.
+                */
+               sw_w32_mask(BIT(30), 0, RTL838X_PLL_CML_CTRL);
+       }
 }
 
 void __init device_tree_init(void)