mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 01:33:56 -06:00
target/loongarch: check tlb_ps
For LoongArch th min tlb_ps is 12(4KB), for TLB code, the tlb_ps may be 0,this may case UndefinedBehavior Add a check-tlb_ps fuction to check tlb_ps, to make sure the tlb_ps is avalablie. we check tlb_ps when get the tlb_ps from tlb->misc or CSR bits. 1. cpu reset set CSR_PWCL.PTBASE and CSR_STLBPS.PS bits a default value from CSR_PRCFG2; 2. tlb instructions. some tlb instructions get the tlb_ps from tlb->misc but the value may has been initialized to 0. we need just check the tlb_ps skip the function and write a guest log. 3. csrwr instructions. to make sure CSR_PWCL.PTBASE and CSR_STLBPS.PS bits are avalable, cheke theses bits and set a default value from CSR_PRCFG2. Signed-off-by: Song Gao <gaosong@loongson.cn> Reviewed-by: Bibo Mao <maobibo@loongson.cn> Message-Id: <20250305063311.830674-3-gaosong@loongson.cn>
This commit is contained in:
parent
089fa3d730
commit
d882c284a3
6 changed files with 56 additions and 8 deletions
|
@ -544,6 +544,7 @@ static void loongarch_max_initfn(Object *obj)
|
|||
|
||||
static void loongarch_cpu_reset_hold(Object *obj, ResetType type)
|
||||
{
|
||||
uint8_t tlb_ps;
|
||||
CPUState *cs = CPU(obj);
|
||||
LoongArchCPUClass *lacc = LOONGARCH_CPU_GET_CLASS(obj);
|
||||
CPULoongArchState *env = cpu_env(cs);
|
||||
|
@ -592,13 +593,17 @@ static void loongarch_cpu_reset_hold(Object *obj, ResetType type)
|
|||
*/
|
||||
env->CSR_PGDH = 0;
|
||||
env->CSR_PGDL = 0;
|
||||
env->CSR_PWCL = 0;
|
||||
env->CSR_PWCH = 0;
|
||||
env->CSR_STLBPS = 0;
|
||||
env->CSR_EENTRY = 0;
|
||||
env->CSR_TLBRENTRY = 0;
|
||||
env->CSR_MERRENTRY = 0;
|
||||
|
||||
/* set CSR_PWCL.PTBASE and CSR_STLBPS.PS bits from CSR_PRCFG2 */
|
||||
if (env->CSR_PRCFG2 == 0) {
|
||||
env->CSR_PRCFG2 = 0x3fffff000;
|
||||
}
|
||||
tlb_ps = ctz32(env->CSR_PRCFG2);
|
||||
env->CSR_STLBPS = FIELD_DP64(env->CSR_STLBPS, CSR_STLBPS, PS, tlb_ps);
|
||||
env->CSR_PWCL = FIELD_DP64(env->CSR_PWCL, CSR_PWCL, PTBASE, tlb_ps);
|
||||
for (n = 0; n < 4; n++) {
|
||||
env->CSR_DMW[n] = FIELD_DP64(env->CSR_DMW[n], CSR_DMW, PLV0, 0);
|
||||
env->CSR_DMW[n] = FIELD_DP64(env->CSR_DMW[n], CSR_DMW, PLV1, 0);
|
||||
|
|
|
@ -100,6 +100,7 @@ DEF_HELPER_1(rdtime_d, i64, env)
|
|||
DEF_HELPER_1(csrrd_pgd, i64, env)
|
||||
DEF_HELPER_1(csrrd_cpuid, i64, env)
|
||||
DEF_HELPER_1(csrrd_tval, i64, env)
|
||||
DEF_HELPER_2(csrwr_stlbps, i64, env, tl)
|
||||
DEF_HELPER_2(csrwr_estat, i64, env, tl)
|
||||
DEF_HELPER_2(csrwr_asid, i64, env, tl)
|
||||
DEF_HELPER_2(csrwr_tcfg, i64, env, tl)
|
||||
|
|
|
@ -43,6 +43,8 @@ enum {
|
|||
TLBRET_PE = 7,
|
||||
};
|
||||
|
||||
bool check_ps(CPULoongArchState *ent, int ps);
|
||||
|
||||
extern const VMStateDescription vmstate_loongarch_cpu;
|
||||
|
||||
void loongarch_cpu_set_irq(void *opaque, int irq, int level);
|
||||
|
|
|
@ -17,6 +17,22 @@
|
|||
#include "hw/irq.h"
|
||||
#include "cpu-csr.h"
|
||||
|
||||
target_ulong helper_csrwr_stlbps(CPULoongArchState *env, target_ulong val)
|
||||
{
|
||||
int64_t old_v = env->CSR_STLBPS;
|
||||
|
||||
/*
|
||||
* The real hardware only supports the min tlb_ps is 12
|
||||
* tlb_ps=0 may cause undefined-behavior.
|
||||
*/
|
||||
uint8_t tlb_ps = FIELD_EX64(env->CSR_STLBPS, CSR_STLBPS, PS);
|
||||
if (!check_ps(env, tlb_ps)) {
|
||||
qemu_log_mask(LOG_GUEST_ERROR,
|
||||
"Attempted set ps %d\n", tlb_ps);
|
||||
}
|
||||
return old_v;
|
||||
}
|
||||
|
||||
target_ulong helper_csrrd_pgd(CPULoongArchState *env)
|
||||
{
|
||||
int64_t v;
|
||||
|
@ -99,7 +115,7 @@ target_ulong helper_csrwr_ticlr(CPULoongArchState *env, target_ulong val)
|
|||
|
||||
target_ulong helper_csrwr_pwcl(CPULoongArchState *env, target_ulong val)
|
||||
{
|
||||
int shift;
|
||||
int shift, ptbase;
|
||||
int64_t old_v = env->CSR_PWCL;
|
||||
|
||||
/*
|
||||
|
@ -107,12 +123,16 @@ target_ulong helper_csrwr_pwcl(CPULoongArchState *env, target_ulong val)
|
|||
* treated as illegal.
|
||||
*/
|
||||
shift = FIELD_EX64(val, CSR_PWCL, PTEWIDTH);
|
||||
ptbase = FIELD_EX64(val, CSR_PWCL, PTBASE);
|
||||
if (shift) {
|
||||
qemu_log_mask(LOG_GUEST_ERROR,
|
||||
"Attempted set pte width with %d bit\n", 64 << shift);
|
||||
val = FIELD_DP64(val, CSR_PWCL, PTEWIDTH, 0);
|
||||
}
|
||||
|
||||
env->CSR_PWCL = val;
|
||||
if (!check_ps(env, ptbase)) {
|
||||
qemu_log_mask(LOG_GUEST_ERROR,
|
||||
"Attrmpted set ptbase 2^%d\n", ptbase);
|
||||
}
|
||||
env->CSR_PWCL =val;
|
||||
return old_v;
|
||||
}
|
||||
|
|
|
@ -74,6 +74,7 @@ static bool set_csr_trans_func(unsigned int csr_num, GenCSRRead readfn,
|
|||
|
||||
void loongarch_csr_translate_init(void)
|
||||
{
|
||||
SET_CSR_FUNC(STLBPS, NULL, gen_helper_csrwr_stlbps);
|
||||
SET_CSR_FUNC(ESTAT, NULL, gen_helper_csrwr_estat);
|
||||
SET_CSR_FUNC(ASID, NULL, gen_helper_csrwr_asid);
|
||||
SET_CSR_FUNC(PGD, gen_helper_csrrd_pgd, NULL);
|
||||
|
|
|
@ -18,6 +18,14 @@
|
|||
#include "exec/log.h"
|
||||
#include "cpu-csr.h"
|
||||
|
||||
bool check_ps(CPULoongArchState *env, int tlb_ps)
|
||||
{
|
||||
if (tlb_ps > 64) {
|
||||
return false;
|
||||
}
|
||||
return BIT_ULL(tlb_ps) & (env->CSR_PRCFG2);
|
||||
}
|
||||
|
||||
void get_dir_base_width(CPULoongArchState *env, uint64_t *dir_base,
|
||||
uint64_t *dir_width, target_ulong level)
|
||||
{
|
||||
|
@ -191,8 +199,10 @@ static void fill_tlb_entry(CPULoongArchState *env, int index)
|
|||
lo1 = env->CSR_TLBELO1;
|
||||
}
|
||||
|
||||
if (csr_ps == 0) {
|
||||
qemu_log_mask(CPU_LOG_MMU, "page size is 0\n");
|
||||
/*check csr_ps */
|
||||
if (!check_ps(env, csr_ps)) {
|
||||
qemu_log_mask(LOG_GUEST_ERROR, "csr_ps %d is illegal\n", csr_ps);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Only MTLB has the ps fields */
|
||||
|
@ -302,7 +312,16 @@ void helper_tlbfill(CPULoongArchState *env)
|
|||
pagesize = FIELD_EX64(env->CSR_TLBIDX, CSR_TLBIDX, PS);
|
||||
}
|
||||
|
||||
if (!check_ps(env, pagesize)) {
|
||||
qemu_log_mask(LOG_GUEST_ERROR, "pagesize %d is illegal\n", pagesize);
|
||||
return;
|
||||
}
|
||||
|
||||
stlb_ps = FIELD_EX64(env->CSR_STLBPS, CSR_STLBPS, PS);
|
||||
if (!check_ps(env, stlb_ps)) {
|
||||
qemu_log_mask(LOG_GUEST_ERROR, "stlb_ps %d is illegal\n", stlb_ps);
|
||||
return;
|
||||
}
|
||||
|
||||
if (pagesize == stlb_ps) {
|
||||
/* Only write into STLB bits [47:13] */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue