stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCHv2] powerpc/lib/sstep: fix 'ptesync' build error
@ 2022-02-11  0:51 Anders Roxell
  2022-02-18  2:24 ` Michael Ellerman
  0 siblings, 1 reply; 2+ messages in thread
From: Anders Roxell @ 2022-02-11  0:51 UTC (permalink / raw)
  To: mpe
  Cc: christophe.leroy, linuxppc-dev, linux-kernel, Anders Roxell,
	stable, Arnd Bergmann

Building tinyconfig with gcc (Debian 11.2.0-16) and assembler (Debian
2.37.90.20220207) the following build error shows up:

{standard input}: Assembler messages:
{standard input}:2088: Error: unrecognized opcode: `ptesync'
make[3]: *** [/builds/linux/scripts/Makefile.build:287: arch/powerpc/lib/sstep.o] Error 1

Add the 'ifdef CONFIG_PPC64' around the 'ptesync' in function
'emulate_update_regs()' to like it is in 'analyse_instr()'. Since it looks like
it got dropped inadvertently by commit 3cdfcbfd32b9 ("powerpc: Change
analyse_instr so it doesn't modify *regs").

Cc: stable@vger.kernel.org # v4.14+
Fixes: 3cdfcbfd32b9 ("powerpc: Change analyse_instr so it doesn't modify *regs")
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
---
 arch/powerpc/lib/sstep.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c
index a94b0cd0bdc5..bd3734d5be89 100644
--- a/arch/powerpc/lib/sstep.c
+++ b/arch/powerpc/lib/sstep.c
@@ -3264,12 +3264,14 @@ void emulate_update_regs(struct pt_regs *regs, struct instruction_op *op)
 		case BARRIER_EIEIO:
 			eieio();
 			break;
+#ifdef CONFIG_PPC64
 		case BARRIER_LWSYNC:
 			asm volatile("lwsync" : : : "memory");
 			break;
 		case BARRIER_PTESYNC:
 			asm volatile("ptesync" : : : "memory");
 			break;
+#endif
 		}
 		break;
 
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCHv2] powerpc/lib/sstep: fix 'ptesync' build error
  2022-02-11  0:51 [PATCHv2] powerpc/lib/sstep: fix 'ptesync' build error Anders Roxell
@ 2022-02-18  2:24 ` Michael Ellerman
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Ellerman @ 2022-02-18  2:24 UTC (permalink / raw)
  To: Anders Roxell, mpe
  Cc: stable, christophe.leroy, linuxppc-dev, linux-kernel, Arnd Bergmann

On Fri, 11 Feb 2022 01:51:13 +0100, Anders Roxell wrote:
> Building tinyconfig with gcc (Debian 11.2.0-16) and assembler (Debian
> 2.37.90.20220207) the following build error shows up:
> 
> {standard input}: Assembler messages:
> {standard input}:2088: Error: unrecognized opcode: `ptesync'
> make[3]: *** [/builds/linux/scripts/Makefile.build:287: arch/powerpc/lib/sstep.o] Error 1
> 
> [...]

Applied to powerpc/fixes.

[1/1] powerpc/lib/sstep: fix 'ptesync' build error
      https://git.kernel.org/powerpc/c/fe663df7825811358531dc2e8a52d9eaa5e3515e

cheers

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-02-18  2:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-11  0:51 [PATCHv2] powerpc/lib/sstep: fix 'ptesync' build error Anders Roxell
2022-02-18  2:24 ` Michael Ellerman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).