From mboxrd@z Thu Jan 1 00:00:00 1970 From: will.deacon@arm.com (Will Deacon) Date: Mon, 19 Feb 2018 11:19:07 +0000 Subject: [PATCH] arm64: Fix compilation error while accessing MPIDR_HWID_BITMASK from .S files In-Reply-To: References: <1519022394-11326-1-git-send-email-bhsharma@redhat.com> <36bd758c-dd49-edef-cc1a-20f5b43f5011@huawei.com> <20180219110238.GA30394@arm.com> Message-ID: <20180219111907.GB30394@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Feb 19, 2018 at 11:12:32AM +0000, John Garry wrote: > On 19/02/2018 11:02, Will Deacon wrote: > >Hi John, > > > >On Mon, Feb 19, 2018 at 10:19:35AM +0000, John Garry wrote: > >>On 19/02/2018 06:39, Bhupesh Sharma wrote: > >>>Since commit e1a50de37860b3a93a9d643b09638db5aff47650 (arm64: cputype: > >>>Silence Sparse warnings), compilation of arm64 architecture is broken > >>>with the following error messages: > >>> > >>> AR arch/arm64/kernel/built-in.o > >>> arch/arm64/kernel/head.S: Assembler messages: > >>> arch/arm64/kernel/head.S:677: Error: found 'L', expected: ')' > >>> arch/arm64/kernel/head.S:677: Error: found 'L', expected: ')' > >>> arch/arm64/kernel/head.S:677: Error: found 'L', expected: ')' > >>> arch/arm64/kernel/head.S:677: Error: junk at end of line, first > >>> unrecognized character is `L' > >>> arch/arm64/kernel/head.S:677: Error: unexpected characters following > >>> instruction at operand 2 -- `movz x1,:abs_g1_s:0xff00ffffffUL' > >>> arch/arm64/kernel/head.S:677: Error: unexpected characters following > >>> instruction at operand 2 -- `movk x1,:abs_g0_nc:0xff00ffffffUL' > >>> > >>>This patch fixes the same by using the UL() macro correctly for > >>>assigning the MPIDR_HWID_BITMASK macro value. > >>> > >>>Signed-off-by: Bhupesh Sharma > >>>--- > >>>arch/arm64/include/asm/cputype.h | 2 +- > >>>1 file changed, 1 insertion(+), 1 deletion(-) > >>> > >>>diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h > >>>index eda8c5f629fc..350c76a1d15b 100644 > >>>--- a/arch/arm64/include/asm/cputype.h > >>>+++ b/arch/arm64/include/asm/cputype.h > >>>@@ -20,7 +20,7 @@ > >>> > >>>#define MPIDR_UP_BITMASK (0x1 << 30) > >>>#define MPIDR_MT_BITMASK (0x1 << 24) > >>>-#define MPIDR_HWID_BITMASK 0xff00ffffffUL > >>>+#define MPIDR_HWID_BITMASK UL(0xff00ffffff) > >> > >>Works for me. > >> > >>FYI, I am using (old) gcc-linaro-4.8-2015.06-x86_64_aarch64. > > > >Just to confirm: are you saying that this patch fixes the build for you, > >or that mainline builds for you and the patch is not needed? > > > > Ah, what I said was ambigious. > > I am saying that linux-next (20180219) is broken for me for the same reason > and this patch fixes it. > > I didn't spot the kernelci message Arnd mentioned, so I just wanted to > mention the toolchain I used. Thanks for the clarification; Catalin -- can you pick this up for -rc3 please? Will From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752566AbeBSLTA (ORCPT ); Mon, 19 Feb 2018 06:19:00 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:57540 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752486AbeBSLS7 (ORCPT ); Mon, 19 Feb 2018 06:18:59 -0500 Date: Mon, 19 Feb 2018 11:19:07 +0000 From: Will Deacon To: John Garry , catalin.marinas@arm.com Cc: Bhupesh Sharma , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, bhupesh.linux@gmail.com Subject: Re: [PATCH] arm64: Fix compilation error while accessing MPIDR_HWID_BITMASK from .S files Message-ID: <20180219111907.GB30394@arm.com> References: <1519022394-11326-1-git-send-email-bhsharma@redhat.com> <36bd758c-dd49-edef-cc1a-20f5b43f5011@huawei.com> <20180219110238.GA30394@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Feb 19, 2018 at 11:12:32AM +0000, John Garry wrote: > On 19/02/2018 11:02, Will Deacon wrote: > >Hi John, > > > >On Mon, Feb 19, 2018 at 10:19:35AM +0000, John Garry wrote: > >>On 19/02/2018 06:39, Bhupesh Sharma wrote: > >>>Since commit e1a50de37860b3a93a9d643b09638db5aff47650 (arm64: cputype: > >>>Silence Sparse warnings), compilation of arm64 architecture is broken > >>>with the following error messages: > >>> > >>> AR arch/arm64/kernel/built-in.o > >>> arch/arm64/kernel/head.S: Assembler messages: > >>> arch/arm64/kernel/head.S:677: Error: found 'L', expected: ')' > >>> arch/arm64/kernel/head.S:677: Error: found 'L', expected: ')' > >>> arch/arm64/kernel/head.S:677: Error: found 'L', expected: ')' > >>> arch/arm64/kernel/head.S:677: Error: junk at end of line, first > >>> unrecognized character is `L' > >>> arch/arm64/kernel/head.S:677: Error: unexpected characters following > >>> instruction at operand 2 -- `movz x1,:abs_g1_s:0xff00ffffffUL' > >>> arch/arm64/kernel/head.S:677: Error: unexpected characters following > >>> instruction at operand 2 -- `movk x1,:abs_g0_nc:0xff00ffffffUL' > >>> > >>>This patch fixes the same by using the UL() macro correctly for > >>>assigning the MPIDR_HWID_BITMASK macro value. > >>> > >>>Signed-off-by: Bhupesh Sharma > >>>--- > >>>arch/arm64/include/asm/cputype.h | 2 +- > >>>1 file changed, 1 insertion(+), 1 deletion(-) > >>> > >>>diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h > >>>index eda8c5f629fc..350c76a1d15b 100644 > >>>--- a/arch/arm64/include/asm/cputype.h > >>>+++ b/arch/arm64/include/asm/cputype.h > >>>@@ -20,7 +20,7 @@ > >>> > >>>#define MPIDR_UP_BITMASK (0x1 << 30) > >>>#define MPIDR_MT_BITMASK (0x1 << 24) > >>>-#define MPIDR_HWID_BITMASK 0xff00ffffffUL > >>>+#define MPIDR_HWID_BITMASK UL(0xff00ffffff) > >> > >>Works for me. > >> > >>FYI, I am using (old) gcc-linaro-4.8-2015.06-x86_64_aarch64. > > > >Just to confirm: are you saying that this patch fixes the build for you, > >or that mainline builds for you and the patch is not needed? > > > > Ah, what I said was ambigious. > > I am saying that linux-next (20180219) is broken for me for the same reason > and this patch fixes it. > > I didn't spot the kernelci message Arnd mentioned, so I just wanted to > mention the toolchain I used. Thanks for the clarification; Catalin -- can you pick this up for -rc3 please? Will