target/arm: Extend PAR format determination
Now that do_ats_write() is entirely in control of whether to generate a 32-bit PAR or a 64-bit PAR, we can make it use the correct (complicated) condition for doing so. Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Tested-by: Stefano Stabellini <sstabellini@kernel.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 1512503192-2239-13-git-send-email-peter.maydell@linaro.org [PMM: Rebased Edgar's patch on top of get_phys_addr() refactoring; use arm_s1_regime_using_lpae_format() rather than regime_using_lpae_format() because the latter will assert if passed ARMMMUIdx_S12NSE0 or ARMMMUIdx_S12NSE1; updated commit message appropriately] Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
bc52bfeb3b
commit
1313e2d7e2
|
@ -2162,16 +2162,41 @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t value,
|
||||||
int prot;
|
int prot;
|
||||||
bool ret;
|
bool ret;
|
||||||
uint64_t par64;
|
uint64_t par64;
|
||||||
|
bool format64 = false;
|
||||||
MemTxAttrs attrs = {};
|
MemTxAttrs attrs = {};
|
||||||
ARMMMUFaultInfo fi = {};
|
ARMMMUFaultInfo fi = {};
|
||||||
ARMCacheAttrs cacheattrs = {};
|
ARMCacheAttrs cacheattrs = {};
|
||||||
|
|
||||||
ret = get_phys_addr(env, value, access_type, mmu_idx, &phys_addr, &attrs,
|
ret = get_phys_addr(env, value, access_type, mmu_idx, &phys_addr, &attrs,
|
||||||
&prot, &page_size, &fi, &cacheattrs);
|
&prot, &page_size, &fi, &cacheattrs);
|
||||||
/* TODO: this is not the correct condition to use to decide whether
|
|
||||||
* to report a PAR in 64-bit or 32-bit format.
|
if (is_a64(env)) {
|
||||||
*/
|
format64 = true;
|
||||||
if (arm_s1_regime_using_lpae_format(env, mmu_idx)) {
|
} else if (arm_feature(env, ARM_FEATURE_LPAE)) {
|
||||||
|
/*
|
||||||
|
* ATS1Cxx:
|
||||||
|
* * TTBCR.EAE determines whether the result is returned using the
|
||||||
|
* 32-bit or the 64-bit PAR format
|
||||||
|
* * Instructions executed in Hyp mode always use the 64bit format
|
||||||
|
*
|
||||||
|
* ATS1S2NSOxx uses the 64bit format if any of the following is true:
|
||||||
|
* * The Non-secure TTBCR.EAE bit is set to 1
|
||||||
|
* * The implementation includes EL2, and the value of HCR.VM is 1
|
||||||
|
*
|
||||||
|
* ATS1Hx always uses the 64bit format (not supported yet).
|
||||||
|
*/
|
||||||
|
format64 = arm_s1_regime_using_lpae_format(env, mmu_idx);
|
||||||
|
|
||||||
|
if (arm_feature(env, ARM_FEATURE_EL2)) {
|
||||||
|
if (mmu_idx == ARMMMUIdx_S12NSE0 || mmu_idx == ARMMMUIdx_S12NSE1) {
|
||||||
|
format64 |= env->cp15.hcr_el2 & HCR_VM;
|
||||||
|
} else {
|
||||||
|
format64 |= arm_current_el(env) == 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (format64) {
|
||||||
/* Create a 64-bit PAR */
|
/* Create a 64-bit PAR */
|
||||||
par64 = (1 << 11); /* LPAE bit always set */
|
par64 = (1 << 11); /* LPAE bit always set */
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
|
|
Loading…
Reference in a new issue