target/arm: Remove is_subpage argument to pmsav8_mpu_lookup
This can be made redundant with result->page_size, by moving the basic set of page_size from get_phys_addr_pmsav8. We still need to overwrite page_size when v8m_security_lookup signals a subpage. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20220822152741.1617527-11-richard.henderson@linaro.org [PMM: Update a comment that used to refer to is_subpage] Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
d2c92e5856
commit
652c750ee5
|
@ -1152,8 +1152,8 @@ bool get_phys_addr(CPUARMState *env, target_ulong address,
|
||||||
|
|
||||||
bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t address,
|
bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t address,
|
||||||
MMUAccessType access_type, ARMMMUIdx mmu_idx,
|
MMUAccessType access_type, ARMMMUIdx mmu_idx,
|
||||||
GetPhysAddrResult *result, bool *is_subpage,
|
GetPhysAddrResult *result, ARMMMUFaultInfo *fi,
|
||||||
ARMMMUFaultInfo *fi, uint32_t *mregion);
|
uint32_t *mregion);
|
||||||
|
|
||||||
void arm_log_exception(CPUState *cs);
|
void arm_log_exception(CPUState *cs);
|
||||||
|
|
||||||
|
|
|
@ -2806,11 +2806,10 @@ uint32_t HELPER(v7m_tt)(CPUARMState *env, uint32_t addr, uint32_t op)
|
||||||
if (arm_current_el(env) != 0 || alt) {
|
if (arm_current_el(env) != 0 || alt) {
|
||||||
GetPhysAddrResult res = {};
|
GetPhysAddrResult res = {};
|
||||||
ARMMMUFaultInfo fi = {};
|
ARMMMUFaultInfo fi = {};
|
||||||
bool is_subpage;
|
|
||||||
|
|
||||||
/* We can ignore the return value as prot is always set */
|
/* We can ignore the return value as prot is always set */
|
||||||
pmsav8_mpu_lookup(env, addr, MMU_DATA_LOAD, mmu_idx,
|
pmsav8_mpu_lookup(env, addr, MMU_DATA_LOAD, mmu_idx,
|
||||||
&res, &is_subpage, &fi, &mregion);
|
&res, &fi, &mregion);
|
||||||
if (mregion == -1) {
|
if (mregion == -1) {
|
||||||
mrvalid = false;
|
mrvalid = false;
|
||||||
mregion = 0;
|
mregion = 0;
|
||||||
|
|
|
@ -1701,8 +1701,8 @@ static bool get_phys_addr_pmsav7(CPUARMState *env, uint32_t address,
|
||||||
|
|
||||||
bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t address,
|
bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t address,
|
||||||
MMUAccessType access_type, ARMMMUIdx mmu_idx,
|
MMUAccessType access_type, ARMMMUIdx mmu_idx,
|
||||||
GetPhysAddrResult *result, bool *is_subpage,
|
GetPhysAddrResult *result, ARMMMUFaultInfo *fi,
|
||||||
ARMMMUFaultInfo *fi, uint32_t *mregion)
|
uint32_t *mregion)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* Perform a PMSAv8 MPU lookup (without also doing the SAU check
|
* Perform a PMSAv8 MPU lookup (without also doing the SAU check
|
||||||
|
@ -1710,8 +1710,9 @@ bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t address,
|
||||||
* mregion is (if not NULL) set to the region number which matched,
|
* mregion is (if not NULL) set to the region number which matched,
|
||||||
* or -1 if no region number is returned (MPU off, address did not
|
* or -1 if no region number is returned (MPU off, address did not
|
||||||
* hit a region, address hit in multiple regions).
|
* hit a region, address hit in multiple regions).
|
||||||
* We set is_subpage to true if the region hit doesn't cover the
|
* If the region hit doesn't cover the entire TARGET_PAGE the address
|
||||||
* entire TARGET_PAGE the address is within.
|
* is within, then we set the result page_size to 1 to force the
|
||||||
|
* memory system to use a subpage.
|
||||||
*/
|
*/
|
||||||
ARMCPU *cpu = env_archcpu(env);
|
ARMCPU *cpu = env_archcpu(env);
|
||||||
bool is_user = regime_is_user(env, mmu_idx);
|
bool is_user = regime_is_user(env, mmu_idx);
|
||||||
|
@ -1722,7 +1723,7 @@ bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t address,
|
||||||
uint32_t addr_page_base = address & TARGET_PAGE_MASK;
|
uint32_t addr_page_base = address & TARGET_PAGE_MASK;
|
||||||
uint32_t addr_page_limit = addr_page_base + (TARGET_PAGE_SIZE - 1);
|
uint32_t addr_page_limit = addr_page_base + (TARGET_PAGE_SIZE - 1);
|
||||||
|
|
||||||
*is_subpage = false;
|
result->page_size = TARGET_PAGE_SIZE;
|
||||||
result->phys = address;
|
result->phys = address;
|
||||||
result->prot = 0;
|
result->prot = 0;
|
||||||
if (mregion) {
|
if (mregion) {
|
||||||
|
@ -1774,13 +1775,13 @@ bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t address,
|
||||||
ranges_overlap(base, limit - base + 1,
|
ranges_overlap(base, limit - base + 1,
|
||||||
addr_page_base,
|
addr_page_base,
|
||||||
TARGET_PAGE_SIZE)) {
|
TARGET_PAGE_SIZE)) {
|
||||||
*is_subpage = true;
|
result->page_size = 1;
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (base > addr_page_base || limit < addr_page_limit) {
|
if (base > addr_page_base || limit < addr_page_limit) {
|
||||||
*is_subpage = true;
|
result->page_size = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (matchregion != -1) {
|
if (matchregion != -1) {
|
||||||
|
@ -1972,7 +1973,6 @@ static bool get_phys_addr_pmsav8(CPUARMState *env, uint32_t address,
|
||||||
uint32_t secure = regime_is_secure(env, mmu_idx);
|
uint32_t secure = regime_is_secure(env, mmu_idx);
|
||||||
V8M_SAttributes sattrs = {};
|
V8M_SAttributes sattrs = {};
|
||||||
bool ret;
|
bool ret;
|
||||||
bool mpu_is_subpage;
|
|
||||||
|
|
||||||
if (arm_feature(env, ARM_FEATURE_M_SECURITY)) {
|
if (arm_feature(env, ARM_FEATURE_M_SECURITY)) {
|
||||||
v8m_security_lookup(env, address, access_type, mmu_idx, &sattrs);
|
v8m_security_lookup(env, address, access_type, mmu_idx, &sattrs);
|
||||||
|
@ -2035,9 +2035,10 @@ static bool get_phys_addr_pmsav8(CPUARMState *env, uint32_t address,
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = pmsav8_mpu_lookup(env, address, access_type, mmu_idx,
|
ret = pmsav8_mpu_lookup(env, address, access_type, mmu_idx,
|
||||||
result, &mpu_is_subpage, fi, NULL);
|
result, fi, NULL);
|
||||||
result->page_size =
|
if (sattrs.subpage) {
|
||||||
sattrs.subpage || mpu_is_subpage ? 1 : TARGET_PAGE_SIZE;
|
result->page_size = 1;
|
||||||
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue