diff options
| -rw-r--r-- | target/s390x/cpu_models.c | 1 | ||||
| -rw-r--r-- | target/s390x/mem_helper.c | 2 | ||||
| -rw-r--r-- | target/s390x/translate.c | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index d4fcddb1d3..51b17b98f3 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -688,6 +688,7 @@ static void add_qemu_cpu_model_features(S390FeatBitmap fbm) S390_FEAT_FLOATING_POINT_SUPPPORT_ENH, S390_FEAT_STFLE_45, S390_FEAT_STFLE_49, + S390_FEAT_LOCAL_TLB_CLEARING, S390_FEAT_STFLE_53, }; int i; diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index a0a805cd1b..182c46f6b5 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -1629,8 +1629,6 @@ void HELPER(ipte)(CPUS390XState *env, uint64_t pto, uint64_t vaddr, /* XXX we exploit the fact that Linux passes the exact virtual address here - it's not obliged to! */ - /* XXX: the LC bit should be considered as 0 if the local-TLB-clearing - facility is not installed. */ if (m4 & 1) { tlb_flush_page(cs, page); } else { diff --git a/target/s390x/translate.c b/target/s390x/translate.c index df3fefab97..1db5f2d5b9 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2385,7 +2385,11 @@ static ExitStatus op_ipte(DisasContext *s, DisasOps *o) TCGv_i32 m4; check_privileged(s); - m4 = tcg_const_i32(get_field(s->fields, m4)); + if (s390_has_feat(S390_FEAT_LOCAL_TLB_CLEARING)) { + m4 = tcg_const_i32(get_field(s->fields, m4)); + } else { + m4 = tcg_const_i32(0); + } gen_helper_ipte(cpu_env, o->in1, o->in2, m4); tcg_temp_free_i32(m4); return NO_EXIT; |