[PATCH v2] OMAP: fix fncpy API call

[PATCH v2] OMAP: fix fncpy API call

[jean.pihet]

From: Jean Pihet <j-pihet@ti.com>

Fix a potential problem with function types when calling the
fncpy API to copy the PM code functions to SRAM.

Signed-off-by: Jean Pihet <j-pihet@ti.com>
---
 arch/arm/plat-omap/include/plat/sram.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/sram.h b/arch/arm/plat-omap/include/plat/sram.h
index d673f2c..f500fc3 100644
--- a/arch/arm/plat-omap/include/plat/sram.h
+++ b/arch/arm/plat-omap/include/plat/sram.h
@@ -18,10 +18,10 @@ extern void *omap_sram_push_address(unsigned long size);
 
 /* Macro to push a function to the internal SRAM, using the fncpy API */
 #define omap_sram_push(funcp, size) ({				\
-	typeof(&funcp) _res = NULL;				\
+	typeof(&(funcp)) _res = NULL;				\
 	void *_sram_address = omap_sram_push_address(size);	\
 	if (_sram_address)					\
-		_res = fncpy(_sram_address, &funcp, size);	\
+		_res = fncpy(_sram_address, &(funcp), size);	\
 	_res;							\
 })
 
-- 
1.7.1

Re: [PATCH v2] OMAP: fix fncpy API call

[Jean Pihet]

On Tue, Jan 25, 2011 at 6:48 PM,  <jean.pihet@newoldbits.com> wrote:
> From: Jean Pihet <j-pihet@ti.com>
>
> Fix a potential problem with function types when calling the
> fncpy API to copy the PM code functions to SRAM.
>
> Signed-off-by: Jean Pihet <j-pihet@ti.com>
> ---
>  arch/arm/plat-omap/include/plat/sram.h |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/plat-omap/include/plat/sram.h b/arch/arm/plat-omap/include/plat/sram.h
> index d673f2c..f500fc3 100644
> --- a/arch/arm/plat-omap/include/plat/sram.h
> +++ b/arch/arm/plat-omap/include/plat/sram.h
> @@ -18,10 +18,10 @@ extern void *omap_sram_push_address(unsigned long size);
>
>  /* Macro to push a function to the internal SRAM, using the fncpy API */
>  #define omap_sram_push(funcp, size) ({                         \
> -       typeof(&funcp) _res = NULL;                             \
> +       typeof(&(funcp)) _res = NULL;                           \
>        void *_sram_address = omap_sram_push_address(size);     \
>        if (_sram_address)                                      \
> -               _res = fncpy(_sram_address, &funcp, size);      \
> +               _res = fncpy(_sram_address, &(funcp), size);    \
>        _res;                                                   \
>  })
>

Dave, Tony,
Are you OK with this version?

If so can it added to the tree? It is a follow-up of commit
021222e9988acbf3bb6fabffc667bab0bb207c54
'omap: use fncpy to copy the PM code functions to SRAM'.

Thanks,
Jean

> --
> 1.7.1
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2] OMAP: fix fncpy API call

[Dave Martin]

On Tue, Jan 25, 2011 at 5:48 PM,  <jean.pihet@newoldbits.com> wrote:
> From: Jean Pihet <j-pihet@ti.com>
>
> Fix a potential problem with function types when calling the
> fncpy API to copy the PM code functions to SRAM.
>
> Signed-off-by: Jean Pihet <j-pihet@ti.com>
> ---
>  arch/arm/plat-omap/include/plat/sram.h |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/plat-omap/include/plat/sram.h b/arch/arm/plat-omap/include/plat/sram.h
> index d673f2c..f500fc3 100644
> --- a/arch/arm/plat-omap/include/plat/sram.h
> +++ b/arch/arm/plat-omap/include/plat/sram.h
> @@ -18,10 +18,10 @@ extern void *omap_sram_push_address(unsigned long size);
>
>  /* Macro to push a function to the internal SRAM, using the fncpy API */
>  #define omap_sram_push(funcp, size) ({                         \
> -       typeof(&funcp) _res = NULL;                             \
> +       typeof(&(funcp)) _res = NULL;                           \
>        void *_sram_address = omap_sram_push_address(size);     \
>        if (_sram_address)                                      \
> -               _res = fncpy(_sram_address, &funcp, size);      \
> +               _res = fncpy(_sram_address, &(funcp), size);    \
>        _res;                                                   \
>  })

I believe this is sound, though I'm not yet in a position to test it fully.

When I have the OMAP kernel building with Thumb-2 again I will follow up.

Cheers
---Dave


Reviewed-by: Dave Martin <dave.martin@linaro.org>

