diff mbox

ARM: proc-feroceon: Fix feroceon_proc_info macro

Message ID 1430319415-6421-1-git-send-email-andrew@lunn.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Andrew Lunn April 29, 2015, 2:56 p.m. UTC
bf35706f3d09 ("ARM: 8314/1: replace PROCINFO embedded branch with
relative offset") broke booting for Kirkwood. The kernel would say:

Starting kernel ...

Uncompressing Linux... done, booting the kernel.

Error: unrecognized/unsupported processor variant (0x56251311).

Fix it by removing the extraneous .long __feroceon_setup from the
feroceon_proc_info macro.

Reported-by: Florian Fainelli <f.fainelli@gmail.com>
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Fixes: bf35706f3d09 ("ARM: 8314/1: replace PROCINFO embedded branch with relative offset")
---
 arch/arm/mm/proc-feroceon.S | 1 -
 1 file changed, 1 deletion(-)

Comments

Ard Biesheuvel April 29, 2015, 3:05 p.m. UTC | #1
On 29 April 2015 at 16:56, Andrew Lunn <andrew@lunn.ch> wrote:
> bf35706f3d09 ("ARM: 8314/1: replace PROCINFO embedded branch with
> relative offset") broke booting for Kirkwood. The kernel would say:
>
> Starting kernel ...
>
> Uncompressing Linux... done, booting the kernel.
>
> Error: unrecognized/unsupported processor variant (0x56251311).
>
> Fix it by removing the extraneous .long __feroceon_setup from the
> feroceon_proc_info macro.
>
> Reported-by: Florian Fainelli <f.fainelli@gmail.com>
> Suggested-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Fixes: bf35706f3d09 ("ARM: 8314/1: replace PROCINFO embedded branch with relative offset")

Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


> ---
>  arch/arm/mm/proc-feroceon.S | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S
> index e494d6d6acbe..92e08bf37aad 100644
> --- a/arch/arm/mm/proc-feroceon.S
> +++ b/arch/arm/mm/proc-feroceon.S
> @@ -602,7 +602,6 @@ __\name\()_proc_info:
>                 PMD_SECT_AP_WRITE | \
>                 PMD_SECT_AP_READ
>         initfn  __feroceon_setup, __\name\()_proc_info
> -       .long __feroceon_setup
>         .long   cpu_arch_name
>         .long   cpu_elf_name
>         .long   HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
> --
> 2.1.4
>
Florian Fainelli April 29, 2015, 4:33 p.m. UTC | #2
On 29/04/15 07:56, Andrew Lunn wrote:
> bf35706f3d09 ("ARM: 8314/1: replace PROCINFO embedded branch with
> relative offset") broke booting for Kirkwood. The kernel would say:
> 
> Starting kernel ...
> 
> Uncompressing Linux... done, booting the kernel.
> 
> Error: unrecognized/unsupported processor variant (0x56251311).
> 
> Fix it by removing the extraneous .long __feroceon_setup from the
> feroceon_proc_info macro.
> 
> Reported-by: Florian Fainelli <f.fainelli@gmail.com>
> Suggested-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Tested-by: Florian Fainelli <f.fainelli@gmail.com>

Thanks everyone!

> Fixes: bf35706f3d09 ("ARM: 8314/1: replace PROCINFO embedded branch with relative offset")
> ---
>  arch/arm/mm/proc-feroceon.S | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S
> index e494d6d6acbe..92e08bf37aad 100644
> --- a/arch/arm/mm/proc-feroceon.S
> +++ b/arch/arm/mm/proc-feroceon.S
> @@ -602,7 +602,6 @@ __\name\()_proc_info:
>  		PMD_SECT_AP_WRITE | \
>  		PMD_SECT_AP_READ
>  	initfn	__feroceon_setup, __\name\()_proc_info
> -	.long __feroceon_setup
>  	.long	cpu_arch_name
>  	.long	cpu_elf_name
>  	.long	HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
>
Aaro Koskinen May 2, 2015, 7:35 p.m. UTC | #3
Hi,

On Wed, Apr 29, 2015 at 04:56:55PM +0200, Andrew Lunn wrote:
> bf35706f3d09 ("ARM: 8314/1: replace PROCINFO embedded branch with
> relative offset") broke booting for Kirkwood. The kernel would say:
> 
> Starting kernel ...
> 
> Uncompressing Linux... done, booting the kernel.
> 
> Error: unrecognized/unsupported processor variant (0x56251311).
> 
> Fix it by removing the extraneous .long __feroceon_setup from the
> feroceon_proc_info macro.
> 
> Reported-by: Florian Fainelli <f.fainelli@gmail.com>
> Suggested-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Fixes: bf35706f3d09 ("ARM: 8314/1: replace PROCINFO embedded branch with relative offset")

Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>

A.
diff mbox

Patch

diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S
index e494d6d6acbe..92e08bf37aad 100644
--- a/arch/arm/mm/proc-feroceon.S
+++ b/arch/arm/mm/proc-feroceon.S
@@ -602,7 +602,6 @@  __\name\()_proc_info:
 		PMD_SECT_AP_WRITE | \
 		PMD_SECT_AP_READ
 	initfn	__feroceon_setup, __\name\()_proc_info
-	.long __feroceon_setup
 	.long	cpu_arch_name
 	.long	cpu_elf_name
 	.long	HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP