2014-11-14 15:54:09 +00:00
|
|
|
/*
|
|
|
|
* Contains CPU specific errata definitions
|
|
|
|
*
|
|
|
|
* Copyright (C) 2014 ARM Ltd.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
|
|
* published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <asm/cpu.h>
|
|
|
|
#include <asm/cputype.h>
|
|
|
|
#include <asm/cpufeature.h>
|
|
|
|
|
2014-11-14 15:54:10 +00:00
|
|
|
static bool __maybe_unused
|
2016-04-22 11:25:31 +00:00
|
|
|
is_affected_midr_range(const struct arm64_cpu_capabilities *entry, int scope)
|
2014-11-14 15:54:10 +00:00
|
|
|
{
|
2018-03-06 17:15:34 +00:00
|
|
|
const struct arm64_midr_revidr *fix;
|
|
|
|
u32 midr = read_cpuid_id(), revidr;
|
|
|
|
|
2016-04-22 11:25:31 +00:00
|
|
|
WARN_ON(scope != SCOPE_LOCAL_CPU || preemptible());
|
2018-03-26 14:12:44 +00:00
|
|
|
if (!is_midr_in_range(midr, &entry->midr_range))
|
2018-03-06 17:15:34 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
midr &= MIDR_REVISION_MASK | MIDR_VARIANT_MASK;
|
|
|
|
revidr = read_cpuid(REVIDR_EL1);
|
|
|
|
for (fix = entry->fixed_revs; fix && fix->revidr_mask; fix++)
|
|
|
|
if (midr == fix->midr_rv && (revidr & fix->revidr_mask))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
2014-11-14 15:54:10 +00:00
|
|
|
}
|
|
|
|
|
2018-03-26 14:12:45 +00:00
|
|
|
static bool __maybe_unused
|
|
|
|
is_affected_midr_range_list(const struct arm64_cpu_capabilities *entry,
|
|
|
|
int scope)
|
2014-11-14 15:54:10 +00:00
|
|
|
{
|
2016-04-22 11:25:31 +00:00
|
|
|
WARN_ON(scope != SCOPE_LOCAL_CPU || preemptible());
|
2018-03-26 14:12:45 +00:00
|
|
|
return is_midr_in_range_list(read_cpuid_id(), entry->midr_range_list);
|
2014-11-14 15:54:10 +00:00
|
|
|
}
|
|
|
|
|
2017-12-13 22:19:37 +00:00
|
|
|
static bool __maybe_unused
|
|
|
|
is_kryo_midr(const struct arm64_cpu_capabilities *entry, int scope)
|
|
|
|
{
|
|
|
|
u32 model;
|
|
|
|
|
|
|
|
WARN_ON(scope != SCOPE_LOCAL_CPU || preemptible());
|
|
|
|
|
|
|
|
model = read_cpuid_id();
|
|
|
|
model &= MIDR_IMPLEMENTOR_MASK | (0xf00 << MIDR_PARTNUM_SHIFT) |
|
|
|
|
MIDR_ARCHITECTURE_MASK;
|
|
|
|
|
2018-03-26 14:12:44 +00:00
|
|
|
return model == entry->midr_range.model;
|
2017-12-13 22:19:37 +00:00
|
|
|
}
|
|
|
|
|
2016-09-09 13:07:16 +00:00
|
|
|
static bool
|
|
|
|
has_mismatched_cache_line_size(const struct arm64_cpu_capabilities *entry,
|
|
|
|
int scope)
|
|
|
|
{
|
|
|
|
WARN_ON(scope != SCOPE_LOCAL_CPU || preemptible());
|
|
|
|
return (read_cpuid_cachetype() & arm64_ftr_reg_ctrel0.strict_mask) !=
|
|
|
|
(arm64_ftr_reg_ctrel0.sys_val & arm64_ftr_reg_ctrel0.strict_mask);
|
|
|
|
}
|
|
|
|
|
2018-03-26 14:12:28 +00:00
|
|
|
static void
|
|
|
|
cpu_enable_trap_ctr_access(const struct arm64_cpu_capabilities *__unused)
|
2016-09-09 13:07:16 +00:00
|
|
|
{
|
|
|
|
/* Clear SCTLR_EL1.UCT */
|
|
|
|
config_sctlr_el1(SCTLR_EL1_UCT, 0);
|
|
|
|
}
|
|
|
|
|
2018-03-13 12:40:39 +00:00
|
|
|
atomic_t arm64_el2_vector_last_slot = ATOMIC_INIT(-1);
|
|
|
|
|
2018-01-03 11:17:58 +00:00
|
|
|
#ifdef CONFIG_HARDEN_BRANCH_PREDICTOR
|
|
|
|
#include <asm/mmu_context.h>
|
|
|
|
#include <asm/cacheflush.h>
|
|
|
|
|
|
|
|
DEFINE_PER_CPU_READ_MOSTLY(struct bp_hardening_data, bp_hardening_data);
|
|
|
|
|
2018-04-10 10:36:45 +00:00
|
|
|
#ifdef CONFIG_KVM_INDIRECT_VECTORS
|
2018-02-06 17:56:20 +00:00
|
|
|
extern char __smccc_workaround_1_smc_start[];
|
|
|
|
extern char __smccc_workaround_1_smc_end[];
|
2018-01-03 12:46:21 +00:00
|
|
|
|
2018-01-03 11:17:58 +00:00
|
|
|
static void __copy_hyp_vect_bpi(int slot, const char *hyp_vecs_start,
|
|
|
|
const char *hyp_vecs_end)
|
|
|
|
{
|
|
|
|
void *dst = lm_alias(__bp_harden_hyp_vecs_start + slot * SZ_2K);
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < SZ_2K; i += 0x80)
|
|
|
|
memcpy(dst + i, hyp_vecs_start, hyp_vecs_end - hyp_vecs_start);
|
|
|
|
|
|
|
|
flush_icache_range((uintptr_t)dst, (uintptr_t)dst + SZ_2K);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __install_bp_hardening_cb(bp_hardening_cb_t fn,
|
|
|
|
const char *hyp_vecs_start,
|
|
|
|
const char *hyp_vecs_end)
|
|
|
|
{
|
|
|
|
static DEFINE_SPINLOCK(bp_lock);
|
|
|
|
int cpu, slot = -1;
|
|
|
|
|
|
|
|
spin_lock(&bp_lock);
|
|
|
|
for_each_possible_cpu(cpu) {
|
|
|
|
if (per_cpu(bp_hardening_data.fn, cpu) == fn) {
|
|
|
|
slot = per_cpu(bp_hardening_data.hyp_vectors_slot, cpu);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (slot == -1) {
|
2018-03-13 12:40:39 +00:00
|
|
|
slot = atomic_inc_return(&arm64_el2_vector_last_slot);
|
|
|
|
BUG_ON(slot >= BP_HARDEN_EL2_SLOTS);
|
2018-01-03 11:17:58 +00:00
|
|
|
__copy_hyp_vect_bpi(slot, hyp_vecs_start, hyp_vecs_end);
|
|
|
|
}
|
|
|
|
|
|
|
|
__this_cpu_write(bp_hardening_data.hyp_vectors_slot, slot);
|
|
|
|
__this_cpu_write(bp_hardening_data.fn, fn);
|
|
|
|
spin_unlock(&bp_lock);
|
|
|
|
}
|
|
|
|
#else
|
2018-02-06 17:56:20 +00:00
|
|
|
#define __smccc_workaround_1_smc_start NULL
|
|
|
|
#define __smccc_workaround_1_smc_end NULL
|
2018-01-03 12:46:21 +00:00
|
|
|
|
2018-01-03 11:17:58 +00:00
|
|
|
static void __install_bp_hardening_cb(bp_hardening_cb_t fn,
|
|
|
|
const char *hyp_vecs_start,
|
|
|
|
const char *hyp_vecs_end)
|
|
|
|
{
|
|
|
|
__this_cpu_write(bp_hardening_data.fn, fn);
|
|
|
|
}
|
2018-04-10 10:36:45 +00:00
|
|
|
#endif /* CONFIG_KVM_INDIRECT_VECTORS */
|
2018-01-03 11:17:58 +00:00
|
|
|
|
|
|
|
static void install_bp_hardening_cb(const struct arm64_cpu_capabilities *entry,
|
|
|
|
bp_hardening_cb_t fn,
|
|
|
|
const char *hyp_vecs_start,
|
|
|
|
const char *hyp_vecs_end)
|
|
|
|
{
|
|
|
|
u64 pfr0;
|
|
|
|
|
|
|
|
if (!entry->matches(entry, SCOPE_LOCAL_CPU))
|
|
|
|
return;
|
|
|
|
|
|
|
|
pfr0 = read_cpuid(ID_AA64PFR0_EL1);
|
|
|
|
if (cpuid_feature_extract_unsigned_field(pfr0, ID_AA64PFR0_CSV2_SHIFT))
|
|
|
|
return;
|
|
|
|
|
|
|
|
__install_bp_hardening_cb(fn, hyp_vecs_start, hyp_vecs_end);
|
|
|
|
}
|
2018-01-03 12:46:21 +00:00
|
|
|
|
2018-02-06 17:56:20 +00:00
|
|
|
#include <uapi/linux/psci.h>
|
|
|
|
#include <linux/arm-smccc.h>
|
2018-01-03 12:46:21 +00:00
|
|
|
#include <linux/psci.h>
|
|
|
|
|
2018-02-06 17:56:20 +00:00
|
|
|
static void call_smc_arch_workaround_1(void)
|
|
|
|
{
|
|
|
|
arm_smccc_1_1_smc(ARM_SMCCC_ARCH_WORKAROUND_1, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void call_hvc_arch_workaround_1(void)
|
|
|
|
{
|
|
|
|
arm_smccc_1_1_hvc(ARM_SMCCC_ARCH_WORKAROUND_1, NULL);
|
|
|
|
}
|
|
|
|
|
2018-04-10 10:36:42 +00:00
|
|
|
static void qcom_link_stack_sanitization(void)
|
|
|
|
{
|
|
|
|
u64 tmp;
|
|
|
|
|
|
|
|
asm volatile("mov %0, x30 \n"
|
|
|
|
".rept 16 \n"
|
|
|
|
"bl . + 4 \n"
|
|
|
|
".endr \n"
|
|
|
|
"mov x30, %0 \n"
|
|
|
|
: "=&r" (tmp));
|
|
|
|
}
|
|
|
|
|
2018-03-26 14:12:28 +00:00
|
|
|
static void
|
|
|
|
enable_smccc_arch_workaround_1(const struct arm64_cpu_capabilities *entry)
|
2018-02-06 17:56:20 +00:00
|
|
|
{
|
|
|
|
bp_hardening_cb_t cb;
|
|
|
|
void *smccc_start, *smccc_end;
|
|
|
|
struct arm_smccc_res res;
|
2018-04-10 10:36:42 +00:00
|
|
|
u32 midr = read_cpuid_id();
|
2018-02-06 17:56:20 +00:00
|
|
|
|
|
|
|
if (!entry->matches(entry, SCOPE_LOCAL_CPU))
|
2018-03-26 14:12:28 +00:00
|
|
|
return;
|
2018-02-06 17:56:20 +00:00
|
|
|
|
|
|
|
if (psci_ops.smccc_version == SMCCC_VERSION_1_0)
|
2018-03-26 14:12:28 +00:00
|
|
|
return;
|
2018-02-06 17:56:20 +00:00
|
|
|
|
|
|
|
switch (psci_ops.conduit) {
|
|
|
|
case PSCI_CONDUIT_HVC:
|
|
|
|
arm_smccc_1_1_hvc(ARM_SMCCC_ARCH_FEATURES_FUNC_ID,
|
|
|
|
ARM_SMCCC_ARCH_WORKAROUND_1, &res);
|
2018-03-09 15:40:50 +00:00
|
|
|
if ((int)res.a0 < 0)
|
2018-03-26 14:12:28 +00:00
|
|
|
return;
|
2018-02-06 17:56:20 +00:00
|
|
|
cb = call_hvc_arch_workaround_1;
|
2018-04-10 10:36:44 +00:00
|
|
|
/* This is a guest, no need to patch KVM vectors */
|
|
|
|
smccc_start = NULL;
|
|
|
|
smccc_end = NULL;
|
2018-02-06 17:56:20 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case PSCI_CONDUIT_SMC:
|
|
|
|
arm_smccc_1_1_smc(ARM_SMCCC_ARCH_FEATURES_FUNC_ID,
|
|
|
|
ARM_SMCCC_ARCH_WORKAROUND_1, &res);
|
2018-03-09 15:40:50 +00:00
|
|
|
if ((int)res.a0 < 0)
|
2018-03-26 14:12:28 +00:00
|
|
|
return;
|
2018-02-06 17:56:20 +00:00
|
|
|
cb = call_smc_arch_workaround_1;
|
|
|
|
smccc_start = __smccc_workaround_1_smc_start;
|
|
|
|
smccc_end = __smccc_workaround_1_smc_end;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2018-03-26 14:12:28 +00:00
|
|
|
return;
|
2018-02-06 17:56:20 +00:00
|
|
|
}
|
|
|
|
|
2018-04-10 10:36:42 +00:00
|
|
|
if (((midr & MIDR_CPU_MODEL_MASK) == MIDR_QCOM_FALKOR) ||
|
|
|
|
((midr & MIDR_CPU_MODEL_MASK) == MIDR_QCOM_FALKOR_V1))
|
|
|
|
cb = qcom_link_stack_sanitization;
|
|
|
|
|
2018-02-06 17:56:20 +00:00
|
|
|
install_bp_hardening_cb(entry, cb, smccc_start, smccc_end);
|
|
|
|
|
2018-03-26 14:12:28 +00:00
|
|
|
return;
|
2018-01-03 12:46:21 +00:00
|
|
|
}
|
2018-01-03 11:17:58 +00:00
|
|
|
#endif /* CONFIG_HARDEN_BRANCH_PREDICTOR */
|
|
|
|
|
2018-05-29 12:11:06 +00:00
|
|
|
#ifdef CONFIG_ARM64_SSBD
|
2018-05-29 12:11:07 +00:00
|
|
|
DEFINE_PER_CPU_READ_MOSTLY(u64, arm64_ssbd_callback_required);
|
|
|
|
|
2018-05-29 12:11:06 +00:00
|
|
|
void __init arm64_update_smccc_conduit(struct alt_instr *alt,
|
|
|
|
__le32 *origptr, __le32 *updptr,
|
|
|
|
int nr_inst)
|
|
|
|
{
|
|
|
|
u32 insn;
|
|
|
|
|
|
|
|
BUG_ON(nr_inst != 1);
|
|
|
|
|
|
|
|
switch (psci_ops.conduit) {
|
|
|
|
case PSCI_CONDUIT_HVC:
|
|
|
|
insn = aarch64_insn_get_hvc_value();
|
|
|
|
break;
|
|
|
|
case PSCI_CONDUIT_SMC:
|
|
|
|
insn = aarch64_insn_get_smc_value();
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
*updptr = cpu_to_le32(insn);
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_ARM64_SSBD */
|
|
|
|
|
2018-03-26 14:12:43 +00:00
|
|
|
#define CAP_MIDR_RANGE(model, v_min, r_min, v_max, r_max) \
|
|
|
|
.matches = is_affected_midr_range, \
|
2018-03-26 14:12:44 +00:00
|
|
|
.midr_range = MIDR_RANGE(model, v_min, r_min, v_max, r_max)
|
2018-03-26 14:12:43 +00:00
|
|
|
|
|
|
|
#define CAP_MIDR_ALL_VERSIONS(model) \
|
|
|
|
.matches = is_affected_midr_range, \
|
2018-03-26 14:12:44 +00:00
|
|
|
.midr_range = MIDR_ALL_VERSIONS(model)
|
2017-02-01 14:38:46 +00:00
|
|
|
|
2018-03-06 17:15:34 +00:00
|
|
|
#define MIDR_FIXED(rev, revidr_mask) \
|
|
|
|
.fixed_revs = (struct arm64_midr_revidr[]){{ (rev), (revidr_mask) }, {}}
|
|
|
|
|
2018-03-26 14:12:43 +00:00
|
|
|
#define ERRATA_MIDR_RANGE(model, v_min, r_min, v_max, r_max) \
|
|
|
|
.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, \
|
|
|
|
CAP_MIDR_RANGE(model, v_min, r_min, v_max, r_max)
|
|
|
|
|
2018-03-26 14:12:45 +00:00
|
|
|
#define CAP_MIDR_RANGE_LIST(list) \
|
|
|
|
.matches = is_affected_midr_range_list, \
|
|
|
|
.midr_range_list = list
|
|
|
|
|
2018-03-26 14:12:43 +00:00
|
|
|
/* Errata affecting a range of revisions of given model variant */
|
|
|
|
#define ERRATA_MIDR_REV_RANGE(m, var, r_min, r_max) \
|
|
|
|
ERRATA_MIDR_RANGE(m, var, r_min, var, r_max)
|
|
|
|
|
|
|
|
/* Errata affecting a single variant/revision of a model */
|
|
|
|
#define ERRATA_MIDR_REV(model, var, rev) \
|
|
|
|
ERRATA_MIDR_RANGE(model, var, rev, var, rev)
|
|
|
|
|
|
|
|
/* Errata affecting all variants/revisions of a given a model */
|
|
|
|
#define ERRATA_MIDR_ALL_VERSIONS(model) \
|
|
|
|
.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, \
|
|
|
|
CAP_MIDR_ALL_VERSIONS(model)
|
|
|
|
|
2018-03-26 14:12:45 +00:00
|
|
|
/* Errata affecting a list of midr ranges, with same work around */
|
|
|
|
#define ERRATA_MIDR_RANGE_LIST(midr_list) \
|
|
|
|
.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, \
|
|
|
|
CAP_MIDR_RANGE_LIST(midr_list)
|
|
|
|
|
arm64: capabilities: Handle shared entries
Some capabilities have different criteria for detection and associated
actions based on the matching criteria, even though they all share the
same capability bit. So far we have used multiple entries with the same
capability bit to handle this. This is prone to errors, as the
cpu_enable is invoked for each entry, irrespective of whether the
detection rule applies to the CPU or not. And also this complicates
other helpers, e.g, __this_cpu_has_cap.
This patch adds a wrapper entry to cover all the possible variations
of a capability by maintaining list of matches + cpu_enable callbacks.
To avoid complicating the prototypes for the "matches()", we use
arm64_cpu_capabilities maintain the list and we ignore all the other
fields except the matches & cpu_enable.
This ensures :
1) The capabilitiy is set when at least one of the entry detects
2) Action is only taken for the entries that "matches".
This avoids explicit checks in the cpu_enable() take some action.
The only constraint here is that, all the entries should have the
same "type" (i.e, scope and conflict rules).
If a cpu_enable() method is associated with multiple matches for a
single capability, care should be taken that either the match criteria
are mutually exclusive, or that the method is robust against being
called multiple times.
This also reverts the changes introduced by commit 67948af41f2e6818ed
("arm64: capabilities: Handle duplicate entries for a capability").
Cc: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Dave Martin <dave.martin@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2018-03-26 14:12:46 +00:00
|
|
|
/*
|
|
|
|
* Generic helper for handling capabilties with multiple (match,enable) pairs
|
|
|
|
* of call backs, sharing the same capability bit.
|
|
|
|
* Iterate over each entry to see if at least one matches.
|
|
|
|
*/
|
2018-03-27 10:51:12 +00:00
|
|
|
static bool __maybe_unused
|
|
|
|
multi_entry_cap_matches(const struct arm64_cpu_capabilities *entry, int scope)
|
arm64: capabilities: Handle shared entries
Some capabilities have different criteria for detection and associated
actions based on the matching criteria, even though they all share the
same capability bit. So far we have used multiple entries with the same
capability bit to handle this. This is prone to errors, as the
cpu_enable is invoked for each entry, irrespective of whether the
detection rule applies to the CPU or not. And also this complicates
other helpers, e.g, __this_cpu_has_cap.
This patch adds a wrapper entry to cover all the possible variations
of a capability by maintaining list of matches + cpu_enable callbacks.
To avoid complicating the prototypes for the "matches()", we use
arm64_cpu_capabilities maintain the list and we ignore all the other
fields except the matches & cpu_enable.
This ensures :
1) The capabilitiy is set when at least one of the entry detects
2) Action is only taken for the entries that "matches".
This avoids explicit checks in the cpu_enable() take some action.
The only constraint here is that, all the entries should have the
same "type" (i.e, scope and conflict rules).
If a cpu_enable() method is associated with multiple matches for a
single capability, care should be taken that either the match criteria
are mutually exclusive, or that the method is robust against being
called multiple times.
This also reverts the changes introduced by commit 67948af41f2e6818ed
("arm64: capabilities: Handle duplicate entries for a capability").
Cc: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Dave Martin <dave.martin@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2018-03-26 14:12:46 +00:00
|
|
|
{
|
|
|
|
const struct arm64_cpu_capabilities *caps;
|
|
|
|
|
|
|
|
for (caps = entry->match_list; caps->matches; caps++)
|
|
|
|
if (caps->matches(caps, scope))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Take appropriate action for all matching entries in the shared capability
|
|
|
|
* entry.
|
|
|
|
*/
|
2018-03-27 10:51:12 +00:00
|
|
|
static void __maybe_unused
|
arm64: capabilities: Handle shared entries
Some capabilities have different criteria for detection and associated
actions based on the matching criteria, even though they all share the
same capability bit. So far we have used multiple entries with the same
capability bit to handle this. This is prone to errors, as the
cpu_enable is invoked for each entry, irrespective of whether the
detection rule applies to the CPU or not. And also this complicates
other helpers, e.g, __this_cpu_has_cap.
This patch adds a wrapper entry to cover all the possible variations
of a capability by maintaining list of matches + cpu_enable callbacks.
To avoid complicating the prototypes for the "matches()", we use
arm64_cpu_capabilities maintain the list and we ignore all the other
fields except the matches & cpu_enable.
This ensures :
1) The capabilitiy is set when at least one of the entry detects
2) Action is only taken for the entries that "matches".
This avoids explicit checks in the cpu_enable() take some action.
The only constraint here is that, all the entries should have the
same "type" (i.e, scope and conflict rules).
If a cpu_enable() method is associated with multiple matches for a
single capability, care should be taken that either the match criteria
are mutually exclusive, or that the method is robust against being
called multiple times.
This also reverts the changes introduced by commit 67948af41f2e6818ed
("arm64: capabilities: Handle duplicate entries for a capability").
Cc: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Dave Martin <dave.martin@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2018-03-26 14:12:46 +00:00
|
|
|
multi_entry_cap_cpu_enable(const struct arm64_cpu_capabilities *entry)
|
|
|
|
{
|
|
|
|
const struct arm64_cpu_capabilities *caps;
|
2014-11-14 15:54:10 +00:00
|
|
|
|
arm64: capabilities: Handle shared entries
Some capabilities have different criteria for detection and associated
actions based on the matching criteria, even though they all share the
same capability bit. So far we have used multiple entries with the same
capability bit to handle this. This is prone to errors, as the
cpu_enable is invoked for each entry, irrespective of whether the
detection rule applies to the CPU or not. And also this complicates
other helpers, e.g, __this_cpu_has_cap.
This patch adds a wrapper entry to cover all the possible variations
of a capability by maintaining list of matches + cpu_enable callbacks.
To avoid complicating the prototypes for the "matches()", we use
arm64_cpu_capabilities maintain the list and we ignore all the other
fields except the matches & cpu_enable.
This ensures :
1) The capabilitiy is set when at least one of the entry detects
2) Action is only taken for the entries that "matches".
This avoids explicit checks in the cpu_enable() take some action.
The only constraint here is that, all the entries should have the
same "type" (i.e, scope and conflict rules).
If a cpu_enable() method is associated with multiple matches for a
single capability, care should be taken that either the match criteria
are mutually exclusive, or that the method is robust against being
called multiple times.
This also reverts the changes introduced by commit 67948af41f2e6818ed
("arm64: capabilities: Handle duplicate entries for a capability").
Cc: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Dave Martin <dave.martin@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2018-03-26 14:12:46 +00:00
|
|
|
for (caps = entry->match_list; caps->matches; caps++)
|
|
|
|
if (caps->matches(caps, SCOPE_LOCAL_CPU) &&
|
|
|
|
caps->cpu_enable)
|
|
|
|
caps->cpu_enable(caps);
|
|
|
|
}
|
|
|
|
|
2018-03-26 14:12:45 +00:00
|
|
|
#ifdef CONFIG_HARDEN_BRANCH_PREDICTOR
|
|
|
|
|
|
|
|
/*
|
|
|
|
* List of CPUs where we need to issue a psci call to
|
|
|
|
* harden the branch predictor.
|
|
|
|
*/
|
|
|
|
static const struct midr_range arm64_bp_harden_smccc_cpus[] = {
|
|
|
|
MIDR_ALL_VERSIONS(MIDR_CORTEX_A57),
|
|
|
|
MIDR_ALL_VERSIONS(MIDR_CORTEX_A72),
|
|
|
|
MIDR_ALL_VERSIONS(MIDR_CORTEX_A73),
|
|
|
|
MIDR_ALL_VERSIONS(MIDR_CORTEX_A75),
|
|
|
|
MIDR_ALL_VERSIONS(MIDR_BRCM_VULCAN),
|
|
|
|
MIDR_ALL_VERSIONS(MIDR_CAVIUM_THUNDERX2),
|
|
|
|
MIDR_ALL_VERSIONS(MIDR_QCOM_FALKOR_V1),
|
|
|
|
MIDR_ALL_VERSIONS(MIDR_QCOM_FALKOR),
|
|
|
|
{},
|
|
|
|
};
|
|
|
|
|
|
|
|
#endif
|
2017-02-01 14:38:46 +00:00
|
|
|
|
2018-04-10 10:36:43 +00:00
|
|
|
#ifdef CONFIG_HARDEN_EL2_VECTORS
|
|
|
|
|
|
|
|
static const struct midr_range arm64_harden_el2_vectors[] = {
|
|
|
|
MIDR_ALL_VERSIONS(MIDR_CORTEX_A57),
|
|
|
|
MIDR_ALL_VERSIONS(MIDR_CORTEX_A72),
|
|
|
|
{},
|
|
|
|
};
|
|
|
|
|
2018-03-28 11:46:07 +00:00
|
|
|
#endif
|
|
|
|
|
2015-03-27 13:09:23 +00:00
|
|
|
const struct arm64_cpu_capabilities arm64_errata[] = {
|
2014-11-14 15:54:12 +00:00
|
|
|
#if defined(CONFIG_ARM64_ERRATUM_826319) || \
|
|
|
|
defined(CONFIG_ARM64_ERRATUM_827319) || \
|
|
|
|
defined(CONFIG_ARM64_ERRATUM_824069)
|
2014-11-14 15:54:10 +00:00
|
|
|
{
|
|
|
|
/* Cortex-A53 r0p[012] */
|
|
|
|
.desc = "ARM errata 826319, 827319, 824069",
|
|
|
|
.capability = ARM64_WORKAROUND_CLEAN_CACHE,
|
2018-03-26 14:12:43 +00:00
|
|
|
ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A53, 0, 0, 2),
|
2018-03-26 14:12:28 +00:00
|
|
|
.cpu_enable = cpu_enable_cache_maint_trap,
|
2014-11-14 15:54:10 +00:00
|
|
|
},
|
2014-11-14 15:54:12 +00:00
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARM64_ERRATUM_819472
|
|
|
|
{
|
|
|
|
/* Cortex-A53 r0p[01] */
|
|
|
|
.desc = "ARM errata 819472",
|
|
|
|
.capability = ARM64_WORKAROUND_CLEAN_CACHE,
|
2018-03-26 14:12:43 +00:00
|
|
|
ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A53, 0, 0, 1),
|
2018-03-26 14:12:28 +00:00
|
|
|
.cpu_enable = cpu_enable_cache_maint_trap,
|
2014-11-14 15:54:12 +00:00
|
|
|
},
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARM64_ERRATUM_832075
|
2014-11-14 15:54:10 +00:00
|
|
|
{
|
2014-11-14 15:54:11 +00:00
|
|
|
/* Cortex-A57 r0p0 - r1p2 */
|
|
|
|
.desc = "ARM erratum 832075",
|
|
|
|
.capability = ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE,
|
2018-03-26 14:12:43 +00:00
|
|
|
ERRATA_MIDR_RANGE(MIDR_CORTEX_A57,
|
|
|
|
0, 0,
|
|
|
|
1, 2),
|
2014-11-14 15:54:11 +00:00
|
|
|
},
|
2015-03-23 19:07:02 +00:00
|
|
|
#endif
|
2015-11-16 10:28:18 +00:00
|
|
|
#ifdef CONFIG_ARM64_ERRATUM_834220
|
|
|
|
{
|
|
|
|
/* Cortex-A57 r0p0 - r1p2 */
|
|
|
|
.desc = "ARM erratum 834220",
|
|
|
|
.capability = ARM64_WORKAROUND_834220,
|
2018-03-26 14:12:43 +00:00
|
|
|
ERRATA_MIDR_RANGE(MIDR_CORTEX_A57,
|
|
|
|
0, 0,
|
|
|
|
1, 2),
|
2015-11-16 10:28:18 +00:00
|
|
|
},
|
|
|
|
#endif
|
2018-03-06 17:15:35 +00:00
|
|
|
#ifdef CONFIG_ARM64_ERRATUM_843419
|
|
|
|
{
|
|
|
|
/* Cortex-A53 r0p[01234] */
|
|
|
|
.desc = "ARM erratum 843419",
|
|
|
|
.capability = ARM64_WORKAROUND_843419,
|
2018-03-26 14:12:43 +00:00
|
|
|
ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A53, 0, 0, 4),
|
2018-03-06 17:15:35 +00:00
|
|
|
MIDR_FIXED(0x4, BIT(8)),
|
2015-11-16 10:28:18 +00:00
|
|
|
},
|
|
|
|
#endif
|
2015-03-23 19:07:02 +00:00
|
|
|
#ifdef CONFIG_ARM64_ERRATUM_845719
|
|
|
|
{
|
|
|
|
/* Cortex-A53 r0p[01234] */
|
|
|
|
.desc = "ARM erratum 845719",
|
|
|
|
.capability = ARM64_WORKAROUND_845719,
|
2018-03-26 14:12:43 +00:00
|
|
|
ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A53, 0, 0, 4),
|
2015-03-23 19:07:02 +00:00
|
|
|
},
|
2015-09-21 20:58:35 +00:00
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_CAVIUM_ERRATUM_23154
|
|
|
|
{
|
|
|
|
/* Cavium ThunderX, pass 1.x */
|
|
|
|
.desc = "Cavium erratum 23154",
|
|
|
|
.capability = ARM64_WORKAROUND_CAVIUM_23154,
|
2018-03-26 14:12:43 +00:00
|
|
|
ERRATA_MIDR_REV_RANGE(MIDR_THUNDERX, 0, 0, 1),
|
2015-09-21 20:58:35 +00:00
|
|
|
},
|
2016-02-25 01:44:57 +00:00
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_CAVIUM_ERRATUM_27456
|
|
|
|
{
|
|
|
|
/* Cavium ThunderX, T88 pass 1.x - 2.1 */
|
|
|
|
.desc = "Cavium erratum 27456",
|
|
|
|
.capability = ARM64_WORKAROUND_CAVIUM_27456,
|
2018-03-26 14:12:43 +00:00
|
|
|
ERRATA_MIDR_RANGE(MIDR_THUNDERX,
|
|
|
|
0, 0,
|
|
|
|
1, 1),
|
2016-02-25 01:44:57 +00:00
|
|
|
},
|
2016-07-07 04:48:17 +00:00
|
|
|
{
|
|
|
|
/* Cavium ThunderX, T81 pass 1.0 */
|
|
|
|
.desc = "Cavium erratum 27456",
|
|
|
|
.capability = ARM64_WORKAROUND_CAVIUM_27456,
|
2018-03-26 14:12:43 +00:00
|
|
|
ERRATA_MIDR_REV(MIDR_THUNDERX_81XX, 0, 0),
|
2016-07-07 04:48:17 +00:00
|
|
|
},
|
2017-06-09 11:49:48 +00:00
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_CAVIUM_ERRATUM_30115
|
|
|
|
{
|
|
|
|
/* Cavium ThunderX, T88 pass 1.x - 2.2 */
|
|
|
|
.desc = "Cavium erratum 30115",
|
|
|
|
.capability = ARM64_WORKAROUND_CAVIUM_30115,
|
2018-03-26 14:12:43 +00:00
|
|
|
ERRATA_MIDR_RANGE(MIDR_THUNDERX,
|
|
|
|
0, 0,
|
|
|
|
1, 2),
|
2017-06-09 11:49:48 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
/* Cavium ThunderX, T81 pass 1.0 - 1.2 */
|
|
|
|
.desc = "Cavium erratum 30115",
|
|
|
|
.capability = ARM64_WORKAROUND_CAVIUM_30115,
|
2018-03-26 14:12:43 +00:00
|
|
|
ERRATA_MIDR_REV_RANGE(MIDR_THUNDERX_81XX, 0, 0, 2),
|
2017-06-09 11:49:48 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
/* Cavium ThunderX, T83 pass 1.0 */
|
|
|
|
.desc = "Cavium erratum 30115",
|
|
|
|
.capability = ARM64_WORKAROUND_CAVIUM_30115,
|
2018-03-26 14:12:43 +00:00
|
|
|
ERRATA_MIDR_REV(MIDR_THUNDERX_83XX, 0, 0),
|
2017-06-09 11:49:48 +00:00
|
|
|
},
|
2014-11-14 15:54:12 +00:00
|
|
|
#endif
|
2016-09-09 13:07:16 +00:00
|
|
|
{
|
|
|
|
.desc = "Mismatched cache line size",
|
|
|
|
.capability = ARM64_MISMATCHED_CACHE_LINE_SIZE,
|
|
|
|
.matches = has_mismatched_cache_line_size,
|
2018-03-26 14:12:32 +00:00
|
|
|
.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,
|
2018-03-26 14:12:28 +00:00
|
|
|
.cpu_enable = cpu_enable_trap_ctr_access,
|
2016-09-09 13:07:16 +00:00
|
|
|
},
|
2017-02-08 20:08:37 +00:00
|
|
|
#ifdef CONFIG_QCOM_FALKOR_ERRATUM_1003
|
|
|
|
{
|
|
|
|
.desc = "Qualcomm Technologies Falkor erratum 1003",
|
|
|
|
.capability = ARM64_WORKAROUND_QCOM_FALKOR_E1003,
|
2018-03-26 14:12:43 +00:00
|
|
|
ERRATA_MIDR_REV(MIDR_QCOM_FALKOR_V1, 0, 0),
|
2017-02-08 20:08:37 +00:00
|
|
|
},
|
2017-12-13 22:19:37 +00:00
|
|
|
{
|
|
|
|
.desc = "Qualcomm Technologies Kryo erratum 1003",
|
|
|
|
.capability = ARM64_WORKAROUND_QCOM_FALKOR_E1003,
|
2018-03-26 14:12:32 +00:00
|
|
|
.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,
|
2018-03-26 14:12:44 +00:00
|
|
|
.midr_range.model = MIDR_QCOM_KRYO,
|
2017-12-13 22:19:37 +00:00
|
|
|
.matches = is_kryo_midr,
|
|
|
|
},
|
2017-02-08 20:08:37 +00:00
|
|
|
#endif
|
2017-01-31 17:50:19 +00:00
|
|
|
#ifdef CONFIG_QCOM_FALKOR_ERRATUM_1009
|
|
|
|
{
|
|
|
|
.desc = "Qualcomm Technologies Falkor erratum 1009",
|
|
|
|
.capability = ARM64_WORKAROUND_REPEAT_TLBI,
|
2018-03-26 14:12:43 +00:00
|
|
|
ERRATA_MIDR_REV(MIDR_QCOM_FALKOR_V1, 0, 0),
|
2017-01-31 17:50:19 +00:00
|
|
|
},
|
2017-03-20 17:18:06 +00:00
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARM64_ERRATUM_858921
|
|
|
|
{
|
|
|
|
/* Cortex-A73 all versions */
|
|
|
|
.desc = "ARM erratum 858921",
|
|
|
|
.capability = ARM64_WORKAROUND_858921,
|
2018-03-26 14:12:43 +00:00
|
|
|
ERRATA_MIDR_ALL_VERSIONS(MIDR_CORTEX_A73),
|
2017-03-20 17:18:06 +00:00
|
|
|
},
|
2018-01-03 12:46:21 +00:00
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_HARDEN_BRANCH_PREDICTOR
|
|
|
|
{
|
|
|
|
.capability = ARM64_HARDEN_BRANCH_PREDICTOR,
|
arm64: capabilities: Handle shared entries
Some capabilities have different criteria for detection and associated
actions based on the matching criteria, even though they all share the
same capability bit. So far we have used multiple entries with the same
capability bit to handle this. This is prone to errors, as the
cpu_enable is invoked for each entry, irrespective of whether the
detection rule applies to the CPU or not. And also this complicates
other helpers, e.g, __this_cpu_has_cap.
This patch adds a wrapper entry to cover all the possible variations
of a capability by maintaining list of matches + cpu_enable callbacks.
To avoid complicating the prototypes for the "matches()", we use
arm64_cpu_capabilities maintain the list and we ignore all the other
fields except the matches & cpu_enable.
This ensures :
1) The capabilitiy is set when at least one of the entry detects
2) Action is only taken for the entries that "matches".
This avoids explicit checks in the cpu_enable() take some action.
The only constraint here is that, all the entries should have the
same "type" (i.e, scope and conflict rules).
If a cpu_enable() method is associated with multiple matches for a
single capability, care should be taken that either the match criteria
are mutually exclusive, or that the method is robust against being
called multiple times.
This also reverts the changes introduced by commit 67948af41f2e6818ed
("arm64: capabilities: Handle duplicate entries for a capability").
Cc: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Dave Martin <dave.martin@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2018-03-26 14:12:46 +00:00
|
|
|
.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,
|
2018-04-10 10:36:42 +00:00
|
|
|
.cpu_enable = enable_smccc_arch_workaround_1,
|
|
|
|
ERRATA_MIDR_RANGE_LIST(arm64_bp_harden_smccc_cpus),
|
2018-01-19 12:22:47 +00:00
|
|
|
},
|
2018-02-15 11:49:20 +00:00
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_HARDEN_EL2_VECTORS
|
|
|
|
{
|
2018-04-10 10:36:43 +00:00
|
|
|
.desc = "EL2 vector hardening",
|
2018-02-15 11:49:20 +00:00
|
|
|
.capability = ARM64_HARDEN_EL2_VECTORS,
|
2018-04-10 10:36:43 +00:00
|
|
|
.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,
|
|
|
|
ERRATA_MIDR_RANGE_LIST(arm64_harden_el2_vectors),
|
2018-02-15 11:49:20 +00:00
|
|
|
},
|
2017-01-31 17:50:19 +00:00
|
|
|
#endif
|
2014-11-14 15:54:11 +00:00
|
|
|
{
|
2014-11-14 15:54:10 +00:00
|
|
|
}
|
2014-11-14 15:54:09 +00:00
|
|
|
};
|