public inbox for linux-arm-kernel@lists.infradead.org 
 help / color / mirror / Atom feed
From: Nathan_Lynch@mentor•com (Nathan Lynch)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] ARM: imx: replace imx6q_restart() with mxc_restart()
Date: Tue, 8 Oct 2013 10:32:53 -0500	[thread overview]
Message-ID: <525425A5.2020500@mentor.com> (raw)
In-Reply-To: <1381050370-3301-1-git-send-email-shawn.guo@linaro.org>

On 10/06/2013 04:06 AM, Shawn Guo wrote:
> The imx6q_restart() works fine with normal reboot but will run into
> problem with emergency reboot like sysrq-b.  In that case, of_iomap()
> gets called from interrupt context and hence triggers the BUG_ON in
> __get_vm_area_node().
> 
> Actually, since commit c1e31d1 (ARM: imx: create
> mxc_arch_reset_init_dt() for DT boot), imx6q/dl should try to use
> mxc_restart() by calling mxc_arch_reset_init_dt() beforehand, where
> things like of_iomap() can be done.
> 
> The patch updates mxc_restart() a little bit to get it work for imx6q/dl
> and kill imx6q_restart() completely.
> 
> Reported-by: Nathan Lynch <nathan_lynch@mentor•com>
> Signed-off-by: Shawn Guo <shawn.guo@linaro•org>

Thanks Shawn, works for me.  One minor comment on the patch below.


> diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h
> index 7230cf8..9ebca9e 100644
> --- a/arch/arm/mach-imx/common.h
> +++ b/arch/arm/mach-imx/common.h
> @@ -130,7 +130,11 @@ static inline void imx_smp_prepare(void) {}
>  static inline void imx_scu_standby_enable(void) {}
>  #endif
>  extern void imx_src_init(void);
> +#ifdef CONFIG_HAVE_IMX_SRC
>  extern void imx_src_prepare_restart(void);
> +#else
> +extern inline void imx_src_prepare_restart(void) {}

Should be static inline?

  reply	other threads:[~2013-10-08 15:32 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-06  9:06 [PATCH] ARM: imx: replace imx6q_restart() with mxc_restart() Shawn Guo
2013-10-08 15:32 ` Nathan Lynch [this message]
2013-10-08 15:49   ` Shawn Guo
     [not found] ` <857E9EDCA6C0904DB3357321AA9123EB62506837@NA-MBX-01.mgc.mentorg.com>
2013-10-21  3:32   ` jiada
2013-10-21  4:59     ` Shawn Guo
     [not found]       ` <857E9EDCA6C0904DB3357321AA9123EB62506BEA@NA-MBX-01.mgc.mentorg.com>
2013-10-21  6:13         ` jiada
2013-10-21  7:04           ` Shawn Guo
2013-10-28  2:41             ` jiada
2013-10-28  2:52               ` Shawn Guo
2013-10-28  7:45               ` Shawn Guo
2013-10-30  3:13                 ` jiada
2013-10-30 17:54                   ` Russell King - ARM Linux
2013-10-31  5:23                     ` Shawn Guo
2013-10-31  5:31                     ` jiada
2013-10-28  5:17 ` Olof Johansson
2013-10-28  8:14   ` Shawn Guo
2013-10-28 17:46     ` Olof Johansson
2013-10-29  2:06       ` Shawn Guo
2013-10-29  8:53         ` Lothar Waßmann
2013-10-29 11:37           ` Russell King - ARM Linux
2013-10-29 13:37             ` Shawn Guo

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=525425A5.2020500@mentor.com \
    --to=nathan_lynch@mentor$(echo .)com \
    --cc=linux-arm-kernel@lists$(echo .)infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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