Messages in this thread Patch in this message | | | From | Michal Suchanek <> | Subject | [PATCH RFC rebase 4/9] powerpc/64s: Use barrier_nospec in RFI_FLUSH_SLOT | Date | Thu, 15 Mar 2018 20:15:53 +0100 |
| |
The RFI flush support patches the speculation barrier into RFI_FLUSH_SLOT as part of the RFI flush. Use separate barrier_nospec instead.
Signed-off-by: Michal Suchanek <msuchanek@suse.de> --- arch/powerpc/include/asm/exception-64s.h | 2 +- arch/powerpc/lib/feature-fixups.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h index 471b2274fbeb..bb5a3052b29b 100644 --- a/arch/powerpc/include/asm/exception-64s.h +++ b/arch/powerpc/include/asm/exception-64s.h @@ -81,9 +81,9 @@ * L1-D cache when returning to userspace or a guest. */ #define RFI_FLUSH_SLOT \ + barrier_nospec_asm; \ RFI_FLUSH_FIXUP_SECTION; \ nop; \ - nop; \ nop #define RFI_TO_KERNEL \ diff --git a/arch/powerpc/lib/feature-fixups.c b/arch/powerpc/lib/feature-fixups.c index 35f80ab7cbd8..4cc2f0c5c863 100644 --- a/arch/powerpc/lib/feature-fixups.c +++ b/arch/powerpc/lib/feature-fixups.c @@ -119,7 +119,7 @@ void do_feature_fixups(unsigned long value, void *fixup_start, void *fixup_end) #ifdef CONFIG_PPC_BOOK3S_64 void do_rfi_flush_fixups(enum l1d_flush_type types) { - unsigned int instrs[3], *dest; + unsigned int instrs[2], *dest; long *start, *end; int i; @@ -128,15 +128,13 @@ void do_rfi_flush_fixups(enum l1d_flush_type types) instrs[0] = 0x60000000; /* nop */ instrs[1] = 0x60000000; /* nop */ - instrs[2] = 0x60000000; /* nop */ if (types & L1D_FLUSH_FALLBACK) - /* b .+16 to fallback flush */ - instrs[0] = 0x48000010; + /* b .+12 to fallback flush */ + instrs[0] = 0x4800000c; i = 0; if (types & L1D_FLUSH_ORI) { - instrs[i++] = 0x63ff0000; /* ori 31,31,0 speculation barrier */ instrs[i++] = 0x63de0000; /* ori 30,30,0 L1d flush*/ } @@ -150,7 +148,6 @@ void do_rfi_flush_fixups(enum l1d_flush_type types) patch_instruction(dest, instrs[0]); patch_instruction(dest + 1, instrs[1]); - patch_instruction(dest + 2, instrs[2]); } printk(KERN_DEBUG "rfi-flush: patched %d locations (%s flush)\n", i, -- 2.13.6
| |