tree 8a45b4e92f371322614cac40d06308b8c22ff8e2
parent 891731f6a5dbe508d12443175a7e166a2fba616a
author NeilBrown <neil@brown.name> 1521601330 +1100
committer James Hogan <jhogan@kernel.org> 1521677190 +0000
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEd80NauSabkiESfLYbAtpk944dnoFAlqy844ACgkQbAtpk944
 dnrYYA//VE2WbpnIHBa7pVoe07mtiQT2PGvNQp6SmqK4PxN8L2AVMon57SbfiCvF
 MzkELRrbR3P9PPL0HuvnXB57A2s1r4XrTMcldx+Iw2pix1OUNzBE9OiQcBkMYD3D
 esLovLi9T04+Zdoj/a/+QSU/TrZ1TM4JKDLesntEdWJy1lqRFypkLlCQY+eUNoh4
 7f71vWVVYfr2LNwfTsP5TkKmmUlftWZD2yx5sVCf25yphAeEkf6Nj6iqMqF8+FM9
 pVfllJcVlcyUJxCycTX46M2Ke0qGtAusmgyqgZRDopnbc/ovLuyuQOgeYZ9BedGQ
 zy0hbW2C4ICn0uxeVGM1Hp06/8xvAfPIRbppxgmAClEu3QrqKJiSaTItcjir2tPf
 /jWwnc0omyuJx0bQgJpUrdVXCztFZM1Iirx/eZbwDvyrqZPhValNtDZAKh5JxivV
 XL4Vpn1ytN+8sSG36Qk/vzwevNnO0YNC4sdxsv4sAVU5hFa5Lt55k1sQfG4YlTob
 MSe+IPa3Yr5grkZ8061j796fnwR3UcqGSHFVWU5FpSQK4j/4wGWH0QXX+0FsC+3k
 psFmR1w1XDrMZ9Np2e/W8dbuQ/WzYmwywzZCCjjqiRqoi2eATquZtYxdxh32DEJz
 UJhxJJV8qxZpCfNWzhQksZ3wxGxT9s5FHfn6lzR5KDRfBMIItTg=
 =DM8w
 -----END PGP SIGNATURE-----

MIPS: ralink: Fix booting on MT7621

Since commit 3af5a67c86a3 ("MIPS: Fix early CM probing") the MT7621 has
not been able to boot.

This commit caused mips_cm_probe() to be called before
mt7621.c::proc_soc_init().

prom_soc_init() has a comment explaining that mips_cm_probe() "wipes out
the bootloader config" and means that configuration registers are no
longer available. It has some code to re-enable this config.

Before this re-enable code is run, the sysc register cannot be read, so
when SYSC_REG_CHIP_NAME0 is read, a garbage value is returned and
panic() is called.

If we move the config-repair code to the top of prom_soc_init(), the
registers can be read and boot can proceed.

Very occasionally, the first register read after the reconfiguration
returns garbage, so add a call to __sync().

Fixes: 3af5a67c86a3 ("MIPS: Fix early CM probing")
Signed-off-by: NeilBrown <neil@brown.name>
Reviewed-by: Matt Redfearn <matt.redfearn@mips.com>
Cc: John Crispin <john@phrozen.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: <stable@vger.kernel.org> # 4.5+
Patchwork: https://patchwork.linux-mips.org/patch/18859/
Signed-off-by: James Hogan <jhogan@kernel.org>