mirror of https://github.com/xemu-project/xemu.git
target/arm: Validate tlbi TG matches translation granule in use
For FEAT_LPA2, we will need other ARMVAParameters, which themselves depend on the translation granule in use. We might as well validate that the given TG matches; the architecture "does not require that the instruction invalidates any entries" if this is not true. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20220301215958.157011-15-richard.henderson@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
d976de218c
commit
3974ff93a7
|
@ -4520,12 +4520,16 @@ static TLBIRange tlbi_aa64_get_range(CPUARMState *env, ARMMMUIdx mmuidx,
|
|||
uint64_t value)
|
||||
{
|
||||
unsigned int page_size_granule, page_shift, num, scale, exponent;
|
||||
/* Extract one bit to represent the va selector in use. */
|
||||
uint64_t select = sextract64(value, 36, 1);
|
||||
ARMVAParameters param = aa64_va_parameters(env, select, mmuidx, true);
|
||||
TLBIRange ret = { };
|
||||
|
||||
page_size_granule = extract64(value, 46, 2);
|
||||
|
||||
if (page_size_granule == 0) {
|
||||
qemu_log_mask(LOG_GUEST_ERROR, "Invalid page size granule %d\n",
|
||||
/* The granule encoded in value must match the granule in use. */
|
||||
if (page_size_granule != (param.using64k ? 3 : param.using16k ? 2 : 1)) {
|
||||
qemu_log_mask(LOG_GUEST_ERROR, "Invalid tlbi page size granule %d\n",
|
||||
page_size_granule);
|
||||
return ret;
|
||||
}
|
||||
|
@ -4537,7 +4541,7 @@ static TLBIRange tlbi_aa64_get_range(CPUARMState *env, ARMMMUIdx mmuidx,
|
|||
|
||||
ret.length = (num + 1) << (exponent + page_shift);
|
||||
|
||||
if (regime_has_2_ranges(mmuidx)) {
|
||||
if (param.select) {
|
||||
ret.base = sextract64(value, 0, 37);
|
||||
} else {
|
||||
ret.base = extract64(value, 0, 37);
|
||||
|
|
Loading…
Reference in New Issue