Author: blogic Date: 2015-12-11 16:02:36 +0100 (Fri, 11 Dec 2015) New Revision: 47837
Added: trunk/target/linux/ramips/patches-4.3/0055-MIPS-CPS-drop-.set-mips64r2-directives.patch Log: ramips: backport batch fixing illegal instruction when booting secodnary CPUs in CPS mode Signed-off-by: Nikolay Martynov <[email protected]> Added: trunk/target/linux/ramips/patches-4.3/0055-MIPS-CPS-drop-.set-mips64r2-directives.patch =================================================================== --- trunk/target/linux/ramips/patches-4.3/0055-MIPS-CPS-drop-.set-mips64r2-directives.patch (rev 0) +++ trunk/target/linux/ramips/patches-4.3/0055-MIPS-CPS-drop-.set-mips64r2-directives.patch 2015-12-11 15:02:36 UTC (rev 47837) @@ -0,0 +1,53 @@ +From patchwork Wed Aug 5 22:42:40 2015 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [6/6] MIPS: CPS: drop .set mips64r2 directives +From: Paul Burton <[email protected]> +X-Patchwork-Id: 10869 +Message-Id: <[email protected]> +To: <[email protected]> +Cc: Paul Burton <[email protected]>, + Markos Chandras <[email protected]>, + <[email protected]>, <[email protected]>, + James Hogan <[email protected]>, "Ralf Baechle" <[email protected]> +Date: Wed, 5 Aug 2015 15:42:40 -0700 + +Commit 977e043d5ea1 ("MIPS: kernel: cps-vec: Replace mips32r2 ISA level +with mips64r2") leads to .set mips64r2 directives being present in 32 +bit (ie. CONFIG_32BIT=y) kernels. This is incorrect & leads to MIPS64 +instructions being emitted by the assembler when expanding +pseudo-instructions. For example the "move" instruction can legitimately +be expanded to a "daddu". This causes problems when the kernel is run on +a MIPS32 CPU, as CONFIG_32BIT kernels of course often are... + +Fix this by dropping the .set <ISA> directives entirely now that Kconfig +should be ensuring that kernels including this code are built with a +suitable -march= compiler flag. + +Signed-off-by: Paul Burton <[email protected]> +Cc: Markos Chandras <[email protected]> +Cc: <[email protected]> # 3.16+ +--- + + arch/mips/kernel/cps-vec.S | 2 -- + 1 file changed, 2 deletions(-) + +--- a/arch/mips/kernel/cps-vec.S ++++ b/arch/mips/kernel/cps-vec.S +@@ -229,7 +229,6 @@ LEAF(mips_cps_core_init) + has_mt t0, 3f + + .set push +- .set mips64r2 + .set mt + + /* Only allow 1 TC per VPE to execute... */ +@@ -348,7 +347,6 @@ LEAF(mips_cps_boot_vpes) + nop + + .set push +- .set mips64r2 + .set mt + + 1: /* Enter VPE configuration state */ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
