Linux MIPS Architecture development
 help / color / mirror / Atom feed
* [PATCH] mips: make mips_cps_{core_init,boot_vpes} work on mips32r2
@ 2015-12-08 18:30 Nikolay Martynov
  2015-12-09 10:03 ` Qais Yousef
  0 siblings, 1 reply; 3+ messages in thread
From: Nikolay Martynov @ 2015-12-08 18:30 UTC (permalink / raw)
  To: linux-mips; +Cc: Nikolay Martynov

mips_cps_{core_init,boot_vpes} had 'mips64r2' hardcoded which
prevented them from being run on mips32. Fix that by choosing
cpu type based on CONFIG_64BIT.

Tested on mt7621.

Signed-off-by: Nikolay Martynov <mar.kolya@gmail.com>
---
 arch/mips/kernel/cps-vec.S | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/mips/kernel/cps-vec.S b/arch/mips/kernel/cps-vec.S
index 8fd5a27..1254a51 100644
--- a/arch/mips/kernel/cps-vec.S
+++ b/arch/mips/kernel/cps-vec.S
@@ -257,7 +257,11 @@ LEAF(mips_cps_core_init)
 	has_mt	t0, 3f
 
 	.set	push
+#ifdef CONFIG_64BIT
 	.set	mips64r2
+#else
+	.set	mips32r2
+#endif
 	.set	mt
 
 	/* Only allow 1 TC per VPE to execute... */
@@ -376,7 +380,11 @@ LEAF(mips_cps_boot_vpes)
 	 nop
 
 	.set	push
+#ifdef CONFIG_64BIT
 	.set	mips64r2
+#else
+	.set	mips32r2
+#endif
 	.set	mt
 
 1:	/* Enter VPE configuration state */
-- 
2.6.3

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] mips: make mips_cps_{core_init,boot_vpes} work on mips32r2
  2015-12-08 18:30 [PATCH] mips: make mips_cps_{core_init,boot_vpes} work on mips32r2 Nikolay Martynov
@ 2015-12-09 10:03 ` Qais Yousef
  2015-12-09 10:03   ` Qais Yousef
  0 siblings, 1 reply; 3+ messages in thread
From: Qais Yousef @ 2015-12-09 10:03 UTC (permalink / raw)
  To: Nikolay Martynov; +Cc: linux-mips, Paul Burton

On 12/08/2015 06:30 PM, Nikolay Martynov wrote:
> mips_cps_{core_init,boot_vpes} had 'mips64r2' hardcoded which
> prevented them from being run on mips32. Fix that by choosing
> cpu type based on CONFIG_64BIT.
>
> Tested on mt7621.
>
> Signed-off-by: Nikolay Martynov <mar.kolya@gmail.com>
> ---
>   arch/mips/kernel/cps-vec.S | 8 ++++++++
>   1 file changed, 8 insertions(+)
>
> diff --git a/arch/mips/kernel/cps-vec.S b/arch/mips/kernel/cps-vec.S
> index 8fd5a27..1254a51 100644
> --- a/arch/mips/kernel/cps-vec.S
> +++ b/arch/mips/kernel/cps-vec.S
> @@ -257,7 +257,11 @@ LEAF(mips_cps_core_init)
>   	has_mt	t0, 3f
>   
>   	.set	push
> +#ifdef CONFIG_64BIT
>   	.set	mips64r2
> +#else
> +	.set	mips32r2
> +#endif
>   	.set	mt
>   
>   	/* Only allow 1 TC per VPE to execute... */
> @@ -376,7 +380,11 @@ LEAF(mips_cps_boot_vpes)
>   	 nop
>   
>   	.set	push
> +#ifdef CONFIG_64BIT
>   	.set	mips64r2
> +#else
> +	.set	mips32r2
> +#endif
>   	.set	mt
>   
>   1:	/* Enter VPE configuration state */

This should have already been fixed in this

     http://patchwork.linux-mips.org/patch/10869/

Thanks,
Qais

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] mips: make mips_cps_{core_init,boot_vpes} work on mips32r2
  2015-12-09 10:03 ` Qais Yousef
@ 2015-12-09 10:03   ` Qais Yousef
  0 siblings, 0 replies; 3+ messages in thread
From: Qais Yousef @ 2015-12-09 10:03 UTC (permalink / raw)
  To: Nikolay Martynov; +Cc: linux-mips, Paul Burton

On 12/08/2015 06:30 PM, Nikolay Martynov wrote:
> mips_cps_{core_init,boot_vpes} had 'mips64r2' hardcoded which
> prevented them from being run on mips32. Fix that by choosing
> cpu type based on CONFIG_64BIT.
>
> Tested on mt7621.
>
> Signed-off-by: Nikolay Martynov <mar.kolya@gmail.com>
> ---
>   arch/mips/kernel/cps-vec.S | 8 ++++++++
>   1 file changed, 8 insertions(+)
>
> diff --git a/arch/mips/kernel/cps-vec.S b/arch/mips/kernel/cps-vec.S
> index 8fd5a27..1254a51 100644
> --- a/arch/mips/kernel/cps-vec.S
> +++ b/arch/mips/kernel/cps-vec.S
> @@ -257,7 +257,11 @@ LEAF(mips_cps_core_init)
>   	has_mt	t0, 3f
>   
>   	.set	push
> +#ifdef CONFIG_64BIT
>   	.set	mips64r2
> +#else
> +	.set	mips32r2
> +#endif
>   	.set	mt
>   
>   	/* Only allow 1 TC per VPE to execute... */
> @@ -376,7 +380,11 @@ LEAF(mips_cps_boot_vpes)
>   	 nop
>   
>   	.set	push
> +#ifdef CONFIG_64BIT
>   	.set	mips64r2
> +#else
> +	.set	mips32r2
> +#endif
>   	.set	mt
>   
>   1:	/* Enter VPE configuration state */

This should have already been fixed in this

     http://patchwork.linux-mips.org/patch/10869/

Thanks,
Qais

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-12-09 10:03 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-08 18:30 [PATCH] mips: make mips_cps_{core_init,boot_vpes} work on mips32r2 Nikolay Martynov
2015-12-09 10:03 ` Qais Yousef
2015-12-09 10:03   ` Qais Yousef

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox