Skip to content

Commit

Permalink
powerpc/mm: Switch obsolete dssall to .long
Browse files Browse the repository at this point in the history
commit d51f86c upstream.

The dssall ("Data Stream Stop All") instruction is obsolete altogether
with other Data Cache Instructions since ISA 2.03 (year 2006).

LLVM IAS does not support it but PPC970 seems to be using it.
This switches dssall to .long as there is no much point in fixing LLVM.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20211221055904.555763-6-aik@ozlabs.ru
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
aik authored and gregkh committed Jun 14, 2022
1 parent 2a0165d commit 82a2059
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 10 deletions.
2 changes: 2 additions & 0 deletions arch/powerpc/include/asm/ppc-opcode.h
Expand Up @@ -249,6 +249,7 @@
#define PPC_INST_COPY 0x7c20060c
#define PPC_INST_DCBA 0x7c0005ec
#define PPC_INST_DCBA_MASK 0xfc0007fe
#define PPC_INST_DSSALL 0x7e00066c
#define PPC_INST_ISEL 0x7c00001e
#define PPC_INST_ISEL_MASK 0xfc00003e
#define PPC_INST_LSWI 0x7c0004aa
Expand Down Expand Up @@ -576,6 +577,7 @@
#define PPC_DCBZL(a, b) stringify_in_c(.long PPC_RAW_DCBZL(a, b))
#define PPC_DIVDE(t, a, b) stringify_in_c(.long PPC_RAW_DIVDE(t, a, b))
#define PPC_DIVDEU(t, a, b) stringify_in_c(.long PPC_RAW_DIVDEU(t, a, b))
#define PPC_DSSALL stringify_in_c(.long PPC_INST_DSSALL)
#define PPC_LQARX(t, a, b, eh) stringify_in_c(.long PPC_RAW_LQARX(t, a, b, eh))
#define PPC_STQCX(t, a, b) stringify_in_c(.long PPC_RAW_STQCX(t, a, b))
#define PPC_MADDHD(t, a, b, c) stringify_in_c(.long PPC_RAW_MADDHD(t, a, b, c))
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/kernel/idle.c
Expand Up @@ -82,7 +82,7 @@ void power4_idle(void)
return;

if (cpu_has_feature(CPU_FTR_ALTIVEC))
asm volatile("DSSALL ; sync" ::: "memory");
asm volatile(PPC_DSSALL " ; sync" ::: "memory");

power4_idle_nap();

Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/kernel/idle_6xx.S
Expand Up @@ -129,7 +129,7 @@ BEGIN_FTR_SECTION
END_FTR_SECTION_IFCLR(CPU_FTR_NO_DPM)
mtspr SPRN_HID0,r4
BEGIN_FTR_SECTION
DSSALL
PPC_DSSALL
sync
END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
lwz r8,TI_LOCAL_FLAGS(r2) /* set napping bit */
Expand Down
6 changes: 3 additions & 3 deletions arch/powerpc/kernel/l2cr_6xx.S
Expand Up @@ -96,7 +96,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_L2CR)

/* Stop DST streams */
BEGIN_FTR_SECTION
DSSALL
PPC_DSSALL
sync
END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)

Expand Down Expand Up @@ -292,7 +292,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_L3CR)
isync

/* Stop DST streams */
DSSALL
PPC_DSSALL
sync

/* Get the current enable bit of the L3CR into r4 */
Expand Down Expand Up @@ -401,7 +401,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_L3CR)
_GLOBAL(__flush_disable_L1)
/* Stop pending alitvec streams and memory accesses */
BEGIN_FTR_SECTION
DSSALL
PPC_DSSALL
END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
sync

Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/kernel/swsusp_32.S
Expand Up @@ -181,7 +181,7 @@ _GLOBAL(swsusp_arch_resume)
#ifdef CONFIG_ALTIVEC
/* Stop pending alitvec streams and memory accesses */
BEGIN_FTR_SECTION
DSSALL
PPC_DSSALL
END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
#endif
sync
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/kernel/swsusp_asm64.S
Expand Up @@ -142,7 +142,7 @@ END_FW_FTR_SECTION_IFCLR(FW_FEATURE_LPAR)
_GLOBAL(swsusp_arch_resume)
/* Stop pending alitvec streams and memory accesses */
BEGIN_FTR_SECTION
DSSALL
PPC_DSSALL
END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
sync

Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/mm/mmu_context.c
Expand Up @@ -81,7 +81,7 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,
* context
*/
if (cpu_has_feature(CPU_FTR_ALTIVEC))
asm volatile ("dssall");
asm volatile (PPC_DSSALL);

if (!new_on_cpu)
membarrier_arch_switch_mm(prev, next, tsk);
Expand Down
4 changes: 2 additions & 2 deletions arch/powerpc/platforms/powermac/cache.S
Expand Up @@ -48,7 +48,7 @@ flush_disable_75x:

/* Stop DST streams */
BEGIN_FTR_SECTION
DSSALL
PPC_DSSALL
sync
END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)

Expand Down Expand Up @@ -197,7 +197,7 @@ flush_disable_745x:
isync

/* Stop prefetch streams */
DSSALL
PPC_DSSALL
sync

/* Disable L2 prefetching */
Expand Down

0 comments on commit 82a2059

Please sign in to comment.