| Message ID | 1487255413-14196-4-git-send-email-fred.konrad@greensocs.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/17/2017 01:30 AM, fred.konrad@greensocs.com wrote: > From: KONRAD Frederic <fred.konrad@greensocs.com> > > get_page_addr_code(..) does a cpu_ldub_code to fill the tlb: > This can lead to some side effects if a device is mapped at this address. > > So this patch replaces the cpu_memory_ld by a tlb_fill. > > Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com> > --- > cputlb.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) Reviewed-by: Richard Henderson <rth@twiddle.net> r~
On 02/23/2017 01:31 AM, Richard Henderson wrote: > On 02/17/2017 01:30 AM, fred.konrad@greensocs.com wrote: >> From: KONRAD Frederic <fred.konrad@greensocs.com> >> >> get_page_addr_code(..) does a cpu_ldub_code to fill the tlb: >> This can lead to some side effects if a device is mapped at this address. >> >> So this patch replaces the cpu_memory_ld by a tlb_fill. >> >> Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com> >> --- >> cputlb.c | 6 ++++-- >> 1 file changed, 4 insertions(+), 2 deletions(-) > > Reviewed-by: Richard Henderson <rth@twiddle.net> > > > r~ Thanks! Fred
diff --git a/cputlb.c b/cputlb.c index b3a5f47..846341e 100644 --- a/cputlb.c +++ b/cputlb.c @@ -534,8 +534,10 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env, target_ulong addr) index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1); mmu_idx = cpu_mmu_index(env, true); if (unlikely(env->tlb_table[mmu_idx][index].addr_code != - (addr & TARGET_PAGE_MASK))) { - cpu_ldub_code(env, addr); + (addr & (TARGET_PAGE_MASK | TLB_INVALID_MASK)))) { + if (!VICTIM_TLB_HIT(addr_read, addr)) { + tlb_fill(ENV_GET_CPU(env), addr, MMU_INST_FETCH, mmu_idx, 0); + } } iotlbentry = &env->iotlb[mmu_idx][index]; pd = iotlbentry->addr & ~TARGET_PAGE_MASK;