Patchwork [U-Boot] sh: fix trigger_address_error()

login
register
mail settings
Submitter Yoshihiro Shimoda
Date Nov. 5, 2012, 1:53 a.m.
Message ID <50971C09.9050609@renesas.com>
Download mbox | patch
Permalink /patch/197119/
State Accepted, archived
Delegated to: Nobuhiro Iwamatsu
Headers show

Comments

Yoshihiro Shimoda - Nov. 5, 2012, 1:53 a.m.
The function should set BL bit, but it should not clear other flags.
So, the patch uses set_bl_bit() instead of a local asm code.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
 arch/sh/include/asm/system.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Nobuhiro Iwamatsu - Nov. 12, 2012, 5:51 a.m.
Applied, thanks.

Best regards,
  Nobuhiro

On Mon, Nov 5, 2012 at 10:53 AM, Shimoda, Yoshihiro
<yoshihiro.shimoda.uh@renesas.com> wrote:
> The function should set BL bit, but it should not clear other flags.
> So, the patch uses set_bl_bit() instead of a local asm code.
>
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> ---
>  arch/sh/include/asm/system.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/sh/include/asm/system.h b/arch/sh/include/asm/system.h
> index 56fd77a..24b5ce8 100644
> --- a/arch/sh/include/asm/system.h
> +++ b/arch/sh/include/asm/system.h
> @@ -274,8 +274,8 @@ void enable_hlt(void);
>
>  static inline void trigger_address_error(void)
>  {
> +       set_bl_bit();
>         __asm__ __volatile__ (
> -               "ldc %0, sr\n\t"
>                 "mov.l @%1, %0"
>                 :
>                 : "r" (0x10000000), "r" (0x80000001)
> --
> 1.7.1

Patch

diff --git a/arch/sh/include/asm/system.h b/arch/sh/include/asm/system.h
index 56fd77a..24b5ce8 100644
--- a/arch/sh/include/asm/system.h
+++ b/arch/sh/include/asm/system.h
@@ -274,8 +274,8 @@  void enable_hlt(void);

 static inline void trigger_address_error(void)
 {
+	set_bl_bit();
 	__asm__ __volatile__ (
-		"ldc %0, sr\n\t"
 		"mov.l @%1, %0"
 		:
 		: "r" (0x10000000), "r" (0x80000001)