linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Scott Wood <oss@buserror.net>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org, Scott Wood <oss@buserror.net>,
	chenhui.zhao@freescale.com
Subject: [PATCH] powerpc/book3e-64: Use hardcoded mttmr opcode
Date: Tue, 15 Mar 2016 01:47:38 -0500	[thread overview]
Message-ID: <1458024458-19206-1-git-send-email-oss@buserror.net> (raw)

This preserves the ability to build using older binutils (reportedly <=
2.22).

Signed-off-by: Scott Wood <oss@buserror.net>
Cc: chenhui.zhao@freescale.com
---
 arch/powerpc/kernel/head_64.S | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 2916283..4286775 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -41,6 +41,7 @@
 #include <asm/ptrace.h>
 #include <asm/hw_irq.h>
 #include <asm/cputhreads.h>
+#include <asm/ppc-opcode.h>
 
 /* The physical memory is laid out such that the secondary processor
  * spin code sits at 0x0000...0x00ff. On server, the vectors follow
@@ -207,12 +208,12 @@ _GLOBAL(book3e_start_thread)
 	/* If the thread id is invalid, just exit. */
 	b	13f
 10:
-	mttmr	TMRN_IMSR0, r5
-	mttmr	TMRN_INIA0, r4
+	MTTMR(TMRN_IMSR0, 5)
+	MTTMR(TMRN_INIA0, 4)
 	b	12f
 11:
-	mttmr	TMRN_IMSR1, r5
-	mttmr	TMRN_INIA1, r4
+	MTTMR(TMRN_IMSR1, 5)
+	MTTMR(TMRN_INIA1, 4)
 12:
 	isync
 	li	r6, 1
-- 
2.5.0

             reply	other threads:[~2016-03-15  6:47 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-15  6:47 Scott Wood [this message]
2016-03-16 10:24 ` powerpc/book3e-64: Use hardcoded mttmr opcode Michael Ellerman

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=1458024458-19206-1-git-send-email-oss@buserror.net \
    --to=oss@buserror.net \
    --cc=chenhui.zhao@freescale.com \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mpe@ellerman.id.au \
    /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;
as well as URLs for NNTP newsgroup(s).