[PATCH] ARM: bcm: fix __iomem annotation on kona_smc

[PATCH] ARM: bcm: fix __iomem annotation on kona_smc

[Olof Johansson]

Fixes the following sparse warning:
arch/arm/mach-bcm/bcm_kona_smc.c:145:21: warning: incorrect type in initializer (different address spaces)
arch/arm/mach-bcm/bcm_kona_smc.c:145:21:    expected unsigned int [usertype] *args
arch/arm/mach-bcm/bcm_kona_smc.c:145:21:    got void [noderef] <asn:2>*static [toplevel] [assigned] bcm_smc_buffer
arch/arm/mach-bcm/bcm_kona_smc.c:151:9: warning: incorrect type in argument 2 (different address spaces)
arch/arm/mach-bcm/bcm_kona_smc.c:151:9:    expected void volatile [noderef] <asn:2>*addr
arch/arm/mach-bcm/bcm_kona_smc.c:151:9:    got unsigned int [usertype] *
[+ 2 more instances]

Signed-off-by: Olof Johansson <olof@lixom.net>
---

Florian, should we just apply this directly on arm-soc?


-Olof

 arch/arm/mach-bcm/bcm_kona_smc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-bcm/bcm_kona_smc.c b/arch/arm/mach-bcm/bcm_kona_smc.c
index a55a7ec..d506d17 100644
--- a/arch/arm/mach-bcm/bcm_kona_smc.c
+++ b/arch/arm/mach-bcm/bcm_kona_smc.c
@@ -142,7 +142,7 @@ static int bcm_kona_do_smc(u32 service_id, u32 buffer_phys)
 static void __bcm_kona_smc(void *info)
 {
 	struct bcm_kona_smc_data *data = info;
-	u32 *args = bcm_smc_buffer;
+	u32 __iomem *args = bcm_smc_buffer;
 
 	BUG_ON(smp_processor_id() != 0);
 	BUG_ON(!args);
-- 
1.7.10.4

[PATCH] ARM: bcm: fix __iomem annotation on kona_smc

[Florian Fainelli]

On 08/12/14 13:45, Olof Johansson wrote:
> Fixes the following sparse warning:
> arch/arm/mach-bcm/bcm_kona_smc.c:145:21: warning: incorrect type in initializer (different address spaces)
> arch/arm/mach-bcm/bcm_kona_smc.c:145:21:    expected unsigned int [usertype] *args
> arch/arm/mach-bcm/bcm_kona_smc.c:145:21:    got void [noderef] <asn:2>*static [toplevel] [assigned] bcm_smc_buffer
> arch/arm/mach-bcm/bcm_kona_smc.c:151:9: warning: incorrect type in argument 2 (different address spaces)
> arch/arm/mach-bcm/bcm_kona_smc.c:151:9:    expected void volatile [noderef] <asn:2>*addr
> arch/arm/mach-bcm/bcm_kona_smc.c:151:9:    got unsigned int [usertype] *
> [+ 2 more instances]
> 
> Signed-off-by: Olof Johansson <olof@lixom.net>
> ---
> 
> Florian, should we just apply this directly on arm-soc?

Yes please.

> 
> 
> -Olof
> 
>  arch/arm/mach-bcm/bcm_kona_smc.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-bcm/bcm_kona_smc.c b/arch/arm/mach-bcm/bcm_kona_smc.c
> index a55a7ec..d506d17 100644
> --- a/arch/arm/mach-bcm/bcm_kona_smc.c
> +++ b/arch/arm/mach-bcm/bcm_kona_smc.c
> @@ -142,7 +142,7 @@ static int bcm_kona_do_smc(u32 service_id, u32 buffer_phys)
>  static void __bcm_kona_smc(void *info)
>  {
>  	struct bcm_kona_smc_data *data = info;
> -	u32 *args = bcm_smc_buffer;
> +	u32 __iomem *args = bcm_smc_buffer;

Your fix looks good to me, although the original code sounds a little
dubious, especially in LPAE environment.

>  
>  	BUG_ON(smp_processor_id() != 0);
>  	BUG_ON(!args);
> 

[PATCH] ARM: bcm: fix __iomem annotation on kona_smc

[Arnd Bergmann]

On Monday 08 December 2014 14:22:16 Florian Fainelli wrote:
> > diff --git a/arch/arm/mach-bcm/bcm_kona_smc.c b/arch/arm/mach-bcm/bcm_kona_smc.c
> > index a55a7ec..d506d17 100644
> > --- a/arch/arm/mach-bcm/bcm_kona_smc.c
> > +++ b/arch/arm/mach-bcm/bcm_kona_smc.c
> > @@ -142,7 +142,7 @@ static int bcm_kona_do_smc(u32 service_id, u32 buffer_phys)
> >  static void __bcm_kona_smc(void *info)
> >  {
> >       struct bcm_kona_smc_data *data = info;
> > -     u32 *args = bcm_smc_buffer;
> > +     u32 __iomem *args = bcm_smc_buffer;
> 
> Your fix looks good to me, although the original code sounds a little
> dubious, especially in LPAE environment.

Right, I think it could just use of_iomap() and drop the size
check. If you want to keep the check, using of_address_to_resource()
will do the right thing.

	Arnd