>
> --
> 1.7.1
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2] OMAP: fix fncpy API call

[Tony Lindgren]

* Dave Martin <dave.martin@linaro.org> [110201 08:34]:
> On Tue, Jan 25, 2011 at 5:48 PM,  <jean.pihet@newoldbits.com> wrote:
> > From: Jean Pihet <j-pihet@ti.com>
> >
> > Fix a potential problem with function types when calling the
> > fncpy API to copy the PM code functions to SRAM.
> >
> > Signed-off-by: Jean Pihet <j-pihet@ti.com>
> > ---
> >  arch/arm/plat-omap/include/plat/sram.h |    4 ++--
> >  1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/plat-omap/include/plat/sram.h b/arch/arm/plat-omap/include/plat/sram.h
> > index d673f2c..f500fc3 100644
> > --- a/arch/arm/plat-omap/include/plat/sram.h
> > +++ b/arch/arm/plat-omap/include/plat/sram.h
> > @@ -18,10 +18,10 @@ extern void *omap_sram_push_address(unsigned long size);
> >
> >  /* Macro to push a function to the internal SRAM, using the fncpy API */
> >  #define omap_sram_push(funcp, size) ({                         \
> > -       typeof(&funcp) _res = NULL;                             \
> > +       typeof(&(funcp)) _res = NULL;                           \
> >        void *_sram_address = omap_sram_push_address(size);     \
> >        if (_sram_address)                                      \
> > -               _res = fncpy(_sram_address, &funcp, size);      \
> > +               _res = fncpy(_sram_address, &(funcp), size);    \
> >        _res;                                                   \
> >  })
> 
> I believe this is sound, though I'm not yet in a position to test it fully.
> 
> When I have the OMAP kernel building with Thumb-2 again I will follow up.
> 
> Cheers
> ---Dave
> 
> 
> Reviewed-by: Dave Martin <dave.martin@linaro.org>

Looks good to me too:

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

I'll add this to omap-testing branch, but as Russell has this queued,
you'll have to send this to him on linux-arm-kernel list.

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2] OMAP: fix fncpy API call

[Jean Pihet]

On Wed, Feb 2, 2011 at 1:01 AM, Tony Lindgren <tony@atomide.com> wrote:
> * Dave Martin <dave.martin@linaro.org> [110201 08:34]:
>> On Tue, Jan 25, 2011 at 5:48 PM,  <jean.pihet@newoldbits.com> wrote:
>> > From: Jean Pihet <j-pihet@ti.com>
>> >
>> > Fix a potential problem with function types when calling the
>> > fncpy API to copy the PM code functions to SRAM.
>> >
>> > Signed-off-by: Jean Pihet <j-pihet@ti.com>
>> > ---
>> >  arch/arm/plat-omap/include/plat/sram.h |    4 ++--
>> >  1 files changed, 2 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/arch/arm/plat-omap/include/plat/sram.h b/arch/arm/plat-omap/include/plat/sram.h
>> > index d673f2c..f500fc3 100644
>> > --- a/arch/arm/plat-omap/include/plat/sram.h
>> > +++ b/arch/arm/plat-omap/include/plat/sram.h
>> > @@ -18,10 +18,10 @@ extern void *omap_sram_push_address(unsigned long size);
>> >
>> >  /* Macro to push a function to the internal SRAM, using the fncpy API */
>> >  #define omap_sram_push(funcp, size) ({                         \
>> > -       typeof(&funcp) _res = NULL;                             \
>> > +       typeof(&(funcp)) _res = NULL;                           \
>> >        void *_sram_address = omap_sram_push_address(size);     \
>> >        if (_sram_address)                                      \
>> > -               _res = fncpy(_sram_address, &funcp, size);      \
>> > +               _res = fncpy(_sram_address, &(funcp), size);    \
>> >        _res;                                                   \
>> >  })
>>
>> I believe this is sound, though I'm not yet in a position to test it fully.
>>
>> When I have the OMAP kernel building with Thumb-2 again I will follow up.
>>
>> Cheers
>> ---Dave
>>
>>
>> Reviewed-by: Dave Martin <dave.martin@linaro.org>
>
> Looks good to me too:
>
> Acked-by: Tony Lindgren <tony@atomide.com>
Ok thanks!

>
> I'll add this to omap-testing branch, but as Russell has this queued,
> you'll have to send this to him on linux-arm-kernel list.
I have folded the 2 original patches code and acks into '[PATCH] omap:
use fncpy to copy the PM code functions to SRAM' and re-sent to l-a-k
and l-o MLs.

Also submitted to Russell's patch system.

>
> Regards,
>
> Tony
>

Regards,
Jean
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html