Message ID | 1321948756-9852-1-git-send-email-jcmvbkbc@gmail.com |
---|---|
State | New |
Headers | show |
Thanks, applied. On Tue, Nov 22, 2011 at 07:59, Max Filippov <jcmvbkbc@gmail.com> wrote: > - ITLB/DTLB ways 5 and 6 have 4 and 8 entries respectively; > - ITLB/DTLB way 6 attr field is set to 3 on reset. > > Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> > --- > target-xtensa/helper.c | 2 +- > target-xtensa/overlay_tool.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c > index fc85815..2a0cb1a 100644 > --- a/target-xtensa/helper.c > +++ b/target-xtensa/helper.c > @@ -273,7 +273,7 @@ static void reset_tlb_mmu_ways56(CPUState *env, > entry[6][ei].vaddr = ei << 29; > entry[6][ei].paddr = ei << 29; > entry[6][ei].asid = 1; > - entry[6][ei].attr = 2; > + entry[6][ei].attr = 3; > } > } > } > diff --git a/target-xtensa/overlay_tool.h b/target-xtensa/overlay_tool.h > index 9cef27d..df19cc9 100644 > --- a/target-xtensa/overlay_tool.h > +++ b/target-xtensa/overlay_tool.h > @@ -256,7 +256,7 @@ > .way_size = { \ > (refill_way_size), (refill_way_size), \ > (refill_way_size), (refill_way_size), \ > - 4, 2, 2, 1, 1, 1, \ > + 4, (way56) ? 4 : 2, (way56) ? 8 : 2, 1, 1, 1, \ > }, \ > .varway56 = (way56), \ > .nrefillentries = (refill_way_size) * 4, \ > -- > 1.7.6.4 > > >
diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c index fc85815..2a0cb1a 100644 --- a/target-xtensa/helper.c +++ b/target-xtensa/helper.c @@ -273,7 +273,7 @@ static void reset_tlb_mmu_ways56(CPUState *env, entry[6][ei].vaddr = ei << 29; entry[6][ei].paddr = ei << 29; entry[6][ei].asid = 1; - entry[6][ei].attr = 2; + entry[6][ei].attr = 3; } } } diff --git a/target-xtensa/overlay_tool.h b/target-xtensa/overlay_tool.h index 9cef27d..df19cc9 100644 --- a/target-xtensa/overlay_tool.h +++ b/target-xtensa/overlay_tool.h @@ -256,7 +256,7 @@ .way_size = { \ (refill_way_size), (refill_way_size), \ (refill_way_size), (refill_way_size), \ - 4, 2, 2, 1, 1, 1, \ + 4, (way56) ? 4 : 2, (way56) ? 8 : 2, 1, 1, 1, \ }, \ .varway56 = (way56), \ .nrefillentries = (refill_way_size) * 4, \
- ITLB/DTLB ways 5 and 6 have 4 and 8 entries respectively; - ITLB/DTLB way 6 attr field is set to 3 on reset. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> --- target-xtensa/helper.c | 2 +- target-xtensa/overlay_tool.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)