diff mbox series

soc: amlogic: fix compile failure with MESON_SECURE_PM_DOMAINS & !MESON_SM

Message ID 1581955933-69832-1-git-send-email-jianxin.pan@amlogic.com (mailing list archive)
State Mainlined
Commit 9ef7a7920678b10431d88635f9a4a49bd23ca3a7
Headers show
Series soc: amlogic: fix compile failure with MESON_SECURE_PM_DOMAINS & !MESON_SM | expand

Commit Message

Jianxin Pan Feb. 17, 2020, 4:12 p.m. UTC
When MESON_SECURE_PM_DOMAINS & !MESON_SM, there will be compile failure:
.../meson-secure-pwrc.o: In function `meson_secure_pwrc_on':
.../meson-secure-pwrc.c:76: undefined reference to `meson_sm_call'

Fix this by adding depends on MESON_SM for MESON_SECURE_PM_DOMAINS.

Fixes: b3dde5013e13 ("soc: amlogic: Add support for Secure power domains controller")

Reported-by: kbuild test robot <lkp@intel.com>
Reported-by: patchwork-bot+linux-amlogic<patchwork-bot+linux-amlogic@kernel.org>
Reported-by: Stephen Rothwell<sfr@canb.auug.org.au>
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
---
 drivers/soc/amlogic/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Stephen Rothwell Feb. 17, 2020, 9:07 p.m. UTC | #1
Hi Jianxin,

On Tue, 18 Feb 2020 00:12:13 +0800 Jianxin Pan <jianxin.pan@amlogic.com> wrote:
>
> When MESON_SECURE_PM_DOMAINS & !MESON_SM, there will be compile failure:
> .../meson-secure-pwrc.o: In function `meson_secure_pwrc_on':
> .../meson-secure-pwrc.c:76: undefined reference to `meson_sm_call'
> 
> Fix this by adding depends on MESON_SM for MESON_SECURE_PM_DOMAINS.
> 
> Fixes: b3dde5013e13 ("soc: amlogic: Add support for Secure power domains controller")
> 
> Reported-by: kbuild test robot <lkp@intel.com>
> Reported-by: patchwork-bot+linux-amlogic<patchwork-bot+linux-amlogic@kernel.org>
> Reported-by: Stephen Rothwell<sfr@canb.auug.org.au>
> Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
> ---
>  drivers/soc/amlogic/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

I will apply that patch to linux-next today.
Stephen Rothwell Feb. 17, 2020, 10:22 p.m. UTC | #2
Hi all,

On Tue, 18 Feb 2020 08:07:43 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 18 Feb 2020 00:12:13 +0800 Jianxin Pan <jianxin.pan@amlogic.com> wrote:
> >
> > When MESON_SECURE_PM_DOMAINS & !MESON_SM, there will be compile failure:
> > .../meson-secure-pwrc.o: In function `meson_secure_pwrc_on':
> > .../meson-secure-pwrc.c:76: undefined reference to `meson_sm_call'
> > 
> > Fix this by adding depends on MESON_SM for MESON_SECURE_PM_DOMAINS.
> > 
> > Fixes: b3dde5013e13 ("soc: amlogic: Add support for Secure power domains controller")
> > 
> > Reported-by: kbuild test robot <lkp@intel.com>
> > Reported-by: patchwork-bot+linux-amlogic<patchwork-bot+linux-amlogic@kernel.org>
> > Reported-by: Stephen Rothwell<sfr@canb.auug.org.au>
> > Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
> > ---
> >  drivers/soc/amlogic/Kconfig | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)  
> 
> I will apply that patch to linux-next today.

This fixes the build for me.

Tested-by: Stephen Rothwell<sfr@canb.auug.org.au>

Also, please keep the commit message tags together at the end of the
commit message i.e. remove the blank line after the Fixes: tag above.
(see "git interpret-trailers ")
Stephen Rothwell Feb. 23, 2020, 11:16 p.m. UTC | #3
Hi all,

