| Message ID | 20190805152947.28536-5-david@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | s390x: MMU changes and extensions | expand |
On 8/5/19 5:29 PM, David Hildenbrand wrote: > This only adds basic support to the DAT translation, but no EDAT2 support > for TCG. E.g., the gdbstub under kvm uses this function, too, to > translate virtual addresses. > > Signed-off-by: David Hildenbrand <david@redhat.com> > --- > target/s390x/mmu_helper.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c > index de7798284d..5c9c7d385d 100644 > --- a/target/s390x/mmu_helper.c > +++ b/target/s390x/mmu_helper.c > @@ -139,6 +139,7 @@ static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr, > { > const bool edat1 = (env->cregs[0] & CR0_EDAT) && > s390_has_feat(S390_FEAT_EDAT); > + const bool edat2 = edat1 && s390_has_feat(S390_FEAT_EDAT_2); > const int asce_tl = asce & ASCE_TABLE_LENGTH; > const int asce_p = asce & ASCE_PRIVATE_SPACE; > hwaddr gaddr = asce & ASCE_ORIGIN; > @@ -234,9 +235,16 @@ static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr, > if ((entry & REGION_ENTRY_TT) != REGION_ENTRY_TT_REGION3) { > return PGM_TRANS_SPEC; > } > + if (edat2 && (entry & REGION3_ENTRY_CR) && asce_p) { > + return PGM_TRANS_SPEC; > + } > if (edat1 && (entry & REGION_ENTRY_P)) { > *flags &= ~PAGE_WRITE; > } > + if (edat2 && (entry & REGION3_ENTRY_FC)) { > + *raddr = entry & REGION3_ENTRY_RFAA; > + return 0; > + } > if (VADDR_SEGMENT_TL(vaddr) < (entry & REGION_ENTRY_TF) >> 6 || > VADDR_SEGMENT_TL(vaddr) > (entry & REGION_ENTRY_TL)) { > return PGM_SEGMENT_TRANS; Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index de7798284d..5c9c7d385d 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -139,6 +139,7 @@ static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr, { const bool edat1 = (env->cregs[0] & CR0_EDAT) && s390_has_feat(S390_FEAT_EDAT); + const bool edat2 = edat1 && s390_has_feat(S390_FEAT_EDAT_2); const int asce_tl = asce & ASCE_TABLE_LENGTH; const int asce_p = asce & ASCE_PRIVATE_SPACE; hwaddr gaddr = asce & ASCE_ORIGIN; @@ -234,9 +235,16 @@ static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr, if ((entry & REGION_ENTRY_TT) != REGION_ENTRY_TT_REGION3) { return PGM_TRANS_SPEC; } + if (edat2 && (entry & REGION3_ENTRY_CR) && asce_p) { + return PGM_TRANS_SPEC; + } if (edat1 && (entry & REGION_ENTRY_P)) { *flags &= ~PAGE_WRITE; } + if (edat2 && (entry & REGION3_ENTRY_FC)) { + *raddr = entry & REGION3_ENTRY_RFAA; + return 0; + } if (VADDR_SEGMENT_TL(vaddr) < (entry & REGION_ENTRY_TF) >> 6 || VADDR_SEGMENT_TL(vaddr) > (entry & REGION_ENTRY_TL)) { return PGM_SEGMENT_TRANS;
This only adds basic support to the DAT translation, but no EDAT2 support for TCG. E.g., the gdbstub under kvm uses this function, too, to translate virtual addresses. Signed-off-by: David Hildenbrand <david@redhat.com> --- target/s390x/mmu_helper.c | 8 ++++++++ 1 file changed, 8 insertions(+)