* [PATCH] ARM: tegra: Re-add removed SoC id macro to tegra_resume()
@ 2014-10-08 18:54 Dmitry Osipenko
[not found] ` <1412794450-9060-1-git-send-email-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: Dmitry Osipenko @ 2014-10-08 18:54 UTC (permalink / raw)
To: swarren-3lzwWm7+Weoh9ZMKESR00Q, josephl-DDmLM1+adcrQT0dZR+AlfA,
thierry.reding-Re5JQEeQqe8AvxtiuMwx3w,
digetx-Re5JQEeQqe8AvxtiuMwx3w
Cc: linux-tegra-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Commit d127e9c5c5bc1ee22a7b1fe804397cddd132f756 ("ARM: tegra: make tegra_resume
can work with current and later chips") removed tegra_get_soc_id macro leaving
used cpu register unassigned and as result causing execution of unintended code
on tegra20. Fix it by re-adding macro.
Signed-off-by: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
arch/arm/mach-tegra/reset-handler.S | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-tegra/reset-handler.S b/arch/arm/mach-tegra/reset-handler.S
index 7b2baab..71be4af 100644
--- a/arch/arm/mach-tegra/reset-handler.S
+++ b/arch/arm/mach-tegra/reset-handler.S
@@ -51,6 +51,7 @@ ENTRY(tegra_resume)
THUMB( it ne )
bne cpu_resume @ no
+ tegra_get_soc_id TEGRA_APB_MISC_BASE, r6
/* Are we on Tegra20? */
cmp r6, #TEGRA20
beq 1f @ Yes
--
2.1.1
^ permalink raw reply related [flat|nested] 5+ messages in thread[parent not found: <1412794450-9060-1-git-send-email-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH] ARM: tegra: Re-add removed SoC id macro to tegra_resume() [not found] ` <1412794450-9060-1-git-send-email-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> @ 2014-10-08 19:01 ` Felipe Balbi 2014-10-08 19:04 ` Felipe Balbi 0 siblings, 1 reply; 5+ messages in thread From: Felipe Balbi @ 2014-10-08 19:01 UTC (permalink / raw) To: Dmitry Osipenko Cc: swarren-3lzwWm7+Weoh9ZMKESR00Q, josephl-DDmLM1+adcrQT0dZR+AlfA, thierry.reding-Re5JQEeQqe8AvxtiuMwx3w, linux-tegra-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA [-- Attachment #1: Type: text/plain, Size: 1539 bytes --] Hi, On Wed, Oct 08, 2014 at 10:54:10PM +0400, Dmitry Osipenko wrote: > Commit d127e9c5c5bc1ee22a7b1fe804397cddd132f756 ("ARM: tegra: make tegra_resume > can work with current and later chips") removed tegra_get_soc_id macro leaving > used cpu register unassigned and as result causing execution of unintended code > on tegra20. Fix it by re-adding macro. you should add: Fixes: d127e9c (ARM: tegra: make tegra_resume can work with current and later chips) Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> # v3.13+ here. With that: Reviewed-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org> > Signed-off-by: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > --- > arch/arm/mach-tegra/reset-handler.S | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/arm/mach-tegra/reset-handler.S b/arch/arm/mach-tegra/reset-handler.S > index 7b2baab..71be4af 100644 > --- a/arch/arm/mach-tegra/reset-handler.S > +++ b/arch/arm/mach-tegra/reset-handler.S > @@ -51,6 +51,7 @@ ENTRY(tegra_resume) > THUMB( it ne ) > bne cpu_resume @ no > > + tegra_get_soc_id TEGRA_APB_MISC_BASE, r6 > /* Are we on Tegra20? */ > cmp r6, #TEGRA20 > beq 1f @ Yes > -- > 2.1.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- balbi [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: tegra: Re-add removed SoC id macro to tegra_resume() 2014-10-08 19:01 ` Felipe Balbi @ 2014-10-08 19:04 ` Felipe Balbi 2014-10-08 19:24 ` [PATCH V2] " Dmitry Osipenko 0 siblings, 1 reply; 5+ messages in thread From: Felipe Balbi @ 2014-10-08 19:04 UTC (permalink / raw) To: Felipe Balbi Cc: Dmitry Osipenko, swarren, josephl, thierry.reding, linux-tegra, linux-kernel [-- Attachment #1: Type: text/plain, Size: 723 bytes --] On Wed, Oct 08, 2014 at 02:01:47PM -0500, Felipe Balbi wrote: > Hi, > > On Wed, Oct 08, 2014 at 10:54:10PM +0400, Dmitry Osipenko wrote: > > Commit d127e9c5c5bc1ee22a7b1fe804397cddd132f756 ("ARM: tegra: make tegra_resume > > can work with current and later chips") removed tegra_get_soc_id macro leaving > > used cpu register unassigned and as result causing execution of unintended code > > on tegra20. Fix it by re-adding macro. > > you should add: > > Fixes: d127e9c (ARM: tegra: make tegra_resume can work with current and later chips) > Cc: <stable@vger.kernel.org> # v3.13+ > > here. With that: > > Reviewed-by: Felipe Balbi <balbi@ti.com> oh, and you should probably Cc lakml. -- balbi [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH V2] ARM: tegra: Re-add removed SoC id macro to tegra_resume() 2014-10-08 19:04 ` Felipe Balbi @ 2014-10-08 19:24 ` Dmitry Osipenko [not found] ` <1412796255-10589-1-git-send-email-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 0 siblings, 1 reply; 5+ messages in thread From: Dmitry Osipenko @ 2014-10-08 19:24 UTC (permalink / raw) To: swarren-3lzwWm7+Weoh9ZMKESR00Q, josephl-DDmLM1+adcrQT0dZR+AlfA, thierry.reding-Re5JQEeQqe8AvxtiuMwx3w, balbi-l0cyMroinI0, digetx-Re5JQEeQqe8AvxtiuMwx3w Cc: linux-tegra-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, stable-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r Commit d127e9c5c5bc1ee22a7b1fe804397cddd132f756 ("ARM: tegra: make tegra_resume can work with current and later chips") removed tegra_get_soc_id macro leaving used cpu register unassigned and as result causing execution of unintended code on tegra20. Fix it by re-adding macro. Fixes: d127e9c (ARM: tegra: make tegra_resume can work with current and later chips) Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> # v3.13+ Reviewed-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org> Signed-off-by: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> --- V2: added Cc's for lakml and stable, added "Reviewed-by:" Felipe Balbi arch/arm/mach-tegra/reset-handler.S | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-tegra/reset-handler.S b/arch/arm/mach-tegra/reset-handler.S index 7b2baab..71be4af 100644 --- a/arch/arm/mach-tegra/reset-handler.S +++ b/arch/arm/mach-tegra/reset-handler.S @@ -51,6 +51,7 @@ ENTRY(tegra_resume) THUMB( it ne ) bne cpu_resume @ no + tegra_get_soc_id TEGRA_APB_MISC_BASE, r6 /* Are we on Tegra20? */ cmp r6, #TEGRA20 beq 1f @ Yes -- 2.1.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
[parent not found: <1412796255-10589-1-git-send-email-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH V2] ARM: tegra: Re-add removed SoC id macro to tegra_resume() [not found] ` <1412796255-10589-1-git-send-email-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> @ 2014-10-09 22:10 ` Dmitry Osipenko 0 siblings, 0 replies; 5+ messages in thread From: Dmitry Osipenko @ 2014-10-09 22:10 UTC (permalink / raw) To: swarren-3lzwWm7+Weoh9ZMKESR00Q, josephl-DDmLM1+adcrQT0dZR+AlfA, thierry.reding-Re5JQEeQqe8AvxtiuMwx3w, balbi-l0cyMroinI0 Cc: linux-tegra-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, stable-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r 08.10.2014 23:24, Dmitry Osipenko пишет: > Commit d127e9c5c5bc1ee22a7b1fe804397cddd132f756 ("ARM: tegra: make tegra_resume > can work with current and later chips") removed tegra_get_soc_id macro leaving > used cpu register unassigned and as result causing execution of unintended code > on tegra20. Fix it by re-adding macro. > > Fixes: d127e9c (ARM: tegra: make tegra_resume can work with current and later chips) > Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> # v3.13+ > Reviewed-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org> > Signed-off-by: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > --- > V2: added Cc's for lakml and stable, added "Reviewed-by:" Felipe Balbi > > arch/arm/mach-tegra/reset-handler.S | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/arm/mach-tegra/reset-handler.S b/arch/arm/mach-tegra/reset-handler.S > index 7b2baab..71be4af 100644 > --- a/arch/arm/mach-tegra/reset-handler.S > +++ b/arch/arm/mach-tegra/reset-handler.S > @@ -51,6 +51,7 @@ ENTRY(tegra_resume) > THUMB( it ne ) > bne cpu_resume @ no > > + tegra_get_soc_id TEGRA_APB_MISC_BASE, r6 > /* Are we on Tegra20? */ > cmp r6, #TEGRA20 > beq 1f @ Yes > Ugh, I just noticed that r6 is expected to be SoC id func argument. It was bug in my emulator that blinded me, so please drop that patch. But, seems tegra20_lp1_reset() doesn't set r6, at least for now I don't see where. I'll check it on real hw and send patch if needed. -- Dmitry ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-10-09 22:10 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-08 18:54 [PATCH] ARM: tegra: Re-add removed SoC id macro to tegra_resume() Dmitry Osipenko
[not found] ` <1412794450-9060-1-git-send-email-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-10-08 19:01 ` Felipe Balbi
2014-10-08 19:04 ` Felipe Balbi
2014-10-08 19:24 ` [PATCH V2] " Dmitry Osipenko
[not found] ` <1412796255-10589-1-git-send-email-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-10-09 22:10 ` Dmitry Osipenko
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).