From patchwork Thu May 9 22:26:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 163783 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1582467ilr; Thu, 9 May 2019 15:46:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqwlXndTesB6etPz2iYizRzqk1FjXHvU6PYZnNXinTWrsl9qiRVeIKnRAF/h3jZ5Lrs1mT26 X-Received: by 2002:a1c:7a03:: with SMTP id v3mr4337489wmc.58.1557441981169; Thu, 09 May 2019 15:46:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557441981; cv=none; d=google.com; s=arc-20160816; b=fbPOtLk53KRO/F+MjTTapxypGswH7ef3Kdzy/PEHRFVOdHKHV/3WkrrDR1NtMYFkcj p4KdRGbuxzf7Z6L+FMouoY3X2UEYq7dsvWkBIE7gMlz+E2xerIz5PzqLTvqjTPhO/upT JCR8bbMoNeDaMqZ/uX4PyFHNGl7Ev/7nPIQoIoKXgxaI3Pv9/625cZwtiicrP2ObvYw5 bRAJzwI4tyBaRa0b+VtVJMwvr68e3jbe7Sl4EhX5ahplKug8mzyWa7ckDNSRHoDDAJze LaBdstIf3XRFFa8AVlq/+Yklqx1ePPoGmDPd3suS/JaGzAsWbTGoV1Sn5hovUU/0T3T5 5wiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=omewBU1W56CpN9jkgUsDwQLimncwo01SMHqSrNfd+ko=; b=R9S6XbQM2aVc9srwuj+O2lcEw2HhxLTGAhxvy5ATqixvjFs+Xa4nB1fh2o9Q3j7cFH sCjYhvIoRAy3a5HzPYZ6RpjLY+IGRGEBdAhMzM2Q4uGvsOXs0nh+VXqDnJjRzYkdfN6k o6Pf2PNr/uKGh5IFSwJ5bpBNgcPc0HG5214YIbuQm6IFdD6RRMG1PUEGVQdGSDVsFrah VFyaHA+yXVvSUWr50sSEh2FhK/MboyDbyQnWcgSYaq7PQ5ExIoSjhY1D9Se62jK6Fko3 mzSHX46Foija5Kww/gk0yKx7dSuxuLgBEH7kJ1r5MUkj68BvWFYHOJZHWiwAEUOodCAw cf+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Brerx8jF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t18si2879397wri.247.2019.05.09.15.46.20 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 15:46:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Brerx8jF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:33751 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOrnw-0007xx-5D for patch@linaro.org; Thu, 09 May 2019 18:46:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32941) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOrV2-0007ew-24 for qemu-devel@nongnu.org; Thu, 09 May 2019 18:26:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOrV0-0005Sz-Ns for qemu-devel@nongnu.org; Thu, 09 May 2019 18:26:48 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:40373) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOrV0-0005Sm-Fv for qemu-devel@nongnu.org; Thu, 09 May 2019 18:26:46 -0400 Received: by mail-pg1-x541.google.com with SMTP id d31so1922864pgl.7 for ; Thu, 09 May 2019 15:26:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=omewBU1W56CpN9jkgUsDwQLimncwo01SMHqSrNfd+ko=; b=Brerx8jFb4MLhY62NvxRp9Pgh4FR2LpBx+8FtNax2NdnECPCS9c4jMULj9VAuZMYcz p+3Mn4PsGnxw1SEWA1hETuvKlyq7V8MuYbWVGXTTEAGXXfTM4JxYY9PWcq1zX8UL4Hpj wCTEtT2v0giesTWApQYqYvKAdb3vrhLR0dL0OAfs23MLxj2PmoGLkmJsgycJhc8MO+kY fUfYoQ6J+lmNhLgfsP6FcEQK41W8EzzzDbMBLMeIk6/FAQl1cIUMCclMiiOQzMgAMSP5 jEwe3Fc8m37jydEeDy/vNTWjf5lV9U95JdKK6Aac0KBZxY/D168PmqDAyUcCpSJ3uYdP YAZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=omewBU1W56CpN9jkgUsDwQLimncwo01SMHqSrNfd+ko=; b=D1adRGlBbZKs2LUV2tb36Eynbmj0i4aKsIB/mvg5CzD+xUU+VQZjMRxgav7stNiyea C5wNBb/LKlP6sHx+5Gog7Ows8Uoo5VQwAEvyjK32ldZmh+3A5NsfhL4hscigd3gvdYVI Cmrbf4byqGz65cOQZaRmKsgA2Tz+bA3U6rvSx7B8PuMLeW1k5v6yqDgQrqY5j6Nf/fsm sbYppy5ppuTbO50p7IISG9LJ25jNKy+jsd/9TNCvCpfhoERa74g+tGIbJygobgAkHJ2E Jm8hkH2OTjUFhCANePdKVvOSqTziqL4O66jR2Ja9W+qHP6qJ/giurHS1/ryo1Dp3oI6a svfQ== X-Gm-Message-State: APjAAAU7SmchG7C6qvhfxg1VgQj3X8LZ7AUIPhLWEpbGBhCIkfRiJjmW UcD2qCd7KKghTmtVd6Tbwmbi/G5m45A= X-Received: by 2002:aa7:8acb:: with SMTP id b11mr8920814pfd.115.1557440805289; Thu, 09 May 2019 15:26:45 -0700 (PDT) Received: from localhost.localdomain (97-113-13-231.tukw.qwest.net. [97.113.13.231]) by smtp.gmail.com with ESMTPSA id m2sm4490521pfi.24.2019.05.09.15.26.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 May 2019 15:26:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 15:26:13 -0700 Message-Id: <20190509222631.14271-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190509222631.14271-1-richard.henderson@linaro.org> References: <20190509222631.14271-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 Subject: [Qemu-devel] [PATCH v3 09/27] target/microblaze: Convert to CPUClass::tlb_fill X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Cc: Edgar E. Iglesias Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- v2: Keep user-only and system tlb_fill separate. --- target/microblaze/cpu.h | 5 +- target/microblaze/cpu.c | 5 +- target/microblaze/helper.c | 107 ++++++++++++++++++---------------- target/microblaze/op_helper.c | 19 ------ 4 files changed, 62 insertions(+), 74 deletions(-) -- 2.17.1 diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index f20e796865..7a9fb8f4aa 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -374,8 +374,9 @@ static inline int cpu_mmu_index (CPUMBState *env, bool ifetch) return MMU_KERNEL_IDX; } -int mb_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, int rw, - int mmu_idx); +bool mb_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr); #include "exec/cpu-all.h" diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index 5596cd5485..0ea549910b 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -304,9 +304,8 @@ static void mb_cpu_class_init(ObjectClass *oc, void *data) cc->set_pc = mb_cpu_set_pc; cc->gdb_read_register = mb_cpu_gdb_read_register; cc->gdb_write_register = mb_cpu_gdb_write_register; -#ifdef CONFIG_USER_ONLY - cc->handle_mmu_fault = mb_cpu_handle_mmu_fault; -#else + cc->tlb_fill = mb_cpu_tlb_fill; +#ifndef CONFIG_USER_ONLY cc->do_transaction_failed = mb_cpu_transaction_failed; cc->get_phys_page_debug = mb_cpu_get_phys_page_debug; #endif diff --git a/target/microblaze/helper.c b/target/microblaze/helper.c index 9848e31d7f..a523c77959 100644 --- a/target/microblaze/helper.c +++ b/target/microblaze/helper.c @@ -38,73 +38,80 @@ void mb_cpu_do_interrupt(CPUState *cs) env->regs[14] = env->sregs[SR_PC]; } -int mb_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, - int mmu_idx) +bool mb_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr) { cs->exception_index = 0xaa; - cpu_dump_state(cs, stderr, 0); - return 1; + cpu_loop_exit_restore(cs, retaddr); } #else /* !CONFIG_USER_ONLY */ -int mb_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, - int mmu_idx) +bool mb_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr) { MicroBlazeCPU *cpu = MICROBLAZE_CPU(cs); CPUMBState *env = &cpu->env; + struct microblaze_mmu_lookup lu; unsigned int hit; - int r = 1; int prot; - /* Translate if the MMU is available and enabled. */ - if (mmu_idx != MMU_NOMMU_IDX) { - uint32_t vaddr, paddr; - struct microblaze_mmu_lookup lu; - - hit = mmu_translate(&env->mmu, &lu, address, rw, mmu_idx); - if (hit) { - vaddr = address & TARGET_PAGE_MASK; - paddr = lu.paddr + vaddr - lu.vaddr; - - qemu_log_mask(CPU_LOG_MMU, "MMU map mmu=%d v=%x p=%x prot=%x\n", - mmu_idx, vaddr, paddr, lu.prot); - tlb_set_page(cs, vaddr, paddr, lu.prot, mmu_idx, TARGET_PAGE_SIZE); - r = 0; - } else { - env->sregs[SR_EAR] = address; - qemu_log_mask(CPU_LOG_MMU, "mmu=%d miss v=%" VADDR_PRIx "\n", - mmu_idx, address); - - switch (lu.err) { - case ERR_PROT: - env->sregs[SR_ESR] = rw == 2 ? 17 : 16; - env->sregs[SR_ESR] |= (rw == 1) << 10; - break; - case ERR_MISS: - env->sregs[SR_ESR] = rw == 2 ? 19 : 18; - env->sregs[SR_ESR] |= (rw == 1) << 10; - break; - default: - abort(); - break; - } - - if (cs->exception_index == EXCP_MMU) { - cpu_abort(cs, "recursive faults\n"); - } - - /* TLB miss. */ - cs->exception_index = EXCP_MMU; - } - } else { + if (mmu_idx == MMU_NOMMU_IDX) { /* MMU disabled or not available. */ address &= TARGET_PAGE_MASK; prot = PAGE_BITS; tlb_set_page(cs, address, address, prot, mmu_idx, TARGET_PAGE_SIZE); - r = 0; + return true; } - return r; + + hit = mmu_translate(&env->mmu, &lu, address, access_type, mmu_idx); + if (likely(hit)) { + uint32_t vaddr = address & TARGET_PAGE_MASK; + uint32_t paddr = lu.paddr + vaddr - lu.vaddr; + + qemu_log_mask(CPU_LOG_MMU, "MMU map mmu=%d v=%x p=%x prot=%x\n", + mmu_idx, vaddr, paddr, lu.prot); + tlb_set_page(cs, vaddr, paddr, lu.prot, mmu_idx, TARGET_PAGE_SIZE); + return true; + } + + /* TLB miss. */ + if (probe) { + return false; + } + + qemu_log_mask(CPU_LOG_MMU, "mmu=%d miss v=%" VADDR_PRIx "\n", + mmu_idx, address); + + env->sregs[SR_EAR] = address; + switch (lu.err) { + case ERR_PROT: + env->sregs[SR_ESR] = access_type == MMU_INST_FETCH ? 17 : 16; + env->sregs[SR_ESR] |= (access_type == MMU_DATA_STORE) << 10; + break; + case ERR_MISS: + env->sregs[SR_ESR] = access_type == MMU_INST_FETCH ? 19 : 18; + env->sregs[SR_ESR] |= (access_type == MMU_DATA_STORE) << 10; + break; + default: + abort(); + } + + if (cs->exception_index == EXCP_MMU) { + cpu_abort(cs, "recursive faults\n"); + } + + /* TLB miss. */ + cs->exception_index = EXCP_MMU; + cpu_loop_exit_restore(cs, retaddr); +} + +void tlb_fill(CPUState *cs, target_ulong addr, int size, + MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) +{ + mb_cpu_tlb_fill(cs, addr, size, access_type, mmu_idx, false, retaddr); } void mb_cpu_do_interrupt(CPUState *cs) diff --git a/target/microblaze/op_helper.c b/target/microblaze/op_helper.c index e23dcfdc20..b5dbb90d05 100644 --- a/target/microblaze/op_helper.c +++ b/target/microblaze/op_helper.c @@ -28,25 +28,6 @@ #define D(x) -#if !defined(CONFIG_USER_ONLY) - -/* Try to fill the TLB and return an exception if error. If retaddr is - * NULL, it means that the function was called in C code (i.e. not - * from generated code or from helper.c) - */ -void tlb_fill(CPUState *cs, target_ulong addr, int size, - MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) -{ - int ret; - - ret = mb_cpu_handle_mmu_fault(cs, addr, size, access_type, mmu_idx); - if (unlikely(ret)) { - /* now we have a real cpu fault */ - cpu_loop_exit_restore(cs, retaddr); - } -} -#endif - void helper_put(uint32_t id, uint32_t ctrl, uint32_t data) { int test = ctrl & STREAM_TEST;