[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.LFD.2.03.1306030922380.1200@syhkavp.arg>
Date: Mon, 3 Jun 2013 09:23:58 -0400 (EDT)
From: Nicolas Pitre <nicolas.pitre@...aro.org>
To: Arnd Bergmann <arnd@...db.de>
cc: linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
Dave Martin <dave.martin@...aro.org>
Subject: Re: [PATCH] drivers/bus: arm-cci: fix combined ARMv6+v7 build
On Mon, 3 Jun 2013, Arnd Bergmann wrote:
> When we build a kernel with support for both ARMv6 and ARMv7,
> gas is trying to be helpful by pointing out that the arm-cci
> driver would not work on ARMv6:
>
> /tmp/ccu1LDeU.s: Assembler messages:
> /tmp/ccu1LDeU.s:450: Error: selected processor does not support ARM mode `wfi '
> /tmp/ccu1LDeU.s:451: Error: selected processor does not support ARM mode `wfe '
> make[4]: *** [drivers/bus/arm-cci.o] Error 1
>
> We know that the driver will only be used on ARMv7, hence we
> can annotate the inline assembly listing to allow those instructions.
>
> Signed-off-by: Arnd Bergmann <arnd@...db.de>
> Cc: Nicolas Pitre <nico@...aro.org>
> Cc: Dave Martin <dave.martin@...aro.org>
Acked-by: Nicolas Pitre <nico@...aro.org>
Since this code is merged into ARM-SOC, I assume you'll take care of
this patch?
>
> diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
> index 380319e..7332889 100644
> --- a/drivers/bus/arm-cci.c
> +++ b/drivers/bus/arm-cci.c
> @@ -253,7 +253,7 @@ EXPORT_SYMBOL_GPL(cci_disable_port_by_cpu);
> asmlinkage void __naked cci_enable_port_for_self(void)
> {
> asm volatile ("\n"
> -
> +" .arch armv7-a\n"
> " mrc p15, 0, r0, c0, c0, 5 @ get MPIDR value \n"
> " and r0, r0, #"__stringify(MPIDR_HWID_BITMASK)" \n"
> " adr r1, 5f \n"
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists