All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ARM: omap2: hide omap3_save_secure_ram on non-OMAP3 builds
Date: Wed, 6 Dec 2017 07:57:14 -0800	[thread overview]
Message-ID: <20171206155714.GY28152@atomide.com> (raw)
In-Reply-To: <20171206141517.670032-1-arnd@arndb.de>

* Arnd Bergmann <arnd@arndb.de> [171206 14:18]:
> In configurations without CONFIG_OMAP3 but with secure RAM support,
> we now run into a link failure:
> 
> arch/arm/mach-omap2/omap-secure.o: In function `omap3_save_secure_ram':
> omap-secure.c:(.text+0x130): undefined reference to `save_secure_ram_context'
> 
> The omap3_save_secure_ram() function is only called from the OMAP34xx
> power management code, so we can simply hide that function in the
> appropriate #ifdef.
> 
> Fixes: d09220a887f7 ("ARM: OMAP2+: Fix SRAM virt to phys translation for save_secure_ram_context")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Thanks for fixing it, want to apply directly to ARM SoC fixes
where d09220a887f7 is now? If so:

Acked-by: Tony Lindgren <tony@atomide.com>

Regards,

Tony


> ---
>  arch/arm/mach-omap2/omap-secure.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/mach-omap2/omap-secure.c b/arch/arm/mach-omap2/omap-secure.c
> index f9303dc631e4..7be95cd8136d 100644
> --- a/arch/arm/mach-omap2/omap-secure.c
> +++ b/arch/arm/mach-omap2/omap-secure.c
> @@ -72,6 +72,7 @@ phys_addr_t omap_secure_ram_mempool_base(void)
>  	return omap_secure_memblock_base;
>  }
>  
> +#ifdef CONFIG_ARCH_OMAP3
>  u32 omap3_save_secure_ram(void __iomem *addr, int size)
>  {
>  	u32 ret;
> @@ -90,6 +91,7 @@ u32 omap3_save_secure_ram(void __iomem *addr, int size)
>  
>  	return ret;
>  }
> +#endif
>  
>  /**
>   * rx51_secure_dispatcher: Routine to dispatch secure PPA API calls
> -- 
> 2.9.0
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: omap2: hide omap3_save_secure_ram on non-OMAP3 builds
Date: Wed, 6 Dec 2017 07:57:14 -0800	[thread overview]
Message-ID: <20171206155714.GY28152@atomide.com> (raw)
In-Reply-To: <20171206141517.670032-1-arnd@arndb.de>

* Arnd Bergmann <arnd@arndb.de> [171206 14:18]:
> In configurations without CONFIG_OMAP3 but with secure RAM support,
> we now run into a link failure:
> 
> arch/arm/mach-omap2/omap-secure.o: In function `omap3_save_secure_ram':
> omap-secure.c:(.text+0x130): undefined reference to `save_secure_ram_context'
> 
> The omap3_save_secure_ram() function is only called from the OMAP34xx
> power management code, so we can simply hide that function in the
> appropriate #ifdef.
> 
> Fixes: d09220a887f7 ("ARM: OMAP2+: Fix SRAM virt to phys translation for save_secure_ram_context")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Thanks for fixing it, want to apply directly to ARM SoC fixes
where d09220a887f7 is now? If so:

Acked-by: Tony Lindgren <tony@atomide.com>

Regards,

Tony


> ---
>  arch/arm/mach-omap2/omap-secure.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/mach-omap2/omap-secure.c b/arch/arm/mach-omap2/omap-secure.c
> index f9303dc631e4..7be95cd8136d 100644
> --- a/arch/arm/mach-omap2/omap-secure.c
> +++ b/arch/arm/mach-omap2/omap-secure.c
> @@ -72,6 +72,7 @@ phys_addr_t omap_secure_ram_mempool_base(void)
>  	return omap_secure_memblock_base;
>  }
>  
> +#ifdef CONFIG_ARCH_OMAP3
>  u32 omap3_save_secure_ram(void __iomem *addr, int size)
>  {
>  	u32 ret;
> @@ -90,6 +91,7 @@ u32 omap3_save_secure_ram(void __iomem *addr, int size)
>  
>  	return ret;
>  }
> +#endif
>  
>  /**
>   * rx51_secure_dispatcher: Routine to dispatch secure PPA API calls
> -- 
> 2.9.0
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply	other threads:[~2017-12-06 15:57 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-06 14:15 [PATCH] ARM: omap2: hide omap3_save_secure_ram on non-OMAP3 builds Arnd Bergmann
2017-12-06 14:15 ` Arnd Bergmann
2017-12-06 14:15 ` Arnd Bergmann
2017-12-06 15:57 ` Tony Lindgren [this message]
2017-12-06 15:57   ` Tony Lindgren
2017-12-06 16:29   ` Dan Murphy
2017-12-06 16:29     ` Dan Murphy
2017-12-06 16:29     ` Dan Murphy
2017-12-06 21:49     ` Arnd Bergmann
2017-12-06 21:49       ` Arnd Bergmann
2017-12-06 22:04       ` Tony Lindgren
2017-12-06 22:04         ` Tony Lindgren

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=20171206155714.GY28152@atomide.com \
    --to=tony@atomide.com \
    --cc=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    /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.