On Tue, 18 Feb 2020 09:22:29 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 18 Feb 2020 08:07:43 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Tue, 18 Feb 2020 00:12:13 +0800 Jianxin Pan <jianxin.pan@amlogic.com> wrote:  
> > >
> > > When MESON_SECURE_PM_DOMAINS & !MESON_SM, there will be compile failure:
> > > .../meson-secure-pwrc.o: In function `meson_secure_pwrc_on':
> > > .../meson-secure-pwrc.c:76: undefined reference to `meson_sm_call'
> > > 
> > > Fix this by adding depends on MESON_SM for MESON_SECURE_PM_DOMAINS.
> > > 
> > > Fixes: b3dde5013e13 ("soc: amlogic: Add support for Secure power domains controller")
> > > 
> > > Reported-by: kbuild test robot <lkp@intel.com>
> > > Reported-by: patchwork-bot+linux-amlogic<patchwork-bot+linux-amlogic@kernel.org>
> > > Reported-by: Stephen Rothwell<sfr@canb.auug.org.au>
> > > Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
> > > ---
> > >  drivers/soc/amlogic/Kconfig | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)    
> > 
> > I will apply that patch to linux-next today.  
> 
> This fixes the build for me.
> 
> Tested-by: Stephen Rothwell<sfr@canb.auug.org.au>
> 
> Also, please keep the commit message tags together at the end of the
> commit message i.e. remove the blank line after the Fixes: tag above.
> (see "git interpret-trailers ")

I am still applying this patch ...
Kevin Hilman Feb. 29, 2020, 4:55 p.m. UTC | #4
Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> On Tue, 18 Feb 2020 09:22:29 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> On Tue, 18 Feb 2020 08:07:43 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> >
>> > On Tue, 18 Feb 2020 00:12:13 +0800 Jianxin Pan <jianxin.pan@amlogic.com> wrote:  
>> > >
>> > > When MESON_SECURE_PM_DOMAINS & !MESON_SM, there will be compile failure:
>> > > .../meson-secure-pwrc.o: In function `meson_secure_pwrc_on':
>> > > .../meson-secure-pwrc.c:76: undefined reference to `meson_sm_call'
>> > > 
>> > > Fix this by adding depends on MESON_SM for MESON_SECURE_PM_DOMAINS.
>> > > 
>> > > Fixes: b3dde5013e13 ("soc: amlogic: Add support for Secure power domains controller")
>> > > 
>> > > Reported-by: kbuild test robot <lkp@intel.com>
>> > > Reported-by: patchwork-bot+linux-amlogic<patchwork-bot+linux-amlogic@kernel.org>
>> > > Reported-by: Stephen Rothwell<sfr@canb.auug.org.au>
>> > > Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
>> > > ---
>> > >  drivers/soc/amlogic/Kconfig | 2 +-
>> > >  1 file changed, 1 insertion(+), 1 deletion(-)    
>> > 
>> > I will apply that patch to linux-next today.  
>> 
>> This fixes the build for me.
>> 
>> Tested-by: Stephen Rothwell<sfr@canb.auug.org.au>
>> 
>> Also, please keep the commit message tags together at the end of the
>> commit message i.e. remove the blank line after the Fixes: tag above.
>> (see "git interpret-trailers ")
>
> I am still applying this patch ...

I've fixed up the trailer whitespace an queued this up now, so should
show up in linux next shortly.

Kevin
Stephen Rothwell March 1, 2020, 12:47 a.m. UTC | #5
Hi Kevin,

On Sat, 29 Feb 2020 17:55:32 +0100 Kevin Hilman <khilman@baylibre.com> wrote:
>
> I've fixed up the trailer whitespace an queued this up now, so should
> show up in linux next shortly.

Thanks.
diff mbox series

Patch

diff --git a/drivers/soc/amlogic/Kconfig b/drivers/soc/amlogic/Kconfig
index 6cb06e7..321c5e2 100644
--- a/drivers/soc/amlogic/Kconfig
+++ b/drivers/soc/amlogic/Kconfig
@@ -50,7 +50,7 @@  config MESON_EE_PM_DOMAINS
 
 config MESON_SECURE_PM_DOMAINS
 	bool "Amlogic Meson Secure Power Domains driver"
-	depends on ARCH_MESON || COMPILE_TEST
+	depends on (ARCH_MESON || COMPILE_TEST) && MESON_SM
 	depends on PM && OF
 	depends on HAVE_ARM_SMCCC
 	default ARCH_MESON