starred/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:46:10 +00:00
Code Issues 380 Packages Projects Releases Wiki Activity

target/arm/ptw: Flip sense of get_phys_addr_for_at return value

Browse Source 
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20260515142541.571911-14-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell
2026-05-15 15:25:40 +01:00
parent 66282b507e
commit 24bf68e381
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/arm/internals.h
View File

@@ -1526,6 +1526,8 @@ bool get_phys_addr(CPUARMState *env, vaddr address,
*
* Similar to get_phys_addr, but for use by AccessType_AT, i.e.
* system instructions for address translation.
*
* Returns: false on translation failure, true on success.
*/
bool get_phys_addr_for_at(CPUARMState *env, vaddr address, unsigned prot_check,
ARMMMUIdx mmu_idx, ARMSecuritySpace space,

2
target/arm/ptw.c
View File

@@ -3851,7 +3851,7 @@ bool get_phys_addr_for_at(CPUARMState *env, vaddr address,
* check is handled or bypassed by .in_prot_check) and "memop = MO_8"
* bypasses any alignment check.
*/
return !get_phys_addr_nogpc(env, &ptw, address,
return get_phys_addr_nogpc(env, &ptw, address,
MMU_DATA_LOAD, MO_8, result, fi);
}

12
target/arm/tcg/cpregs-at.c
View File

@@ -31,17 +31,17 @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t value,
bool format64 = false;
ARMMMUFaultInfo fi = {};
GetPhysAddrResult res = {};
bool ret = get_phys_addr_for_at(env, value, prot_check,
mmu_idx, ss, &res, &fi);
bool ok = get_phys_addr_for_at(env, value, prot_check,
mmu_idx, ss, &res, &fi);
/*
* ATS operations only do S1 or S1+S2 translations, so we never
* have to deal with the ARMCacheAttrs format for S2 only.
* (Note that res fields are only valid on ptw success.)
*/
assert(ret || !res.cacheattrs.is_s2_format);
assert(!ok || !res.cacheattrs.is_s2_format);
if (ret) {
if (!ok) {
/*
* Some kinds of translation fault must cause exceptions rather
* than being reported in the PAR.
@@ -144,7 +144,7 @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t value,
if (format64) {
/* Create a 64-bit PAR */
par64 = (1 << 11); /* LPAE bit always set */
if (!ret) {
if (ok) {
par64 |= res.f.phys_addr & ~0xfffULL;
if (!res.f.attrs.secure) {
par64 |= (1 << 9); /* NS */
@@ -169,7 +169,7 @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t value,
* translation table format (with WnR always clear).
* Convert it to a 32-bit PAR.
*/
if (!ret) {
if (ok) {
/* We do not set any attribute bits in the PAR */
if (res.f.lg_page_size == 24
&& arm_feature(env, ARM_FEATURE_V7)) {