mirror of
https://github.com/nxp-imx/linux-imx.git
synced 2025-07-11 11:55:28 +02:00
arm64: barrier: Restore spec_bar() macro
[ Upstream commitebfc726eae
] Upcoming errata workarounds will need to use SB from C code. Restore the spec_bar() macro so that we can use SB. This is effectively a revert of commit:4f30ba1cce
("arm64: barrier: Remove spec_bar() macro") Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: James Morse <james.morse@arm.com> Cc: Will Deacon <will@kernel.org> Link: https://lore.kernel.org/r/20240508081400.235362-2-mark.rutland@arm.com Signed-off-by: Will Deacon <will@kernel.org> [ Mark: trivial backport ] Signed-off-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
4167bf7780
commit
1ae80faecc
|
@ -40,6 +40,10 @@
|
||||||
*/
|
*/
|
||||||
#define dgh() asm volatile("hint #6" : : : "memory")
|
#define dgh() asm volatile("hint #6" : : : "memory")
|
||||||
|
|
||||||
|
#define spec_bar() asm volatile(ALTERNATIVE("dsb nsh\nisb\n", \
|
||||||
|
SB_BARRIER_INSN"nop\n", \
|
||||||
|
ARM64_HAS_SB))
|
||||||
|
|
||||||
#ifdef CONFIG_ARM64_PSEUDO_NMI
|
#ifdef CONFIG_ARM64_PSEUDO_NMI
|
||||||
#define pmr_sync() \
|
#define pmr_sync() \
|
||||||
do { \
|
do { \
|
||||||
|
|
Loading…
Reference in New Issue
Block a user