linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Agner <stefan@agner.ch>
To: linux@armlinux.org.uk
Cc: nicolas.pitre@linaro.org, andrew@lunn.ch, mans@mansr.com,
	tony@atomide.com, Stefan Agner <stefan@agner.ch>,
	robh@kernel.org, f.fainelli@gmail.com,
	gregory.clement@bootlin.com, krzk@kernel.org, kgene@kernel.org,
	bcm-kernel-feedback-list@broadcom.com,
	sebastian.hesselbarth@gmail.com, jason@lakedaemon.net,
	arnd@arndb.de, marc.w.gonzalez@free.fr, rjui@broadcom.com,
	ssantosh@kernel.org, linux-arm-kernel@lists.infradead.org,
	sbranden@broadcom.com, ard.biesheuvel@linaro.org,
	ndesaulniers@google.com, linux-kernel@vger.kernel.org,
	robin.murphy@arm.com
Subject: [PATCH 3/3] ARM: mvebu: prefix coprocessor operand with p
Date: Sat, 23 Mar 2019 16:52:58 +0100	[thread overview]
Message-ID: <7258b06ce7f788dd5d8eedc55855205c08068c0b.1553356359.git.stefan@agner.ch> (raw)
In-Reply-To: <9641c58c03720104186a797a96e30a52ae9805e4.1553356359.git.stefan@agner.ch>

In every other instance where mrc is used the coprocessor operand
is prefix with p (e.g. p15). Use the p prefix in this case too.
This fixes a build issue when using LLVM's integrated assembler:
  arch/arm/mach-mvebu/coherency_ll.S:69:6: error: invalid operand for instruction
   mrc 15, 0, r3, cr0, cr0, 5
       ^
  arch/arm/mach-mvebu/pmsu_ll.S:19:6: error: invalid operand for instruction
   mrc 15, 0, r0, cr0, cr0, 5 @ get the CPU ID
       ^

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 arch/arm/mach-mvebu/coherency_ll.S | 2 +-
 arch/arm/mach-mvebu/pmsu_ll.S      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-mvebu/coherency_ll.S b/arch/arm/mach-mvebu/coherency_ll.S
index 8b2fbc8b6bc6..2d962fe48821 100644
--- a/arch/arm/mach-mvebu/coherency_ll.S
+++ b/arch/arm/mach-mvebu/coherency_ll.S
@@ -66,7 +66,7 @@ ENDPROC(ll_get_coherency_base)
  * fabric registers
  */
 ENTRY(ll_get_coherency_cpumask)
-	mrc	15, 0, r3, cr0, cr0, 5
+	mrc	p15, 0, r3, cr0, cr0, 5
 	and	r3, r3, #15
 	mov	r2, #(1 << 24)
 	lsl	r3, r2, r3
diff --git a/arch/arm/mach-mvebu/pmsu_ll.S b/arch/arm/mach-mvebu/pmsu_ll.S
index c1fb713e9306..7aae9a25cfeb 100644
--- a/arch/arm/mach-mvebu/pmsu_ll.S
+++ b/arch/arm/mach-mvebu/pmsu_ll.S
@@ -16,7 +16,7 @@
 ENTRY(armada_38x_scu_power_up)
 	mrc     p15, 4, r1, c15, c0	@ get SCU base address
 	orr	r1, r1, #0x8		@ SCU CPU Power Status Register
-	mrc	15, 0, r0, cr0, cr0, 5	@ get the CPU ID
+	mrc	p15, 0, r0, cr0, cr0, 5	@ get the CPU ID
 	and	r0, r0, #15
 	add	r1, r1, r0
 	mov	r0, #0x0
-- 
2.21.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2019-03-23 15:53 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-23 15:52 [PATCH 1/3] ARM: use arch_extension directive instead of arch argument Stefan Agner
2019-03-23 15:52 ` [PATCH 2/3] ARM: mvebu: drop unnecessary label Stefan Agner
2019-03-23 17:55   ` nicolas.pitre
2019-03-23 15:52 ` Stefan Agner [this message]
2019-03-23 17:56   ` [PATCH 3/3] ARM: mvebu: prefix coprocessor operand with p nicolas.pitre
2019-03-23 16:02 ` [PATCH 1/3] ARM: use arch_extension directive instead of arch argument Måns Rullgård
2019-03-23 20:06 ` Arnd Bergmann
2019-03-24 21:50   ` Stefan Agner
2019-03-31 17:34   ` Arnd Bergmann
2019-04-08 20:23     ` Stefan Agner
2019-03-25  8:11 ` Marc Gonzalez
2019-03-25 10:53 ` Krzysztof Kozlowski

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=7258b06ce7f788dd5d8eedc55855205c08068c0b.1553356359.git.stefan@agner.ch \
    --to=stefan@agner.ch \
    --cc=andrew@lunn.ch \
    --cc=ard.biesheuvel@linaro.org \
    --cc=arnd@arndb.de \
    --cc=bcm-kernel-feedback-list@broadcom.com \
    --cc=f.fainelli@gmail.com \
    --cc=gregory.clement@bootlin.com \
    --cc=jason@lakedaemon.net \
    --cc=kgene@kernel.org \
    --cc=krzk@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=mans@mansr.com \
    --cc=marc.w.gonzalez@free.fr \
    --cc=ndesaulniers@google.com \
    --cc=nicolas.pitre@linaro.org \
    --cc=rjui@broadcom.com \
    --cc=robh@kernel.org \
    --cc=robin.murphy@arm.com \
    --cc=sbranden@broadcom.com \
    --cc=sebastian.hesselbarth@gmail.com \
    --cc=ssantosh@kernel.org \
    --cc=tony@atomide.com \
    /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).