[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/46] target/ppc: Do not call hreg_compute_mem_idx after ppc_stor
From: |
David Gibson |
Subject: |
[PULL 05/46] target/ppc: Do not call hreg_compute_mem_idx after ppc_store_msr |
Date: |
Tue, 4 May 2021 15:52:31 +1000 |
From: Richard Henderson <richard.henderson@linaro.org>
In ppc_store_msr we call hreg_compute_hflags, which itself
calls hreg_compute_mem_idx. Rely on ppc_store_msr to update
everything required by the msr update.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210315184615.1985590-5-richard.henderson@linaro.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
target/ppc/machine.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/target/ppc/machine.c b/target/ppc/machine.c
index 87d7bffb86..f6eeda9642 100644
--- a/target/ppc/machine.c
+++ b/target/ppc/machine.c
@@ -125,9 +125,6 @@ static int cpu_load_old(QEMUFile *f, void *opaque, int
version_id)
env->msr ^= env->msr_mask & ~((1ULL << MSR_TGPR) | MSR_HVB);
ppc_store_msr(env, msr);
- /* Recompute mmu indices */
- hreg_compute_mem_idx(env);
-
return 0;
}
@@ -418,14 +415,12 @@ static int cpu_post_load(void *opaque, int version_id)
/*
* Invalidate all supported msr bits except MSR_TGPR/MSR_HVB
- * before restoring
+ * before restoring. Note that this recomputes hflags and mem_idx.
*/
msr = env->msr;
env->msr ^= env->msr_mask & ~((1ULL << MSR_TGPR) | MSR_HVB);
ppc_store_msr(env, msr);
- hreg_compute_mem_idx(env);
-
return 0;
}
--
2.31.1
- [PULL 00/46] ppc-for-6.1 queue 20210504, David Gibson, 2021/05/04
- [PULL 01/46] hw/ppc/mac_newworld: Restrict RAM to 2 GiB, David Gibson, 2021/05/04
- [PULL 03/46] target/ppc: Move 601 hflags adjustment to hreg_compute_hflags, David Gibson, 2021/05/04
- [PULL 02/46] target/ppc: Move helper_regs.h functions out-of-line, David Gibson, 2021/05/04
- [PULL 04/46] target/ppc: Properly sync cpu state with new msr in cpu_load_old, David Gibson, 2021/05/04
- [PULL 08/46] hw/ppc/pnv_core: Update hflags after setting msr, David Gibson, 2021/05/04
- [PULL 05/46] target/ppc: Do not call hreg_compute_mem_idx after ppc_store_msr,
David Gibson <=
- [PULL 06/46] target/ppc: Retain hflags_nmsr only for migration, David Gibson, 2021/05/04
- [PULL 07/46] target/ppc: Fix comment for MSR_FE{0,1}, David Gibson, 2021/05/04
- [PULL 09/46] hw/ppc/spapr_rtas: Update hflags after setting msr, David Gibson, 2021/05/04
- [PULL 10/46] target/ppc: Extract post_load_update_msr, David Gibson, 2021/05/04
- [PULL 11/46] target/ppc: Disconnect hflags from MSR, David Gibson, 2021/05/04
- [PULL 14/46] target/ppc: Create helper_scv, David Gibson, 2021/05/04
- [PULL 15/46] target/ppc: Put LPCR[GTSE] in hflags, David Gibson, 2021/05/04
- [PULL 12/46] target/ppc: Reduce env->hflags to uint32_t, David Gibson, 2021/05/04
- [PULL 17/46] target/ppc: Remove env->immu_idx and env->dmmu_idx, David Gibson, 2021/05/04
- [PULL 19/46] target/ppc: Validate hflags with CONFIG_DEBUG_TCG, David Gibson, 2021/05/04