2019-08-06 21:47:47

by Sasha Levin

Subject: [PATCH AUTOSEL 5.2 07/59] xtensa: fix build for cores with coprocessors

From: Max Filippov <[email protected]>

[ Upstream commit e3cacb73e626d885b8cf24103fed0ae26518e3c4 ]

Assembly entry/return abstraction change didn't add asmmacro.h include
statement to coprocessor.S, resulting in references to undefined macros
abi_entry and abi_ret on cores that define XTENSA_HAVE_COPROCESSORS.
Fix that by including asm/asmmacro.h from the coprocessor.S.

Signed-off-by: Max Filippov <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
---
arch/xtensa/kernel/coprocessor.S | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/xtensa/kernel/coprocessor.S b/arch/xtensa/kernel/coprocessor.S
index 92bf24a9da929..e723129c36688 100644
--- a/arch/xtensa/kernel/coprocessor.S
+++ b/arch/xtensa/kernel/coprocessor.S
@@ -14,6 +14,7 @@

#include <linux/linkage.h>
#include <asm/asm-offsets.h>
+#include <asm/asmmacro.h>
#include <asm/processor.h>
#include <asm/coprocessor.h>
#include <asm/thread_info.h>
--
2.20.1

2019-08-06 21:56:36

by Max Filippov

Subject: Re: [PATCH AUTOSEL 5.2 07/59] xtensa: fix build for cores with coprocessors

Hello,

On Tue, Aug 6, 2019 at 2:33 PM Sasha Levin <[email protected]> wrote:
> From: Max Filippov <[email protected]>
>
> [ Upstream commit e3cacb73e626d885b8cf24103fed0ae26518e3c4 ]
>
> Assembly entry/return abstraction change didn't add asmmacro.h include
> statement to coprocessor.S, resulting in references to undefined macros
> abi_entry and abi_ret on cores that define XTENSA_HAVE_COPROCESSORS.
> Fix that by including asm/asmmacro.h from the coprocessor.S.
>
> Signed-off-by: Max Filippov <[email protected]>
> Signed-off-by: Sasha Levin <[email protected]>
> ---
> arch/xtensa/kernel/coprocessor.S | 1 +
> 1 file changed, 1 insertion(+)

This fix is only relevant to 5.3, as it fixes a bug introduced in 5.3-rc1.

--
Thanks.
-- Max

2019-08-18 01:48:21

by Sasha Levin

Subject: Re: [PATCH AUTOSEL 5.2 07/59] xtensa: fix build for cores with coprocessors

On Tue, Aug 06, 2019 at 02:55:29PM -0700, Max Filippov wrote:
>Hello,
>
>On Tue, Aug 6, 2019 at 2:33 PM Sasha Levin <[email protected]> wrote:
>> From: Max Filippov <[email protected]>
>>
>> [ Upstream commit e3cacb73e626d885b8cf24103fed0ae26518e3c4 ]
>>
>> Assembly entry/return abstraction change didn't add asmmacro.h include
>> statement to coprocessor.S, resulting in references to undefined macros
>> abi_entry and abi_ret on cores that define XTENSA_HAVE_COPROCESSORS.
>> Fix that by including asm/asmmacro.h from the coprocessor.S.
>>
>> Signed-off-by: Max Filippov <[email protected]>
>> Signed-off-by: Sasha Levin <[email protected]>
>> ---
>> arch/xtensa/kernel/coprocessor.S | 1 +
>> 1 file changed, 1 insertion(+)
>
>This fix is only relevant to 5.3, as it fixes a bug introduced in 5.3-rc1.

Now dropped, thank you.

--
Thanks,
Sasha