diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-08 09:08:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-08 09:08:06 -0800 |
| commit | fc55c23a736cce88f5f975ab93326d25b49ef109 (patch) | |
| tree | 8c7b8a68338ad8840beed3b80c6c0a7fd993f2b2 /arch/arm/include/asm/assembler.h | |
| parent | 4a01e748a51cdc0527fdc913546dd46e822aa00d (diff) | |
| parent | 25875aa71dfefd1959f07e626c4d285b88b27ac2 (diff) | |
| download | linux-fc55c23a736cce88f5f975ab93326d25b49ef109.tar.gz linux-fc55c23a736cce88f5f975ab93326d25b49ef109.tar.bz2 linux-fc55c23a736cce88f5f975ab93326d25b49ef109.zip | |
Merge tag 'for-linus-bhb' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM spectre fixes from Russell King:
"ARM Spectre BHB mitigations.
These patches add Spectre BHB migitations for the following Arm CPUs
to the 32-bit ARM kernels:
- Cortex A15
- Cortex A57
- Cortex A72
- Cortex A73
- Cortex A75
- Brahma B15
for CVE-2022-23960"
* tag 'for-linus-bhb' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: include unprivileged BPF status in Spectre V2 reporting
ARM: Spectre-BHB workaround
ARM: use LOADADDR() to get load address of sections
ARM: early traps initialisation
ARM: report Spectre v2 status through sysfs
Diffstat (limited to 'arch/arm/include/asm/assembler.h')
| -rw-r--r-- | arch/arm/include/asm/assembler.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index 6fe67963ba5a..b50cc0169d5c 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -107,6 +107,16 @@ .endm #endif +#if __LINUX_ARM_ARCH__ < 7 + .macro dsb, args + mcr p15, 0, r0, c7, c10, 4 + .endm + + .macro isb, args + mcr p15, 0, r0, c7, r5, 4 + .endm +#endif + .macro asm_trace_hardirqs_off, save=1 #if defined(CONFIG_TRACE_IRQFLAGS) .if \save |