d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PowerPC64] Hide dssall instruction from llvm assembler

Browse Source 
When doing a build for a modern CPUTYPE, llvm will throw errors if obsolete
instructions are used, even if they will never run due to runtime checks.

Hiding the dssall instruction from the assembler fixes kernel build when
overriding CPUTYPE, without having any effect on the generated binary.

This has been in my local tree for over a year and is well tested across
a variety of machines.

Sponsored by:	Tag1 Consulting, Inc.
This commit is contained in:
Brandon Bergren 2020-09-08 22:59:43 +00:00
parent d20ae9cca2
commit 95090cd024
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/powerpc/aim/aim_machdep.c
View File

@ -629,7 +629,8 @@ flush_disable_caches(void)
mtspr(SPR_MSSCR0, msscr0); mtspr(SPR_MSSCR0, msscr0);
powerpc_sync(); powerpc_sync();
isync(); isync();
__asm__ __volatile__("dssall; sync"); /* 7e00066c: dssall */
__asm__ __volatile__(".long 0x7e00066c; sync");
powerpc_sync(); powerpc_sync();
isync(); isync();
__asm__ __volatile__("dcbf 0,%0" :: "r"(0)); __asm__ __volatile__("dcbf 0,%0" :: "r"(0));

3
sys/powerpc/powerpc/cpu.c
View File

@ -753,8 +753,9 @@ cpu_idle_60x(sbintime_t sbt)
case MPC7450: case MPC7450:
case MPC7455: case MPC7455:
case MPC7457: case MPC7457:
/* 0x7e00066c: dssall */
__asm __volatile("\ __asm __volatile("\
dssall; sync; mtmsr %0; isync" .long 0x7e00066c; sync; mtmsr %0; isync"
:: "r"(msr | PSL_POW)); :: "r"(msr | PSL_POW));
break; break;
default: default: