From: Dave Martin <dave.martin@linaro.org>
To: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: linux-arm-kernel@lists.infradead.org,
Tony Lindgren <tony@atomide.com>, Jean Pihet-XID <j-pihet@ti.com>,
linux-omap@vger.kernel.org,
Nicolas Pitre <nicolas.pitre@linaro.org>
Subject: Re: [PATCH v3 3/5] ARM: omap3: Remove hand-encoded SMC instructions
Date: Fri, 4 Feb 2011 15:00:49 +0000 [thread overview]
Message-ID: <20110204150048.GA21122@arm.com> (raw)
In-Reply-To: <b0dfeb95491faa938be5ee21f22d8c51@mail.gmail.com>
On Fri, Feb 04, 2011 at 08:28:53PM +0530, Santosh Shilimkar wrote:
> > -----Original Message-----
> > From: Dave Martin [mailto:dave.martin@linaro.org]
> > Sent: Friday, February 04, 2011 7:52 PM
> > To: linux-arm-kernel@lists.infradead.org
> > Cc: Dave Martin; Tony Lindgren; Santosh Shilimkar; Jean Pihet;
> > linux-omap@vger.kernel.org; Nicolas Pitre
> > Subject: [PATCH v3 3/5] ARM: omap3: Remove hand-encoded SMC
> > instructions
> >
> > For various reasons, Linux now only officially supports being built
> > with tools which are new enough to understand the SMC instruction.
> >
> > Replacing the hand-encoded instructions when the mnemonic also
> > allows for correct assembly in Thumb-2 (otherwise, the result is
> > random data in the middle of the code).
> >
> > The Makefile already ensures that this file is built with a high
> > enough gcc -march= flag (armv7-a).
> >
> > Signed-off-by: Dave Martin <dave.martin@linaro.org>
> > Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> > ---
> > arch/arm/mach-omap2/sleep34xx.S | 14 +++++++-------
> > 1 files changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-
> > omap2/sleep34xx.S
> > index 98d8232..2c4671f 100644
> > --- a/arch/arm/mach-omap2/sleep34xx.S
> > +++ b/arch/arm/mach-omap2/sleep34xx.S
> > @@ -133,7 +133,7 @@ ENTRY(save_secure_ram_context)
> > mov r6, #0xff
> > mcr p15, 0, r0, c7, c10, 4 @ data write barrier
> > mcr p15, 0, r0, c7, c10, 5 @ data memory barrier
> > - .word 0xE1600071 @ call SMI monitor (smi #1)
> > + smc 1 @ call SMI monitor (smi #1)
>
> Minor. You missed #1 here :)
Gaaah, that's weird ... I did a search-and-replace.
3rd time licky...
Cheers
---Dave
>
> > nop
> > nop
> > nop
> > @@ -408,7 +408,7 @@ skipl2dis:
> > adr r3, l2_inv_api_params @ r3 points to dummy parameters
> > mcr p15, 0, r0, c7, c10, 4 @ data write barrier
> > mcr p15, 0, r0, c7, c10, 5 @ data memory barrier
> > - .word 0xE1600071 @ call SMI monitor (smi #1)
> > + smc #1 @ call SMI monitor (smi #1)
> > /* Write to Aux control register to set some bits */
> > mov r0, #42 @ set service ID for PPA
> > mov r12, r0 @ copy secure Service ID in r12
> > @@ -419,7 +419,7 @@ skipl2dis:
> > ldr r3, [r4, #0xBC] @ r3 points to parameters
> > mcr p15, 0, r0, c7, c10, 4 @ data write barrier
> > mcr p15, 0, r0, c7, c10, 5 @ data memory barrier
> > - .word 0xE1600071 @ call SMI monitor (smi #1)
> > + smc #1 @ call SMI monitor (smi #1)
> >
> > #ifdef CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE
> > /* Restore L2 aux control register */
> > @@ -434,7 +434,7 @@ skipl2dis:
> > adds r3, r3, #8 @ r3 points to parameters
> > mcr p15, 0, r0, c7, c10, 4 @ data write barrier
> > mcr p15, 0, r0, c7, c10, 5 @ data memory barrier
> > - .word 0xE1600071 @ call SMI monitor (smi #1)
> > + smc #1 @ call SMI monitor (smi #1)
> > #endif
> > b logic_l1_restore
> >
> > @@ -443,18 +443,18 @@ l2_inv_api_params:
> > l2_inv_gp:
> > /* Execute smi to invalidate L2 cache */
> > mov r12, #0x1 @ set up to invalidate L2
> > - .word 0xE1600070 @ Call SMI monitor (smieq)
> > + smc #0 @ Call SMI monitor (smieq)
> > /* Write to Aux control register to set some bits */
> > ldr r4, scratchpad_base
> > ldr r3, [r4,#0xBC]
> > ldr r0, [r3,#4]
> > mov r12, #0x3
> > - .word 0xE1600070 @ Call SMI monitor (smieq)
> > + smc #0 @ Call SMI monitor (smieq)
> > ldr r4, scratchpad_base
> > ldr r3, [r4,#0xBC]
> > ldr r0, [r3,#12]
> > mov r12, #0x2
> > - .word 0xE1600070 @ Call SMI monitor (smieq)
> > + smc #0 @ Call SMI monitor (smieq)
> > logic_l1_restore:
> > ldr r1, l2dis_3630
> > cmp r1, #0x1 @ Test if L2 re-enable needed on
> 3630
> > --
> > 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: dave.martin@linaro.org (Dave Martin)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 3/5] ARM: omap3: Remove hand-encoded SMC instructions
Date: Fri, 4 Feb 2011 15:00:49 +0000 [thread overview]
Message-ID: <20110204150048.GA21122@arm.com> (raw)
In-Reply-To: <b0dfeb95491faa938be5ee21f22d8c51@mail.gmail.com>
On Fri, Feb 04, 2011 at 08:28:53PM +0530, Santosh Shilimkar wrote:
> > -----Original Message-----
> > From: Dave Martin [mailto:dave.martin at linaro.org]
> > Sent: Friday, February 04, 2011 7:52 PM
> > To: linux-arm-kernel at lists.infradead.org
> > Cc: Dave Martin; Tony Lindgren; Santosh Shilimkar; Jean Pihet;
> > linux-omap at vger.kernel.org; Nicolas Pitre
> > Subject: [PATCH v3 3/5] ARM: omap3: Remove hand-encoded SMC
> > instructions
> >
> > For various reasons, Linux now only officially supports being built
> > with tools which are new enough to understand the SMC instruction.
> >
> > Replacing the hand-encoded instructions when the mnemonic also
> > allows for correct assembly in Thumb-2 (otherwise, the result is
> > random data in the middle of the code).
> >
> > The Makefile already ensures that this file is built with a high
> > enough gcc -march= flag (armv7-a).
> >
> > Signed-off-by: Dave Martin <dave.martin@linaro.org>
> > Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> > ---
> > arch/arm/mach-omap2/sleep34xx.S | 14 +++++++-------
> > 1 files changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-
> > omap2/sleep34xx.S
> > index 98d8232..2c4671f 100644
> > --- a/arch/arm/mach-omap2/sleep34xx.S
> > +++ b/arch/arm/mach-omap2/sleep34xx.S
> > @@ -133,7 +133,7 @@ ENTRY(save_secure_ram_context)
> > mov r6, #0xff
> > mcr p15, 0, r0, c7, c10, 4 @ data write barrier
> > mcr p15, 0, r0, c7, c10, 5 @ data memory barrier
> > - .word 0xE1600071 @ call SMI monitor (smi #1)
> > + smc 1 @ call SMI monitor (smi #1)
>
> Minor. You missed #1 here :)
Gaaah, that's weird ... I did a search-and-replace.
3rd time licky...
Cheers
---Dave
>
> > nop
> > nop
> > nop
> > @@ -408,7 +408,7 @@ skipl2dis:
> > adr r3, l2_inv_api_params @ r3 points to dummy parameters
> > mcr p15, 0, r0, c7, c10, 4 @ data write barrier
> > mcr p15, 0, r0, c7, c10, 5 @ data memory barrier
> > - .word 0xE1600071 @ call SMI monitor (smi #1)
> > + smc #1 @ call SMI monitor (smi #1)
> > /* Write to Aux control register to set some bits */
> > mov r0, #42 @ set service ID for PPA
> > mov r12, r0 @ copy secure Service ID in r12
> > @@ -419,7 +419,7 @@ skipl2dis:
> > ldr r3, [r4, #0xBC] @ r3 points to parameters
> > mcr p15, 0, r0, c7, c10, 4 @ data write barrier
> > mcr p15, 0, r0, c7, c10, 5 @ data memory barrier
> > - .word 0xE1600071 @ call SMI monitor (smi #1)
> > + smc #1 @ call SMI monitor (smi #1)
> >
> > #ifdef CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE
> > /* Restore L2 aux control register */
> > @@ -434,7 +434,7 @@ skipl2dis:
> > adds r3, r3, #8 @ r3 points to parameters
> > mcr p15, 0, r0, c7, c10, 4 @ data write barrier
> > mcr p15, 0, r0, c7, c10, 5 @ data memory barrier
> > - .word 0xE1600071 @ call SMI monitor (smi #1)
> > + smc #1 @ call SMI monitor (smi #1)
> > #endif
> > b logic_l1_restore
> >
> > @@ -443,18 +443,18 @@ l2_inv_api_params:
> > l2_inv_gp:
> > /* Execute smi to invalidate L2 cache */
> > mov r12, #0x1 @ set up to invalidate L2
> > - .word 0xE1600070 @ Call SMI monitor (smieq)
> > + smc #0 @ Call SMI monitor (smieq)
> > /* Write to Aux control register to set some bits */
> > ldr r4, scratchpad_base
> > ldr r3, [r4,#0xBC]
> > ldr r0, [r3,#4]
> > mov r12, #0x3
> > - .word 0xE1600070 @ Call SMI monitor (smieq)
> > + smc #0 @ Call SMI monitor (smieq)
> > ldr r4, scratchpad_base
> > ldr r3, [r4,#0xBC]
> > ldr r0, [r3,#12]
> > mov r12, #0x2
> > - .word 0xE1600070 @ Call SMI monitor (smieq)
> > + smc #0 @ Call SMI monitor (smieq)
> > logic_l1_restore:
> > ldr r1, l2dis_3630
> > cmp r1, #0x1 @ Test if L2 re-enable needed on
> 3630
> > --
> > 1.7.1
next prev parent reply other threads:[~2011-02-04 15:00 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-04 14:21 [PATCH v3 0/5] ARM: omap[34]: Thumb-2 compatibility fixes Dave Martin
2011-02-04 14:21 ` Dave Martin
2011-02-04 14:21 ` [PATCH v3 1/5] ARM: omap4: Replace custom do_wfi() with generic wfi() Dave Martin
2011-02-04 14:21 ` Dave Martin
2011-02-04 14:21 ` [PATCH v3 2/5] ARM: omap4: Convert END() to ENDPROC() for correct linkage with CONFIG_THUMB2_KERNEL Dave Martin
2011-02-04 14:21 ` Dave Martin
2011-02-04 14:21 ` [PATCH v3 3/5] ARM: omap3: Remove hand-encoded SMC instructions Dave Martin
2011-02-04 14:21 ` Dave Martin
2011-02-04 14:58 ` Santosh Shilimkar
2011-02-04 14:58 ` Santosh Shilimkar
2011-02-04 15:00 ` Dave Martin [this message]
2011-02-04 15:00 ` Dave Martin
2011-02-04 14:21 ` [PATCH v3 4/5] ARM: omap3: Thumb-2 compatibility for sram34xx.S Dave Martin
2011-02-04 14:21 ` Dave Martin
2011-02-04 14:21 ` [PATCH v3 5/5] ARM: omap3: Thumb-2 compatibility for sleep34xx.S Dave Martin
2011-02-04 14:21 ` Dave Martin
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=20110204150048.GA21122@arm.com \
--to=dave.martin@linaro.org \
--cc=j-pihet@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=nicolas.pitre@linaro.org \
--cc=santosh.shilimkar@ti.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.