Linux MIPS Architecture development
 help / color / mirror / Atom feed
From: Nikolay Martynov <mar.kolya@gmail.com>
To: linux-mips@linux-mips.org
Cc: Nikolay Martynov <mar.kolya@gmail.com>
Subject: [PATCH] mips: make mips_cps_{core_init,boot_vpes} work on mips32r2
Date: Tue,  8 Dec 2015 13:30:37 -0500	[thread overview]
Message-ID: <1449599437-9593-1-git-send-email-mar.kolya@gmail.com> (raw)

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

             reply	other threads:[~2015-12-08 18:30 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-08 18:30 Nikolay Martynov [this message]
2015-12-09 10:03 ` [PATCH] mips: make mips_cps_{core_init,boot_vpes} work on mips32r2 Qais Yousef
2015-12-09 10:03   ` Qais Yousef

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1449599437-9593-1-git-send-email-mar.kolya@gmail.com \
    --to=mar.kolya@gmail.com \
    --cc=linux-mips@linux-mips.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox