Re: Bug#885245: linux: FTBFS on powerpcspe: sstep.c: ptesync unrecognized

On Sat, Jan 22, 2022, 01:00 Cameron MacPherson <cameron.macpherson@gmail.com> wrote:

to get the latest kernel to compile on a powermac g5 takes removing the power8 instructions from sstep.c it will compile with -mpower8 but then wont boot if you dont get rid of the instructions

On Thu, Jan 20, 2022, 1:11 AM John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> wrote:
Hi!

On 12/26/17 04:32, Aaron M. Ucko wrote:
> Builds of linux for powerpcspe (admittedly not a release architecture)
> have been failing lately:
>
> {standard input}: Assembler messages:
> {standard input}:5854: Error: unrecognized opcode: `ptesync'
> /<<PKGBUILDDIR>>/scripts/Makefile.build:319: recipe for target 'arch/powerpc/lib/sstep.o' failed
> make[6]: *** [arch/powerpc/lib/sstep.o] Error 1

Funny, it seems that this particular issue is now uncovering on powerpc [1] and
ppc64 [2] as well after this change [3] in the GNU Assembler.

Adrian

> [1] https://buildd.debian.org/status/fetch.php?pkg=linux&arch=powerpc&ver=5.15.15-1&stamp=1642579068&raw=0
> [2] https://buildd.debian.org/status/fetch.php?pkg=linux&arch=ppc64&ver=5.15.15-1&stamp=1642578946&raw=0
> [3] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=b25f942e18d6ecd7ec3e2d2e9930eb4f996c258a

--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer - glaubitz@debian.org
`. `' Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913

commit 8a6358dfdf06a35d2aa9cf171b8444a716ad0c2a Author: threader <michael.heltne@gmail.com> Date: Fri Jan 21 20:36:33 2022 +0100 arch: powerpc: fix building, 'dssall' in mmu_context.c is an altivec instruction, so build that accordingly if such is the case. 'ptesync' is a PPC64 instruction, so dont go there for PPC32. And apparently ifdefined __powerpc64__ isnt enough in all configurations(?) and 'stbcix' sticks its head up. Signed-off-by: Micahel B Heltne <michael.heltne@gmail.com> diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h index beba4979bff9..cb09701ed114 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h @@ -334,7 +334,7 @@ static inline void __raw_writel(unsigned int v, volatile void __iomem *addr) } #define __raw_writel __raw_writel -#ifdef __powerpc64__ +#ifdef CONFIG_PPC64 static inline unsigned long __raw_readq(const volatile void __iomem *addr) { return *(volatile unsigned long __force *)PCI_FIX_ADDR(addr); diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c index 86f49e3e7cf5..becbe2898e10 100644 --- a/arch/powerpc/lib/sstep.c +++ b/arch/powerpc/lib/sstep.c @@ -3267,9 +3267,11 @@ void emulate_update_regs(struct pt_regs *regs, struct instruction_op *op) case BARRIER_LWSYNC: asm volatile("lwsync" : : : "memory"); break; +#ifdef CONFIG_PPC64 case BARRIER_PTESYNC: asm volatile("ptesync" : : : "memory"); break; +#endif } break; diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile index df8172da2301..2f87e7731599 100644 --- a/arch/powerpc/mm/Makefile +++ b/arch/powerpc/mm/Makefile @@ -4,6 +4,9 @@ # ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC) +ifeq ($(CONFIG_ALTIVEC),y) +CFLAGS_mmu_context.o += $(call cc-option, -maltivec, -mabi=altivec) +endif obj-y := fault.o mem.o pgtable.o mmap.o maccess.o pageattr.o \ init_$(BITS).o pgtable_$(BITS).o \ diff --git a/arch/powerpc/mm/pageattr.c b/arch/powerpc/mm/pageattr.c index edea388e9d3f..ccd04a386e28 100644 --- a/arch/powerpc/mm/pageattr.c +++ b/arch/powerpc/mm/pageattr.c @@ -54,11 +54,11 @@ static int change_page_attr(pte_t *ptep, unsigned long addr, void *data) } pte_update(&init_mm, addr, ptep, ~0UL, pte_val(pte), 0); - +#ifdef CONFIG_PPC64 /* See ptesync comment in radix__set_pte_at() */ if (radix_enabled()) asm volatile("ptesync": : :"memory"); - +#endif flush_tlb_kernel_range(addr, addr + PAGE_SIZE); spin_unlock(&init_mm.page_table_lock);