[3.19.y-ckt stable] Patch "MIPS: kernel: cps-vec: Replace mips32r2 ISA level with mips64r2" has been added to staging queue

[Paul Burton]

On Wed, Aug 05, 2015 at 02:47:14PM -0700, Kamal Mostafa wrote:
> This is a note to let you know that I have just added a patch titled
> 
>     MIPS: kernel: cps-vec: Replace mips32r2 ISA level with mips64r2
> 
> to the linux-3.19.y-queue branch of the 3.19.y-ckt extended stable tree 
> which can be found at:
> 
>     http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.19.y-queue
> 
> This patch is scheduled to be released in version 3.19.8-ckt5.
> 
> If you, or anyone else, feels it should not be added to this tree, please 
> reply to this email.

Hi Kamal,

This patch breaks the boot of SMP kernels on Imagination's current
MIPS32 systems. This & the other MIPS64 related patches that were
submitted as part of the same series do not improve things for any CPUs
that Linux supports even as of the v4.2 cycle, so I do not believe they
should have been marked for backport.

So please either drop this patch (& preferrably the other MIPS64 CPS SMP
ones too) or also backport the series I've just submitted:

    http://marc.info/?l=linux-mips&m=143881461431570&w=2

My preference would be for not backporting any of them.

Thanks,
    Paul

> For more information about the 3.19.y-ckt tree, see
> https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
> 
> Thanks.
> -Kamal
> 
> ------
> 
> From 22a7e30c46134b8c9978a237c6d143b59b66609a Mon Sep 17 00:00:00 2001
> From: Markos Chandras <markos.chandras at imgtec.com>
> Date: Wed, 1 Jul 2015 09:13:30 +0100
> Subject: MIPS: kernel: cps-vec: Replace mips32r2 ISA level with mips64r2
> 
> commit 977e043d5ea1270ce985e4c165724ff91dc3c3e2 upstream.
> 
> mips32r2 is a subset of mips64r2, so we replace mips32r2 with mips64r2
> in preparation for 64-bit CPS support.
> 
> Reviewed-by: Paul Burton <paul.burton at imgtec.com>
> Signed-off-by: Markos Chandras <markos.chandras at imgtec.com>
> Cc: linux-mips at linux-mips.org
> Patchwork: https://patchwork.linux-mips.org/patch/10588/
> Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
> Signed-off-by: Kamal Mostafa <kamal at canonical.com>
> ---
>  arch/mips/kernel/cps-vec.S | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/mips/kernel/cps-vec.S b/arch/mips/kernel/cps-vec.S
> index a4b2d81..bbbd88e 100644
> --- a/arch/mips/kernel/cps-vec.S
> +++ b/arch/mips/kernel/cps-vec.S
> @@ -229,7 +229,7 @@ LEAF(mips_cps_core_init)
>  	 nop
> 
>  	.set	push
> -	.set	mips32r2
> +	.set	mips64r2
>  	.set	mt
> 
>  	/* Only allow 1 TC per VPE to execute... */
> @@ -346,7 +346,7 @@ LEAF(mips_cps_boot_vpes)
>  	 nop
> 
>  	.set	push
> -	.set	mips32r2
> +	.set	mips64r2
>  	.set	mt
> 
>  1:	/* Enter VPE configuration state */
> --
> 1.9.1
>