2016-03-15 13:08:03

by Christophe Leroy

[permalink] [raw]
Subject: [PATCH v2] powerpc/8xx: Fix do_mtspr_cpu6 build on older compilers

Some versions of GCC, reportedly before 4.8, fail with
arch/powerpc/mm/8xx_mmu.c:139:2: error: memory input 1 is not directly
addressable

Change the one-element array into a simple variable to avoid this.

Signed-off-by: Christophe Leroy <[email protected]>
Cc: Scott Wood <[email protected]>
---
Verified with GCC 4.4.4 and GCC 4.8.3

v2: compilation result is compliant with CPU6 ERRATA
(using stw/lwz and not stwx/lwzx)

arch/powerpc/include/asm/reg_8xx.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/include/asm/reg_8xx.h b/arch/powerpc/include/asm/reg_8xx.h
index d41412c..94d01f8 100644
--- a/arch/powerpc/include/asm/reg_8xx.h
+++ b/arch/powerpc/include/asm/reg_8xx.h
@@ -53,7 +53,7 @@
#ifdef CONFIG_8xx_CPU6
#define do_mtspr_cpu6(rn, rn_addr, v) \
do { \
- int _reg_cpu6 = rn_addr, _tmp_cpu6[1]; \
+ int _reg_cpu6 = rn_addr, _tmp_cpu6; \
asm volatile("stw %0, %1;" \
"lwz %0, %1;" \
"mtspr " __stringify(rn) ",%2" : \
--
2.1.0


2016-03-15 17:41:35

by Crystal Wood

[permalink] [raw]
Subject: Re: [PATCH v2] powerpc/8xx: Fix do_mtspr_cpu6 build on older compilers

On Tue, 2016-03-15 at 14:07 +0100, Christophe Leroy wrote:
> Some versions of GCC, reportedly before 4.8, fail with
> arch/powerpc/mm/8xx_mmu.c:139:2: error: memory input 1 is not directly
> addressable

"before 4.8" means "< 4.8", not "<= 4.8" -- did you mean "before 4.9"?

> Change the one-element array into a simple variable to avoid this.
>
> Signed-off-by: Christophe Leroy <[email protected]>
> Cc: Scott Wood <[email protected]>
> ---
> Verified with GCC 4.4.4 and GCC 4.8.3
>
> v2: compilation result is compliant with CPU6 ERRATA
> (using stw/lwz and not stwx/lwzx)
>
> arch/powerpc/include/asm/reg_8xx.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/include/asm/reg_8xx.h
> b/arch/powerpc/include/asm/reg_8xx.h
> index d41412c..94d01f8 100644
> --- a/arch/powerpc/include/asm/reg_8xx.h
> +++ b/arch/powerpc/include/asm/reg_8xx.h
> @@ -53,7 +53,7 @@
> #ifdef CONFIG_8xx_CPU6
> #define do_mtspr_cpu6(rn, rn_addr, v) \
> do {
> \
> - int _reg_cpu6 = rn_addr, _tmp_cpu6[1]; \
> + int _reg_cpu6 = rn_addr, _tmp_cpu6; \
> asm volatile("stw %0, %1;" \
> "lwz %0, %1;" \
> "mtspr " __stringify(rn) ",%2" :
> \

I thought I tried this with 4.7.2 without success, but now it seems to be
working...

-Scott

2016-03-15 18:12:35

by Christophe Leroy

[permalink] [raw]
Subject: Re: [PATCH v2] powerpc/8xx: Fix do_mtspr_cpu6 build on older compilers



Le 15/03/2016 18:41, Scott Wood a écrit :
> On Tue, 2016-03-15 at 14:07 +0100, Christophe Leroy wrote:
>> Some versions of GCC, reportedly before 4.8, fail with
>> arch/powerpc/mm/8xx_mmu.c:139:2: error: memory input 1 is not directly
>> addressable
> "before 4.8" means "< 4.8", not "<= 4.8" -- did you mean "before 4.9"?
I mean it doesn't fail with 4.8.3

Christophe
>
>> Change the one-element array into a simple variable to avoid this.
>>
>> Signed-off-by: Christophe Leroy <[email protected]>
>> Cc: Scott Wood <[email protected]>
>> ---
>> Verified with GCC 4.4.4 and GCC 4.8.3
>>
>> v2: compilation result is compliant with CPU6 ERRATA
>> (using stw/lwz and not stwx/lwzx)
>>
>> arch/powerpc/include/asm/reg_8xx.h | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/powerpc/include/asm/reg_8xx.h
>> b/arch/powerpc/include/asm/reg_8xx.h
>> index d41412c..94d01f8 100644
>> --- a/arch/powerpc/include/asm/reg_8xx.h
>> +++ b/arch/powerpc/include/asm/reg_8xx.h
>> @@ -53,7 +53,7 @@
>> #ifdef CONFIG_8xx_CPU6
>> #define do_mtspr_cpu6(rn, rn_addr, v) \
>> do {
>> \
>> - int _reg_cpu6 = rn_addr, _tmp_cpu6[1]; \
>> + int _reg_cpu6 = rn_addr, _tmp_cpu6; \
>> asm volatile("stw %0, %1;" \
>> "lwz %0, %1;" \
>> "mtspr " __stringify(rn) ",%2" :
>> \
> I thought I tried this with 4.7.2 without success, but now it seems to be
> working...
>
> -Scott
>


---
L'absence de virus dans ce courrier électronique a été vérifiée par le logiciel antivirus Avast.
https://www.avast.com/antivirus

2016-03-16 10:24:31

by Michael Ellerman

[permalink] [raw]
Subject: Re: [v2] powerpc/8xx: Fix do_mtspr_cpu6 build on older compilers

On Tue, 2016-15-03 at 13:07:49 UTC, Christophe Leroy wrote:
> Some versions of GCC, reportedly before 4.8, fail with
> arch/powerpc/mm/8xx_mmu.c:139:2: error: memory input 1 is not directly
> addressable
>
> Change the one-element array into a simple variable to avoid this.
>
> Signed-off-by: Christophe Leroy <[email protected]>
> Cc: Scott Wood <[email protected]>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/2e098dcee6208a690f73e11feb

cheers