mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-09 20:14:09 +08:00
arm64: Get rid of arm64_ssbd_state
Out with the old ghost, in with the new... Signed-off-by: Marc Zyngier <maz@kernel.org> Signed-off-by: Will Deacon <will@kernel.org>
This commit is contained in:
parent
d63d975a71
commit
31c84d6c9c
@ -698,20 +698,6 @@ static inline bool system_supports_tlb_range(void)
|
|||||||
cpus_have_const_cap(ARM64_HAS_TLB_RANGE);
|
cpus_have_const_cap(ARM64_HAS_TLB_RANGE);
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ARM64_SSBD_UNKNOWN -1
|
|
||||||
#define ARM64_SSBD_FORCE_DISABLE 0
|
|
||||||
#define ARM64_SSBD_KERNEL 1
|
|
||||||
#define ARM64_SSBD_FORCE_ENABLE 2
|
|
||||||
#define ARM64_SSBD_MITIGATED 3
|
|
||||||
|
|
||||||
static inline int arm64_get_ssbd_state(void)
|
|
||||||
{
|
|
||||||
extern int ssbd_state;
|
|
||||||
return ssbd_state;
|
|
||||||
}
|
|
||||||
|
|
||||||
void arm64_set_ssbd_mitigation(bool state);
|
|
||||||
|
|
||||||
extern int do_emulate_mrs(struct pt_regs *regs, u32 sys_reg, u32 rt);
|
extern int do_emulate_mrs(struct pt_regs *regs, u32 sys_reg, u32 rt);
|
||||||
|
|
||||||
static inline u32 id_aa64mmfr0_parange_to_phys_shift(int parange)
|
static inline u32 id_aa64mmfr0_parange_to_phys_shift(int parange)
|
||||||
|
@ -106,8 +106,6 @@ cpu_enable_trap_ctr_access(const struct arm64_cpu_capabilities *cap)
|
|||||||
sysreg_clear_set(sctlr_el1, SCTLR_EL1_UCT, 0);
|
sysreg_clear_set(sctlr_el1, SCTLR_EL1_UCT, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
int ssbd_state __read_mostly = ARM64_SSBD_UNKNOWN;
|
|
||||||
|
|
||||||
#ifdef CONFIG_ARM64_ERRATUM_1463225
|
#ifdef CONFIG_ARM64_ERRATUM_1463225
|
||||||
DEFINE_PER_CPU(int, __in_cortex_a76_erratum_1463225_wa);
|
DEFINE_PER_CPU(int, __in_cortex_a76_erratum_1463225_wa);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user